include check to avoid function_exist errors

1 files changed, 53 insertions, 48 deletions

diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index eb7c2f6..a5fc964 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -73,39 +73,40 @@ if(!function_exists("pfSenseHeader")) {
 /* END compatibility goo with HEAD */
 
 /*fetch menu notices function*/
-function get_menu_messages(){
-	global $g,$config;
-				if (are_notices_pending()) {
-					$notices = get_notices();
-					$requests=array();
+if(!function_exists("get_menu_messages")) {
+	function get_menu_messages(){
+		global $g,$config;
+		if (are_notices_pending()) {
+			$notices = get_notices();
+			$requests=array();
 
-					## Get Query Arguments from URL ###
-					foreach ($_REQUEST as $key => $value) {
-						if ($key != "PHPSESSID")
-							$requests[] = $key.'='.$value;
-					}
-					if(is_array($requests))
-						$request_string = implode("&", $requests);
+			## Get Query Arguments from URL ###
+			foreach ($_REQUEST as $key => $value) {
+				if ($key != "PHPSESSID")
+					$requests[] = $key.'='.$value;
+				}
+			if(is_array($requests))
+				$request_string = implode("&", $requests);
 
-					if(is_array($notices)) {
-						$notice_msgs = "<table colspan=6 id=notice_table>";
-						$alert_style="style=\'color:#ffffff; filter:Glow(color=#ff0000, strength=12);\' ";
-						$notice = "<a href=# onClick=notice_action(\'acknowledge\',\'all\');domTT_close(this); {$alert_style}>".gettext("Acknowledge All Notices")."</a>";
-						$alert_link="title=\'".gettext("Click to Acknowledge")."\' {$alert_style}";
-						$domtt_width=500;
-						foreach ($notices as $key => $value) {
-							$date = date("m-d-y H:i:s", $key);
-							$noticemsg = ($value['notice'] != "" ? $value['notice'] : $value['id']);
-							$noticemsg = preg_replace("/(\"|\'|\n|<.?\w+>)/i","",$noticemsg);
-							if ((strlen($noticemsg)* 8) > $domtt_width)
-								$domtt_width=(strlen($noticemsg) *8);
-							if ((strlen($noticemsg)* 8) > 900)
-								$domtt_width= 900;
-							$alert_action ="onClick=notice_action(\'acknowledge\',\'{$key}\');domTT_close(this);jQuery(this).parent().parent().remove();";
-							$notice_msgs .= "<tr><td valign=\'top\' width=\'120\'><a href=# {$alert_link} {$alert_action}>{$date}</a></td><td valign=\'top\'><a href=# {$alert_link} {$alert_action}>[ ".htmlspecialchars($noticemsg)."]</a></td><tr>";
-							}
-							$notice_msgs .="</table>";
-							
+				if(is_array($notices)) {
+					$notice_msgs = "<table colspan=6 id=notice_table>";
+					$alert_style="style=\'color:#ffffff; filter:Glow(color=#ff0000, strength=12);\' ";
+					$notice = "<a href=# onClick=notice_action(\'acknowledge\',\'all\');domTT_close(this); {$alert_style}>".gettext("Acknowledge All Notices")."</a>";
+					$alert_link="title=\'".gettext("Click to Acknowledge")."\' {$alert_style}";
+					$domtt_width=500;
+					foreach ($notices as $key => $value) {
+						$date = date("m-d-y H:i:s", $key);
+						$noticemsg = ($value['notice'] != "" ? $value['notice'] : $value['id']);
+						$noticemsg = preg_replace("/(\"|\'|\n|<.?\w+>)/i","",$noticemsg);
+						if ((strlen($noticemsg)* 8) > $domtt_width)
+							$domtt_width=(strlen($noticemsg) *8);
+						if ((strlen($noticemsg)* 8) > 900)
+							$domtt_width= 900;
+						$alert_action ="onClick=notice_action(\'acknowledge\',\'{$key}\');domTT_close(this);jQuery(this).parent().parent().remove();";
+						$notice_msgs .= "<tr><td valign=\'top\' width=\'120\'><a href=# {$alert_link} {$alert_action}>{$date}</a></td><td valign=\'top\'><a href=# {$alert_link} {$alert_action}>[ ".htmlspecialchars($noticemsg)."]</a></td><tr>";
+						}
+					$notice_msgs .="</table>";
+						
 					$domtt= "onclick=\"domTT_activate(this, event, 'caption', '{$notice}','content', '<br>{$notice_msgs}', 'trail', false, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle','width','{$domtt_width}','y',5,'type', 'sticky');\"";					
                     $menu_messages="<div id='alerts' ; >\n";
                     if(count($notices)==1)
@@ -115,25 +116,29 @@ function get_menu_messages(){
                     $menu_messages.="<div id='marquee-text' style='z-index:1001;'><a href=# {$domtt}><b> .:. {$msg} .:. </b></a></div>\n";
                     $menu_messages.="</div>\n";
                     }
-				} else {
-					$menu_messages='<div id="hostname">';
-					$menu_messages.=$config['system']['hostname'] . "." . $config['system']['domain']; 
-					$menu_messages.='</div>';
-					}
-				return ($menu_messages);
-				}
+			}
+		else {
+			$menu_messages='<div id="hostname">';
+			$menu_messages.=$config['system']['hostname'] . "." . $config['system']['domain']; 
+			$menu_messages.='</div>';
+			}
+		return ($menu_messages);
+		}
+}
 				
-function dom_title($title_msg,$width){
-	$width=preg_replace("/\D+/","",$width);
-	if (!empty($width)){
-		$width=",'width',$width";
+if(!function_exists("dom_title")) {
+	function dom_title($title_msg,$width){
+		$width=preg_replace("/\D+/","",$width);
+		if (!empty($width)){
+			$width=",'width',$width";
+			}
+		if (!empty($title_msg)){
+			$title_msg=preg_replace("/\s+/"," ",$title_msg);
+	   	    $title_msg=preg_replace("/'/","\'",$title_msg);
+			return "onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\" onmouseover=\"domTT_activate(this, event, 'content', '{$title_msg}', 'trail', true, 'delay', 250, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle' $width);\"";
+			}
+		}
 	}
-	if (!empty($title_msg)){
-		$title_msg=preg_replace("/\s+/"," ",$title_msg);
-        $title_msg=preg_replace("/'/","\'",$title_msg);
-		return "onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\" onmouseover=\"domTT_activate(this, event, 'content', '{$title_msg}', 'trail', true, 'delay', 250, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle' $width);\"";
-	}
-}
 /* include all configuration functions */
 require_once("interfaces.inc");
 require_once("gwlb.inc");