Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 09:04:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replace "group" with "circle" in the rest of the code

Browse source 
- Remaining mentions already mean "forum"
This commit is contained in:
Hypolite Petovan 2023-05-13 19:54:35 -04:00
parent 4f6e02357a
commit 4f7740264e
120 changed files with 1308 additions and 1304 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Util/ACLFormatter.php
View file

@ -21,7 +21,7 @@
namespace Friendica\Util;
use Friendica\Model\Group;
use Friendica\Model\Circle;
/**
* Util class for ACL formatting
@ -29,7 +29,7 @@ use Friendica\Model\Group;
final class ACLFormatter
{
/**
* Turn user/group ACLs stored as angle bracketed text into arrays
* Turn user/circle ACLs stored as angle bracketed text into arrays
*
* @param string|null $acl_string A angle-bracketed list of IDs
*
@ -44,7 +44,7 @@ final class ACLFormatter
// 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]+)>/', $acl_string, $matches, PREG_PATTERN_ORDER);
preg_match_all('/<(' . Circle::FOLLOWERS . '|'. Circle::MUTUALS . '|[0-9]+)>/', $acl_string, $matches, PREG_PATTERN_ORDER);
return $matches[1];
}
@ -86,7 +86,7 @@ final class ACLFormatter
if (intval($item)) {
$item = '<' . intval($item) . '>';
// The item is a allowed ACL character
} elseif (in_array($item, [Group::FOLLOWERS, Group::MUTUALS])) {
} elseif (in_array($item, [Circle::FOLLOWERS, Circle::MUTUALS])) {
$item = '<' . $item . '>';
// The item is already a ACL string
} elseif (preg_match('/<\d+?>/', $item)) {