bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #7077 from nupplaphil/task/mod_nogroup

Browse source 
Move mod/nogroup to src/Module/Group
This commit is contained in:
Hypolite Petovan 2019-05-03 08:54:04 -04:00 committed by GitHub
parent c9cce8492e 1ef4b9c7e4
commit 41401bb18d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mod/nogroup.php
View file

@ -1,23 +0,0 @@
<?php
/**
* @file mod/nogroup.php
*/
use Friendica\App;
use Friendica\Core\L10n;
function nogroup_init(App $a)
{
if (! local_user()) {
return;
}
}
function nogroup_content(App $a)
{
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return '';
}
$a->internalRedirect('group/none');
}

1
src/App/Router.php
View file

@ -129,6 +129,7 @@ class Router
$this->routeCollector->addRoute(['GET'], '/magic', Module\Magic::class); $this->routeCollector->addRoute(['GET'], '/magic', Module\Magic::class);
$this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class); $this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class);
$this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class); $this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class);
$this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class);
$this->routeCollector->addRoute(['GET'], '/objects/{guid}', Module\Objects::class); $this->routeCollector->addRoute(['GET'], '/objects/{guid}', Module\Objects::class);
$this->routeCollector->addGroup('/oembed', function (RouteCollector $collector) { $this->routeCollector->addGroup('/oembed', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/[b2h|h2b]', Module\Oembed::class); $collector->addRoute(['GET'], '/[b2h|h2b]', Module\Oembed::class);

4
src/Module/Group.php
View file

@ -176,7 +176,9 @@ class Group extends BaseModule
$nogroup = false; $nogroup = false;
if (($a->argc == 2) && ($a->argv[1] === 'none')) { // @TODO: Replace with parameter from router
if (($a->argc == 2) && ($a->argv[1] === 'none') ||
($a->argc == 1) && ($a->argv[0] === 'nogroup')) {
$id = -1; $id = -1;
$nogroup = true; $nogroup = true;
$group = [ $group = [