[evolvis-commits] r10467: fixing gantt that chris broken with that bad view patch↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 17:49:09 CET 2011


Author: mirabilos
Date: 2011-02-24 17:49:09 +0100 (Thu, 24 Feb 2011)
New Revision: 10467

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectTaskFactory.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/gantt.php
Log:
fixing gantt that chris broken with that bad view patch


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectTaskFactory.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectTaskFactory.class	2011-02-24 16:46:59 UTC (rev 10466)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectTaskFactory.class	2011-02-24 16:49:09 UTC (rev 10467)
@@ -93,7 +93,7 @@
 	 *	@param	int	Include this param if you want to limit to a certain category.
 	 *	@param	string	What view mode the screen should be in.
 	 */
-	function setup($offset,$order,$max_rows,$set,$_assigned_to,$_status,$_category_id,$_view) {
+	function setup($offset,$order,$max_rows,$set,$_assigned_to,$_status,$_category_id,$_view='') {
 //echo "<BR>offset: $offset| order: $order|max_rows: $max_rows|_assigned_to: $_assigned_to|_status: $_status|_category_id: $_category_id +";
 		if ((!$offset) || ($offset < 0)) {
 			$this->offset=0;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/gantt.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/gantt.php	2011-02-24 16:46:59 UTC (rev 10466)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/gantt.php	2011-02-24 16:49:09 UTC (rev 10467)
@@ -4,43 +4,20 @@
 	exit_error('Error', 'Package JPGraph not installed');
 }
 
-require_once($sys_path_to_jpgraph.'jpgraph.php');
-require_once($sys_path_to_jpgraph.'jpgraph_gantt.php');
+require_once($sys_path_to_jpgraph.'/jpgraph.php');
+require_once($sys_path_to_jpgraph.'/jpgraph_gantt.php');
 require_once('common/pm/ProjectTaskFactory.class');
 
-/**
- * settitlefont() - Set font setting for GanttGraph object
- *
- * @param	GanttGraph	Target GanttGraph object
- * @param	string		Font family
- * @param	string		Font style
- * @param	integer		Font size
- * /
-function settitlefont($graph, $sys_font_family, $sys_font_style, $sys_font_size) {
-	if ($sys_font_family != "" &&
-	    $sys_font_style != "" &&
-	    $sys_font_size != "") {
-
-eval() is a nasty security hole
-
-		eval("\$font_family=$sys_font_family;");
-		eval("\$font_style=$sys_font_style;");
-		eval("\$font_size=$sys_font_size;");
-		$graph->title->SetFont($font_family,$font_style,$font_size);
-	}
-}
-*/
-
 $ptf = new ProjectTaskFactory($pg);
 if (!$ptf || !is_object($ptf)) {
 	exit_error('Error','Could Not Get ProjectTaskFactory');
 } elseif ($ptf->isError()) {
-	exit_error('Error',$ptf->getErrorMessage());
+	exit_error('Error getting PTF',$ptf->getErrorMessage());
 }
 
 $ptf->setup($offset,$_order,$max_rows,'custom',$_assigned_to,$_status,$_category_id);
 if ($ptf->isError()) {
-	exit_error('Error',$ptf->getErrorMessage());
+	exit_error('Error in PTF',$ptf->getErrorMessage());
 }
 
 $pt_arr =& $ptf->getTasks();
@@ -57,6 +34,7 @@
 } else {
 	$graph  = new GanttGraph (800,600, "auto");
 }
+
 //$graph->SetShadow();
 $graph->SetMargin(10,10,25,10);
 



More information about the evolvis-commits mailing list