*/
use Friendica\App;
+use Friendica\BaseModule;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
+use Friendica\Database\DBA;
+use Friendica\Model;
+use Friendica\Module;
+use Friendica\Util\Security;
+use Friendica\Util\Strings;
function group_init(App $a) {
if (local_user()) {
- $a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
+ $a->page['aside'] = Model\Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
}
}
function group_post(App $a) {
- if (! local_user()) {
- notice(t('Permission denied.') . EOL);
+ if (!local_user()) {
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
if (($a->argc == 2) && ($a->argv[1] === 'new')) {
- check_form_security_token_redirectOnErr('/group/new', 'group_edit');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
- $name = notags(trim($_POST['groupname']));
- $r = Group::create(local_user(), $name);
+ $name = Strings::escapeTags(trim($_POST['groupname']));
+ $r = Model\Group::create(local_user(), $name);
if ($r) {
- info(t('Group created.') . EOL);
- $r = Group::getIdByName(local_user(), $name);
+ info(L10n::t('Group created.') . EOL);
+ $r = Model\Group::getIdByName(local_user(), $name);
if ($r) {
- goaway(System::baseUrl() . '/group/' . $r);
+ $a->internalRedirect('group/' . $r);
}
} else {
- notice(t('Could not create group.') . EOL);
+ notice(L10n::t('Could not create group.') . EOL);
}
- goaway(System::baseUrl() . '/group');
+ $a->internalRedirect('group');
return; // NOTREACHED
}
- if (($a->argc == 2) && (intval($a->argv[1]))) {
- check_form_security_token_redirectOnErr('/group', 'group_edit');
+ if (($a->argc == 2) && intval($a->argv[1])) {
+ BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit');
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
intval(local_user())
);
- if (! DBM::is_result($r)) {
- notice(t('Group not found.') . EOL);
- goaway(System::baseUrl() . '/contacts');
+ if (!DBA::isResult($r)) {
+ notice(L10n::t('Group not found.') . EOL);
+ $a->internalRedirect('contact');
return; // NOTREACHED
}
$group = $r[0];
- $groupname = notags(trim($_POST['groupname']));
- if ((strlen($groupname)) && ($groupname != $group['name'])) {
+ $groupname = Strings::escapeTags(trim($_POST['groupname']));
+ if (strlen($groupname) && ($groupname != $group['name'])) {
$r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d",
- dbesc($groupname),
+ DBA::escape($groupname),
intval(local_user()),
intval($group['id'])
);
if ($r) {
- info(t('Group name changed.') . EOL);
+ info(L10n::t('Group name changed.') . EOL);
}
}
- $a->page['aside'] = Group::sidebarWidget();
+ $a->page['aside'] = Model\Group::sidebarWidget();
}
return;
}
function group_content(App $a) {
$change = false;
- if (! local_user()) {
- notice(t('Permission denied') . EOL);
+ if (!local_user()) {
+ notice(L10n::t('Permission denied') . EOL);
return;
}
- // Switch to text mode interface if we have more than 'n' contacts or group members
+ // With no group number provided we jump to the unassigned contacts as a starting point
+ if ($a->argc == 1) {
+ $a->internalRedirect('group/none');
+ }
+ // Switch to text mode interface if we have more than 'n' contacts or group members
$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
if (is_null($switchtotext)) {
$switchtotext = Config::get('system', 'groupedit_image_limit', 400);
}
- $tpl = get_markup_template('group_edit.tpl');
+ $tpl = Renderer::getMarkupTemplate('group_edit.tpl');
$context = [
- '$submit' => t('Save Group'),
+ '$submit' => L10n::t('Save Group'),
+ '$submit_filter' => L10n::t('Filter'),
];
if (($a->argc == 2) && ($a->argv[1] === 'new')) {
- return replace_macros($tpl, $context + [
- '$title' => t('Create a group of contacts/friends.'),
- '$gname' => ['groupname', t('Group Name: '), '', ''],
+ return Renderer::replaceMacros($tpl, $context + [
+ '$title' => L10n::t('Create a group of contacts/friends.'),
+ '$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
'$gid' => 'new',
- '$form_security_token' => get_form_security_token("group_edit"),
+ '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"),
]);
}
+ $nogroup = false;
+
+ if (($a->argc == 2) && ($a->argv[1] === 'none')) {
+ $id = -1;
+ $nogroup = true;
+ $group = [
+ 'id' => $id,
+ 'name' => L10n::t('Contacts not in any group'),
+ ];
+
+ $members = [];
+ $preselected = [];
+ $entry = [];
+
+ $context = $context + [
+ '$title' => $group['name'],
+ '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+ '$gid' => $id,
+ '$editable' => 0,
+ ];
+ }
+
+
if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
- check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't');
if (intval($a->argv[2])) {
$r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
$result = null;
- if (DBM::is_result($r)) {
- $result = Group::removeByName(local_user(), $r[0]['name']);
+ if (DBA::isResult($r)) {
+ $result = Model\Group::removeByName(local_user(), $r[0]['name']);
}
if ($result) {
- info(t('Group removed.') . EOL);
+ info(L10n::t('Group removed.') . EOL);
} else {
- notice(t('Unable to remove group.') . EOL);
+ notice(L10n::t('Unable to remove group.') . EOL);
}
}
- goaway(System::baseUrl() . '/group');
+ $a->internalRedirect('group');
// NOTREACHED
}
if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
- check_form_security_token_ForbiddenOnErr('group_member_change', 't');
+ BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't');
$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
intval($a->argv[2]),
intval(local_user())
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$change = intval($a->argv[2]);
}
}
- if (($a->argc > 1) && (intval($a->argv[1]))) {
- require_once 'include/acl_selectors.php';
- require_once 'mod/contacts.php';
-
+ if (($a->argc > 1) && intval($a->argv[1])) {
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
intval($a->argv[1]),
intval(local_user())
);
- if (! DBM::is_result($r)) {
- notice(t('Group not found.') . EOL);
- goaway(System::baseUrl() . '/contacts');
+ if (!DBA::isResult($r)) {
+ notice(L10n::t('Group not found.') . EOL);
+ $a->internalRedirect('contact');
}
$group = $r[0];
- $members = Contact::getByGroupId($group['id']);
+ $members = Model\Contact::getByGroupId($group['id']);
$preselected = [];
$entry = [];
$id = 0;
if ($change) {
if (in_array($change, $preselected)) {
- Group::removeMember($group['id'], $change);
+ Model\Group::removeMember($group['id'], $change);
} else {
- Group::addMember($group['id'], $change);
+ Model\Group::addMember($group['id'], $change);
}
- $members = Contact::getByGroupId($group['id']);
+ $members = Model\Contact::getByGroupId($group['id']);
$preselected = [];
if (count($members)) {
foreach ($members as $member) {
}
}
- $drop_tpl = get_markup_template('group_drop.tpl');
- $drop_txt = replace_macros($drop_tpl, [
+ $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
+ $drop_txt = Renderer::replaceMacros($drop_tpl, [
'$id' => $group['id'],
- '$delete' => t('Delete Group'),
- '$form_security_token' => get_form_security_token("group_drop"),
+ '$delete' => L10n::t('Delete Group'),
+ '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
]);
$context = $context + [
- '$title' => t('Group Editor'),
- '$gname' => ['groupname', t('Group Name: '), $group['name'], ''],
+ '$title' => $group['name'],
+ '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
'$gid' => $group['id'],
'$drop' => $drop_txt,
- '$form_security_token' => get_form_security_token('group_edit'),
- '$edit_name' => t('Edit Group Name')
+ '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
+ '$edit_name' => L10n::t('Edit Group Name'),
+ '$editable' => 1,
];
}
- if (! isset($group)) {
+ if (!isset($group)) {
return;
}
$groupeditor = [
- 'label_members' => t('Members'),
+ 'label_members' => L10n::t('Members'),
'members' => [],
- 'label_contacts' => t('All Contacts'),
- 'group_is_empty' => t('Group is empty'),
+ 'label_contacts' => L10n::t('All Contacts'),
+ 'group_is_empty' => L10n::t('Group is empty'),
'contacts' => [],
];
- $sec_token = addslashes(get_form_security_token('group_member_change'));
+ $sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change'));
// Format the data of the group members
foreach ($members as $member) {
if ($member['url']) {
- $entry = _contact_detail_for_template($member);
+ $entry = Module\Contact::getContactTemplateVars($member);
$entry['label'] = 'members';
$entry['photo_menu'] = '';
$entry['change_member'] = [
- 'title' => t("Remove Contact"),
+ 'title' => L10n::t("Remove contact from group"),
'gid' => $group['id'],
'cid' => $member['id'],
'sec_token' => $sec_token
$groupeditor['members'][] = $entry;
} else {
- Group::removeMember($group['id'], $member['id']);
+ Model\Group::removeMember($group['id'], $member['id']);
}
}
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
- intval(local_user())
- );
+ if ($nogroup) {
+ $r = Model\Contact::getUngroupedList(local_user());
+ } else {
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
+ intval(local_user())
+ );
+ $context['$desc'] = L10n::t('Click on a contact to add or remove.');
+ }
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
// Format the data of the contacts who aren't in the contact group
foreach ($r as $member) {
- if (! in_array($member['id'], $preselected)) {
- $entry = _contact_detail_for_template($member);
+ if (!in_array($member['id'], $preselected)) {
+ $entry = Module\Contact::getContactTemplateVars($member);
$entry['label'] = 'contacts';
- $entry['photo_menu'] = '';
- $entry['change_member'] = [
- 'title' => t("Add Contact"),
- 'gid' => $group['id'],
- 'cid' => $member['id'],
- 'sec_token' => $sec_token
- ];
+ if (!$nogroup)
+ $entry['photo_menu'] = [];
+
+ if (!$nogroup) {
+ $entry['change_member'] = [
+ 'title' => L10n::t("Add contact to group"),
+ 'gid' => $group['id'],
+ 'cid' => $member['id'],
+ 'sec_token' => $sec_token
+ ];
+ }
$groupeditor['contacts'][] = $entry;
}
}
$context['$groupeditor'] = $groupeditor;
- $context['$desc'] = t('Click on a contact to add or remove.');
// If there are to many contacts we could provide an alternative view mode
$total = count($groupeditor['members']) + count($groupeditor['contacts']);
$context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false);
if ($change) {
- $tpl = get_markup_template('groupeditor.tpl');
- echo replace_macros($tpl, $context);
+ $tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
+ echo Renderer::replaceMacros($tpl, $context);
killme();
}
- return replace_macros($tpl, $context);
+ return Renderer::replaceMacros($tpl, $context);
}
projects / friendica.git / blobdiff