X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=a4acf58bad4fb0fb54590ad47e63e268379af375;hb=d5373c583bc12d2104659aaf6386d2b9e28ec68d;hp=9453dc65907fc402fc9483f6079cc50df38eb58d;hpb=536fbe5af17a4a393ea440155e2770f63b5a71f5;p=friendica.git

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 9453dc6590..a4acf58bad 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
  *
@@ -62,8 +62,6 @@ class ACL
 		$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
 		$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
-		// When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
-		// to one recipient. By default our selector allows multiple selects amongst all contacts.
 		$condition = [
 			'uid' => local_user(),
 			'self' => false,
@@ -72,7 +70,7 @@ class ACL
 			'archive' => false,
 			'deleted' => false,
 			'rel' => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND],
-			'network' => Protocol::FEDERATED,
+			'network' => Protocol::SUPPORT_PRIVATE,
 		];
 
 		$contacts = Contact::selectToArray(
@@ -82,7 +80,7 @@ class ACL
 
 		$arr = ['contact' => $contacts, 'entry' => $o];
 
-		Hook::callAll(DI::module()->getName() . '_pre_recipient', $arr);
+		Hook::callAll(DI::args()->getModuleName() . '_pre_recipient', $arr);
 
 		$tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
 		$o = Renderer::replaceMacros($tpl, [
@@ -90,7 +88,7 @@ class ACL
 			'$selected' => $selected,
 		]);
 
-		Hook::callAll(DI::module()->getName() . '_post_recipient', $o);
+		Hook::callAll(DI::args()->getModuleName() . '_post_recipient', $o);
 
 		return $o;
 	}
@@ -343,4 +341,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;
+	}
 }