Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 18:24:23 +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

18
src/Security/Security.php
View file

@ -24,7 +24,7 @@ namespace Friendica\Security;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Circle;
use Friendica\Model\User;
/**
@ -117,17 +117,13 @@ class Security
if ($local_user && $local_user == $owner_id) {
$sql = '';
/*
* Authenticated visitor. Load the groups the visitor belongs to.
* Authenticated visitor. Load the circles the visitor belongs to.
*/
} elseif ($remote_contact) {
$gs = '<<>>'; // should be impossible to match
$circleIds = '<<>>'; // should be impossible to match
$groups = Group::getIdsByContactId($remote_contact);
if (is_array($groups)) {
foreach ($groups as $g) {
$gs .= '|<' . intval($g) . '>';
}
foreach (Circle::getIdsByContactId($remote_contact) as $circleId) {
$circleIds .= '|<' . intval($circleId) . '>';
}
$sql = sprintf(
@ -135,9 +131,9 @@ class Security
AND (allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s'
OR (allow_cid = '' AND allow_gid = ''))" . $acc_sql . ") ",
intval($remote_contact),
DBA::escape($gs),
DBA::escape($circleIds),
intval($remote_contact),
DBA::escape($gs)
DBA::escape($circleIds)
);
}
return $sql;