From dc19c4eb8c75b5ec02d2d5337b7fb63c8b61688e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 16 Feb 2014 06:27:35 -0500
Subject: [PATCH] Fixed: FS#3093 - PHPMyAdmin URL field does not accept uri symbols '?', '&' and '='
---
interface/lib/classes/ini_parser.inc.php | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/interface/lib/classes/ini_parser.inc.php b/interface/lib/classes/ini_parser.inc.php
index 6821667..b8dffba 100644
--- a/interface/lib/classes/ini_parser.inc.php
+++ b/interface/lib/classes/ini_parser.inc.php
@@ -31,13 +31,13 @@
class ini_parser{
private $config;
-
+
//* Converts a ini string to array
public function parse_ini_string($ini) {
$ini = str_replace("\r\n", "\n", $ini);
$lines = explode("\n", $ini);
foreach($lines as $line) {
- $line = trim($line);
+ $line = trim($line);
if($line != '') {
if(preg_match("/^\[([\w\d_]+)\]$/", $line, $matches)) {
$section = strtolower($matches[1]);
@@ -49,8 +49,8 @@
}
return $this->config;
}
-
-
+
+
//* Converts a config array to a string
public function get_ini_string($config_array = '') {
if($config_array == '') $config_array = $this->config;
@@ -59,19 +59,16 @@
$content .= "[$section]\n";
foreach($data as $item => $value) {
if($item != ''){
- $value = trim($value);
- $item = trim($item);
- $content .= "$item=$value\n";
- }
+ $value = trim($value);
+ $item = trim($item);
+ $content .= "$item=$value\n";
+ }
}
$content .= "\n";
}
return $content;
}
-
-
-
-
+
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1