Merge pull request #3022 from phil-davis/require_once

7 files changed, 17 insertions, 17 deletions

diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index cbaac9f..cd3e07c 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -323,6 +323,6 @@ if (isset($config['system']['webgui']['webguicss'])) {
 		//]]>
 		</script>
 <?php
-require('foot.inc');
+require_once('foot.inc');
 
 } // end function
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 1c2b818..c126e3e 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -54,10 +54,10 @@
  */
 
 if (!function_exists("dump_rrd_to_xml")) {
-	require("rrd.inc");
+	require_once("rrd.inc");
 }
 if (!function_exists("read_altq_config")) {
-	require("shaper.inc");
+	require_once("shaper.inc");
 }
 
 /* Upgrade functions must be named:
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index c720752..bea6bd0 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1272,7 +1272,7 @@ EOD;
 
 								if (!empty($ealg_kl) && $ealg_kl == "auto") {
 									if (empty($p2_ealgos) || !is_array($p2_ealgos)) {
-										require("ipsec.inc");
+										require_once("ipsec.inc");
 									}
 									$key_hi = $p2_ealgos[$ealg_id]['keysel']['hi'];
 									$key_lo = $p2_ealgos[$ealg_id]['keysel']['lo'];
diff --git a/src/etc/rc.captiveportal_configure b/src/etc/rc.captiveportal_configure
index 586583d..ca44f06 100755
--- a/src/etc/rc.captiveportal_configure
+++ b/src/etc/rc.captiveportal_configure
@@ -28,11 +28,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require("config.inc");
-require("functions.inc");
+require_once("config.inc");
+require_once("functions.inc");
 require_once("filter.inc");
-require("shaper.inc");
-require("captiveportal.inc");
+require_once("shaper.inc");
+require_once("captiveportal.inc");
 
 captiveportal_configure();
 
diff --git a/src/etc/rc.captiveportal_configure_mac b/src/etc/rc.captiveportal_configure_mac
index b0daf68..1cdd44e 100755
--- a/src/etc/rc.captiveportal_configure_mac
+++ b/src/etc/rc.captiveportal_configure_mac
@@ -28,11 +28,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require("config.inc");
-require("functions.inc");
+require_once("config.inc");
+require_once("functions.inc");
 require_once("filter.inc");
-require("shaper.inc");
-require("captiveportal.inc");
+require_once("shaper.inc");
+require_once("captiveportal.inc");
 
 global $cpzone;
 
diff --git a/src/etc/rc.initial.password b/src/etc/rc.initial.password
index 969745b..b8a0e9b 100755
--- a/src/etc/rc.initial.password
+++ b/src/etc/rc.initial.password
@@ -32,7 +32,7 @@
 	/* parse the configuration and include all functions used below */
 
 	require_once("config.inc");
-	require("auth.inc");
+	require_once("auth.inc");
 	require_once("functions.inc");
 	require_once("shaper.inc");
 
diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui
index 45034ac..a65a8aa 100755
--- a/src/etc/rc.restart_webgui
+++ b/src/etc/rc.restart_webgui
@@ -2,10 +2,10 @@
 
 <?php
 
-require("config.inc");
-require("functions.inc");
-require("shaper.inc");
-require("captiveportal.inc");
+require_once("config.inc");
+require_once("functions.inc");
+require_once("shaper.inc");
+require_once("captiveportal.inc");
 require_once("rrd.inc");
 
 echo "Restarting webConfigurator...";