notags calls

[friendica.git] / mod / group.php

diff --git a/mod/group.php b/mod/group.php
index 129cf18c2a24febbd72c57badf990ae87a5d0099..970fbba299e0a1703aeb65c25bee7962522f19e6 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -10,11 +10,13 @@ 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;
+use Friendica\Util\Strings;
 
 function group_init(App $a) {
        if (local_user()) {
@@ -32,18 +34,18 @@ function group_post(App $a) {
        if (($a->argc == 2) && ($a->argv[1] === 'new')) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
 
-               $name = notags(trim($_POST['groupname']));
+               $name = Strings::removeTags(trim($_POST['groupname']));
                $r = Model\Group::create(local_user(), $name);
                if ($r) {
                        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
        }
 
@@ -56,11 +58,11 @@ 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];
-               $groupname = notags(trim($_POST['groupname']));
+               $groupname = Strings::removeTags(trim($_POST['groupname']));
                if (strlen($groupname) && ($groupname != $group['name'])) {
                        $r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d",
                                DBA::escape($groupname),
@@ -88,7 +90,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
@@ -97,7 +99,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'),
@@ -105,7 +107,7 @@ 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',
@@ -159,7 +161,7 @@ function group_content(App $a) {
                                notice(L10n::t('Unable to remove group.') . EOL);
                        }
                }
-               goaway(System::baseUrl() . '/group');
+               $a->internalRedirect('group');
                // NOTREACHED
        }
 
@@ -183,7 +185,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];
@@ -214,8 +216,8 @@ 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' => BaseModule::getFormSecurityToken("group_drop"),
@@ -306,11 +308,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);
 
 }