X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Facl.php;h=375c618c86dbfe483c9229a347a19db174938ba8;hb=e25fb2b2f9a822fa7180448ddff7f558dfc34fee;hp=cb5959a95b4b6393158097ef263b9d264ca8ee42;hpb=1d35d1e5a1c807ea391d7958657b13a6bb471a0b;p=friendica.git

diff --git a/mod/acl.php b/mod/acl.php
old mode 100644
new mode 100755
index cb5959a95b..375c618c86
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -10,71 +10,92 @@ function acl_init(&$a){
 	$start = (x($_POST,'start')?$_POST['start']:0);
 	$count = (x($_POST,'count')?$_POST['count']:100);
 	$search = (x($_POST,'search')?$_POST['search']:"");
+	$type = (x($_POST,'type')?$_POST['type']:"");
+	
 
 	if ($search!=""){
 		$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
+		$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
+	} else {
+		$sql_extra = $sql_extra2 = "";
 	}
 	
 	// count groups and contacts
-	$r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
-		intval(local_user())
-	);
-	$group_count = (int)$r[0]['g'];
-	$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
-			WHERE `uid` = %d AND `self` = 0 
-			  AND `blocked` = 0 AND `pending` = 0 
-			  AND `notify` != '' $sql_extra" ,
-		intval(local_user())
-	);
-	$contact_count = (int)$r[0]['c'];
+	if ($type=='' || $type=='g'){
+		$r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+			intval(local_user())
+		);
+		$group_count = (int)$r[0]['g'];
+	} else {
+		$group_count = 0;
+	}
+	
+	if ($type=='' || $type=='c'){
+		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+				WHERE `uid` = %d AND `self` = 0 
+				AND `blocked` = 0 AND `pending` = 0 
+				AND `notify` != '' $sql_extra" ,
+			intval(local_user())
+		);
+		$contact_count = (int)$r[0]['c'];
+	} else {
+		$contact_count = 0;
+	}
 	
 	$tot = $group_count+$contact_count;
 	
 	$groups = array();
 	$contacts = array();
 	
-	$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
-			FROM `group`,`group_member` 
-			WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
-				AND `group_member`.`gid`=`group`.`id`
-				$sql_extra
-			GROUP BY `group`.`id`
-			ORDER BY `group`.`name` 
-			LIMIT %d,%d",
-		intval(local_user()),
-		intval($start),
-		intval($count)
-	);
-
-	
-	foreach($r as $g){
-		$groups[] = array(
-			"type"  => "g",
-			"photo" => "images/default-group-mm.png",
-			"name"  => $g['name'],
-			"id"	=> intval($g['id']),
-			"uids"  => array_map("intval", explode(",",$g['uids']))
+	if ($type=='' || $type=='g'){
+		
+		$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
+				FROM `group`,`group_member` 
+				WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
+					AND `group_member`.`gid`=`group`.`id`
+					$sql_extra
+				GROUP BY `group`.`id`
+				ORDER BY `group`.`name` 
+				LIMIT %d,%d",
+			intval(local_user()),
+			intval($start),
+			intval($count)
 		);
+
+		foreach($r as $g){
+//		logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);		
+			$groups[] = array(
+				"type"  => "g",
+				"photo" => "images/twopeople.png",
+				"name"  => $g['name'],
+				"id"	=> intval($g['id']),
+				"uids"  => array_map("intval", explode(",",$g['uids'])),
+				"link"  => ''
+			);
+		}
 	}
 	
+	if ($type=='' || $type=='c'){
 	
-	$r = q("SELECT `id`, `name`, `micro`, `network` FROM `contact` 
-		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
-		$sql_extra
-		ORDER BY `name` ASC ",
-		intval(local_user())
-	);
-	foreach($r as $g){
-		$contacts[] = array(
-			"type"  => "c",
-			"photo" => $g['micro'],
-			"name"  => $g['name'],
-			"id"	=> intval($g['id']),
-			"network" => $g['network']
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
+			$sql_extra2
+			ORDER BY `name` ASC ",
+			intval(local_user())
 		);
+		foreach($r as $g){
+			$contacts[] = array(
+				"type"  => "c",
+				"photo" => $g['micro'],
+				"name"  => $g['name'],
+				"id"	=> intval($g['id']),
+				"network" => $g['network'],
+				"link" => $g['url'],
+				"nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
+			);
+		}
+			
 	}
-		
-	
 	
 	
 	$items = array_merge($groups, $contacts);