12 files changed, 49 insertions, 9 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 744cd47..ca10ff5 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -40,7 +40,10 @@
 
 $pgtitle = array("Services","Captive portal");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if (!is_array($config['captiveportal'])) {
 	$config['captiveportal'] = array();
diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php
index 38b0576..84091d1 100755
--- a/usr/local/www/services_captiveportal_filemanager.php
+++ b/usr/local/www/services_captiveportal_filemanager.php
@@ -51,8 +51,11 @@ function cpelements_sort() {
 
 $pgtitle = array("Services","Captive portal");
 
-require_once("guiconfig.inc");
-require_once("captiveportal.inc");
+require("guiconfig.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if (!is_array($config['captiveportal']['element']))
 	$config['captiveportal']['element'] = array();
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
index 0146439..60d2792 100755
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -41,7 +41,10 @@
 
 $pgtitle = array("Services","Captive portal");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if (!is_array($config['captiveportal']['allowedip']))
 	$config['captiveportal']['allowedip'] = array();
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
index 62d39a7..866c9f3 100755
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -51,7 +51,10 @@ function allowedips_sort() {
 
 $pgtitle = array("Services","Captive portal","Edit allowed IP address");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if (!is_array($config['captiveportal']['allowedip']))
 	$config['captiveportal']['allowedip'] = array();
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index 24cab5e..5080c0c 100755
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -40,7 +40,10 @@
 
 $pgtitle = array("Services","Captive portal");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if (!is_array($config['captiveportal']['passthrumac']))
 	$config['captiveportal']['passthrumac'] = array();
diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
index 5d8a769..56618b7 100755
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -50,7 +50,10 @@ function passthrumacs_sort() {
 
 $pgtitle = array("Services","Captive portal","Edit pass-through MAC address");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if (!is_array($config['captiveportal']['passthrumac']))
 	$config['captiveportal']['passthrumac'] = array();
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index 8bf8f50..8fa4ea6 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -38,7 +38,10 @@
 
 $pgtitle = array("Services", "Captive portal", "Vouchers");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 require_once("voucher.inc");
 
 if (!is_array($config['voucher'])) {
diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php
index 665b00c..69e485a 100644
--- a/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -37,7 +37,10 @@
 
 $pgtitle = array("Services", "Captive portal", "Edit Voucher Rolls");
 require("guiconfig.inc");
-require_once("captiveportal.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 require_once("voucher.inc");
 
 if (!is_array($config['voucher'])) {
diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index 725f1fb..22be0be 100755
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -40,6 +40,10 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 
 if ($_GET['act'] == "del") {
 	captiveportal_disconnect_client($_GET['id']);
diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php
index 7831bd9..4a030e2 100644
--- a/usr/local/www/status_captiveportal_test.php
+++ b/usr/local/www/status_captiveportal_test.php
@@ -37,6 +37,10 @@
 
 $pgtitle = array("Status", "Captive portal", "Test Vouchers");
 require("guiconfig.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 require_once("voucher.inc");
 
 include("head.inc");
diff --git a/usr/local/www/status_captiveportal_voucher_rolls.php b/usr/local/www/status_captiveportal_voucher_rolls.php
index dfe1634..8863365 100644
--- a/usr/local/www/status_captiveportal_voucher_rolls.php
+++ b/usr/local/www/status_captiveportal_voucher_rolls.php
@@ -37,6 +37,10 @@
 
 $pgtitle = array("Status", "Captive portal", "Voucher Rolls");
 require("guiconfig.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 require_once("voucher.inc");
 
 if (!is_array($config['voucher']['roll'])) {
diff --git a/usr/local/www/status_captiveportal_vouchers.php b/usr/local/www/status_captiveportal_vouchers.php
index 3a53e14..fa9942d 100644
--- a/usr/local/www/status_captiveportal_vouchers.php
+++ b/usr/local/www/status_captiveportal_vouchers.php
@@ -37,6 +37,10 @@
 
 $pgtitle = array("Status", "Captive portal", "Vouchers");
 require("guiconfig.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
 require_once("voucher.inc");
 
 function clientcmp($a, $b) {