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

removed unused "f" parameter

This commit is contained in:
Michael 2019-09-29 18:59:03 +00:00
parent 51e55bca18
commit 5eeca432fe
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Contact.php
View File

@ -1214,7 +1214,7 @@ class Contact extends BaseObject
} }
if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; $poke_link = System::baseUrl() . '/poke/?c=' . $contact['id'];
} }
$contact_url = System::baseUrl() . '/contact/' . $contact['id']; $contact_url = System::baseUrl() . '/contact/' . $contact['id'];

2
src/Model/Profile.php
View File

@ -1087,7 +1087,7 @@ class Profile
$basepath = Contact::getBasepath($contact['url']); $basepath = Contact::getBasepath($contact['url']);
if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic')) { if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic')) {
$magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest . '&' . $addr_request; $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
// We have to check if the remote server does understand /magic without invoking something // We have to check if the remote server does understand /magic without invoking something
$serverret = Network::curl($basepath . '/magic'); $serverret = Network::curl($basepath . '/magic');

2
src/Module/Debug/Localtime.php
View File

@ -39,7 +39,7 @@ class Localtime extends BaseModule
$output .= '<p>' . L10n::t('Converted localtime: %s', $app->data['mod-localtime']) . '</p>'; $output .= '<p>' . L10n::t('Converted localtime: %s', $app->data['mod-localtime']) . '</p>';
} }
$output .= '<form action ="' . $app->getBaseURL() . '/localtime?f=&time=' . $time . '" method="post" >'; $output .= '<form action ="' . $app->getBaseURL() . '/localtime?time=' . $time . '" method="post" >';
$output .= '<p>' . L10n::t('Please select your timezone:') . '</p>'; $output .= '<p>' . L10n::t('Please select your timezone:') . '</p>';
$output .= Temporal::getTimezoneSelect(defaults($_REQUEST, 'timezone', Installer::DEFAULT_TZ)); $output .= Temporal::getTimezoneSelect(defaults($_REQUEST, 'timezone', Installer::DEFAULT_TZ));
$output .= '<input type="submit" name="submit" value="' . L10n::t('Submit') . '" /></form>'; $output .= '<input type="submit" name="submit" value="' . L10n::t('Submit') . '" /></form>';

3
src/Module/Magic.php
View File

@ -97,8 +97,7 @@ class Magic extends BaseModule
} else { } else {
$token = $j['token']; $token = $j['token'];
} }
$x = strpbrk($dest, '?&'); $args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
Logger::info('Redirecting', ['path' => $dest . $args]); Logger::info('Redirecting', ['path' => $dest . $args]);
System::externalRedirect($dest . $args); System::externalRedirect($dest . $args);

2
src/Protocol/Diaspora.php
View File

@ -1608,7 +1608,7 @@ class Diaspora
} }
if (self::isRedmatrix($contact["url"])) { if (self::isRedmatrix($contact["url"])) {
return $contact["url"] . "/?f=&mid=" . $guid; return $contact["url"] . "/?mid=" . $guid;
} }
if ($parent_guid != '') { if ($parent_guid != '') {