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
19,384 Commits 27 Branches 53 Tags 494 MiB
88165371ef
Commit Graph

124 Commits

Author SHA1 Message Date
Darren Embry
428c289fb4 allow null to be passed as 2nd arg to parse_config_xml* 
in which case entire config is returned
 2012-05-17 17:30:24 -04:00
Darren Embry
ff9fbc7b3c fix 'XML error: no Array object found!' errors 2012-05-17 17:14:04 -04:00
Vinicius Coque
9d3d8d005e Merge branch 'master' into inc 
Conflicts:
	etc/inc/captiveportal.inc
	etc/inc/config.console.inc
	etc/inc/config.lib.inc
	etc/inc/easyrule.inc
	etc/inc/filter.inc
	etc/inc/ipsec.inc
	etc/inc/pkg-utils.inc
	etc/inc/shaper.inc
	etc/inc/system.inc
	etc/inc/voucher.inc
 2011-01-28 17:32:17 -02:00
Scott Ullrich
79e99eb47e Make allowedhostname an array. 2011-01-25 12:30:18 -05:00
smos
71f88d75b9 Add the npt tag which is used by the IPv6 tree to the 2.0 mainline tree. 
This prevents a config blowup when a ipv6 config loads on 2.0.
 2011-01-24 08:34:16 +01:00
jim-p
72b7aa4a8e Also CDATA protect the detail field. Fixes #1168 2011-01-06 13:53:38 -05:00
Vinicius Coque
c92ccac76f Merge remote branch 'mainline/master' into inc 
Conflicts:
	etc/inc/auth.inc
	etc/inc/config.lib.inc
	etc/inc/filter.inc
	etc/inc/gwlb.inc
	etc/inc/interfaces.inc
	etc/inc/pfsense-utils.inc
	etc/inc/pkg-utils.inc
	etc/inc/shaper.inc
	etc/inc/upgrade_config.inc
	etc/inc/xmlparse.inc
	usr/local/www/fbegin.inc
 2010-12-14 09:56:34 -02:00
jim-p
7af33a75ab Print file name when logging an xml error. 2010-11-30 11:30:11 -05:00
Erik Fonnesbeck
990d7c037c Check for pfsense root object name in config.xml as a fallback if the configured name is not found. 2010-11-26 15:57:55 -07:00
Scott Ullrich
9734b0545e Remove trailing carriage return 2010-11-10 12:00:32 -05:00
Renato Botelho
addc043993 Fix quotes to use %N$X on gettext calls 2010-10-01 10:17:13 -03:00
Renato Botelho
8c04b1ae0a Merge remote branch 'mainline/master' into inc 
Conflicts:
	etc/inc/filter.inc
	etc/inc/pkg-utils.inc
	etc/inc/service-utils.inc
	etc/inc/system.inc
	etc/inc/vpn.inc
 2010-09-08 10:20:04 -03:00
Ermal
0e642c78b4 Make possible to run multiple instances of pppoe server. Not yet switched to mpd4. 2010-09-02 17:27:14 +00:00
Renato Botelho
47f12397b3 Fix gettext calls with printf to permit change strings order 2010-08-30 20:36:30 -03:00
Renato Botelho
5e56c56dba Merge remote branch 'mainline/master' into inc 
Conflicts:
	etc/inc/captiveportal.inc
 2010-08-30 19:36:59 -03:00
jim-p
6733f0f90f Add crl as a listtag 2010-08-30 17:31:16 -04:00
Renato Botelho
ada992bd11 Implement gettext() calls on xmlparse.inc 2010-08-17 09:34:12 -03:00
Ermal
187ce62b3d Do not call die while parsing package xml files. Instead return an empty array. This should avoid packages not uninstalling. 2010-08-06 21:51:37 +00:00
Scott Ullrich
981d193fb4 Remove trailing newline 2010-07-27 20:01:53 -04:00
Scott Ullrich
d9a6bd8f58 Adding build_port_path 2010-07-18 21:12:05 -04:00
Erik Fonnesbeck
1fb064e86d Separate regdomain.xml parsing back to a separate file, so it can be used when xmlreader.inc is used instead of xmlparse.inc 2010-07-10 21:36:54 -06:00
Ermal
70d6b5c491 Ticket #612. Correctly show the number of users as 0 on a group with no users. Also handle the case of empty arrays on the xmlparser. 2010-05-24 18:10:50 +00:00
Ermal
02611466ce Do not aritificially add spaces around values on CDATA fields. Tested-by: Jim 2010-05-20 19:38:05 +00:00
Ermal
2e6a43a13c Encode/decode special characters with htmlentities/html_entity_decode combo to make the parser not bail on special characters. 2010-05-18 20:03:25 +00:00
Ermal
e08e4ebc69 Make list the same. Remove whitespace at the end so it does not get interpreted as special tag. 2010-05-07 13:27:43 +00:00
Ermal
bef6cb998b Fix parsign of packages xml. 2010-03-19 17:49:39 +00:00
Ermal
541989d590 Ticket #434. Do not die when parsing config since we know how to recover. Only die during packages. 2010-03-19 15:55:04 +00:00
Erik Fonnesbeck
071d63b9ab Restore attribute support, but with some extra checks in the function that uses it. 2010-03-16 23:13:15 -06:00
Erik Fonnesbeck
441e600798 Needs a little more testing; revert attribute support in xmlparse.inc for now. 
This reverts commit 2843a3ec5d.
 2010-03-16 22:12:47 -06:00
Erik Fonnesbeck
2843a3ec5d Add optional support for reading attributes to xmlparse.inc and move regdomain.xml parsing from regdomain.inc to xmlparse.inc. 2010-03-16 20:59:06 -06:00
Ermal Luçi
9f695b0fc8 Add skip white space. To avoid erroring out on accidental blank space. 2010-03-08 23:12:50 +00:00
Erik Fonnesbeck
1e52f18cc9 Merge commit 'mainline/master' 2010-03-01 15:46:54 -07:00
Ermal Luçi
78dd50201b Prevent empty tags of creating <tag></tag> entries but instead just create them as <tag/> to be consistent. This fixes some empty arrays problems on the code. 2010-02-24 18:08:57 +00:00
Erik Fonnesbeck
9f428275e9 Add page for configuration of wireless clone interfaces. 2010-02-15 01:44:25 -07:00
Scott Ullrich
26433cb842 Adding newer xmlreader code to it's own file so that it can be turned and off until remaining bugs are fixed 2009-11-06 22:28:00 -05:00
Scott Ullrich
523855b02b Add pfSense_BUILDER_BINARIES: and pfSense_MODULE: additions 2009-09-12 15:34:07 -04:00
Ermal Luçi
5e4071bef7 Seems we need even CDATA handling since it is used through packages. 2009-09-09 22:01:59 +00:00
Ermal Luçi
0eb230cb2e If it is supposed to be an array then make sure it has the array type. This fixes wireless configuration problems at least. 2009-09-09 14:41:07 +00:00
Ermal Luçi
8f192f4e81 Test if we actually succeeded in opening the requested xml file and log an error in bad cases to avoid strange errors. 2009-08-24 10:34:16 +00:00
Ermal Luçi
d1bd66b422 Micro speedup improvements on the parser. 2009-08-13 15:59:45 +00:00
Ermal Luçi
d7b6c8424d Change the parser to xmlreader instead of the current parser. This brings speed improvements and reduces some of the errors of the previous parser. 2009-08-12 17:55:18 +00:00
Scott Ullrich
5e7d127ad9 Revert "Rename cvssync to gitsync" 
This reverts commit 62b035ce5f.
 2009-06-18 20:17:10 -04:00
Scott Ullrich
62b035ce5f Rename cvssync to gitsync 2009-06-18 20:16:23 -04:00
Charlie
336e3c1cab Port voucher login ability on CaptivePortal from M0n0Wall. 
Various locking fixes are done with the import and this means that as of now pfSense has a better performin/behaving CP than m0n0wall.
 2009-06-13 17:24:28 +00:00
Ermal Luçi
5f1e1d2617 Bring in support for QinQ. At this time it is limited to only 2 levels. 2009-03-28 09:08:31 +00:00
Ermal Luçi
0ec2fdf0ad * Introduce interface groups. For now they are availble only on Firewall:Rules section maybe it would be usable to have tham on nat too. 
* Some fixes and cleanup.
 2009-03-16 23:48:59 +00:00
Scott Ullrich
54d0c16c8a Add GIT array type rrddatafile 2009-03-12 00:31:17 -04:00
Ermal Luci
bca76c1045 Unbreak igmpproxy by making known to the parser that we have IGMP too now. 2009-02-01 15:10:45 +00:00
Helder Pereira
f63d5b66b4 This patch adds the initial support for layer7 protocol inspection gui. 2008-12-20 23:57:09 +00:00
Matthew Grooms
b63f2e8b29 Make it possible for pakages to insert additional tabbed pages into an 
existing tab group. This requires that each page in the tab group call
add_package_tabs() with the tab group name before display_top_tabs() so
pages can be inserted. While far from optimal, this system is really a
stop-gap measure until a more intelligent menu/tab system can be
implemented. Discussed with Scott on IRC.
 2008-09-16 17:41:22 +00:00