Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 14:30:11 +00: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

22
src/Module/Contact.php
View file

@ -191,7 +191,7 @@ class Contact extends BaseModule
$search = trim($_GET['search'] ?? '');
$nets = trim($_GET['nets'] ?? '');
$rel = trim($_GET['rel'] ?? '');
$group = trim($_GET['group'] ?? '');
$circle = trim($_GET['circle'] ?? '');
$accounttype = $_GET['accounttype'] ?? '';
$accounttypeid = User::getAccountTypeByString($accounttype);
@ -211,12 +211,12 @@ class Contact extends BaseModule
$follow_widget = Widget::follow();
}
$account_widget = Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype);
$account_widget = Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype);
$networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets);
$rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
$groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group);
$rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
$circles_widget = Widget::circles($_SERVER['REQUEST_URI'], $circle);
DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $rel_widget . $groups_widget . $networks_widget . $account_widget;
DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $rel_widget . $circles_widget . $networks_widget . $account_widget;
$tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
@ -306,9 +306,9 @@ class Contact extends BaseModule
break;
}
if ($group) {
if ($circle) {
$sql_extra .= " AND `id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)";
$sql_values[] = $group;
$sql_values[] = $circle;
}
$networks = Widget::unavailableNetworks();
@ -391,11 +391,11 @@ class Contact extends BaseModule
'accesskey' => 'h',
],
[
'label' => DI::l10n()->t('Groups'),
'url' => 'group',
'label' => DI::l10n()->t('Circles'),
'url' => 'circle',
'sel' => '',
'title' => DI::l10n()->t('Organize your contact groups'),
'id' => 'contactgroups-tab',
'title' => DI::l10n()->t('Organize your contact circles'),
'id' => 'contactcircles-tab',
'accesskey' => 'e',
],
];