[Fusionforge-commits] r8063 - in trunk/gforge/www/pm: . include msproject reporting
Roland Mas
lolando at libremir.placard.fr.eu.org
Mon Aug 31 17:39:20 CEST 2009
Author: lolando
Date: 2009-08-31 17:39:19 +0200 (Mon, 31 Aug 2009)
New Revision: 8063
Modified:
trunk/gforge/www/pm/include/ProjectGroupHTML.class.php
trunk/gforge/www/pm/include/ProjectTaskHTML.class.php
trunk/gforge/www/pm/mod_task.php
trunk/gforge/www/pm/msproject/msp.php
trunk/gforge/www/pm/reporting/index.php
Log:
Ongoing migration to db_query_params()
Modified: trunk/gforge/www/pm/include/ProjectGroupHTML.class.php
===================================================================
--- trunk/gforge/www/pm/include/ProjectGroupHTML.class.php 2009-08-31 15:39:10 UTC (rev 8062)
+++ trunk/gforge/www/pm/include/ProjectGroupHTML.class.php 2009-08-31 15:39:19 UTC (rev 8063)
@@ -102,9 +102,10 @@
}
function groupProjectBox($name='group_project_id',$checked='xzxz',$show_100=true,$text_100='None') {
- $res=db_query("SELECT group_project_id,project_name
+ $res=db_query_params ('SELECT group_project_id,project_name
FROM project_group_list
- WHERE group_id='".$this->Group->getID()."'");
+ WHERE group_id=$1',
+ array($this->Group->getID()));
return html_build_select_box($res,$name,$checked,$show_100,$text_100);
}
Modified: trunk/gforge/www/pm/include/ProjectTaskHTML.class.php
===================================================================
--- trunk/gforge/www/pm/include/ProjectTaskHTML.class.php 2009-08-31 15:39:10 UTC (rev 8062)
+++ trunk/gforge/www/pm/include/ProjectTaskHTML.class.php 2009-08-31 15:39:19 UTC (rev 8063)
@@ -40,11 +40,12 @@
function showDependentTasks () {
- $sql="SELECT project_task.project_task_id,project_task.summary
+
+ $result=db_query_params ('SELECT project_task.project_task_id,project_task.summary
FROM project_task,project_dependencies
WHERE project_task.project_task_id=project_dependencies.project_task_id
- AND project_dependencies.is_dependent_on_task_id='". $this->getID() ."'";
- $result=db_query($sql);
+ AND project_dependencies.is_dependent_on_task_id=$1',
+ array($this->getID() ));
$rows=db_numrows($result);
if ($rows > 0) {
Modified: trunk/gforge/www/pm/mod_task.php
===================================================================
--- trunk/gforge/www/pm/mod_task.php 2009-08-31 15:39:10 UTC (rev 8062)
+++ trunk/gforge/www/pm/mod_task.php 2009-08-31 15:39:19 UTC (rev 8063)
@@ -233,14 +233,15 @@
//
// Display Time Recorded for this task
//
-$sql="SELECT users.realname, rep_time_tracking.report_date, rep_time_tracking.hours, rep_time_category.category_name
+
+
+$res=db_query_params ('SELECT users.realname, rep_time_tracking.report_date, rep_time_tracking.hours, rep_time_category.category_name
FROM users,rep_time_tracking,rep_time_category
WHERE
users.user_id=rep_time_tracking.user_id
AND rep_time_tracking.time_code=rep_time_category.time_code
- AND rep_time_tracking.project_task_id='$project_task_id'";
-
-$res=db_query($sql);
+ AND rep_time_tracking.project_task_id=$1',
+ array($project_task_id));
$total_hours =0;
for ($i=0; $i<db_numrows($res); $i++) {
Modified: trunk/gforge/www/pm/msproject/msp.php
===================================================================
--- trunk/gforge/www/pm/msproject/msp.php 2009-08-31 15:39:10 UTC (rev 8062)
+++ trunk/gforge/www/pm/msproject/msp.php 2009-08-31 15:39:19 UTC (rev 8063)
@@ -38,11 +38,7 @@
$array['success']=true;
$array['session_hash']=$session_ser;
if ( $sys_database_type == "mysql" ) {
- $sql="SELECT pgl.group_project_id, CONCAT(g.group_name, ': ', pgl.project_name) AS name";
- } else {
- $sql="SELECT pgl.group_project_id, g.group_name || ': ' || pgl.project_name AS name";
- }
- $sql.="
+ $sql="SELECT pgl.group_project_id, CONCAT(g.group_name, ': ', pgl.project_name) AS name
FROM groups g, project_group_list pgl, role_setting rs, user_group ug
WHERE ug.user_id='".user_getid()."'
AND g.group_id=pgl.group_id
@@ -50,7 +46,20 @@
AND rs.group_project_id = pgl.group_project_id
AND ug.role_id = rs.role_id
AND rs.section_name='pm'";
- $res=db_query($sql);
+ $res=db_query_mysql($sql);
+ } else {
+ $res=db_query_params ('SELECT pgl.group_project_id, g.group_name || $1 || pgl.project_name AS name
+ FROM groups g, project_group_list pgl, role_setting rs, user_group ug
+ WHERE ug.user_id=$2
+ AND g.group_id=pgl.group_id
+ AND rs.value::integer > 0
+ AND rs.group_project_id = pgl.group_project_id
+ AND ug.role_id = rs.role_id
+ AND rs.section_name=$3',
+ array(': ',
+ user_getid(),
+ 'pm'));
+ }
$rows=db_numrows($res);
if (!$res || $rows<1) {
$array['success']=false;
@@ -201,7 +210,9 @@
$array['success']=false;
$array['errormessage']='Could Not Continue Session';
}
- $group_res = db_query("SELECT groups.group_id FROM groups NATURAL JOIN user_group WHERE user_id='".user_getid()."' AND project_flags='2'");
+ $group_res = db_query_params ('SELECT groups.group_id FROM groups NATURAL JOIN user_group WHERE user_id=$1 AND project_flags=$2',
+ array(user_getid(),
+ 2));
$group_ids=&util_result_column_to_array($group_res,'group_id');
$groups=&group_get_objects($group_ids);
return $groups;
Modified: trunk/gforge/www/pm/reporting/index.php
===================================================================
--- trunk/gforge/www/pm/reporting/index.php 2009-08-31 15:39:10 UTC (rev 8062)
+++ trunk/gforge/www/pm/reporting/index.php 2009-08-31 15:39:19 UTC (rev 8063)
@@ -112,16 +112,19 @@
$start=($time_now-($counter*$sub_duration));
$end=($time_now-(($counter-1)*$sub_duration));
- $sql="SELECT avg((end_date-start_date)/(24*60*60))
+
+
+ $result = db_query_params ('SELECT avg((end_date-start_date)/(24*60*60))
FROM project_task,project_group_list
WHERE end_date > 0
-AND (start_date >= '$start' AND start_date <= '$end')
+AND (start_date >= $1 AND start_date <= $2)
AND project_task.status_id=2
AND project_group_list.group_project_id=project_task.group_project_id
-AND project_group_list.group_id='$group_id' ";
+AND project_group_list.group_id=$3 ',
+ array($start,
+ $end,
+ $group_id));
- $result = db_query($sql);
-
$names[$counter-1]=date("Y-m-d",($start))." to ".date("Y-m-d",($end));
$values[$counter-1]=((int)(db_result($result, 0,0)*1000))/1000;
}
@@ -135,15 +138,16 @@
$start=($time_now-($counter*$sub_duration));
$end=($time_now-(($counter-1)*$sub_duration));
- $sql="SELECT count(*)
+ $result = db_query_params ('SELECT count(*)
FROM project_task,project_group_list
-WHERE start_date >= '$start'
-AND start_date <= '$end'
+WHERE start_date >= $1
+AND start_date <= $2
AND project_group_list.group_project_id=project_task.group_project_id
-AND project_group_list.group_id='$group_id' ";
+AND project_group_list.group_id=$3 ',
+ array($start,
+ $end,
+ $group_id));
- $result = db_query($sql);
-
$names[$counter-1]=date("Y-m-d",($start))." to ".date("Y-m-d",($end));
$values[$counter-1]=db_result($result, 0,0);
}
@@ -157,15 +161,18 @@
$start=($time_now-($counter*$sub_duration));
$end=($time_now-(($counter-1)*$sub_duration));
- $sql="SELECT count(*)
+
+
+ $result = db_query_params ('SELECT count(*)
FROM project_task,project_group_list
-WHERE start_date <= '$end'
-AND (end_date >= '$end' OR end_date < 1 OR end_date is null)
+WHERE start_date <= $1
+AND (end_date >= $2 OR end_date < 1 OR end_date is null)
AND project_group_list.group_project_id=project_task.group_project_id
-AND project_group_list.group_id='$group_id' ";
+AND project_group_list.group_id=$3 ',
+ array($end,
+ $end,
+ $group_id));
- $result = db_query($sql);
-
$names[$counter-1]=date("Y-m-d",($end));
$values[$counter-1]=db_result($result, 0,0);
}
More information about the Fusionforge-commits
mailing list