Now using only a single array

[friendica.git] / src / Util / ACLFormatter.php

diff --git a/src/Util/ACLFormatter.php b/src/Util/ACLFormatter.php
index e724a89487c81ba7c1391b0bbc809fe3f5d3d42f..a7d851508d4e22d1c9441b959eb541c56e2875b9 100644 (file)
--- a/src/Util/ACLFormatter.php
+++ b/src/Util/ACLFormatter.php
@@ -12,12 +12,17 @@ final class ACLFormatter
        /**
         * Turn user/group ACLs stored as angle bracketed text into arrays
         *
-        * @param string $ids A angle-bracketed list of IDs
+        * @param string|null $ids A angle-bracketed list of IDs
         *
-        * @return array The array based on the IDs
+        * @return array The array based on the IDs (empty in case there is no list)
         */
-       public function expand(string $ids)
+       public function expand(string $ids = null)
        {
+               // In case there is no ID list, return empty array (=> no ACL set)
+               if (!isset($ids)) {
+                       return [];
+               }
+
                // turn string array of angle-bracketed elements into numeric array
                // e.g. "<1><2><3>" => array(1,2,3);
                preg_match_all('/<(' . Group::FOLLOWERS . '|'. Group::MUTUALS . '|[0-9]+)>/', $ids, $matches, PREG_PATTERN_ORDER);
@@ -30,11 +35,17 @@ final class ACLFormatter
         *
         * @param string $item The item to sanitise
         */
-       private function sanitiseAcl(string &$item) {
+       private function sanitize(string &$item) {
+               // The item is an ACL int value
                if (intval($item)) {
                        $item = '<' . intval(Strings::escapeTags(trim($item))) . '>';
+               // The item is a allowed ACL character
                } elseif (in_array($item, [Group::FOLLOWERS, Group::MUTUALS])) {
                        $item = '<' . $item . '>';
+               // The item is already a ACL string
+               } elseif (preg_match('/<\d+?>/', $item)) {
+                       unset($item);
+               // The item is not supported, so remove it (cleanup)
                } else {
                        $item = '';
                }
@@ -50,7 +61,7 @@ final class ACLFormatter
         *
         * @return string
         */
-       function aclToString($permissions) {
+       function toString($permissions) {
                $return = '';
                if (is_array($permissions)) {
                        $item = $permissions;
@@ -59,7 +70,7 @@ final class ACLFormatter
                }
 
                if (is_array($item)) {
-                       array_walk($item, [$this, 'sanitiseAcl']);
+                       array_walk($item, [$this, 'sanitize']);
                        $return = implode('', $item);
                }
                return $return;