mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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).

Browse Source
This commit is contained in:
Scott Ullrich 2009-11-06 22:33:15 -05:00
parent 26433cb842
commit 093bcebcd3
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/inc/config.gui.inc
View File

@ -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 */

5
etc/inc/config.inc
View File

@ -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");

5
etc/inc/notices.inc
View File

@ -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;

5
etc/inc/pkg-utils.inc
View File

@ -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");

1
usr/local/www/carp_status.php
View File

@ -39,7 +39,6 @@
*/
require_once("guiconfig.inc");
require_once("xmlparse.inc");
function gentitle_pkg($pgname) {
global $config;