visual display of group members

[friendica.git] / mod / group.php

diff --git a/mod/group.php b/mod/group.php
index 201c61f2a234099a2374ecb3a4452893725a3dec..591c936271c5e5c93b1f79bfa7f34ace6b20f016 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -20,12 +20,12 @@ function group_post(&$a) {
                return;
        }
 
-       if(($a->argc == 2) && ($a->argv[1] == 'new')) {
+       if(($a->argc == 2) && ($a->argv[1] === 'new')) {
                $name = notags(trim($_POST['groupname']));
-               $r = group_add(get_uid(),$name);
+               $r = group_add(local_user(),$name);
                if($r) {
                        notice( t('Group created.') . EOL );
-                       $r = group_byname(get_uid(),$name);
+                       $r = group_byname(local_user(),$name);
                        if($r)
                                goaway($a->get_baseurl() . '/group/' . $r);
                }
@@ -37,7 +37,7 @@ function group_post(&$a) {
        if(($a->argc == 2) && (intval($a->argv[1]))) {
                $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($a->argv[1]),
-                       intval(get_uid())
+                       intval(local_user())
                );
                if(! count($r)) {
                        notice( t('Group not found.') . EOL );
@@ -49,24 +49,25 @@ function group_post(&$a) {
                if((strlen($groupname))  && ($groupname != $group['name'])) {
                        $r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
                                dbesc($groupname),
-                               intval(get_uid()),
+                               intval(local_user()),
                                intval($group['id'])
                        );
                        if($r)
                                notice( t('Group name changed.') . EOL );
                }
                $members = $_POST['group_members_select'];
-               array_walk($members,'validate_members');
+               if(is_array($members))
+                       array_walk($members,'validate_members');
                $r = q("DELETE FROM `group_member` WHERE `gid` = %d AND `uid` = %d",
                        intval($a->argv[1]),
-                       intval(get_uid())
+                       intval(local_user())
                );
                $result = true;
-               if(count($members)) {
+               if(is_array($members) && count($members)) {
                        foreach($members as $member) {
                                $r = q("INSERT INTO `group_member` ( `uid`, `gid`, `contact-id`)
                                        VALUES ( %d, %d, %d )",
-                                       intval(get_uid()),
+                                       intval(local_user()),
                                        intval($group['id']),
                                        intval($member)
                                );
@@ -88,20 +89,24 @@ function group_content(&$a) {
                return;
        }
 
-       if(($a->argc == 2) && ($a->argv[1] == 'new')) {
-               $tpl = file_get_contents('view/group_new.tpl');
-               $o .= replace_macros($tpl,array());
+       if(($a->argc == 2) && ($a->argv[1] === 'new')) {
+               $tpl = load_view_file('view/group_new.tpl');
+               $o .= replace_macros($tpl,array(
+                       '$desc' => t('Create a group of contacts/friends.'),
+                       '$name' => t('Group Name: '),
+                       '$submit' => t('Submit')
+                ));
                return $o;
        }
 
-       if(($a->argc == 3) && ($a->argv[1] == 'drop')) {
+       if(($a->argc == 3) && ($a->argv[1] === 'drop')) {
                if(intval($a->argv[2])) {
                        $r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($a->argv[2]),
-                               intval(get_uid())
+                               intval(local_user())
                        );
                        if(count($r)) 
-                               $result = group_rmv(get_uid(),$r[0]['name']);
+                               $result = group_rmv(local_user(),$r[0]['name']);
                        if($result)
                                notice( t('Group removed.') . EOL);
                        else
@@ -113,38 +118,51 @@ function group_content(&$a) {
 
 
        if(($a->argc == 2) && (intval($a->argv[1]))) {
-               require_once('view/acl_selectors.php');
+               require_once('include/acl_selectors.php');
                $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($a->argv[1]),
-                       intval(get_uid())
+                       intval(local_user())
                );
                if(! count($r)) {
                        notice( t('Group not found.') . EOL );
                        goaway($a->get_baseurl() . '/contacts');
                }
                $group = $r[0];
-               $ret = group_get_members($group['id']);
+               $members = group_get_members($group['id']);
                $preselected = array();
-               if(count($ret)) {
-                       foreach($ret as $p)
-                               $preselected[] = $p['id'];
+               if(count($members))     {
+                       foreach($members as $member)
+                               $preselected[] = $member['id'];
                }
 
-               $drop_tpl = file_get_contents('view/group_drop.tpl');
+               $drop_tpl = load_view_file('view/group_drop.tpl');
                $drop_txt = replace_macros($drop_tpl, array(
                        '$id' => $group['id'],
                        '$delete' => t('Delete')
                ));
 
-               $tpl = file_get_contents('view/group_edit.tpl');
+               $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
+               $tpl = load_view_file('view/group_edit.tpl');
                $o .= replace_macros($tpl, array(
                        '$gid' => $group['id'],
                        '$name' => $group['name'],
                        '$drop' => $drop_txt,
-                       '$selector' => contact_select('group_members_select','group_members_select',$preselected,25)
+                       '$selector' => contact_select('group_members_select','group_members_select',$preselected,25,false,$celeb),
+                       '$title' => t('Group Editor'),
+                       '$gname' => t('Group Name: '),
+                       '$members' => t('Members:'),
+                       '$submit' => t('Submit')
                ));
 
        }
+
+       $o .= '<div id="group-members">';
+       foreach($members as $member) {
+               $o .= micropro($member,true,'mpgroup');
+       }
+       $o .= '</div><div id="group-members-end"></div>';
+
        return $o;
 
 }
\ No newline at end of file