X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=fe29d39f1a810ae86eb6ec5ef66d630c7538831e;hb=1f76e5158bfc4c3b4a171eab08eacfd46d681cc2;hp=7ede242c087073b326a1d5de296d398d806cf00f;hpb=e0dbd2e8e4c1c4791502378e216b0eaf159e4067;p=friendica.git

diff --git a/include/group.php b/include/group.php
index 7ede242c08..fe29d39f1a 100644
--- a/include/group.php
+++ b/include/group.php
@@ -8,17 +8,17 @@ function group_add($uid,$name) {
 		$r = group_byname($uid,$name); // check for dups
 		if($r !== false) {
 
-			// This could be a problem. 
+			// This could be a problem.
 			// Let's assume we've just created a group which we once deleted
 			// all the old members are gone, but the group remains so we don't break any security
 			// access lists. What we're doing here is reviving the dead group, but old content which
-			// was restricted to this group may now be seen by the new group members. 
+			// was restricted to this group may now be seen by the new group members.
 
 			$z = q("SELECT * FROM `group` WHERE `id` = %d LIMIT 1",
 				intval($r)
 			);
 			if(count($z) && $z[0]['deleted']) {
-				$r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+				$r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s'",
 					intval($uid),
 					dbesc($name)
 				);
@@ -32,7 +32,7 @@ function group_add($uid,$name) {
 			dbesc($name)
 		);
 		$ret = $r;
-	}	
+	}
 	return $ret;
 }
 
@@ -87,7 +87,7 @@ function group_rmv($uid,$name) {
 		);
 
 		// remove group
-		$r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+		$r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s'",
 			intval($uid),
 			dbesc($name)
 		);
@@ -117,13 +117,13 @@ function group_rmv_member($uid,$name,$member) {
 		return false;
 	if(! ( $uid && $gid && $member))
 		return false;
-	$r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1 ",
+	$r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d",
 		intval($uid),
 		intval($gid),
 		intval($member)
 	);
 	return $r;
-	
+
 
 }
 
@@ -134,13 +134,13 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 	if((! $gid) || (! $uid) || (! $member))
 		return false;
 
-	$r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1",	
+	$r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1",
 		intval($uid),
 		intval($gid),
 		intval($member)
 	);
 	if(count($r))
-		return true;	// You might question this, but 
+		return true;	// You might question this, but
 				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
  	if(! count($r))
@@ -156,9 +156,11 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 function group_get_members($gid) {
 	$ret = array();
 	if(intval($gid)) {
-		$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member` 
-			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
-			WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
+		$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
+			INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
+			WHERE `gid` = %d AND `group_member`.`uid` = %d AND
+				NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				ORDER BY `contact`.`name` ASC ",
 			intval($gid),
 			intval(local_user())
 		);
@@ -171,14 +173,14 @@ function group_get_members($gid) {
 function group_public_members($gid) {
 	$ret = 0;
 	if(intval($gid)) {
-		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
-			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
-			WHERE `gid` = %d AND `group_member`.`uid` = %d 
+		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member`
+			INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
+			WHERE `gid` = %d AND `group_member`.`uid` = %d
 			AND  `contact`.`network` = '%s' AND `contact`.`notify` != '' ",
 			intval($gid),
 			intval(local_user()),
 			dbesc(NETWORK_OSTATUS)
-		);		
+		);
 		if(count($r))
 			$ret = count($r);
 	}
@@ -187,7 +189,7 @@ function group_public_members($gid) {
 
 
 function mini_group_select($uid,$gid = 0) {
-	
+
 	$grps = array();
 	$o = '';
 
@@ -205,7 +207,7 @@ function mini_group_select($uid,$gid = 0) {
 
 	$o = replace_macros(get_markup_template('group_selection.tpl'), array(
 		'$label' => t('Default privacy group for new contacts'),
-		'$groups' => $grps 
+		'$groups' => $grps
 	));
 	return $o;
 }
@@ -263,23 +265,25 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 			);
 		}
 	}
-	
-	
+
+
 	$tpl = get_markup_template("group_side.tpl");
 	$o = replace_macros($tpl, array(
 		'$title'		=> t('Groups'),
 		'$edittext'     => t('Edit group'),
 		'$createtext' 	=> t('Create a new group'),
+    '$creategroup' => t('Group Name: '),
+    '$form_security_token' => get_form_security_token("group_edit"),
 		'$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
 		'$groups'		=> $groups,
 		'$add'			=> t('add'),
 	));
-		
-	
+
+
 	return $o;
 }
 
-function expand_groups($a) {
+function expand_groups($a,$check_dead = false) {
 	if(! (is_array($a) && count($a)))
 		return array();
 	$groups = implode(',', $a);
@@ -289,13 +293,17 @@ function expand_groups($a) {
 	if(count($r))
 		foreach($r as $rr)
 			$ret[] = $rr['contact-id'];
+	if($check_dead) {
+		require_once('include/acl_selectors.php');
+		$ret = prune_deadguys($ret);
+	}
 	return $ret;
 }
 
 
 function member_of($c) {
 
-	$r = q("SELECT `group`.`name`, `group`.`id` FROM `group` LEFT JOIN `group_member` ON `group_member`.`gid` = `group`.`id` WHERE `group_member`.`contact-id` = %d AND `group`.`deleted` = 0 ORDER BY `group`.`name`  ASC ",
+	$r = q("SELECT `group`.`name`, `group`.`id` FROM `group` INNER JOIN `group_member` ON `group_member`.`gid` = `group`.`id` WHERE `group_member`.`contact-id` = %d AND `group`.`deleted` = 0 ORDER BY `group`.`name`  ASC ",
 		intval($c)
 	);