diff options
Diffstat (limited to 'libraries/classes/Setup/ConfigGenerator.php')
| -rw-r--r-- | libraries/classes/Setup/ConfigGenerator.php | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/libraries/classes/Setup/ConfigGenerator.php b/libraries/classes/Setup/ConfigGenerator.php index d252636efa..189c8c9260 100644 --- a/libraries/classes/Setup/ConfigGenerator.php +++ b/libraries/classes/Setup/ConfigGenerator.php @@ -36,24 +36,22 @@ class ConfigGenerator */ public static function getConfigFile(ConfigFile $cf) { - $crlf = isset($_SESSION['eol']) && $_SESSION['eol'] === 'win' - ? "\r\n" - : "\n"; + $eol = isset($_SESSION['eol']) && $_SESSION['eol'] === 'win' ? "\r\n" : "\n"; $conf = $cf->getConfig(); // header - $ret = '<?php' . $crlf - . '/**' . $crlf - . ' * Generated configuration file' . $crlf + $ret = '<?php' . $eol + . '/**' . $eol + . ' * Generated configuration file' . $eol . ' * Generated by: phpMyAdmin ' . Version::VERSION - . ' setup script' . $crlf - . ' * Date: ' . gmdate(DATE_RFC1123) . $crlf - . ' */' . $crlf . $crlf; + . ' setup script' . $eol + . ' * Date: ' . gmdate(DATE_RFC1123) . $eol + . ' */' . $eol . $eol; //servers if (! empty($conf['Servers'])) { - $ret .= self::getServerPart($cf, $crlf, $conf['Servers']); + $ret .= self::getServerPart($cf, $eol, $conf['Servers']); unset($conf['Servers']); } @@ -62,7 +60,7 @@ class ConfigGenerator foreach ($conf as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', (string) $k); - $ret .= self::getVarExport($k, $v, $crlf); + $ret .= self::getVarExport($k, $v, $eol); if (! isset($persistKeys[$k])) { continue; } @@ -77,10 +75,10 @@ class ConfigGenerator } $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); - $ret .= self::getVarExport($k, $cf->getDefault($k), $crlf); + $ret .= self::getVarExport($k, $cf->getDefault($k), $eol); } - return $ret . $crlf; + return $ret . $eol; } /** @@ -88,21 +86,21 @@ class ConfigGenerator * * @param string $var_name configuration name * @param mixed $var_value configuration value(s) - * @param string $crlf line ending + * @param string $eol line ending * * @return string */ - private static function getVarExport($var_name, $var_value, $crlf) + private static function getVarExport($var_name, $var_value, string $eol) { if (! is_array($var_value) || empty($var_value)) { return "\$cfg['" . $var_name . "'] = " - . var_export($var_value, true) . ';' . $crlf; + . var_export($var_value, true) . ';' . $eol; } if (self::isZeroBasedArray($var_value)) { return "\$cfg['" . $var_name . "'] = " - . self::exportZeroBasedArray($var_value, $crlf) - . ';' . $crlf; + . self::exportZeroBasedArray($var_value, $eol) + . ';' . $eol; } $ret = ''; @@ -110,7 +108,7 @@ class ConfigGenerator foreach ($var_value as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); $ret .= "\$cfg['" . $var_name . "']['" . $k . "'] = " - . var_export($v, true) . ';' . $crlf; + . var_export($v, true) . ';' . $eol; } return $ret; @@ -136,11 +134,11 @@ class ConfigGenerator * Exports continuous 0-based array * * @param array $array Array to export - * @param string $crlf Newline string + * @param string $eol Newline string * * @return string */ - private static function exportZeroBasedArray(array $array, $crlf) + private static function exportZeroBasedArray(array $array, string $eol) { $retv = []; foreach ($array as $v) { @@ -156,7 +154,7 @@ class ConfigGenerator // more than 4 values - value per line $imax = count($retv); for ($i = 0; $i < $imax; $i++) { - $ret .= ($i > 0 ? ',' : '') . $crlf . ' ' . $retv[$i]; + $ret .= ($i > 0 ? ',' : '') . $eol . ' ' . $retv[$i]; } return $ret . ']'; @@ -166,36 +164,36 @@ class ConfigGenerator * Generate server part of config file * * @param ConfigFile $cf Config file - * @param string $crlf Carriage return char + * @param string $eol Carriage return char * @param array $servers Servers list * * @return string|null */ - protected static function getServerPart(ConfigFile $cf, $crlf, array $servers) + protected static function getServerPart(ConfigFile $cf, string $eol, array $servers) { if ($cf->getServerCount() === 0) { return null; } - $ret = '/* Servers configuration */' . $crlf . '$i = 0;' . $crlf . $crlf; + $ret = '/* Servers configuration */' . $eol . '$i = 0;' . $eol . $eol; foreach ($servers as $id => $server) { $ret .= '/* Server: ' . strtr($cf->getServerName($id) . ' [' . $id . '] ', '*/', '-') - . '*/' . $crlf - . '$i++;' . $crlf; + . '*/' . $eol + . '$i++;' . $eol; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', (string) $k); $ret .= "\$cfg['Servers'][\$i]['" . $k . "'] = " . (is_array($v) && self::isZeroBasedArray($v) - ? self::exportZeroBasedArray($v, $crlf) + ? self::exportZeroBasedArray($v, $eol) : var_export($v, true)) - . ';' . $crlf; + . ';' . $eol; } - $ret .= $crlf; + $ret .= $eol; } - $ret .= '/* End of servers configuration */' . $crlf . $crlf; + $ret .= '/* End of servers configuration */' . $eol . $eol; return $ret; } |