removed unused "f" parameter

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 816c2a18644827ae03153c71c6d3ec4b7f282189..74534fc37151b92008f7d22671ad18c49b87ee6e 100644 (file)
--- a/src/Model/Contact.php
+++ b/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'];

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 4ca6ca66bd29b563447c2066c7fc52d6330994f3..4261d62e7a5ee375e7b6c5e642dbe862cf0a0a4f 100644 (file)
--- a/src/Model/Profile.php
+++ b/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');

diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php
index 36eaa17ac87254df049785655b73c809d5671bf4..7af9cb8dad2d56970cc96cd0990b433b4c72f9d1 100644 (file)
--- a/src/Module/Debug/Localtime.php
+++ b/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>';

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 0722da3cd76c8c5c15162ba6876854e2276b7ce1..4cb3dc7328052df1f9fe89da9cb603b24c753267 100644 (file)
--- a/src/Module/Magic.php
+++ b/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);

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 9e074e8a9a1c3a0b820938151fe7d18ac9ce6dae..587b34c3fe3b4839927e52a536fb09042f39ef40 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/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 != '') {