X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=fcdc6a75823b682516595b78d4f3056c1300ab92;hb=777c47aaa697ff46cf554fb4f36d0c252ae42e94;hp=aa4751961775d8da4055133c173a3760cd5e93d7;hpb=d5a13b1e4c0f35445aa539ff6b3779062907a9cb;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index aa47519617..fcdc6a7582 100644
--- 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,20 @@ function group_content(&$a) {
 		return;
 	}
 
-	if(($a->argc == 2) && ($a->argv[1] == 'new')) {
+	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
 		$tpl = load_view_file('view/group_new.tpl');
 		$o .= replace_macros($tpl,array());
 		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,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 );
@@ -136,12 +137,14 @@ function group_content(&$a) {
 			'$delete' => t('Delete')
 		));
 
+		$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)
 		));
 
 	}