From f502826680da458c198d20a784ab5737b2b1b4eb Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Tue, 22 Nov 2011 15:51:38 +0000
Subject: [PATCH] Merged from Evolvis via 5.1: PHP errors

---
 src/common/pm/ProjectTask.class.php         |  2 +-
 src/common/pm/ProjectTasksForUser.class.php |  2 +-
 src/common/pm/import_utils.php              | 16 +++++++++++-----
 src/www/export/rssAboTask.php               |  2 +-
 src/www/pm/postuploadcsv.php                |  8 ++++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/common/pm/ProjectTask.class.php b/src/common/pm/ProjectTask.class.php
index 8dba5254be..85dea1d83b 100644
--- a/src/common/pm/ProjectTask.class.php
+++ b/src/common/pm/ProjectTask.class.php
@@ -27,7 +27,7 @@
 require_once $gfcommon.'include/Error.class.php';
 require_once $gfcommon.'include/Validator.class.php';
 
-function &projecttask_get_object($project_task_id,$data=false) {
+function projecttask_get_object($project_task_id,$data=false) {
 		global $PROJECTTASK_OBJ;
 		if (!isset($PROJECTTASK_OBJ["_".$project_task_id."_"])) {
 			if ($data) {
diff --git a/src/common/pm/ProjectTasksForUser.class.php b/src/common/pm/ProjectTasksForUser.class.php
index b768a2fd67..f091cfa2c9 100644
--- a/src/common/pm/ProjectTasksForUser.class.php
+++ b/src/common/pm/ProjectTasksForUser.class.php
@@ -60,7 +60,7 @@ class ProjectTasksForUser extends Error {
 		for ($i=0; $i < $rows; $i++) {
 			$project_task_id = db_result($result,$i,'project_task_id');
 			$arr = db_fetch_array($result);
-			$task =& projecttask_get_object($project_task_id,$arr);
+			$task = projecttask_get_object($project_task_id,$arr);
 			$tasks[] =& $task;
 		}
 		return $tasks;
diff --git a/src/common/pm/import_utils.php b/src/common/pm/import_utils.php
index bb133f68f2..c9e27f2f98 100644
--- a/src/common/pm/import_utils.php
+++ b/src/common/pm/import_utils.php
@@ -47,6 +47,9 @@ function printrcomplete() {
 }
 
 function &pm_import_tasks($group_project_id,&$tasks) {
+	$was_error = false;
+	$foo = "";
+
 	printr($tasks,'MSPCheckin::in-array');
 	printr(getenv('TZ'),'MSPCheckin::entry TZ');
 
@@ -79,7 +82,7 @@ function &pm_import_tasks($group_project_id,&$tasks) {
 			$resrc = $tasks[$i]['resources'];
 			for ($j=0; $j<count($resrc); $j++) {
 				//validate user - see if they really exist as techs in this subproject
-				if (!$tarr[strtolower($resrc[$j]['user_name'])]) {
+				if (!util_ifsetor($tarr[strtolower($resrc[$j]['user_name'])])) {
 					//create list of bogus names to send back
 					if (array_search(strtolower($resrc[$j]['user_name']),$invalid_names) === false) {
 						$invalid_names[]=$resrc[$j]['user_name'];
@@ -93,7 +96,10 @@ function &pm_import_tasks($group_project_id,&$tasks) {
 		//
 		if (count($invalid_names)) {
 			$array['success']=false;
-			$array['errormessage']='Invalid Resource Name';
+			$array['errormessage']='Invalid Resource Name:';
+			foreach ($invalid_names as $i) {
+				$array['errormessage'] .= ' ' . $i;
+			}
 			$array['resourcename']=$invalid_names;
 			for ($i=0; $i<$tcount; $i++) {
 				$array['usernames'][$techs[$i]->getID()]=$techs[$i]->getUnixName();
@@ -197,7 +203,7 @@ function &pm_import_tasks($group_project_id,&$tasks) {
 				} else {
 					//update existing task
 					//create the task
-					$pt = &projecttask_get_object($tasks[$i]['id']);
+					$pt = projecttask_get_object($tasks[$i]['id']);
 					if (!$pt || !is_object($pt)) {
 						printr($tasks[$i]['id'],'Could not get task');
 					//	$array['success']=false;
@@ -316,7 +322,7 @@ function &pm_import_tasks($group_project_id,&$tasks) {
 						$deps[$id]=$darr[$dcount]['link_type'];
 					}
 					printr($deps,'Deps for task id: '.$tasks[$i]['id']);
-					if (is_object($tasks[$i]['obj'])) {
+					if (isset($tasks[$i]['obj']) && is_object($tasks[$i]['obj'])) {
 						printr($deps,'11 Done Setting deps for task id: '.$tasks[$i]['id']);
 						if (!$tasks[$i]['obj']->setDependentOn($deps)) {
 							$was_error=true;
@@ -344,7 +350,7 @@ function &pm_import_tasks($group_project_id,&$tasks) {
 				$pt_arr=& $ptf->getTasks();
 				for ($i=0; $i<count($pt_arr); $i++) {
 					if (is_object($pt_arr[$i])) {
-						if (!$completed[$pt_arr[$i]->getID()]) {
+						if (!util_ifsetor($completed[$pt_arr[$i]->getID()])) {
 							printr($pt_arr[$i]->getID(),'Deleting task');
 							if (!$pt_arr[$i]->delete(true)) {
 								echo $pt_arr[$i]->getErrorMessage();
diff --git a/src/www/export/rssAboTask.php b/src/www/export/rssAboTask.php
index e5ff833e44..0cadc35cf6 100644
--- a/src/www/export/rssAboTask.php
+++ b/src/www/export/rssAboTask.php
@@ -70,7 +70,7 @@ if(!$objProjectGroup || !is_object($objProjectGroup)) {
 	exit_error('Error',_('No project group was found for this task.'));
 }
 
-$objProjectTask = &projecttask_get_object($project_task_id);
+$objProjectTask = projecttask_get_object($project_task_id);
 if(!$objProjectTask || !is_object($objProjectTask)) {
 	exit_error('Error',_('No project task was found.'));
 }
diff --git a/src/www/pm/postuploadcsv.php b/src/www/pm/postuploadcsv.php
index 3b2f7b4528..b2f2c31964 100644
--- a/src/www/pm/postuploadcsv.php
+++ b/src/www/pm/postuploadcsv.php
@@ -43,7 +43,8 @@
 require_once $gfcommon.'pm/import_utils.php';
 
 $input_file = getUploadedFile('userfile');
-if (is_uploaded_file($input_file['tmp_name'])) {
+if (isset($input_file) && isset($input_file['tmp_name']) &&
+    is_uploaded_file($input_file['tmp_name'])) {
 	$handle = fopen($input_file['tmp_name'], 'r');
 	$tasks = array();
 
@@ -106,8 +107,11 @@ if (is_uploaded_file($input_file['tmp_name'])) {
 					'dependenton'=>$dependentOn,
 					'notes'=>$cols[11]);
 		}
+		$res=&pm_import_tasks($group_project_id, $tasks);
+
+	} else {
+		$res['errormessage'] = 'Parameter error';
 	}
-	$res=&pm_import_tasks($group_project_id, $tasks);
 
 	if ($res['success']) {
 		$feedback .= 'Import Was Successful';
-- 
2.30.2