diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-03-10 22:56:35 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-03-10 22:56:35 -0400 |
| commit | 1987293b2cf80d15677860f9c5d6ff52b9ff03db (patch) | |
| tree | 640ba9166921877915625c97bfe57eae61d57c44 /etc | |
| parent | 2f9fc96194fac9c3be7766d57fb6552913f5e567 (diff) | |
| download | pfsense-1987293b2cf80d15677860f9c5d6ff52b9ff03db.zip pfsense-1987293b2cf80d15677860f9c5d6ff52b9ff03db.tar.gz | |
Sync from HEAD to avoid complete meltdowns when downgrading from 2.0
back to 1.2.*. Tested by rebooting and visiting many pages.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/xmlparse.inc | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc index 5344640..517d9b4 100644 --- a/etc/inc/xmlparse.inc +++ b/etc/inc/xmlparse.inc @@ -32,11 +32,22 @@ /* The following items will be treated as arrays in config.xml */ function listtags() { - $ret = explode(" ", "element alias aliasurl allowedip cacert config columnitem disk dnsserver domainoverrides " . - "earlyshellcmd encryption-algorithm-option field fieldname hash-algorithm-option " . - "hosts group interface_array item key lbpool menu mobilekey mount onetoone option package passthrumac priv proxyarpnet " . - "queue pages pipe route row rule schedule service servernat servers earlyshellcmd shellcmd staticmap subqueue " . - "timerange tunnel user vip virtual_server vlan winsserver ntpserver wolentry widget depends_on_package"); + /* Please keep this list alpha sorted and no longer than 80 characters + * I know it's a pain, but it's a pain to find stuff too if it's not + */ + $ret = explode(" ", + "alias aliasurl allowedip authserver bridged ca cacert cert config container ". + "columnitem depends_on_package disk dnsserver dnsupdate domainoverrides ". + "dyndns earlyshellcmd element encryption-algorithm-option field ". + "fieldname hash-algorithm-option gateway_item gateway_group gif gre ". + "group hosts member igmpentry interface_array item key lagg lbaction lbpool l7rules ". + "lbprotocol member menu tab mobilekey monitor_type mount ntpserver onetoone ". + "openvpn-server openvpn-client openvpn-csc " . + "option ppp package passthrumac phase1 phase2 priv proxyarpnet queue ". + "pages pipe route row rule schedule service servernat servers ". + "serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ". + "tunnel user vip virtual_server vlan winsserver wolentry widget " + ); return $ret; } @@ -259,4 +270,4 @@ function dump_xml_config_raw($arr, $rootobj) { return $xmlconfig; } -?>
\ No newline at end of file +?> |
