[phpwiki-checkins] CVS: phpwiki/lib/pear Config.php,1.2,1.3

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/pear
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7606/lib/pear

Modified Files:
	Config.php 
Log Message:
Some IniConfig fixes: prepend our private lib/pear dir
  switch from " to ' in the auth statements
  use error handling. 
WikiUserNew changes for the new "'$variable'" syntax 
  in the statements
TODO: optimization to put config vars into the session.


Index: Config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pear/Config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- Config.php	20 Apr 2004 16:41:35 -0000	1.2
+++ Config.php	20 Apr 2004 17:08:38 -0000	1.3
@@ -23,10 +23,10 @@ require_once('lib/pear/Config/Container.
 $GLOBALS['CONFIG_TYPES'] = 
         array(
-            'apache'        =>array('Config/Container/Apache.php','Config_Container_Apache'),
-            'genericconf'   =>array('Config/Container/GenericConf.php','Config_Container_GenericConf'),
-            'inifile'       =>array('Config/Container/IniFile.php','Config_Container_IniFile'),
-            'inicommented'  =>array('Config/Container/IniCommented.php','Config_Container_IniCommented'),
-            'phparray'      =>array('Config/Container/PHPArray.php','Config_Container_PHPArray'),
-            'xml'           =>array('Config/Container/XML.php','Config_Container_XML')
+            'apache'        =>array('lib/pear/Config/Container/Apache.php','Config_Container_Apache'),
+            'genericconf'   =>array('lib/pear/Config/Container/GenericConf.php','Config_Container_GenericConf'),
+            'inifile'       =>array('lib/pear/Config/Container/IniFile.php','Config_Container_IniFile'),
+            'inicommented'  =>array('lib/pear/Config/Container/IniCommented.php','Config_Container_IniCommented'),
+            'phparray'      =>array('lib/pear/Config/Container/PHPArray.php','Config_Container_PHPArray'),
+            'xml'           =>array('lib/pear/Config/Container/XML.php','Config_Container_XML')
             );
 
@@ -184,5 +184,5 @@ class Config {
         $configType = strtolower($configType);
         if (!$this->isConfigTypeRegistered($configType)) {
-            return PEAR::raiseError("Configuration type '$configType' is not registered in Config::parseConfig.", null, PEAR_ERROR_RETURN);
+            PEAR::raiseError("Configuration type '$configType' is not registered in Config::parseConfig.", null, PEAR_ERROR_RETURN);
         }
         $includeFile = $GLOBALS['CONFIG_TYPES'][$configType][0];
@@ -192,6 +192,6 @@ class Config {
         $parser = new $className($options);
         $error = $parser->parseDatasrc($datasrc, $this);
-        if ($error !== true) {
-            return $error;
+        if (PEAR::isError($error)) {
+            PEAR::raiseError($error, null, PEAR_ERROR_DIE);
         }
         $this->parserOptions = $parser->options;