From: Joby W. <joby@u.washington.edu> - 2004-04-21 00:10:42
|
Reini Urban wrote: > Joseph (Joby) Walker schrieb: > >> --- IniConfig.php 20 Apr 2004 18:10:27 -0000 1.6 >> +++ IniConfig.php 20 Apr 2004 22:26:27 -0000 1.7 >> @@ -53,5 +53,4 @@ include_once "lib/config.php"; >> function IniConfig($file) >> { >> - require_once('lib/pear/Config.php'); >> // List of all valid config options to be define()d which take >> "values" (not >> @@ -85,13 +84,10 @@ function IniConfig($file) >> 'DISABLE_HTTP_REDIRECT'); >> >> - $config = new Config(); >> - $root = &$config->parseConfig($file, 'inicommented'); >> - if (PEAR::isError($root)) { >> - trigger_error("Datasource file config/config.ini does not >> exist.", E_USER_ERROR); >> + if(!file_exists($file)){ >> + trigger_error("Datasource file '$file' does not exist", >> E_USER_ERROR); >> exit(); >> } >> - $out = $root->toArray(); >> >> - $rs = &$out['root']; >> + $rs = @parse_ini_file($file); > > > Uuh! Do you test this? > Sorry for the round about. My initial tests showed that the SQL statement would not work with parse_ini_file() -- as discussed at length -- because they used " characters. And the formulation one of the PCRE statements didn't seem to work either. But you just changed the SQL statements to avoid double quotes, which seems to work just fine with mysql and pgsql, and thus with some changes (additional double quotes around some of the values) parse_ini_file() works just fine. Additionally I pushed this to the demo site so that things will speed up -- there is a noticable difference. So you can see for yourself. My testing didn't catch the Pear inheritance earlier, because my test box has all of the PEAR modules installed into the php include_path. I should be done breaking crap for now -- back to work on the config/Tools.php and config/Values.php files. jbw |