X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fgroup.php;h=5b28784f5663cc1b7056125b26619416e9e76b6d;hb=fd8df4c4d6688e5ffd6bc78e14062aa064102715;hp=2e2c8ab23139c34729aeb40d2fdfbc8bd2ed0905;hpb=c052d688284fda76c612325b237d8352f2abb5d4;p=friendica.git diff --git a/mod/group.php b/mod/group.php index 2e2c8ab231..5b28784f56 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','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0)); } } @@ -21,20 +21,24 @@ function group_post(&$a) { } 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); 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); } else - notice( t('Could not create group.') . EOL ); + notice( t('Could not create group.') . EOL ); goaway($a->get_baseurl() . '/group'); return; // NOTREACHED } if(($a->argc == 2) && (intval($a->argv[1]))) { + check_form_security_token_redirectOnErr('/group', 'group_edit'); + $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($a->argv[1]), intval(local_user()) @@ -47,55 +51,76 @@ function group_post(&$a) { $group = $r[0]; $groupname = notags(trim($_POST['groupname'])); if((strlen($groupname)) && ($groupname != $group['name'])) { - $r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", + $r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc($groupname), intval(local_user()), intval($group['id']) ); if($r) - notice( t('Group name changed.') . EOL ); + info( t('Group name changed.') . EOL ); } $a->page['aside'] = group_side(); } - return; + return; } function group_content(&$a) { + $change = false; if(! local_user()) { 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 = 400; + + $tpl = get_markup_template('group_edit.tpl'); + + $context = array( + '$submit' => t('Save Group'), + ); + if(($a->argc == 2) && ($a->argv[1] === 'new')) { - $tpl = file_get_contents('view/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; + + return replace_macros($tpl, $context + array( + '$title' => t('Create a group of contacts/friends.'), + '$gname' => array('groupname',t('Group Name: '), '', ''), + '$gid' => 'new', + '$form_security_token' => get_form_security_token("group_edit"), + )); + + } if(($a->argc == 3) && ($a->argv[1] === 'drop')) { + check_form_security_token_redirectOnErr('/group', 'group_drop', 't'); + if(intval($a->argv[2])) { $r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($a->argv[2]), intval(local_user()) ); - if(count($r)) + 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])) { + check_form_security_token_ForbiddenOnErr('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()) @@ -107,7 +132,7 @@ function group_content(&$a) { if(($a->argc > 1) && (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()) ); @@ -140,68 +165,69 @@ function group_content(&$a) { } - $drop_tpl = file_get_contents('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') + '$delete' => t('Delete'), + '$form_security_token' => get_form_security_token("group_drop"), )); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $tpl = file_get_contents('view/group_edit.tpl'); - $o .= replace_macros($tpl, array( + $context = $context + array( + '$title' => t('Group Editor'), + '$gname' => array('groupname',t('Group Name: '),$group['name'], ''), '$gid' => $group['id'], - '$name' => $group['name'], '$drop' => $drop_txt, - '$desc' => t('Click on a contact to add or remove.'), - '$title' => t('Group Editor'), - '$gname' => t('Group Name: '), - '$submit' => t('Submit') - )); + '$form_security_token' => get_form_security_token('group_edit'), + ); } - $o .= '