Merge pull request #1193 from doktornotor/patch-1

25 files changed, 123 insertions, 26 deletions

diff --git a/config/apache_mod_security-dev/apache_mod_security.inc b/config/apache_mod_security-dev/apache_mod_security.inc
index 4ec13bd0..564b57da 100644
--- a/config/apache_mod_security-dev/apache_mod_security.inc
+++ b/config/apache_mod_security-dev/apache_mod_security.inc
@@ -29,7 +29,13 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("config.inc");
+require_once("globals.inc");
+require_once("notices.inc");
 require_once("service-utils.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 $shortcut_section = "apache";
 // Check to find out on which system the package is running
diff --git a/config/bind/bind.inc b/config/bind/bind.inc
index 39c12e13..1c83231b 100644
--- a/config/bind/bind.inc
+++ b/config/bind/bind.inc
@@ -39,6 +39,9 @@ require_once("service-utils.inc");
 if (!function_exists("filter_configure")) {
 	require_once("filter.inc");
 }
+require_once("notices.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
 if ($pf_version == "2.1" || $pf_version == "2.2") {
diff --git a/config/checkmk-agent/checkmk.inc b/config/checkmk-agent/checkmk.inc
index 1ab92400..fb97e678 100644
--- a/config/checkmk-agent/checkmk.inc
+++ b/config/checkmk-agent/checkmk.inc
@@ -28,8 +28,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("filter.inc");
+require_once("globals.inc");
+require_once("interfaces.inc");
+require_once("notices.inc");
 require_once("pfsense-utils.inc");
 require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 define('ETC_SERVICES', '/etc/services');
 
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc
index c915d579..a819473e 100755
--- a/config/dansguardian/dansguardian.inc
+++ b/config/dansguardian/dansguardian.inc
@@ -27,10 +27,12 @@
 	POSSIBILITY OF SUCH DAMAGE.
 
 */
-
-require_once("util.inc");
+require_once("config.inc");
 require_once("globals.inc");
-#require("guiconfig.inc");
+require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pf_version > 2.0)
diff --git a/config/filer/filer.inc b/config/filer/filer.inc
index 63cdb302..ac7fba43 100644
--- a/config/filer/filer.inc
+++ b/config/filer/filer.inc
@@ -30,6 +30,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /* ========================================================================== */
+require_once("config.inc");
+require_once("globals.inc");
+require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
+
 function filer_text_area_decode($text) {
 	return preg_replace('/\r\n/', "\n", base64_decode($text));
 }
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index f23e6c38..0ac591b6 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -28,14 +28,17 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once('config.inc');
-require_once('service-utils.inc');
-require_once("util.inc");
+require_once("config.inc");
+require_once("filter.inc");
 require_once("functions.inc");
-require_once("pkg-utils.inc");
 require_once("globals.inc");
-require_once("filter.inc");
+require_once("notices.inc");
+require_once("pkg-utils.inc");
 require_once("services.inc");
+require_once("service-utils.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 // Check pfSense version
 $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
diff --git a/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
index 699dffd1..6d0f1523 100644
--- a/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
+++ b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
@@ -32,6 +32,8 @@
 require_once("functions.inc");
 require_once("pkg-utils.inc");
 require_once("notices.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 function xmlrpc_sync_execute($syncinfo) {
 	// name that is logged if something fails during syncing
diff --git a/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc b/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc
index 699dffd1..ae5f9897 100644
--- a/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc
+++ b/config/haproxy1_5/pkg/haproxy_xmlrpcsyncclient.inc
@@ -32,6 +32,9 @@
 require_once("functions.inc");
 require_once("pkg-utils.inc");
 require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 function xmlrpc_sync_execute($syncinfo) {
 	// name that is logged if something fails during syncing
diff --git a/config/ipguard/ipguard.inc b/config/ipguard/ipguard.inc
index d51e4fe2..35ab9e68 100644
--- a/config/ipguard/ipguard.inc
+++ b/config/ipguard/ipguard.inc
@@ -28,7 +28,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("config.inc");
+require_once("globals.inc");
+require_once("notices.inc");
 require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 function ipguard_custom_php_deinstall_command() {
 	unlink_if_exists("/usr/local/etc/rc.d/ipguard.sh");
diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc
index 62905091..6907f7ca 100644
--- a/config/mailscanner/mailscanner.inc
+++ b/config/mailscanner/mailscanner.inc
@@ -28,9 +28,13 @@
 
 */
 $shortcut_section = "mailscanner";
-require_once("util.inc");
+require_once("config.inc");
 require_once("globals.inc");
-#require("guiconfig.inc");
+require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
+
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pf_version == "2.1" || $pf_version == "2.2") {
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index 7ddbb565..69e010d3 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -42,6 +42,8 @@ require_once('pfsense-utils.inc');
 require_once('globals.inc');
 require_once('services.inc');
 require_once('service-utils.inc');
+require_once('xmlrpc.inc');
+require_once('xmlrpc_client.inc');
 require_once('/usr/local/pkg/pfblockerng/pfblockerng_extra.inc');	// 'include functions' not yet merged into pfSense
 
 global $g, $config, $pfb;
@@ -4774,4 +4776,4 @@ function pfblockerng_do_xmlrpc_sync($sync_to_ip, $port, $protocol, $username, $p
 	}
 	return $success;
 }
-?>
\ No newline at end of file
+?>
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 9db7e5a1..20683f49 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -29,10 +29,16 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 $shortcut_section = "postfix";
-require_once("util.inc");
+require_once("config.inc");
 require_once("functions.inc");
-require_once("pkg-utils.inc");
 require_once("globals.inc");
+require_once("interfaces.inc");
+require_once("notices.inc");
+require_once("pkg-utils.inc");
+require_once("services.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
 if ($pfs_version == "2.1" || $pfs_version == "2.2") {
diff --git a/config/postfix/postfix.php b/config/postfix/postfix.php
index 4c444ab8..f6a31fe7 100644
--- a/config/postfix/postfix.php
+++ b/config/postfix/postfix.php
@@ -31,6 +31,8 @@ require_once("/etc/inc/util.inc");
 require_once("/etc/inc/functions.inc");
 require_once("/etc/inc/pkg-utils.inc");
 require_once("/etc/inc/globals.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 require_once("/usr/local/pkg/postfix.inc");
 
 $uname = posix_uname();
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc
index 561f7c61..d67d11dc 100644
--- a/config/sarg/sarg.inc
+++ b/config/sarg/sarg.inc
@@ -28,6 +28,14 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("config.inc");
+require_once("globals.inc");
+require_once("notices.inc");
+require_once("services.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
+
 $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
 if ($pf_version == "2.1" || $pf_version == "2.2") {
 	// Function to get squidGuard directory
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 5cdd5a00..692bae29 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -33,10 +33,15 @@
 
 require_once("pfsense-utils.inc");
 require_once("config.inc");
+require_once("globals.inc");
 require_once("functions.inc");
 require_once("service-utils.inc");
 require_once("pkg-utils.inc");
 require_once("filter.inc");
+require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 require("/usr/local/pkg/snort/snort_defs.inc");
 
 // Snort GUI needs some extra PHP memory space to manipulate large rules arrays
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index b7eb9889..aab4d134 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -31,12 +31,16 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once('globals.inc');
 require_once('config.inc');
-require_once('util.inc');
+require_once('globals.inc');
+require_once('notices.inc');
 require_once('pfsense-utils.inc');
 require_once('pkg-utils.inc');
+require_once('services.inc');
 require_once('service-utils.inc');
+require_once('util.inc');
+require_once('xmlrpc.inc');
+require_once('xmlrpc_client.inc');
 
 if (!function_exists("filter_configure")) {
 	require_once("filter.inc");
diff --git a/config/squid3/34/squid_antivirus.inc b/config/squid3/34/squid_antivirus.inc
index fe8406e7..82768f4b 100644
--- a/config/squid3/34/squid_antivirus.inc
+++ b/config/squid3/34/squid_antivirus.inc
@@ -27,8 +27,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /* Functions for Squid C-ICAP/ClamAV integration */
-require_once('globals.inc');
 require_once('config.inc');
+require_once('globals.inc');
+require_once('services.inc');
+require_once('service-utils.inc');
+require_once('util.inc');
 /* This file is currently only being included in squid.inc and not used separately */
 // require_once('squid.inc');
 
diff --git a/config/squid3/34/squid_js.inc b/config/squid3/34/squid_js.inc
index e1eb2e4e..59b75e60 100644
--- a/config/squid3/34/squid_js.inc
+++ b/config/squid3/34/squid_js.inc
@@ -29,7 +29,6 @@
 /*
  * Squid javascript helpers for GUI fields status manipulation
  */
-require_once('globals.inc');
 require_once('config.inc');
 
 /*
diff --git a/config/squid3/34/squid_reverse.inc b/config/squid3/34/squid_reverse.inc
index 483069e4..b302c8b1 100755
--- a/config/squid3/34/squid_reverse.inc
+++ b/config/squid3/34/squid_reverse.inc
@@ -30,6 +30,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once('certs.inc');
+require_once('util.inc');
 /* This file is currently only being included in squid.inc and not used separately */
 // require_once('squid.inc');
 
diff --git a/config/squidGuard-devel/squidguard.inc b/config/squidGuard-devel/squidguard.inc
index c9d51b8d..a4fd9ff3 100644
--- a/config/squidGuard-devel/squidguard.inc
+++ b/config/squidGuard-devel/squidguard.inc
@@ -29,13 +29,16 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once('globals.inc');
 require_once('config.inc');
-require_once('util.inc');
+require_once('filter.inc');
+require_once('globals.inc');
+require_once("notices.inc");
 require_once('pfsense-utils.inc');
 require_once('pkg-utils.inc');
-require_once('filter.inc');
 require_once('service-utils.inc');
+require_once('util.inc');
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 require_once('squidguard_configurator.inc');
 
 # ------------------------------------------------------------------------------
diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc
index 65e1ef50..9bffd746 100644
--- a/config/squidGuard/squidguard.inc
+++ b/config/squidGuard/squidguard.inc
@@ -29,13 +29,16 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once('globals.inc');
 require_once('config.inc');
-require_once('util.inc');
+require_once('filter.inc');
+require_once('globals.inc');
+require_once("notices.inc");
 require_once('pfsense-utils.inc');
 require_once('pkg-utils.inc');
-require_once('filter.inc');
 require_once('service-utils.inc');
+require_once('util.inc');
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 require_once('squidguard_configurator.inc');
 
 # ------------------------------------------------------------------------------
diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index 7c1be614..d814d0dc 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -30,7 +30,11 @@
 */
 
 require_once("config.inc");
+require_once("globals.inc");
+require_once("notices.inc");
 require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 
 function restart_sshd() {
 	mwexec_bg("/etc/sshd");
diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc
index bd7a181b..423e01ec 100644
--- a/config/suricata/suricata.inc
+++ b/config/suricata/suricata.inc
@@ -39,11 +39,16 @@
 */
 require_once("pfsense-utils.inc");
 require_once("config.inc");
+require_once("globals.inc");
 require_once("functions.inc");
 require_once("services.inc");
 require_once("service-utils.inc");
 require_once("pkg-utils.inc");
 require_once("filter.inc");
+require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 require("/usr/local/pkg/suricata/suricata_defs.inc");
 
 global $g, $config;
diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc
index 5e61fc05..14ff2e50 100644
--- a/config/tinydns/tinydns.inc
+++ b/config/tinydns/tinydns.inc
@@ -28,11 +28,18 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-if(!function_exists("filter_configure")) 
+require_once("globals.inc");
+if (!function_exists("filter_configure")) {
 	require_once("filter.inc");
-	
-if(!function_exists("get_real_wan_interface")) 
+}
+if (!function_exists("get_real_wan_interface")) {
 	require_once("interfaces.inc");
+}
+require_once("notices.inc");
+require_once("service-utils.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
 	
 function tinydns_validate() {
 	global $input_errors, $config;
diff --git a/config/varnish3/varnish.inc b/config/varnish3/varnish.inc
index 5df8052b..662b8dee 100644
--- a/config/varnish3/varnish.inc
+++ b/config/varnish3/varnish.inc
@@ -32,6 +32,12 @@
     POSSIBILITY OF SUCH DAMAGE.
                                                                               */
 /* ========================================================================== */
+require_once("globals.inc");
+require_once("notices.inc");
+require_once("util.inc");
+require_once("xmlrpc.inc");
+require_once("xmlrpc_client.inc");
+
 $shortcut_section = "varnish";
 
 $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);