]> git.mxchange.org Git - friendica.git/blobdiff - src/Module/Group.php
Merge pull request #11003 from annando/fix-api
[friendica.git] / src / Module / Group.php
index b3fe1ba53b04751948329f21921d48c1d3be689b..1750d3e04f7b2581d4517cf309af882de69358ed 100644 (file)
@@ -1,69 +1,80 @@
 <?php
 /**
- * @file src/Module/Group.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 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();
 
-               if ($a->isAjax()) {
+               if (DI::mode()->isAjax()) {
                        self::ajaxPost();
                }
 
                if (!local_user()) {
-                       notice(L10n::t('Permission denied.'));
+                       notice(DI::l10n()->t('Permission denied.'));
                        DI::baseUrl()->redirect();
                }
 
                // @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) {
-                               info(L10n::t('Group created.'));
                                $r = Model\Group::getIdByName(local_user(), $name);
                                if ($r) {
                                        DI::baseUrl()->redirect('group/' . $r);
                                }
                        } else {
-                               notice(L10n::t('Could not create group.'));
+                               notice(DI::l10n()->t('Could not create group.'));
                        }
                        DI::baseUrl()->redirect('group');
                }
 
                // @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(L10n::t('Group not found.'));
+                               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)) {
-                                       info(L10n::t('Group name changed.'));
+                               if (!Model\Group::update($group['id'], $groupname)) {
+                                       notice(DI::l10n()->t('Group name was not changed.'));
                                }
                        }
                }
@@ -75,51 +86,51 @@ class Group extends BaseModule
                        $a = DI::app();
 
                        if (!local_user()) {
-                               throw new \Exception(L10n::t('Permission denied.'), 403);
+                               throw new \Exception(DI::l10n()->t('Permission denied.'), 403);
                        }
 
                        // 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(L10n::t('Unknown group.'), 404);
+                                       throw new \Exception(DI::l10n()->t('Unknown group.'), 404);
                                }
 
                                $contact = DBA::selectFirst('contact', ['deleted'], ['id' => $contact_id, 'uid' => local_user()]);
                                if (!DBA::isResult($contact)) {
-                                       throw new \Exception(L10n::t('Contact not found.'), 404);
+                                       throw new \Exception(DI::l10n()->t('Contact not found.'), 404);
                                }
 
                                if ($contact['deleted']) {
-                                       throw new \Exception(L10n::t('Contact is deleted.'), 410);
+                                       throw new \Exception(DI::l10n()->t('Contact is deleted.'), 410);
                                }
 
                                switch($command) {
                                        case 'add':
                                                if (!Model\Group::addMember($group_id, $contact_id)) {
-                                                       throw new \Exception(L10n::t('Unable to add the contact to the group.'), 500);
+                                                       throw new \Exception(DI::l10n()->t('Unable to add the contact to the group.'), 500);
                                                }
 
-                                               $message = L10n::t('Contact successfully added to group.');
+                                               $message = DI::l10n()->t('Contact successfully added to group.');
                                                break;
                                        case 'remove':
                                                if (!Model\Group::removeMember($group_id, $contact_id)) {
-                                                       throw new \Exception(L10n::t('Unable to remove the contact from the group.'), 500);
+                                                       throw new \Exception(DI::l10n()->t('Unable to remove the contact from the group.'), 500);
                                                }
 
-                                               $message = L10n::t('Contact successfully removed from group.');
+                                               $message = DI::l10n()->t('Contact successfully removed from group.');
                                                break;
                                        default:
-                                               throw new \Exception(L10n::t('Unknown group command.'), 400);
+                                               throw new \Exception(DI::l10n()->t('Unknown group command.'), 400);
                                }
                        } else {
-                               throw new \Exception(L10n::t('Bad request.'), 400);
+                               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());
@@ -127,7 +138,7 @@ class Group extends BaseModule
                }
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                $change = false;
 
@@ -137,33 +148,33 @@ class Group extends BaseModule
 
                $a = DI::app();
 
-               $a->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');
                }
 
                // Switch to text mode interface if we have more than 'n' contacts or group members
-               $switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
+               $switchtotext = DI::pConfig()->get(local_user(), 'system', 'groupedit_image_limit');
                if (is_null($switchtotext)) {
-                       $switchtotext = Config::get('system', 'groupedit_image_limit', 200);
+                       $switchtotext = DI::config()->get('system', 'groupedit_image_limit', 200);
                }
 
                $tpl = Renderer::getMarkupTemplate('group_edit.tpl');
 
 
                $context = [
-                       '$submit' => L10n::t('Save Group'),
-                       '$submit_filter' => L10n::t('Filter'),
+                       '$submit' => DI::l10n()->t('Save Group'),
+                       '$submit_filter' => DI::l10n()->t('Filter'),
                ];
 
                // @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' => L10n::t('Create a group of contacts/friends.'),
-                               '$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
+                               '$title' => DI::l10n()->t('Create a group of contacts/friends.'),
+                               '$gname' => ['groupname', DI::l10n()->t('Group Name: '), '', ''],
                                '$gid' => 'new',
                                '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"),
                        ]);
@@ -172,13 +183,13 @@ 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 = [
                                'id' => $id,
-                               'name' => L10n::t('Contacts not in any group'),
+                               'name' => DI::l10n()->t('Contacts not in any group'),
                        ];
 
                        $members = [];
@@ -186,50 +197,48 @@ class Group extends BaseModule
 
                        $context = $context + [
                                '$title' => $group['name'],
-                               '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+                               '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''],
                                '$gid' => $id,
                                '$editable' => 0,
                        ];
                }
 
                // @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())) {
-                                       notice(L10n::t('Group not found.'));
+                       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])) {
-                                       info(L10n::t('Group removed.'));
-                               } else {
-                                       notice(L10n::t('Unable to remove group.'));
+                               if (!Model\Group::remove(DI::args()->getArgv()[2])) {
+                                       notice(DI::l10n()->t('Unable to remove group.'));
                                }
                        }
                        DI::baseUrl()->redirect('group');
                }
 
                // @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(L10n::t('Group not found.'));
+                               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)) {
@@ -245,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) {
@@ -257,17 +266,17 @@ class Group extends BaseModule
                        $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
                        $drop_txt = Renderer::replaceMacros($drop_tpl, [
                                '$id' => $group['id'],
-                               '$delete' => L10n::t('Delete Group'),
+                               '$delete' => DI::l10n()->t('Delete Group'),
                                '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
                        ]);
 
                        $context = $context + [
                                '$title' => $group['name'],
-                               '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+                               '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''],
                                '$gid' => $group['id'],
                                '$drop' => $drop_txt,
                                '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
-                               '$edit_name' => L10n::t('Edit Group Name'),
+                               '$edit_name' => DI::l10n()->t('Edit Group Name'),
                                '$editable' => 1,
                        ];
                }
@@ -277,10 +286,10 @@ class Group extends BaseModule
                }
 
                $groupeditor = [
-                       'label_members' => L10n::t('Members'),
+                       'label_members' => DI::l10n()->t('Members'),
                        'members' => [],
-                       'label_contacts' => L10n::t('All Contacts'),
-                       'group_is_empty' => L10n::t('Group is empty'),
+                       'label_contacts' => DI::l10n()->t('All Contacts'),
+                       'group_is_empty' => DI::l10n()->t('Group is empty'),
                        'contacts' => [],
                ];
 
@@ -293,7 +302,7 @@ class Group extends BaseModule
                                $entry['label'] = 'members';
                                $entry['photo_menu'] = '';
                                $entry['change_member'] = [
-                                       'title'     => L10n::t("Remove contact from group"),
+                                       'title'     => DI::l10n()->t("Remove contact from group"),
                                        'gid'       => $group['id'],
                                        'cid'       => $member['id'],
                                        'sec_token' => $sec_token
@@ -306,14 +315,15 @@ 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);
-                       $context['$desc'] = L10n::t('Click on a contact to add or remove.');
+                       $context['$desc'] = DI::l10n()->t('Click on a contact to add or remove.');
                }
 
                if (DBA::isResult($contacts)) {
@@ -327,7 +337,7 @@ class Group extends BaseModule
 
                                        if (!$nogroup) {
                                                $entry['change_member'] = [
-                                                       'title'     => L10n::t("Add contact to group"),
+                                                       'title'     => DI::l10n()->t("Add contact to group"),
                                                        'gid'       => $group['id'],
                                                        'cid'       => $member['id'],
                                                        'sec_token' => $sec_token