diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-11-06 22:33:15 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-11-06 22:33:15 -0500 |
commit | 093bcebcd38818d7f72f09e622f3412ddecc3c97 (patch) | |
tree | 15a5e2ea660b5cbf1d4fdabf3c4fda7f2c594b95 | |
parent | 26433cb8424871912ef94213976205cd16d7831c (diff) | |
download | pfsense-093bcebcd38818d7f72f09e622f3412ddecc3c97.zip pfsense-093bcebcd38818d7f72f09e622f3412ddecc3c97.tar.gz |
Move newer xmlreader code to xmlreader.inc. Restore old xmlparse code to xmlparse.inc. Default to the older xmlparse.inc but add a flag check if /cf/conf/use_xmlreader is present the newer code will be included instead until the remaining bugs can be resolved with it (see rcs for many).
-rw-r--r-- | etc/inc/config.gui.inc | 5 | ||||
-rw-r--r-- | etc/inc/config.inc | 5 | ||||
-rw-r--r-- | etc/inc/notices.inc | 5 | ||||
-rw-r--r-- | etc/inc/pkg-utils.inc | 5 | ||||
-rwxr-xr-x | usr/local/www/carp_status.php | 1 |
5 files changed, 16 insertions, 5 deletions
diff --git a/etc/inc/config.gui.inc b/etc/inc/config.gui.inc index 9922275..d56703f 100644 --- a/etc/inc/config.gui.inc +++ b/etc/inc/config.gui.inc @@ -61,7 +61,10 @@ ini_set("memory_limit","128M"); require_once('config.lib.inc'); require_once("notices.inc"); require_once("util.inc"); -require_once("xmlparse.inc"); +if(file_exists("/cf/conf/use_xmlreader")) + require_once("xmlreader.inc"); +else + require_once("xmlparse.inc"); require_once("crypt.inc"); /* read platform */ diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 0312fd3..ace1cc7 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -66,7 +66,10 @@ require_once("notices.inc"); if($g['booting']) echo "."; require_once("util.inc"); if($g['booting']) echo "."; -require_once("xmlparse.inc"); +if(file_exists("/cf/conf/use_xmlreader")) + require_once("xmlreader.inc"); +else + require_once("xmlparse.inc"); if($g['booting']) echo "."; require_once("crypt.inc"); diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc index 26130be..b936dcd 100644 --- a/etc/inc/notices.inc +++ b/etc/inc/notices.inc @@ -173,7 +173,10 @@ function close_notice($id) { * Outputs notices in XML formatted text ******/ function dump_xml_notices() { - require_once("xmlparse.inc"); + if(file_exists("/cf/conf/use_xmlreader")) + require_once("xmlreader.inc"); + else + require_once("xmlparse.inc"); global $notice_path, $listtags; $listtags[] = 'notice'; if(!$notices = get_notices()) return; diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 3f04edc..7775b1a 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -41,7 +41,10 @@ */ require_once("xmlrpc.inc"); -require_once("xmlparse.inc"); +if(file_exists("/cf/conf/use_xmlreader")) + require_once("xmlreader.inc"); +else + require_once("xmlparse.inc"); require_once("service-utils.inc"); require_once("pfsense-utils.inc"); require_once("globals.inc"); diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 1792f5d..efb147f 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -39,7 +39,6 @@ */ require_once("guiconfig.inc"); -require_once("xmlparse.inc"); function gentitle_pkg($pgname) { global $config; |