From 32dab50e76b6a2b742e2e71855248f532c11c696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Wed, 23 Jul 2008 16:23:36 +0000
Subject: Check if cuntions exists bvefore defining them to preven errors with
 some scripts mostly from console.

---
 etc/inc/functions.inc | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index 113d6f7..38bbd48 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -69,31 +69,35 @@ if(!function_exists("pfSenseHeader")) {
 }
 /* END compatibility goo with HEAD */
 
-// Return inline javascript file or CSS to minimizie 
-// request count going back to server.
-function outputJavaScriptFileInline($javascript) {
-	if(file_exists($javascript)) {
-		echo "<script type=\"text/javascript\">";
-		include($javascript);
-		echo "</script>";
-	} else {
-		echo "<p/>ERROR!  COULD NOT LOCATE $javascript";
-		echo "<p/>Please contact webmaster.";
-		exit;
+if(!function_exists("outputJavaScriptFileInline")) {
+	// Return inline javascript file or CSS to minimizie 
+	// request count going back to server.
+	function outputJavaScriptFileInline($javascript) {
+		if(file_exists($javascript)) {
+			echo "<script type=\"text/javascript\">";
+			include($javascript);
+			echo "</script>";
+		} else {
+			echo "<p/>ERROR!  COULD NOT LOCATE $javascript";
+			echo "<p/>Please contact webmaster.";
+			exit;
+		}
 	}
 }
-function outputCSSFileInline($css) {
-	if(file_exists($css)) {
-		echo "<style type=\"text/css\">";
-		include($css);
-		echo "</style>";
-	} else {
-		echo "<p/>ERROR!  COULD NOT LOCATE $css";
-		echo "<p/>Please contact webmaster.";
-		exit;
+
+if(!function_exists("outputCSSFileInline")) {
+	function outputCSSFileInline($css) {
+		if(file_exists($css)) {
+			echo "<style type=\"text/css\">";
+			include($css);
+			echo "</style>";
+		} else {
+			echo "<p/>ERROR!  COULD NOT LOCATE $css";
+			echo "<p/>Please contact webmaster.";
+			exit;
+		}
 	}
 }
-
 /* include all configuration functions */
 require_once("auth.inc");
 require_once("captiveportal.inc");
@@ -111,4 +115,4 @@ require_once("gwlb.inc");
 require_once("notices.inc");
 require_once("cmd_chain.inc");
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.1