[Tikiwiki-cvs] tiki tiki-user_tasks.php,1.15.2.34,1.15.2.35

[<mh...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25701

Modified Files:
      Tag: BRANCH-1-9
	tiki-user_tasks.php 
Log Message:
layout


Index: tiki-user_tasks.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-user_tasks.php,v
retrieving revision 1.15.2.34
retrieving revision 1.15.2.35
diff -u -d -r1.15.2.34 -r1.15.2.35
--- tiki-user_tasks.php	2 Feb 2005 14:25:43 -0000	1.15.2.34
+++ tiki-user_tasks.php	2 Feb 2005 15:42:48 -0000	1.15.2.35
@@ -519,31 +519,34 @@
 	} else {
 		$send_message = false;
 	}
-    $info=$save;
+
+	if (isset($_REQUEST['preview'])) {
+    	$info=$save;
         $info['taskId'] = $_REQUEST['taskId'];
         $info['task_version'] = $_REQUEST['task_version'];
         $info['last_version'] = $_REQUEST['last_version'];
         $info['user'] = $_REQUEST['task_user'];
         $info['creator'] = $_REQUEST['creator'];;
         $info['public_for_group'] = $_REQUEST['public_for_group'];
-        $info['rights_by_creator'] = $_REQUEST['rights_by_creator'];
-        $task['deleted'] = $_REQUEST['deleted'];
-        $task['created'] = $_REQUEST['created'];
+        $info['rights_by_creator'] = (isset($_REQUEST['rights_by_creator']))? $_REQUEST['rights_by_creator'] : NULL;
+      //  $task['deleted'] = (isset($_REQUEST['deleted']))? $_REQUEST['deleted'] :NULL;
+      //  $task['created'] = (isset($_REQUEST['created']))? $_REQUEST['created'] :NULL;
         /*--history --*/
-        $task['belongs_to'] = $_REQUEST['belongs_to'];
-        $task['lasteditor'] = $_REQUEST['lasteditor'];
-        $task['lastchanges'] = date("U");
+      //  $task['belongs_to'] = (isset($_REQUEST['belongs_to']))? :;
+      //  $task['lasteditor'] = (isset($_REQUEST['lasteditor']))? :;
+      //  $task['lastchanges'] = date("U");
         /*--*/
         $info['percentage_null'] = ($_REQUEST['percentage'] == 'w');
-		if  ($_REQUEST['status'] == 'w') {
-        	$info['status'] = null; 
+
+		if  ((isset($_REQUEST['status'])) && ($_REQUEST['status'] != 'w')) {
+			$info['status'] = $_REQUEST['status'];
 		}
 		else{
-			$info['status'] = $_REQUEST['status'];
+        	$info['status'] = null; 
 		}
-        $info['info'] = $_REQUEST['task_info_message'];
-		$info['parsed'] = $tikilib->parse_data($info['description']);
-
+        $info['info'] = (isset($_REQUEST['task_info_message']))? $_REQUEST['task_info_message']:'';
+		$info['parsed'] = (isset($info['description']))? $tikilib->parse_data($info['description']):'';
+	}
 }
 	
 	
@@ -632,6 +635,11 @@
 	}
 					
 	if($show_admin) $user_for_group_list = $info['creator'];
+
+	$show_form = false;
+	$smarty->assign('show_form', $show_form);
+	$show_view = true;
+	$smarty->assign('show_view', $show_view);
 }
 
 
@@ -733,7 +741,13 @@
 
 $smarty->assign_by_ref('percs', $percs);
 
-ask_ticket('user-tasks');
+$img_accepted = 'src="img/icons2/tick.gif" width="15" height="15"';
+$img_one_accepted = 'src="img/icons2/error.gif" width="14" height="14"';
+$img_not_accepted = 'src="img/icons2/icn_forum.gif" width="16" height="16"';
+
+$smarty->assign('img_accepted', $img_accepted);
+$smarty->assign('img_one_accepted', $img_one_accepted);
+$smarty->assign('img_not_accepted', $img_not_accepted);
 
 $smarty->assign('mid', 'tiki-user_tasks.tpl');
 $smarty->display("tiki.tpl");