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

diff --git a/mod/group.php b/mod/group.php
index a3bd750f90..fcdc6a7582 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -5,9 +5,10 @@ function validate_members(&$item) {
 }
 
 function group_init(&$a) {
-	require_once('include/group.php');
-	$a->page['aside'] = group_side();
-
+	if(local_user()) {
+		require_once('include/group.php');
+		$a->page['aside'] = group_side();
+	}
 }
 
 
@@ -19,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($_SESSION['uid'],$name);
+		$r = group_add(local_user(),$name);
 		if($r) {
 			notice( t('Group created.') . EOL );
-			$r = group_byname($_SESSION['uid'],$name);
+			$r = group_byname(local_user(),$name);
 			if($r)
 				goaway($a->get_baseurl() . '/group/' . $r);
 		}
@@ -36,35 +37,37 @@ 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($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(! count($r)) {
 			notice( t('Group not found.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
+			return; // NOTREACHED
 		}
 		$group = $r[0];
 		$groupname = notags(trim($_POST['groupname']));
 		if((strlen($groupname))  && ($groupname != $group['name'])) {
 			$r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
 				dbesc($groupname),
-				intval($_SESSION['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($_SESSION['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($_SESSION['uid']),
+					intval(local_user()),
 					intval($group['id']),
 					intval($member)
 				);
@@ -74,9 +77,9 @@ function group_post(&$a) {
 		}
 		if($result)
 			notice( t('Membership list updated.') . EOL);
-	$a->page['aside'] = group_side();
+		$a->page['aside'] = group_side();
 	}
-	
+	return;	
 }
 
 function group_content(&$a) {
@@ -86,22 +89,20 @@ 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());
+		return $o;
 	}
-		
-	if(($a->argc == 3) && ($a->argv[1] == 'drop')) {
-		if(intval($argv[2])) {
+
+	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($argv[2]),
-				intval($_SESSION['uid'])
+				intval($a->argv[2]),
+				intval(local_user())
 			);
 			if(count($r)) 
-				$result = group_rmv($_SESSION['uid'],$r[0]['name']);
+				$result = group_rmv(local_user(),$r[0]['name']);
 			if($result)
 				notice( t('Group removed.') . EOL);
 			else
@@ -113,13 +114,13 @@ 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($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(! count($r)) {
-			notice( t("Group not found.") . EOL );
+			notice( t('Group not found.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 		}
 		$group = $r[0];
@@ -130,26 +131,23 @@ function group_content(&$a) {
 				$preselected[] = $p['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)
 		));
 
 	}
-
-
-
-
-
 	return $o;
 
 }
\ No newline at end of file