aboutsummaryrefslogtreecommitdiffstats
path: root/mod/group.php
diff options
context:
space:
mode:
authorChris Case <kahotep@bunda.dreamhost.com>2011-05-21 21:40:16 -0700
committerChris Case <kahotep@bunda.dreamhost.com>2011-05-21 21:40:16 -0700
commit4cff911939b263993eb41682ca558c975e2db01f (patch)
tree78f58e08d04413827744689d0f5df7660bee6caa /mod/group.php
parent2cf696d0b5d647e1741d2f94ee379aa19b25ae1b (diff)
parentf3f063c0dd7fd8b706987b856d79c7b58924acbb (diff)
downloadvolse-hubzilla-4cff911939b263993eb41682ca558c975e2db01f.tar.gz
volse-hubzilla-4cff911939b263993eb41682ca558c975e2db01f.tar.bz2
volse-hubzilla-4cff911939b263993eb41682ca558c975e2db01f.zip
merged multipart email changes
Diffstat (limited to 'mod/group.php')
-rw-r--r--mod/group.php127
1 files changed, 92 insertions, 35 deletions
diff --git a/mod/group.php b/mod/group.php
index fcdc6a758..3da633edf 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -55,28 +55,7 @@ function group_post(&$a) {
if($r)
notice( t('Group name changed.') . EOL );
}
- $members = $_POST['group_members_select'];
- if(is_array($members))
- array_walk($members,'validate_members');
- $r = q("DELETE FROM `group_member` WHERE `gid` = %d AND `uid` = %d",
- intval($a->argv[1]),
- intval(local_user())
- );
- $result = true;
- if(is_array($members) && count($members)) {
- foreach($members as $member) {
- $r = q("INSERT INTO `group_member` ( `uid`, `gid`, `contact-id`)
- VALUES ( %d, %d, %d )",
- intval(local_user()),
- intval($group['id']),
- intval($member)
- );
- if(! $r)
- $result = false;
- }
- }
- if($result)
- notice( t('Membership list updated.') . EOL);
+
$a->page['aside'] = group_side();
}
return;
@@ -90,8 +69,12 @@ function group_content(&$a) {
}
if(($a->argc == 2) && ($a->argv[1] === 'new')) {
- $tpl = load_view_file('view/group_new.tpl');
- $o .= replace_macros($tpl,array());
+ $tpl = get_markup_template('group_new.tpl');
+ $o .= replace_macros($tpl,array(
+ '$desc' => t('Create a group of contacts/friends.'),
+ '$name' => t('Group Name: '),
+ '$submit' => t('Submit')
+ ));
return $o;
}
@@ -109,13 +92,22 @@ function group_content(&$a) {
notice( t('Unable to remove group.') . EOL);
}
goaway($a->get_baseurl() . '/group');
- return; // NOTREACHED
+ // NOTREACHED
+ }
+
+ if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+ $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(count($r))
+ $change = intval($a->argv[2]);
}
+ if(($a->argc > 1) && (intval($a->argv[1]))) {
- if(($a->argc == 2) && (intval($a->argv[1]))) {
require_once('include/acl_selectors.php');
- $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
intval($a->argv[1]),
intval(local_user())
);
@@ -124,14 +116,31 @@ function group_content(&$a) {
goaway($a->get_baseurl() . '/contacts');
}
$group = $r[0];
- $ret = group_get_members($group['id']);
+ $members = group_get_members($group['id']);
$preselected = array();
- if(count($ret)) {
- foreach($ret as $p)
- $preselected[] = $p['id'];
+ 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);
+ }
+
+ $members = group_get_members($group['id']);
+ $preselected = array();
+ if(count($members)) {
+ foreach($members as $member)
+ $preselected[] = $member['id'];
+ }
}
- $drop_tpl = load_view_file('view/group_drop.tpl');
+
+ $drop_tpl = get_markup_template('group_drop.tpl');
$drop_txt = replace_macros($drop_tpl, array(
'$id' => $group['id'],
'$delete' => t('Delete')
@@ -139,15 +148,63 @@ function group_content(&$a) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
- $tpl = load_view_file('view/group_edit.tpl');
+ $tpl = get_markup_template('group_edit.tpl');
$o .= replace_macros($tpl, array(
'$gid' => $group['id'],
'$name' => $group['name'],
'$drop' => $drop_txt,
- '$selector' => contact_select('group_members_select','group_members_select',$preselected,25,false,$celeb)
+ '$desc' => t('Click on a contact to add or remove.'),
+ '$title' => t('Group Editor'),
+ '$gname' => t('Group Name: '),
+ '$submit' => t('Submit')
));
}
+
+ if(! isset($group))
+ return;
+
+ $o .= '<div id="group-update-wrapper">';
+ if($change)
+ $o = '';
+
+ $o .= '<div id="group-members">';
+ $o .= '<h3>' . t('Members') . '</h3>';
+ foreach($members as $member) {
+ if($member['url']) {
+ $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+ $o .= micropro($member,true,'mpgroup');
+ }
+ else
+ group_rmv_member(local_user(),$group['name'],$member['id']);
+ }
+
+ $o .= '</div><div id="group-members-end"></div>';
+ $o .= '<hr id="group-separator" />';
+ $o .= '<div id="group-all-contacts">';
+
+ $o .= '<h3>' . t('All Contacts') . '</h3>';
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
+ intval(local_user())
+ );
+
+ if(count($r)) {
+ foreach($r as $member) {
+ if(! in_array($member['id'],$preselected)) {
+ $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+ $o .= micropro($member,true,'mpall');
+ }
+ }
+ }
+
+ $o .= '</div><div id="group-all-contacts-end"></div>';
+
+ if($change) {
+ echo $o;
+ killme();
+ }
+ $o .= '</div>';
return $o;
-} \ No newline at end of file
+}
+