From 135e9b3bddb76933ac14f82d4a05b06832abd339 Mon Sep 17 00:00:00 2001
From: Scott Dale <sdale@pfsense.org>
Date: Wed, 23 Jul 2008 00:22:11 +0000
Subject: validate widget sequence before loading

---
 usr/local/www/index.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index ecb1b1b..4f92c2d 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -152,11 +152,10 @@ if ($_POST){
 }
 
 	
-if ($config['widgets'])
+if ($config['widgets'] && $pconfig['sequence'] != "")
 {
 	$widgetlist = array();
 	$widgetlist = $pconfig['sequence'];
-	
 	$colpos = array();
 	$savedwidgetfiles = array();
 	$widgetname = "";
@@ -501,6 +500,7 @@ echo $jscriptstr;
 	?> 
 	<div id="col1" style="float:left;width:49%;padding-bottom:40px">		
 	<?php	
+		
 	foreach($widgetlist as $widget) {
 		
 		if(!stristr($widget, "widget.php"))
@@ -515,7 +515,7 @@ echo $jscriptstr;
 			$nicename = ucwords($nicename);
 		}
 		
-		if ($config['widgets']){
+		if ($config['widgets'] && $pconfig['sequence'] != ""){
 			if ($displayarray[$widgetcounter] == "show"){
 				$divdisplay = "block";
 				$display = "block";
@@ -583,7 +583,7 @@ echo $jscriptstr;
 			}
 		}
 		
-		if ($config['widgets']){
+		if ($config['widgets'] && $pconfig['sequence'] != ""){
 			if ($colpos[$widgetcounter] == "col2" && $printed == false)
 			{
 				$printed = true;
@@ -675,7 +675,7 @@ echo $jscriptstr;
 	    
 <script type="text/javascript">
 
-	<?php if (!$config['widgets']){ ?>
+	<?php if (!$config['widgets']  && $pconfig['sequence'] != ""){ ?>
 	window.onload = function(in_event)
 	{		
 			hideAllWidgets();		    
-- 
cgit v1.1