X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=a20775379707d68b1416618bbaa1760bc19ed8df;hb=66902c7956eedba02ea54aea6ea7aa417344ffbb;hp=9e1a2642a4768ed2e4ddaa5315e44bdd77335481;hpb=aff775e55c51fa2745656bb2e2607f1c5710e56f;p=friendica.git

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 9e1a2642a4..a207753797 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -6,7 +6,7 @@
 
 require_once("include/contact_selectors.php");
 require_once("include/contact_widgets.php");
-require_once("include/dir_fns.php");
+require_once("include/DirSearch.php");
 require_once("include/features.php");
 require_once("mod/proxy.php");
 
@@ -33,8 +33,8 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-	if(count($r)) {
-		foreach($r as $rr) {
+	if (dbm::is_result($r)) {
+		foreach ($r as $rr) {
 			if((is_array($preselected)) && in_array($rr['id'], $preselected))
 				$selected = " selected=\"selected\" ";
 			else
@@ -65,20 +65,24 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 	$exclude = false;
 	$size = 4;
 
-	if(is_array($options)) {
-		if(x($options,'size'))
+	if (is_array($options)) {
+		if (x($options,'size'))
 			$size = $options['size'];
 
-		if(x($options,'mutual_friends'))
+		if (x($options,'mutual_friends')) {
 			$mutual = true;
-		if(x($options,'single'))
+		}
+		if (x($options,'single')) {
 			$single = true;
-		if(x($options,'multiple'))
+		}
+		if (x($options,'multiple')) {
 			$single = false;
-		if(x($options,'exclude'))
+		}
+		if (x($options,'exclude')) {
 			$exclude = $options['exclude'];
+		}
 
-		if(x($options,'networks')) {
+		if (x($options,'networks')) {
 			switch($options['networks']) {
 				case 'DFRN_ONLY':
 					$networks = array(NETWORK_DFRN);
@@ -144,12 +148,13 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-	if(count($r)) {
-		foreach($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
+	if (dbm::is_result($r)) {
+		foreach ($r as $rr) {
+			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
-			else
+			} else {
 				$selected = '';
+			}
 
 			$trimmed = mb_substr($rr['name'],0,20);
 
@@ -220,17 +225,20 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$receiverlist = array();
 
-	if(count($r)) {
-		foreach($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
+	if (dbm::is_result($r)) {
+		foreach ($r as $rr) {
+			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
-			else
+			}
+			else {
 				$selected = '';
+			}
 
-			if($privmail)
+			if ($privmail) {
 				$trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
-			else
+			} else {
 				$trimmed = mb_substr($rr['name'],0,20);
+			}
 
 			$receiverlist[] = $trimmed;
 
@@ -256,16 +264,22 @@ function fixacl(&$item) {
 
 function prune_deadguys($arr) {
 
-	if(! $arr)
+	if (! $arr) {
 		return $arr;
+	}
+
 	$str = dbesc(implode(',',$arr));
+
 	$r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
-	if($r) {
+
+	if ($r) {
 		$ret = array();
-		foreach($r as $rr)
+		foreach ($r as $rr) {
 			$ret[] = intval($rr['id']);
+		}
 		return $ret;
 	}
+
 	return array();
 }
 
@@ -314,7 +328,7 @@ function populate_acl($user = null, $show_jotnets = false) {
 			$r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 				intval(local_user())
 			);
-			if(count($r)) {
+			if (dbm::is_result($r)) {
 				$mail_enabled = true;
 				if(intval($r[0]['pubmail']))
 					$pubmail_enabled = true;
@@ -392,14 +406,15 @@ function construct_acl_data(&$a, $user) {
 
 function acl_lookup(&$a, $out_type = 'json') {
 
-	if(!local_user())
-		return "";
+	if (!local_user()) {
+		return '';
+	}
 
 	$start	=	(x($_REQUEST,'start')		? $_REQUEST['start']		: 0);
 	$count	=	(x($_REQUEST,'count')		? $_REQUEST['count']		: 100);
 	$search	 =	(x($_REQUEST,'search')		? $_REQUEST['search']		: "");
 	$type	=	(x($_REQUEST,'type')		? $_REQUEST['type']		: "");
-	$mode	=	(x($_REQUEST,'mode')		? $_REQUEST['mode']		: "");
+	$mode	=	(x($_REQUEST,'smode')		? $_REQUEST['smode']		: "");
 	$conv_id =	(x($_REQUEST,'conversation')	? $_REQUEST['conversation']	: null);
 
 	// For use with jquery.textcomplete for private mail completion
@@ -481,11 +496,11 @@ function acl_lookup(&$a, $out_type = 'json') {
 	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`
+				FROM `group`
+				INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
+				WHERE NOT `group`.`deleted` AND `group`.`uid` = %d
 					$sql_extra
-				GROUP BY `group`.`id`
+				GROUP BY `group`.`name`
 				ORDER BY `group`.`name`
 				LIMIT %d,%d",
 			intval(local_user()),
@@ -509,7 +524,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 
 	if ($type==''){
 
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum` FROM `contact`
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
 			AND NOT (`network` IN ('%s', '%s'))
 			$sql_extra2
@@ -520,7 +535,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 	}
 	elseif ($type=='c'){
 
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum` FROM `contact`
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
 			AND NOT (`network` IN ('%s'))
 			$sql_extra2
@@ -540,32 +555,33 @@ function acl_lookup(&$a, $out_type = 'json') {
 			dbesc(NETWORK_ZOT),
 			dbesc(NETWORK_DIASPORA)
 		);
-	}
-	elseif($type == 'a') {
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
+	} elseif ($type == 'a') {
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND `pending` = 0
 			$sql_extra2
 			ORDER BY `name` ASC ",
 			intval(local_user())
 		);
-	}
-	elseif($type == 'x') {
+	} elseif ($type == 'x') {
 		// autocomplete for global contact search (e.g. navbar search)
 		$r = navbar_complete($a);
 		$contacts = array();
-		if($r) {
-			foreach($r as $g) {
+		if ($r) {
+			foreach ($r as $g) {
 				$contacts[] = array(
-					"photo"    => $g['photo'],
-					"name"     => $g['name'],
-					"nick"     => (x($g['addr']) ? $g['addr'] : $g['url']),
+					'photo'   => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
+					'name'    => $g['name'],
+					'nick'    => (x($g['addr']) ? $g['addr'] : $g['url']),
+					'network' => $g['network'],
+					'link'    => $g['url'],
+					'forum'   => (x($g['community']) ? 1 : 0),
 				);
 			}
 		}
 		$o = array(
 			'start' => $start,
-			'count'	=> $count,
-			'items'	=> $contacts,
+			'count' => $count,
+			'items' => $contacts,
 		);
 		echo json_encode($o);
 		killme();
@@ -574,17 +590,17 @@ function acl_lookup(&$a, $out_type = 'json') {
 		$r = array();
 
 
-	if(count($r)) {
-		foreach($r as $g){
+	if (dbm::is_result($r)) {
+		foreach ($r as $g){
 			$contacts[] = array(
-				"type"  => "c",
-				"photo" => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
-				"name"  => htmlentities($g['name']),
-				"id"	=> intval($g['id']),
-				"network" => $g['network'],
-				"link" => $g['url'],
-				"nick" => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
-				"forum" => $g['forum']
+				'type'    => 'c',
+				'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
+				'name'    => htmlentities($g['name']),
+				'id'      => intval($g['id']),
+				'network' => $g['network'],
+				'link'    => $g['url'],
+				'nick'    => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
+				'forum'   => ((x($g['forum']) || x($g['prv'])) ? 1 : 0),
 			);
 		}
 	}
@@ -609,8 +625,8 @@ function acl_lookup(&$a, $out_type = 'json') {
 				dbesc($search),
 				implode("','", $known_contacts)
 		);
-		if (is_array($r) && count($r)){
-			foreach($r as $row) {
+		if (dbm::is_result($r)){
+			foreach ($r as $row) {
 				// nickname..
 				$up = parse_url($row['author-link']);
 				$nick = explode("/",$up['path']);
@@ -618,14 +634,14 @@ function acl_lookup(&$a, $out_type = 'json') {
 				$nick .= "@".$up['host'];
 				// /nickname
 				$unknow_contacts[] = array(
-					"type"  => "c",
-					"photo" => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
-					"name"  => htmlentities($row['author-name']),
-					"id"	=> '',
-					"network" => "unknown",
-					"link" => $row['author-link'],
-					"nick" => htmlentities($nick),
-					"forum" => false
+					'type'    => 'c',
+					'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
+					'name'    => htmlentities($row['author-name']),
+					'id'      => '',
+					'network' => 'unknown',
+					'link'    => $row['author-link'],
+					'nick'    => htmlentities($nick),
+					'forum'   => false
 				);
 			}
 		}
@@ -634,22 +650,35 @@ function acl_lookup(&$a, $out_type = 'json') {
 		$tot += count($unknow_contacts);
 	}
 
+	$results = array(
+		'tot'      => $tot,
+		'start'    => $start,
+		'count'    => $count,
+		'groups'   => $groups,
+		'contacts' => $contacts,
+		'items'    => $items,
+		'type'     => $type,
+		'search'   => $search,
+	);
+
+	call_hooks('acl_lookup_end', $results);
+
 	if($out_type === 'html') {
 		$o = array(
-			'tot'		=> $tot,
-			'start'	=> $start,
-			'count'	=> $count,
-			'groups'	=> $groups,
-			'contacts'	=> $contacts,
+			'tot'      => $results['tot'],
+			'start'    => $results['start'],
+			'count'    => $results['count'],
+			'groups'   => $results['groups'],
+			'contacts' => $results['contacts'],
 		);
 		return $o;
 	}
 
 	$o = array(
-		'tot'	=> $tot,
-		'start' => $start,
-		'count'	=> $count,
-		'items'	=> $items,
+		'tot'   => $results['tot'],
+		'start' => $results['start'],
+		'count' => $results['count'],
+		'items' => $results['items'],
 	);
 
 	echo json_encode($o);
@@ -660,13 +689,13 @@ function acl_lookup(&$a, $out_type = 'json') {
  * @brief Searching for global contacts for autocompletion
  * 
  * @param App $a
- * @return array
+ * @return array with the search results
  */
 function navbar_complete(&$a) {
 
 //	logger('navbar_complete');
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
 
@@ -674,31 +703,35 @@ function navbar_complete(&$a) {
 	$localsearch = get_config('system','poco_local_search');
 
 	$search = $prefix.notags(trim($_REQUEST['search']));
-	$mode = $_REQUEST['mode'];
+	$mode = $_REQUEST['smode'];
 
 	// don't search if search term has less than 2 characters
-	if(! $search || mb_strlen($search) < 2)
+	if (! $search || mb_strlen($search) < 2) {
 		return array();
+	}
 
-	if(substr($search,0,1) === '@')
+	if (substr($search,0,1) === '@') {
 		$search = substr($search,1);
+	}
 
-	if($localsearch) {
-		$x = dir::global_search_by_name($search, $mode);
+	if ($localsearch) {
+		$x = DirSearch::global_search_by_name($search, $mode);
 		return $x;
 	}
 
-	if(! $localsearch) {
+	if (! $localsearch) {
 		$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
 		$x = z_fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
-		if($x['success']) {
+		if ($x['success']) {
 			$t = 0;
 			$j = json_decode($x['body'],true);
-			if($j && $j['results']) {
+			if ($j && $j['results']) {
 				return $j['results'];
 			}
 		}
 	}
+
+	/// @TODO Not needed here?
 	return;
-}
\ No newline at end of file
+}