friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Adding $a->getBaseURL for Worker in profile_photo 

Adding a TODO for Contact::magicLink
This commit is contained in:
Philipp Holzer 2018-10-20 01:00:01 +02:00
parent 34989480e1
commit 363d00cc45
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/profile_photo.php
View File

@ -126,7 +126,7 @@ function profile_photo_post(App $a)
info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
if ($path && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $path);
Worker::add(PRIORITY_LOW, "Directory", $a->getBaseURL() . '/' . $path);
}
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());

8
mod/randprof.php
View File

@ -13,7 +13,13 @@ function randprof_init(App $a)
$x = GContact::getRandomUrl();
if ($x) {
$a->internalRedirect(Contact::magicLink($x));
$link = Contact::magicLink($x);
// @TODO making the return of magicLink save to use either externalRedirect or internalRedirect
if (filter_var($link, FILTER_VALIDATE_URL)) {
System::externalRedirect($link);
} else {
$a->internalRedirect($link);
}
}
$a->internalRedirect('profile');

2
src/Model/Contact.php
View File

@ -2024,6 +2024,8 @@ class Contact extends BaseObject
/**
* @brief Returns a magic link to authenticate remote visitors
*
* @todo check if the return is either a fully qualified URL or a relative path to Friendica basedir
*
* @param string $contact_url The address of the target contact profile
* @param string $url An url that we will be redirected to after the authentication
*