Use centralized function to fetch query results

[friendica.git] / src / Module / Settings / Delegation.php

diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index dffb23eb6f6a2feaa5c79da01bcc6e5f06f0dc56..75e683e60a179b3190538f154a4d7075427357eb 100644 (file)
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -1,28 +1,44 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Settings;
 
-use Friendica\App\Arguments;
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Module\BaseSettingsModule;
+use Friendica\Module\BaseSettings;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 
 /**
  * Account delegation settings module
  */
-class Delegation extends BaseSettingsModule
+class Delegation extends BaseSettings
 {
-       public static function post(array $parameters = [])
+       protected function post(array $request = [])
        {
-               if (!local_user() || !empty(DI::app()->user['uid']) && DI::app()->user['uid'] != local_user()) {
+               if (!DI::app()->isLoggedIn()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
                }
 
@@ -46,9 +62,9 @@ class Delegation extends BaseSettingsModule
                DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
        }
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
-               parent::content($parameters);
+               parent::content();
 
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -109,6 +125,7 @@ class Delegation extends BaseSettingsModule
                while ($contact = DBA::fetch($contacts)) {
                        $nicknames[] = $contact['nick'];
                }
+               DBA::close($contacts);
 
                // get user records for all potential page delegates who are not already delegates or managers
                $potentialDelegateUsers = DBA::selectToArray('user', ['uid', 'username', 'nickname'], ['nickname' => $nicknames]);
@@ -134,7 +151,7 @@ class Delegation extends BaseSettingsModule
                                }
                        }
 
-                       $parent_user = ['parent_user', '', $parent_uid, '', $parents];
+                       $parent_user = ['parent_user', DI::l10n()->t('Parent User'), $parent_uid, '', $parents];
                        $parent_password = ['parent_password', DI::l10n()->t('Parent Password:'), '', DI::l10n()->t('Please enter the password of the parent account to legitimize your request.')];
                }
 
@@ -143,7 +160,7 @@ class Delegation extends BaseSettingsModule
                $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/delegation.tpl'), [
                        '$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
                        '$account_header' => DI::l10n()->t('Additional Accounts'),
-                       '$account_desc' => DI::l10n()->t('Register additional accounts that are automatically connected to your existing account so you can manage it from this account.'),
+                       '$account_desc' => DI::l10n()->t('Register additional accounts that are automatically connected to your existing account so you can manage them from this account.'),
                        '$add_account' => DI::l10n()->t('Register an additional account'),
                        '$parent_header' => DI::l10n()->t('Parent User'),
                        '$parent_user' => $parent_user,