[phpBT-dev] CVS: phpbt include.php,1.74,1.75 query.php,1.40,1.41

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv728

Modified Files:
	include.php query.php 
Log Message:
Code cleanup

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- include.php	2001/11/13 03:53:02	1.74
+++ include.php	2001/11/14 04:58:06	1.75
@@ -220,7 +220,7 @@
   global $q, $select;
 
   //create hash to map tablenames
-  $cfgDatabase=array(
+  $cfgDatabase = array(
     'group' => TBL_AUTH_GROUP,
     'project' => TBL_PROJECT,
     'component' => TBL_COMPONENT,
@@ -231,16 +231,18 @@
   );
 
   $text = '';
-  $querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
-  $queries = array(
-    'group' => $querystart.' where group_name <> \'User\' order by group_name',
-    'severity' => $querystart.' where sort_order > 0 order by sort_order',
-    'status' => $querystart.' where sort_order > 0 order by sort_order',
-    'resolution' => $querystart.' where sort_order > 0 order by sort_order',
-    'project' => $querystart." where active > 0 order by {$box}_name",
-    'component' => $querystart." where project_id = $project order by {$box}_name",
-    'version' => $querystart." where project_id = $project order by {$box}_name"
-    );
+	if (in_array($box, $cfgDatabase)) {
+  	$querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
+  	$queries = array(
+    	'group' => $querystart.' where group_name <> \'User\' order by group_name',
+    	'severity' => $querystart.' where sort_order > 0 order by sort_order',
+    	'status' => $querystart.' where sort_order > 0 order by sort_order',
+    	'resolution' => $querystart.' where sort_order > 0 order by sort_order',
+    	'project' => $querystart." where active > 0 order by {$box}_name",
+    	'component' => $querystart." where project_id = $project order by {$box}_name",
+    	'version' => $querystart." where project_id = $project order by {$box}_name"
+    	);
+	}
 
   switch($box) {
     case 'group' :
@@ -344,6 +346,7 @@
 function multipages($nr, $page, $urlstr) {
   global $me, $selrange;
 
+	$pages = '';
   if (!$page) $page = 1;
   if ($page == 'all') {
     $selrange = $nr;

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- query.php	2001/11/14 04:11:02	1.40
+++ query.php	2001/11/14 04:58:06	1.41
@@ -36,6 +36,7 @@
 	global $q, $t, $status, $resolution, $os, $priority, $severity, $TITLE, $u;
 	
 	$nq = new dbclass;
+	$js = '';
 	
 	$t->set_file('content','queryform.html');
 	$t->set_block('content', 'savequeryblock', 'sqblock');
@@ -117,12 +118,12 @@
 		}
 	} else {
 		// Select boxes
-		if ($status) $flags[] = 'b.status_id in ('.delimit_list(',',$status).')';
-		if ($resolution) $flags[] = 'b.resolution_id in ('.delimit_list(',',$resolution).')';
-		if ($os) $flags[] = 'b.os_id in ('.delimit_list(',',$os).')';
-		if ($priority) $flags[] = 'b.priority in ('.delimit_list(',',$priority).')';
-		if ($severity) $flags[] = 'b.severity_id in ('.delimit_list(',',$severity).')';
-		if ($flags) $query[] = '('.delimit_list(' or ',$flags).')';
+		if (!empty($status)) $flags[] = 'b.status_id in ('.delimit_list(',',$status).')';
+		if (!empty($resolution)) $flags[] = 'b.resolution_id in ('.delimit_list(',',$resolution).')';
+		if (!empty($os)) $flags[] = 'b.os_id in ('.delimit_list(',',$os).')';
+		if (!empty($priority)) $flags[] = 'b.priority in ('.delimit_list(',',$priority).')';
+		if (!empty($severity)) $flags[] = 'b.severity_id in ('.delimit_list(',',$severity).')';
+		if (!empty($flags)) $query[] = '('.delimit_list(' or ',$flags).')';
 
 		// Email field(s)
 		if ($email1) {
@@ -137,7 +138,7 @@
 		}
 
 		// Text search field(s)
-		foreach(array('title','tescription','url') as $searchfield) {
+		foreach(array('title','description','url') as $searchfield) {
 			if ($$searchfield) {
 				switch (${$searchfield."_type"}) {
 					case 'like' : $cond = "like '%".$$searchfield."%'"; break;
@@ -147,7 +148,7 @@
 				$fields[] = "$searchfield $cond";
 			}
 		}
-		if ($fields) $query[] = '('.delimit_list(' or ',$fields).')';
+		if (!empty($fields)) $query[] = '('.delimit_list(' or ',$fields).')';
 
 		// Project/Version/Component
 		if ($projects) {
@@ -158,9 +159,11 @@
 		}
 	}
 	
-	if ($query) $querystring = delimit_list(' and ',$query);
-	return $querystring;
-	if (!$sess->is_registered('querystring')) $sess->register('querystring');
+	if (!empty($query)) {
+		return delimit_list(' and ',$query);
+	} else {
+		return '';
+	}
 }
 
 function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
@@ -301,7 +304,7 @@
 				case 'reporter' :
 				case 'owner' : 
 				case 'lastmodifier' : 
-					$coldata = maskemail($row[$field]);
+					$coldata = !empty($row[$field]) ? maskemail($row[$field]) : '';
 					$td_extra = 'class="center"';
 					break;
 				case 'priority' :
@@ -309,7 +312,7 @@
 					$td_extra = 'class="center"';
 					break;
 				default :
-					$coldata = $row[$field];
+					$coldata = !empty($row[$field]) ? $row[$field] : '';
 					$td_extra = 'class="center"';
 					break;
 			}
@@ -329,6 +332,8 @@
 
 $t->set_file('wrap','wrap.html');
 
+$reportedby = !empty($_gv['reportedby']) ? $_gv['reportedby'] : 0;
+$assignedto = !empty($_gv['assignedto']) ? $_gv['assignedto'] : 0;
 if ($op) switch($op) {
 	case 'query' : show_query(); break;
 	case 'doquery' : $queryinfo['query'] = ''; list_items(); break;