X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=67712aae7c45924f3146762d8a03629c1a293940;hb=fb676335dbfb90d282622a68cb9a7113be19bc31;hp=00b66ad58628f0db729447ed57987440b4a19e2f;hpb=01b02dbcaa8532f965389375e961d9c47d74eeec;p=friendica.git

diff --git a/include/group.php b/include/group.php
index 00b66ad586..67712aae7c 100644
--- a/include/group.php
+++ b/include/group.php
@@ -44,7 +44,7 @@ function group_rmv($uid,$name) {
 			intval($uid),
 			dbesc($name)
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$group_id = $r[0]['id'];
 		if(! $group_id)
 			return false;
@@ -106,7 +106,7 @@ function group_byname($uid,$name) {
 		intval($uid),
 		dbesc($name)
 	);
-	if(count($r))
+	if (dbm::is_result($r))
 		return $r[0]['id'];
 	return false;
 }
@@ -139,17 +139,18 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 		intval($gid),
 		intval($member)
 	);
-	if(count($r))
+	if (dbm::is_result($r))
 		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))
+ 	if (! dbm::is_result($r)) {
 		$r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
 			VALUES( %d, %d, %d ) ",
 			intval($uid),
 			intval($gid),
 			intval($member)
-	);
+		);
+	}
 	return $r;
 }
 
@@ -164,7 +165,7 @@ function group_get_members($gid) {
 			intval($gid),
 			intval(local_user())
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$ret = $r;
 	}
 	return $ret;
@@ -181,7 +182,7 @@ function group_public_members($gid) {
 			intval(local_user()),
 			dbesc(NETWORK_OSTATUS)
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$ret = count($r);
 	}
 	return $ret;
@@ -197,7 +198,7 @@ function mini_group_select($uid,$gid = 0, $label = "") {
 		intval($uid)
 	);
 	$grps[] = array('name' => '', 'id' => '0', 'selected' => '');
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		foreach($r as $rr) {
 			$grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
 		}
@@ -255,7 +256,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
 		$member_of = groups_containing(local_user(),$cid);
 	}
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		foreach($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 
@@ -316,7 +317,7 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) {
 
 
 	$ret = array();
-	if(count($r))
+	if (dbm::is_result($r))
 		foreach($r as $rr)
 			$ret[] = $rr['contact-id'];
 	if($check_dead AND !$use_gcontact) {
@@ -345,7 +346,7 @@ function groups_containing($uid,$c) {
 	);
 
 	$ret = array();
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		foreach($r as $rr)
 			$ret[] = $rr['gid'];
 	}
@@ -366,7 +367,7 @@ function groups_containing($uid,$c) {
 function groups_count_unseen() {
 
 	$r = q("SELECT `group`.`id`, `group`.`name`,
-			(SELECT COUNT(*) FROM `item`
+			(SELECT COUNT(*) FROM `item` FORCE INDEX (`uid_unseen_contactid`)
 				WHERE `uid` = %d AND `unseen` AND
 					`contact-id` IN (SELECT `contact-id` FROM `group_member`
 								WHERE `group_member`.`gid` = `group`.`id` AND `group_member`.`uid` = %d)) AS `count`