diff options
Diffstat (limited to 'usr/local/www')
39 files changed, 42 insertions, 16 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 6921912..87c3c47 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -49,6 +49,7 @@ $pgtitle = array("Status","IPsec"); require("guiconfig.inc"); include("head.inc"); +require("ipsec.inc"); if (!is_array($config['ipsec']['phase2'])) $config['ipsec']['phase2'] = array(); diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 9d6740f..75ec782 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -44,6 +44,7 @@ ##|-PRIV require("guiconfig.inc"); +require("ipsec.inc"); $pgtitle = array("Status","IPsec","SAD"); include("head.inc"); diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 2f97df9..3d44b62 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -44,6 +44,7 @@ ##|-PRIV require("guiconfig.inc"); +require("ipsec.inc"); $pgtitle = array("Status","IPsec","SPD"); include("head.inc"); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 1529daa..aeb8aec 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -44,6 +44,7 @@ ##|-PRIV require("guiconfig.inc"); +require("ipsec.inc"); $ipsec_logfile = "{$g['varlog_path']}/ipsec.log"; diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 692484b..50a6098 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -42,10 +42,10 @@ ##|*MATCH=diag_logs_openvpn.php* ##|-PRIV - $pgtitle = array("Status","System logs","OpenVPN"); require("guiconfig.inc"); +require_once("vpn.inc"); $openvpn_logfile = "{$g['varlog_path']}/openvpn.log"; diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index b953211..9019f89 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -43,6 +43,7 @@ $pgtitle = array("Status","System logs","PPTP VPN"); require("guiconfig.inc"); +require_once("vpn.inc"); $nentries = $config['syslog']['nentries']; if (!$nentries) diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index 4806619..212aaff 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -42,6 +42,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("itemid.inc"); if (!is_array($config['nat']['rule'])) $config['nat']['rule'] = array(); diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 5406a04..c4dd0a9 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -40,6 +40,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("itemid.inc"); if (!is_array($config['nat']['rule'])) { $config['nat']['rule'] = array(); diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 09d5a61..f6c6fe5 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -158,7 +158,6 @@ while (false !== ($filename = readdir($dirhandle))) { $widgetfiles[] = $filename; } - ##sort widgets alphabetically sort($widgetfiles); @@ -206,13 +205,11 @@ if ($config['widgets'] && $config['widgets']['sequence'] != "") { } $widgetlist = $savedwidgetfiles; -} -##no saved widget sequence found, build default list. -else{ +} else{ + // no saved widget sequence found, build default list. $widgetlist = $widgetfiles; } - ##build list of php include files $phpincludefiles = array(); $directory = "/usr/local/www/widgets/include/"; diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 472da57..744cd47 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -40,6 +40,7 @@ $pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); +require_once("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 8bf23eb..38b0576 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -52,6 +52,7 @@ function cpelements_sort() { $pgtitle = array("Services","Captive portal"); require_once("guiconfig.inc"); +require_once("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 da8fe37..0146439 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -41,6 +41,7 @@ $pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); +require_once("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 60b76b5..62d39a7 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -51,6 +51,7 @@ function allowedips_sort() { $pgtitle = array("Services","Captive portal","Edit allowed IP address"); require("guiconfig.inc"); +require_once("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 42fabb0..24cab5e 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -40,6 +40,7 @@ $pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); +require_once("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 e675779..5d8a769 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -50,6 +50,7 @@ function passthrumacs_sort() { $pgtitle = array("Services","Captive portal","Edit pass-through MAC address"); require("guiconfig.inc"); +require_once("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 dd6933d..8bf8f50 100644 --- a/usr/local/www/services_captiveportal_vouchers.php +++ b/usr/local/www/services_captiveportal_vouchers.php @@ -38,6 +38,7 @@ $pgtitle = array("Services", "Captive portal", "Vouchers"); require("guiconfig.inc"); +require_once("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 6afc325..665b00c 100644 --- a/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/usr/local/www/services_captiveportal_vouchers_edit.php @@ -37,6 +37,7 @@ $pgtitle = array("Services", "Captive portal", "Edit Voucher Rolls"); require("guiconfig.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); if (!is_array($config['voucher'])) { diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index 7de1c7e..e130a74 100755 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -54,7 +54,6 @@ if ($_POST['height']) else $height = "200"; - if ($_GET['if']) $curif = $_GET['if']; else @@ -142,7 +141,7 @@ function updateBandwidthHosts(data){ } } - setTimeout('updateBandwidth()', 3000); + setTimeout('updateBandwidth()', 10); } diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php index 52f4f04..e9a538f 100644 --- a/usr/local/www/status_openvpn.php +++ b/usr/local/www/status_openvpn.php @@ -40,6 +40,7 @@ $pgtitle = array("Status", "OpenVPN"); require("guiconfig.inc"); +require_once("vpn.inc"); $servers = array(); diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php index 5b76725..da46b37 100755 --- a/usr/local/www/status_rrd_graph.php +++ b/usr/local/www/status_rrd_graph.php @@ -40,6 +40,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("rrd.inc"); /* if the rrd graphs are not enabled redirect to settings page */ if(! isset($config['rrd']['enable'])) { diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 7830c22..9cf8ee1 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -33,6 +33,7 @@ */ require("guiconfig.inc"); +require_once("rrd.inc"); $pgtitle = array("System","RRD Graphs","Image viewer"); diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php index f0b5666..e8d89f0 100755 --- a/usr/local/www/status_rrd_graph_settings.php +++ b/usr/local/www/status_rrd_graph_settings.php @@ -40,6 +40,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("rrd.inc"); $pconfig['enable'] = isset($config['rrd']['enable']); $pconfig['category'] = $config['rrd']['category']; diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index 9eb99ed..b8c0aae 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -38,6 +38,8 @@ require("functions.inc"); require("guiconfig.inc"); +require_once("ipsec.inc"); +require_once("vpn.inc"); if (!is_array($config['ipsec']['phase1'])) $config['ipsec']['phase1'] = array(); diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php index 7a952e3..6f15b6c 100755 --- a/usr/local/www/vpn_ipsec_mobile.php +++ b/usr/local/www/vpn_ipsec_mobile.php @@ -36,6 +36,8 @@ require("functions.inc"); require("guiconfig.inc"); +require_once("ipsec.inc"); +require_once("vpn.inc"); if (!is_array($config['ipsec']['phase1'])) $config['ipsec']['phase1'] = array(); diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index 6bade97..5b8fb25 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -38,6 +38,8 @@ require("functions.inc"); require("guiconfig.inc"); +require_once("ipsec.inc"); +require_once("vpn.inc"); if (!is_array($config['ipsec']['phase1'])) $config['ipsec']['phase1'] = array(); diff --git a/usr/local/www/vpn_ipsec_phase2.php b/usr/local/www/vpn_ipsec_phase2.php index 2f63bb0..9c99ef1 100644 --- a/usr/local/www/vpn_ipsec_phase2.php +++ b/usr/local/www/vpn_ipsec_phase2.php @@ -38,6 +38,8 @@ require("functions.inc"); require("guiconfig.inc"); +require_once("ipsec.inc"); +require_once("vpn.inc"); if (!is_array($config['ipsec']['client'])) $config['ipsec']['client'] = array(); diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index 0c0336e..24bb85c 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -38,6 +38,7 @@ $pgtitle = array(gettext("VPN"), gettext("L2TP"), gettext("L2TP")); require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['l2tp']['radius'])) { $config['l2tp']['radius'] = array(); diff --git a/usr/local/www/vpn_l2tp_users.php b/usr/local/www/vpn_l2tp_users.php index 7aa358d..3cba0a2 100644 --- a/usr/local/www/vpn_l2tp_users.php +++ b/usr/local/www/vpn_l2tp_users.php @@ -38,6 +38,7 @@ $pgtitle = array(gettext("VPN"),gettext("L2TP"),gettext("Users")); require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['l2tp']['user'])) { $config['l2tp']['user'] = array(); diff --git a/usr/local/www/vpn_l2tp_users_edit.php b/usr/local/www/vpn_l2tp_users_edit.php index c54a449..ad1db19 100644 --- a/usr/local/www/vpn_l2tp_users_edit.php +++ b/usr/local/www/vpn_l2tp_users_edit.php @@ -51,6 +51,7 @@ function l2tp_users_sort() { } require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['l2tp']['user'])) { $config['l2tp']['user'] = array(); diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index 5f1df40..060c24e 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -34,7 +34,6 @@ ##|*MATCH=vpn_openvpn_client.php* ##|-PRIV - require("guiconfig.inc"); require_once("openvpn.inc"); diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index 2a0670a..328d72a 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -34,7 +34,6 @@ ##|*MATCH=vpn_openvpn_csc.php* ##|-PRIV - require("guiconfig.inc"); require_once("openvpn.inc"); diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index c1da985..4524731 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -34,7 +34,6 @@ ##|*MATCH=vpn_openvpn_server.php* ##|-PRIV - require("guiconfig.inc"); require_once("openvpn.inc"); diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php index 581fb24..7b0cd41 100755 --- a/usr/local/www/vpn_pppoe.php +++ b/usr/local/www/vpn_pppoe.php @@ -35,8 +35,8 @@ ##|*MATCH=vpn_pppoe.php* ##|-PRIV - require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['pppoe']['radius'])) { $config['pppoe']['radius'] = array(); diff --git a/usr/local/www/vpn_pppoe_users.php b/usr/local/www/vpn_pppoe_users.php index b92fcef..a10589a7 100755 --- a/usr/local/www/vpn_pppoe_users.php +++ b/usr/local/www/vpn_pppoe_users.php @@ -35,8 +35,8 @@ ##|*MATCH=vpn_pppoe_users.php* ##|-PRIV - require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['pppoe']['user'])) { $config['pppoe']['user'] = array(); diff --git a/usr/local/www/vpn_pppoe_users_edit.php b/usr/local/www/vpn_pppoe_users_edit.php index de5a314..2b884ab 100755 --- a/usr/local/www/vpn_pppoe_users_edit.php +++ b/usr/local/www/vpn_pppoe_users_edit.php @@ -49,6 +49,7 @@ function pppoe_users_sort() { } require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['pppoe']['user'])) { $config['pppoe']['user'] = array(); diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index c402533..f841d98 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -35,8 +35,8 @@ ##|*MATCH=vpn_pptp.php* ##|-PRIV - require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['pptpd']['radius'])) { $config['pptpd']['radius'] = array(); diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php index 31aa0ad..8d74aec 100755 --- a/usr/local/www/vpn_pptp_users.php +++ b/usr/local/www/vpn_pptp_users.php @@ -35,8 +35,8 @@ ##|*MATCH=vpn_pptp_users.php* ##|-PRIV - require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['pptpd']['user'])) { $config['pptpd']['user'] = array(); diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php index b8ad074..5d5c9e2 100755 --- a/usr/local/www/vpn_pptp_users_edit.php +++ b/usr/local/www/vpn_pptp_users_edit.php @@ -49,6 +49,7 @@ function pptpd_users_sort() { } require("guiconfig.inc"); +require_once("vpn.inc"); if (!is_array($config['pptpd']['user'])) { $config['pptpd']['user'] = array(); diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php index 1a63029..4966dd7 100644 --- a/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/usr/local/www/widgets/widgets/ipsec.widget.php @@ -30,9 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + require_once("guiconfig.inc"); -require_once("pfsense-utils.inc"); require_once("functions.inc"); +require_once("ipsec.inc"); if (isset($config['ipsec']['phase1'])){?> <div> </div> |
