webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

Replace uses of escapeJsString with json_encode

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela
2022-10-15 01:03:09 +01:00
parent 4035ec7e35
commit 270ad693eb
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/classes/Config/FormDisplay.php
View File

@@ -436,22 +436,22 @@ class FormDisplay
$this->setComments($systemPath, $opts);
// send default value to form's JS
$jsLine = '\'' . $translatedPath . '\': ';
$jsLine = '';
switch ($type) {
case 'text':
case 'short_text':
case 'number_text':
case 'password':
$jsLine .= '\'' . Sanitize::escapeJsString($valueDefault) . '\'';
$jsLine = (string) $valueDefault;
break;
case 'checkbox':
$jsLine .= $valueDefault ? 'true' : 'false';
$jsLine = (bool) $valueDefault;
break;
case 'select':
$valueDefaultJs = is_bool($valueDefault)
? (int) $valueDefault
: $valueDefault;
$jsLine .= '[\'' . Sanitize::escapeJsString($valueDefaultJs) . '\']';
$jsLine = (array) $valueDefaultJs;
break;
case 'list':
$val = $valueDefault;
@@ -459,12 +459,11 @@ class FormDisplay
unset($val['wrapper_params']);
}
$jsLine .= '\'' . Sanitize::escapeJsString(implode("\n", $val))
. '\'';
$jsLine = implode("\n", $val);
break;
}
$jsDefault[] = $jsLine;
$jsDefault[$translatedPath] = $jsLine;
return $this->formDisplayTemplate->displayInput(
$translatedPath,

14
libraries/classes/Header.php
View File

@@ -16,14 +16,15 @@ use function defined;
use function gmdate;
use function header;
use function htmlspecialchars;
use function implode;
use function ini_get;
use function is_bool;
use function json_encode;
use function sprintf;
use function strlen;
use function strtolower;
use function urlencode;
use const JSON_HEX_TAG;
/**
* Class used to output the HTTP and HTML headers
*/
@@ -201,15 +202,8 @@ class Header
public function getJsParamsCode(): string
{
$params = $this->getJsParams();
foreach ($params as $key => $value) {
if (is_bool($value)) {
$params[$key] = $key . ':' . ($value ? 'true' : 'false') . '';
} else {
$params[$key] = $key . ':"' . Sanitize::escapeJsString($value) . '"';
}
}
return 'window.CommonParams.setAll({' . implode(',', $params) . '});';
return 'window.CommonParams.setAll(' . json_encode($params, JSON_HEX_TAG) . ');';
}
/**

6
templates/config/form_display/display.twig
View File

@@ -68,9 +68,9 @@
'error_value_lte': '{{ 'Value must be less than or equal to %s!'|trans|e('js') }}',
});
$.extend(window.defaultValues, {
{{ js_default|join(",\n ")|raw }}
});
$.extend(window.defaultValues,
{{ js_default|json_encode(constant('JSON_HEX_TAG'))|raw }}
);
});
if (typeof window.configScriptLoaded !== 'undefined' && window.configInlineParams) {
window.Config.loadInlineConfig();