X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=51fa2493e4ae2d6cf07a1049c1dede1ab193ca80;hb=0dc06d66a0f4bc68529fe693b919d0a72ea57a28;hp=404448ebb77008b9175365c583ea452432823b0b;hpb=7ee8bdafc53a88fe51f233e14169bb4af0d376ab;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index 404448ebb7..51fa2493e4 100644
--- 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,7 +34,7 @@ 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::escapeTags(trim($_POST['groupname']));
 		$r = Model\Group::create(local_user(), $name);
 		if ($r) {
 			info(L10n::t('Group created.') . EOL);
@@ -60,7 +62,7 @@ function group_post(App $a) {
 			return; // NOTREACHED
 		}
 		$group = $r[0];
-		$groupname = notags(trim($_POST['groupname']));
+		$groupname = Strings::escapeTags(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),
@@ -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',
@@ -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);
 
 }