clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Completely removed argc/argv

Browse Source
This commit is contained in:
Michael
2021-07-25 15:23:37 +00:00
parent 540ddb9265
commit df558d4056
18 changed files with 70 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Module/Diaspora/Fetch.php
View File

@@ -40,15 +40,11 @@ class Fetch extends BaseModule
{
public static function rawContent(array $parameters = [])
{
$app = DI::app();
// @TODO: Replace with parameter from router
if (($app->argc != 3) || (!in_array($app->argv[1], ["post", "status_message", "reshare"]))) {
if (empty($parameters['guid'])) {
throw new HTTPException\NotFoundException();
}
// @TODO: Replace with parameter from router
$guid = $app->argv[2];
$guid = $parameters['guid'];
// Fetch the item
$fields = [
@@ -68,7 +64,7 @@ class Fetch extends BaseModule
$host = $parts["scheme"] . "://" . $parts["host"];
if (Strings::normaliseLink($host) != Strings::normaliseLink(DI::baseUrl()->get())) {
$location = $host . "/fetch/" . $app->argv[1] . "/" . urlencode($guid);
$location = $host . "/fetch/" . DI::args()->getArgv()[1] . "/" . urlencode($guid);
System::externalRedirect($location, 301);
}
}