[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16983] trunk/tiki-view_tracker_item.php

[<sy...@us...>]

Revision: 16983
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16983&view=rev
Author:   sylvieg
Date:     2009-02-27 16:53:52 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
[FIX]tracker: sorry rollback to 16957(test on item caetgory perm is not ready) + put the test null date

Modified Paths:
--------------
    trunk/tiki-view_tracker_item.php

Modified: trunk/tiki-view_tracker_item.php
===================================================================
--- trunk/tiki-view_tracker_item.php	2009-02-27 14:46:54 UTC (rev 16982)
+++ trunk/tiki-view_tracker_item.php	2009-02-27 16:53:52 UTC (rev 16983)
@@ -295,6 +295,13 @@
 }
 $tikilib->get_perm_object($_REQUEST['trackerId'], 'tracker', $tracker_info);
 
+if ($tiki_p_view_trackers != 'y' and $tracker_info["writerCanModify"] != 'y' and $tracker_info["writerGroupCanModify"] != 'y'&& !$special) {
+	$smarty->assign('errortype', 401);
+	$smarty->assign('msg', tra("You do not have permission to use this feature"));
+	$smarty->display("error.tpl");
+	die;
+}
+
 $status_types = $trklib->status_types();
 $smarty->assign('status_types', $status_types);
 
@@ -639,22 +646,13 @@
 		$smarty->assign("tiki_p_view_trackers","y");
 	}
 }
-
-if ($tiki_p_view_trackers != 'y' and $tracker_info["writerCanModify"] != 'y' and $tracker_info["writerGroupCanModify"] != 'y' && !$special) {
-	if ($prefs['feature_categories'] == 'y' && $categlib->is_categorized('tracker '.$_REQUEST['trackerId'], $_REQUEST['itemId'])) {
-		$perms = $categlib->get_object_categories_perms($user, 'tracker '.$_REQUEST['trackerId'], $_REQUEST['itemId']);
-		echo 'sdfsdf';
-		if ($perms['tiki_p_view_categorized'] == 'y')
-			$tiki_p_view_trackers = 'y';
-	} else {
-		$smarty->assign('errortype', 401);
-		$smarty->assign('msg', tra("You do not have permission to use this feature"));
-		$smarty->display("error.tpl");
-		die;
-	}
+if ($tiki_p_view_trackers != 'y' && !$special) {
+	$smarty->assign('errortype', 401);
+	$smarty->assign('msg', tra("You do not have permission to use this feature"));
+	$smarty->display("error.tpl");
+	die;
 }
 
-
 if (!isset($mainfield)) {
 	$mainfield = 0;
 }
@@ -795,6 +793,9 @@
 	foreach($xfields["data"] as $i=>$array) {
 		if ($xfields["data"][$i]['isHidden'] == 'n' or $xfields["data"][$i]['isHidden'] == 'p' or $tiki_p_admin_trackers == 'y' or ($xfields["data"][$i]['type'] == 's' and $xfields[$i]['name'] == 'Rating' and $tiki_p_tracker_view_ratings == 'y')or ($xfields['data'][$i]['isHidden'] == 'c' && !empty($user) && $user == $itemUser)) {
 			$fields["data"][$i] = $xfields["data"][$i];
+			if ($fields['data'][$i]['type'] == 'f' || $fields['data'][$i]['type'] == 'j') {
+				$dateFields[] = $fields['data'][$i]['fieldId'];
+			}
 			if ($fields["data"][$i]["type"] != 'h') {
 				$fid = $fields["data"][$i]["fieldId"];
 				$ins_fields["data"][$i]["id"] = $fid;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.