[Fusionforge-commits] r10458 - in trunk/src: common/tracker www/pm/reporting www/tracker www/tracker/include

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Sun Sep 12 19:46:26 CEST 2010


Author: nerville
Date: 2010-09-12 19:46:26 +0200 (Sun, 12 Sep 2010)
New Revision: 10458

Modified:
   trunk/src/common/tracker/ArtifactQuery.class.php
   trunk/src/www/pm/reporting/index.php
   trunk/src/www/tracker/include/ArtifactTypeHtml.class.php
   trunk/src/www/tracker/query.php
Log:
mostly warning fix or coding standard

Modified: trunk/src/common/tracker/ArtifactQuery.class.php
===================================================================
--- trunk/src/common/tracker/ArtifactQuery.class.php	2010-09-12 17:24:22 UTC (rev 10457)
+++ trunk/src/common/tracker/ArtifactQuery.class.php	2010-09-12 17:46:26 UTC (rev 10458)
@@ -79,6 +79,13 @@
 	var $data_array;
 
 	/**
+	 * Array of query conditions
+	 *
+	 * @var		array	$element_array.
+	 */
+	var $element_array;
+
+	/**
 	 *	ArtifactQuery - Constructer
 	 *
 	 *	@param	object	ArtifactType object.

Modified: trunk/src/www/pm/reporting/index.php
===================================================================
--- trunk/src/www/pm/reporting/index.php	2010-09-12 17:24:22 UTC (rev 10457)
+++ trunk/src/www/pm/reporting/index.php	2010-09-12 17:46:26 UTC (rev 10458)
@@ -1,20 +1,29 @@
 <?php
 /**
- * GForge Project Management Facility
+ * FusionForge Project Management Facility : Tasks
  *
- * Copyright 2002 GForge, LLC
- * http://gforge.org/
+ * Copyright 1999-2000 (c) Tim Perdue - Sourceforge
+ * Copyright 2002 (c) GForge LLC
+ * Copyright 2010 (c) FusionForge Team
+ * http://fusionforge.org
  *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/*
 
-	Tasks
-	By Tim Perdue, Sourceforge, 11/99
-	Heavy rewrite by Tim Perdue April 2000
-
-	Total rewrite in OO and GForge coding guidelines 12/2002 by Tim Perdue
-*/
-
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'pm/include/ProjectGroupHTML.class.php';
@@ -58,7 +67,6 @@
 
 	   	pm_header(array ("title"=>$title));
 	   	pm_reporting_header($group_id);
-	   	echo "\n<h1>$title</h1>";
 
 		reports_quick_graph($subtitle1,$qpa1,$qpa2,$bar_colors);
 
@@ -87,7 +95,6 @@
 
 		pm_header(array ("title"=>_('Aging Report')));
 		pm_reporting_header($group_id);
-		echo "\n<h1>"._('Aging Report')."</h1>";
 
 		$time_now=time();
 //		echo $time_now."<p>";

Modified: trunk/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- trunk/src/www/tracker/include/ArtifactTypeHtml.class.php	2010-09-12 17:24:22 UTC (rev 10457)
+++ trunk/src/www/tracker/include/ArtifactTypeHtml.class.php	2010-09-12 17:46:26 UTC (rev 10458)
@@ -1,15 +1,28 @@
 <?php
 /**
-  *
-  * SourceForge Generic Tracker facility
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  */
+ * FusionForge Generic Tracker facility
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems - Sourceforge
+ * Copyright 2010 (c) Fusionforge Team
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
+ */
 
-
 require_once $gfcommon.'tracker/ArtifactType.class.php';
 require_once $gfcommon.'tracker/ArtifactExtraField.class.php';
 require_once $gfcommon.'tracker/ArtifactExtraFieldElement.class.php';
@@ -538,7 +551,7 @@
 	 *	@return		radio multiselectbox
 	 */	
 	function renderMultiSelectBox ($extra_field_id,$checked=array(),$show_100=false,$text_100='none') {
-		$arr =& $this->getExtraFieldElements($extra_field_id);
+		$arr =$this->getExtraFieldElements($extra_field_id);
 		if (!$checked) {
 			$checked=array();
 		}
@@ -547,7 +560,7 @@
 		}	
 		$keys=array();
 		$vals=array();
-		$arr =& $this->getExtraFieldElements($extra_field_id);
+		$arr = $this->getExtraFieldElements($extra_field_id);
 		for ($i=0; $i<count($arr); $i++) {
 			$keys[]=$arr[$i]['element_id'];
 			$vals[]=$arr[$i]['element_name'];

Modified: trunk/src/www/tracker/query.php
===================================================================
--- trunk/src/www/tracker/query.php	2010-09-12 17:24:22 UTC (rev 10457)
+++ trunk/src/www/tracker/query.php	2010-09-12 17:46:26 UTC (rev 10458)
@@ -1,21 +1,23 @@
 <?php
 /**
  * Copyright 2005 (c) GForge Group, LLC; Anthony J. Pugliese,
+ * Copyright 2010 (c) Fusionforge Team
+ * http://fusionforge.org
  *
- * This file is part of GForge.
+ * This file is part of FusionForge.
  *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
  */
 require_once $gfcommon.'tracker/ArtifactQuery.class.php';
@@ -64,8 +66,7 @@
 		}
 		$aq->makeDefault();
 		$query_id=$aq->getID();
-		header('Location: /tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
-		exit;
+		session_redirect('/tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
 	//	
 /*
 	// Make the displayed query the default
@@ -113,8 +114,7 @@
 		}
 		$aq->makeDefault();
 		$query_id=$aq->getID();
-		header('Location: /tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
-		exit;
+		session_redirect('/tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
 	//
 	//	Just load the query
 	//
@@ -141,7 +141,7 @@
 			$feedback .= 'Query Deleted';
 		}
 		$query_id=0;
-		header('Location: /tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
+		session_redirect('/tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
 		exit;
 	} else {
 		exit_error('Error', 'Missing Build Query Action');
@@ -161,7 +161,7 @@
 //
 $_assigned_to=$aq->getAssignee();
 $_status=$aq->getStatus();
-$extra_fields =& $aq->getExtraFields();
+$extra_fields=$aq->getExtraFields();
 $_sort_col=$aq->getSortCol();
 $_sort_ord=$aq->getSortOrd();
 $_moddaterange=$aq->getModDateRange();




More information about the Fusionforge-commits mailing list