Merge pull request #3374 from rabuzarus/20170407_-_group_edit
Frio: provide own group template + some restructuring in group.php
This commit is contained in:
Hypolite Petovan
GitHub
commit
82ea7ead66
9 changed files with 526 additions and 102 deletions
143
mod/group.php
143
mod/group.php
|
|
@ -1,38 +1,38 @@
|
|||
<?php
|
||||
/**
|
||||
* @file mod/group.php
|
||||
* @brief The group module (create and rename contact groups, add and
|
||||
* remove contacts to the contact groups
|
||||
*/
|
||||
|
||||
function validate_members(&$item) {
|
||||
$item = intval($item);
|
||||
}
|
||||
|
||||
function group_init(App $a) {
|
||||
if(local_user()) {
|
||||
require_once('include/group.php');
|
||||
$a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
|
||||
if (local_user()) {
|
||||
require_once 'include/group.php';
|
||||
$a->page['aside'] = group_side('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
function group_post(App $a) {
|
||||
|
||||
if (! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
notice(t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if(($a->argc == 2) && ($a->argv[1] === 'new')) {
|
||||
if (($a->argc == 2) && ($a->argv[1] === 'new')) {
|
||||
check_form_security_token_redirectOnErr('/group/new', 'group_edit');
|
||||
|
||||
$name = notags(trim($_POST['groupname']));
|
||||
$r = group_add(local_user(),$name);
|
||||
$r = group_add(local_user(), $name);
|
||||
if ($r) {
|
||||
info( t('Group created.') . EOL );
|
||||
$r = group_byname(local_user(),$name);
|
||||
info(t('Group created.') . EOL);
|
||||
$r = group_byname(local_user(), $name);
|
||||
if ($r) {
|
||||
goaway(App::get_baseurl() . '/group/' . $r);
|
||||
}
|
||||
} else {
|
||||
notice( t('Could not create group.') . EOL );
|
||||
notice(t('Could not create group.') . EOL);
|
||||
}
|
||||
goaway(App::get_baseurl() . '/group');
|
||||
return; // NOTREACHED
|
||||
|
|
@ -46,7 +46,7 @@ function group_post(App $a) {
|
|||
intval(local_user())
|
||||
);
|
||||
if (! dbm::is_result($r)) {
|
||||
notice( t('Group not found.') . EOL );
|
||||
notice(t('Group not found.') . EOL);
|
||||
goaway(App::get_baseurl() . '/contacts');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
|
@ -60,7 +60,7 @@ function group_post(App $a) {
|
|||
);
|
||||
|
||||
if ($r) {
|
||||
info( t('Group name changed.') . EOL );
|
||||
info(t('Group name changed.') . EOL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -73,17 +73,19 @@ function group_content(App $a) {
|
|||
$change = false;
|
||||
|
||||
if (! local_user()) {
|
||||
notice( t('Permission denied') . EOL);
|
||||
notice(t('Permission denied') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
// Switch to text mode interface if we have more than 'n' contacts or group members
|
||||
|
||||
$switchtotext = get_pconfig(local_user(),'system','groupedit_image_limit');
|
||||
if($switchtotext === false)
|
||||
$switchtotext = get_config('system','groupedit_image_limit');
|
||||
if($switchtotext === false)
|
||||
$switchtotext = get_pconfig(local_user(), 'system', 'groupedit_image_limit');
|
||||
if ($switchtotext === false) {
|
||||
$switchtotext = get_config('system', 'groupedit_image_limit');
|
||||
}
|
||||
if ($switchtotext === false) {
|
||||
$switchtotext = 400;
|
||||
}
|
||||
|
||||
$tpl = get_markup_template('group_edit.tpl');
|
||||
|
||||
|
|
@ -92,7 +94,6 @@ function group_content(App $a) {
|
|||
);
|
||||
|
||||
if (($a->argc == 2) && ($a->argv[1] === 'new')) {
|
||||
|
||||
return replace_macros($tpl, $context + array(
|
||||
'$title' => t('Create a group of contacts/friends.'),
|
||||
'$gname' => array('groupname', t('Group Name: '), '', ''),
|
||||
|
|
@ -115,13 +116,13 @@ function group_content(App $a) {
|
|||
$result = null;
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
$result = group_rmv(local_user(),$r[0]['name']);
|
||||
$result = group_rmv(local_user(), $r[0]['name']);
|
||||
}
|
||||
|
||||
if ($result) {
|
||||
info( t('Group removed.') . EOL);
|
||||
info(t('Group removed.') . EOL);
|
||||
} else {
|
||||
notice( t('Unable to remove group.') . EOL);
|
||||
notice(t('Unable to remove group.') . EOL);
|
||||
}
|
||||
}
|
||||
goaway(App::get_baseurl() . '/group');
|
||||
|
|
@ -135,66 +136,75 @@ function group_content(App $a) {
|
|||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($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';
|
||||
|
||||
require_once('include/acl_selectors.php');
|
||||
$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 );
|
||||
notice(t('Group not found.') . EOL);
|
||||
goaway(App::get_baseurl() . '/contacts');
|
||||
}
|
||||
|
||||
$group = $r[0];
|
||||
$members = group_get_members($group['id']);
|
||||
$preselected = array();
|
||||
if(count($members)) {
|
||||
foreach($members as $member)
|
||||
$entry = array();
|
||||
$id = 0;
|
||||
|
||||
if (count($members)) {
|
||||
foreach ($members as $member) {
|
||||
$preselected[] = $member['id'];
|
||||
}
|
||||
}
|
||||
|
||||
if($change) {
|
||||
if(in_array($change,$preselected)) {
|
||||
group_rmv_member(local_user(),$group['name'],$change);
|
||||
}
|
||||
else {
|
||||
group_add_member(local_user(),$group['name'],$change);
|
||||
if ($change) {
|
||||
if (in_array($change, $preselected)) {
|
||||
group_rmv_member(local_user(), $group['name'], $change);
|
||||
} else {
|
||||
group_add_member(local_user(), $group['name'], $change);
|
||||
}
|
||||
|
||||
$members = group_get_members($group['id']);
|
||||
$preselected = array();
|
||||
if(count($members)) {
|
||||
foreach($members as $member)
|
||||
if (count($members)) {
|
||||
foreach ($members as $member) {
|
||||
$preselected[] = $member['id'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$drop_tpl = get_markup_template('group_drop.tpl');
|
||||
$drop_txt = replace_macros($drop_tpl, array(
|
||||
'$id' => $group['id'],
|
||||
'$delete' => t('Delete'),
|
||||
'$delete' => t('Delete Group'),
|
||||
'$form_security_token' => get_form_security_token("group_drop"),
|
||||
));
|
||||
|
||||
|
||||
$context = $context + array(
|
||||
'$title' => t('Group Editor'),
|
||||
'$gname' => array('groupname', t('Group Name: '),$group['name'], ''),
|
||||
'$gname' => array('groupname', 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')
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
if(! isset($group))
|
||||
if (! isset($group)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$groupeditor = array(
|
||||
'label_members' => t('Members'),
|
||||
|
|
@ -205,14 +215,24 @@ function group_content(App $a) {
|
|||
);
|
||||
|
||||
$sec_token = addslashes(get_form_security_token('group_member_change'));
|
||||
$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
|
||||
foreach($members as $member) {
|
||||
if($member['url']) {
|
||||
$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . ',\'' . $sec_token . '\'); return true;';
|
||||
$groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode);
|
||||
|
||||
// Format the data of the group members
|
||||
foreach ($members as $member) {
|
||||
if ($member['url']) {
|
||||
$entry = _contact_detail_for_template($member);
|
||||
$entry['label'] = 'members';
|
||||
$entry['photo_menu'] = '';
|
||||
$entry['change_member'] = array(
|
||||
'title' => t("Remove Contact"),
|
||||
'gid' => $group['id'],
|
||||
'cid' => $member['id'],
|
||||
'sec_token' => $sec_token
|
||||
);
|
||||
|
||||
$groupeditor['members'][] = $entry;
|
||||
} else {
|
||||
group_rmv_member(local_user(), $group['name'], $member['id']);
|
||||
}
|
||||
else
|
||||
group_rmv_member(local_user(),$group['name'],$member['id']);
|
||||
}
|
||||
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
|
||||
|
|
@ -220,11 +240,20 @@ function group_content(App $a) {
|
|||
);
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
|
||||
foreach($r as $member) {
|
||||
if(! in_array($member['id'],$preselected)) {
|
||||
$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . ',\'' . $sec_token . '\'); return true;';
|
||||
$groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode);
|
||||
// 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);
|
||||
$entry['label'] = 'contacts';
|
||||
$entry['photo_menu'] = '';
|
||||
$entry['change_member'] = array(
|
||||
'title' => t("Add Contact"),
|
||||
'gid' => $group['id'],
|
||||
'cid' => $member['id'],
|
||||
'sec_token' => $sec_token
|
||||
);
|
||||
|
||||
$groupeditor['contacts'][] = $entry;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -232,7 +261,11 @@ function group_content(App $a) {
|
|||
$context['$groupeditor'] = $groupeditor;
|
||||
$context['$desc'] = t('Click on a contact to add or remove.');
|
||||
|
||||
if($change) {
|
||||
// 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);
|
||||
killme();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue