From a9cf5cdca6cb8bc65a27cb77b7565cc772c5b281 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Mon, 23 May 2005 00:11:44 +0000
Subject: [PATCH] r197: Changing the datastore foreach() loops that we can to
 use construct_datastore_select() [includes/functions.php]

---
 editreport.php         | 34 ++++------------------------------
 includes/functions.php | 17 +++++++++++++++++
 newreport.php          | 32 +++++---------------------------
 3 files changed, 26 insertions(+), 57 deletions(-)

diff --git a/editreport.php b/editreport.php
index 7b80b1e..81ae2fb 100644
--- a/editreport.php
+++ b/editreport.php
@@ -174,40 +174,14 @@ if ($_POST['do'] == 'update')
 
 if ($_REQUEST['do'] == 'edit')
 {
-	foreach ($bugsys->datastore['severity'] AS $severity)
-	{
-		$value = $severity['severityid'];
-		$selected = (($severity['severityid'] == $bug['severity']) ? true : false);
-		$label = $severity['severity'];
-		eval('$select[severity] .= "' . $template->fetch('selectoption') . '";');
-	}
+	$select['severity'] = construct_datastore_select('severity', 'severity', 'severityid', $bug['severity']);
 	
 	$show['changestatus'] = ((can_perform('canchangestatus')) ? true : false);
 	if (can_perform('canchangestatus'))
 	{
-		foreach ($bugsys->datastore['priority'] AS $priority)
-		{
-			$value = $priority['priorityid'];
-			$selected = (($priority['priorityid'] == $bug['priority']) ? true : false);
-			$label = $priority['priority'];
-			eval('$select[priority] .= "' . $template->fetch('selectoption') . '";');
-		}
-		
-		foreach ($bugsys->datastore['status'] AS $status)
-		{
-			$value = $status['statusid'];
-			$selected = (($status['statusid'] == $bug['status']) ? true : false);
-			$label = $status['status'];
-			eval('$select[status] .= "' . $template->fetch('selectoption') . '";');
-		}
-		
-		foreach ($bugsys->datastore['resolution'] AS $resolution)
-		{
-			$value = $resolution['resolutionid'];
-			$selected = (($resolution['resolutionid'] == $bug['resolution']) ? true : false);
-			$label = $resolution['resolution'];
-			eval('$select[resolution] .= "' . $template->fetch('selectoption') . '";');
-		}
+		$select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid', $bug['priority']);
+		$select['status'] = construct_datastore_select('status', 'status', 'statusid', $bug['status']);
+		$select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid', $bug['resolution']);		
 	}
 	
 	$show['assign'] = ((can_perform('canassign')) ? true : false);
diff --git a/includes/functions.php b/includes/functions.php
index dc30d3d..a16a841 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -307,6 +307,23 @@ function parse_pcv_select($input, $validate = false)
 	}
 }
 
+// ################# Start construct_datastore_select ################
+// loops through the specified datastore to create <select>s
+function construct_datastore_select($datastore, $labelname, $valuename, $selectedvalue = 0)
+{
+	global $bugsys;
+	
+	$select = '';
+	foreach ($bugsys->datastore["$datastore"] AS $item)
+	{
+		$label = $item["$labelname"];
+		$value = $item["$valuename"];
+		$selected = (($value == $selectedvalue) ? true : false);
+		eval('$select .= "' . $bugsys->template->fetch('selectoption') . '";');
+	}
+	return $select;
+}
+
 /*=====================================================================*\
 || ###################################################################
 || # $HeadURL$
diff --git a/newreport.php b/newreport.php
index 5acb6f9..3c64315 100755
--- a/newreport.php
+++ b/newreport.php
@@ -136,37 +136,15 @@ if ($_POST['do'] == 'insert')
 
 if ($_REQUEST['do'] == 'add')
 {
-	foreach ($bugsys->datastore['severity'] AS $severity)
-	{
-		$value = $severity['severityid'];
-		$label = $severity['severity'];
-		eval('$select[severity] .= "' . $template->fetch('selectoption') . '";');
-	}
-	
+	$select['severity'] = construct_datastore_select('severity', 'severity', 'severityid');
+
 	$show['changestatus'] = ((can_perform('canchangestatus')) ? true : false);
 	
 	if (can_perform('canchangestatus'))
 	{
-		foreach ($bugsys->datastore['priority'] AS $priority)
-		{
-			$value = $priority['priorityid'];
-			$label = $priority['priority'];
-			eval('$select[priority] .= "' . $template->fetch('selectoption') . '";');
-		}
-		
-		foreach ($bugsys->datastore['status'] AS $status)
-		{
-			$value = $status['statusid'];
-			$label = $status['status'];
-			eval('$select[status] .= "' . $template->fetch('selectoption') . '";');
-		}
-		
-		foreach ($bugsys->datastore['resolution'] AS $resolution)
-		{
-			$value = $resolution['resolutionid'];
-			$label = $resolution['resolution'];
-			eval('$select[resolution] .= "' . $template->fetch('selectoption') . '";'); 
-		}
+		$select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid');
+		$select['status'] = construct_datastore_select('status', 'status', 'statusid');
+		$select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid');
 	}
 	
 	$show['assign'] = ((can_perform('canassign')) ? true : false);
-- 
2.22.5