From f617ecbd6b461dafb853705efb7998ae13060549 Mon Sep 17 00:00:00 2001
From: Scott Dale <sdale@pfsense.org>
Date: Thu, 24 Jul 2008 00:30:11 +0000
Subject: code cleanup, does not resolve widget save bug

---
 usr/local/www/index.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 7909084..8dfde20 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -122,6 +122,7 @@ $dirhandle  = opendir($directory);
 $filename = "";
 $widgetnames = array();
 $widgetfiles = array();
+$widgetlist = array();
 
 while (false !== ($filename = readdir($dirhandle))) {
 	$periodpos = strpos($filename, ".");
@@ -133,12 +134,9 @@ while (false !== ($filename = readdir($dirhandle))) {
 sort($widgetfiles);
 array_unshift($widgetfiles, "system_information.widget.php");
 
-
 if (!is_array($config['widgets'])) {
 	$config['widgets'] = array();
 }
-
-$pconfig['sequence'] = $config['widgets']['sequence'];
 	
 if ($_POST){
 	$config['widgets']['sequence'] = $_POST['sequence'];
@@ -154,10 +152,10 @@ if ($_POST){
 	exit;
 }
 
+$pconfig['sequence'] = $config['widgets']['sequence'];
 	
 if ($config['widgets'] && $pconfig['sequence'] != "")
 {
-	$widgetlist = array();
 	$widgetlist = $pconfig['sequence'];
 	$colpos = array();
 	$savedwidgetfiles = array();
@@ -172,22 +170,13 @@ if ($config['widgets'] && $pconfig['sequence'] != "")
 		$displayarray[] = substr($widget,$displayposition+1);
 		$savedwidgetfiles[] = $widgetname . ".widget.php";
 	}
-	foreach ($widgetnames as $widget){
-		if ($config['widgets'][$widget . '-config']){
-			$pconfig[$widget . '-config'] = $config['widgets'][$widget . '-config'];
-		}
-	}
-	$widgetlist = $savedwidgetfiles;
-	
+	$widgetlist = $savedwidgetfiles;	
 }
 else{
 	$widgetlist = $widgetfiles;
 }
 
 
-
-
-
 //build list of php include files
 $phpincludefiles = array();
 $directory = "/usr/local/www/widgets/include/";
-- 
cgit v1.1