diff options
author | Bill Marquette <billm@pfsense.org> | 2005-06-27 05:11:15 +0000 |
---|---|---|
committer | Bill Marquette <billm@pfsense.org> | 2005-06-27 05:11:15 +0000 |
commit | eeb6c16ec4d233505e4bbd5f4056ec2d3f2de614 (patch) | |
tree | f29d44b9ecb2c4f8a1a341529d819792b127fd1c /etc/inc | |
parent | 39cecbebff0a3d2aeaba4a52584880f84e2f33ad (diff) | |
download | pfsense-eeb6c16ec4d233505e4bbd5f4056ec2d3f2de614.zip pfsense-eeb6c16ec4d233505e4bbd5f4056ec2d3f2de614.tar.gz |
Stop duplicating work - use listtags() and listtags_pkg() instead of creating the list
twice (once for xmlparse, once for xmldump).
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/xmlparse.inc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc index c950a87..a9c9080 100644 --- a/etc/inc/xmlparse.inc +++ b/etc/inc/xmlparse.inc @@ -30,6 +30,21 @@ POSSIBILITY OF SUCH DAMAGE. */ +function listtags() { + $ret = explode(" ", "cacert row config package columnitem option item fieldname field rule user key subqueue " . + "dnsserver winsserver encryption-algorithm-option hash-algorithm-option hosts tunnel " . + "onetoone staticmap route alias queue shellcmd earlyshellcmd mobilekey " . + "service servernat proxyarpnet passthrumac allowedip wolentry vlan menu domainoverrides"); + + return $ret; +} + +function listtags_pkg() { + $ret = array("onetoone", "queue", "rule", "servernat", "alias", "additional_files_needed", "tab", "template", "menu", "rowhelperfield", "service", "step", "package", "columnitem", "option", "item", "field", "package"); + + return $ret; +} + function startElement($parser, $name, $attrs) { global $parsedcfg, $depth, $curpath, $havedata, $listtags; @@ -105,16 +120,13 @@ function cData($parser, $data) { function parse_xml_config($cffile, $rootobj) { global $listtags; - $listtags = explode(" ", "cacert row config package columnitem option item fieldname field rule user key subqueue " . - "dnsserver winsserver encryption-algorithm-option hash-algorithm-option hosts tunnel " . - "onetoone staticmap route alias queue shellcmd earlyshellcmd mobilekey " . - "service servernat proxyarpnet passthrumac allowedip wolentry vlan menu domainoverrides"); + $listtags = listtags(); return parse_xml_config_raw($cffile, $rootobj); } function parse_xml_config_pkg($cffile, $rootobj) { global $listtags; - $listtags = array("onetoone", "queue", "rule", "servernat", "alias", "additional_files_needed", "tab", "template", "menu", "rowhelperfield", "service", "step", "package", "columnitem", "option", "item", "field", "package"); + $listtags = listtags_pkg(); return parse_xml_config_raw($cffile, $rootobj); } @@ -201,16 +213,13 @@ function dump_xml_config_sub($arr, $indent) { function dump_xml_config($arr, $rootobj) { global $listtags; - $listtags = explode(" ", "cacert row config package columnitem option item fieldname field rule user key subqueue " . - "dnsserver winsserver encryption-algorithm-option hash-algorithm-option hosts tunnel " . - "onetoone staticmap route alias queue shellcmd earlyshellcmd mobilekey " . - "service servernat proxyarpnet passthrumac allowedip wolentry vlan menu domainoverrides"); + $listtags = listtags(); return dump_xml_config_raw($arr, $rootobj); } function dump_xml_config_pkg($arr, $rootobj) { global $listtags; - $listtags = array("onetoone", "queue", "rule", "servernat", "alias", "additional_files_needed", "tab", "template", "menu", "rowhelperfield", "service", "step", "package", "columnitem", "option", "item", "field", "package"); + $listtags = listtags_pkg(); return dump_xml_config_raw($arr, $rootobj); } |