Group selection: Respect "pubmail" and ignore atchived or blocked contacts

[friendica.git] / src / Module / Group.php

diff --git a/src/Module/Group.php b/src/Module/Group.php
index eb1389d799e33d5c27d2d15f1264306ba0dd5cba..4c7672c01a7285d855547028cfb8072f7fd9c0be 100644 (file)
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -19,7 +19,7 @@ require_once 'boot.php';
 
 class Group extends BaseModule
 {
-       public static function post()
+       public static function post(array $parameters = [])
        {
                $a = self::getApp();
 
@@ -132,12 +132,12 @@ class Group extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
                $change = false;
 
                if (!local_user()) {
-                       System::httpExit(403);
+                       throw new \Friendica\Network\HTTPException\ForbiddenException();
                }
 
                $a = self::getApp();
@@ -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 = [
@@ -276,7 +278,7 @@ class Group extends BaseModule
                }
 
                if (!isset($group)) {
-                       System::httpExit(400);
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
 
                $groupeditor = [