]> git.mxchange.org Git - friendica.git/blobdiff - mod/group.php
Misspelling in use statement
[friendica.git] / mod / group.php
index 09fe676c17ccee667c1b0fc6f903fd5ec6368fcf..404448ebb77008b9175365c583ea452432823b0b 100644 (file)
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -29,7 +30,7 @@ function group_post(App $a) {
        }
 
        if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-               Security::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);
@@ -37,17 +38,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])) {
-               Security::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() . '/contact');
+                       $a->internalRedirect('contact');
                        return; // NOTREACHED
                }
                $group = $r[0];
@@ -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' => Security::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')) {
-               Security::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",
@@ -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])) {
-               Security::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,7 +183,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];
@@ -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' => Security::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' => Security::get_form_security_token('group_edit'),
+                       '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
                        '$edit_name' => L10n::t('Edit Group Name'),
                        '$editable' => 1,
                ];
@@ -245,7 +246,7 @@ function group_content(App $a) {
                'contacts' => [],
        ];
 
-       $sec_token = addslashes(Security::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) {