X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Facl_selectors.php;h=32348c2330aff6172420b2a20a56288062d42d86;hb=93fd189198efe047d0f8642c2d6d0df49530e38b;hp=fbe5d1e6929910fef54479bedcad7638327996ae;hpb=3f4502155d508a714da2d17fd1ad2534a6494010;p=friendica.git

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index fbe5d1e692..32348c2330 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -4,6 +4,8 @@
  * @file include/acl_selectors.php
  */
 
+use Friendica\App;
+
 require_once "include/contact_selectors.php";
 require_once "include/contact_widgets.php";
 require_once "include/DirSearch.php";
@@ -207,7 +209,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : "");
 
-	if ($privmail AND $preselected) {
+	if ($privmail && $preselected) {
 		$sql_extra .= " AND `id` IN (".implode(",", $preselected).")";
 		$hidepreselected = ' style="display: none;"';
 	} else {
@@ -259,7 +261,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$o .= "</select>\r\n";
 
-	if ($privmail AND $preselected) {
+	if ($privmail && $preselected) {
 		$o .= implode(", ", $receiverlist);
 	}
 
@@ -386,6 +388,9 @@ function populate_acl($user = null, $show_jotnets = false) {
 }
 
 function construct_acl_data(App $a, $user) {
+	// This function is now deactivated. It seems as if the generated data isn't used anywhere.
+	/// @todo Remove this function and all function calls before releasing Friendica 3.5.3
+	return;
 
 	// Get group and contact information for html ACL selector
 	$acl_data = acl_lookup($a, 'html');
@@ -468,18 +473,29 @@ function acl_lookup(App $a, $out_type = 'json') {
 		$r = q("SELECT COUNT(*) AS c FROM `contact`
 				WHERE `uid` = %d AND NOT `self`
 				AND NOT `blocked` AND NOT `pending` AND NOT `archive`
+				AND `success_update` >= `failure_update`
 				AND `notify` != '' $sql_extra2" ,
 			intval(local_user())
 		);
 		$contact_count = (int)$r[0]['c'];
-	}
-	elseif ($type == 'm') {
-
+	} elseif ($type == 'f') {
+		// autocomplete for editor mentions of forums
+		$r = q("SELECT COUNT(*) AS c FROM `contact`
+				WHERE `uid` = %d AND NOT `self`
+				AND NOT `blocked` AND NOT `pending` AND NOT `archive`
+				AND (`forum` OR `prv`)
+				AND `success_update` >= `failure_update`
+				AND `notify` != '' $sql_extra2" ,
+			intval(local_user())
+		);
+		$contact_count = (int)$r[0]['c'];
+	} elseif ($type == 'm') {
 		// autocomplete for Private Messages
 
 		$r = q("SELECT COUNT(*) AS c FROM `contact`
 				WHERE `uid` = %d AND NOT `self`
 				AND NOT `blocked` AND NOT `pending` AND NOT `archive`
+				AND `success_update` >= `failure_update`
 				AND `network` IN ('%s','%s','%s') $sql_extra2" ,
 			intval(local_user()),
 			dbesc(NETWORK_DFRN),
@@ -488,8 +504,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 		);
 		$contact_count = (int)$r[0]['c'];
 
-	}
-	elseif ($type == 'a') {
+	} elseif ($type == 'a') {
 
 		// autocomplete for Contacts
 
@@ -539,13 +554,16 @@ function acl_lookup(App $a, $out_type = 'json') {
 				"forum" => '0'
 			);
 		}
+		if ((count($groups) > 0) && ($search == "")) {
+			$groups[] = array("separator" => true);
+		}
 	}
 
 	if ($type == '') {
 
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv`, (`prv` OR `forum`) AS `frm` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
-			AND NOT (`network` IN ('%s', '%s'))
+			AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s'))
 			$sql_extra2
 			ORDER BY `name` ASC ",
 			intval(local_user()),
@@ -554,17 +572,26 @@ function acl_lookup(App $a, $out_type = 'json') {
 	} elseif ($type == 'c') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
-			AND NOT (`network` IN ('%s'))
+			AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s'))
 			$sql_extra2
 			ORDER BY `name` ASC ",
 			intval(local_user()),
 			dbesc(NETWORK_STATUSNET)
 		);
-	}
-	elseif ($type == 'm') {
+	} elseif ($type == 'f') {
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
+			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
+			AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s'))
+			AND (`forum` OR `prv`)
+			$sql_extra2
+			ORDER BY `name` ASC ",
+			intval(local_user()),
+			dbesc(NETWORK_STATUSNET)
+		);
+	} elseif ($type == 'm') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive`
-			AND `network` IN ('%s','%s','%s')
+			AND `success_update` >= `failure_update` AND `network` IN ('%s','%s','%s')
 			$sql_extra2
 			ORDER BY `name` ASC ",
 			intval(local_user()),
@@ -574,7 +601,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 		);
 	} elseif ($type == 'a') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
-			WHERE `uid` = %d AND `pending` = 0
+			WHERE `uid` = %d AND `pending` = 0 AND `success_update` >= `failure_update`
 			$sql_extra2
 			ORDER BY `name` ASC ",
 			intval(local_user())
@@ -608,8 +635,9 @@ function acl_lookup(App $a, $out_type = 'json') {
 
 
 	if (dbm::is_result($r)) {
+		$forums = array();
 		foreach ($r as $g) {
-			$contacts[] = array(
+			$entry = array(
 				'type'    => 'c',
 				'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
 				'name'    => htmlentities($g['name']),
@@ -620,6 +648,17 @@ function acl_lookup(App $a, $out_type = 'json') {
 				'addr'    => htmlentities(($g['addr']) ? $g['addr'] : $g['url']),
 				'forum'   => ((x($g, 'forum') || x($g, 'prv')) ? 1 : 0),
 			);
+			if ($entry['forum']) {
+				$forums[] = $entry;
+			} else {
+				$contacts[] = $entry;
+			}
+		}
+		if (count($forums) > 0) {
+			if ($search == "") {
+				$forums[] = array("separator" => true);
+			}
+			$contacts = array_merge($forums, $contacts);
 		}
 	}