[Fusionforge-commits] FusionForge branch master updated. 3cd8d3f3c425aa487a99cd9b8a20bdd099e42164

[Alain Peyrat]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  3cd8d3f3c425aa487a99cd9b8a20bdd099e42164 (commit)
      from  3c7aad26eabe323cf359e7ebb58a03975678e29e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3cd8d3f3c425aa487a99cd9b8a20bdd099e42164
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri Sep 13 17:56:28 2013 +0200

    Minor: clean code & phpdoc

diff --git a/src/www/include/project_summary.php b/src/www/include/project_summary.php
index f20ab76..fddf57d 100644
--- a/src/www/include/project_summary.php
+++ b/src/www/include/project_summary.php
@@ -48,6 +48,7 @@ function project_setup_agg($group_id) {
  *
  * @param		int		The group ID
  * @param		string	The type
+ * @return string
  * @access		private
  */
 function project_getaggvalue($group_id,$type) {
@@ -90,7 +91,7 @@ function project_get_survey_count($group_id) {
  */
 function project_summary($group_id,$mode,$no_table) {
 	if (!$group_id) {
-		return 'Error - No Project ID';
+		return 'Error: No Project ID';
 	}
 	if (!$mode) {
 		$mode='full';
diff --git a/src/www/pm/msproject/msp.php b/src/www/pm/msproject/msp.php
index 641bd97..8833c24 100644
--- a/src/www/pm/msproject/msp.php
+++ b/src/www/pm/msproject/msp.php
@@ -230,12 +230,12 @@ function &MSPGetProjects($session_hash) {
 * Create SubProjects
 *
 * @author	Luis Hurtado	luis at gforgegroup.com
-* @param	int	$group_id		ID Group
-* @param	$session_hash	User Session
-* @param	$name		Project name
+* @param	int		$group_id		ID Group
+* @param	object	$session_hash	User Session
+* @param	string	$name		Project name
 * @param	bool	$is_public	1 Public  0 Private
-* @param	$description	Project Description
-* @return	ProjectGroup	Object ProjectGroup
+* @param	string	$description	Project Description
+* @return	object	ProjectGroup	Object ProjectGroup
 * @date		2005-01-19
 *
 */
diff --git a/src/www/pm/msproject/xmlparser.php b/src/www/pm/msproject/xmlparser.php
index 9cf4ce0..71172b4 100644
--- a/src/www/pm/msproject/xmlparser.php
+++ b/src/www/pm/msproject/xmlparser.php
@@ -95,14 +95,7 @@ $fdependenton = false;
 
 function startElement($parser, $name, $attrib){
     global $principal_tag;
-    global $principal_action;
     global $subproject_id;
-    global $task_id;
-    global $project_id;
-    global $parent_task_id;
-    global $parent_project_id;
-    global $isnew;
-    global $task_count;
     global $tasks;
     global $fdependenton;
     global $result;
@@ -183,9 +176,7 @@ function startElement($parser, $name, $attrib){
 
 function endElement($parser, $name) {
 	global $task_count;
-	global $iddependenton;
 	global $fdependenton;
-	global $result;
 	global $atasks;
 	global $resourcename;
 	global $principal_tag;
@@ -214,12 +205,6 @@ function characterDataHandler ($parser, $data) {
 	global $subproject_id;
 	global $result;
 	global $tag_aux;
-	global $task_count;
-	global $task_id;
-	global $project_id;
-	global $parent_task_id;
-	global $parent_project_id;
-	global $isnew;
 	global $atasks;
 	global $fdependenton;
 	global $iddependenton;
diff --git a/src/www/pm/reporting/index.php b/src/www/pm/reporting/index.php
index 033fc67..622f5c0 100644
--- a/src/www/pm/reporting/index.php
+++ b/src/www/pm/reporting/index.php
@@ -142,8 +142,9 @@ if ($what) {
 								AND project_group_list.group_id=$3 ',
 								array($start, $end, $group_id));
 
-			$ticks[$counter-1] = sprintf(_('%1$s to %2$s'),
-			    date("Y-m-d", $start), date("Y-m-d", $end));
+			$ticks[$counter-1] = date("Y-m-d", ($start))
+								. ' ' . _('to') . ' '
+								. date("Y-m-d",($end));
 			$values[0][$counter-1] = ((int)(db_result($resAvgClosedTask, 0, 0)*1000))/1000;
 			$values[1][$counter-1] = (int)db_result($resStartTasks, 0, 0);
 		}

-----------------------------------------------------------------------

Summary of changes:
 src/www/include/project_summary.php |    3 ++-
 src/www/pm/msproject/msp.php        |   10 +++++-----
 src/www/pm/msproject/xmlparser.php  |   15 ---------------
 src/www/pm/reporting/index.php      |    5 +++--
 4 files changed, 10 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge