X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=a2db32afc459c44cc21bcaa6315230d7411cccb6;hb=f826ce70ceb9f810a16b70d3d77b9ba2c8d9097d;hp=2a9c02e81216fc5468cb92117728f1990ebdd671;hpb=5aad46c7fb2b66d63ad93d92ee355fc522b57be1;p=friendica.git

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 2a9c02e812..a2db32afc4 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -51,7 +51,7 @@ class ACL
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function getMessageContactSelectHTML(int $selected = null)
+	public static function getMessageContactSelectHTML(int $selected = null): string
 	{
 		$o = '';
 
@@ -62,25 +62,7 @@ class ACL
 		$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
 		$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
-		$condition = [
-			'uid' => local_user(),
-			'self' => false,
-			'blocked' => false,
-			'pending' => false,
-			'archive' => false,
-			'deleted' => false,
-			'rel' => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND],
-			'network' => Protocol::SUPPORT_PRIVATE,
-		];
-
-		$contacts = Contact::selectToArray(
-			['id', 'name', 'addr', 'micro'],
-			DBA::mergeConditions($condition, ["`notify` != ''"])
-		);
-
-		$arr = ['contact' => $contacts, 'entry' => $o];
-
-		Hook::callAll(DI::args()->getModuleName() . '_pre_recipient', $arr);
+		$contacts = self::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId());
 
 		$tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
 		$o = Renderer::replaceMacros($tpl, [
@@ -93,6 +75,25 @@ class ACL
 		return $o;
 	}
 
+	public static function getValidMessageRecipientsForUser(int $uid): array
+	{
+		$condition = [
+			'uid'     => $uid,
+			'self'    => false,
+			'blocked' => false,
+			'pending' => false,
+			'archive' => false,
+			'deleted' => false,
+			'rel'     => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND],
+			'network' => Protocol::SUPPORT_PRIVATE,
+		];
+
+		return Contact::selectToArray(
+			['id', 'name', 'addr', 'micro', 'url', 'nick'],
+			DBA::mergeConditions($condition, ["`notify` != ''"])
+		);
+	}
+
 	/**
 	 * Returns a minimal ACL block for self-only permissions
 	 *
@@ -341,4 +342,62 @@ class ACL
 
 		return $o;
 	}
+
+	/**
+	 * Checks the validity of the given ACL string
+	 *
+	 * @param string $acl_string
+	 * @param int    $uid
+	 * @return bool
+	 * @throws Exception
+	 */
+	public static function isValidContact($acl_string, $uid)
+	{
+		if (empty($acl_string)) {
+			return true;
+		}
+
+		// split <x><y><z> into array of cids
+		preg_match_all('/<[A-Za-z0-9]+>/', $acl_string, $array);
+
+		// check for each cid if the contact is valid for the given user
+		$cid_array = $array[0];
+		foreach ($cid_array as $cid) {
+			$cid = str_replace(['<', '>'], ['', ''], $cid);
+			if (!DBA::exists('contact', ['id' => $cid, 'uid' => $uid])) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks the validity of the given ACL string
+	 *
+	 * @param string $acl_string
+	 * @param int    $uid
+	 * @return bool
+	 * @throws Exception
+	 */
+	public static function isValidGroup($acl_string, $uid)
+	{
+		if (empty($acl_string)) {
+			return true;
+		}
+
+		// split <x><y><z> into array of cids
+		preg_match_all('/<[A-Za-z0-9]+>/', $acl_string, $array);
+
+		// check for each cid if the contact is valid for the given user
+		$gid_array = $array[0];
+		foreach ($gid_array as $gid) {
+			$gid = str_replace(['<', '>'], ['', ''], $gid);
+			if (!DBA::exists('group', ['id' => $gid, 'uid' => $uid, 'deleted' => false])) {
+				return false;
+			}
+		}
+
+		return true;
+	}
 }