Merge remote-tracking branch 'origin/Nav-#3878' into Nav-#3878

[friendica.git] / mod / group.php

diff --git a/mod/group.php b/mod/group.php
index 71fca276a016e1a964dc105ed7e23d5473aa3b7b..ce091db8cd0e339eb2387a5d1d3138a7bfe9fe11 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -6,12 +6,16 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 function group_init(App $a) {
        if (local_user()) {
-               require_once 'include/group.php';
-               $a->page['aside'] = group_side('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
+               $a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
        }
 }
 
@@ -26,10 +30,10 @@ function group_post(App $a) {
                check_form_security_token_redirectOnErr('/group/new', 'group_edit');
 
                $name = notags(trim($_POST['groupname']));
-               $r = group_add(local_user(), $name);
+               $r = Group::create(local_user(), $name);
                if ($r) {
                        info(t('Group created.') . EOL);
-                       $r = group_byname(local_user(), $name);
+                       $r = Group::getIdByName(local_user(), $name);
                        if ($r) {
                                goaway(System::baseUrl() . '/group/' . $r);
                        }
@@ -47,7 +51,7 @@ function group_post(App $a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        notice(t('Group not found.') . EOL);
                        goaway(System::baseUrl() . '/contacts');
                        return; // NOTREACHED
@@ -66,7 +70,7 @@ function group_post(App $a) {
                        }
                }
 
-               $a->page['aside'] = group_side();
+               $a->page['aside'] = Group::sidebarWidget();
        }
        return;
 }
@@ -81,27 +85,24 @@ function group_content(App $a) {
 
        // Switch to text mode interface if we have more than 'n' contacts or group members
 
-       $switchtotext = get_pconfig(local_user(), 'system', 'groupedit_image_limit');
-       if ($switchtotext === false) {
-               $switchtotext = get_config('system', 'groupedit_image_limit');
-       }
-       if ($switchtotext === false) {
-               $switchtotext = 400;
+       $switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
+       if (is_null($switchtotext)) {
+               $switchtotext = Config::get('system', 'groupedit_image_limit', 400);
        }
 
        $tpl = get_markup_template('group_edit.tpl');
 
-       $context = array(
+       $context = [
                        '$submit' => t('Save Group'),
-       );
+       ];
 
        if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-               return replace_macros($tpl, $context + array(
+               return replace_macros($tpl, $context + [
                        '$title' => t('Create a group of contacts/friends.'),
-                       '$gname' => array('groupname', t('Group Name: '), '', ''),
+                       '$gname' => ['groupname', t('Group Name: '), '', ''],
                        '$gid' => 'new',
                        '$form_security_token' => get_form_security_token("group_edit"),
-               ));
+               ]);
 
 
        }
@@ -117,8 +118,8 @@ function group_content(App $a) {
 
                        $result = null;
 
-                       if (dbm::is_result($r)) {
-                               $result = group_rmv(local_user(), $r[0]['name']);
+                       if (DBM::is_result($r)) {
+                               $result = Group::removeByName(local_user(), $r[0]['name']);
                        }
 
                        if ($result) {
@@ -138,7 +139,7 @@ function group_content(App $a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $change = intval($a->argv[2]);
                }
        }
@@ -152,15 +153,15 @@ function group_content(App $a) {
                        intval(local_user())
                );
 
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        notice(t('Group not found.') . EOL);
                        goaway(System::baseUrl() . '/contacts');
                }
 
                $group = $r[0];
-               $members = group_get_members($group['id']);
-               $preselected = array();
-               $entry = array();
+               $members = Contact::getByGroupId($group['id']);
+               $preselected = [];
+               $entry = [];
                $id = 0;
 
                if (count($members)) {
@@ -171,13 +172,13 @@ function group_content(App $a) {
 
                if ($change) {
                        if (in_array($change, $preselected)) {
-                               group_rmv_member(local_user(), $group['name'], $change);
+                               Group::removeMember($group['id'], $change);
                        } else {
-                               group_add_member(local_user(), $group['name'], $change);
+                               Group::addMember($group['id'], $change);
                        }
 
-                       $members = group_get_members($group['id']);
-                       $preselected = array();
+                       $members = Contact::getByGroupId($group['id']);
+                       $preselected = [];
                        if (count($members)) {
                                foreach ($members as $member) {
                                        $preselected[] = $member['id'];
@@ -186,21 +187,21 @@ function group_content(App $a) {
                }
 
                $drop_tpl = get_markup_template('group_drop.tpl');
-               $drop_txt = replace_macros($drop_tpl, array(
+               $drop_txt = replace_macros($drop_tpl, [
                        '$id' => $group['id'],
                        '$delete' => t('Delete Group'),
                        '$form_security_token' => get_form_security_token("group_drop"),
-               ));
+               ]);
 
 
-               $context = $context + array(
+               $context = $context + [
                        '$title' => t('Group Editor'),
-                       '$gname' => array('groupname', t('Group Name: '), $group['name'], ''),
+                       '$gname' => ['groupname', t('Group Name: '), $group['name'], ''],
                        '$gid' => $group['id'],
                        '$drop' => $drop_txt,
                        '$form_security_token' => get_form_security_token('group_edit'),
                        '$edit_name' => t('Edit Group Name')
-               );
+               ];
 
        }
 
@@ -208,13 +209,13 @@ function group_content(App $a) {
                return;
        }
 
-       $groupeditor = array(
+       $groupeditor = [
                'label_members' => t('Members'),
-               'members' => array(),
+               'members' => [],
                'label_contacts' => t('All Contacts'),
                'group_is_empty' => t('Group is empty'),
-               'contacts' => array(),
-       );
+               'contacts' => [],
+       ];
 
        $sec_token = addslashes(get_form_security_token('group_member_change'));
 
@@ -224,16 +225,16 @@ function group_content(App $a) {
                        $entry = _contact_detail_for_template($member);
                        $entry['label'] = 'members';
                        $entry['photo_menu'] = '';
-                       $entry['change_member'] = array(
+                       $entry['change_member'] = [
                                'title'     => t("Remove Contact"),
                                'gid'       => $group['id'],
                                'cid'       => $member['id'],
                                'sec_token' => $sec_token
-                       );
+                       ];
 
                        $groupeditor['members'][] = $entry;
                } else {
-                       group_rmv_member(local_user(), $group['name'], $member['id']);
+                       Group::removeMember($group['id'], $member['id']);
                }
        }
 
@@ -241,19 +242,19 @@ function group_content(App $a) {
                intval(local_user())
        );
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                // Format the data of the contacts who aren't in the contact group
                foreach ($r as $member) {
                        if (! in_array($member['id'], $preselected)) {
                                $entry = _contact_detail_for_template($member);
                                $entry['label'] = 'contacts';
                                $entry['photo_menu'] = '';
-                               $entry['change_member'] = array(
+                               $entry['change_member'] = [
                                        'title'     => t("Add Contact"),
                                        'gid'       => $group['id'],
                                        'cid'       => $member['id'],
                                        'sec_token' => $sec_token
-                               );
+                               ];
 
                                $groupeditor['contacts'][] = $entry;
                        }