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

Do not output unescaped chars to generated configuration file.

Browse Source
This commit is contained in:
Michal Čihař
2009-03-24 08:34:23 +00:00
parent 7758956869
commit dcf66863db
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/lib/ConfigFile.class.php
View File

@@ -280,6 +280,7 @@ class ConfigFile
if ($this->getServerCount() > 0) { if ($this->getServerCount() > 0) {
$ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
foreach ($c['Servers'] as $id => $server) { foreach ($c['Servers'] as $id => $server) {
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
$ret .= '/* Server: ' . $this->getServerName($id) . " [$id] */" . $crlf $ret .= '/* Server: ' . $this->getServerName($id) . " [$id] */" . $crlf
. '$i++;' . $crlf; . '$i++;' . $crlf;
foreach ($server as $k => $v) { foreach ($server as $k => $v) {
@@ -295,6 +296,7 @@ class ConfigFile
// other settings // other settings
$persistKeys = $this->persistKeys; $persistKeys = $this->persistKeys;
foreach ($c as $k => $v) { foreach ($c as $k => $v) {
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
$ret .= "\$cfg['$k'] = " . var_export($v, true) . ';' . $crlf; $ret .= "\$cfg['$k'] = " . var_export($v, true) . ';' . $crlf;
if (isset($persistKeys[$k])) { if (isset($persistKeys[$k])) {
unset($persistKeys[$k]); unset($persistKeys[$k]);
@@ -303,6 +305,7 @@ class ConfigFile
// keep 1d array keys which are present in $persist_keys (config_info.inc.php) // keep 1d array keys which are present in $persist_keys (config_info.inc.php)
foreach (array_keys($persistKeys) as $k) { foreach (array_keys($persistKeys) as $k) {
if (strpos($k, '/') === false) { if (strpos($k, '/') === false) {
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
$ret .= "\$cfg['$k'] = " . var_export($this->getDefault($k), true) . ';' . $crlf; $ret .= "\$cfg['$k'] = " . var_export($this->getDefault($k), true) . ';' . $crlf;
} }
} }