X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=8b2ce9ca12eb829e9efcc19abf08bbc612934c1c;hb=1ad5f2dc46758d5b10ffe541a60fb19c56297af2;hp=f8fefc78f9e96cf91ac481f713ea956b8568df77;hpb=d71327e311120cff52b4db9baf498ac7c3239635;p=friendica.git diff --git a/mod/group.php b/mod/group.php index f8fefc78f9..8b2ce9ca12 100644 --- a/mod/group.php +++ b/mod/group.php @@ -6,13 +6,16 @@ */ use Friendica\App; +use Friendica\BaseModule; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model; use Friendica\Module; +use Friendica\Util\Security; function group_init(App $a) { if (local_user()) { @@ -28,7 +31,7 @@ function group_post(App $a) { } if (($a->argc == 2) && ($a->argv[1] === 'new')) { - check_form_security_token_redirectOnErr('/group/new', 'group_edit'); + BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit'); $name = notags(trim($_POST['groupname'])); $r = Model\Group::create(local_user(), $name); @@ -36,17 +39,17 @@ function group_post(App $a) { info(L10n::t('Group created.') . EOL); $r = Model\Group::getIdByName(local_user(), $name); if ($r) { - goaway(System::baseUrl() . '/group/' . $r); + $a->internalRedirect('group/' . $r); } } else { notice(L10n::t('Could not create group.') . EOL); } - goaway(System::baseUrl() . '/group'); + $a->internalRedirect('group'); return; // NOTREACHED } if (($a->argc == 2) && intval($a->argv[1])) { - check_form_security_token_redirectOnErr('/group', 'group_edit'); + BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit'); $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($a->argv[1]), @@ -54,7 +57,7 @@ function group_post(App $a) { ); if (!DBA::isResult($r)) { notice(L10n::t('Group not found.') . EOL); - goaway(System::baseUrl() . '/contact'); + $a->internalRedirect('contact'); return; // NOTREACHED } $group = $r[0]; @@ -86,7 +89,7 @@ function group_content(App $a) { // With no group number provided we jump to the unassigned contacts as a starting point if ($a->argc == 1) { - goaway('group/none'); + $a->internalRedirect('group/none'); } // Switch to text mode interface if we have more than 'n' contacts or group members @@ -95,7 +98,7 @@ function group_content(App $a) { $switchtotext = Config::get('system', 'groupedit_image_limit', 400); } - $tpl = get_markup_template('group_edit.tpl'); + $tpl = Renderer::getMarkupTemplate('group_edit.tpl'); $context = [ '$submit' => L10n::t('Save Group'), @@ -103,11 +106,11 @@ function group_content(App $a) { ]; if (($a->argc == 2) && ($a->argv[1] === 'new')) { - return replace_macros($tpl, $context + [ + return Renderer::replaceMacros($tpl, $context + [ '$title' => L10n::t('Create a group of contacts/friends.'), '$gname' => ['groupname', L10n::t('Group Name: '), '', ''], '$gid' => 'new', - '$form_security_token' => get_form_security_token("group_edit"), + '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"), ]); @@ -137,7 +140,7 @@ function group_content(App $a) { if (($a->argc == 3) && ($a->argv[1] === 'drop')) { - check_form_security_token_redirectOnErr('/group', 'group_drop', 't'); + BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't'); if (intval($a->argv[2])) { $r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -157,12 +160,12 @@ function group_content(App $a) { notice(L10n::t('Unable to remove group.') . EOL); } } - goaway(System::baseUrl() . '/group'); + $a->internalRedirect('group'); // NOTREACHED } if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { - check_form_security_token_ForbiddenOnErr('group_member_change', 't'); + BaseModule::checkFormSecurityTokenForbiddenOnError('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]), @@ -181,7 +184,7 @@ function group_content(App $a) { if (!DBA::isResult($r)) { notice(L10n::t('Group not found.') . EOL); - goaway(System::baseUrl() . '/contact'); + $a->internalRedirect('contact'); } $group = $r[0]; @@ -212,11 +215,11 @@ function group_content(App $a) { } } - $drop_tpl = get_markup_template('group_drop.tpl'); - $drop_txt = replace_macros($drop_tpl, [ + $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl'); + $drop_txt = Renderer::replaceMacros($drop_tpl, [ '$id' => $group['id'], '$delete' => L10n::t('Delete Group'), - '$form_security_token' => get_form_security_token("group_drop"), + '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"), ]); @@ -225,7 +228,7 @@ function group_content(App $a) { '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''], '$gid' => $group['id'], '$drop' => $drop_txt, - '$form_security_token' => get_form_security_token('group_edit'), + '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'), '$edit_name' => L10n::t('Edit Group Name'), '$editable' => 1, ]; @@ -244,7 +247,7 @@ function group_content(App $a) { 'contacts' => [], ]; - $sec_token = addslashes(get_form_security_token('group_member_change')); + $sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change')); // Format the data of the group members foreach ($members as $member) { @@ -304,11 +307,11 @@ function group_content(App $a) { $context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false); if ($change) { - $tpl = get_markup_template('groupeditor.tpl'); - echo replace_macros($tpl, $context); + $tpl = Renderer::getMarkupTemplate('groupeditor.tpl'); + echo Renderer::replaceMacros($tpl, $context); killme(); } - return replace_macros($tpl, $context); + return Renderer::replaceMacros($tpl, $context); }