Some more changes after review

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

diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index 134b002c1bc79c85df3820b26d1f9d2f45b07f06..3fd5fef49ff46e4ab0e5f425e35f0e281eb5e96a 100644 (file)
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -43,11 +43,13 @@ class Delegation extends BaseSettings
 
                BaseModule::checkFormSecurityTokenRedirectOnError('settings/delegation', 'delegate');
 
-               $parent_uid = (int)$_POST['parent_user'] ?? 0;
-               $parent_password = $_POST['parent_password'] ?? '';
+               $parent_uid = $request['parent_user'] ?? null;
+               $parent_password = $request['parent_password'] ?? '';
 
-               if ($parent_uid != 0) {
+               if ($parent_uid) {
                        try {
+                               // An integer value will trigger the direct user query on uid in User::getAuthenticationInfo
+                               $parent_uid = (int)$parent_uid;
                                User::getIdFromPasswordAuthentication($parent_uid, $parent_password);
                                DI::sysmsg()->addInfo(DI::l10n()->t('Delegation successfully granted.'));
                        } catch (\Exception $ex) {
@@ -142,7 +144,7 @@ class Delegation extends BaseSettings
                        $parents = [0 => DI::l10n()->t('No parent user')];
 
                        $fields = ['uid', 'username', 'nickname'];
-                       $condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => 0];
+                       $condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => null];
                        $parent_users = DBA::selectToArray('user', $fields, $condition);
                        foreach($parent_users as $parent) {
                                if ($parent['uid'] != DI::userSession()->getLocalUserId()) {