X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=a6f649bf399989ce967059b65af068f38ecb45ba;hb=e7be87df93895de47414a5a788cd6487adb98a29;hp=129cf18c2a24febbd72c57badf990ae87a5d0099;hpb=2f7f9ffdd827dca6996a894fac662e7c77f8e713;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index 129cf18c2a..a6f649bf39 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -10,15 +10,15 @@ use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
 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()) {
-		$a->page['aside'] = Model\Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
+		$a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
 	}
 }
 
@@ -32,18 +32,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::escapeTags(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 +56,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::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),
@@ -88,7 +88,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 +97,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 +105,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',
@@ -127,7 +127,6 @@ function group_content(App $a) {
 
 		$members = [];
 		$preselected = [];
-		$entry = [];
 
 		$context = $context + [
 			'$title' => $group['name'],
@@ -159,7 +158,7 @@ function group_content(App $a) {
 				notice(L10n::t('Unable to remove group.') . EOL);
 			}
 		}
-		goaway(System::baseUrl() . '/group');
+		$a->internalRedirect('group');
 		// NOTREACHED
 	}
 
@@ -183,14 +182,12 @@ 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];
 		$members = Model\Contact::getByGroupId($group['id']);
 		$preselected = [];
-		$entry = [];
-		$id = 0;
 
 		if (count($members)) {
 			foreach ($members as $member) {
@@ -214,8 +211,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 +303,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);
-		killme();
+		$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
+		echo Renderer::replaceMacros($tpl, $context);
+		exit();
 	}
 
-	return replace_macros($tpl, $context);
+	return Renderer::replaceMacros($tpl, $context);
 
 }