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 545ccea2c7fd36dd3c3f7430d4045f28566bf57d..ce091db8cd0e339eb2387a5d1d3138a7bfe9fe11 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -15,7 +15,6 @@ use Friendica\Model\Group;
 
 function group_init(App $a) {
        if (local_user()) {
-               require_once 'include/group.php';
                $a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
        }
 }
@@ -93,17 +92,17 @@ function group_content(App $a) {
 
        $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"),
-               ));
+               ]);
 
 
        }
@@ -161,8 +160,8 @@ function group_content(App $a) {
 
                $group = $r[0];
                $members = Contact::getByGroupId($group['id']);
-               $preselected = array();
-               $entry = array();
+               $preselected = [];
+               $entry = [];
                $id = 0;
 
                if (count($members)) {
@@ -175,11 +174,11 @@ function group_content(App $a) {
                        if (in_array($change, $preselected)) {
                                Group::removeMember($group['id'], $change);
                        } else {
-                               Group::create_member(local_user(), $group['name'], $change);
+                               Group::addMember($group['id'], $change);
                        }
 
                        $members = Contact::getByGroupId($group['id']);
-                       $preselected = array();
+                       $preselected = [];
                        if (count($members)) {
                                foreach ($members as $member) {
                                        $preselected[] = $member['id'];
@@ -188,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')
-               );
+               ];
 
        }
 
@@ -210,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'));
 
@@ -226,12 +225,12 @@ 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 {
@@ -250,12 +249,12 @@ function group_content(App $a) {
                                $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;
                        }