mirror of
https://github.com/friendica/friendica
synced 2025-04-19 11:50:12 +00:00
Replace "group" with "circle" in the rest of the code
- Remaining mentions already mean "forum"
This commit is contained in:
Hypolite Petovan
parent
4f6e02357a
commit
4f7740264e
120 changed files with 1308 additions and 1304 deletions
|
|
@ -29,7 +29,7 @@ use Friendica\Core\Search;
|
|||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Group;
|
||||
use Friendica\Model\Circle;
|
||||
use Friendica\Model\Notification;
|
||||
use Friendica\Model\Post\UserNotification;
|
||||
use Friendica\Model\Profile;
|
||||
|
|
@ -162,23 +162,23 @@ class Account extends BaseSettings
|
|||
$blocktags = empty($request['blocktags']); // this setting is inverted!
|
||||
$unkmail = !empty($request['unkmail']);
|
||||
$cntunkmail = intval($request['cntunkmail'] ?? 0);
|
||||
$def_gid = intval($request['group-selection'] ?? 0);
|
||||
$def_gid = intval($request['circle-selection'] ?? 0);
|
||||
|
||||
$aclFormatter = DI::aclFormatter();
|
||||
|
||||
$str_group_allow = !empty($request['group_allow']) ? $aclFormatter->toString($request['group_allow']) : '';
|
||||
$str_contact_allow = !empty($request['contact_allow']) ? $aclFormatter->toString($request['contact_allow']) : '';
|
||||
$str_group_deny = !empty($request['group_deny']) ? $aclFormatter->toString($request['group_deny']) : '';
|
||||
$str_contact_deny = !empty($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : '';
|
||||
$str_circle_allow = !empty($request['circle_allow']) ? $aclFormatter->toString($request['circle_allow']) : '';
|
||||
$str_contact_deny = !empty($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : '';
|
||||
$str_circle_deny = !empty($request['circle_deny']) ? $aclFormatter->toString($request['circle_deny']) : '';
|
||||
|
||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'unlisted', !empty($request['unlisted']));
|
||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'accessible-photos', !empty($request['accessible-photos']));
|
||||
|
||||
$fields = [
|
||||
'allow_cid' => $str_contact_allow,
|
||||
'allow_gid' => $str_group_allow,
|
||||
'allow_gid' => $str_circle_allow,
|
||||
'deny_cid' => $str_contact_deny,
|
||||
'deny_gid' => $str_group_deny,
|
||||
'deny_gid' => $str_circle_deny,
|
||||
'maxreq' => $maxreq,
|
||||
'def_gid' => $def_gid,
|
||||
'blockwall' => $blockwall,
|
||||
|
|
@ -329,7 +329,7 @@ class Account extends BaseSettings
|
|||
$fields = [
|
||||
'allow_cid' => '',
|
||||
'allow_gid' => $page_flags == User::PAGE_FLAGS_PRVGROUP ?
|
||||
'<' . Group::FOLLOWERS . '>'
|
||||
'<' . Circle::FOLLOWERS . '>'
|
||||
: '',
|
||||
'deny_cid' => '',
|
||||
'deny_gid' => '',
|
||||
|
|
@ -592,7 +592,7 @@ class Account extends BaseSettings
|
|||
'$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')],
|
||||
'$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')],
|
||||
'$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail, DI::l10n()->t("(to prevent spam abuse)")],
|
||||
'$group_select' => Group::displayGroupSelection(DI::userSession()->getLocalUserId(), $user['def_gid']),
|
||||
'$circle_select' => Circle::getSelectorHTML(DI::userSession()->getLocalUserId(), $user['def_gid']),
|
||||
'$permissions' => DI::l10n()->t('Default Post Permissions'),
|
||||
'$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()),
|
||||
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ class Index extends BaseSettings
|
|||
<p>You can use BBCodes in the field values.</p>
|
||||
<p>Reorder by dragging the field title.</p>
|
||||
<p>Empty the label field to remove a custom field.</p>
|
||||
<p>Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected groups.</p>",
|
||||
<p>Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected circles.</p>",
|
||||
'profile/' . $profile['nickname'] . '/profile'
|
||||
),
|
||||
'$custom_fields' => $custom_fields,
|
||||
|
|
@ -284,9 +284,9 @@ class Index extends BaseSettings
|
|||
$permissionSet = DI::permissionSet()->selectOrCreate(DI::permissionSetFactory()->createFromString(
|
||||
$uid,
|
||||
DI::aclFormatter()->toString($profileFieldInputs['new']['contact_allow'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInputs['new']['group_allow'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInputs['new']['circle_allow'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInputs['new']['contact_deny'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInputs['new']['group_deny'] ?? '')
|
||||
DI::aclFormatter()->toString($profileFieldInputs['new']['circle_deny'] ?? '')
|
||||
));
|
||||
|
||||
$profileFields->append(DI::profileFieldFactory()->createFromValues(
|
||||
|
|
@ -305,9 +305,9 @@ class Index extends BaseSettings
|
|||
$permissionSet = DI::permissionSet()->selectOrCreate(DI::permissionSetFactory()->createFromString(
|
||||
$uid,
|
||||
DI::aclFormatter()->toString($profileFieldInput['contact_allow'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInput['group_allow'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInput['circle_allow'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInput['contact_deny'] ?? ''),
|
||||
DI::aclFormatter()->toString($profileFieldInput['group_deny'] ?? '')
|
||||
DI::aclFormatter()->toString($profileFieldInput['circle_deny'] ?? '')
|
||||
));
|
||||
|
||||
$profileFields->append(DI::profileFieldFactory()->createFromValues(
|
||||
|
|
|
|||
|
|
@ -263,12 +263,12 @@ class UserExport extends BaseSettings
|
|||
sprintf("SELECT * FROM `pconfig` WHERE uid = %d", $user_id)
|
||||
);
|
||||
|
||||
$group = $this->exportMultiRow(
|
||||
$circle = $this->exportMultiRow(
|
||||
sprintf("SELECT * FROM `group` WHERE uid = %d", $user_id)
|
||||
);
|
||||
|
||||
$group_member = $this->exportMultiRow(
|
||||
sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", $user_id)
|
||||
$circle_member = $this->exportMultiRow(
|
||||
sprintf("SELECT `circle_member`.`gid`, `circle_member`.`contact-id` FROM `group_member` AS `circle_member` INNER JOIN `group` AS `circle` ON `circle`.`id` = `circle_member`.`gid` WHERE `circle`.`uid` = %d", $user_id)
|
||||
);
|
||||
|
||||
$output = [
|
||||
|
|
@ -281,8 +281,8 @@ class UserExport extends BaseSettings
|
|||
'profile_fields' => $profile_fields,
|
||||
'photo' => $photo,
|
||||
'pconfig' => $pconfig,
|
||||
'group' => $group,
|
||||
'group_member' => $group_member,
|
||||
'circle' => $circle,
|
||||
'circle_member' => $circle_member,
|
||||
];
|
||||
|
||||
echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue