Merge pull request #11003 from annando/fix-api

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

diff --git a/src/Module/Group.php b/src/Module/Group.php
index d5f1fc8ef8430bee958096997dd5b7ae26532355..1750d3e04f7b2581d4517cf309af882de69358ed 100644 (file)
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,13 +27,12 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
-use Friendica\Util\Strings;
 
 require_once 'boot.php';
 
 class Group extends BaseModule
 {
-       public static function post(array $parameters = [])
+       public function post()
        {
                $a = DI::app();
 
@@ -47,10 +46,10 @@ class Group extends BaseModule
                }
 
                // @TODO: Replace with parameter from router
-               if (($a->argc == 2) && ($a->argv[1] === 'new')) {
+               if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
 
-                       $name = Strings::escapeTags(trim($_POST['groupname']));
+                       $name = trim($_POST['groupname']);
                        $r = Model\Group::create(local_user(), $name);
                        if ($r) {
                                $r = Model\Group::getIdByName(local_user(), $name);
@@ -64,15 +63,15 @@ class Group extends BaseModule
                }
 
                // @TODO: Replace with parameter from router
-               if (($a->argc == 2) && intval($a->argv[1])) {
+               if ((DI::args()->getArgc() == 2) && intval(DI::args()->getArgv()[1])) {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit');
 
-                       $group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user()]);
+                       $group = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => local_user()]);
                        if (!DBA::isResult($group)) {
                                notice(DI::l10n()->t('Group not found.'));
                                DI::baseUrl()->redirect('contact');
                        }
-                       $groupname = Strings::escapeTags(trim($_POST['groupname']));
+                       $groupname = trim($_POST['groupname']);
                        if (strlen($groupname) && ($groupname != $group['name'])) {
                                if (!Model\Group::update($group['id'], $groupname)) {
                                        notice(DI::l10n()->t('Group name was not changed.'));
@@ -93,8 +92,8 @@ class Group extends BaseModule
                        // POST /group/123/add/123
                        // POST /group/123/remove/123
                        // @TODO: Replace with parameter from router
-                       if ($a->argc == 4) {
-                               list($group_id, $command, $contact_id) = array_slice($a->argv, 1);
+                       if (DI::args()->getArgc() == 4) {
+                               list($group_id, $command, $contact_id) = array_slice(DI::args()->getArgv(), 1);
 
                                if (!Model\Group::exists($group_id, local_user())) {
                                        throw new \Exception(DI::l10n()->t('Unknown group.'), 404);
@@ -131,7 +130,7 @@ class Group extends BaseModule
                                throw new \Exception(DI::l10n()->t('Bad request.'), 400);
                        }
 
-                       notice($message);
+                       info($message);
                        System::jsonExit(['status' => 'OK', 'message' => $message]);
                } catch (\Exception $e) {
                        notice($e->getMessage());
@@ -139,7 +138,7 @@ class Group extends BaseModule
                }
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                $change = false;
 
@@ -149,11 +148,11 @@ class Group extends BaseModule
 
                $a = DI::app();
 
-               DI::page()['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
+               DI::page()['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : 'everyone'));
 
                // With no group number provided we jump to the unassigned contacts as a starting point
                // @TODO: Replace with parameter from router
-               if ($a->argc == 1) {
+               if (DI::args()->getArgc() == 1) {
                        DI::baseUrl()->redirect('group/none');
                }
 
@@ -172,7 +171,7 @@ class Group extends BaseModule
                ];
 
                // @TODO: Replace with parameter from router
-               if (($a->argc == 2) && ($a->argv[1] === 'new')) {
+               if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) {
                        return Renderer::replaceMacros($tpl, $context + [
                                '$title' => DI::l10n()->t('Create a group of contacts/friends.'),
                                '$gname' => ['groupname', DI::l10n()->t('Group Name: '), '', ''],
@@ -184,8 +183,8 @@ class Group extends BaseModule
                $nogroup = false;
 
                // @TODO: Replace with parameter from router
-               if (($a->argc == 2) && ($a->argv[1] === 'none') ||
-                       ($a->argc == 1) && ($a->argv[0] === 'nogroup')) {
+               if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'none') ||
+                       (DI::args()->getArgc() == 1) && (DI::args()->getArgv()[0] === 'nogroup')) {
                        $id = -1;
                        $nogroup = true;
                        $group = [
@@ -205,17 +204,17 @@ class Group extends BaseModule
                }
 
                // @TODO: Replace with parameter from router
-               if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
+               if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop')) {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't');
 
                        // @TODO: Replace with parameter from router
-                       if (intval($a->argv[2])) {
-                               if (!Model\Group::exists($a->argv[2], local_user())) {
+                       if (intval(DI::args()->getArgv()[2])) {
+                               if (!Model\Group::exists(DI::args()->getArgv()[2], local_user())) {
                                        notice(DI::l10n()->t('Group not found.'));
                                        DI::baseUrl()->redirect('contact');
                                }
 
-                               if (!Model\Group::remove($a->argv[2])) {
+                               if (!Model\Group::remove(DI::args()->getArgv()[2])) {
                                        notice(DI::l10n()->t('Unable to remove group.'));
                                }
                        }
@@ -223,23 +222,23 @@ class Group extends BaseModule
                }
 
                // @TODO: Replace with parameter from router
-               if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+               if ((DI::args()->getArgc() > 2) && intval(DI::args()->getArgv()[1]) && intval(DI::args()->getArgv()[2])) {
                        BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't');
 
-                       if (DBA::exists('contact', ['id' => $a->argv[2], 'uid' => local_user(), 'self' => false, 'pending' => false, 'blocked' => false])) {
-                               $change = intval($a->argv[2]);
+                       if (DBA::exists('contact', ['id' => DI::args()->getArgv()[2], 'uid' => local_user(), 'self' => false, 'pending' => false, 'blocked' => false])) {
+                               $change = intval(DI::args()->getArgv()[2]);
                        }
                }
 
                // @TODO: Replace with parameter from router
-               if (($a->argc > 1) && intval($a->argv[1])) {
-                       $group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user(), 'deleted' => false]);
+               if ((DI::args()->getArgc() > 1) && intval(DI::args()->getArgv()[1])) {
+                       $group = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => local_user(), 'deleted' => false]);
                        if (!DBA::isResult($group)) {
                                notice(DI::l10n()->t('Group not found.'));
                                DI::baseUrl()->redirect('contact');
                        }
 
-                       $members = Model\Contact::getByGroupId($group['id']);
+                       $members = Model\Contact\Group::getById($group['id']);
                        $preselected = [];
 
                        if (count($members)) {
@@ -255,7 +254,7 @@ class Group extends BaseModule
                                        Model\Group::addMember($group['id'], $change);
                                }
 
-                               $members = Model\Contact::getByGroupId($group['id']);
+                               $members = Model\Contact\Group::getById($group['id']);
                                $preselected = [];
                                if (count($members)) {
                                        foreach ($members as $member) {
@@ -316,10 +315,11 @@ class Group extends BaseModule
                }
 
                if ($nogroup) {
-                       $contacts = Model\Contact::getUngroupedList(local_user());
+                       $contacts = Model\Contact\Group::listUngrouped(local_user());
                } else {
                        $contacts_stmt = DBA::select('contact', [],
-                               ['uid' => local_user(), 'pending' => false, 'blocked' => false, 'self' => false],
+                               ['rel' => [Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING],
+                               'uid' => local_user(), 'pending' => false, 'blocked' => false, 'failed' => false, 'self' => false],
                                ['order' => ['name']]
                        );
                        $contacts = DBA::toArray($contacts_stmt);