Browse Source

removed unused "f" parameter

pull/7678/head
Michael 2 years ago
parent
commit
5eeca432fe
  1. 2
      src/Model/Contact.php
  2. 2
      src/Model/Profile.php
  3. 2
      src/Module/Debug/Localtime.php
  4. 3
      src/Module/Magic.php
  5. 2
      src/Protocol/Diaspora.php

2
src/Model/Contact.php

@ -1214,7 +1214,7 @@ class Contact extends BaseObject
}
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'];

2
src/Model/Profile.php

@ -1087,7 +1087,7 @@ class Profile
$basepath = Contact::getBasepath($contact['url']);
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
$serverret = Network::curl($basepath . '/magic');

2
src/Module/Debug/Localtime.php

@ -39,7 +39,7 @@ class Localtime extends BaseModule
$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 .= Temporal::getTimezoneSelect(defaults($_REQUEST, 'timezone', Installer::DEFAULT_TZ));
$output .= '<input type="submit" name="submit" value="' . L10n::t('Submit') . '" /></form>';

3
src/Module/Magic.php

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

2
src/Protocol/Diaspora.php

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

Loading…
Cancel
Save