X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=804d0c58f3ee1cbfded85e7572d7502cefff8c4d;hb=494288ab9f9370bdf4f7b4ab9990b64f05adbd9d;hp=5dca08c76bd7357d97a823c72edcc8c83156ec27;hpb=229eb9c681d62edc5faa63bb1d66046d123c3f35;p=friendica.git

diff --git a/include/group.php b/include/group.php
index 5dca08c76b..804d0c58f3 100644
--- a/include/group.php
+++ b/include/group.php
@@ -124,7 +124,7 @@ function group_public_members($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 
-			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' ",
+			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' AND `contact`.`network` != 'face' ",
 			intval($gid),
 			intval(local_user())
 		);		
@@ -161,7 +161,7 @@ $o .= <<< EOT
 
 EOT;
 
-	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d",
+	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
 		intval($_SESSION['uid'])
 	);
 	if(count($r)) {
@@ -185,3 +185,15 @@ function expand_groups($a) {
 			$ret[] = $rr['contact-id'];
 	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 ",
+		intval($c)
+	);
+
+	return $r;
+
+}
+