X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FSearch%2FAcl.php;h=9f072b91c938df938c70ceb6047b1cda5fcea908;hb=99284222c1d7fb4adca9077e3057faf3b36f7180;hp=f00c9f9ecb1c98b0f25d900d7c32d9e85728a88d;hpb=9d25c3a8f6f4e509fc41d3d527426df15f5b7c20;p=friendica.git

diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index f00c9f9ecb..9f072b91c9 100644
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -27,6 +27,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Search;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -50,7 +51,7 @@ class Acl extends BaseModule
 
 	protected function rawContent(array $request = [])
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));
 		}
 
@@ -61,11 +62,10 @@ class Acl extends BaseModule
 			$o = self::regularContactSearch($type);
 		}
 
-		echo json_encode($o);
-		exit;
+		System::jsonExit($o);
 	}
 
-	private static function globalContactSearch()
+	private static function globalContactSearch(): array
 	{
 		// autocomplete for global contact search (e.g. navbar search)
 		$search = trim($_REQUEST['search']);
@@ -95,7 +95,7 @@ class Acl extends BaseModule
 		return $o;
 	}
 
-	private static function regularContactSearch(string $type)
+	private static function regularContactSearch(string $type): array
 	{
 		$start   = $_REQUEST['start']        ?? 0;
 		$count   = $_REQUEST['count']        ?? 100;
@@ -113,8 +113,8 @@ class Acl extends BaseModule
 		Logger::info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);
 
 		$sql_extra = '';
-		$condition       = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", local_user()];
-		$condition_group = ["`uid` = ? AND NOT `deleted`", local_user()];
+		$condition       = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", DI::userSession()->getLocalUserId()];
+		$condition_group = ["`uid` = ? AND NOT `deleted`", DI::userSession()->getLocalUserId()];
 
 		if ($search != '') {
 			$sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'";
@@ -135,13 +135,13 @@ class Acl extends BaseModule
 		switch ($type) {
 			case self::TYPE_MENTION_CONTACT_GROUP:
 				$condition = DBA::mergeConditions($condition,
-					["NOT `self` AND NOT `blocked` AND `notify` != ? AND NOT `network` IN (?, ?)", '', Protocol::OSTATUS, Protocol::STATUSNET
+					["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS
 				]);
 				break;
 
 			case self::TYPE_MENTION_CONTACT:
 				$condition = DBA::mergeConditions($condition,
-					["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::STATUSNET
+					["NOT `self` AND NOT `blocked` AND `notify` != ?", ''
 				]);
 				break;
 
@@ -176,7 +176,7 @@ class Acl extends BaseModule
 				GROUP BY `group`.`name`, `group`.`id`
 				ORDER BY `group`.`name`
 				LIMIT ?, ?",
-				local_user(),
+				DI::userSession()->getLocalUserId(),
 				$start,
 				$count
 			));
@@ -251,7 +251,7 @@ class Acl extends BaseModule
 
 			$condition = ["`parent` = ?", $conv_id];
 			$params = ['order' => ['author-name' => true]];
-			$authors = Post::selectForUser(local_user(), ['author-link'], $condition, $params);
+			$authors = Post::selectForUser(DI::userSession()->getLocalUserId(), ['author-link'], $condition, $params);
 			$item_authors = [];
 			while ($author = Post::fetch($authors)) {
 				$item_authors[$author['author-link']] = $author['author-link'];