diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-15 21:38:23 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-15 21:38:23 +0000 |
| commit | e8279472de81bf4a63f404cdbd6bd36ad33f3ae6 (patch) | |
| tree | 451e0098ecb1e68e9fb64faabde1875c89b6a011 /lib | |
| parent | 1f5748db2b30825426e3b877699d86d543f641eb (diff) | |
| download | ampache-e8279472de81bf4a63f404cdbd6bd36ad33f3ae6.tar.gz ampache-e8279472de81bf4a63f404cdbd6bd36ad33f3ae6.tar.bz2 ampache-e8279472de81bf4a63f404cdbd6bd36ad33f3ae6.zip | |
hopefully speed up read_config function
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/general.lib.php | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php index a6f100bc..7eae2960 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -116,53 +116,9 @@ function read_config($config_file, $debug=0, $test=0) { $value = trim($value); - if (preg_match("/^\[([A-Za-z]+)\]$/",$value,$matches)) { - // If we have previous data put it into $results... - if (isset($config_name) && isset(${$config_name}) && count(${$config_name})) { - $results[$config_name] = ${$config_name}; - } - - $config_name = $matches[1]; - - } // if it is a [section] name - - - elseif (isset($config_name)) { - - // if it's not a comment - if (preg_match("/^([\w\d]+)\s+=\s+[\"]{1}(.*?)[\"]{1}$/",$value,$matches) - || preg_match("/^([\w\d]+)\s+=\s+[\']{1}(.*?)[\']{1}$/", $value, $matches) - || preg_match("/^([\w\d]+)\s+=\s+[\'\"]{0}(.*)[\'\"]{0}$/",$value,$matches)) { - - if (isset(${$config_name}[$matches[1]]) && is_array(${$config_name}[$matches[1]]) && isset($matches[2]) ) { - if($debug) echo "Adding value <strong>$matches[2]</strong> to existing key <strong>$matches[1]</strong>\n"; - array_push(${$config_name}[$matches[1]], $matches[2]); - } - - elseif (isset(${$config_name}[$matches[1]]) && isset($matches[2]) ) { - if($debug) echo "Adding value <strong>$matches[2]</strong> to existing key $matches[1]</strong>\n"; - ${$config_name}[$matches[1]] = array(${$config_name}[$matches[1]],$matches[2]); - } - - elseif ($matches[2] !== "") { - if($debug) echo "Adding value <strong>$matches[2]</strong> for key <strong>$matches[1]</strong>\n"; - ${$config_name}[$matches[1]] = $matches[2]; - } - - // if there is something there and it's not a comment - elseif ($value{0} !== "#" AND strlen(trim($value)) > 0 AND !$test AND strlen($matches[2]) > 0) { - echo "Error Invalid Config Entry --> Line:$count"; return false; - } // elseif it's not a comment and there is something there - - else { - if($debug) echo "Key <strong>$matches[1]</strong> defined, but no value set\n"; - } - } // end if it's not a comment - - } // elseif no config_name - + if (substr($value,0,1) == '#') { continue; } - elseif (preg_match("/^([\w\d]+)\s+=\s+[\"]{1}(.*?)[\"]{1}$/",$value,$matches) + if (preg_match("/^([\w\d]+)\s+=\s+[\"]{1}(.*?)[\"]{1}$/",$value,$matches) || preg_match("/^([\w\d]+)\s+=\s+[\']{1}(.*?)[\']{1}$/", $value, $matches) || preg_match("/^([\w\d]+)\s+=\s+[\'\"]{0}(.*)[\'\"]{0}$/",$value,$matches)) { |