X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=263586e2e903458f1cf7627a8849ffc4bdc64149;hb=b888382cc6cc2b2b123ef06abefe4ea10c2620d5;hp=cef4371e94e2448986bce90b03f4e32d0e507438;hpb=609c45e791fe23217decbc6e07f44a1f9a9afc93;p=friendica.git diff --git a/mod/group.php b/mod/group.php index cef4371e94..263586e2e9 100644 --- a/mod/group.php +++ b/mod/group.php @@ -22,7 +22,7 @@ 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) { @@ -32,13 +32,13 @@ function group_post(&$a) { 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()) @@ -51,7 +51,7 @@ 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']) @@ -62,12 +62,12 @@ function group_post(&$a) { $a->page['aside'] = group_side(); } - return; + return; } function group_content(&$a) { $change = false; - + if(! local_user()) { notice( t('Permission denied') . EOL); return; @@ -84,11 +84,11 @@ function group_content(&$a) { $tpl = get_markup_template('group_edit.tpl'); $context = array( - '$submit' => t('Submit'), + '$submit' => t('Save Group'), ); 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: '), '', ''), @@ -101,13 +101,13 @@ function group_content(&$a) { 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) info( t('Group removed.') . EOL); @@ -120,7 +120,7 @@ function group_content(&$a) { 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()) @@ -172,9 +172,7 @@ function group_content(&$a) { '$form_security_token' => get_form_security_token("group_drop"), )); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $context = $context + array( '$title' => t('Group Editor'), '$gname' => array('groupname',t('Group Name: '),$group['name'], ''), @@ -194,7 +192,7 @@ function group_content(&$a) { 'label_contacts' => t('All Contacts'), 'contacts' => array(), ); - + $sec_token = addslashes(get_form_security_token('group_member_change')); $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); foreach($members as $member) { @@ -228,8 +226,7 @@ function group_content(&$a) { echo replace_macros($tpl, $context); killme(); } - + return replace_macros($tpl, $context); } -