X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FArguments.php;h=4d386fc2551d2c5138e80db4e4fca53872fbcd7d;hb=1138abe9237b9db1cf8a0ac7925de9bb55923cdb;hp=de3fecf9edbe476e92f6d2976304c10f2244f94e;hpb=c6b45a958e3b09bc8f3950a718c181dfc9e0b910;p=friendica.git diff --git a/src/App/Arguments.php b/src/App/Arguments.php index de3fecf9ed..4d386fc255 100644 --- a/src/App/Arguments.php +++ b/src/App/Arguments.php @@ -1,6 +1,6 @@ queryString = $queryString; $this->command = $command; + $this->moduleName = $moduleName; $this->argv = $argv; $this->argc = $argc; + $this->method = $method; } /** @@ -71,6 +83,14 @@ class Arguments return $this->command; } + /** + * @return string The module name based on the arguments + */ + public function getModuleName(): string + { + return $this->moduleName; + } + /** * @return array All arguments of this call */ @@ -79,6 +99,14 @@ class Arguments return $this->argv; } + /** + * @return string The used HTTP method + */ + public function getMethod() + { + return $this->method; + } + /** * @return int The count of arguments of this call */ @@ -87,6 +115,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 @@ -161,6 +200,20 @@ class Arguments $queryString = $command . ($queryParameters ? '?' . http_build_query($queryParameters) : ''); - return new Arguments($queryString, $command, $argv, $argc); + if ($argc > 0) { + $module = str_replace('.', '_', $argv[0]); + $module = str_replace('-', '_', $module); + } else { + $module = self::DEFAULT_MODULE; + } + + // Compatibility with the Firefox App + if (($module == "users") && ($command == "users/sign_in")) { + $module = "login"; + } + + $httpMethod = in_array($server['REQUEST_METHOD'] ?? '', Router::ALLOWED_METHODS) ? $server['REQUEST_METHOD'] : Router::GET; + + return new Arguments($queryString, $command, $module, $argv, $argc, $httpMethod); } }