Merge pull request #10953 from annando/bott-shrinked

[friendica.git] / src / App / Arguments.php

diff --git a/src/App/Arguments.php b/src/App/Arguments.php
index e2f60b1956529ad224fe49c7ab524992374c1a06..ae6c64a4f39715db1577e29a04d7ec7e294f659a 100644 (file)
--- a/src/App/Arguments.php
+++ b/src/App/Arguments.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -47,7 +47,7 @@ class Arguments
         */
        private $argc;
 
-       public function __construct(string $queryString = '', string $command = '', array $argv = [Module::DEFAULT], int $argc = 1)
+       public function __construct(string $queryString = '', string $command = '', array $argv = [], int $argc = 0)
        {
                $this->queryString = $queryString;
                $this->command     = $command;
@@ -56,7 +56,7 @@ class Arguments
        }
 
        /**
-        * @return string The whole query string of this call
+        * @return string The whole query string of this call with url-encoded query parameters
         */
        public function getQueryString()
        {
@@ -87,6 +87,17 @@ class Arguments
                return $this->argc;
        }
 
+       public function setArgv(array $argv)
+       {
+               $this->argv = $argv;
+               $this->argc = count($argv);
+       }
+
+       public function setArgc(int $argc)
+       {
+               $this->argc = $argc;
+       }
+
        /**
         * Returns the value of a argv key
         * @todo there are a lot of $a->argv usages in combination with ?? which can be replaced with this method
@@ -121,50 +132,27 @@ class Arguments
         */
        public function determine(array $server, array $get)
        {
-               $queryString = '';
-
-               if (!empty($server['QUERY_STRING']) && strpos($server['QUERY_STRING'], 'pagename=') === 0) {
-                       $queryString = urldecode(substr($server['QUERY_STRING'], 9));
-               } elseif (!empty($server['QUERY_STRING']) && strpos($server['QUERY_STRING'], 'q=') === 0) {
-                       $queryString = urldecode(substr($server['QUERY_STRING'], 2));
-               }
+               // removing leading / - maybe a nginx problem
+               $server['QUERY_STRING'] = ltrim($server['QUERY_STRING'] ?? '', '/');
 
-               // eventually strip ZRL
-               $queryString = $this->stripZRLs($queryString);
-
-               // eventually strip OWT
-               $queryString = $this->stripQueryParam($queryString, 'owt');
-
-               // removing trailing / - maybe a nginx problem
-               $queryString = ltrim($queryString, '/');
+               $queryParameters = [];
+               parse_str($server['QUERY_STRING'], $queryParameters);
 
                if (!empty($get['pagename'])) {
                        $command = trim($get['pagename'], '/\\');
+               } elseif (!empty($queryParameters['pagename'])) {
+                       $command = trim($queryParameters['pagename'], '/\\');
                } elseif (!empty($get['q'])) {
+                       // Legacy page name parameter, now conflicts with the search query parameter
                        $command = trim($get['q'], '/\\');
                } else {
-                       $command = Module::DEFAULT;
-               }
-
-
-               // fix query_string
-               if (!empty($command)) {
-                       $queryString = str_replace(
-                               $command . '&',
-                               $command . '?',
-                               $queryString
-                       );
-               }
-
-               // unix style "homedir"
-               if (substr($command, 0, 1) === '~') {
-                       $command = 'profile/' . substr($command, 1);
+                       $command = '';
                }
 
-               // Diaspora style profile url
-               if (substr($command, 0, 2) === 'u/') {
-                       $command = 'profile/' . substr($command, 2);
-               }
+               // Remove generated and one-time use parameters
+               unset($queryParameters['pagename']);
+               unset($queryParameters['zrl']);
+               unset($queryParameters['owt']);
 
                /*
                 * Break the URL path into C style argc/argv style arguments for our
@@ -173,41 +161,17 @@ class Arguments
                 *   [0] => 'module'
                 *   [1] => 'arg1'
                 *   [2] => 'arg2'
-                *
-                *
-                * There will always be one argument. If provided a naked domain
-                * URL, $this->argv[0] is set to "home".
                 */
+               if ($command) {
+                       $argv = explode('/', $command);
+               } else {
+                       $argv = [];
+               }
 
-               $argv = explode('/', $command);
                $argc = count($argv);
 
+               $queryString = $command . ($queryParameters ? '?' . http_build_query($queryParameters) : '');
 
                return new Arguments($queryString, $command, $argv, $argc);
        }
-
-       /**
-        * Strip zrl parameter from a string.
-        *
-        * @param string $queryString The input string.
-        *
-        * @return string The zrl.
-        */
-       public function stripZRLs(string $queryString)
-       {
-               return preg_replace('/[?&]zrl=(.*?)(&|$)/ism', '$2', $queryString);
-       }
-
-       /**
-        * Strip query parameter from a string.
-        *
-        * @param string $queryString The input string.
-        * @param string $param
-        *
-        * @return string The query parameter.
-        */
-       public function stripQueryParam(string $queryString, string $param)
-       {
-               return preg_replace('/[?&]' . $param . '=(.*?)(&|$)/ism', '$2', $queryString);
-       }
-}
\ No newline at end of file
+}