X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fgroup.php;h=404448ebb77008b9175365c583ea452432823b0b;hb=f32ea03911e81ccb1ce9f6553f8fc3bdaa815ffb;hp=cfcbca4e47ce0e6cf82acf7f41e5a102dc426bcd;hpb=80ea86113d7646e9ab24948fcdf11183d07920df;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index cfcbca4e47..404448ebb7 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -6,18 +6,19 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-use Friendica\Module\Contacts;
+use Friendica\Model;
+use Friendica\Module;
+use Friendica\Util\Security;
 
 function group_init(App $a) {
 	if (local_user()) {
-		$a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
+		$a->page['aside'] = Model\Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
 	}
 }
 
@@ -29,25 +30,25 @@ 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 = Group::create(local_user(), $name);
+		$r = Model\Group::create(local_user(), $name);
 		if ($r) {
 			info(L10n::t('Group created.') . EOL);
-			$r = Group::getIdByName(local_user(), $name);
+			$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]),
@@ -55,7 +56,7 @@ function group_post(App $a) {
 		);
 		if (!DBA::isResult($r)) {
 			notice(L10n::t('Group not found.') . EOL);
-			goaway(System::baseUrl() . '/contacts');
+			$a->internalRedirect('contact');
 			return; // NOTREACHED
 		}
 		$group = $r[0];
@@ -72,7 +73,7 @@ function group_post(App $a) {
 			}
 		}
 
-		$a->page['aside'] = Group::sidebarWidget();
+		$a->page['aside'] = Model\Group::sidebarWidget();
 	}
 	return;
 }
@@ -87,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
@@ -108,7 +109,7 @@ function group_content(App $a) {
 			'$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"),
 		]);
 
 
@@ -138,7 +139,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",
@@ -149,7 +150,7 @@ function group_content(App $a) {
 			$result = null;
 
 			if (DBA::isResult($r)) {
-				$result = Group::removeByName(local_user(), $r[0]['name']);
+				$result = Model\Group::removeByName(local_user(), $r[0]['name']);
 			}
 
 			if ($result) {
@@ -158,12 +159,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]),
@@ -182,11 +183,11 @@ function group_content(App $a) {
 
 		if (!DBA::isResult($r)) {
 			notice(L10n::t('Group not found.') . EOL);
-			goaway(System::baseUrl() . '/contacts');
+			$a->internalRedirect('contact');
 		}
 
 		$group = $r[0];
-		$members = Contact::getByGroupId($group['id']);
+		$members = Model\Contact::getByGroupId($group['id']);
 		$preselected = [];
 		$entry = [];
 		$id = 0;
@@ -199,12 +200,12 @@ function group_content(App $a) {
 
 		if ($change) {
 			if (in_array($change, $preselected)) {
-				Group::removeMember($group['id'], $change);
+				Model\Group::removeMember($group['id'], $change);
 			} else {
-				Group::addMember($group['id'], $change);
+				Model\Group::addMember($group['id'], $change);
 			}
 
-			$members = Contact::getByGroupId($group['id']);
+			$members = Model\Contact::getByGroupId($group['id']);
 			$preselected = [];
 			if (count($members)) {
 				foreach ($members as $member) {
@@ -217,7 +218,7 @@ function group_content(App $a) {
 		$drop_txt = replace_macros($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"),
 		]);
 
 
@@ -226,7 +227,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,
 		];
@@ -245,12 +246,12 @@ 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) {
 		if ($member['url']) {
-			$entry = Contacts::_contact_detail_for_template($member);
+			$entry = Module\Contact::getContactTemplateVars($member);
 			$entry['label'] = 'members';
 			$entry['photo_menu'] = '';
 			$entry['change_member'] = [
@@ -262,12 +263,12 @@ function group_content(App $a) {
 
 			$groupeditor['members'][] = $entry;
 		} else {
-			Group::removeMember($group['id'], $member['id']);
+			Model\Group::removeMember($group['id'], $member['id']);
 		}
 	}
 
 	if ($nogroup) {
-		$r = Contact::getUngroupedList(local_user());
+		$r = Model\Contact::getUngroupedList(local_user());
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
 			intval(local_user())
@@ -279,7 +280,7 @@ function group_content(App $a) {
 		// Format the data of the contacts who aren't in the contact group
 		foreach ($r as $member) {
 			if (!in_array($member['id'], $preselected)) {
-				$entry = Contacts::_contact_detail_for_template($member);
+				$entry = Module\Contact::getContactTemplateVars($member);
 				$entry['label'] = 'contacts';
 				if (!$nogroup)
 					$entry['photo_menu'] = [];