[phpBT-dev] CVS: phpbt report.php,1.26.6.1,1.26.6.2

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

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1:/tmp/cvs-serv23846

Modified Files:
      Tag: htmltemplates
	report.php 
Log Message:
updates

Index: report.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/report.php,v
retrieving revision 1.26.6.1
retrieving revision 1.26.6.2
diff -u -r1.26.6.1 -r1.26.6.2
--- report.php	30 Aug 2003 22:07:12 -0000	1.26.6.1
+++ report.php	17 Nov 2003 12:44:59 -0000	1.26.6.2
@@ -2,7 +2,7 @@
 
 // report.php - Generate reports on various bug activities
 // ------------------------------------------------------------------------
-// Copyright (c) 2001, 2002 The phpBugTracker Group
+// Copyright (c) 2001 - 2003 The phpBugTracker Group
 // ------------------------------------------------------------------------
 // This file is part of phpBugTracker
 //
@@ -29,7 +29,7 @@
 	
 	// Start off our query
 	$querystring = $QUERY['report-resbyeng-1'];
-	$resfields = array('Assigned To','Open');
+	$resfields = array(translate("Assigned To"), translate("Open"));
 
 	// Grab the resolutions from the database
 	$rs = $db->query($QUERY['report-resbyeng-2'].
@@ -40,7 +40,7 @@
 		$resfields[] = $fieldname;
 		$querystring .= $countquery;
 	}
-	$resfields[] = 'Total';
+	$resfields[] = translate("Total");
 	
 	if ($projectid && is_numeric($projectid)) {
 		$projectquery = $QUERY['join-where']." project_id = $projectid";
@@ -63,17 +63,17 @@
 }
 
 function new_bugs_by_date($date_range) {
-	global $db, $t, $now, $_gv;
+	global $db, $t, $now;
 	
-	include ("jpgraph.php");
-	include ("jpgraph_bar.php");
+	include_once("jpgraph.php");
+	include_once("jpgraph_bar.php");
 	
 	$colors = array('red', 'cadetblue', 'gold', 'darkmagenta');
 	
 	$graph = new Graph(450,300);
 	$graph->SetShadow();
 	$graph->SetScale("textlin");
-	$graph->title->Set("Bug Counts by Date");
+	$graph->title->Set(translate("Bug Counts by Date"));
 	$graph->title->SetFont(FF_FONT1,FS_BOLD);
 	$graph->img->SetMargin(40,140,40,80);
 	if ($date_range > 30) {
@@ -118,9 +118,9 @@
 	$graph->Add($p1);
 	
 	// Resolutions
-	if (isset($_gv['resolutions'])) {
+	if (isset($_GET['resolutions'])) {
 		$color = 0;
-		foreach ($_gv['resolutions'] as $resolution) {
+		foreach ($_GET['resolutions'] as $resolution) {
 			$stats = array(
 				'dates' => array(), 
 				'labels' => array(), 
@@ -154,12 +154,12 @@
 	$graph->Stroke();
 }
 
-$projectid = isset($_gv['projectid']) ? $_gv['projectid'] : 0;
+$projectid = isset($_GET['projectid']) ? $_GET['projectid'] : 0;
 
-if (isset($_gv['op'])) {
-	switch ($_gv['op']) {
+if (isset($_GET['op'])) {
+	switch ($_GET['op']) {
 		case 'bugsbydate' : 
-			new_bugs_by_date(isset($_gv['date_range']) ? $_gv['date_range'] : 7);
+			new_bugs_by_date(isset($_GET['date_range']) ? $_GET['date_range'] : 7);
 			break;
 	}
 } else {