Merge branch 'chriscase-master'

[friendica.git] / mod / group.php

diff --git a/mod/group.php b/mod/group.php
index 56c3e21d1e0ae372598a9cfeb849a194c3423b27..fcdc6a75823b682516595b78d4f3056c1300ab92 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -22,10 +22,10 @@ function group_post(&$a) {
 
        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)
                                );
@@ -98,10 +99,10 @@ function group_content(&$a) {
                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,10 +114,10 @@ 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 );