gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

$GLOBALS['form_display']

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-05-27 20:00:31 +01:00
parent 210521bae8
commit c948030634
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/classes/Controllers/Preferences/ManageController.php
View File

@ -64,7 +64,6 @@ class ManageController extends AbstractController
$GLOBALS['lang'] ??= null;
$GLOBALS['new_config'] ??= null;
$GLOBALS['return_url'] ??= null;
$GLOBALS['form_display'] ??= null;
$GLOBALS['all_ok'] ??= null;
$GLOBALS['query'] ??= null;
@ -147,7 +146,7 @@ class ManageController extends AbstractController
} else {
// sanitize input values: treat them as though
// they came from HTTP POST request
$GLOBALS['form_display'] = new UserFormList($GLOBALS['cf']);
$formDisplay = new UserFormList($GLOBALS['cf']);
$GLOBALS['new_config'] = $GLOBALS['cf']->getFlatDefaultConfig();
if ($request->hasBodyParam('import_merge')) {
$GLOBALS['new_config'] = array_merge($GLOBALS['new_config'], $GLOBALS['cf']->getConfigArray());
@ -160,12 +159,12 @@ class ManageController extends AbstractController
}
$GLOBALS['cf']->resetConfigData();
$GLOBALS['all_ok'] = $GLOBALS['form_display']->process(true, false);
$GLOBALS['all_ok'] = $GLOBALS['all_ok'] && ! $GLOBALS['form_display']->hasErrors();
$GLOBALS['all_ok'] = $formDisplay->process(true, false);
$GLOBALS['all_ok'] = $GLOBALS['all_ok'] && ! $formDisplay->hasErrors();
$_POST = $postParamBackup;
if (! $GLOBALS['all_ok'] && $request->hasBodyParam('fix_errors')) {
$GLOBALS['form_display']->fixErrors();
$formDisplay->fixErrors();
$GLOBALS['all_ok'] = true;
}
@ -180,7 +179,7 @@ class ManageController extends AbstractController
]);
echo $this->template->render('preferences/manage/error', [
'form_errors' => $GLOBALS['form_display']->displayErrors(),
'form_errors' => $formDisplay->displayErrors(),
'json' => $GLOBALS['json'],
'import_merge' => $request->getParsedBodyParam('import_merge'),
'return_url' => $GLOBALS['return_url'],

2
psalm-baseline.xml
View File

@ -2418,7 +2418,6 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['all_ok']]]></code>
<code><![CDATA[$GLOBALS['cf']]]></code>
<code><![CDATA[$GLOBALS['form_display']]]></code>
<code><![CDATA[$GLOBALS['json']]]></code>
<code><![CDATA[$GLOBALS['new_config']]]></code>
<code><![CDATA[$GLOBALS['query']]]></code>
@ -2437,7 +2436,6 @@
<MixedAssignment>
<code><![CDATA[$GLOBALS['all_ok']]]></code>
<code><![CDATA[$GLOBALS['cf']]]></code>
<code><![CDATA[$GLOBALS['form_display']]]></code>
<code><![CDATA[$GLOBALS['json']]]></code>
<code><![CDATA[$GLOBALS['json']]]></code>
<code><![CDATA[$GLOBALS['new_config']]]></code>