diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index 465e80f73..927c8dfd1 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -1,10 +1,7 @@
.
All rights reserved.
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index c546f8c7e..310b5c9c8 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -1,9 +1,7 @@
.
All rights reserved.
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index 18af8d758..dfba48c91 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -1,11 +1,7 @@
.
All rights reserved.
@@ -30,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: filter
-*/
-
-##|+PRIV
-##|*IDENT=page-firewall-rules-edit
-##|*NAME=Firewall: Rules: Edit page
-##|*DESCR=Allow access to the 'Firewall: Rules: Edit' page.
-##|*MATCH=firewall_rules_edit.php*
-##|-PRIV
require("guiconfig.inc");
require_once("filter.inc");
@@ -600,9 +586,6 @@ if ($_POST) {
$input_errors[] = gettext("If you specify TCP flags that should be set you should specify out of which flags as well.");
}
- // Allow extending of the firewall edit page and include custom input validation
- pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/input_validation");
-
if (!$input_errors) {
$filterent = array();
$filterent['id'] = $_POST['ruleid']>0?$_POST['ruleid']:'';
@@ -768,9 +751,6 @@ if ($_POST) {
$filterent['updated'] = make_config_revision_entry();
- // Allow extending of the firewall edit page and include custom input validation
- pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_write_config");
-
if (isset($id) && $a_filter[$id])
$a_filter[$id] = $filterent;
else {
@@ -816,7 +796,6 @@ include("head.inc");
-
@@ -831,10 +810,7 @@ include("head.inc");
=gettext("Edit Firewall rule");?>
-
+
=gettext("Action");?>
@@ -919,8 +895,7 @@ include("head.inc");
if (have_ruleint_access($ifgen['ifname']))
$interfaces[$ifgen['ifname']] = $ifgen['ifname'];
$ifdescs = get_configured_interface_with_descr();
- // Allow extending of the firewall edit page and include custom input validation
- pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_interfaces_edit");
+
foreach ($ifdescs as $ifent => $ifdesc)
if(have_ruleint_access($ifent))
$interfaces[$ifent] = $ifdesc;
@@ -1704,10 +1679,7 @@ include("head.inc");
-
+
.
All rights reserved.
@@ -29,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: schedules
-*/
-##|+PRIV
-##|*IDENT=page-firewall-schedules
-##|*NAME=Firewall: Schedules page
-##|*DESCR=Allow access to the 'Firewall: Schedules' page.
-##|*MATCH=firewall_schedule.php*
-##|-PRIV
-
$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php
index 86b0a40a1..82775ca48 100644
--- a/src/www/firewall_schedule_edit.php
+++ b/src/www/firewall_schedule_edit.php
@@ -1,10 +1,7 @@
.
All rights reserved.
@@ -29,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: schedules
-*/
-
-##|+PRIV
-##|*IDENT=page-firewall-schedules-edit
-##|*NAME=Firewall: Schedules: Edit page
-##|*DESCR=Allow access to the 'Firewall: Schedules: Edit' page.
-##|*MATCH=firewall_schedule_edit.php*
-##|-PRIV
function schedulecmp($a, $b) {
return strcmp($a['name'], $b['name']);
diff --git a/src/www/firewall_shaper.php b/src/www/firewall_shaper.php
index a5a3189b7..da2c981ec 100644
--- a/src/www/firewall_shaper.php
+++ b/src/www/firewall_shaper.php
@@ -1,7 +1,6 @@
.
- All rights reserved.
-
- Includes code from m0n0wall which is:
Copyright (C) 2003-2005 Manuel Kasper .
- All rights reserved.
-
- Includes code from pfSense which is:
Copyright (C) 2004-2005 Scott Ullrich .
All rights reserved.
@@ -36,17 +27,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_BUILDER_BINARIES: /sbin/ifconfig
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-firewall-virtualipaddresses
-##|*NAME=Firewall: Virtual IP Addresses page
-##|*DESCR=Allow access to the 'Firewall: Virtual IP Addresses' page.
-##|*MATCH=firewall_virtual_ip.php*
-##|-PRIV
require("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index a9dbd8d90..5851fdfe7 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -1,18 +1,8 @@
.
- All rights reserved.
-
- Includes code from m0n0wall which is:
Copyright (C) 2003-2005 Manuel Kasper .
- All rights reserved.
-
- Includes code from pfSense which is:
Copyright (C) 2004-2005 Scott Ullrich .
All rights reserved.
@@ -37,17 +27,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_BUILDER_BINARIES: /sbin/ifconfig
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-firewall-virtualipaddress-edit
-##|*NAME=Firewall: Virtual IP Address: Edit page
-##|*DESCR=Allow access to the 'Firewall: Virtual IP Address: Edit' page.
-##|*MATCH=firewall_virtual_ip_edit.php*
-##|-PRIV
require("guiconfig.inc");
require_once("filter.inc");
diff --git a/src/www/getserviceproviders.php b/src/www/getserviceproviders.php
index 91713772d..86416cfc3 100644
--- a/src/www/getserviceproviders.php
+++ b/src/www/getserviceproviders.php
@@ -1,6 +1,6 @@
All rights reserved.
@@ -25,16 +25,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: ajax
-*/
-##|+PRIV
-##|*IDENT=page-getserviceproviders
-##|*NAME=AJAX: Get Service Providers
-##|*DESCR=Allow access to the 'AJAX: Service Providers' page.
-##|*MATCH=getserviceproviders.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("pfsense-utils.inc");
diff --git a/src/www/getstats.php b/src/www/getstats.php
index fa2cdfec1..c49f1d30c 100644
--- a/src/www/getstats.php
+++ b/src/www/getstats.php
@@ -1,6 +1,6 @@
, Manuel Kasper
and Jonathan Watt .
All rights reserved.
@@ -28,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: graph
-*/
-
-##|+PRIV
-##|*IDENT=page-diagnostics-interfacetraffic
-##|*NAME=Diagnostics: Interface Traffic page
-##|*DESCR=Allow access to the 'Diagnostics: Interface Traffic' page.
-##|*MATCH=graph.php*
-##|-PRIV
require("globals.inc");
require("guiconfig.inc");
diff --git a/src/www/graph_cpu.php b/src/www/graph_cpu.php
index 3a2c3f248..0cc2537fd 100644
--- a/src/www/graph_cpu.php
+++ b/src/www/graph_cpu.php
@@ -1,8 +1,6 @@
, Manuel Kasper
and Jonathan Watt .
All rights reserved.
@@ -28,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: graph
-*/
-
-##|+PRIV
-##|*IDENT=page-diagnostics-cpuutilization
-##|*NAME=Diagnostics: CPU Utilization page
-##|*DESCR=Allow access to the 'Diagnostics: CPU Utilization' page.
-##|*MATCH=graph_cpu.php*
-##|-PRIV
require_once("guiconfig.inc");
diff --git a/src/www/halt.php b/src/www/halt.php
index 3351b5fdb..0b9429bf1 100755
--- a/src/www/halt.php
+++ b/src/www/halt.php
@@ -1,12 +1,7 @@
.
All rights reserved.
@@ -31,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: header
-*/
-
-##|+PRIV
-##|*IDENT=page-diagnostics-haltsystem
-##|*NAME=Diagnostics: Halt system page
-##|*DESCR=Allow access to the 'Diagnostics: Halt system' page.
-##|*MATCH=halt.php*
-##|-PRIV
require("guiconfig.inc");
require("functions.inc");
diff --git a/src/www/headjs.php b/src/www/headjs.php
index ef5c4d4ce..2e07ebc69 100644
--- a/src/www/headjs.php
+++ b/src/www/headjs.php
@@ -1,6 +1,6 @@
- *
- */
+/*
+ Copyright (C) 2014-2015 Deciso B.V.
+ Copyright (C) 2009 Jim Pingle
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+
require_once("guiconfig.inc");
diff --git a/src/www/ifstats.php b/src/www/ifstats.php
index ce899b0d2..c0452dec8 100644
--- a/src/www/ifstats.php
+++ b/src/www/ifstats.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -32,17 +28,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_BUILDER_BINARIES: /usr/sbin/arp
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-interfaces
-##|*NAME=Interfaces: WAN page
-##|*DESCR=Allow access to the 'Interfaces' page.
-##|*MATCH=interfaces.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("ipsec.inc");
@@ -2004,7 +1989,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
Initial Interval:
- pfSense Default
+ OPNsense Default
Saved Cfg
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 9481a33a2..4ebb09043 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -1,9 +1,8 @@
.
All rights reserved.
@@ -28,17 +27,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_BUILDER_BINARIES: /bin/rm
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-interfaces-assignnetworkports
-##|*NAME=Interfaces: Assign network ports page
-##|*DESCR=Allow access to the 'Interfaces: Assign network ports' page.
-##|*MATCH=interfaces_assign.php*
-##|-PRIV
$pgtitle = array(gettext("Interfaces"),gettext("Assign network ports"));
$shortcut_section = "interfaces";
@@ -454,7 +442,6 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
} elseif($savemsg)
print_info_box($savemsg);
- pfSense_handle_custom_code("/usr/local/pkg/interfaces_assign/pre_input_errors");
if ($input_errors)
print_input_errors($input_errors);
?>
diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index 983dd7114..85cd73e0d 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -1,8 +1,6 @@
-
diff --git a/src/www/interfaces_lagg.php b/src/www/interfaces_lagg.php
index 7ad2110cd..b5c6d2d16 100644
--- a/src/www/interfaces_lagg.php
+++ b/src/www/interfaces_lagg.php
@@ -1,8 +1,6 @@
.
All rights reserved.
@@ -28,17 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_BUILDER_BINARIES: /sbin/ifconfig
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-interfaces-ppps
-##|*NAME=Interfaces: ppps page
-##|*DESCR=Allow access to the 'Interfaces: ppps' page.
-##|*MATCH=interfaces_ppps.php*
-##|-PRIV
require("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/interfaces_ppps_edit.php b/src/www/interfaces_ppps_edit.php
index a7805b877..d6289b489 100644
--- a/src/www/interfaces_ppps_edit.php
+++ b/src/www/interfaces_ppps_edit.php
@@ -1,11 +1,7 @@
.
- All rights reserved.
Copyright (C) 2010 Gabriel B. .
All rights reserved.
@@ -30,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-interfaces-ppps-edit
-##|*NAME=Interfaces: PPPs: Edit page
-##|*DESCR=Allow access to the 'Interfaces: PPPs: Edit' page.
-##|*MATCH=interfaces_ppps_edit.php*
-##|-PRIV
require("guiconfig.inc");
require("functions.inc");
diff --git a/src/www/interfaces_qinq.php b/src/www/interfaces_qinq.php
index 92dac88f9..a270a7d9a 100644
--- a/src/www/interfaces_qinq.php
+++ b/src/www/interfaces_qinq.php
@@ -1,7 +1,6 @@
.
All rights reserved.
@@ -28,17 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_BUILDER_BINARIES: /sbin/ifconfig
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-interfaces-vlan
-##|*NAME=Interfaces: VLAN page
-##|*DESCR=Allow access to the 'Interfaces: VLAN' page.
-##|*MATCH=interfaces_vlan.php*
-##|-PRIV
require("guiconfig.inc");
diff --git a/src/www/interfaces_vlan_edit.php b/src/www/interfaces_vlan_edit.php
index b2fe4ec38..a972a34cd 100644
--- a/src/www/interfaces_vlan_edit.php
+++ b/src/www/interfaces_vlan_edit.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: interfaces
-*/
-
-##|+PRIV
-##|*IDENT=page-interfaces-vlan-edit
-##|*NAME=Interfaces: VLAN: Edit page
-##|*DESCR=Allow access to the 'Interfaces: VLAN: Edit' page.
-##|*MATCH=interfaces_vlan_edit.php*
-##|-PRIV
require("guiconfig.inc");
diff --git a/src/www/interfaces_wireless.php b/src/www/interfaces_wireless.php
index 2269b52ef..663d6584d 100644
--- a/src/www/interfaces_wireless.php
+++ b/src/www/interfaces_wireless.php
@@ -1,8 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-monitor
-##|*NAME=Services: Load Balancer: Monitors page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Monitors' page.
-##|*MATCH=load_balancer_monitor.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/load_balancer_monitor_edit.php b/src/www/load_balancer_monitor_edit.php
index c1ceae9d6..8064078ae 100644
--- a/src/www/load_balancer_monitor_edit.php
+++ b/src/www/load_balancer_monitor_edit.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-monitor-edit
-##|*NAME=Services: Load Balancer: Monitor: Edit page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Monitor: Edit' page.
-##|*MATCH=load_balancer_monitor_edit.php*
-##|-PRIV
require("guiconfig.inc");
diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php
index 924907928..2bafc7103 100644
--- a/src/www/load_balancer_pool.php
+++ b/src/www/load_balancer_pool.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-loadbalancer-pool
-##|*NAME=Load Balancer: Pool page
-##|*DESCR=Allow access to the 'Load Balancer: Pool' page.
-##|*MATCH=load_balancer_pool.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/load_balancer_pool_edit.php b/src/www/load_balancer_pool_edit.php
index 1f44c1931..b14075aed 100644
--- a/src/www/load_balancer_pool_edit.php
+++ b/src/www/load_balancer_pool_edit.php
@@ -1,9 +1,7 @@
.
All rights reserved.
@@ -28,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-loadbalancer-pool-edit
-##|*NAME=Load Balancer: Pool: Edit page
-##|*DESCR=Allow access to the 'Load Balancer: Pool: Edit' page.
-##|*MATCH=load_balancer_pool_edit.php*
-##|-PRIV
require("guiconfig.inc");
require_once("filter.inc");
diff --git a/src/www/load_balancer_relay_action.php b/src/www/load_balancer_relay_action.php
index 116f9f384..42eb32ede 100644
--- a/src/www/load_balancer_relay_action.php
+++ b/src/www/load_balancer_relay_action.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-relay-action
-##|*NAME=Services: Load Balancer: Relay Actions page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Relay Actions' page.
-##|*MATCH=load_balancer_relay_action.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/load_balancer_relay_action_edit.php b/src/www/load_balancer_relay_action_edit.php
index 4948845bf..1d0a1affd 100644
--- a/src/www/load_balancer_relay_action_edit.php
+++ b/src/www/load_balancer_relay_action_edit.php
@@ -1,43 +1,30 @@
.
+ All rights reserved.
- Copyright (C) 2008 Bill Marquette .
- All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-relay-action-edit
-##|*NAME=Services: Load Balancer: Relay Action: Edit page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Relay Action: Edit' page.
-##|*MATCH=load_balancer_relay_action_edit.php*
-##|-PRIV
require("guiconfig.inc");
diff --git a/src/www/load_balancer_relay_protocol.php b/src/www/load_balancer_relay_protocol.php
index e5f846aad..94f680319 100644
--- a/src/www/load_balancer_relay_protocol.php
+++ b/src/www/load_balancer_relay_protocol.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-relay-protocol
-##|*NAME=Services: Load Balancer: Relay Protocols page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Relay Protocols' page.
-##|*MATCH=load_balancer_relay_protocol.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/load_balancer_relay_protocol_edit.php b/src/www/load_balancer_relay_protocol_edit.php
index 08036c5b3..7b3330564 100644
--- a/src/www/load_balancer_relay_protocol_edit.php
+++ b/src/www/load_balancer_relay_protocol_edit.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-relay-protocol-edit
-##|*NAME=Services: Load Balancer: Relay Protocol: Edit page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Relay Protocol: Edit' page.
-##|*MATCH=load_balancer_relay_protocol_edit.php*
-##|-PRIV
require("guiconfig.inc");
diff --git a/src/www/load_balancer_setting.php b/src/www/load_balancer_setting.php
index 5f46af0ee..33826290c 100644
--- a/src/www/load_balancer_setting.php
+++ b/src/www/load_balancer_setting.php
@@ -1,9 +1,6 @@
.
Copyright (C) 2012 Pierre POMES .
All rights reserved.
@@ -29,16 +26,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-setting
-##|*NAME=Services: Load Balancer: setting page
-##|*DESCR=Allow access to the 'Settings: Load Balancer: Settings' page.
-##|*MATCH=load_balancer_setting.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php
index 6032fd214..3d7d62e24 100644
--- a/src/www/load_balancer_virtual_server.php
+++ b/src/www/load_balancer_virtual_server.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-services-loadbalancer-virtualservers
-##|*NAME=Services: Load Balancer: Virtual Servers page
-##|*DESCR=Allow access to the 'Services: Load Balancer: Virtual Servers' page.
-##|*MATCH=load_balancer_virtual_server.php*
-##|-PRIV
require_once("guiconfig.inc");
require_once("functions.inc");
diff --git a/src/www/load_balancer_virtual_server_edit.php b/src/www/load_balancer_virtual_server_edit.php
index 5298bb34f..212f40663 100644
--- a/src/www/load_balancer_virtual_server_edit.php
+++ b/src/www/load_balancer_virtual_server_edit.php
@@ -1,9 +1,6 @@
.
All rights reserved.
@@ -28,16 +25,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-loadbalancer-virtualserver-edit
-##|*NAME=Load Balancer: Virtual Server: Edit page
-##|*DESCR=Allow access to the 'Load Balancer: Virtual Server: Edit' page.
-##|*MATCH=load_balancer_virtual_server_edit.php*
-##|-PRIV
require("guiconfig.inc");