summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xusr/local/www/pkg.php4
-rwxr-xr-xusr/local/www/pkg_edit.php5
-rwxr-xr-xusr/local/www/pkg_mgr.php4
-rwxr-xr-xusr/local/www/pkg_mgr_install.php5
-rwxr-xr-xusr/local/www/pkg_mgr_installed.php4
-rwxr-xr-xusr/local/www/progress.php14
-rwxr-xr-xusr/local/www/reboot.php5
-rwxr-xr-xusr/local/www/restart_httpd.php6
-rwxr-xr-xusr/local/www/services_captiveportal.php4
-rwxr-xr-xusr/local/www/services_captiveportal_filemanager.php3
-rwxr-xr-xusr/local/www/services_captiveportal_ip.php5
-rwxr-xr-xusr/local/www/services_captiveportal_ip_edit.php4
-rwxr-xr-xusr/local/www/services_captiveportal_mac.php4
-rwxr-xr-xusr/local/www/services_captiveportal_mac_edit.php3
-rw-r--r--usr/local/www/services_captiveportal_vouchers.php4
-rw-r--r--usr/local/www/services_captiveportal_vouchers_edit.php3
-rwxr-xr-xusr/local/www/services_dhcp.php10
-rwxr-xr-xusr/local/www/services_dhcp_edit.php4
-rwxr-xr-xusr/local/www/services_dhcp_relay.php4
-rwxr-xr-xusr/local/www/services_dnsmasq.php4
-rwxr-xr-xusr/local/www/services_dnsmasq_domainoverride_edit.php4
-rwxr-xr-xusr/local/www/services_dnsmasq_edit.php3
-rwxr-xr-xusr/local/www/services_dyndns.php7
-rw-r--r--usr/local/www/services_dyndns_edit.php7
-rwxr-xr-xusr/local/www/services_igmpproxy.php4
-rwxr-xr-xusr/local/www/services_igmpproxy_edit.php4
-rwxr-xr-xusr/local/www/services_proxyarp.php4
-rwxr-xr-xusr/local/www/services_proxyarp_edit.php3
-rw-r--r--usr/local/www/services_rfc2136.php4
-rw-r--r--usr/local/www/services_rfc2136_edit.php3
-rwxr-xr-xusr/local/www/services_snmp.php4
-rwxr-xr-xusr/local/www/services_usermanager.php4
-rwxr-xr-xusr/local/www/services_wol.php17
-rwxr-xr-xusr/local/www/services_wol_edit.php3
-rwxr-xr-xusr/local/www/status.php13
-rwxr-xr-xusr/local/www/status_captiveportal.php4
-rw-r--r--usr/local/www/status_captiveportal_test.php3
-rw-r--r--usr/local/www/status_captiveportal_voucher_rolls.php3
-rw-r--r--usr/local/www/status_captiveportal_vouchers.php3
-rw-r--r--usr/local/www/status_filter_reload.php3
-rwxr-xr-xusr/local/www/status_gateway_groups.php4
-rwxr-xr-xusr/local/www/status_gateways.php4
-rwxr-xr-xusr/local/www/status_graph.php5
-rw-r--r--usr/local/www/status_graph_cpu.php4
-rwxr-xr-xusr/local/www/status_interfaces.php4
-rw-r--r--usr/local/www/status_openvpn.php4
-rwxr-xr-xusr/local/www/status_queues.php5
-rwxr-xr-xusr/local/www/status_rrd_graph.php4
-rw-r--r--usr/local/www/status_rrd_graph_img.php4
-rwxr-xr-xusr/local/www/status_rrd_graph_settings.php5
-rwxr-xr-xusr/local/www/status_services.php11
-rwxr-xr-xusr/local/www/status_slbd_pool.php3
-rwxr-xr-xusr/local/www/status_slbd_vs.php5
-rw-r--r--usr/local/www/status_upnp.php5
-rwxr-xr-xusr/local/www/status_wireless.php4
-rwxr-xr-xusr/local/www/system.php7
-rw-r--r--usr/local/www/system_advanced_admin.php8
-rw-r--r--usr/local/www/system_advanced_firewall.php4
-rw-r--r--usr/local/www/system_advanced_misc.php4
-rw-r--r--usr/local/www/system_advanced_network.php3
-rw-r--r--usr/local/www/system_advanced_notifications.php3
-rw-r--r--usr/local/www/system_advanced_sysctl.php4
-rw-r--r--usr/local/www/system_authservers.php3
-rw-r--r--usr/local/www/system_camanager.php3
-rw-r--r--usr/local/www/system_certmanager.php3
-rwxr-xr-xusr/local/www/system_firmware.php6
-rwxr-xr-xusr/local/www/system_firmware_auto.php13
-rwxr-xr-xusr/local/www/system_firmware_check.php4
-rwxr-xr-xusr/local/www/system_firmware_settings.php7
-rwxr-xr-xusr/local/www/system_gateway_groups.php4
-rwxr-xr-xusr/local/www/system_gateway_groups_edit.php4
-rwxr-xr-xusr/local/www/system_gateways.php5
-rwxr-xr-xusr/local/www/system_gateways_edit.php4
-rwxr-xr-xusr/local/www/system_gateways_settings.php3
-rw-r--r--usr/local/www/system_groupmanager.php4
-rw-r--r--usr/local/www/system_groupmanager_addprivs.php3
-rwxr-xr-xusr/local/www/system_routes.php4
-rwxr-xr-xusr/local/www/system_routes_edit.php3
-rw-r--r--usr/local/www/system_usermanager.php5
-rw-r--r--usr/local/www/system_usermanager_addcert.php3
-rw-r--r--usr/local/www/system_usermanager_addprivs.php3
-rwxr-xr-xusr/local/www/system_usermanager_settings.php3
-rw-r--r--usr/local/www/system_usermanager_settings_ldapacpicker.php3
-rwxr-xr-xusr/local/www/system_usermanager_settings_test.php4
84 files changed, 308 insertions, 89 deletions
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php
index b8a2df0..3886a11 100755
--- a/usr/local/www/pkg.php
+++ b/usr/local/www/pkg.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: pkgs
+*/
##|+PRIV
##|*IDENT=page-package-settings
@@ -34,7 +37,6 @@
##|*MATCH=pkg.php*
##|-PRIV
-
require_once("guiconfig.inc");
require_once("pkg-utils.inc");
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 6bc4429..675899a 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -26,6 +26,10 @@
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: pkgs
+*/
##|+PRIV
##|*IDENT=page-package-edit
@@ -34,7 +38,6 @@
##|*MATCH=pkg_edit.php*
##|-PRIV
-
require_once("guiconfig.inc");
require_once("pkg-utils.inc");
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index c0c107b..62e6515 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -26,6 +26,10 @@
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: pkgs
+*/
##|+PRIV
##|*IDENT=page-system-packagemanager
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 390839f..62835e8 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -27,6 +27,10 @@
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: pkgs
+*/
##|+PRIV
##|*IDENT=page-system-packagemanager-installpackage
@@ -35,7 +39,6 @@
##|*MATCH=pkg_mgr_install.php*
##|-PRIV
-
require_once("guiconfig.inc");
require_once("pkg-utils.inc");
diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php
index 0d40d01..3dc35b5 100755
--- a/usr/local/www/pkg_mgr_installed.php
+++ b/usr/local/www/pkg_mgr_installed.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: pkgs
+*/
##|+PRIV
##|*IDENT=page-system-packagemanager-installed
@@ -34,7 +37,6 @@
##|*MATCH=pkg_mgr_installed.php*
##|-PRIV
-
require_once("guiconfig.inc");
require_once("pkg-utils.inc");
diff --git a/usr/local/www/progress.php b/usr/local/www/progress.php
index 2325c03..95aae82 100755
--- a/usr/local/www/progress.php
+++ b/usr/local/www/progress.php
@@ -1,4 +1,5 @@
-#!/usr/local/bin/php?php
+<?php
+
/* $Id$ */
include("guiconfig.inc");
@@ -8,7 +9,6 @@ if($config['theme'] <> "")
else
$g['theme'] = "pfsense";
-
$url = 'progress.php?UPLOAD_IDENTIFIER='. $_GET["UPLOAD_IDENTIFIER"] .'&e=1';
function nice_value($x) {
@@ -18,7 +18,6 @@ function nice_value($x) {
return sprintf("%.2fMB", $x/1000/1000);
}
-
$X = upload_progress_meter_get_info( $_GET["UPLOAD_IDENTIFIER"] );
if (!$X) {
@@ -29,7 +28,7 @@ if (!$X) {
echo ('<HTML><meta HTTP-EQUIV="Refresh" CONTENT="1; url='. $url .'"><BODY></BODY></HTML>');
}
-}else{
+} else {
$meter = sprintf("%.2f", $X['bytes_uploaded'] / $X['bytes_total'] * 100);
@@ -44,7 +43,7 @@ if (!$X) {
if ($X['bytes_total'] > 1 && $X['bytes_uploaded'] >= $X['bytes_total'] && $X['est_sec'] == 0) {
echo ('<HTML><BODY onLoad="window.close()"> UPLOAD completed!</BODY></HTML>');
- }else{
+ } else {
?>
@@ -78,11 +77,6 @@ if (!$X) {
<td width="5" height="15" background="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" align="top"></td>
</table>
-
-
-
-
-
<br>
<TABLE WIDTH="100%">
diff --git a/usr/local/www/reboot.php b/usr/local/www/reboot.php
index adc0b31..6f837b4 100755
--- a/usr/local/www/reboot.php
+++ b/usr/local/www/reboot.php
@@ -36,7 +36,6 @@
##|*MATCH=reboot.php*
##|-PRIV
-
require("guiconfig.inc");
if ($_POST) {
@@ -47,7 +46,6 @@ if ($_POST) {
}
}
-
$pgtitle = array("Diagnostics","Reboot System");
include("head.inc");
@@ -77,4 +75,5 @@ if ($_POST) {
exit;
}
}
-?>
+
+?> \ No newline at end of file
diff --git a/usr/local/www/restart_httpd.php b/usr/local/www/restart_httpd.php
index 27227e4..87fe5a2 100755
--- a/usr/local/www/restart_httpd.php
+++ b/usr/local/www/restart_httpd.php
@@ -25,6 +25,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /bin/chmod
+ pfSense_MODULE: pkgs
+*/
##|+PRIV
##|*IDENT=page-diagnostics-restart-httpd
@@ -47,7 +51,7 @@ Mounting file systems read/write...
<?php flush(); sleep(1); conf_mount_rw(); ?>
Done.<br>
Forcing all PHP file permissions to 0755...
-<?php flush(); sleep(1); system('chmod -R 0755 /usr/local/www/*.php'); ?>
+<?php flush(); sleep(1); system('/bin/chmod -R 0755 /usr/local/www/*.php'); ?>
Done.<br>
Mounting file systems read only...
<?php flush(); sleep(1); conf_mount_ro(); ?>
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 93961a5..5289044 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal
@@ -35,7 +38,6 @@
##|*MATCH=services_captiveportal.php*
##|-PRIV
-
$pgtitle = array("Services","Captive portal");
require("guiconfig.inc");
diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php
index 93bdb9b..8bf23eb 100755
--- a/usr/local/www/services_captiveportal_filemanager.php
+++ b/usr/local/www/services_captiveportal_filemanager.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-filemanager
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
index 0c8983c..da8fe37 100755
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -27,6 +27,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /sbin/ipfw
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-allowedips
@@ -35,7 +39,6 @@
##|*MATCH=services_captiveportal_ip.php*
##|-PRIV
-
$pgtitle = array("Services","Captive portal");
require("guiconfig.inc");
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
index 1ae6f36..60b76b5 100755
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -27,6 +27,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /sbin/ipfw
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-editallowedips
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index 5282b29..42fabb0 100755
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-macaddresses
@@ -35,7 +38,6 @@
##|*MATCH=services_captiveportal_mac.php*
##|-PRIV
-
$pgtitle = array("Services","Captive portal");
require("guiconfig.inc");
diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
index da6e6b3..e675779 100755
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-editmacaddresses
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index b2e54bd..dd6933d 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -24,6 +24,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/local/bin/voucher
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-vouchers
diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php
index 701b4de..6afc325 100644
--- a/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -24,6 +24,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-services-captiveportal-voucher-edit
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index c31fa96..549f596 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -28,6 +28,10 @@
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-services-dhcpserver
@@ -257,9 +261,9 @@ if ($_POST) {
$config['dhcpd'][$if]['maxleasetime'] = $_POST['maxtime'];
$config['dhcpd'][$if]['netmask'] = $_POST['netmask'];
$previous = $config['dhcpd'][$if]['failover_peerip'];
- if($previous <> $_POST['failover_peerip']) {
- mwexec("rm -rf /var/dhcpd/var/db/*");
- }
+ if($previous <> $_POST['failover_peerip'])
+ mwexec("/bin/rm -rf /var/dhcpd/var/db/*");
+
$config['dhcpd'][$if]['failover_peerip'] = $_POST['failover_peerip'];
unset($config['dhcpd'][$if]['winsserver']);
diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php
index 9ef4ab9..483675a 100755
--- a/usr/local/www/services_dhcp_edit.php
+++ b/usr/local/www/services_dhcp_edit.php
@@ -28,6 +28,10 @@
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: dhcpserver
+*/
##|+PRIV
##|*IDENT=page-services-dhcpserver-editstaticmapping
diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php
index 4d12ee9..ccc2ae4 100755
--- a/usr/local/www/services_dhcp_relay.php
+++ b/usr/local/www/services_dhcp_relay.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dhcprelay
+*/
##|+PRIV
##|*IDENT=page-services-dhcprelay
@@ -36,7 +39,6 @@
##|*MATCH=services_dhcp_relay.php*
##|-PRIV
-
function get_wan_dhcp_server() {
global $config, $g;
$dhclientfn = $g['vardb_path'] . "/dhclient.leases." . $config['interfaces']['wan']['if'];
diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index 1f93e2a..aa2cc18 100755
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dnsforwarder
+*/
##|+PRIV
##|*IDENT=page-services-dnsforwarder
@@ -36,7 +39,6 @@
##|*MATCH=services_dnsmasq.php*
##|-PRIV
-
require("guiconfig.inc");
$pconfig['enable'] = isset($config['dnsmasq']['enable']);
diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php
index f816546..ecc3e93 100755
--- a/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dnsforwarder
+*/
##|+PRIV
##|*IDENT=page-services-dnsforwarder-editdomainoverride
@@ -35,7 +38,6 @@
##|*MATCH=services_dnsmasq_domainoverride_edit.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['dnsmasq']['domainoverrides'])) {
diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php
index 26773b8..1f269ea 100755
--- a/usr/local/www/services_dnsmasq_edit.php
+++ b/usr/local/www/services_dnsmasq_edit.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dnsforwarder
+*/
##|+PRIV
##|*IDENT=page-services-dnsforwarder-edithost
diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php
index 6a0d059..a2e1947 100755
--- a/usr/local/www/services_dyndns.php
+++ b/usr/local/www/services_dyndns.php
@@ -25,6 +25,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/host
+ pfSense_MODULE: dyndns
+*/
##|+PRIV
##|*IDENT=page-services-dynamicdnsclients
@@ -33,7 +37,6 @@
##|*MATCH=services_dyndns.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['dyndnses']['dyndns']))
@@ -109,7 +112,7 @@ include("head.inc");
$real_int = get_real_interface($if);
$filename = "{$g['conf_path']}/dyndns_{$int}dyndns.cache";
if(file_exists($filename)) {
- $dns_resolv = str_replace("\n", "", `host {$dyndns['host']} | awk '{ print $4 }'`);
+ $dns_resolv = str_replace("\n", "", `/usr/bin/host {$dyndns['host']} | awk '{ print $4 }'`);
$cached_ip_s = split(":", file_get_contents($filename));
$cached_ip = $cached_ip_s[0];
$int_ip = find_interface_ip($real_int);
diff --git a/usr/local/www/services_dyndns_edit.php b/usr/local/www/services_dyndns_edit.php
index 651bf6d..1dbadc0 100644
--- a/usr/local/www/services_dyndns_edit.php
+++ b/usr/local/www/services_dyndns_edit.php
@@ -25,6 +25,10 @@
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: dyndns
+*/
##|+PRIV
##|*IDENT=page-services-dynamicdnsclient
@@ -33,7 +37,6 @@
##|*MATCH=services_dyndns_edit.php*
##|-PRIV
-
/* returns true if $uname is a valid DynDNS username */
function is_dyndns_username($uname) {
if (!is_string($uname))
@@ -111,7 +114,7 @@ if ($_POST) {
$retval = 0;
conf_mount_rw();
- mwexec("rm {$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}.cache");
+ mwexec("/bin/rm {$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}.cache");
conf_mount_ro();
$retval = services_dyndns_configure_client($dyndns);
diff --git a/usr/local/www/services_igmpproxy.php b/usr/local/www/services_igmpproxy.php
index 7307b15..91fac4e 100755
--- a/usr/local/www/services_igmpproxy.php
+++ b/usr/local/www/services_igmpproxy.php
@@ -32,6 +32,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dyndns
+*/
##|+PRIV
##|*IDENT=page-services-igmpproxy
@@ -40,7 +43,6 @@
##|*MATCH=services_igmpproxy.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['igmpproxy']['igmpentry']))
diff --git a/usr/local/www/services_igmpproxy_edit.php b/usr/local/www/services_igmpproxy_edit.php
index 20d8636..e97869b 100755
--- a/usr/local/www/services_igmpproxy_edit.php
+++ b/usr/local/www/services_igmpproxy_edit.php
@@ -32,6 +32,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: igmpproxy
+*/
##|+PRIV
##|*IDENT=page-services-igmpproxy
@@ -40,7 +43,6 @@
##|*MATCH=services_igmpproxy_edit.php*
##|-PRIV
-
$pgtitle = array("Firewall","IGMP Proxy", "Edit");
require("guiconfig.inc");
diff --git a/usr/local/www/services_proxyarp.php b/usr/local/www/services_proxyarp.php
index d02c2d6..600aa4d 100755
--- a/usr/local/www/services_proxyarp.php
+++ b/usr/local/www/services_proxyarp.php
@@ -30,6 +30,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: proxyarp
+*/
##|+PRIV
##|*IDENT=page-services-proxyarp
@@ -38,7 +41,6 @@
##|*MATCH=services_proxyarp.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['proxyarp']['proxyarpnet'])) {
diff --git a/usr/local/www/services_proxyarp_edit.php b/usr/local/www/services_proxyarp_edit.php
index c84fdbc..55bc239 100755
--- a/usr/local/www/services_proxyarp_edit.php
+++ b/usr/local/www/services_proxyarp_edit.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: proxyarp
+*/
##|+PRIV
##|*IDENT=page-services-proxyarp-edit
diff --git a/usr/local/www/services_rfc2136.php b/usr/local/www/services_rfc2136.php
index 082a5c9..80edc0b 100644
--- a/usr/local/www/services_rfc2136.php
+++ b/usr/local/www/services_rfc2136.php
@@ -25,6 +25,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dnsupdate
+*/
##|+PRIV
##|*IDENT=page-services-rfc2136clients
@@ -33,7 +36,6 @@
##|*MATCH=services_rfc2136.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['dnsupdates']['dnsupdate']))
diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php
index 4c0a40b..97f8770 100644
--- a/usr/local/www/services_rfc2136_edit.php
+++ b/usr/local/www/services_rfc2136_edit.php
@@ -25,6 +25,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: dnsupdate
+*/
require("guiconfig.inc");
diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php
index 1e8b4c1..29ae1b0 100755
--- a/usr/local/www/services_snmp.php
+++ b/usr/local/www/services_snmp.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: snmp
+*/
##|+PRIV
##|*IDENT=page-services-snmp
@@ -36,7 +39,6 @@
##|*MATCH=services_snmp.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['snmpd'])) {
diff --git a/usr/local/www/services_usermanager.php b/usr/local/www/services_usermanager.php
index 755627a..487a604 100755
--- a/usr/local/www/services_usermanager.php
+++ b/usr/local/www/services_usermanager.php
@@ -31,6 +31,9 @@
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-services-usermanager
@@ -40,6 +43,7 @@
##|-PRIV
require("guiconfig.inc");
+
if(isset($_POST['save'])){
$_POST['username']=trim($_POST['username']);
if($_POST['old_username']!="" && $_POST['old_username']!=$_POST['username']){
diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php
index 8fe4ad7..faf0bf9 100755
--- a/usr/local/www/services_wol.php
+++ b/usr/local/www/services_wol.php
@@ -28,6 +28,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/local/bin/wol
+ pfSense_MODULE: wol
+*/
##|+PRIV
##|*IDENT=page-services-wakeonlan
@@ -36,7 +40,6 @@
##|*MATCH=services_wol.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['wol']['wolentry'])) {
@@ -148,10 +151,10 @@ include("head.inc");
</td>
</tr>
</table>
-&nbsp;<br>
-Wake all clients at once: <a href="services_wol.php?wakeall=true"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wol_all.gif" width="17" height="17" border="0"></a><p/>
-Or Click the MAC address to wake up an individual device:
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ &nbsp;<br>
+ Wake all clients at once: <a href="services_wol.php?wakeall=true"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wol_all.gif" width="17" height="17" border="0"></a><p/>
+ Or Click the MAC address to wake up an individual device:
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="15%" class="listhdrr">Interface</td>
<td width="25%" class="listhdrr">MAC address</td>
@@ -188,7 +191,7 @@ Or Click the MAC address to wake up an individual device:
</tr>
</table>
</td>
- </tr>
+ </tr>
<?php $i++; endforeach; ?>
<tr>
<td class="list" colspan="3"></td>
@@ -201,7 +204,7 @@ Or Click the MAC address to wake up an individual device:
</table>
</td>
- </tr>
+ </tr>
</table>
<span class="vexpl">
<span class="red">
diff --git a/usr/local/www/services_wol_edit.php b/usr/local/www/services_wol_edit.php
index e9b238e..871e6e9 100755
--- a/usr/local/www/services_wol_edit.php
+++ b/usr/local/www/services_wol_edit.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: wol
+*/
##|+PRIV
##|*IDENT=page-services-wakeonlan-edit
diff --git a/usr/local/www/status.php b/usr/local/www/status.php
index 2e5fd63..bc2656d 100755
--- a/usr/local/www/status.php
+++ b/usr/local/www/status.php
@@ -28,6 +28,11 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/vmstat /usr/bin/netstat /sbin/dmesg /sbin/mount /usr/local/sbin/setkey /usr/local/sbin/pftop
+ pfSense_BUILDER_BINARIES: /sbin/pfctl /sbin/sysctl /usr/bin/top /usr/bin/netstat /sbin/pfctl /sbin/ifconfig
+ pfSense_MODULE: support
+*/
##|+PRIV
##|*IDENT=page-hidden-detailedstatus
@@ -124,7 +129,7 @@ global $g;
defCmdT("System uptime","uptime");
defCmdT("Interfaces","/sbin/ifconfig -a");
-defCmdT("PF Info","pfctl -s info");
+defCmdT("PF Info","/sbin/pfctl -s info");
defCmdT("Routing tables","netstat -nr");
@@ -149,7 +154,7 @@ defCmdT("netstat -s -ppfsync","netstat -s -ppfsync");
defCmdT("pfctl -vsq","/sbin/pfctl -vsq");
-defCmdT("pfctl -vs Tables","pfctl -vs Tables");
+defCmdT("pfctl -vs Tables","/sbin/pfctl -vs Tables");
defCmdT("Load Balancer","/sbin/pfctl -a slb -s nat");
@@ -169,8 +174,8 @@ defCmdT("ez-ipupdate.cache","cat /conf/ez-ipupdate.cache");
defCmdT("df","/bin/df");
defCmdT("racoon.conf","cat /var/etc/racoon.conf");
-defCmdT("SPD","/sbin/setkey -DP");
-defCmdT("SAD","/sbin/setkey -D");
+defCmdT("SPD","/usr/local/sbin/setkey -DP");
+defCmdT("SAD","/usr/local/sbin/setkey -D");
if(isset($config['system']['usefifolog'])) {
defCmdT("last 200 system log entries","/usr/sbin/fifolog_reader /var/log/system.log 2>&1 | tail -n 200");
diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index f516303..545b527 100755
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-status-captiveportal
@@ -38,7 +41,6 @@
require("guiconfig.inc");
-
if ($_GET['act'] == "del") {
captiveportal_disconnect_client($_GET['id']);
Header("Location: status_captiveportal.php");
diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php
index fd5cf73..cc97b9b 100644
--- a/usr/local/www/status_captiveportal_test.php
+++ b/usr/local/www/status_captiveportal_test.php
@@ -24,6 +24,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-status-captiveportal-test
diff --git a/usr/local/www/status_captiveportal_voucher_rolls.php b/usr/local/www/status_captiveportal_voucher_rolls.php
index 5e8a49f..6d7be3c 100644
--- a/usr/local/www/status_captiveportal_voucher_rolls.php
+++ b/usr/local/www/status_captiveportal_voucher_rolls.php
@@ -24,6 +24,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-status-captiveportal-voucher-rolls
diff --git a/usr/local/www/status_captiveportal_vouchers.php b/usr/local/www/status_captiveportal_vouchers.php
index 5599c37..14ae1c6 100644
--- a/usr/local/www/status_captiveportal_vouchers.php
+++ b/usr/local/www/status_captiveportal_vouchers.php
@@ -24,6 +24,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: captiveportal
+*/
##|+PRIV
##|*IDENT=page-status-captiveportal-vouchers
diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php
index cf93aeb..67c5517 100644
--- a/usr/local/www/status_filter_reload.php
+++ b/usr/local/www/status_filter_reload.php
@@ -26,6 +26,9 @@
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-status-filterreloadstatus
diff --git a/usr/local/www/status_gateway_groups.php b/usr/local/www/status_gateway_groups.php
index 3a8d06b..353f025 100755
--- a/usr/local/www/status_gateway_groups.php
+++ b/usr/local/www/status_gateway_groups.php
@@ -28,6 +28,9 @@
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-status-gatewaygroups
@@ -36,7 +39,6 @@
##|*MATCH=status_gateway_groups.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['gateways']['gateway_group']))
diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php
index e8b0702..12e0c0a 100755
--- a/usr/local/www/status_gateways.php
+++ b/usr/local/www/status_gateways.php
@@ -28,6 +28,9 @@
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-status-gateways
@@ -36,7 +39,6 @@
##|*MATCH=status_gateways.php*
##|-PRIV
-
require("guiconfig.inc");
$a_gateways = return_gateways_array();
diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php
index 56e1398..7de1c7e 100755
--- a/usr/local/www/status_graph.php
+++ b/usr/local/www/status_graph.php
@@ -31,6 +31,9 @@
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-status-trafficgraph
@@ -39,8 +42,6 @@
##|*MATCH=status_graph.php*
##|-PRIV
-
-
require("guiconfig.inc");
if ($_POST['width'])
diff --git a/usr/local/www/status_graph_cpu.php b/usr/local/www/status_graph_cpu.php
index cc18aed..6d8278c 100644
--- a/usr/local/www/status_graph_cpu.php
+++ b/usr/local/www/status_graph_cpu.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-status-cpuload
@@ -35,7 +38,6 @@
##|*MATCH=status_graph_cpu.php*
##|-PRIV
-
$pgtitle = array("Status", "CPU load");
require("guiconfig.inc");
include("head.inc");
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php
index cb749d3..e37fa69 100755
--- a/usr/local/www/status_interfaces.php
+++ b/usr/local/www/status_interfaces.php
@@ -31,6 +31,9 @@
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-status-interfaces
@@ -39,7 +42,6 @@
##|*MATCH=status_interfaces.php*
##|-PRIV
-
require_once("guiconfig.inc");
if ($_GET['if']) {
diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php
index b8cae6f..52f4f04 100644
--- a/usr/local/www/status_openvpn.php
+++ b/usr/local/www/status_openvpn.php
@@ -27,6 +27,9 @@
POSSIBILITY OF SUCH DAMAGE.
*/
/* DISABLE_PHP_LINT_CHECKING */
+/*
+ pfSense_MODULE: openvpn
+*/
##|+PRIV
##|*IDENT=page-status-openvpn
@@ -35,7 +38,6 @@
##|*MATCH=status_openvpn.php*
##|-PRIV
-
$pgtitle = array("Status", "OpenVPN");
require("guiconfig.inc");
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
index d18ae08..03eed60 100755
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -29,6 +29,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /sbin/pfctl
+ pfSense_MODULE: shaper
+*/
##|+PRIV
##|*IDENT=page-status-trafficshaper-queues
@@ -37,7 +41,6 @@
##|*MATCH=status_queues.php*
##|-PRIV
-
require("guiconfig.inc");
if ($_REQUEST['getactivity']) {
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 0f3b420..5b76725 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -27,6 +27,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/find
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-status-rrdgraphs
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index 9883e3f..7830c22 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -27,6 +27,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/find /bin/rm /usr/local/bin/rrdtool
+ pfSense_MODULE: system
+*/
require("guiconfig.inc");
diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php
index 419050c..f0b5666 100755
--- a/usr/local/www/status_rrd_graph_settings.php
+++ b/usr/local/www/status_rrd_graph_settings.php
@@ -27,6 +27,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/find
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-status-rrdgraphs
@@ -35,7 +39,6 @@
##|*MATCH=status_rrd_graph_settings.php*
##|-PRIV
-
require("guiconfig.inc");
$pconfig['enable'] = isset($config['rrd']['enable']);
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php
index 1a13f4e..108a191 100755
--- a/usr/local/www/status_services.php
+++ b/usr/local/www/status_services.php
@@ -25,6 +25,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/local/sbin/openvpn /usr/bin/killall /bin/ps
+ pfSense_MODULE: services
+*/
##|+PRIV
##|*IDENT=page-status-services
@@ -33,7 +37,6 @@
##|*MATCH=status_services.php*
##|-PRIV
-
require("guiconfig.inc");
require_once("service-utils.inc");
@@ -72,7 +75,7 @@ if($_GET['mode'] == "restartservice" and $_GET['service']) {
upnp_action('restart');
break;
case 'racoon':
- exec("killall -9 racoon");
+ exec("/usr/bin/killall -9 racoon");
sleep(1);
vpn_ipsec_force_reload();
break;
@@ -85,7 +88,7 @@ if($_GET['mode'] == "restartservice" and $_GET['service']) {
killbypid($pidfile);
sleep(1);
$configfile = $g['varetc_path'] . "/openvpn_{$vpnmode}{$id}.conf";
- mwexec_bg("openvpn --config $configfile");
+ mwexec_bg("/usr/local/sbin/openvpn --config $configfile");
}
}
break;
@@ -128,7 +131,7 @@ if($_GET['mode'] == "startservice" and $_GET['service']) {
$id = $_GET['id'];
if (is_numeric($id)) {
$configfile = $g['varetc_path'] . "/openvpn_{$vpnmode}{$id}.conf";
- mwexec_bg("openvpn --config $configfile");
+ mwexec_bg("/usr/local/sbin/openvpn --config $configfile");
}
}
break;
diff --git a/usr/local/www/status_slbd_pool.php b/usr/local/www/status_slbd_pool.php
index 93332b8..0e8eb66 100755
--- a/usr/local/www/status_slbd_pool.php
+++ b/usr/local/www/status_slbd_pool.php
@@ -28,6 +28,9 @@
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-status-loadbalancer-pool
diff --git a/usr/local/www/status_slbd_vs.php b/usr/local/www/status_slbd_vs.php
index b8f78cc..f421a7f 100755
--- a/usr/local/www/status_slbd_vs.php
+++ b/usr/local/www/status_slbd_vs.php
@@ -28,6 +28,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/local/sbin/relayctl
+ pfSense_MODULE: routing
+*/
##|+PRIV
##|*IDENT=page-status-loadbalancer-virtualserver
@@ -36,7 +40,6 @@
##|*MATCH=status_slbd_vs.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['load_balancer']['lbpool'])) {
diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php
index d2be0c2..3cc4755 100644
--- a/usr/local/www/status_upnp.php
+++ b/usr/local/www/status_upnp.php
@@ -28,6 +28,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /sbin/pfctl
+ pfSense_MODULE: upnp
+*/
##|+PRIV
##|*IDENT=page-status-upnpstatus
@@ -36,7 +40,6 @@
##|*MATCH=status_upnp.php*
##|-PRIV
-
require("guiconfig.inc");
if ($_POST) {
diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php
index 8dd6b83..6ebac7f 100755
--- a/usr/local/www/status_wireless.php
+++ b/usr/local/www/status_wireless.php
@@ -25,6 +25,9 @@
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-diagnostics-wirelessstatus
@@ -33,7 +36,6 @@
##|*MATCH=status_wireless.php*
##|-PRIV
-
require_once("guiconfig.inc");
function gentitle_pkg($pgname) {
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 3c1b569..bc4c413 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -28,6 +28,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /bin/kill /usr/bin/tar
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-generalsetup
@@ -36,7 +40,6 @@
##|*MATCH=system.php*
##|-PRIV
-
require("guiconfig.inc");
$pconfig['hostname'] = $config['system']['hostname'];
@@ -73,7 +76,7 @@ if($pconfig['timezone'] <> $_POST['timezone']) {
require_once("functions.inc");
$pid = `ps awwwux | grep -v "grep" | grep "tcpdump -v -l -n -e -ttt -i pflog0" | awk '{ print $2 }'`;
if($pid) {
- mwexec("kill $pid");
+ mwexec("/bin/kill $pid");
usleep(1000);
}
filter_pflog_start();
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 9a6432c..595deb1 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -32,6 +32,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/killall
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-advanced-admin
@@ -40,7 +44,6 @@
##|*MATCH=system_advanced_admin.php*
##|-PRIV
-
require("guiconfig.inc");
$pconfig['webguiproto'] = $config['system']['webgui']['protocol'];
@@ -398,4 +401,5 @@ if ($restart_webgui) {
log_error("webConfigurator configuration has changed. Restarting webConfigurator.");
touch("{$g['tmp_path']}/restart_webgui");
}
-?>
+
+?> \ No newline at end of file
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index 1e38e37..b124795 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -32,6 +32,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-advanced-firewall
@@ -40,7 +43,6 @@
##|*MATCH=system_advanced.php*
##|-PRIV
-
require("guiconfig.inc");
$pconfig['disablefilter'] = $config['system']['disablefilter'];
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 6fbfd4f..b830978 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -32,6 +32,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-advanced-misc
@@ -40,7 +43,6 @@
##|*MATCH=system_advanced.php*
##|-PRIV
-
require("guiconfig.inc");
$pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php
index 81b4d4d..8b59457 100644
--- a/usr/local/www/system_advanced_network.php
+++ b/usr/local/www/system_advanced_network.php
@@ -32,6 +32,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-advanced-network
diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php
index 5c0a59e..50e3aef 100644
--- a/usr/local/www/system_advanced_notifications.php
+++ b/usr/local/www/system_advanced_notifications.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-advanced-notifications
diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php
index 1cd8780..e2bc20e 100644
--- a/usr/local/www/system_advanced_sysctl.php
+++ b/usr/local/www/system_advanced_sysctl.php
@@ -32,6 +32,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: system
+*/
##|+PRIV
##|*IDENT=page-system-advanced-sysctl
@@ -40,7 +43,6 @@
##|*MATCH=system_advanced-sysctrl.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['sysctl']['item']))
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index 12d9564..c0ed3dd 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-authservers
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index 3458da5..7b60e10 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: certificate_managaer
+*/
##|+PRIV
##|*IDENT=page-system-camanager
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index be3f88b..0a62569 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: certificate_managaer
+*/
##|+PRIV
##|*IDENT=page-system-certmanager
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index 0955efc..f432ec0 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -30,6 +30,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/tar
+ pfSense_MODULE: firmware
+*/
##|+PRIV
##|*IDENT=page-system-firmware-manualupdate
@@ -58,7 +62,7 @@ function file_is_for_platform($filename, $ul_name) {
else
return false;
}
- exec("tar xzf $filename -C /tmp/ etc/platform");
+ exec("/usr/bin/tar xzf $filename -C /tmp/ etc/platform");
if(!file_exists("/tmp/etc/platform"))
return false;
$upgrade_is_for_platform = trim(file_get_contents("/tmp/etc/platform"));
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php
index 7eeb2f6..d1310c7 100755
--- a/usr/local/www/system_firmware_auto.php
+++ b/usr/local/www/system_firmware_auto.php
@@ -30,6 +30,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/bin/nohup /bin/cat /sbin/sha256
+ pfSense_MODULE: firmware
+*/
##|+PRIV
##|*IDENT=page-system-firmware-checkforupdate
@@ -38,7 +42,6 @@
##|*MATCH=system_firmware_auto.php*
##|-PRIV
-
require("guiconfig.inc");
$curcfg = $config['system']['firmware'];
@@ -148,8 +151,8 @@ else
if($needs_system_upgrade == true)
$external_upgrade_helper_text .= "{$g['upload_path']}/latest.tgz";
-$downloaded_latest_tgz_sha256 = str_replace("\n", "", `sha256 -q {$g['upload_path']}/latest.tgz`);
-$upgrade_latest_tgz_sha256 = str_replace("\n", "", `cat {$g['upload_path']}/latest.tgz.sha256 | awk '{ print $4 }'`);
+$downloaded_latest_tgz_sha256 = str_replace("\n", "", `/sbin/sha256 -q {$g['upload_path']}/latest.tgz`);
+$upgrade_latest_tgz_sha256 = str_replace("\n", "", `/bin/cat {$g['upload_path']}/latest.tgz.sha256 | awk '{ print $4 }'`);
$sigchk = 0;
@@ -193,7 +196,7 @@ if($downloaded_latest_tgz_sha256 <> $upgrade_latest_tgz_sha256) {
} else {
update_output_window("{$g['product_name']} is now upgrading.\\n\\nThe firewall will reboot once the operation is completed.");
echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';\n</script>";
- mwexec("nohup {$external_upgrade_helper_text}");
+ mwexec("/usr/bin/nohup {$external_upgrade_helper_text}");
}
/*
@@ -227,4 +230,4 @@ function read_body_firmware($ch, $string) {
return $length;
}
-?>
+?> \ No newline at end of file
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php
index 9af821f..daa7e81 100755
--- a/usr/local/www/system_firmware_check.php
+++ b/usr/local/www/system_firmware_check.php
@@ -30,6 +30,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: firmware
+*/
##|+PRIV
##|*IDENT=page-system-firmware-autoupdate
@@ -38,7 +41,6 @@
##|*MATCH=system_firmware_check.php*
##|-PRIV
-
$d_isfwfile = 1;
require("guiconfig.inc");
diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php
index 8827ef3..622e355 100755
--- a/usr/local/www/system_firmware_settings.php
+++ b/usr/local/www/system_firmware_settings.php
@@ -27,6 +27,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES: /usr/bin/fetch
+ pfSense_MODULE: firmware
+*/
##|+PRIV
##|*IDENT=page-system-firmware-settings
@@ -35,7 +39,6 @@
##|*MATCH=system_firmware_settings.php*
##|-PRIV
-
require("guiconfig.inc");
if ($_POST) {
@@ -58,7 +61,7 @@ $curcfg = $config['system']['firmware'];
$pgtitle = array("System","Firmware","Settings");
include("head.inc");
-exec("fetch -q -o /tmp/manifest \"{$g['update_manifest']}\"");
+exec("/usr/bin/fetch -q -o /tmp/manifest \"{$g['update_manifest']}\"");
if(file_exists("/tmp/manifest")) {
$preset_urls_split = split("\n", file_get_contents("/tmp/manifest"));
}
diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php
index 295fa26..2bf23f9 100755
--- a/usr/local/www/system_gateway_groups.php
+++ b/usr/local/www/system_gateway_groups.php
@@ -28,6 +28,9 @@
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-system-gatewaygroups
@@ -36,7 +39,6 @@
##|*MATCH=system_gateway_groups.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['gateways']['gateway_group']))
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 1fdcdf2..974dc75 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -28,6 +28,9 @@
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-system-gateways-editgatewaygroups
@@ -36,7 +39,6 @@
##|*MATCH=system_gateway_groups_edit.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['gateways']['gateway_group']))
diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php
index c06130f..6152300 100755
--- a/usr/local/www/system_gateways.php
+++ b/usr/local/www/system_gateways.php
@@ -28,6 +28,9 @@
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-system-gateways
@@ -36,10 +39,8 @@
##|*MATCH=system_gateways.php*
##|-PRIV
-
require("guiconfig.inc");
-
$a_gateways = return_gateways_array();
$a_gateways_arr = array();
foreach($a_gateways as $gw) {
diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php
index 66ac916..687c8c4 100755
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -28,6 +28,9 @@
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-system-gateways-editgateway
@@ -36,7 +39,6 @@
##|*MATCH=system_gateways_edit.php*
##|-PRIV
-
require("guiconfig.inc");
require("pkg-utils.inc");
diff --git a/usr/local/www/system_gateways_settings.php b/usr/local/www/system_gateways_settings.php
index 2d2a4c9..f080de9 100755
--- a/usr/local/www/system_gateways_settings.php
+++ b/usr/local/www/system_gateways_settings.php
@@ -27,6 +27,9 @@
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-status-rrdgraphs
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index 8748ffb..ac67818 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -33,6 +33,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-groupmanager
@@ -41,7 +44,6 @@
##|*MATCH=system_groupmanager.php*
##|-PRIV
-
require("guiconfig.inc");
$pgtitle = array("System", "Group manager");
diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php
index 95a5570..5b96f87 100644
--- a/usr/local/www/system_groupmanager_addprivs.php
+++ b/usr/local/www/system_groupmanager_addprivs.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-groupmanager-addprivs
diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php
index a142a3a..5b5581e 100755
--- a/usr/local/www/system_routes.php
+++ b/usr/local/www/system_routes.php
@@ -28,6 +28,9 @@
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-system-staticroutes
@@ -36,7 +39,6 @@
##|*MATCH=system_routes.php*
##|-PRIV
-
require("guiconfig.inc");
if (!is_array($config['staticroutes']['route']))
diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
index 4bb2e6c..48dcefc 100755
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -28,6 +28,9 @@
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-system-staticroutes-editroute
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index 931721f..a736615 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -34,6 +34,10 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_BUILDER_BINARIES:
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-usermanager
@@ -42,7 +46,6 @@
##|*MATCH=system_usermanager.php*
##|-PRIV
-
require("guiconfig.inc");
if (isAllowedPage("system_usermanager")) {
diff --git a/usr/local/www/system_usermanager_addcert.php b/usr/local/www/system_usermanager_addcert.php
index 081487b..da3ce34 100644
--- a/usr/local/www/system_usermanager_addcert.php
+++ b/usr/local/www/system_usermanager_addcert.php
@@ -26,6 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: certificate_manager
+*/
##|+PRIV
##|*IDENT=page-system-usermanager_addcert
diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php
index 9ee3145..ee8666e 100644
--- a/usr/local/www/system_usermanager_addprivs.php
+++ b/usr/local/www/system_usermanager_addprivs.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-usermanager-addprivs
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php
index e996abc..04291ae 100755
--- a/usr/local/www/system_usermanager_settings.php
+++ b/usr/local/www/system_usermanager_settings.php
@@ -30,6 +30,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-usermanager-settings
diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 6a280b5..7ca3ff7 100644
--- a/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
require("guiconfig.inc");
diff --git a/usr/local/www/system_usermanager_settings_test.php b/usr/local/www/system_usermanager_settings_test.php
index d613a4d..277f77f 100755
--- a/usr/local/www/system_usermanager_settings_test.php
+++ b/usr/local/www/system_usermanager_settings_test.php
@@ -27,6 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ pfSense_MODULE: auth
+*/
##|+PRIV
##|*IDENT=page-system-usermanager-settings-testldap
@@ -35,7 +38,6 @@
##|*MATCH=system_usermanager_settings_test.php*
##|-PRIV
-
require("guiconfig.inc");
$ldapserver = $config['system']['webgui']['ldapserver'];
OpenPOWER on IntegriCloud