Move mod/nogroup to src/Module/Group

diff --git a/mod/nogroup.php b/mod/nogroup.php
deleted file mode 100644 (file)
index 20dbd23..0000000
--- a/mod/nogroup.php
+++ /dev/null
@@ -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');
-}

diff --git a/src/App/Router.php b/src/App/Router.php
index 34ca0df3dd1b19b05e92a33397c31790490e6960..6612936e1b250b7448880c5777f28bf3848d6d87 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -129,6 +129,7 @@ class Router
                $this->routeCollector->addRoute(['GET'],         '/magic',               Module\Magic::class);
                $this->routeCollector->addRoute(['GET'],         '/manifest',            Module\Manifest::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->addGroup('/oembed', function (RouteCollector $collector) {
                        $collector->addRoute(['GET'], '/[b2h|h2b]',                          Module\Oembed::class);

diff --git a/src/Module/Group.php b/src/Module/Group.php
index acc969c7e025f8bab6fe75bc4a043b1c8d77d502..d8d5fb1c592086e9e2574fb246fbdf8eb08a5992 100644 (file)
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -176,7 +176,9 @@ class Group extends BaseModule
 
                $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;
                        $nogroup = true;
                        $group = [