';
+ .'/timesheet/timesheetFavouriteAdmin.php?ref='.$ref.'&action=view"&token='.$token.'>';
} else{
$lien = "";
}
diff --git a/htdocs/timesheet/class/TimesheetTask.class.php b/htdocs/timesheet/class/TimesheetTask.class.php
index 6d9822d..e25aec2 100644
--- a/htdocs/timesheet/class/TimesheetTask.class.php
+++ b/htdocs/timesheet/class/TimesheetTask.class.php
@@ -569,7 +569,7 @@ public function getActuals($timeStart = 0, $timeEnd = 0, $userid = 0)
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt";
$sql .= " WHERE ";
if ($this->id == -1 && is_array($this->exclusionlist)){
- $sql .= " ptt.fk_task not in '".implode("','",$this->exclusionlist)."' ";
+ $sql .= " ptt.fk_task not in ('".implode("','",$this->exclusionlist)."') ";
$sql .= " AND (ptt.fk_user = '".$userid."') ";
$sql .= " AND (DATE(ptt.task_datehour) >= '".$this->db->idate($timeStart)."') ";
$sql .= " AND (DATE(ptt.task_datehour)<'".$this->db->idate($timeEnd)."')";
diff --git a/htdocs/timesheet/class/TimesheetUserTasks.class.php b/htdocs/timesheet/class/TimesheetUserTasks.class.php
index c34effc..a56775a 100644
--- a/htdocs/timesheet/class/TimesheetUserTasks.class.php
+++ b/htdocs/timesheet/class/TimesheetUserTasks.class.php
@@ -561,7 +561,7 @@ public function fetchTaskTimesheet($userid = '')
$tasksList[$i]->date_end_approval = $this->date_end;
$tasksList[$i]->task_timesheet = $this->id;
$tasksList[$i]->progress = $obj->progress;
- $tasksList[$i]->listed = is_array($whiteList)?$whiteList[$obj->taskid]:null;
+ $tasksList[$i]->listed = (is_array($whiteList) && array_key_exists($obj->taskid, $whiteList) )?$whiteList[$obj->taskid]:null;
// $tasksList[$i]->pStatus = $obj->p_status;
$i++;
@@ -845,12 +845,12 @@ public function getHTMLHeader($search = false)
*/
public function getHTMLFormHeader($ajax = false)
{
- global $langs, $conf;
+ global $langs, $conf, $token;
$html = '