X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fgroup.php;h=ca163902ca685d127ca4163eaaf11123428980c6;hb=a1a07e7287e9e764912bbd08383cf43503deb9e8;hp=8733614dd10576070d15f366364d3ae5b9c5e3b7;hpb=61915a524debe3db08a07f0adb86033ee894be28;p=friendica.git diff --git a/mod/group.php b/mod/group.php index 8733614dd1..ca163902ca 100644 --- a/mod/group.php +++ b/mod/group.php @@ -7,7 +7,7 @@ function validate_members(&$item) { function group_init(&$a) { if(local_user()) { require_once('include/group.php'); - $a->page['aside'] = group_side(); + $a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0)); } } @@ -24,7 +24,7 @@ function group_post(&$a) { $name = notags(trim($_POST['groupname'])); $r = group_add(local_user(),$name); if($r) { - notice( t('Group created.') . EOL ); + info( t('Group created.') . EOL ); $r = group_byname(local_user(),$name); if($r) goaway($a->get_baseurl() . '/group/' . $r); @@ -53,30 +53,9 @@ function group_post(&$a) { intval($group['id']) ); 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; - } + info( t('Group name changed.') . EOL ); } - if($result) - notice( t('Membership list updated.') . EOL); + $a->page['aside'] = group_side(); } return; @@ -89,8 +68,16 @@ function group_content(&$a) { return; } + // Switch to text mod 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 = 400; + if(($a->argc == 2) && ($a->argv[1] === 'new')) { - $tpl = load_view_file('view/group_new.tpl'); + $tpl = get_markup_template('group_new.tpl'); $o .= replace_macros($tpl,array( '$desc' => t('Create a group of contacts/friends.'), '$name' => t('Group Name: '), @@ -108,18 +95,27 @@ function group_content(&$a) { if(count($r)) $result = group_rmv(local_user(),$r[0]['name']); if($result) - notice( t('Group removed.') . EOL); + info( t('Group removed.') . EOL); else 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()) ); @@ -135,7 +131,24 @@ function group_content(&$a) { $preselected[] = $member['id']; } - $drop_tpl = load_view_file('view/group_drop.tpl'); + 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 = get_markup_template('group_drop.tpl'); $drop_txt = replace_macros($drop_tpl, array( '$id' => $group['id'], '$delete' => t('Delete') @@ -143,45 +156,66 @@ 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: '), - '$members' => t('Members:'), '$submit' => t('Submit') )); } + if(! isset($group)) + return; + + $o .= '