alxarafe / alixar

dolibarr/htdocs/projet/class/task.class.php

Spacing +228 added lines, -228 removed lines

@@ -24,7 +24,7 @@ 
  *      \ingroup    project
  *      \brief      This file is a CRUD class file for Task (Create/Read/Update/Delete)
  */
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * 	Class to manage tasks
@@ -47,7 +47,7 @@ 
      */
     public $fk_element = 'fk_task';
     public $picto = 'task';
-    protected $childtables = array('projet_task_time');    // To test if we can delete object
+    protected $childtables = array('projet_task_time'); // To test if we can delete object
 
     /**
      * @var int ID parent task
@@ -63,7 +63,7 @@ 
      * @var string description
      */
     public $description;
-    public $duration_effective;  // total of time spent on this task
+    public $duration_effective; // total of time spent on this task
     public $planned_workload;
     public $date_c;
     public $date_start;
@@ -98,8 +98,8 @@ 
     public $timespent_duration;
     public $timespent_old_duration;
     public $timespent_date;
-    public $timespent_datehour;  // More accurate start date (same than timespent_date but includes hours, minutes and seconds)
-    public $timespent_withhour;  // 1 = we entered also start hours for timesheet line
+    public $timespent_datehour; // More accurate start date (same than timespent_date but includes hours, minutes and seconds)
+    public $timespent_withhour; // 1 = we entered also start hours for timesheet line
     public $timespent_fk_user;
     public $timespent_note;
     public $comments = array();
@@ -135,7 +135,7 @@ 
         // Check parameters
         // Put here code to add control on parameters values
         // Insert request
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet_task (";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task (";
         $sql .= "fk_projet";
         $sql .= ", ref";
         $sql .= ", fk_task_parent";
@@ -149,29 +149,29 @@ 
         $sql .= ", progress";
         $sql .= ") VALUES (";
         $sql .= $this->fk_project;
-        $sql .= ", " . (!empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'null');
-        $sql .= ", " . $this->fk_task_parent;
-        $sql .= ", '" . $this->db->escape($this->label) . "'";
-        $sql .= ", '" . $this->db->escape($this->description) . "'";
-        $sql .= ", '" . $this->db->idate($this->date_c) . "'";
-        $sql .= ", " . $user->id;
-        $sql .= ", " . ($this->date_start != '' ? "'" . $this->db->idate($this->date_start) . "'" : 'null');
-        $sql .= ", " . ($this->date_end != '' ? "'" . $this->db->idate($this->date_end) . "'" : 'null');
-        $sql .= ", " . (($this->planned_workload != '' && $this->planned_workload >= 0) ? $this->planned_workload : 'null');
-        $sql .= ", " . (($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null');
+        $sql .= ", ".(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'null');
+        $sql .= ", ".$this->fk_task_parent;
+        $sql .= ", '".$this->db->escape($this->label)."'";
+        $sql .= ", '".$this->db->escape($this->description)."'";
+        $sql .= ", '".$this->db->idate($this->date_c)."'";
+        $sql .= ", ".$user->id;
+        $sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+        $sql .= ", ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
+        $sql .= ", ".(($this->planned_workload != '' && $this->planned_workload >= 0) ? $this->planned_workload : 'null');
+        $sql .= ", ".(($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null');
         $sql .= ")";
 
         $this->db->begin();
 
-        dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
 
         if (!$error) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "projet_task");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task");
 
             if (!$notrigger) {
                 // Call trigger
@@ -196,8 +196,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -243,17 +243,17 @@ 
             $sql .= ", t2.ref as task_parent_ref";
             $sql .= ", t2.rang as task_parent_position";
         }
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t";
         if (!empty($loadparentdata))
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t2 ON t.fk_task_parent = t2.rowid";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t2 ON t.fk_task_parent = t2.rowid";
         $sql .= " WHERE ";
         if (!empty($ref)) {
-            $sql .= "t.ref = '" . $this->db->escape($ref) . "'";
+            $sql .= "t.ref = '".$this->db->escape($ref)."'";
         } else {
-            $sql .= "t.rowid = " . $id;
+            $sql .= "t.rowid = ".$id;
         }
 
-        dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num_rows = $this->db->num_rows($resql);
@@ -298,7 +298,7 @@ 
                 return 0;
             }
         } else {
-            $this->error = "Error " . $this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -341,27 +341,27 @@ 
         // Check parameters
         // Put here code to add control on parameters values
         // Update request
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task SET";
-        $sql .= " fk_projet=" . (isset($this->fk_project) ? $this->fk_project : "null") . ",";
-        $sql .= " ref=" . (isset($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : "'" . $this->db->escape($this->id) . "'") . ",";
-        $sql .= " fk_task_parent=" . (isset($this->fk_task_parent) ? $this->fk_task_parent : "null") . ",";
-        $sql .= " label=" . (isset($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ",";
-        $sql .= " description=" . (isset($this->description) ? "'" . $this->db->escape($this->description) . "'" : "null") . ",";
-        $sql .= " duration_effective=" . (isset($this->duration_effective) ? $this->duration_effective : "null") . ",";
-        $sql .= " planned_workload=" . ((isset($this->planned_workload) && $this->planned_workload != '') ? $this->planned_workload : "null") . ",";
-        $sql .= " dateo=" . ($this->date_start != '' ? "'" . $this->db->idate($this->date_start) . "'" : 'null') . ",";
-        $sql .= " datee=" . ($this->date_end != '' ? "'" . $this->db->idate($this->date_end) . "'" : 'null') . ",";
-        $sql .= " progress=" . (($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null') . ",";
-        $sql .= " rang=" . ((!empty($this->rang)) ? $this->rang : "0");
-        $sql .= " WHERE rowid=" . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
+        $sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+        $sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "'".$this->db->escape($this->id)."'").",";
+        $sql .= " fk_task_parent=".(isset($this->fk_task_parent) ? $this->fk_task_parent : "null").",";
+        $sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
+        $sql .= " duration_effective=".(isset($this->duration_effective) ? $this->duration_effective : "null").",";
+        $sql .= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '') ? $this->planned_workload : "null").",";
+        $sql .= " dateo=".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null').",";
+        $sql .= " datee=".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null').",";
+        $sql .= " progress=".(($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null').",";
+        $sql .= " rang=".((!empty($this->rang)) ? $this->rang : "0");
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
-        dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
 
         // Update extrafield
@@ -391,10 +391,10 @@ 
                 $project = new Project($this->db);
                 $project->fetch($this->fk_project);
 
-                $olddir = $conf->projet->dir_output . '/' . dol_sanitizeFileName($project->ref) . '/' . dol_sanitizeFileName($this->oldcopy->ref);
-                $newdir = $conf->projet->dir_output . '/' . dol_sanitizeFileName($project->ref) . '/' . dol_sanitizeFileName($this->ref);
+                $olddir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
+                $newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
                 if (file_exists($olddir)) {
-                    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
                     $res = dol_move($olddir, $newdir);
                     if (!$res) {
                         $langs->load("errors");
@@ -408,8 +408,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -430,14 +430,14 @@ 
     {
 
         global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $error = 0;
 
         $this->db->begin();
 
         if ($this->hasChildren() > 0) {
-            dol_syslog(get_class($this) . "::delete Can't delete record as it has some sub tasks", LOG_WARNING);
+            dol_syslog(get_class($this)."::delete Can't delete record as it has some sub tasks", LOG_WARNING);
             $this->error = 'ErrorRecordHasSubTasks';
             $this->db->rollback();
             return 0;
@@ -445,7 +445,7 @@ 
 
         $objectisused = $this->isObjectUsed($this->id);
         if (!empty($objectisused)) {
-            dol_syslog(get_class($this) . "::delete Can't delete record as it has some child", LOG_WARNING);
+            dol_syslog(get_class($this)."::delete Can't delete record as it has some child", LOG_WARNING);
             $this->error = 'ErrorRecordHasChildren';
             $this->db->rollback();
             return 0;
@@ -463,35 +463,35 @@ 
         }
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
-            $sql .= " WHERE fk_task=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+            $sql .= " WHERE fk_task=".$this->id;
 
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $error++;
-                $this->errors[] = "Error " . $this->db->lasterror();
+                $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
-            $sql .= " WHERE fk_object=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
+            $sql .= " WHERE fk_object=".$this->id;
 
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $error++;
-                $this->errors[] = "Error " . $this->db->lasterror();
+                $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
-            $sql .= " WHERE rowid=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
+            $sql .= " WHERE rowid=".$this->id;
 
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $error++;
-                $this->errors[] = "Error " . $this->db->lasterror();
+                $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
 
@@ -509,8 +509,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -520,10 +520,10 @@ 
                 $projectstatic = new Project($this->db);
                 $projectstatic->fetch($this->fk_project);
 
-                $dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($projectstatic->ref) . '/' . dol_sanitizeFileName($this->id);
-                dol_syslog(get_class($this) . "::delete dir=" . $dir, LOG_DEBUG);
+                $dir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($this->id);
+                dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG);
                 if (file_exists($dir)) {
-                    require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+                    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
                     $res = @dol_delete_dir_recursive($dir);
                     if (!$res) {
                         $this->error = 'ErrorFailToDeleteDir';
@@ -550,14 +550,14 @@ 
         $ret = 0;
 
         $sql = "SELECT COUNT(*) as nb";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task";
-        $sql .= " WHERE fk_task_parent=" . $this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
+        $sql .= " WHERE fk_task_parent=".$this->id;
 
-        dol_syslog(get_class($this) . "::hasChildren", LOG_DEBUG);
+        dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         } else {
             $obj = $this->db->fetch_object($resql);
             if ($obj)
@@ -583,14 +583,14 @@ 
         $ret = 0;
 
         $sql = "SELECT COUNT(*) as nb";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time";
-        $sql .= " WHERE fk_task=" . $this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+        $sql .= " WHERE fk_task=".$this->id;
 
-        dol_syslog(get_class($this) . "::hasTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         } else {
             $obj = $this->db->fetch_object($resql);
             if ($obj)
@@ -622,19 +622,19 @@ 
         global $conf, $langs, $user;
 
         if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+            $notooltip = 1; // Force disable tooltips
 
         $result = '';
-        $label = '<u>' . $langs->trans("ShowTask") . '</u>';
+        $label = '<u>'.$langs->trans("ShowTask").'</u>';
         if (!empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
         if (!empty($this->label))
-            $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+            $label .= '<br><b>'.$langs->trans('LabelTask').':</b> '.$this->label;
         if ($this->date_start || $this->date_end) {
-            $label .= "<br>" . get_date_range($this->date_start, $this->date_end, '', $langs, 0);
+            $label .= "<br>".get_date_range($this->date_start, $this->date_end, '', $langs, 0);
         }
 
-        $url = DOL_URL_ROOT . '/projet/tasks/' . $mode . '.php?id=' . $this->id . ($option == 'withproject' ? '&withproject=1' : '');
+        $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option == 'withproject' ? '&withproject=1' : '');
         // Add param to save lastsearch_values or not
         $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
         if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))
@@ -646,26 +646,26 @@ 
         if (empty($notooltip)) {
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
                 $label = $langs->trans("ShowTask");
-                $linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip"';
         }
 
-        $linkstart = '<a href="' . $url . '"';
-        $linkstart .= $linkclose . '>';
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart .= $linkclose.'>';
         $linkend = '</a>';
 
         $picto = 'projecttask';
 
         $result .= $linkstart;
         if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+            $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
         if ($withpicto != 2)
             $result .= $this->ref;
         $result .= $linkend;
         if ($withpicto != 2)
-            $result .= (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+            $result .= (($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
         return $result;
     }
@@ -718,38 +718,38 @@ 
         // List of tasks (does not care about permissions. Filtering will be done later)
         $sql = "SELECT ";
         if ($filteronprojuser > 0 || $filterontaskuser > 0)
-            $sql .= " DISTINCT";  // We may get several time the same record if user has several roles on same project/task
+            $sql .= " DISTINCT"; // We may get several time the same record if user has several roles on same project/task
         $sql .= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
         $sql .= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
         $sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
         $sql .= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
         if ($mode == 0) {
             if ($filteronprojuser > 0) {
-                $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-                $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
             }
-            $sql .= ", " . MAIN_DB_PREFIX . "projet_task as t";
+            $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
             if ($filterontaskuser > 0) {
-                $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec2";
-                $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc2";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            $sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+            $sql .= " WHERE p.entity IN (".getEntity('project').")";
             $sql .= " AND t.fk_projet = p.rowid";
         } elseif ($mode == 1) {
             if ($filteronprojuser > 0) {
-                $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-                $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
             }
             if ($filterontaskuser > 0) {
-                $sql .= ", " . MAIN_DB_PREFIX . "projet_task as t";
-                $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec2";
-                $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc2";
+                $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             } else {
-                $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t on t.fk_projet = p.rowid";
+                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
-            $sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+            $sql .= " WHERE p.entity IN (".getEntity('project').")";
         } else
             return 'BadValueForParameterMode';
 
@@ -757,7 +757,7 @@ 
             $sql .= " AND p.rowid = ec.element_id";
             $sql .= " AND ctc.rowid = ec.fk_c_type_contact";
             $sql .= " AND ctc.element = 'project'";
-            $sql .= " AND ec.fk_socpeople = " . $filteronprojuser;
+            $sql .= " AND ec.fk_socpeople = ".$filteronprojuser;
             $sql .= " AND ec.statut = 4";
             $sql .= " AND ctc.source = 'internal'";
         }
@@ -766,24 +766,24 @@ 
             $sql .= " AND p.rowid = ec2.element_id";
             $sql .= " AND ctc2.rowid = ec2.fk_c_type_contact";
             $sql .= " AND ctc2.element = 'project_task'";
-            $sql .= " AND ec2.fk_socpeople = " . $filterontaskuser;
+            $sql .= " AND ec2.fk_socpeople = ".$filterontaskuser;
             $sql .= " AND ec2.statut = 4";
             $sql .= " AND ctc2.source = 'internal'";
         }
         if ($socid)
-            $sql .= " AND p.fk_soc = " . $socid;
+            $sql .= " AND p.fk_soc = ".$socid;
         if ($projectid)
-            $sql .= " AND p.rowid in (" . $projectid . ")";
+            $sql .= " AND p.rowid in (".$projectid.")";
         if ($filteronproj)
             $sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
         if ($filteronprojstatus && $filteronprojstatus != '-1')
-            $sql .= " AND p.fk_statut IN (" . $filteronprojstatus . ")";
+            $sql .= " AND p.fk_statut IN (".$filteronprojstatus.")";
         if ($morewherefilter)
             $sql .= $morewherefilter;
         $sql .= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;exit;
-        dol_syslog(get_class($this) . "::getTasksArray", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -815,7 +815,7 @@ 
                     $tasks[$i]->projectstatus = $obj->projectstatus;
                     $tasks[$i]->label = $obj->label;
                     $tasks[$i]->description = $obj->description;
-                    $tasks[$i]->fk_parent = $obj->fk_task_parent;      // deprecated
+                    $tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated
                     $tasks[$i]->fk_task_parent = $obj->fk_task_parent;
                     $tasks[$i]->duration = $obj->duration_effective;
                     $tasks[$i]->planned_workload = $obj->planned_workload;
@@ -856,7 +856,7 @@ 
     {
         $arrayroles = array();
 
-        dol_syslog(get_class($this) . "::getUserRolesForProjectsOrTasks userp=" . is_object($userp) . " usert=" . is_object($usert) . " projectid=" . $projectid . " taskid=" . $taskid);
+        dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks userp=".is_object($userp)." usert=".is_object($usert)." projectid=".$projectid." taskid=".$taskid);
 
         // We want role of user for a projet or role of user for a task. Both are not possible.
         if (empty($userp) && empty($usert)) {
@@ -871,44 +871,44 @@ 
         /* Liste des taches et role sur les projets ou taches */
         $sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
         if ($userp)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet as pt";
+            $sql .= " FROM ".MAIN_DB_PREFIX."projet as pt";
         if ($usert && $filteronprojstatus > -1)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "projet_task as pt";
+            $sql .= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
         if ($usert && $filteronprojstatus <= -1)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as pt";
-        $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-        $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc";
+            $sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+        $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+        $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
         $sql .= " WHERE pt.rowid = ec.element_id";
         if ($userp && $filteronprojstatus > -1)
-            $sql .= " AND pt.fk_statut = " . $filteronprojstatus;
+            $sql .= " AND pt.fk_statut = ".$filteronprojstatus;
         if ($usert && $filteronprojstatus > -1)
-            $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = " . $filteronprojstatus;
+            $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
         if ($userp)
             $sql .= " AND ctc.element = 'project'";
         if ($usert)
             $sql .= " AND ctc.element = 'project_task'";
         $sql .= " AND ctc.rowid = ec.fk_c_type_contact";
         if ($userp)
-            $sql .= " AND ec.fk_socpeople = " . $userp->id;
+            $sql .= " AND ec.fk_socpeople = ".$userp->id;
         if ($usert)
-            $sql .= " AND ec.fk_socpeople = " . $usert->id;
+            $sql .= " AND ec.fk_socpeople = ".$usert->id;
         $sql .= " AND ec.statut = 4";
         $sql .= " AND ctc.source = 'internal'";
         if ($projectid) {
             if ($userp)
-                $sql .= " AND pt.rowid in (" . $projectid . ")";
+                $sql .= " AND pt.rowid in (".$projectid.")";
             if ($usert)
-                $sql .= " AND pt.fk_projet in (" . $projectid . ")";
+                $sql .= " AND pt.fk_projet in (".$projectid.")";
         }
         if ($taskid) {
             if ($userp)
                 $sql .= " ERROR SHOULD NOT HAPPENS";
             if ($usert)
-                $sql .= " AND pt.rowid = " . $taskid;
+                $sql .= " AND pt.rowid = ".$taskid;
         }
         //print $sql;
 
-        dol_syslog(get_class($this) . "::getUserRolesForProjectsOrTasks execute request", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks execute request", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -918,7 +918,7 @@ 
                 if (empty($arrayroles[$obj->pid]))
                     $arrayroles[$obj->pid] = $obj->code;
                 else
-                    $arrayroles[$obj->pid] .= ',' . $obj->code;
+                    $arrayroles[$obj->pid] .= ','.$obj->code;
                 $i++;
             }
             $this->db->free($resql);
@@ -964,7 +964,7 @@ 
     {
         global $conf, $langs;
 
-        dol_syslog(get_class($this) . "::addTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
 
         $ret = 0;
 
@@ -982,7 +982,7 @@ 
 
         $this->db->begin();
 
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet_task_time (";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";
         $sql .= "fk_task";
         $sql .= ", task_date";
         $sql .= ", task_datehour";
@@ -992,17 +992,17 @@ 
         $sql .= ", note";
         $sql .= ") VALUES (";
         $sql .= $this->id;
-        $sql .= ", '" . $this->db->idate($this->timespent_date) . "'";
-        $sql .= ", '" . $this->db->idate($this->timespent_datehour) . "'";
-        $sql .= ", " . (empty($this->timespent_withhour) ? 0 : 1);
-        $sql .= ", " . $this->timespent_duration;
-        $sql .= ", " . $this->timespent_fk_user;
-        $sql .= ", " . (isset($this->timespent_note) ? "'" . $this->db->escape($this->timespent_note) . "'" : "null");
+        $sql .= ", '".$this->db->idate($this->timespent_date)."'";
+        $sql .= ", '".$this->db->idate($this->timespent_datehour)."'";
+        $sql .= ", ".(empty($this->timespent_withhour) ? 0 : 1);
+        $sql .= ", ".$this->timespent_duration;
+        $sql .= ", ".$this->timespent_fk_user;
+        $sql .= ", ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
         $sql .= ")";
 
         $resql = $this->db->query($sql);
         if ($resql) {
-            $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX . "projet_task_time");
+            $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
             $ret = $tasktime_id;
             $this->timespent_id = $ret;
 
@@ -1021,23 +1021,23 @@ 
 
         if ($ret > 0) {
             // Recalculate amount of time spent for task and update denormalized field
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
-            $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM " . MAIN_DB_PREFIX . "projet_task_time as ptt where ptt.fk_task = " . $this->id . ")";
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+            $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
             if (isset($this->progress))
-                $sql .= ", progress = " . $this->progress; // Do not overwrite value if not provided
-            $sql .= " WHERE rowid = " . $this->id;
+                $sql .= ", progress = ".$this->progress; // Do not overwrite value if not provided
+            $sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this) . "::addTimeSpent", LOG_DEBUG);
+            dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
             if (!$this->db->query($sql)) {
                 $this->error = $this->db->lasterror();
                 $ret = -2;
             }
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task_time";
-            $sql .= " SET thm = (SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . $this->timespent_fk_user . ")"; // set average hour rate of user
-            $sql .= " WHERE rowid = " . $tasktime_id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
+            $sql .= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")"; // set average hour rate of user
+            $sql .= " WHERE rowid = ".$tasktime_id;
 
-            dol_syslog(get_class($this) . "::addTimeSpent", LOG_DEBUG);
+            dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
             if (!$this->db->query($sql)) {
                 $this->error = $this->db->lasterror();
                 $ret = -2;
@@ -1080,26 +1080,26 @@ 
         $sql .= " MIN(t.task_datehour) as min_date,";
         $sql .= " MAX(t.task_datehour) as max_date,";
         $sql .= " SUM(t.task_duration) as total_duration,";
-        $sql .= " SUM(t.task_duration / 3600 * " . $this->db->ifsql("t.thm IS NULL", 0, "t.thm") . ") as total_amount,";
+        $sql .= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as total_amount,";
         $sql .= " COUNT(t.rowid) as nblines,";
-        $sql .= " SUM(" . $this->db->ifsql("t.thm IS NULL", 1, 0) . ") as nblinesnull";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time as t";
+        $sql .= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql .= " WHERE 1 = 1";
         if ($morewherefilter)
             $sql .= $morewherefilter;
         if ($id > 0)
-            $sql .= " AND t.fk_task = " . $id;
+            $sql .= " AND t.fk_task = ".$id;
         if ($userid > 0)
-            $sql .= " AND t.fk_user = " . $userid;
+            $sql .= " AND t.fk_user = ".$userid;
 
-        dol_syslog(get_class($this) . "::getSummaryOfTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
 
-            $result['min_date'] = $obj->min_date;               // deprecated. use the ->timespent_xxx instead
-            $result['max_date'] = $obj->max_date;               // deprecated. use the ->timespent_xxx instead
-            $result['total_duration'] = $obj->total_duration;   // deprecated. use the ->timespent_xxx instead
+            $result['min_date'] = $obj->min_date; // deprecated. use the ->timespent_xxx instead
+            $result['max_date'] = $obj->max_date; // deprecated. use the ->timespent_xxx instead
+            $result['total_duration'] = $obj->total_duration; // deprecated. use the ->timespent_xxx instead
 
             $this->timespent_min_date = $this->db->jdate($obj->min_date);
             $this->timespent_max_date = $this->db->jdate($obj->max_date);
@@ -1134,23 +1134,23 @@ 
 
         $sql = "SELECT";
         $sql .= " SUM(t.task_duration) as nbseconds,";
-        $sql .= " SUM(t.task_duration / 3600 * " . $this->db->ifsql("t.thm IS NULL", 0, "t.thm") . ") as amount, SUM(" . $this->db->ifsql("t.thm IS NULL", 1, 0) . ") as nblinesnull";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time as t";
-        $sql .= " WHERE t.fk_task = " . $id;
+        $sql .= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+        $sql .= " WHERE t.fk_task = ".$id;
         if (is_object($fuser) && $fuser->id > 0) {
-            $sql .= " AND fk_user = " . $fuser->id;
+            $sql .= " AND fk_user = ".$fuser->id;
         }
         if ($dates > 0) {
             $datefieldname = "task_datehour";
-            $sql .= " AND (" . $datefieldname . " >= '" . $this->db->idate($dates) . "' OR " . $datefieldname . " IS NULL)";
+            $sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
         }
         if ($datee > 0) {
             $datefieldname = "task_datehour";
-            $sql .= " AND (" . $datefieldname . " <= '" . $this->db->idate($datee) . "' OR " . $datefieldname . " IS NULL)";
+            $sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
         }
         //print $sql;
 
-        dol_syslog(get_class($this) . "::getSumOfAmount", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSumOfAmount", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -1186,10 +1186,10 @@ 
         $sql .= " t.task_duration,";
         $sql .= " t.fk_user,";
         $sql .= " t.note";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time as t";
-        $sql .= " WHERE t.rowid = " . $id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
-        dol_syslog(get_class($this) . "::fetchTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             if ($this->db->num_rows($resql)) {
@@ -1209,7 +1209,7 @@ 
 
             return 1;
         } else {
-            $this->error = "Error " . $this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -1246,15 +1246,15 @@ 
         $sql .= " p.ref as project_ref,";
         $sql .= " p.title as project_label,";
         $sql .= " p.public as public";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time as ptt, " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet as p";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as ptt, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
         $sql .= " WHERE ptt.fk_task = pt.rowid AND pt.fk_projet = p.rowid";
-        $sql .= " AND ptt.fk_user = " . $userobj->id;
-        $sql .= " AND pt.entity IN (" . getEntity('project') . ")";
+        $sql .= " AND ptt.fk_user = ".$userobj->id;
+        $sql .= " AND pt.entity IN (".getEntity('project').")";
         if ($morewherefilter)
             $sql .= $morewherefilter;
 
-        dol_syslog(get_class($this) . "::fetchAllTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchAllTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -1294,7 +1294,7 @@ 
             $this->db->free($resql);
         } else {
             dol_print_error($this->db);
-            $this->error = "Error " . $this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -1322,16 +1322,16 @@ 
 
         $this->db->begin();
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task_time SET";
-        $sql .= " task_date = '" . $this->db->idate($this->timespent_date) . "',";
-        $sql .= " task_datehour = '" . $this->db->idate($this->timespent_datehour) . "',";
-        $sql .= " task_date_withhour = " . (empty($this->timespent_withhour) ? 0 : 1) . ",";
-        $sql .= " task_duration = " . $this->timespent_duration . ",";
-        $sql .= " fk_user = " . $this->timespent_fk_user . ",";
-        $sql .= " note = " . (isset($this->timespent_note) ? "'" . $this->db->escape($this->timespent_note) . "'" : "null");
-        $sql .= " WHERE rowid = " . $this->timespent_id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
+        $sql .= " task_date = '".$this->db->idate($this->timespent_date)."',";
+        $sql .= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
+        $sql .= " task_date_withhour = ".(empty($this->timespent_withhour) ? 0 : 1).",";
+        $sql .= " task_duration = ".$this->timespent_duration.",";
+        $sql .= " fk_user = ".$this->timespent_fk_user.",";
+        $sql .= " note = ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
+        $sql .= " WHERE rowid = ".$this->timespent_id;
 
-        dol_syslog(get_class($this) . "::updateTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
         if ($this->db->query($sql)) {
             if (!$notrigger) {
                 // Call trigger
@@ -1354,11 +1354,11 @@ 
         if ($ret == 1 && ($this->timespent_old_duration != $this->timespent_duration)) {
             $newDuration = $this->timespent_duration - $this->timespent_old_duration;
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
-            $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM " . MAIN_DB_PREFIX . "projet_task_time as ptt where ptt.fk_task = " . $this->db->escape($this->id) . ")";
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+            $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->db->escape($this->id).")";
+            $sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this) . "::updateTimeSpent", LOG_DEBUG);
+            dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
             if (!$this->db->query($sql)) {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
@@ -1386,14 +1386,14 @@ 
 
         $this->db->begin();
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
-        $sql .= " WHERE rowid = " . $this->timespent_id;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+        $sql .= " WHERE rowid = ".$this->timespent_id;
 
-        dol_syslog(get_class($this) . "::delTimeSpent", LOG_DEBUG);
+        dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
 
         if (!$error) {
@@ -1408,11 +1408,11 @@ 
         }
 
         if (!$error) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
-            $sql .= " SET duration_effective = duration_effective - " . $this->db->escape($this->timespent_duration ? $this->timespent_duration : 0);
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+            $sql .= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration ? $this->timespent_duration : 0);
+            $sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this) . "::delTimeSpent", LOG_DEBUG);
+            dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
             if ($this->db->query($sql)) {
                 $result = 0;
             } else {
@@ -1424,8 +1424,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::delTimeSpent " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::delTimeSpent ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -1475,8 +1475,8 @@ 
 
         $defaultref = '';
         $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-        if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) {
-            require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php';
+        if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php")) {
+            require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
             $modTask = new $obj;
             $defaultref = $modTask->getNextValue(0, $clone_task);
         }
@@ -1556,7 +1556,7 @@ 
 
             //Duplicate file
             if ($clone_file) {
-                require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
                 //retreive project origin ref to know folder to copy
                 $projectstatic = new Project($this->db);
@@ -1570,21 +1570,21 @@ 
                     $clone_project_ref = $ori_project_ref;
                 }
 
-                $clone_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($clone_project_ref) . "/" . dol_sanitizeFileName($clone_task_ref);
-                $ori_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($ori_project_ref) . "/" . dol_sanitizeFileName($fromid);
+                $clone_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($clone_project_ref)."/".dol_sanitizeFileName($clone_task_ref);
+                $ori_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName($fromid);
 
                 $filearray = dol_dir_list($ori_task_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
                 foreach ($filearray as $key => $file) {
                     if (!file_exists($clone_task_dir)) {
                         if (dol_mkdir($clone_task_dir) < 0) {
-                            $this->error .= $langs->trans('ErrorInternalErrorDetected') . ':dol_mkdir';
+                            $this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
                             $error++;
                         }
                     }
 
-                    $rescopy = dol_copy($ori_task_dir . '/' . $file['name'], $clone_task_dir . '/' . $file['name'], 0, 1);
+                    $rescopy = dol_copy($ori_task_dir.'/'.$file['name'], $clone_task_dir.'/'.$file['name'], 0, 1);
                     if (is_numeric($rescopy) && $rescopy < 0) {
-                        $this->error .= $langs->trans("ErrorFailToCopyFile", $ori_task_dir . '/' . $file['name'], $clone_task_dir . '/' . $file['name']);
+                        $this->error .= $langs->trans("ErrorFailToCopyFile", $ori_task_dir.'/'.$file['name'], $clone_task_dir.'/'.$file['name']);
                         $error++;
                     }
                 }
@@ -1628,7 +1628,7 @@ 
             return $clone_task_id;
         } else {
             $this->db->rollback();
-            dol_syslog(get_class($this) . "::createFromClone nbError: " . $error . " error : " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1675,17 +1675,17 @@ 
             return $langs->trans($this->statuts_short[$statut]);
         } elseif ($mode == 2) {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts_short[$statut]);
             elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1').' '.$langs->trans($this->statuts_short[$statut]);
             elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3').' '.$langs->trans($this->statuts_short[$statut]);
             elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts_short[$statut]);
             elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts_short[$statut]);
             elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5').' '.$langs->trans($this->statuts_short[$statut]);
         }
         elseif ($mode == 3) {
             if ($statut == 0)
@@ -1703,17 +1703,17 @@ 
         }
         elseif ($mode == 4) {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
             elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]);
             elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]);
             elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
             elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
             elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts[$statut]);
+                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5').' '.$langs->trans($this->statuts[$statut]);
         }
         elseif ($mode == 5) {
             /* if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
@@ -1792,20 +1792,20 @@ 
         $sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
         $sql .= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
         $sql .= " t.dateo as date_start, t.datee as datee";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         //if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-        $sql .= ", " . MAIN_DB_PREFIX . "projet_task as t";
-        $sql .= " WHERE p.entity IN (" . getEntity('project', 0) . ')';
+        $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+        $sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
         $sql .= " AND p.fk_statut = 1";
         $sql .= " AND t.fk_projet = p.rowid";
-        $sql .= " AND t.progress < 100";         // tasks to do
+        $sql .= " AND t.progress < 100"; // tasks to do
         if (!$user->rights->projet->all->lire)
-            $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+            $sql .= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         if ($socid)
-            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         // if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
         //print $sql;
@@ -1818,10 +1818,10 @@ 
             $response->label = $langs->trans("OpenedTasks");
             if ($user->rights->projet->all->lire) {
                 // $response->url = DOL_URL_ROOT . '/projet/tasks/list.php?mainmenu=project';
-                $response->url = BASE_URI . '?controller=projet/tasks&method=list&mainmenu=project';
+                $response->url = BASE_URI.'?controller=projet/tasks&method=list&mainmenu=project';
             } else {
                 // $response->url = DOL_URL_ROOT . '/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
-                $response->url = BASE_URI . '?controller=projet/tasks&method=list&mode=mine&amp;mainmenu=project';
+                $response->url = BASE_URI.'?controller=projet/tasks&method=list&mode=mine&amp;mainmenu=project';
                 $response->img = img_object('', "task");
             }
             // This assignment in condition is not a bug. It allows walking the results.
@@ -1864,21 +1864,21 @@ 
 
         // List of tasks (does not care about permissions. Filtering will be done later)
         $sql = "SELECT count(p.rowid) as nb";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-        $sql .= ", " . MAIN_DB_PREFIX . "projet_task as t";
-        $sql .= " WHERE p.entity IN (" . getEntity('project', 0) . ')';
-        $sql .= " AND t.fk_projet = p.rowid";         // tasks to do
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+        $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+        $sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
+        $sql .= " AND t.fk_projet = p.rowid"; // tasks to do
         if ($mine || !$user->rights->projet->all->lire)
-            $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+            $sql .= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         if ($socid)
-            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id . ") OR (s.rowid IS NULL))";
+            $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
 
         $resql = $this->db->query($sql);
         if ($resql) {

Braces +213 added lines, -158 removed lines

@@ -244,8 +244,9 @@ 
             $sql .= ", t2.rang as task_parent_position";
         }
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
-        if (!empty($loadparentdata))
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t2 ON t.fk_task_parent = t2.rowid";
+        if (!empty($loadparentdata)) {
+                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t2 ON t.fk_task_parent = t2.rowid";
+        }
         $sql .= " WHERE ";
         if (!empty($ref)) {
             $sql .= "t.ref = '" . $this->db->escape($ref) . "'";
@@ -560,8 +561,9 @@ 
             $this->errors[] = "Error " . $this->db->lasterror();
         } else {
             $obj = $this->db->fetch_object($resql);
-            if ($obj)
-                $ret = $obj->nb;
+            if ($obj) {
+                            $ret = $obj->nb;
+            }
             $this->db->free($resql);
         }
 
@@ -593,8 +595,9 @@ 
             $this->errors[] = "Error " . $this->db->lasterror();
         } else {
             $obj = $this->db->fetch_object($resql);
-            if ($obj)
-                $ret = $obj->nb;
+            if ($obj) {
+                            $ret = $obj->nb;
+            }
             $this->db->free($resql);
         }
 
@@ -621,15 +624,19 @@ 
     {
         global $conf, $langs, $user;
 
-        if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) {
+                    $notooltip = 1;
+        }
+        // Force disable tooltips
 
         $result = '';
         $label = '<u>' . $langs->trans("ShowTask") . '</u>';
-        if (!empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (!empty($this->label))
-            $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        if (!empty($this->ref)) {
+                    $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        }
+        if (!empty($this->label)) {
+                    $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        }
         if ($this->date_start || $this->date_end) {
             $label .= "<br>" . get_date_range($this->date_start, $this->date_end, '', $langs, 0);
         }
@@ -637,10 +644,12 @@ 
         $url = DOL_URL_ROOT . '/projet/tasks/' . $mode . '.php?id=' . $this->id . ($option == 'withproject' ? '&withproject=1' : '');
         // Add param to save lastsearch_values or not
         $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))
-            $add_save_lastsearch_values = 1;
-        if ($add_save_lastsearch_values)
-            $url .= '&save_lastsearch_values=1';
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+                    $add_save_lastsearch_values = 1;
+        }
+        if ($add_save_lastsearch_values) {
+                    $url .= '&save_lastsearch_values=1';
+        }
 
         $linkclose = '';
         if (empty($notooltip)) {
@@ -659,13 +668,16 @@ 
         $picto = 'projecttask';
 
         $result .= $linkstart;
-        if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2)
-            $result .= $this->ref;
+        if ($withpicto) {
+                    $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        }
+        if ($withpicto != 2) {
+                    $result .= $this->ref;
+        }
         $result .= $linkend;
-        if ($withpicto != 2)
-            $result .= (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        if ($withpicto != 2) {
+                    $result .= (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        }
 
         return $result;
     }
@@ -717,8 +729,10 @@ 
         //print $usert.'-'.$userp.'-'.$projectid.'-'.$socid.'-'.$mode.'<br>';
         // List of tasks (does not care about permissions. Filtering will be done later)
         $sql = "SELECT ";
-        if ($filteronprojuser > 0 || $filterontaskuser > 0)
-            $sql .= " DISTINCT";  // We may get several time the same record if user has several roles on same project/task
+        if ($filteronprojuser > 0 || $filterontaskuser > 0) {
+                    $sql .= " DISTINCT";
+        }
+        // We may get several time the same record if user has several roles on same project/task
         $sql .= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
         $sql .= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
         $sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
@@ -750,8 +764,9 @@ 
                 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t on t.fk_projet = p.rowid";
             }
             $sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
-        } else
-            return 'BadValueForParameterMode';
+        } else {
+                    return 'BadValueForParameterMode';
+        }
 
         if ($filteronprojuser > 0) {
             $sql .= " AND p.rowid = ec.element_id";
@@ -770,16 +785,21 @@ 
             $sql .= " AND ec2.statut = 4";
             $sql .= " AND ctc2.source = 'internal'";
         }
-        if ($socid)
-            $sql .= " AND p.fk_soc = " . $socid;
-        if ($projectid)
-            $sql .= " AND p.rowid in (" . $projectid . ")";
-        if ($filteronproj)
-            $sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
-        if ($filteronprojstatus && $filteronprojstatus != '-1')
-            $sql .= " AND p.fk_statut IN (" . $filteronprojstatus . ")";
-        if ($morewherefilter)
-            $sql .= $morewherefilter;
+        if ($socid) {
+                    $sql .= " AND p.fk_soc = " . $socid;
+        }
+        if ($projectid) {
+                    $sql .= " AND p.rowid in (" . $projectid . ")";
+        }
+        if ($filteronproj) {
+                    $sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
+        }
+        if ($filteronprojstatus && $filteronprojstatus != '-1') {
+                    $sql .= " AND p.fk_statut IN (" . $filteronprojstatus . ")";
+        }
+        if ($morewherefilter) {
+                    $sql .= $morewherefilter;
+        }
         $sql .= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;exit;
@@ -870,41 +890,54 @@ 
 
         /* Liste des taches et role sur les projets ou taches */
         $sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
-        if ($userp)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet as pt";
-        if ($usert && $filteronprojstatus > -1)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "projet_task as pt";
-        if ($usert && $filteronprojstatus <= -1)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as pt";
+        if ($userp) {
+                    $sql .= " FROM " . MAIN_DB_PREFIX . "projet as pt";
+        }
+        if ($usert && $filteronprojstatus > -1) {
+                    $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "projet_task as pt";
+        }
+        if ($usert && $filteronprojstatus <= -1) {
+                    $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as pt";
+        }
         $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec";
         $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc";
         $sql .= " WHERE pt.rowid = ec.element_id";
-        if ($userp && $filteronprojstatus > -1)
-            $sql .= " AND pt.fk_statut = " . $filteronprojstatus;
-        if ($usert && $filteronprojstatus > -1)
-            $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = " . $filteronprojstatus;
-        if ($userp)
-            $sql .= " AND ctc.element = 'project'";
-        if ($usert)
-            $sql .= " AND ctc.element = 'project_task'";
+        if ($userp && $filteronprojstatus > -1) {
+                    $sql .= " AND pt.fk_statut = " . $filteronprojstatus;
+        }
+        if ($usert && $filteronprojstatus > -1) {
+                    $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = " . $filteronprojstatus;
+        }
+        if ($userp) {
+                    $sql .= " AND ctc.element = 'project'";
+        }
+        if ($usert) {
+                    $sql .= " AND ctc.element = 'project_task'";
+        }
         $sql .= " AND ctc.rowid = ec.fk_c_type_contact";
-        if ($userp)
-            $sql .= " AND ec.fk_socpeople = " . $userp->id;
-        if ($usert)
-            $sql .= " AND ec.fk_socpeople = " . $usert->id;
+        if ($userp) {
+                    $sql .= " AND ec.fk_socpeople = " . $userp->id;
+        }
+        if ($usert) {
+                    $sql .= " AND ec.fk_socpeople = " . $usert->id;
+        }
         $sql .= " AND ec.statut = 4";
         $sql .= " AND ctc.source = 'internal'";
         if ($projectid) {
-            if ($userp)
-                $sql .= " AND pt.rowid in (" . $projectid . ")";
-            if ($usert)
-                $sql .= " AND pt.fk_projet in (" . $projectid . ")";
+            if ($userp) {
+                            $sql .= " AND pt.rowid in (" . $projectid . ")";
+            }
+            if ($usert) {
+                            $sql .= " AND pt.fk_projet in (" . $projectid . ")";
+            }
         }
         if ($taskid) {
-            if ($userp)
-                $sql .= " ERROR SHOULD NOT HAPPENS";
-            if ($usert)
-                $sql .= " AND pt.rowid = " . $taskid;
+            if ($userp) {
+                            $sql .= " ERROR SHOULD NOT HAPPENS";
+            }
+            if ($usert) {
+                            $sql .= " AND pt.rowid = " . $taskid;
+            }
         }
         //print $sql;
 
@@ -915,15 +948,15 @@ 
             $i = 0;
             while ($i < $num) {
                 $obj = $this->db->fetch_object($resql);
-                if (empty($arrayroles[$obj->pid]))
-                    $arrayroles[$obj->pid] = $obj->code;
-                else
-                    $arrayroles[$obj->pid] .= ',' . $obj->code;
+                if (empty($arrayroles[$obj->pid])) {
+                                    $arrayroles[$obj->pid] = $obj->code;
+                } else {
+                                    $arrayroles[$obj->pid] .= ',' . $obj->code;
+                }
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -944,10 +977,11 @@ 
         $num = count($tab);
         $i = 0;
         while ($i < $num) {
-            if ($source == 'thirdparty')
-                $contactAlreadySelected[$i] = $tab[$i]['socid'];
-            else
-                $contactAlreadySelected[$i] = $tab[$i]['id'];
+            if ($source == 'thirdparty') {
+                            $contactAlreadySelected[$i] = $tab[$i]['socid'];
+            } else {
+                            $contactAlreadySelected[$i] = $tab[$i]['id'];
+            }
             $i++;
         }
         return $contactAlreadySelected;
@@ -975,10 +1009,12 @@ 
         }
 
         // Clean parameters
-        if (isset($this->timespent_note))
-            $this->timespent_note = trim($this->timespent_note);
-        if (empty($this->timespent_datehour))
-            $this->timespent_datehour = $this->timespent_date;
+        if (isset($this->timespent_note)) {
+                    $this->timespent_note = trim($this->timespent_note);
+        }
+        if (empty($this->timespent_datehour)) {
+                    $this->timespent_datehour = $this->timespent_date;
+        }
 
         $this->db->begin();
 
@@ -1023,8 +1059,10 @@ 
             // Recalculate amount of time spent for task and update denormalized field
             $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
             $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM " . MAIN_DB_PREFIX . "projet_task_time as ptt where ptt.fk_task = " . $this->id . ")";
-            if (isset($this->progress))
-                $sql .= ", progress = " . $this->progress; // Do not overwrite value if not provided
+            if (isset($this->progress)) {
+                            $sql .= ", progress = " . $this->progress;
+            }
+            // Do not overwrite value if not provided
             $sql .= " WHERE rowid = " . $this->id;
 
             dol_syslog(get_class($this) . "::addTimeSpent", LOG_DEBUG);
@@ -1063,10 +1101,12 @@ 
     {
         global $langs;
 
-        if (is_object($userobj))
-            $userid = $userobj->id;
-        else
-            $userid = $userobj; // old method
+        if (is_object($userobj)) {
+                    $userid = $userobj->id;
+        } else {
+                    $userid = $userobj;
+        }
+        // old method
 
         $id = $this->id;
         if (empty($id) && empty($userid)) {
@@ -1085,12 +1125,15 @@ 
         $sql .= " SUM(" . $this->db->ifsql("t.thm IS NULL", 1, 0) . ") as nblinesnull";
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time as t";
         $sql .= " WHERE 1 = 1";
-        if ($morewherefilter)
-            $sql .= $morewherefilter;
-        if ($id > 0)
-            $sql .= " AND t.fk_task = " . $id;
-        if ($userid > 0)
-            $sql .= " AND t.fk_user = " . $userid;
+        if ($morewherefilter) {
+                    $sql .= $morewherefilter;
+        }
+        if ($id > 0) {
+                    $sql .= " AND t.fk_task = " . $id;
+        }
+        if ($userid > 0) {
+                    $sql .= " AND t.fk_user = " . $userid;
+        }
 
         dol_syslog(get_class($this) . "::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1127,8 +1170,9 @@ 
     {
         global $langs;
 
-        if (empty($id))
-            $id = $this->id;
+        if (empty($id)) {
+                    $id = $this->id;
+        }
 
         $result = array();
 
@@ -1251,8 +1295,9 @@ 
         $sql .= " WHERE ptt.fk_task = pt.rowid AND pt.fk_projet = p.rowid";
         $sql .= " AND ptt.fk_user = " . $userobj->id;
         $sql .= " AND pt.entity IN (" . getEntity('project') . ")";
-        if ($morewherefilter)
-            $sql .= $morewherefilter;
+        if ($morewherefilter) {
+                    $sql .= $morewherefilter;
+        }
 
         dol_syslog(get_class($this) . "::fetchAllTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1315,10 +1360,12 @@ 
         $ret = 0;
 
         // Clean parameters
-        if (empty($this->timespent_datehour))
-            $this->timespent_datehour = $this->timespent_date;
-        if (isset($this->timespent_note))
-            $this->timespent_note = trim($this->timespent_note);
+        if (empty($this->timespent_datehour)) {
+                    $this->timespent_datehour = $this->timespent_date;
+        }
+        if (isset($this->timespent_note)) {
+                    $this->timespent_note = trim($this->timespent_note);
+        }
 
         $this->db->begin();
 
@@ -1339,13 +1386,14 @@ 
                 if ($result < 0) {
                     $this->db->rollback();
                     $ret = -1;
-                } else
-                    $ret = 1;
+                } else {
+                                    $ret = 1;
+                }
                 // End call triggers
-            } else
-                $ret = 1;
-        }
-        else {
+            } else {
+                            $ret = 1;
+            }
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             $ret = -1;
@@ -1366,8 +1414,9 @@ 
             }
         }
 
-        if ($ret >= 0)
-            $this->db->commit();
+        if ($ret >= 0) {
+                    $this->db->commit();
+        }
         return $ret;
     }
 
@@ -1674,48 +1723,48 @@ 
         } elseif ($mode == 1) {
             return $langs->trans($this->statuts_short[$statut]);
         } elseif ($mode == 2) {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts_short[$statut]);
-        }
-        elseif ($mode == 3) {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
-            elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1');
-            elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3');
-            elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
-            elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
-            elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5');
-        }
-        elseif ($mode == 4) {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts[$statut]);
-        }
-        elseif ($mode == 5) {
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 3) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 4) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 5) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            }
+        } elseif ($mode == 3) {
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
+            } elseif ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1');
+            } elseif ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3');
+            } elseif ($statut == 3) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+            } elseif ($statut == 4) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+            } elseif ($statut == 5) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5');
+            }
+        } elseif ($mode == 4) {
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 3) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 4) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 5) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts[$statut]);
+            }
+        } elseif ($mode == 5) {
             /* if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
               elseif ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
               elseif ($statut==2) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
@@ -1800,12 +1849,14 @@ 
         $sql .= " AND p.fk_statut = 1";
         $sql .= " AND t.fk_projet = p.rowid";
         $sql .= " AND t.progress < 100";         // tasks to do
-        if (!$user->rights->projet->all->lire)
-            $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        if (!$user->rights->projet->all->lire) {
+                    $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        }
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid)
-            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        if ($socid) {
+                    $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        }
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         // if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
         //print $sql;
@@ -1866,19 +1917,23 @@ 
         $sql = "SELECT count(p.rowid) as nb";
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on p.fk_soc = s.rowid";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+        }
         $sql .= ", " . MAIN_DB_PREFIX . "projet_task as t";
         $sql .= " WHERE p.entity IN (" . getEntity('project', 0) . ')';
         $sql .= " AND t.fk_projet = p.rowid";         // tasks to do
-        if ($mine || !$user->rights->projet->all->lire)
-            $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        if ($mine || !$user->rights->projet->all->lire) {
+                    $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        }
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid)
-            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id . ") OR (s.rowid IS NULL))";
+        if ($socid) {
+                    $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        }
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id . ") OR (s.rowid IS NULL))";
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {

dolibarr/htdocs/projet/tasks/list.php

Spacing +297 added lines, -297 removed lines

@@ -26,7 +26,7 @@ 
  *	\brief      List all task of a project
  */
 
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
@@ -37,43 +37,43 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'users', 'companies'));
 
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$id=GETPOST('id','int');
+$id = GETPOST('id', 'int');
 
-$search_all=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_categ=GETPOST("search_categ",'alpha');
-$search_project=GETPOST('search_project');
-if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus']))
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_categ = GETPOST("search_categ", 'alpha');
+$search_project = GETPOST('search_project');
+if (!isset($_GET['search_projectstatus']) && !isset($_POST['search_projectstatus']))
 {
-	if ($search_all != '') $search_projectstatus=-1;
-	else $search_projectstatus=1;
+	if ($search_all != '') $search_projectstatus = -1;
+	else $search_projectstatus = 1;
 }
-else $search_projectstatus=GETPOST('search_projectstatus');
-$search_project_ref=GETPOST('search_project_ref');
-$search_project_title=GETPOST('search_project_title');
-$search_task_ref=GETPOST('search_task_ref');
-$search_task_label=GETPOST('search_task_label');
-$search_task_description=GETPOST('search_task_description');
-$search_project_user=GETPOST('search_project_user');
-$search_task_user=GETPOST('search_task_user');
-
-$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
+else $search_projectstatus = GETPOST('search_projectstatus');
+$search_project_ref = GETPOST('search_project_ref');
+$search_project_title = GETPOST('search_project_title');
+$search_task_ref = GETPOST('search_task_ref');
+$search_task_label = GETPOST('search_task_label');
+$search_task_description = GETPOST('search_task_description');
+$search_project_user = GETPOST('search_project_user');
+$search_task_user = GETPOST('search_task_user');
+
+$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
 if ($mine) { $search_task_user = $user->id; $mine = 0; }
 
-$search_sday	= GETPOST('search_sday','int');
-$search_smonth	= GETPOST('search_smonth','int');
-$search_syear	= GETPOST('search_syear','int');
-$search_eday	= GETPOST('search_eday','int');
-$search_emonth	= GETPOST('search_emonth','int');
-$search_eyear	= GETPOST('search_eyear','int');
+$search_sday	= GETPOST('search_sday', 'int');
+$search_smonth	= GETPOST('search_smonth', 'int');
+$search_syear	= GETPOST('search_syear', 'int');
+$search_eday	= GETPOST('search_eday', 'int');
+$search_emonth	= GETPOST('search_emonth', 'int');
+$search_eyear	= GETPOST('search_eyear', 'int');
 
 // Initialize context for list
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'tasklist';
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'tasklist';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Task($db);
@@ -82,25 +82,25 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('projet_task');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Security check
-$socid=0;
+$socid = 0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
-$diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='p.ref';
-if (! $sortorder) $sortorder='DESC';
+if (!$sortfield) $sortfield = 'p.ref';
+if (!$sortorder) $sortorder = 'DESC';
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -109,9 +109,9 @@ 
 	't.description'=>"Description",
 	't.note_public'=>"NotePublic",
 );
-if (empty($user->socid)) $fieldstosearchall['t.note_private']="NotePrivate";
+if (empty($user->socid)) $fieldstosearchall['t.note_private'] = "NotePrivate";
 
-$arrayfields=array(
+$arrayfields = array(
 	't.ref'=>array('label'=>$langs->trans("RefTask"), 'checked'=>1, 'position'=>80),
 	't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>80),
 	't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100),
@@ -131,9 +131,9 @@ 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	foreach ($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
@@ -142,11 +142,11 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -155,39 +155,39 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
-		$search_all="";
-		$search_categ="";
-		$search_project="";
-		$search_projectstatus=-1;
-		$search_project_ref="";
-		$search_project_title="";
-		$search_task_ref="";
-		$search_task_label="";
-		$search_task_description="";
-		$search_task_user=-1;
-		$search_project_user=-1;
-		$search_sday='';
-		$search_smonth='';
-		$search_syear='';
-		$search_eday='';
-		$search_emonth='';
-		$search_eyear='';
-		$toselect='';
-		$search_array_options=array();
+		$search_all = "";
+		$search_categ = "";
+		$search_project = "";
+		$search_projectstatus = -1;
+		$search_project_ref = "";
+		$search_project_title = "";
+		$search_task_ref = "";
+		$search_task_label = "";
+		$search_task_description = "";
+		$search_task_user = -1;
+		$search_project_user = -1;
+		$search_sday = '';
+		$search_smonth = '';
+		$search_syear = '';
+		$search_eday = '';
+		$search_emonth = '';
+		$search_eyear = '';
+		$toselect = '';
+		$search_array_options = array();
 	}
 
 	// Mass actions
-	$objectclass='Task';
-	$objectlabel='Tasks';
+	$objectclass = 'Task';
+	$objectlabel = 'Tasks';
 	$permtoread = $user->rights->projet->lire;
 	$permtodelete = $user->rights->projet->supprimer;
 	$uploaddir = $conf->projet->dir_output.'/tasks';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if (empty($search_projectstatus) && $search_projectstatus == '') $search_projectstatus=1;
+if (empty($search_projectstatus) && $search_projectstatus == '') $search_projectstatus = 1;
 
 
 
@@ -197,16 +197,16 @@ 
  */
 
 $now = dol_now();
-$form=new Form($db);
-$formother=new FormOther($db);
-$socstatic=new Societe($db);
+$form = new Form($db);
+$formother = new FormOther($db);
+$socstatic = new Societe($db);
 $projectstatic = new Project($db);
-$puser=new User($db);
-$tuser=new User($db);
+$puser = new User($db);
+$tuser = new User($db);
 if ($search_project_user > 0) $puser->fetch($search_project_user);
 if ($search_task_user > 0) $tuser->fetch($search_task_user);
 
-$title=$langs->trans("Activities");
+$title = $langs->trans("Activities");
 //if ($search_task_user == $user->id) $title=$langs->trans("MyActivities");
 
 if ($id)
@@ -216,68 +216,68 @@ 
 }
 
 // Get list of project id allowed to user (in a string list separated by coma)
-if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 //var_dump($projectsListId);
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
-$listofprojectcontacttype=array();
+$listofprojectcontacttype = array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-$sql.= " WHERE ctc.element = '" . $projectstatic->element . "'";
-$sql.= " AND ctc.source = 'internal'";
+$sql .= " WHERE ctc.element = '".$projectstatic->element."'";
+$sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
 {
-	while($obj = $db->fetch_object($resql))
+	while ($obj = $db->fetch_object($resql))
 	{
-		$listofprojectcontacttype[$obj->rowid]=$obj->code;
+		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
 }
 else dol_print_error($db);
-if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid sql syntax error if not found
+if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 // Get id of types of contacts for tasks (This list never contains a lot of elements)
-$listoftaskcontacttype=array();
+$listoftaskcontacttype = array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-$sql.= " WHERE ctc.element = '" . $object->element . "'";
-$sql.= " AND ctc.source = 'internal'";
+$sql .= " WHERE ctc.element = '".$object->element."'";
+$sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
 {
-	while($obj = $db->fetch_object($resql))
+	while ($obj = $db->fetch_object($resql))
 	{
-		$listoftaskcontacttype[$obj->rowid]=$obj->code;
+		$listoftaskcontacttype[$obj->rowid] = $obj->code;
 	}
 }
 else dol_print_error($db);
-if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0]='0';         // To avoid sql syntax error if not found
+if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
-$distinct='DISTINCT';   // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
+$distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
 $sql = "SELECT ".$distinct." p.rowid as projectid, p.ref as projectref, p.title as projecttitle, p.fk_statut as projectstatus, p.datee as projectdatee, p.fk_opp_status, p.public, p.fk_user_creat as projectusercreate";
-$sql.= ", s.nom as name, s.rowid as socid";
-$sql.= ", t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_update";
-$sql.= ", t.rowid as id, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
+$sql .= ", s.nom as name, s.rowid as socid";
+$sql .= ", t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_update";
+$sql .= ", t.rowid as id, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
 // We'll need these fields in order to filter by categ
 if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 // We'll need this table joined to the select in order to filter by categ
-if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
-$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($search_project_user > 0)  $sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
-if ($search_task_user > 0)     $sql.=", ".MAIN_DB_PREFIX."element_contact as ect";
-$sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity IN (".getEntity('project').')';
-if (! $user->rights->projet->all->lire) $sql.=" AND p.rowid IN (".($projectsListId?$projectsListId:'0').")";    // public and assigned to projects, or restricted to company for external users
+if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
+$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as ef on (t.rowid = ef.fk_object)";
+if ($search_project_user > 0)  $sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
+if ($search_task_user > 0)     $sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
+$sql .= " WHERE t.fk_projet = p.rowid";
+$sql .= " AND p.entity IN (".getEntity('project').')';
+if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".($projectsListId ? $projectsListId : '0').")"; // public and assigned to projects, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-if ($search_categ > 0)     $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2)   $sql.= " AND cs.fk_categorie IS NULL";
+if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($search_categ > 0)     $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
+if ($search_categ == -2)   $sql .= " AND cs.fk_categorie IS NULL";
 if ($search_project_ref)   $sql .= natural_search('p.ref', $search_project_ref);
 if ($search_project_title) $sql .= natural_search('p.title', $search_project_title);
 if ($search_task_ref)      $sql .= natural_search('t.ref', $search_task_ref);
@@ -286,28 +286,28 @@ 
 if ($search_smonth > 0)
 {
 	if ($search_syear > 0 && empty($search_sday))
-		$sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,$search_smonth,false))."' AND '".$db->idate(dol_get_last_day($search_syear,$search_smonth,false))."'";
-		else if ($search_syear > 0 && ! empty($search_sday))
-			$sql.= " AND t.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_smonth, $search_sday, $search_syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_smonth, $search_sday, $search_syear))."'";
+		$sql .= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear, $search_smonth, false))."' AND '".$db->idate(dol_get_last_day($search_syear, $search_smonth, false))."'";
+		else if ($search_syear > 0 && !empty($search_sday))
+			$sql .= " AND t.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_smonth, $search_sday, $search_syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_smonth, $search_sday, $search_syear))."'";
 			else
-				$sql.= " AND date_format(t.dateo, '%m') = '".$search_smonth."'";
+				$sql .= " AND date_format(t.dateo, '%m') = '".$search_smonth."'";
 }
 else if ($search_syear > 0)
 {
-	$sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,1,false))."' AND '".$db->idate(dol_get_last_day($search_syear,12,false))."'";
+	$sql .= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear, 1, false))."' AND '".$db->idate(dol_get_last_day($search_syear, 12, false))."'";
 }
 if ($search_emonth > 0)
 {
 	if ($search_eyear > 0 && empty($search_eday))
-		$sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,$search_emonth,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,$search_emonth,false))."'";
-		else if ($search_eyear > 0 && ! empty($search_eday))
-			$sql.= " AND t.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_emonth, $search_eday, $search_eyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_emonth, $search_eday, $search_eyear))."'";
+		$sql .= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear, $search_emonth, false))."' AND '".$db->idate(dol_get_last_day($search_eyear, $search_emonth, false))."'";
+		else if ($search_eyear > 0 && !empty($search_eday))
+			$sql .= " AND t.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_emonth, $search_eday, $search_eyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_emonth, $search_eday, $search_eyear))."'";
 			else
-				$sql.= " AND date_format(t.datee, '%m') = '".$search_emonth."'";
+				$sql .= " AND date_format(t.datee, '%m') = '".$search_emonth."'";
 }
 else if ($search_eyear > 0)
 {
-	$sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
+	$sql .= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear, 1, false))."' AND '".$db->idate(dol_get_last_day($search_eyear, 12, false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_projectstatus >= 0)
@@ -315,16 +315,16 @@ 
 	if ($search_projectstatus == 99) $sql .= " AND p.fk_statut <> 2";
 	else $sql .= " AND p.fk_statut = ".$db->escape($search_projectstatus);
 }
-if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);
-if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
-if ($search_task_user > 0) $sql.= " AND ect.fk_c_type_contact IN (".join(',',array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$search_task_user;
+if ($search_public != '') $sql .= " AND p.public = ".$db->escape($search_public);
+if ($search_project_user > 0) $sql .= " AND ecp.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
+if ($search_task_user > 0) $sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$search_task_user;
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= $db->order($sortfield,$sortorder);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -338,12 +338,12 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit + 1,$offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("list allowed project", LOG_DEBUG);
 
 $resql = $db->query($sql);
-if (! $resql)
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -351,9 +351,9 @@ 
 
 $num = $db->num_rows($resql);
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->id;
@@ -361,50 +361,50 @@ 
 	exit;
 }
 
-$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $title, $help_url);
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_sday)                 		$param.='&search_sday='.$search_sday;
-if ($search_smonth)              		$param.='&search_smonth='.$search_smonth;
-if ($search_syear)               		$param.='&search_syear=' .$search_syear;
-if ($search_eday)               		$param.='&search_eday='.$search_eday;
-if ($search_emonth)              		$param.='&search_emonth='.$search_emonth;
-if ($search_eyear)               		$param.='&search_eyear=' .$search_eyear;
-if ($socid)				        $param.='&socid='.$socid;
-if ($search_all != '') 			$param.='&search_all='.$search_all;
-if ($search_project_ref != '') 			$param.='&search_project_ref='.$search_project_ref;
-if ($search_project_title != '') 		$param.='&search_project_title='.$search_project_title;
-if ($search_ref != '') 			$param.='&search_ref='.$search_ref;
-if ($search_label != '') 		$param.='&search_label='.$search_label;
-if ($search_societe != '') 		$param.='&search_societe='.$search_societe;
-if ($search_projectstatus != '') $param.='&search_projectstatus='.$search_projectstatus;
-if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','none'))) 	$param.='&search_opp_status='.urlencode($search_opp_status);
-if ($search_public != '') 		$param.='&search_public='.$search_public;
-if ($search_project_user != '')   $param.='&search_project_user='.$search_project_user;
-if ($search_task_user > 0)    	$param.='&search_task_user='.$search_task_user;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($search_sday)                 		$param .= '&search_sday='.$search_sday;
+if ($search_smonth)              		$param .= '&search_smonth='.$search_smonth;
+if ($search_syear)               		$param .= '&search_syear='.$search_syear;
+if ($search_eday)               		$param .= '&search_eday='.$search_eday;
+if ($search_emonth)              		$param .= '&search_emonth='.$search_emonth;
+if ($search_eyear)               		$param .= '&search_eyear='.$search_eyear;
+if ($socid)				        $param .= '&socid='.$socid;
+if ($search_all != '') 			$param .= '&search_all='.$search_all;
+if ($search_project_ref != '') 			$param .= '&search_project_ref='.$search_project_ref;
+if ($search_project_title != '') 		$param .= '&search_project_title='.$search_project_title;
+if ($search_ref != '') 			$param .= '&search_ref='.$search_ref;
+if ($search_label != '') 		$param .= '&search_label='.$search_label;
+if ($search_societe != '') 		$param .= '&search_societe='.$search_societe;
+if ($search_projectstatus != '') $param .= '&search_projectstatus='.$search_projectstatus;
+if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'none'))) 	$param .= '&search_opp_status='.urlencode($search_opp_status);
+if ($search_public != '') 		$param .= '&search_public='.$search_public;
+if ($search_project_user != '')   $param .= '&search_project_user='.$search_project_user;
+if ($search_task_user > 0)    	$param .= '&search_task_user='.$search_task_user;
+if ($optioncss != '') $param .= '&optioncss='.$optioncss;
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 //    'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton='';
+$newcardbutton = '';
 if ($user->rights->projet->creer)
 {
 	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/projet/tasks.php?action=create"><span class="valignmiddle">'.$langs->trans('NewTask').'</span>';
-	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-	$newcardbutton.= '</a>';
+	$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton .= '</a>';
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -425,143 +425,143 @@ 
 if ($search_task_user == $user->id) print $langs->trans("MyTasksDesc").'<br><br>';
 else
 {
-	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("TasksOnProjectsDesc").'<br><br>';
+	if ($user->rights->projet->all->lire && !$socid) print $langs->trans("TasksOnProjectsDesc").'<br><br>';
 	else print $langs->trans("TasksOnProjectsPublicDesc").'<br><br>';
 }
 print '</div>';
 
-$topicmail="Information";
-$modelmail="task";
-$objecttmp=new Task($db);
-$trackid='tas'.$object->id;
+$topicmail = "Information";
+$modelmail = "task";
+$objecttmp = new Task($db);
+$trackid = 'tas'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $morehtmlfilter = '';
 
 // Filter on categories
-if (! empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled))
 {
-	require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('ProjectCategories'). ': ';
-	$moreforfilter.=$formother->select_categories('project', $search_categ, 'search_categ', 1, 'maxwidth300');
-	$moreforfilter.='</div>';
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('ProjectCategories').': ';
+	$moreforfilter .= $formother->select_categories('project', $search_categ, 'search_categ', 1, 'maxwidth300');
+	$moreforfilter .= '</div>';
 }
 
 // If the user can view users
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ' ';
-$includeonly='';
-if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
-$moreforfilter.='</div>';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('ProjectsWithThisUserAsContact').' ';
+$includeonly = '';
+if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+$moreforfilter .= $form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= '</div>';
 
 // If the user can view users
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.=$langs->trans('TasksWithThisUserAsContact'). ': ';
-$includeonly='';
-if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
-$moreforfilter.='</div>';
-
-if (! empty($moreforfilter))
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('TasksWithThisUserAsContact').': ';
+$includeonly = '';
+if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+$moreforfilter .= $form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= '</div>';
+
+if (!empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (! empty($arrayfields['t.ref']['checked']))
+if (!empty($arrayfields['t.ref']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'" size="4">';
 	print '</td>';
 }
-if (! empty($arrayfields['t.label']['checked']))
+if (!empty($arrayfields['t.label']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'" size="8">';
 	print '</td>';
 }
 // Start date
-if (! empty($arrayfields['t.dateo']['checked']))
+if (!empty($arrayfields['t.dateo']['checked']))
 {
 	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
 	print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
-	$formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5);
+	$formother->select_year($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5);
 	print '</td>';
 }
 // End date
-if (! empty($arrayfields['t.datee']['checked']))
+if (!empty($arrayfields['t.datee']['checked']))
 {
 	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
 	print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
-	$formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5);
+	$formother->select_year($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5);
 	print '</td>';
 }
-if (! empty($arrayfields['p.ref']['checked']))
+if (!empty($arrayfields['p.ref']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_project_ref" value="'.$search_project_ref.'" size="4">';
 	print '</td>';
 }
-if (! empty($arrayfields['p.title']['checked']))
+if (!empty($arrayfields['p.title']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_project_title" value="'.$search_project_title.'" size="6">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.nom']['checked']))
+if (!empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_societe" value="'.dol_escape_htmltag($search_societe).'" size="4">';
 	print '</td>';
 }
-if (! empty($arrayfields['p.fk_statut']['checked']))
+if (!empty($arrayfields['p.fk_statut']['checked']))
 {
 	print '<td class="liste_titre center">';
 	$arrayofstatus = array();
-	foreach($projectstatic->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
-	$arrayofstatus['99']=$langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
+	foreach ($projectstatic->statuts_short as $key => $val) $arrayofstatus[$key] = $langs->trans($val);
+	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
 	print $form->selectarray('search_projectstatus', $arrayofstatus, $search_projectstatus, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	print '</td>';
 }
-if (! empty($arrayfields['t.planned_workload']['checked'])) print '<td class="liste_titre"></td>';
-if (! empty($arrayfields['t.duration_effective']['checked'])) print '<td class="liste_titre"></td>';
-if (! empty($arrayfields['t.progress_calculated']['checked'])) print '<td class="liste_titre"></td>';
-if (! empty($arrayfields['t.progress']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['t.planned_workload']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['t.duration_effective']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['t.progress_calculated']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['t.progress']['checked'])) print '<td class="liste_titre"></td>';
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))
+if (!empty($arrayfields['t.datec']['checked']))
 {
 	// Date creation
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['t.tms']['checked']))
+if (!empty($arrayfields['t.tms']['checked']))
 {
 	// Date modification
 	print '<td class="liste_titre">';
@@ -569,44 +569,44 @@ 
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'],$_SERVER["PHP_SELF"],"t.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['t.label']['checked']))         print_liste_field_titre($arrayfields['t.label']['label'],$_SERVER["PHP_SELF"],"t.label","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['t.dateo']['checked']))         print_liste_field_titre($arrayfields['t.dateo']['label'],$_SERVER["PHP_SELF"],"t.dateo","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.datee']['checked']))         print_liste_field_titre($arrayfields['t.datee']['label'],$_SERVER["PHP_SELF"],"t.datee","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'],$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.fk_statut']['checked']))     print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.planned_workload']['checked']))         print_liste_field_titre($arrayfields['t.planned_workload']['label'],$_SERVER["PHP_SELF"],"t.planned_workload","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.duration_effective']['checked']))       print_liste_field_titre($arrayfields['t.duration_effective']['label'],$_SERVER["PHP_SELF"],"t.duration_effective","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.progress_calculated']['checked']))      print_liste_field_titre($arrayfields['t.progress_calculated']['label'],$_SERVER["PHP_SELF"],"","",$param,'align="center"');
-if (! empty($arrayfields['t.progress']['checked']))      print_liste_field_titre($arrayfields['t.progress']['label'],$_SERVER["PHP_SELF"],"t.progress","",$param,'align="center"',$sortfield,$sortorder);
+if (!empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.label']['checked']))         print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.dateo']['checked']))         print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.datee']['checked']))         print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['p.fk_statut']['checked']))     print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.planned_workload']['checked']))         print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.duration_effective']['checked']))       print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.progress_calculated']['checked']))      print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="center"');
+if (!empty($arrayfields['t.progress']['checked']))      print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, 'align="center"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+if (!empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
 
-$plannedworkloadoutputformat='allhourmin';
-$timespentoutputformat='allhourmin';
-if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+$plannedworkloadoutputformat = 'allhourmin';
+$timespentoutputformat = 'allhourmin';
+if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 
-$i=0;
-$totalarray=array();
-while ($i < min($num,$limit))
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 
@@ -615,7 +615,7 @@ 
 	$object->label = $obj->label;
 	$object->fk_statut = $obj->fk_statut;
 	$object->progress = $obj->progress;
-	$object->datee = $db->jdate($obj->date_end);	// deprecated
+	$object->datee = $db->jdate($obj->date_end); // deprecated
 	$object->date_end = $db->jdate($obj->date_end);
 
 	$projectstatic->id = $obj->projectid;
@@ -625,69 +625,69 @@ 
 	$projectstatic->statut = $obj->projectstatus;
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
 
-	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
+	$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
 	if ($userAccess >= 0)
 	{
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (! empty($arrayfields['t.ref']['checked']))
+		if (!empty($arrayfields['t.ref']['checked']))
 		{
 			print '<td>';
-			print $object->getNomUrl(1,'withproject');
+			print $object->getNomUrl(1, 'withproject');
 			if ($object->hasDelay()) print img_warning("Late");
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Label
-		if (! empty($arrayfields['t.label']['checked']))
+		if (!empty($arrayfields['t.label']['checked']))
 		{
 			print '<td>';
 			print $object->label;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Date start
-		if (! empty($arrayfields['t.dateo']['checked']))
+		if (!empty($arrayfields['t.dateo']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_start),'day');
+			print dol_print_date($db->jdate($obj->date_start), 'day');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Date end
-		if (! empty($arrayfields['t.datee']['checked']))
+		if (!empty($arrayfields['t.datee']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_end),'day');
+			print dol_print_date($db->jdate($obj->date_end), 'day');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Project ref
-		if (! empty($arrayfields['p.ref']['checked']))
+		if (!empty($arrayfields['p.ref']['checked']))
 		{
 			print '<td class="nowrap">';
 			print $projectstatic->getNomUrl(1, 'task');
 			if ($projectstatic->hasDelay()) print img_warning("Late");
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Project title
-		if (! empty($arrayfields['p.title']['checked']))
+		if (!empty($arrayfields['p.title']['checked']))
 		{
 			print '<td>';
-			print dol_trunc($obj->projecttitle,80);
+			print dol_trunc($obj->projecttitle, 80);
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Third party
-		if (! empty($arrayfields['s.nom']['checked']))
+		if (!empty($arrayfields['s.nom']['checked']))
 		{
 			print '<td>';
 			if ($obj->socid)
 			{
-				$socstatic->id=$obj->socid;
-				$socstatic->name=$obj->name;
+				$socstatic->id = $obj->socid;
+				$socstatic->name = $obj->name;
 				print $socstatic->getNomUrl(1);
 			}
 			else
@@ -695,23 +695,23 @@ 
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Project status
-		if (! empty($arrayfields['p.fk_statut']['checked']))
+		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{
 			print '<td align="center">';
 			print $projectstatic->getLibStatut(1);
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Planned workload
-		if (! empty($arrayfields['t.planned_workload']['checked']))
+		if (!empty($arrayfields['t.planned_workload']['checked']))
 		{
 			print '<td class="center">';
-			$fullhour=convertSecondToTime($obj->planned_workload,$plannedworkloadoutputformat);
-			$workingdelay=convertSecondToTime($obj->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+			$fullhour = convertSecondToTime($obj->planned_workload, $plannedworkloadoutputformat);
+			$workingdelay = convertSecondToTime($obj->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
 			if ($obj->planned_workload != '')
 			{
 				print $fullhour;
@@ -720,41 +720,41 @@ 
 			}
 			//else print '--:--';
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totalplannedworkloadfield']=$totalarray['nbfield'];
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totalplannedworkloadfield'] = $totalarray['nbfield'];
 			$totalarray['totalplannedworkload'] += $obj->planned_workload;
 		}
 		// Time spent
-		if (! empty($arrayfields['t.duration_effective']['checked']))
+		if (!empty($arrayfields['t.duration_effective']['checked']))
 		{
-			$showlineingray=0;$showproject=1;
+			$showlineingray = 0; $showproject = 1;
 			print '<td class="center">';
 			if ($showlineingray) print '<i>';
-			else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject?'':'&withproject=1').'">';
-			if ($obj->duration_effective) print convertSecondToTime($obj->duration_effective,$timespentoutputformat);
+			else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject ? '' : '&withproject=1').'">';
+			if ($obj->duration_effective) print convertSecondToTime($obj->duration_effective, $timespentoutputformat);
 			else print '--:--';
 			if ($showlineingray) print '</i>';
 			else print '</a>';
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totaldurationeffectivefield']=$totalarray['nbfield'];
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totaldurationeffectivefield'] = $totalarray['nbfield'];
 			$totalarray['totaldurationeffective'] += $obj->duration_effective;
 		}
 		// Calculated progress
-		if (! empty($arrayfields['t.progress_calculated']['checked']))
+		if (!empty($arrayfields['t.progress_calculated']['checked']))
 		{
 			print '<td class="center">';
 			if ($obj->planned_workload || $obj->duration_effective)
 			{
-				if ($obj->planned_workload) print round(100 * $obj->duration_effective / $obj->planned_workload,2).' %';
-				else print $form->textwithpicto('',$langs->trans('WorkloadNotDefined'), 1, 'help');
+				if ($obj->planned_workload) print round(100 * $obj->duration_effective / $obj->planned_workload, 2).' %';
+				else print $form->textwithpicto('', $langs->trans('WorkloadNotDefined'), 1, 'help');
 			}
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totalprogress_calculated']=$totalarray['nbfield'];
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totalprogress_calculated'] = $totalarray['nbfield'];
 		}
 		// Declared progress
-		if (! empty($arrayfields['t.progress']['checked']))
+		if (!empty($arrayfields['t.progress']['checked']))
 		{
 			print '<td class="center">';
 			if ($obj->progress != '')
@@ -762,29 +762,29 @@ 
 				print $obj->progress.' %';
 			}
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (! empty($arrayfields['t.datec']['checked']))
+		if (!empty($arrayfields['t.datec']['checked']))
 		{
 			print '<td align="center">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Date modification
-		if (! empty($arrayfields['t.tms']['checked']))
+		if (!empty($arrayfields['t.tms']['checked']))
 		{
 			print '<td align="center">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Status
 		/*if (! empty($arrayfields['p.fk_statut']['checked']))
@@ -796,12 +796,12 @@ 
 		print '<td class="nowrap" align="center">';
 		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		{
-			$selected=0;
-			if (in_array($obj->id, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected?' checked="checked"':'').'>';
+			$selected = 0;
+			if (in_array($obj->id, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>\n";
 
@@ -815,7 +815,7 @@ 
 if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['totalplannedworkloadfield']))
 {
 	print '<tr class="liste_total">';
-	$i=0;
+	$i = 0;
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
@@ -824,8 +824,8 @@ 
 			if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 			else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 		}
-		elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).'</td>';
-		elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totaldurationeffective'],$timespentoutputformat).'</td>';
+		elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
+		elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).'</td>';
 		elseif ($totalarray['totalprogress_calculated'] == $i) print '<td align="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
 		else print '<td></td>';
 	}
@@ -834,8 +834,8 @@ 
 
 $db->free($resql);
 
-$parameters=array('sql' => $sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('sql' => $sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print "</table>";

dolibarr/htdocs/home/home.php

Indentation +2 added lines, -2 removed lines

@@ -80,14 +80,14 @@
  */
 
 if (!is_object($form))
- {
+    {
     $form = new Form($db);
 }
 
 // Title
 $title = $langs->trans("HomeArea") . ' - Dolibarr ' . DOL_VERSION;
 if (!empty($conf->global->MAIN_APPLICATION_TITLE))
- {
+    {
     $title = $langs->trans("HomeArea") . ' - ' . $conf->global->MAIN_APPLICATION_TITLE;
 }
 

Spacing +95 added lines, -95 removed lines

@@ -31,8 +31,8 @@ 
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
 $_GET['mainmenu'] = GETPOST('mainmenu', 'aZ09') ? GETPOST('mainmenu', 'aZ09') : 'home';
@@ -47,7 +47,7 @@ 
 // Check if company name is defined (first install)
 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM)) {
     //header("Location: " . DOL_URL_ROOT . "/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    header('Location: ' . BASE_URI . '?controller=admin&method=index&mainmenu=home&leftmenu=setup&mesg=setupnotcomplete');
+    header('Location: '.BASE_URI.'?controller=admin&method=index&mainmenu=home&leftmenu=setup&mesg=setupnotcomplete');
     exit;
 }
 /*
@@ -61,7 +61,7 @@ 
   }
  */
 if (GETPOST('addbox')) { // Add box (when submit is done from a form when ajax disabled)
-    require_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
     $zone = GETPOST('areacode', 'aZ09');
     $userid = GETPOST('userid', 'int');
     $boxorder = GETPOST('boxorder', 'aZ09');
@@ -85,15 +85,15 @@ 
 }
 
 // Title
-$title = $langs->trans("HomeArea") . ' - Dolibarr ' . DOL_VERSION;
+$title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
 if (!empty($conf->global->MAIN_APPLICATION_TITLE))
  {
-    $title = $langs->trans("HomeArea") . ' - ' . $conf->global->MAIN_APPLICATION_TITLE;
+    $title = $langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
 }
 
 llxHeader('', $title);
 
-$resultboxes = FormOther::getBoxesArea($user, "0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+$resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'title_home');
 
@@ -127,16 +127,16 @@ 
 
 if (empty($user->societe_id)) {
     $boxstat .= '<div class="box">';
-    $boxstat .= '<table summary="' . dol_escape_htmltag($langs->trans("DolibarrStateBoard")) . '" class="noborder boxtable boxtablenobottom nohover" width="100%">';
+    $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover" width="100%">';
     $boxstat .= '<tr class="liste_titre">';
-    $boxstat .= '<th class="liste_titre">' . $langs->trans("DolibarrStateBoard") . '</th>';
+    $boxstat .= '<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
     $boxstat .= '</tr>';
     $boxstat .= '<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
 
     $object = new stdClass();
     $parameters = array();
     $action = '';
-    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
     $boxstat .= $hookmanager->resPrint;
 
     if (empty($reshook)) {
@@ -164,25 +164,25 @@ 
         );
         // Class file containing the method load_state_board for each line
         $includes = array(
-            DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
-            DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-            DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
-            DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
-            DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
-            DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-            DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-            DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
-            DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
-            DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
-            DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
-            DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
-            DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
-            DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
-            DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
-            DOL_DOCUMENT_ROOT . "/don/class/don.class.php"
+            DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+            DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+            DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+            DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+            DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+            DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+            DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+            DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+            DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+            DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+            DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+            DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+            DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+            DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+            DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+            DOL_DOCUMENT_ROOT."/don/class/don.class.php"
         );
         // Name class containing the method load_state_board for each line
         $classes = array('User',
@@ -293,25 +293,25 @@ 
           );
          */
         $links = array(
-            BASE_URI . '/?controller=user&method=list',
-            BASE_URI . '/?controller=societe&method=list&type=c&mainmenu=companies',
-            BASE_URI . '/?controller=societe&method=list&type=p&mainmenu=companies',
-            BASE_URI . '/?controller=societe&method=list&type=f&mainmenu=companies',
-            BASE_URI . '/?controller=contact&method=list&mainmenu=companies',
-            BASE_URI . '/?controller=adherents&method=list&statut=1&mainmenu=members',
-            BASE_URI . '/?controller=product&method=list&type=0&mainmenu=products',
-            BASE_URI . '/?controller=product&method=list&type=1&mainmenu=products',
-            BASE_URI . '/?controller=comm/propal&method=list&mainmenu=commercial&leftmenu=propals',
-            BASE_URI . '/?controller=commande&method=list&mainmenu=commercial&leftmenu=orders',
-            BASE_URI . '/?controller=compta/facture&method=list&mainmenu=billing&leftmenu=customers_bills',
-            BASE_URI . '/?controller=contrat&method=list&mainmenu=commercial&leftmenu=contracts',
-            BASE_URI . '/?controller=fichinter&method=list&mainmenu=commercial&leftmenu=ficheinter',
-            BASE_URI . '/?controller=fourn/commande&method=list&mainmenu=commercial&leftmenu=orders_suppliers',
-            BASE_URI . '/?controller=fourn/facture&method=list&mainmenu=billing&leftmenu=suppliers_bills',
-            BASE_URI . '/?controller=supplier_proposal&method=list&mainmenu=commercial&leftmenu=',
-            BASE_URI . '/?controller=projet&method=list&mainmenu=project',
-            BASE_URI . '/?controller=expensereport&method=list&mainmenu=hrm&leftmenu=expensereport',
-            BASE_URI . '/?controller=don&method=list&leftmenu=donations'
+            BASE_URI.'/?controller=user&method=list',
+            BASE_URI.'/?controller=societe&method=list&type=c&mainmenu=companies',
+            BASE_URI.'/?controller=societe&method=list&type=p&mainmenu=companies',
+            BASE_URI.'/?controller=societe&method=list&type=f&mainmenu=companies',
+            BASE_URI.'/?controller=contact&method=list&mainmenu=companies',
+            BASE_URI.'/?controller=adherents&method=list&statut=1&mainmenu=members',
+            BASE_URI.'/?controller=product&method=list&type=0&mainmenu=products',
+            BASE_URI.'/?controller=product&method=list&type=1&mainmenu=products',
+            BASE_URI.'/?controller=comm/propal&method=list&mainmenu=commercial&leftmenu=propals',
+            BASE_URI.'/?controller=commande&method=list&mainmenu=commercial&leftmenu=orders',
+            BASE_URI.'/?controller=compta/facture&method=list&mainmenu=billing&leftmenu=customers_bills',
+            BASE_URI.'/?controller=contrat&method=list&mainmenu=commercial&leftmenu=contracts',
+            BASE_URI.'/?controller=fichinter&method=list&mainmenu=commercial&leftmenu=ficheinter',
+            BASE_URI.'/?controller=fourn/commande&method=list&mainmenu=commercial&leftmenu=orders_suppliers',
+            BASE_URI.'/?controller=fourn/facture&method=list&mainmenu=billing&leftmenu=suppliers_bills',
+            BASE_URI.'/?controller=supplier_proposal&method=list&mainmenu=commercial&leftmenu=',
+            BASE_URI.'/?controller=projet&method=list&mainmenu=project',
+            BASE_URI.'/?controller=expensereport&method=list&mainmenu=hrm&leftmenu=expensereport',
+            BASE_URI.'/?controller=don&method=list&leftmenu=donations'
         );
         // Translation lang files
         $langfile = array("users",
@@ -356,10 +356,10 @@ 
                     $langs->load($langfile[$key]);
                 $text = $langs->trans($titres[$key]);
                 //$sep=($conf->dol_use_jmobile?'<br>':' ');
-                $boxstat .= '<a href="' . $links[$key] . '" class="boxstatsindicator thumbstat nobold nounderline">';
+                $boxstat .= '<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
                 $boxstat .= '<div class="boxstats">';
-                $boxstat .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
-                $boxstat .= '<span class="boxstatsindicator">' . img_object("", $icons[$key], 'class="inline-block"') . ' ' . ($board->nb[$val] ? $board->nb[$val] : 0) . '</span>';
+                $boxstat .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
+                $boxstat .= '<span class="boxstatsindicator">'.img_object("", $icons[$key], 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
                 $boxstat .= '</div>';
                 $boxstat .= '</a>';
             }
@@ -393,11 +393,11 @@ 
 $dashboardlines = array();
 
 // Do not include sections without management permission
-require_once DOL_DOCUMENT_ROOT . '/core/class/workboardresponse.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
 if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
-    include_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
     $board = new ActionComm($db);
 
     $dashboardlines[] = $board->load_board($user);
@@ -405,21 +405,21 @@ 
 
 // Number of project opened
 if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $board = new Project($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
 if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
     $board = new Task($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
 if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
     $board = new Propal($db);
     $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
@@ -428,7 +428,7 @@ 
 
 // Number of commercial proposals opened (expired)
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
     $board = new SupplierProposal($db);
     $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
@@ -437,21 +437,21 @@ 
 
 // Number of customer orders a deal
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
     $board = new Commande($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
 if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
     $board = new CommandeFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
 if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
     $board = new Contrat($db);
     $dashboardlines[] = $board->load_board($user, "inactives");
     // Number of active services (expired)
@@ -459,23 +459,23 @@ 
 }
 // Number of invoices customers (has paid)
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
     $board = new Facture($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
 if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
-    include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
     $board = new FactureFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
 if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
     $board = new Account($db);
-    $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
+    $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
     if ($nb > 0) {
         $dashboardlines[] = $board->load_board($user);
     }
@@ -483,28 +483,28 @@ 
 
 // Number of cheque to send
 if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
     $board = new RemiseCheque($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of foundation members
 if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->societe_id) {
-    include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
     $board = new Adherent($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
-    include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board = new ExpenseReport($db);
     $dashboardlines[] = $board->load_board($user, 'toapprove');
 }
 
 // Number of expense reports to pay
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
-    include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board = new ExpenseReport($db);
     $dashboardlines[] = $board->load_board($user, 'topay');
 }
@@ -512,7 +512,7 @@ 
 $object = new stdClass();
 $parameters = array();
 $action = '';
-$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook == 0) {
     $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
 }
@@ -542,22 +542,22 @@ 
 //var_dump($totallate);
 $boxwork = '';
 $boxwork .= '<div class="box">';
-$boxwork .= '<table summary="' . dol_escape_htmltag($langs->trans("WorkingBoard")) . '" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">' . "\n";
+$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
 $boxwork .= '<tr class="liste_titre">';
-$boxwork .= '<th class="liste_titre">' . $langs->trans("DolibarrWorkBoard") . '</th>';
-$boxwork .= '</tr>' . "\n";
+$boxwork .= '<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
+$boxwork .= '</tr>'."\n";
 
 if ($showweather) {
     $boxwork .= '<tr class="nohover">';
-    $boxwork .= '<td class="nohover' . ($conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '') . ' center valignmiddle">';
+    $boxwork .= '<td class="nohover'.($conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '').' center valignmiddle">';
     $text = '';
     if ($totallate > 0)
     {
-        $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate", $totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
+        $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
     } else {
         $text = $langs->transnoentitiesnoconv("NoItemLate");
     }
-    $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
+    $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
     //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
     $options = 'height="64px"';
     $boxwork .= showWeather($totallate, $text, $options);
@@ -577,23 +577,23 @@ 
         }
 
         $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
-        $textlate .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')';
+        $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
 
         $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $sep = ($conf->dol_use_jmobile ? '<br>' : ' ');
-        $boxwork .= '<span class="boxstatstext" title="' . dol_escape_htmltag($board->label) . '">' . $board->img . ' ' . $board->label . '</span><br>';
-        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . $board->nbtodo . '</span></a>';
+        $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
+        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
         if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
-            $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . price($board->total) . '</span></a>';
+            $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';
         }
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0) {
             $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
-            $boxwork .= '<a title="' . dol_escape_htmltag($textlate) . '" class="valignmiddle dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '" href="' . ((!$board->url_late) ? $board->url : $board->url_late ) . '">';
+            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';
             //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-            $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"') . '';
-            $boxwork .= '<span class="dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '">';
+            $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"').'';
+            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';
             $boxwork .= $board->nbtodolate;
             $boxwork .= '</span>';
             $boxwork .= '</a>';
@@ -622,7 +622,7 @@ 
 
 $boxwork .= '</td></tr>';
 
-$boxwork .= '</table>';   // End table array of working board
+$boxwork .= '</table>'; // End table array of working board
 $boxwork .= '</div>';
 
 print '</div></div></div><div class="clearboth"></div>';
@@ -668,11 +668,11 @@ 
     $message = '';
 
     // Check if install lock file is present
-    $lockfile = DOL_DATA_ROOT . '/install.lock';
-    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT . "/install")) {
+    $lockfile = DOL_DATA_ROOT.'/install.lock';
+    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install")) {
         $langs->load("errors");
         //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT) . ' ' . $langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT . "/install"), 0, 0, '1', 'clearboth');
+        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     // Conf files must be in read only mode
@@ -680,7 +680,7 @@ 
         $langs->load("errors");
         //$langs->load("other");
         //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly") . ' ' . $langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT . "/install"), 0, 0, '1', 'clearboth');
+        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     if ($message) {
@@ -715,20 +715,20 @@ 
     $used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
 
     $level0 = $offset;
-    if (!empty($conf->global->{$used_conf . '0'})) {
-        $level0 = $conf->global->{$used_conf . '0'};
+    if (!empty($conf->global->{$used_conf.'0'})) {
+        $level0 = $conf->global->{$used_conf.'0'};
     }
     $level1 = $offset + 1 * $factor;
-    if (!empty($conf->global->{$used_conf . '1'})) {
-        $level1 = $conf->global->{$used_conf . '1'};
+    if (!empty($conf->global->{$used_conf.'1'})) {
+        $level1 = $conf->global->{$used_conf.'1'};
     }
     $level2 = $offset + 2 * $factor;
-    if (!empty($conf->global->{$used_conf . '2'})) {
-        $level2 = $conf->global->{$used_conf . '2'};
+    if (!empty($conf->global->{$used_conf.'2'})) {
+        $level2 = $conf->global->{$used_conf.'2'};
     }
     $level3 = $offset + 3 * $factor;
-    if (!empty($conf->global->{$used_conf . '3'})) {
-        $level3 = $conf->global->{$used_conf . '3'};
+    if (!empty($conf->global->{$used_conf.'3'})) {
+        $level3 = $conf->global->{$used_conf.'3'};
     }
 
     if ($totallate <= $level0)

Braces +12 added lines, -8 removed lines

@@ -352,8 +352,9 @@ 
                 }
 
 
-                if (!empty($langfile[$key]))
-                    $langs->load($langfile[$key]);
+                if (!empty($langfile[$key])) {
+                                    $langs->load($langfile[$key]);
+                }
                 $text = $langs->trans($titres[$key]);
                 //$sep=($conf->dol_use_jmobile?'<br>':' ');
                 $boxstat .= '<a href="' . $links[$key] . '" class="boxstatsindicator thumbstat nobold nounderline">';
@@ -524,21 +525,24 @@ 
 //load_board can return an integer if failed or WorkboardResponse if OK
 $valid_dashboardlines = array();
 foreach ($dashboardlines as $tmp) {
-    if ($tmp instanceof WorkboardResponse)
-        $valid_dashboardlines[] = $tmp;
-}
+    if ($tmp instanceof WorkboardResponse) {
+            $valid_dashboardlines[] = $tmp;
+    }
+    }
 
 // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
 foreach ($valid_dashboardlines as $board) {
     if ($board->nbtodolate > 0) {
-        if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE))
-            $totaltodo += $board->nbtodo;
+        if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+                    $totaltodo += $board->nbtodo;
+        }
         $totallate += $board->nbtodolate;
     }
 }
 //var_dump($totallate, $totaltodo);
-if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) && !empty($totaltodo))
+if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) && !empty($totaltodo)) {
     $totallate = round($totallate / $totaltodo * 100, 2);
+}
 //var_dump($totallate);
 $boxwork = '';
 $boxwork .= '<div class="box">';

dolibarr/htdocs/comm/action/class/actioncomm.class.php

Spacing +229 added lines, -229 removed lines

@@ -28,8 +28,8 @@ 
  *       \ingroup    agenda
  *       \brief      File of class to manage agenda events (actions)
  */
-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/cactioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * 		Class to manage agenda events (actions)
@@ -76,19 +76,19 @@ 
      * @var int
      */
     public $ref;
-    public $type_id;  // Id into parent table llx_c_actioncomm (used only if option to use type is set)
-    public $type_code;  // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
+    public $type_id; // Id into parent table llx_c_actioncomm (used only if option to use type is set)
+    public $type_code; // Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
     public $type_label;
-    public $type;   // Label into parent table llx_c_actioncomm (used only if option to use type is set)
+    public $type; // Label into parent table llx_c_actioncomm (used only if option to use type is set)
     public $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set)
-    public $code;   // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
+    public $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
 
     /**
      * @var string Agenda event label
      */
     public $label;
-    public $datec;   // Date creation record (datec)
-    public $datem;   // Date modification record (tms)
+    public $datec; // Date creation record (datec)
+    public $datem; // Date modification record (tms)
 
     /**
      * Object user that create action
@@ -117,15 +117,15 @@ 
      * @var int
      */
     public $usermodid;
-    public $datep;   // Date action start (datep)
-    public $datef;   // Date action end (datep2)
+    public $datep; // Date action start (datep)
+    public $datef; // Date action end (datep2)
 
     /**
      * @var int -1=Unkown duration
      * @deprecated
      */
     public $durationp = -1;
-    public $fulldayevent = 0;    // 1=Event on full day
+    public $fulldayevent = 0; // 1=Event on full day
 
     /**
      * Milestone
@@ -133,10 +133,10 @@ 
      * @deprecated Milestone is already event with end date = start date
      */
     public $punctual = 1;
-    public $percentage;    // Percentage
-    public $location;      // Location
+    public $percentage; // Percentage
+    public $location; // Location
     public $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
-    public $priority;      // Small int (0 By default)
+    public $priority; // Small int (0 By default)
     public $userassigned = array(); // Array of user ids
     public $userownerid; // Id of user owner = fk_user_action into table
     public $userdoneid; // Id of user done (deprecated)
@@ -177,9 +177,9 @@ 
      */
     public $contact;
     // Properties for links to other objects
-    public $fk_element;    // Id of record
-    public $elementid;    // Id of record alternative for API
-    public $elementtype;   // Type of record. This if property ->element of object linked to.
+    public $fk_element; // Id of record
+    public $elementid; // Id of record alternative for API
+    public $elementtype; // Type of record. This if property ->element of object linked to.
     // Ical
     public $icalname;
     public $icalcolor;
@@ -247,7 +247,7 @@ 
             $this->percentage = 100;
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
         if (!empty($this->datep) && !empty($this->datef))
-            $this->durationp = ($this->datef - $this->datep);  // deprecated
+            $this->durationp = ($this->datef - $this->datep); // deprecated
 
             
 //if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
@@ -270,7 +270,7 @@ 
         }
 
         if (is_object($this->contact) && isset($this->contact->id) && $this->contact->id > 0 && !($this->contactid > 0))
-            $this->contactid = $this->contact->id;  // For backward compatibility. Using this->contact->xx is deprecated
+            $this->contactid = $this->contact->id; // For backward compatibility. Using this->contact->xx is deprecated
 
 
         $userownerid = $this->userownerid;
@@ -291,7 +291,7 @@ 
                 $this->type_id = $cactioncomm->id;
                 $this->type_code = $cactioncomm->code;
             } else if ($result == 0) {
-                $this->error = 'Failed to get record with id ' . $this->type_id . ' code ' . $this->type_code . ' from dictionary "type of events"';
+                $this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
                 return -1;
             } else {
                 $this->error = $cactioncomm->error;
@@ -308,7 +308,7 @@ 
 
         $this->db->begin();
 
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "actioncomm";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
         $sql .= "(datec,";
         $sql .= "datep,";
         $sql .= "datep2,";
@@ -338,40 +338,40 @@ 
         $sql .= "email_subject,";
         $sql .= "errors_to";
         $sql .= ") VALUES (";
-        $sql .= "'" . $this->db->idate($now) . "', ";
-        $sql .= (strval($this->datep) != '' ? "'" . $this->db->idate($this->datep) . "'" : "null") . ", ";
-        $sql .= (strval($this->datef) != '' ? "'" . $this->db->idate($this->datef) . "'" : "null") . ", ";
-        $sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'" . $this->db->escape($this->durationp) . "'" : "null") . ", "; // deprecated
-        $sql .= (isset($this->type_id) ? $this->type_id : "null") . ",";
-        $sql .= ($code ? ("'" . $code . "'") : "null") . ", ";
-        $sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null") . ", ";
-        $sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null") . ", ";
-        $sql .= " '" . $this->db->escape($this->note_private ? $this->note_private : $this->note) . "', ";
-        $sql .= ((isset($this->contactid) && $this->contactid > 0) ? $this->contactid : "null") . ", ";
-        $sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null") . ", ";
-        $sql .= ($userownerid > 0 ? $userownerid : "null") . ", ";
-        $sql .= ($userdoneid > 0 ? $userdoneid : "null") . ", ";
-        $sql .= "'" . $this->db->escape($this->label) . "','" . $this->db->escape($this->percentage) . "','" . $this->db->escape($this->priority) . "','" . $this->db->escape($this->fulldayevent) . "','" . $this->db->escape($this->location) . "','" . $this->db->escape($this->punctual) . "', ";
-        $sql .= "'" . $this->db->escape($this->transparency) . "', ";
-        $sql .= (!empty($this->fk_element) ? $this->fk_element : "null") . ", ";
-        $sql .= (!empty($this->elementtype) ? "'" . $this->db->escape($this->elementtype) . "'" : "null") . ", ";
-        $sql .= $conf->entity . ",";
-        $sql .= (!empty($this->extraparams) ? "'" . $this->db->escape($this->extraparams) . "'" : "null") . ", ";
+        $sql .= "'".$this->db->idate($now)."', ";
+        $sql .= (strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : "null").", ";
+        $sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
+        $sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
+        $sql .= (isset($this->type_id) ? $this->type_id : "null").",";
+        $sql .= ($code ? ("'".$code."'") : "null").", ";
+        $sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null").", ";
+        $sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null").", ";
+        $sql .= " '".$this->db->escape($this->note_private ? $this->note_private : $this->note)."', ";
+        $sql .= ((isset($this->contactid) && $this->contactid > 0) ? $this->contactid : "null").", ";
+        $sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
+        $sql .= ($userownerid > 0 ? $userownerid : "null").", ";
+        $sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
+        $sql .= "'".$this->db->escape($this->label)."','".$this->db->escape($this->percentage)."','".$this->db->escape($this->priority)."','".$this->db->escape($this->fulldayevent)."','".$this->db->escape($this->location)."','".$this->db->escape($this->punctual)."', ";
+        $sql .= "'".$this->db->escape($this->transparency)."', ";
+        $sql .= (!empty($this->fk_element) ? $this->fk_element : "null").", ";
+        $sql .= (!empty($this->elementtype) ? "'".$this->db->escape($this->elementtype)."'" : "null").", ";
+        $sql .= $conf->entity.",";
+        $sql .= (!empty($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").", ";
         // Fields emails
-        $sql .= (!empty($this->email_msgid) ? "'" . $this->db->escape($this->email_msgid) . "'" : "null") . ", ";
-        $sql .= (!empty($this->email_from) ? "'" . $this->db->escape($this->email_from) . "'" : "null") . ", ";
-        $sql .= (!empty($this->email_sender) ? "'" . $this->db->escape($this->email_sender) . "'" : "null") . ", ";
-        $sql .= (!empty($this->email_to) ? "'" . $this->db->escape($this->email_to) . "'" : "null") . ", ";
-        $sql .= (!empty($this->email_tocc) ? "'" . $this->db->escape($this->email_tocc) . "'" : "null") . ", ";
-        $sql .= (!empty($this->email_tobcc) ? "'" . $this->db->escape($this->email_tobcc) . "'" : "null") . ", ";
-        $sql .= (!empty($this->email_subject) ? "'" . $this->db->escape($this->email_subject) . "'" : "null") . ", ";
-        $sql .= (!empty($this->errors_to) ? "'" . $this->db->escape($this->errors_to) . "'" : "null");
+        $sql .= (!empty($this->email_msgid) ? "'".$this->db->escape($this->email_msgid)."'" : "null").", ";
+        $sql .= (!empty($this->email_from) ? "'".$this->db->escape($this->email_from)."'" : "null").", ";
+        $sql .= (!empty($this->email_sender) ? "'".$this->db->escape($this->email_sender)."'" : "null").", ";
+        $sql .= (!empty($this->email_to) ? "'".$this->db->escape($this->email_to)."'" : "null").", ";
+        $sql .= (!empty($this->email_tocc) ? "'".$this->db->escape($this->email_tocc)."'" : "null").", ";
+        $sql .= (!empty($this->email_tobcc) ? "'".$this->db->escape($this->email_tobcc)."'" : "null").", ";
+        $sql .= (!empty($this->email_subject) ? "'".$this->db->escape($this->email_subject)."'" : "null").", ";
+        $sql .= (!empty($this->errors_to) ? "'".$this->db->escape($this->errors_to)."'" : "null");
         $sql .= ")";
 
-        dol_syslog(get_class($this) . "::add", LOG_DEBUG);
+        dol_syslog(get_class($this)."::add", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "actioncomm", "id");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
 
             // Now insert assignedusers
             if (!$error) {
@@ -380,8 +380,8 @@ 
                         $val = array('id' => $val);
                     }
 
-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-                    $sql .= " VALUES(" . $this->id . ", 'user', " . $val['id'] . ", " . (empty($val['mandatory']) ? '0' : $val['mandatory']) . ", " . (empty($val['transparency']) ? '0' : $val['transparency']) . ", " . (empty($val['answer_status']) ? '0' : $val['answer_status']) . ")";
+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
+                    $sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
                     $resql = $this->db->query($sql);
                     if (!$resql) {
@@ -395,8 +395,8 @@ 
             if (!$error) {
                 if (!empty($this->socpeopleassigned)) {
                     foreach ($this->socpeopleassigned as $id => $Tab) {
-                        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-                        $sql .= " VALUES(" . $this->id . ", 'socpeople', " . $id . ", 0, 0, 0)";
+                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
+                        $sql .= " VALUES(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
 
                         $resql = $this->db->query($sql);
                         if (!$resql) {
@@ -506,7 +506,7 @@ 
             if (is_object($hookmanager)) {
                 $parameters = array('objFrom' => $objFrom);
                 $action = '';
-                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0)
                     $error++;
             }
@@ -562,19 +562,19 @@ 
         $sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
         $sql .= " s.nom as socname,";
         $sql .= " u.firstname, u.lastname as lastname";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a ";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_actioncomm as c ON a.fk_action=c.id ";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_author";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on s.rowid = a.fk_soc";
+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a ";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action=c.id ";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
         $sql .= " WHERE ";
         if ($ref)
-            $sql .= " a.id=" . $ref;           // No field ref, we use id
+            $sql .= " a.id=".$ref; // No field ref, we use id
         elseif ($ref_ext)
-            $sql .= " a.ref_ext='" . $this->db->escape($ref_ext) . "'";
+            $sql .= " a.ref_ext='".$this->db->escape($ref_ext)."'";
         else
-            $sql .= " a.id=" . $id;
+            $sql .= " a.id=".$id;
 
-        dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -590,10 +590,10 @@ 
                 $this->type_code = $obj->type_code;
                 $this->type_color = $obj->type_color;
                 $this->type_picto = $obj->type_picto;
-                $transcode = $langs->trans("Action" . $obj->type_code);
-                $this->type = (($transcode != "Action" . $obj->type_code) ? $transcode : $obj->type_label);
-                $transcode = $langs->trans("Action" . $obj->type_code . 'Short');
-                $this->type_short = (($transcode != "Action" . $obj->type_code . 'Short') ? $transcode : '');
+                $transcode = $langs->trans("Action".$obj->type_code);
+                $this->type = (($transcode != "Action".$obj->type_code) ? $transcode : $obj->type_label);
+                $transcode = $langs->trans("Action".$obj->type_code.'Short');
+                $this->type_short = (($transcode != "Action".$obj->type_code.'Short') ? $transcode : '');
 
                 $this->code = $obj->code;
                 $this->label = $obj->label;
@@ -612,12 +612,12 @@ 
 
                 if (!is_object($this->author))
                     $this->author = new stdClass(); // To avoid warning
-                $this->author->id = $obj->fk_user_author;  // deprecated
-                $this->author->firstname = $obj->firstname;   // deprecated
-                $this->author->lastname = $obj->lastname;   // deprecated
+                $this->author->id = $obj->fk_user_author; // deprecated
+                $this->author->firstname = $obj->firstname; // deprecated
+                $this->author->lastname = $obj->lastname; // deprecated
                 if (!is_object($this->usermod))
                     $this->usermod = new stdClass(); // To avoid warning
-                $this->usermod->id = $obj->fk_user_mod;  // deprecated
+                $this->usermod->id = $obj->fk_user_mod; // deprecated
 
                 $this->userownerid = $obj->fk_user_action;
                 $this->userdoneid = $obj->fk_user_done;
@@ -625,14 +625,14 @@ 
                 $this->fulldayevent = $obj->fulldayevent;
                 $this->location = $obj->location;
                 $this->transparency = $obj->transparency;
-                $this->punctual = $obj->punctual;       // deprecated
+                $this->punctual = $obj->punctual; // deprecated
 
-                $this->socid = $obj->fk_soc;   // To have fetch_thirdparty method working
-                $this->contactid = $obj->fk_contact;  // To have fetch_contact method working
-                $this->fk_project = $obj->fk_project;  // To have fetch_project method working
+                $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
+                $this->contactid = $obj->fk_contact; // To have fetch_contact method working
+                $this->fk_project = $obj->fk_project; // To have fetch_project method working
 
-                $this->societe->id = $obj->fk_soc;   // deprecated
-                $this->contact->id = $obj->fk_contact;  // deprecated
+                $this->societe->id = $obj->fk_soc; // deprecated
+                $this->contact->id = $obj->fk_contact; // deprecated
 
                 $this->fk_element = $obj->elementid;
                 $this->elementid = $obj->elementid;
@@ -658,8 +658,8 @@ 
     function fetchResources()
     {
         $sql = 'SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm_resources';
-        $sql .= ' WHERE fk_actioncomm = ' . $this->id;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm_resources';
+        $sql .= ' WHERE fk_actioncomm = '.$this->id;
         $sql .= " AND element_type IN ('user', 'socpeople')";
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -703,8 +703,8 @@ 
     {
         // phpcs:enable
         $sql = "SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm_resources";
-        $sql .= " WHERE element_type = 'user' AND fk_actioncomm = " . $this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm_resources";
+        $sql .= " WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
         $resql2 = $this->db->query($sql);
         if ($resql2) {
             $this->userassigned = array();
@@ -742,10 +742,10 @@ 
 
         $this->db->begin();
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "actioncomm";
-        $sql .= " WHERE id=" . $this->id;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
+        $sql .= " WHERE id=".$this->id;
 
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $res = $this->db->query($sql);
         if ($res < 0) {
             $this->error = $this->db->lasterror();
@@ -753,10 +753,10 @@ 
         }
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "actioncomm_resources";
-            $sql .= " WHERE fk_actioncomm=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources";
+            $sql .= " WHERE fk_actioncomm=".$this->id;
 
-            dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $res = $this->db->query($sql);
             if ($res < 0) {
                 $this->error = $this->db->lasterror();
@@ -769,7 +769,7 @@ 
             $result = $this->deleteExtraFields();
             if ($result < 0) {
                 $error++;
-                dol_syslog(get_class($this) . "::delete error -3 " . $this->error, LOG_ERR);
+                dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
             }
         }
 
@@ -826,7 +826,7 @@ 
             $this->percentage = 100;
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
         if ($this->datep && $this->datef)
-            $this->durationp = ($this->datef - $this->datep);  // deprecated
+            $this->durationp = ($this->datef - $this->datep); // deprecated
 
             
 //if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
@@ -849,32 +849,32 @@ 
 
         $this->db->begin();
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "actioncomm ";
-        $sql .= " SET percent = '" . $this->db->escape($this->percentage) . "'";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
+        $sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
         if ($this->type_id > 0)
-            $sql .= ", fk_action = '" . $this->db->escape($this->type_id) . "'";
-        $sql .= ", label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-        $sql .= ", datep = " . (strval($this->datep) != '' ? "'" . $this->db->idate($this->datep) . "'" : 'null');
-        $sql .= ", datep2 = " . (strval($this->datef) != '' ? "'" . $this->db->idate($this->datef) . "'" : 'null');
-        $sql .= ", durationp = " . (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '' ? "'" . $this->db->escape($this->durationp) . "'" : "null"); // deprecated
-        $sql .= ", note = '" . $this->db->escape($this->note_private ? $this->note_private : $this->note) . "'";
-        $sql .= ", fk_project =" . ($this->fk_project > 0 ? $this->fk_project : "null");
-        $sql .= ", fk_soc =" . ($socid > 0 ? $socid : "null");
-        $sql .= ", fk_contact =" . ($contactid > 0 ? $contactid : "null");
-        $sql .= ", priority = '" . $this->db->escape($this->priority) . "'";
-        $sql .= ", fulldayevent = '" . $this->db->escape($this->fulldayevent) . "'";
-        $sql .= ", location = " . ($this->location ? "'" . $this->db->escape($this->location) . "'" : "null");
-        $sql .= ", transparency = '" . $this->db->escape($this->transparency) . "'";
-        $sql .= ", fk_user_mod = " . $user->id;
-        $sql .= ", fk_user_action=" . ($userownerid > 0 ? "'" . $userownerid . "'" : "null");
-        $sql .= ", fk_user_done=" . ($userdoneid > 0 ? "'" . $userdoneid . "'" : "null");
+            $sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+        $sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
+        $sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
+        $sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
+        $sql .= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '' ? "'".$this->db->escape($this->durationp)."'" : "null"); // deprecated
+        $sql .= ", note = '".$this->db->escape($this->note_private ? $this->note_private : $this->note)."'";
+        $sql .= ", fk_project =".($this->fk_project > 0 ? $this->fk_project : "null");
+        $sql .= ", fk_soc =".($socid > 0 ? $socid : "null");
+        $sql .= ", fk_contact =".($contactid > 0 ? $contactid : "null");
+        $sql .= ", priority = '".$this->db->escape($this->priority)."'";
+        $sql .= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
+        $sql .= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'" : "null");
+        $sql .= ", transparency = '".$this->db->escape($this->transparency)."'";
+        $sql .= ", fk_user_mod = ".$user->id;
+        $sql .= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'" : "null");
+        $sql .= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'" : "null");
         if (!empty($this->fk_element))
-            $sql .= ", fk_element=" . ($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+            $sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
         if (!empty($this->elementtype))
-            $sql .= ", elementtype=" . ($this->elementtype ? "'" . $this->db->escape($this->elementtype) . "'" : "null");
-        $sql .= " WHERE id=" . $this->id;
+            $sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
+        $sql .= " WHERE id=".$this->id;
 
-        dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         if ($this->db->query($sql)) {
             $action = 'update';
 
@@ -888,15 +888,15 @@ 
 
             // Now insert assignedusers
             if (!$error) {
-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "actioncomm_resources where fk_actioncomm = " . $this->id . " AND element_type = 'user'";
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'user'";
                 $resql = $this->db->query($sql);
 
                 foreach ($this->userassigned as $key => $val) {
                     if (!is_array($val)) { // For backward compatibility when val=id
                         $val = array('id' => $val);
                     }
-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-                    $sql .= " VALUES(" . $this->id . ", 'user', " . $val['id'] . ", " . (empty($val['mandatory']) ? '0' : $val['mandatory']) . ", " . (empty($val['transparency']) ? '0' : $val['transparency']) . ", " . (empty($val['answer_status']) ? '0' : $val['answer_status']) . ")";
+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
+                    $sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
                     $resql = $this->db->query($sql);
                     if (!$resql) {
@@ -908,13 +908,13 @@ 
             }
 
             if (!$error) {
-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "actioncomm_resources where fk_actioncomm = " . $this->id . " AND element_type = 'socpeople'";
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'socpeople'";
                 $resql = $this->db->query($sql);
 
                 if (!empty($this->socpeopleassigned)) {
                     foreach (array_keys($this->socpeopleassigned) as $id) {
-                        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-                        $sql .= " VALUES(" . $this->id . ", 'socpeople', " . $id . ", 0, 0, 0)";
+                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
+                        $sql .= " VALUES(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
 
                         $resql = $this->db->query($sql);
                         if (!$resql) {
@@ -939,7 +939,7 @@ 
                 return 1;
             } else {
                 $this->db->rollback();
-                dol_syslog(get_class($this) . "::update " . join(',', $this->errors), LOG_ERR);
+                dol_syslog(get_class($this)."::update ".join(',', $this->errors), LOG_ERR);
                 return -2;
             }
         } else {
@@ -970,15 +970,15 @@ 
         $resarray = array();
 
         $sql = "SELECT a.id";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";
-        $sql .= " WHERE a.entity IN (" . getEntity('agenda') . ")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+        $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
         if (!empty($socid))
-            $sql .= " AND a.fk_soc = " . $socid;
+            $sql .= " AND a.fk_soc = ".$socid;
         if (!empty($elementtype)) {
             if ($elementtype == 'project')
-                $sql .= ' AND a.fk_project = ' . $fk_element;
+                $sql .= ' AND a.fk_project = '.$fk_element;
             else
-                $sql .= " AND a.fk_element = " . (int) $fk_element . " AND a.elementtype = '" . $elementtype . "'";
+                $sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$elementtype."'";
         }
         if (!empty($filter))
             $sql .= $filter;
@@ -986,7 +986,7 @@ 
             $sql .= $db->order($sortfield, $sortorder);
         $sql .= $db->plimit($limit, 0);
 
-        dol_syslog(get_class() . "::getActions", LOG_DEBUG);
+        dol_syslog(get_class()."::getActions", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql) {
             $num = $db->num_rows($resql);
@@ -1025,21 +1025,21 @@ 
             $this->nb = array();
             $sql = "SELECT count(a.id) as nb";
         }
-        $sql .= " FROM (" . MAIN_DB_PREFIX . "actioncomm as a";
+        $sql .= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
         $sql .= ")";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON a.fk_soc = s.rowid";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
         $sql .= " WHERE 1 = 1";
         if (empty($load_state_board))
             $sql .= " AND a.percent >= 0 AND a.percent < 100";
-        $sql .= " AND a.entity IN (" . getEntity('agenda') . ")";
+        $sql .= " AND a.entity IN (".getEntity('agenda').")";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
-            $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
+            $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
         if ($user->societe_id)
-            $sql .= " AND a.fk_soc = " . $user->societe_id;
+            $sql .= " AND a.fk_soc = ".$user->societe_id;
         if (!$user->rights->agenda->allactions->read)
-            $sql .= " AND (a.fk_user_author = " . $user->id . " OR a.fk_user_action = " . $user->id . " OR a.fk_user_done = " . $user->id . ")";
+            $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -1049,7 +1049,7 @@ 
                 $response->warning_delay = $conf->agenda->warning_delay / 60 / 60 / 24;
                 $response->label = $langs->trans("ActionsToDo");
                 // $response->url = DOL_URL_ROOT.'/comm/action/list.php?actioncode=0&amp;status=todo&amp;mainmenu=agenda';
-                $response->url = BASE_URI . '?controller=comm/action&method=list&actioncode=0&amp;status=todo&amp;mainmenu=agenda';
+                $response->url = BASE_URI.'?controller=comm/action&method=list&actioncode=0&amp;status=todo&amp;mainmenu=agenda';
                 if ($user->rights->agenda->allactions->read) {
                     $response->url .= '&filtert=-1';
                 }
@@ -1093,10 +1093,10 @@ 
         $sql .= ' tms as datem,';
         $sql .= ' fk_user_author,';
         $sql .= ' fk_user_mod';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm as a';
-        $sql .= ' WHERE a.id = ' . $id;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
+        $sql .= ' WHERE a.id = '.$id;
 
-        dol_syslog(get_class($this) . "::info", LOG_DEBUG);
+        dol_syslog(get_class($this)."::info", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
             if ($this->db->num_rows($result)) {
@@ -1155,11 +1155,11 @@ 
             if ($percent == -1 && !$hidenastatus)
                 return $langs->trans('StatusNotApplicable');
             elseif ($percent == 0)
-                return $langs->trans('StatusActionToDo') . ' (0%)';
+                return $langs->trans('StatusActionToDo').' (0%)';
             elseif ($percent > 0 && $percent < 100)
-                return $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)';
+                return $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
             elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone') . ' (100%)';
+                return $langs->trans('StatusActionDone').' (100%)';
         }
         elseif ($mode == 1) {
             if ($percent == -1 && !$hidenastatus)
@@ -1167,67 +1167,67 @@ 
             elseif ($percent == 0)
                 return $langs->trans('StatusActionToDo');
             elseif ($percent > 0 && $percent < 100)
-                return $percent . '%';
+                return $percent.'%';
             elseif ($percent >= 100)
                 return $langs->trans('StatusActionDone');
         }
         elseif ($mode == 2) {
             if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans('StatusNotApplicable'), 'statut9') . ' ' . $langs->trans('StatusNotApplicable');
+                return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
             elseif ($percent == 0)
-                return img_picto($langs->trans('StatusActionToDo'), 'statut1') . ' ' . $langs->trans('StatusActionToDo');
+                return img_picto($langs->trans('StatusActionToDo'), 'statut1').' '.$langs->trans('StatusActionToDo');
             elseif ($percent > 0 && $percent < 100)
-                return img_picto($langs->trans('StatusActionInProcess'), 'statut3') . ' ' . $percent . '%';
+                return img_picto($langs->trans('StatusActionInProcess'), 'statut3').' '.$percent.'%';
             elseif ($percent >= 100)
-                return img_picto($langs->trans('StatusActionDone'), 'statut6') . ' ' . $langs->trans('StatusActionDone');
+                return img_picto($langs->trans('StatusActionDone'), 'statut6').' '.$langs->trans('StatusActionDone');
         }
         elseif ($mode == 3) {
             if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusNotApplicable'), 'statut9');
+                return img_picto($langs->trans("Status").': '.$langs->trans('StatusNotApplicable'), 'statut9');
             elseif ($percent == 0)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionToDo') . ' (0%)', 'statut1');
+                return img_picto($langs->trans("Status").': '.$langs->trans('StatusActionToDo').' (0%)', 'statut1');
             elseif ($percent > 0 && $percent < 100)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)', 'statut3');
+                return img_picto($langs->trans("Status").': '.$langs->trans('StatusActionInProcess').' ('.$percent.'%)', 'statut3');
             elseif ($percent >= 100)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionDone') . ' (100%)', 'statut6');
+                return img_picto($langs->trans("Status").': '.$langs->trans('StatusActionDone').' (100%)', 'statut6');
         }
         elseif ($mode == 4) {
             if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans('StatusNotApplicable'), 'statut9') . ' ' . $langs->trans('StatusNotApplicable');
+                return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
             elseif ($percent == 0)
-                return img_picto($langs->trans('StatusActionToDo'), 'statut1') . ' ' . $langs->trans('StatusActionToDo') . ' (0%)';
+                return img_picto($langs->trans('StatusActionToDo'), 'statut1').' '.$langs->trans('StatusActionToDo').' (0%)';
             elseif ($percent > 0 && $percent < 100)
-                return img_picto($langs->trans('StatusActionInProcess'), 'statut3') . ' ' . $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)';
+                return img_picto($langs->trans('StatusActionInProcess'), 'statut3').' '.$langs->trans('StatusActionInProcess').' ('.$percent.'%)';
             elseif ($percent >= 100)
-                return img_picto($langs->trans('StatusActionDone'), 'statut6') . ' ' . $langs->trans('StatusActionDone') . ' (100%)';
+                return img_picto($langs->trans('StatusActionDone'), 'statut6').' '.$langs->trans('StatusActionDone').' (100%)';
         }
         elseif ($mode == 5) {
             if ($percent == -1 && !$hidenastatus)
                 return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
             elseif ($percent == 0)
-                return '0% ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
+                return '0% '.img_picto($langs->trans('StatusActionToDo'), 'statut1');
             elseif ($percent > 0 && $percent < 100)
-                return $percent . '% ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
+                return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%', 'statut3');
             elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone') . ' ' . img_picto($langs->trans('StatusActionDone'), 'statut6');
+                return $langs->trans('StatusActionDone').' '.img_picto($langs->trans('StatusActionDone'), 'statut6');
         }
         elseif ($mode == 6) {
             if ($percent == -1 && !$hidenastatus)
-                return $langs->trans('StatusNotApplicable') . ' ' . img_picto($langs->trans('StatusNotApplicable'), 'statut9');
+                return $langs->trans('StatusNotApplicable').' '.img_picto($langs->trans('StatusNotApplicable'), 'statut9');
             elseif ($percent == 0)
-                return $langs->trans('StatusActionToDo') . ' (0%) ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
+                return $langs->trans('StatusActionToDo').' (0%) '.img_picto($langs->trans('StatusActionToDo'), 'statut1');
             elseif ($percent > 0 && $percent < 100)
-                return $langs->trans('StatusActionInProcess') . ' (' . $percent . '%) ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
+                return $langs->trans('StatusActionInProcess').' ('.$percent.'%) '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%', 'statut3');
             elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone') . ' (100%) ' . img_picto($langs->trans('StatusActionDone'), 'statut6');
+                return $langs->trans('StatusActionDone').' (100%) '.img_picto($langs->trans('StatusActionDone'), 'statut6');
         }
         elseif ($mode == 7) {
             if ($percent == -1 && !$hidenastatus)
                 return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
             elseif ($percent == 0)
-                return '0% ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
+                return '0% '.img_picto($langs->trans('StatusActionToDo'), 'statut1');
             elseif ($percent > 0 && $percent < 100)
-                return $percent . '% ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
+                return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%', 'statut3');
             elseif ($percent >= 100)
                 return img_picto($langs->trans('StatusActionDone'), 'statut6');
         }
@@ -1253,49 +1253,49 @@ 
         global $conf, $langs, $user, $hookmanager, $action;
 
         if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+            $notooltip = 1; // Force disable tooltips
 
         if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id))
             $option = 'nolink';
 
         $label = $this->label;
         if (empty($label))
-            $label = $this->libelle;   // For backward compatibility
+            $label = $this->libelle; // For backward compatibility
 
         $result = '';
 
         // Set label of type
         $labeltype = '';
         if ($this->type_code) {
-            $labeltype = ($langs->transnoentities("Action" . $this->type_code) != "Action" . $this->type_code) ? $langs->transnoentities("Action" . $this->type_code) : $this->type_label;
+            $labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code) ? $langs->transnoentities("Action".$this->type_code) : $this->type_label;
         }
         if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
             if ($this->type_code != 'AC_OTH_AUTO')
                 $labeltype = $langs->trans('ActionAC_MANUAL');
         }
 
-        $tooltip = '<u>' . $langs->trans('ShowAction') . '</u>';
+        $tooltip = '<u>'.$langs->trans('ShowAction').'</u>';
         if (!empty($this->ref))
-            $tooltip .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+            $tooltip .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
         if (!empty($label))
-            $tooltip .= '<br><b>' . $langs->trans('Title') . ':</b> ' . $label;
+            $tooltip .= '<br><b>'.$langs->trans('Title').':</b> '.$label;
         if (!empty($labeltype))
-            $tooltip .= '<br><b>' . $langs->trans('Type') . ':</b> ' . $labeltype;
+            $tooltip .= '<br><b>'.$langs->trans('Type').':</b> '.$labeltype;
         if (!empty($this->location))
-            $tooltip .= '<br><b>' . $langs->trans('Location') . ':</b> ' . $this->location;
+            $tooltip .= '<br><b>'.$langs->trans('Location').':</b> '.$this->location;
         if (!empty($this->note))
-            $tooltip .= '<br><b>' . $langs->trans('Note') . ':</b> ' . $this->note;
+            $tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.$this->note;
         $linkclose = '';
         if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
-            $linkclose = ' style="background-color:#' . $this->type_color . '"';
+            $linkclose = ' style="background-color:#'.$this->type_color.'"';
 
         if (empty($notooltip)) {
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
                 $label = $langs->trans("ShowAction");
-                $linkclose .= ' alt="' . dol_escape_htmltag($tooltip, 1) . '"';
+                $linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
             }
-            $linkclose .= ' title="' . dol_escape_htmltag($tooltip, 1) . '"';
-            $linkclose .= ' class="' . $classname . ' classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($tooltip, 1).'"';
+            $linkclose .= ' class="'.$classname.' classfortooltip"';
 
             /*
               $hookmanager->initHooks(array('actiondao'));
@@ -1304,13 +1304,13 @@ 
               $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
              */
         } else
-            $linkclose .= ' class="' . $classname . '"';
+            $linkclose .= ' class="'.$classname.'"';
 
         $url = '';
         if ($option == 'birthday')
-            $url = DOL_URL_ROOT . '/contact/perso.php?id=' . $this->id;
+            $url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
         else
-            $url = DOL_URL_ROOT . '/comm/action/card.php?id=' . $this->id;
+            $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
         if ($option !== 'nolink') {
             // Add param to save lastsearch_values or not
             $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
@@ -1320,8 +1320,8 @@ 
                 $url .= '&save_lastsearch_values=1';
         }
 
-        $linkstart = '<a href="' . $url . '"';
-        $linkstart .= $linkclose . '>';
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart .= $linkclose.'>';
         $linkend = '</a>';
 
         if ($option == 'nolink') {
@@ -1337,7 +1337,7 @@ 
             $libelleshort = '';
         }
         else {
-            $libelle = (empty($this->libelle) ? $label : $this->libelle . (($label && $label != $this->libelle) ? ' ' . $label : ''));
+            $libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle))
                 $libelle = $labeltype;
             if ($maxlength < 0)
@@ -1349,21 +1349,21 @@ 
         if ($withpicto) {
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) { // Add code into ()
                 if ($labeltype) {
-                    $libelle .= (preg_match('/' . preg_quote($labeltype, '/') . '/', $libelle) ? '' : ' (' . $langs->transnoentities("Action" . $this->type_code) . ')');
+                    $libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
                 }
             }
         }
 
         $result .= $linkstart;
         if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $langs->trans("ShowAction") . ': ' . $libelle), ($overwritepicto ? $overwritepicto : 'action'), ($notooltip ? 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'valigntextbottom"' : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+            $result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), ($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'valigntextbottom"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
         $result .= $libelleshort;
         $result .= $linkend;
 
         global $action;
         $hookmanager->initHooks(array('actiondao'));
         $parameters = array('id' => $this->id, 'getnomurl' => $result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
         if ($reshook > 0)
             $result = $hookmanager->resPrint;
         else
@@ -1388,11 +1388,11 @@ 
         // phpcs:enable
         global $conf, $langs, $dolibarr_main_url_root, $mysoc;
 
-        require_once DOL_DOCUMENT_ROOT . "/core/lib/xcal.lib.php";
-        require_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php";
-        require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
+        require_once DOL_DOCUMENT_ROOT."/core/lib/xcal.lib.php";
+        require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+        require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
-        dol_syslog(get_class($this) . "::build_exportfile Build export file format=" . $format . ", type=" . $type . ", cachedelay=" . $cachedelay . ", filename=" . $filename . ", filters size=" . count($filters), LOG_DEBUG);
+        dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
         // Check parameters
         if (empty($format))
@@ -1403,12 +1403,12 @@ 
             $extension = 'vcs';
             if ($format == 'ical')
                 $extension = 'ics';
-            $filename = $format . '.' . $extension;
+            $filename = $format.'.'.$extension;
         }
 
         // Create dir and define output file (definitive and temporary)
         $result = dol_mkdir($conf->agenda->dir_temp);
-        $outputfile = $conf->agenda->dir_temp . '/' . $filename;
+        $outputfile = $conf->agenda->dir_temp.'/'.$filename;
 
         $result = 0;
 
@@ -1422,9 +1422,9 @@ 
 
         if ($cachedelay) {
             $nowgmt = dol_now();
-            include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
             if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) {
-                dol_syslog(get_class($this) . "::build_exportfile file " . $outputfile . " is not older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . "). Build is canceled");
+                dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
                 $buildfile = false;
             }
         }
@@ -1434,9 +1434,9 @@ 
             $eventarray = array();
 
             $sql = "SELECT a.id,";
-            $sql .= " a.datep,";  // Start
+            $sql .= " a.datep,"; // Start
             $sql .= " a.datep2,"; // End
-            $sql .= " a.durationp,";   // deprecated
+            $sql .= " a.durationp,"; // deprecated
             $sql .= " a.datec, a.tms as datem,";
             $sql .= " a.label, a.code, a.note, a.fk_action as type_id,";
             $sql .= " a.fk_soc,";
@@ -1448,31 +1448,31 @@ 
             $sql .= " u.firstname, u.lastname,";
             $sql .= " s.nom as socname,";
             $sql .= " c.id as type_id, c.code as type_code, c.libelle";
-            $sql .= " FROM (" . MAIN_DB_PREFIX . "c_actioncomm as c, " . MAIN_DB_PREFIX . "actioncomm as a)";
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_author"; // Link to get author of event for export
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on s.rowid = a.fk_soc";
+            $sql .= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author"; // Link to get author of event for export
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
             // We must filter on assignement table
             if ($filters['logint'])
-                $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
+                $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
             $sql .= " WHERE a.fk_action=c.id";
-            $sql .= " AND a.entity IN (" . getEntity('agenda') . ")";
+            $sql .= " AND a.entity IN (".getEntity('agenda').")";
             foreach ($filters as $key => $value) {
                 if ($key == 'notolderthan' && $value != '')
-                    $sql .= " AND a.datep >= '" . $this->db->idate($now - ($value * 24 * 60 * 60)) . "'";
+                    $sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
                 if ($key == 'year')
-                    $sql .= " AND a.datep BETWEEN '" . $this->db->idate(dol_get_first_day($value, 1)) . "' AND '" . $this->db->idate(dol_get_last_day($value, 12)) . "'";
+                    $sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
                 if ($key == 'id')
-                    $sql .= " AND a.id=" . (is_numeric($value) ? $value : 0);
+                    $sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
                 if ($key == 'idfrom')
-                    $sql .= " AND a.id >= " . (is_numeric($value) ? $value : 0);
+                    $sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
                 if ($key == 'idto')
-                    $sql .= " AND a.id <= " . (is_numeric($value) ? $value : 0);
+                    $sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
                 if ($key == 'project')
-                    $sql .= " AND a.fk_project=" . (is_numeric($value) ? $value : 0);
+                    $sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
                 if ($key == 'actiontype')
-                    $sql .= " AND c.type = '" . $this->db->escape($value) . "'";
+                    $sql .= " AND c.type = '".$this->db->escape($value)."'";
                 if ($key == 'notactiontype')
-                    $sql .= " AND c.type <> '" . $this->db->escape($value) . "'";
+                    $sql .= " AND c.type <> '".$this->db->escape($value)."'";
                 // We must filter on assignement table
                 if ($key == 'logint')
                     $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
@@ -1486,7 +1486,7 @@ 
                     $userforfilter = new User($this->db);
                     $result = $userforfilter->fetch('', $logina);
                     if ($result > 0)
-                        $sql .= " AND a.fk_user_author " . $condition . " " . $userforfilter->id;
+                        $sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
                     elseif ($result < 0 || $condition == '=')
                         $sql .= " AND a.fk_user_author = 0";
                 }
@@ -1500,16 +1500,16 @@ 
                     $userforfilter = new User($this->db);
                     $result = $userforfilter->fetch('', $logint);
                     if ($result > 0)
-                        $sql .= " AND ar.fk_element = " . $userforfilter->id;
+                        $sql .= " AND ar.fk_element = ".$userforfilter->id;
                     elseif ($result < 0 || $condition == '=')
                         $sql .= " AND ar.fk_element = 0";
                 }
             }
-            $sql .= " AND a.datep IS NOT NULL";  // To exclude corrupted events and avoid errors in lightning/sunbird import
+            $sql .= " AND a.datep IS NOT NULL"; // To exclude corrupted events and avoid errors in lightning/sunbird import
             $sql .= " ORDER by datep";
             //print $sql;exit;
 
-            dol_syslog(get_class($this) . "::build_exportfile select events", LOG_DEBUG);
+            dol_syslog(get_class($this)."::build_exportfile select events", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
                 // Note: Output of sql request is encoded in $conf->file->character_set_client
@@ -1520,28 +1520,28 @@ 
 
                     // 'eid','startdate','duration','enddate','title','summary','category','email','url','desc','author'
                     $event = array();
-                    $event['uid'] = 'dolibarragenda-' . $this->db->database_name . '-' . $obj->id . "@" . $_SERVER["SERVER_NAME"];
+                    $event['uid'] = 'dolibarragenda-'.$this->db->database_name.'-'.$obj->id."@".$_SERVER["SERVER_NAME"];
                     $event['type'] = $type;
                     $datestart = $this->db->jdate($obj->datep) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
                     $dateend = $this->db->jdate($obj->datep2) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
                     $duration = ($datestart && $dateend) ? ($dateend - $datestart) : 0;
-                    $event['summary'] = $obj->label . ($obj->socname ? " (" . $obj->socname . ")" : "");
+                    $event['summary'] = $obj->label.($obj->socname ? " (".$obj->socname.")" : "");
                     $event['desc'] = $obj->note;
                     $event['startdate'] = $datestart;
-                    $event['enddate'] = $dateend;  // Not required with type 'journal'
+                    $event['enddate'] = $dateend; // Not required with type 'journal'
                     $event['duration'] = $duration; // Not required with type 'journal'
                     $event['author'] = dolGetFirstLastname($obj->firstname, $obj->lastname);
                     $event['priority'] = $obj->priority;
                     $event['fulldayevent'] = $obj->fulldayevent;
                     $event['location'] = $obj->location;
-                    $event['transparency'] = (($obj->transparency > 0) ? 'OPAQUE' : 'TRANSPARENT');  // OPAQUE (busy) or TRANSPARENT (not busy)
+                    $event['transparency'] = (($obj->transparency > 0) ? 'OPAQUE' : 'TRANSPARENT'); // OPAQUE (busy) or TRANSPARENT (not busy)
                     $event['punctual'] = $obj->punctual;
                     $event['category'] = $obj->libelle; // libelle type action
                     // Define $urlwithroot
-                    $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));
-                    $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;   // This is to use external domain name found into config file
+                    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+                    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
                     //$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-                    $url = $urlwithroot . '/comm/action/card.php?id=' . $obj->id;
+                    $url = $urlwithroot.'/comm/action/card.php?id='.$obj->id;
                     $event['url'] = $url;
                     $event['created'] = $this->db->jdate($obj->datec) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
                     $event['modified'] = $this->db->jdate($obj->datem) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
@@ -1561,25 +1561,25 @@ 
             // Define title and desc
             $more = '';
             if ($login)
-                $more = $langs->transnoentities("User") . ' ' . $login;
+                $more = $langs->transnoentities("User").' '.$login;
             if ($logina)
-                $more = $langs->transnoentities("ActionsAskedBy") . ' ' . $logina;
+                $more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
             if ($logint)
-                $more = $langs->transnoentities("ActionsToDoBy") . ' ' . $logint;
+                $more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
             if ($logind)
-                $more = $langs->transnoentities("ActionsDoneBy") . ' ' . $logind;
+                $more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
             if ($more) {
-                $title = 'Dolibarr actions ' . $mysoc->name . ' - ' . $more;
+                $title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
                 $desc = $more;
-                $desc .= ' (' . $mysoc->name . ' - built by Dolibarr)';
+                $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
             } else {
-                $title = 'Dolibarr actions ' . $mysoc->name;
+                $title = 'Dolibarr actions '.$mysoc->name;
                 $desc = $langs->transnoentities('ListOfActions');
-                $desc .= ' (' . $mysoc->name . ' - built by Dolibarr)';
+                $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
             }
 
             // Create temp file
-            $outputfiletmp = tempnam($conf->agenda->dir_temp, 'tmp');  // Temporary file (allow call of function by different threads
+            $outputfiletmp = tempnam($conf->agenda->dir_temp, 'tmp'); // Temporary file (allow call of function by different threads
             @chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
             // Write file
@@ -1594,13 +1594,13 @@ 
                 if (dol_move($outputfiletmp, $outputfile, 0, 1))
                     $result = 1;
                 else {
-                    $this->error = 'Failed to rename ' . $outputfiletmp . ' into ' . $outputfile;
-                    dol_syslog(get_class($this) . "::build_exportfile " . $this->error, LOG_ERR);
+                    $this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
+                    dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
                     dol_delete_file($outputfiletmp, 0, 1);
                     $result = -1;
                 }
             } else {
-                dol_syslog(get_class($this) . "::build_exportfile build_xxxfile function fails to for format=" . $format . " outputfiletmp=" . $outputfile, LOG_ERR);
+                dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
                 dol_delete_file($outputfiletmp, 0, 1);
                 $langs->load("errors");
                 $this->error = $langs->trans("ErrorFailToCreateFile", $outputfile);
@@ -1713,7 +1713,7 @@ 
 
         // TODO Scan events of type 'email' into table llx_actioncomm_reminder with status todo, send email, then set status to done
         // Delete also very old past events (we do not keep more than 1 month record in past)
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "actioncomm_reminder WHERE dateremind < '" . $this->db->jdate($now - (3600 * 24 * 32)) . "'";
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE dateremind < '".$this->db->jdate($now - (3600 * 24 * 32))."'";
         $this->db->query($sql);
 
         $this->db->commit();

Braces +385 added lines, -291 removed lines

@@ -233,35 +233,48 @@ 
         $this->label = dol_trunc(trim($this->label), 128);
         $this->location = dol_trunc(trim($this->location), 128);
         $this->note = dol_htmlcleanlastbr(trim($this->note));
-        if (empty($this->percentage))
-            $this->percentage = 0;
-        if (empty($this->priority) || !is_numeric($this->priority))
-            $this->priority = 0;
-        if (empty($this->fulldayevent))
-            $this->fulldayevent = 0;
-        if (empty($this->punctual))
-            $this->punctual = 0;
-        if (empty($this->transparency))
-            $this->transparency = 0;
-        if ($this->percentage > 100)
-            $this->percentage = 100;
+        if (empty($this->percentage)) {
+                    $this->percentage = 0;
+        }
+        if (empty($this->priority) || !is_numeric($this->priority)) {
+                    $this->priority = 0;
+        }
+        if (empty($this->fulldayevent)) {
+                    $this->fulldayevent = 0;
+        }
+        if (empty($this->punctual)) {
+                    $this->punctual = 0;
+        }
+        if (empty($this->transparency)) {
+                    $this->transparency = 0;
+        }
+        if ($this->percentage > 100) {
+                    $this->percentage = 100;
+        }
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if (!empty($this->datep) && !empty($this->datef))
-            $this->durationp = ($this->datef - $this->datep);  // deprecated
+        if (!empty($this->datep) && !empty($this->datef)) {
+                    $this->durationp = ($this->datef - $this->datep);
+        }
+        // deprecated
 
             
 //if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
-        if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef)
-            $this->datef = $this->datep;
+        if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) {
+                    $this->datef = $this->datep;
+        }
         //if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
-        if (!isset($this->fk_project) || $this->fk_project < 0)
-            $this->fk_project = 0;
-        if ($this->elementtype == 'facture')
-            $this->elementtype = 'invoice';
-        if ($this->elementtype == 'commande')
-            $this->elementtype = 'order';
-        if ($this->elementtype == 'contrat')
-            $this->elementtype = 'contract';
+        if (!isset($this->fk_project) || $this->fk_project < 0) {
+                    $this->fk_project = 0;
+        }
+        if ($this->elementtype == 'facture') {
+                    $this->elementtype = 'invoice';
+        }
+        if ($this->elementtype == 'commande') {
+                    $this->elementtype = 'order';
+        }
+        if ($this->elementtype == 'contrat') {
+                    $this->elementtype = 'contract';
+        }
 
         if (!is_array($this->userassigned) && !empty($this->userassigned)) { // For backward compatibility when userassigned was an int instead fo array
             $tmpid = $this->userassigned;
@@ -269,16 +282,19 @@ 
             $this->userassigned[$tmpid] = array('id' => $tmpid, 'transparency' => $this->transparency);
         }
 
-        if (is_object($this->contact) && isset($this->contact->id) && $this->contact->id > 0 && !($this->contactid > 0))
-            $this->contactid = $this->contact->id;  // For backward compatibility. Using this->contact->xx is deprecated
+        if (is_object($this->contact) && isset($this->contact->id) && $this->contact->id > 0 && !($this->contactid > 0)) {
+                    $this->contactid = $this->contact->id;
+        }
+        // For backward compatibility. Using this->contact->xx is deprecated
 
 
         $userownerid = $this->userownerid;
         $userdoneid = $this->userdoneid;
 
         // Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
-        if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned))
-            $this->userassigned = array($userownerid => array('id' => $userownerid, 'transparency' => $this->transparency));
+        if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned)) {
+                    $this->userassigned = array($userownerid => array('id' => $userownerid, 'transparency' => $this->transparency));
+        }
 
         if (!$this->type_id || !$this->type_code) {
             $key = empty($this->type_id) ? $this->type_code : $this->type_id;
@@ -498,8 +514,9 @@ 
 
         // Create clone
         $result = $this->create($fuser);
-        if ($result < 0)
-            $error++;
+        if ($result < 0) {
+                    $error++;
+        }
 
         if (!$error) {
             // Hook of thirdparty module
@@ -507,8 +524,9 @@ 
                 $parameters = array('objFrom' => $objFrom);
                 $action = '';
                 $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
             }
 
             // Call trigger
@@ -567,12 +585,15 @@ 
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_author";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on s.rowid = a.fk_soc";
         $sql .= " WHERE ";
-        if ($ref)
-            $sql .= " a.id=" . $ref;           // No field ref, we use id
-        elseif ($ref_ext)
-            $sql .= " a.ref_ext='" . $this->db->escape($ref_ext) . "'";
-        else
-            $sql .= " a.id=" . $id;
+        if ($ref) {
+                    $sql .= " a.id=" . $ref;
+        }
+        // No field ref, we use id
+        elseif ($ref_ext) {
+                    $sql .= " a.ref_ext='" . $this->db->escape($ref_ext) . "'";
+        } else {
+                    $sql .= " a.id=" . $id;
+        }
 
         dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -610,13 +631,17 @@ 
                 $this->authorid = $obj->fk_user_author;
                 $this->usermodid = $obj->fk_user_mod;
 
-                if (!is_object($this->author))
-                    $this->author = new stdClass(); // To avoid warning
+                if (!is_object($this->author)) {
+                                    $this->author = new stdClass();
+                }
+                // To avoid warning
                 $this->author->id = $obj->fk_user_author;  // deprecated
                 $this->author->firstname = $obj->firstname;   // deprecated
                 $this->author->lastname = $obj->lastname;   // deprecated
-                if (!is_object($this->usermod))
-                    $this->usermod = new stdClass(); // To avoid warning
+                if (!is_object($this->usermod)) {
+                                    $this->usermod = new stdClass();
+                }
+                // To avoid warning
                 $this->usermod->id = $obj->fk_user_mod;  // deprecated
 
                 $this->userownerid = $obj->fk_user_action;
@@ -641,8 +666,7 @@ 
                 $this->fetchResources();
             }
             $this->db->free($resql);
-        }
-        else {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -667,16 +691,20 @@ 
             $this->socpeopleassigned = array();
 
             // If owner is known, we must but id first into list
-            if ($this->userownerid > 0)
-                $this->userassigned[$this->userownerid] = array('id' => $this->userownerid); // Set first so will be first into list.
+            if ($this->userownerid > 0) {
+                            $this->userassigned[$this->userownerid] = array('id' => $this->userownerid);
+            }
+            // Set first so will be first into list.
 
             while ($obj = $this->db->fetch_object($resql)) {
                 if ($obj->fk_element > 0) {
                     switch ($obj->element_type) {
                         case 'user':
                             $this->userassigned[$obj->fk_element] = array('id' => $obj->fk_element, 'mandatory' => $obj->mandatory, 'answer_status' => $obj->answer_status, 'transparency' => $obj->transparency);
-                            if (empty($this->userownerid))
-                                $this->userownerid = $obj->fk_element; // If not defined (should not happened, we fix this)
+                            if (empty($this->userownerid)) {
+                                                            $this->userownerid = $obj->fk_element;
+                            }
+                            // If not defined (should not happened, we fix this)
                             break;
                         case 'socpeople':
                             $this->socpeopleassigned[$obj->fk_element] = array('id' => $obj->fk_element, 'mandatory' => $obj->mandatory, 'answer_status' => $obj->answer_status, 'transparency' => $obj->transparency);
@@ -686,8 +714,7 @@ 
             }
 
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -710,19 +737,23 @@ 
             $this->userassigned = array();
 
             // If owner is known, we must but id first into list
-            if ($this->userownerid > 0)
-                $this->userassigned[$this->userownerid] = array('id' => $this->userownerid); // Set first so will be first into list.
+            if ($this->userownerid > 0) {
+                            $this->userassigned[$this->userownerid] = array('id' => $this->userownerid);
+            }
+            // Set first so will be first into list.
 
             while ($obj = $this->db->fetch_object($resql2)) {
-                if ($obj->fk_element > 0)
-                    $this->userassigned[$obj->fk_element] = array('id' => $obj->fk_element, 'mandatory' => $obj->mandatory, 'answer_status' => $obj->answer_status, 'transparency' => $obj->transparency);
-                if (empty($this->userownerid))
-                    $this->userownerid = $obj->fk_element; // If not defined (should not happened, we fix this)
+                if ($obj->fk_element > 0) {
+                                    $this->userassigned[$obj->fk_element] = array('id' => $obj->fk_element, 'mandatory' => $obj->mandatory, 'answer_status' => $obj->answer_status, 'transparency' => $obj->transparency);
+                }
+                if (empty($this->userownerid)) {
+                                    $this->userownerid = $obj->fk_element;
+                }
+                // If not defined (should not happened, we fix this)
             }
 
             return 1;
-        }
-        else {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -814,27 +845,36 @@ 
         // Clean parameters
         $this->label = trim($this->label);
         $this->note = trim($this->note);
-        if (empty($this->percentage))
-            $this->percentage = 0;
-        if (empty($this->priority) || !is_numeric($this->priority))
-            $this->priority = 0;
-        if (empty($this->transparency))
-            $this->transparency = 0;
-        if (empty($this->fulldayevent))
-            $this->fulldayevent = 0;
-        if ($this->percentage > 100)
-            $this->percentage = 100;
+        if (empty($this->percentage)) {
+                    $this->percentage = 0;
+        }
+        if (empty($this->priority) || !is_numeric($this->priority)) {
+                    $this->priority = 0;
+        }
+        if (empty($this->transparency)) {
+                    $this->transparency = 0;
+        }
+        if (empty($this->fulldayevent)) {
+                    $this->fulldayevent = 0;
+        }
+        if ($this->percentage > 100) {
+                    $this->percentage = 100;
+        }
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if ($this->datep && $this->datef)
-            $this->durationp = ($this->datef - $this->datep);  // deprecated
+        if ($this->datep && $this->datef) {
+                    $this->durationp = ($this->datef - $this->datep);
+        }
+        // deprecated
 
             
 //if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
-        if ($this->datep && $this->datef && $this->datep > $this->datef)
-            $this->datef = $this->datep;
+        if ($this->datep && $this->datef && $this->datep > $this->datef) {
+                    $this->datef = $this->datep;
+        }
         //if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
-        if ($this->fk_project < 0)
-            $this->fk_project = 0;
+        if ($this->fk_project < 0) {
+                    $this->fk_project = 0;
+        }
 
         // Check parameters
         if ($this->percentage == 0 && $this->userdoneid > 0) {
@@ -851,8 +891,9 @@ 
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "actioncomm ";
         $sql .= " SET percent = '" . $this->db->escape($this->percentage) . "'";
-        if ($this->type_id > 0)
-            $sql .= ", fk_action = '" . $this->db->escape($this->type_id) . "'";
+        if ($this->type_id > 0) {
+                    $sql .= ", fk_action = '" . $this->db->escape($this->type_id) . "'";
+        }
         $sql .= ", label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
         $sql .= ", datep = " . (strval($this->datep) != '' ? "'" . $this->db->idate($this->datep) . "'" : 'null');
         $sql .= ", datep2 = " . (strval($this->datef) != '' ? "'" . $this->db->idate($this->datef) . "'" : 'null');
@@ -868,10 +909,12 @@ 
         $sql .= ", fk_user_mod = " . $user->id;
         $sql .= ", fk_user_action=" . ($userownerid > 0 ? "'" . $userownerid . "'" : "null");
         $sql .= ", fk_user_done=" . ($userdoneid > 0 ? "'" . $userdoneid . "'" : "null");
-        if (!empty($this->fk_element))
-            $sql .= ", fk_element=" . ($this->fk_element ? $this->db->escape($this->fk_element) : "null");
-        if (!empty($this->elementtype))
-            $sql .= ", elementtype=" . ($this->elementtype ? "'" . $this->db->escape($this->elementtype) . "'" : "null");
+        if (!empty($this->fk_element)) {
+                    $sql .= ", fk_element=" . ($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+        }
+        if (!empty($this->elementtype)) {
+                    $sql .= ", elementtype=" . ($this->elementtype ? "'" . $this->db->escape($this->elementtype) . "'" : "null");
+        }
         $sql .= " WHERE id=" . $this->id;
 
         dol_syslog(get_class($this) . "::update", LOG_DEBUG);
@@ -972,18 +1015,22 @@ 
         $sql = "SELECT a.id";
         $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";
         $sql .= " WHERE a.entity IN (" . getEntity('agenda') . ")";
-        if (!empty($socid))
-            $sql .= " AND a.fk_soc = " . $socid;
+        if (!empty($socid)) {
+                    $sql .= " AND a.fk_soc = " . $socid;
+        }
         if (!empty($elementtype)) {
-            if ($elementtype == 'project')
-                $sql .= ' AND a.fk_project = ' . $fk_element;
-            else
-                $sql .= " AND a.fk_element = " . (int) $fk_element . " AND a.elementtype = '" . $elementtype . "'";
-        }
-        if (!empty($filter))
-            $sql .= $filter;
-        if ($sortorder && $sortfield)
-            $sql .= $db->order($sortfield, $sortorder);
+            if ($elementtype == 'project') {
+                            $sql .= ' AND a.fk_project = ' . $fk_element;
+            } else {
+                            $sql .= " AND a.fk_element = " . (int) $fk_element . " AND a.elementtype = '" . $elementtype . "'";
+            }
+        }
+        if (!empty($filter)) {
+                    $sql .= $filter;
+        }
+        if ($sortorder && $sortfield) {
+                    $sql .= $db->order($sortfield, $sortorder);
+        }
         $sql .= $db->plimit($limit, 0);
 
         dol_syslog(get_class() . "::getActions", LOG_DEBUG);
@@ -1019,27 +1066,32 @@ 
         // phpcs:enable
         global $conf, $langs;
 
-        if (empty($load_state_board))
-            $sql = "SELECT a.id, a.datep as dp";
-        else {
+        if (empty($load_state_board)) {
+                    $sql = "SELECT a.id, a.datep as dp";
+        } else {
             $this->nb = array();
             $sql = "SELECT count(a.id) as nb";
         }
         $sql .= " FROM (" . MAIN_DB_PREFIX . "actioncomm as a";
         $sql .= ")";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) {
+                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+        }
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON a.fk_soc = s.rowid";
         $sql .= " WHERE 1 = 1";
-        if (empty($load_state_board))
-            $sql .= " AND a.percent >= 0 AND a.percent < 100";
+        if (empty($load_state_board)) {
+                    $sql .= " AND a.percent >= 0 AND a.percent < 100";
+        }
         $sql .= " AND a.entity IN (" . getEntity('agenda') . ")";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-            $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
-        if ($user->societe_id)
-            $sql .= " AND a.fk_soc = " . $user->societe_id;
-        if (!$user->rights->agenda->allactions->read)
-            $sql .= " AND (a.fk_user_author = " . $user->id . " OR a.fk_user_action = " . $user->id . " OR a.fk_user_done = " . $user->id . ")";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) {
+                    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
+        }
+        if ($user->societe_id) {
+                    $sql .= " AND a.fk_soc = " . $user->societe_id;
+        }
+        if (!$user->rights->agenda->allactions->read) {
+                    $sql .= " AND (a.fk_user_author = " . $user->id . " OR a.fk_user_action = " . $user->id . " OR a.fk_user_done = " . $user->id . ")";
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -1060,19 +1112,21 @@ 
                 if (empty($load_state_board)) {
                     $response->nbtodo++;
                     $agenda_static->datep = $this->db->jdate($obj->dp);
-                    if ($agenda_static->hasDelay())
-                        $response->nbtodolate++;
-                } else
-                    $this->nb["actionscomm"] = $obj->nb;
+                    if ($agenda_static->hasDelay()) {
+                                            $response->nbtodolate++;
+                    }
+                } else {
+                                    $this->nb["actionscomm"] = $obj->nb;
+                }
             }
 
             $this->db->free($resql);
-            if (empty($load_state_board))
-                return $response;
-            else
-                return 1;
-        }
-        else {
+            if (empty($load_state_board)) {
+                            return $response;
+            } else {
+                            return 1;
+            }
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -1114,12 +1168,12 @@ 
                 }
 
                 $this->date_creation = $this->db->jdate($obj->datec);
-                if (!empty($obj->fk_user_mod))
-                    $this->date_modification = $this->db->jdate($obj->datem);
+                if (!empty($obj->fk_user_mod)) {
+                                    $this->date_modification = $this->db->jdate($obj->datem);
+                }
             }
             $this->db->free($result);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -1152,84 +1206,85 @@ 
         global $langs;
 
         if ($mode == 0) {
-            if ($percent == -1 && !$hidenastatus)
-                return $langs->trans('StatusNotApplicable');
-            elseif ($percent == 0)
-                return $langs->trans('StatusActionToDo') . ' (0%)';
-            elseif ($percent > 0 && $percent < 100)
-                return $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)';
-            elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone') . ' (100%)';
-        }
-        elseif ($mode == 1) {
-            if ($percent == -1 && !$hidenastatus)
-                return $langs->trans('StatusNotApplicable');
-            elseif ($percent == 0)
-                return $langs->trans('StatusActionToDo');
-            elseif ($percent > 0 && $percent < 100)
-                return $percent . '%';
-            elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone');
-        }
-        elseif ($mode == 2) {
-            if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans('StatusNotApplicable'), 'statut9') . ' ' . $langs->trans('StatusNotApplicable');
-            elseif ($percent == 0)
-                return img_picto($langs->trans('StatusActionToDo'), 'statut1') . ' ' . $langs->trans('StatusActionToDo');
-            elseif ($percent > 0 && $percent < 100)
-                return img_picto($langs->trans('StatusActionInProcess'), 'statut3') . ' ' . $percent . '%';
-            elseif ($percent >= 100)
-                return img_picto($langs->trans('StatusActionDone'), 'statut6') . ' ' . $langs->trans('StatusActionDone');
-        }
-        elseif ($mode == 3) {
-            if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusNotApplicable'), 'statut9');
-            elseif ($percent == 0)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionToDo') . ' (0%)', 'statut1');
-            elseif ($percent > 0 && $percent < 100)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)', 'statut3');
-            elseif ($percent >= 100)
-                return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionDone') . ' (100%)', 'statut6');
-        }
-        elseif ($mode == 4) {
-            if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans('StatusNotApplicable'), 'statut9') . ' ' . $langs->trans('StatusNotApplicable');
-            elseif ($percent == 0)
-                return img_picto($langs->trans('StatusActionToDo'), 'statut1') . ' ' . $langs->trans('StatusActionToDo') . ' (0%)';
-            elseif ($percent > 0 && $percent < 100)
-                return img_picto($langs->trans('StatusActionInProcess'), 'statut3') . ' ' . $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)';
-            elseif ($percent >= 100)
-                return img_picto($langs->trans('StatusActionDone'), 'statut6') . ' ' . $langs->trans('StatusActionDone') . ' (100%)';
-        }
-        elseif ($mode == 5) {
-            if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-            elseif ($percent == 0)
-                return '0% ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
-            elseif ($percent > 0 && $percent < 100)
-                return $percent . '% ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
-            elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone') . ' ' . img_picto($langs->trans('StatusActionDone'), 'statut6');
-        }
-        elseif ($mode == 6) {
-            if ($percent == -1 && !$hidenastatus)
-                return $langs->trans('StatusNotApplicable') . ' ' . img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-            elseif ($percent == 0)
-                return $langs->trans('StatusActionToDo') . ' (0%) ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
-            elseif ($percent > 0 && $percent < 100)
-                return $langs->trans('StatusActionInProcess') . ' (' . $percent . '%) ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
-            elseif ($percent >= 100)
-                return $langs->trans('StatusActionDone') . ' (100%) ' . img_picto($langs->trans('StatusActionDone'), 'statut6');
-        }
-        elseif ($mode == 7) {
-            if ($percent == -1 && !$hidenastatus)
-                return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-            elseif ($percent == 0)
-                return '0% ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
-            elseif ($percent > 0 && $percent < 100)
-                return $percent . '% ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
-            elseif ($percent >= 100)
-                return img_picto($langs->trans('StatusActionDone'), 'statut6');
+            if ($percent == -1 && !$hidenastatus) {
+                            return $langs->trans('StatusNotApplicable');
+            } elseif ($percent == 0) {
+                            return $langs->trans('StatusActionToDo') . ' (0%)';
+            } elseif ($percent > 0 && $percent < 100) {
+                            return $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)';
+            } elseif ($percent >= 100) {
+                            return $langs->trans('StatusActionDone') . ' (100%)';
+            }
+        } elseif ($mode == 1) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return $langs->trans('StatusNotApplicable');
+            } elseif ($percent == 0) {
+                            return $langs->trans('StatusActionToDo');
+            } elseif ($percent > 0 && $percent < 100) {
+                            return $percent . '%';
+            } elseif ($percent >= 100) {
+                            return $langs->trans('StatusActionDone');
+            }
+        } elseif ($mode == 2) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return img_picto($langs->trans('StatusNotApplicable'), 'statut9') . ' ' . $langs->trans('StatusNotApplicable');
+            } elseif ($percent == 0) {
+                            return img_picto($langs->trans('StatusActionToDo'), 'statut1') . ' ' . $langs->trans('StatusActionToDo');
+            } elseif ($percent > 0 && $percent < 100) {
+                            return img_picto($langs->trans('StatusActionInProcess'), 'statut3') . ' ' . $percent . '%';
+            } elseif ($percent >= 100) {
+                            return img_picto($langs->trans('StatusActionDone'), 'statut6') . ' ' . $langs->trans('StatusActionDone');
+            }
+        } elseif ($mode == 3) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusNotApplicable'), 'statut9');
+            } elseif ($percent == 0) {
+                            return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionToDo') . ' (0%)', 'statut1');
+            } elseif ($percent > 0 && $percent < 100) {
+                            return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)', 'statut3');
+            } elseif ($percent >= 100) {
+                            return img_picto($langs->trans("Status") . ': ' . $langs->trans('StatusActionDone') . ' (100%)', 'statut6');
+            }
+        } elseif ($mode == 4) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return img_picto($langs->trans('StatusNotApplicable'), 'statut9') . ' ' . $langs->trans('StatusNotApplicable');
+            } elseif ($percent == 0) {
+                            return img_picto($langs->trans('StatusActionToDo'), 'statut1') . ' ' . $langs->trans('StatusActionToDo') . ' (0%)';
+            } elseif ($percent > 0 && $percent < 100) {
+                            return img_picto($langs->trans('StatusActionInProcess'), 'statut3') . ' ' . $langs->trans('StatusActionInProcess') . ' (' . $percent . '%)';
+            } elseif ($percent >= 100) {
+                            return img_picto($langs->trans('StatusActionDone'), 'statut6') . ' ' . $langs->trans('StatusActionDone') . ' (100%)';
+            }
+        } elseif ($mode == 5) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
+            } elseif ($percent == 0) {
+                            return '0% ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
+            } elseif ($percent > 0 && $percent < 100) {
+                            return $percent . '% ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
+            } elseif ($percent >= 100) {
+                            return $langs->trans('StatusActionDone') . ' ' . img_picto($langs->trans('StatusActionDone'), 'statut6');
+            }
+        } elseif ($mode == 6) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return $langs->trans('StatusNotApplicable') . ' ' . img_picto($langs->trans('StatusNotApplicable'), 'statut9');
+            } elseif ($percent == 0) {
+                            return $langs->trans('StatusActionToDo') . ' (0%) ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
+            } elseif ($percent > 0 && $percent < 100) {
+                            return $langs->trans('StatusActionInProcess') . ' (' . $percent . '%) ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
+            } elseif ($percent >= 100) {
+                            return $langs->trans('StatusActionDone') . ' (100%) ' . img_picto($langs->trans('StatusActionDone'), 'statut6');
+            }
+        } elseif ($mode == 7) {
+            if ($percent == -1 && !$hidenastatus) {
+                            return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
+            } elseif ($percent == 0) {
+                            return '0% ' . img_picto($langs->trans('StatusActionToDo'), 'statut1');
+            } elseif ($percent > 0 && $percent < 100) {
+                            return $percent . '% ' . img_picto($langs->trans('StatusActionInProcess') . ' - ' . $percent . '%', 'statut3');
+            } elseif ($percent >= 100) {
+                            return img_picto($langs->trans('StatusActionDone'), 'statut6');
+            }
         }
 
         return '';
@@ -1252,15 +1307,20 @@ 
     {
         global $conf, $langs, $user, $hookmanager, $action;
 
-        if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) {
+                    $notooltip = 1;
+        }
+        // Force disable tooltips
 
-        if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id))
-            $option = 'nolink';
+        if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id)) {
+                    $option = 'nolink';
+        }
 
         $label = $this->label;
-        if (empty($label))
-            $label = $this->libelle;   // For backward compatibility
+        if (empty($label)) {
+                    $label = $this->libelle;
+        }
+        // For backward compatibility
 
         $result = '';
 
@@ -1270,24 +1330,31 @@ 
             $labeltype = ($langs->transnoentities("Action" . $this->type_code) != "Action" . $this->type_code) ? $langs->transnoentities("Action" . $this->type_code) : $this->type_label;
         }
         if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
-            if ($this->type_code != 'AC_OTH_AUTO')
-                $labeltype = $langs->trans('ActionAC_MANUAL');
+            if ($this->type_code != 'AC_OTH_AUTO') {
+                            $labeltype = $langs->trans('ActionAC_MANUAL');
+            }
         }
 
         $tooltip = '<u>' . $langs->trans('ShowAction') . '</u>';
-        if (!empty($this->ref))
-            $tooltip .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (!empty($label))
-            $tooltip .= '<br><b>' . $langs->trans('Title') . ':</b> ' . $label;
-        if (!empty($labeltype))
-            $tooltip .= '<br><b>' . $langs->trans('Type') . ':</b> ' . $labeltype;
-        if (!empty($this->location))
-            $tooltip .= '<br><b>' . $langs->trans('Location') . ':</b> ' . $this->location;
-        if (!empty($this->note))
-            $tooltip .= '<br><b>' . $langs->trans('Note') . ':</b> ' . $this->note;
+        if (!empty($this->ref)) {
+                    $tooltip .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        }
+        if (!empty($label)) {
+                    $tooltip .= '<br><b>' . $langs->trans('Title') . ':</b> ' . $label;
+        }
+        if (!empty($labeltype)) {
+                    $tooltip .= '<br><b>' . $langs->trans('Type') . ':</b> ' . $labeltype;
+        }
+        if (!empty($this->location)) {
+                    $tooltip .= '<br><b>' . $langs->trans('Location') . ':</b> ' . $this->location;
+        }
+        if (!empty($this->note)) {
+                    $tooltip .= '<br><b>' . $langs->trans('Note') . ':</b> ' . $this->note;
+        }
         $linkclose = '';
-        if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
-            $linkclose = ' style="background-color:#' . $this->type_color . '"';
+        if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color) {
+                    $linkclose = ' style="background-color:#' . $this->type_color . '"';
+        }
 
         if (empty($notooltip)) {
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -1303,21 +1370,25 @@ 
               $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
               $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
              */
-        } else
-            $linkclose .= ' class="' . $classname . '"';
+        } else {
+                    $linkclose .= ' class="' . $classname . '"';
+        }
 
         $url = '';
-        if ($option == 'birthday')
-            $url = DOL_URL_ROOT . '/contact/perso.php?id=' . $this->id;
-        else
-            $url = DOL_URL_ROOT . '/comm/action/card.php?id=' . $this->id;
+        if ($option == 'birthday') {
+                    $url = DOL_URL_ROOT . '/contact/perso.php?id=' . $this->id;
+        } else {
+                    $url = DOL_URL_ROOT . '/comm/action/card.php?id=' . $this->id;
+        }
         if ($option !== 'nolink') {
             // Add param to save lastsearch_values or not
             $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))
-                $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values)
-                $url .= '&save_lastsearch_values=1';
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+                            $add_save_lastsearch_values = 1;
+            }
+            if ($add_save_lastsearch_values) {
+                            $url .= '&save_lastsearch_values=1';
+            }
         }
 
         $linkstart = '<a href="' . $url . '"';
@@ -1332,18 +1403,20 @@ 
 
         if ($withpicto == 2) {
             $libelle = $label;
-            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-                $libelle = $labeltype;
+            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+                            $libelle = $labeltype;
+            }
             $libelleshort = '';
-        }
-        else {
+        } else {
             $libelle = (empty($this->libelle) ? $label : $this->libelle . (($label && $label != $this->libelle) ? ' ' . $label : ''));
-            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle))
-                $libelle = $labeltype;
-            if ($maxlength < 0)
-                $libelleshort = $this->ref;
-            else
-                $libelleshort = dol_trunc($libelle, $maxlength);
+            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) {
+                            $libelle = $labeltype;
+            }
+            if ($maxlength < 0) {
+                            $libelleshort = $this->ref;
+            } else {
+                            $libelleshort = dol_trunc($libelle, $maxlength);
+            }
         }
 
         if ($withpicto) {
@@ -1355,8 +1428,9 @@ 
         }
 
         $result .= $linkstart;
-        if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $langs->trans("ShowAction") . ': ' . $libelle), ($overwritepicto ? $overwritepicto : 'action'), ($notooltip ? 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'valigntextbottom"' : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+        if ($withpicto) {
+                    $result .= img_object(($notooltip ? '' : $langs->trans("ShowAction") . ': ' . $libelle), ($overwritepicto ? $overwritepicto : 'action'), ($notooltip ? 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'valigntextbottom"' : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+        }
         $result .= $libelleshort;
         $result .= $linkend;
 
@@ -1364,10 +1438,11 @@ 
         $hookmanager->initHooks(array('actiondao'));
         $parameters = array('id' => $this->id, 'getnomurl' => $result);
         $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0)
-            $result = $hookmanager->resPrint;
-        else
-            $result .= $hookmanager->resPrint;
+        if ($reshook > 0) {
+                    $result = $hookmanager->resPrint;
+        } else {
+                    $result .= $hookmanager->resPrint;
+        }
 
         return $result;
     }
@@ -1395,14 +1470,16 @@ 
         dol_syslog(get_class($this) . "::build_exportfile Build export file format=" . $format . ", type=" . $type . ", cachedelay=" . $cachedelay . ", filename=" . $filename . ", filters size=" . count($filters), LOG_DEBUG);
 
         // Check parameters
-        if (empty($format))
-            return -1;
+        if (empty($format)) {
+                    return -1;
+        }
 
         // Clean parameters
         if (!$filename) {
             $extension = 'vcs';
-            if ($format == 'ical')
-                $extension = 'ics';
+            if ($format == 'ical') {
+                            $extension = 'ics';
+            }
             $filename = $format . '.' . $extension;
         }
 
@@ -1452,30 +1529,40 @@ 
             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_author"; // Link to get author of event for export
             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on s.rowid = a.fk_soc";
             // We must filter on assignement table
-            if ($filters['logint'])
-                $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
+            if ($filters['logint']) {
+                            $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
+            }
             $sql .= " WHERE a.fk_action=c.id";
             $sql .= " AND a.entity IN (" . getEntity('agenda') . ")";
             foreach ($filters as $key => $value) {
-                if ($key == 'notolderthan' && $value != '')
-                    $sql .= " AND a.datep >= '" . $this->db->idate($now - ($value * 24 * 60 * 60)) . "'";
-                if ($key == 'year')
-                    $sql .= " AND a.datep BETWEEN '" . $this->db->idate(dol_get_first_day($value, 1)) . "' AND '" . $this->db->idate(dol_get_last_day($value, 12)) . "'";
-                if ($key == 'id')
-                    $sql .= " AND a.id=" . (is_numeric($value) ? $value : 0);
-                if ($key == 'idfrom')
-                    $sql .= " AND a.id >= " . (is_numeric($value) ? $value : 0);
-                if ($key == 'idto')
-                    $sql .= " AND a.id <= " . (is_numeric($value) ? $value : 0);
-                if ($key == 'project')
-                    $sql .= " AND a.fk_project=" . (is_numeric($value) ? $value : 0);
-                if ($key == 'actiontype')
-                    $sql .= " AND c.type = '" . $this->db->escape($value) . "'";
-                if ($key == 'notactiontype')
-                    $sql .= " AND c.type <> '" . $this->db->escape($value) . "'";
+                if ($key == 'notolderthan' && $value != '') {
+                                    $sql .= " AND a.datep >= '" . $this->db->idate($now - ($value * 24 * 60 * 60)) . "'";
+                }
+                if ($key == 'year') {
+                                    $sql .= " AND a.datep BETWEEN '" . $this->db->idate(dol_get_first_day($value, 1)) . "' AND '" . $this->db->idate(dol_get_last_day($value, 12)) . "'";
+                }
+                if ($key == 'id') {
+                                    $sql .= " AND a.id=" . (is_numeric($value) ? $value : 0);
+                }
+                if ($key == 'idfrom') {
+                                    $sql .= " AND a.id >= " . (is_numeric($value) ? $value : 0);
+                }
+                if ($key == 'idto') {
+                                    $sql .= " AND a.id <= " . (is_numeric($value) ? $value : 0);
+                }
+                if ($key == 'project') {
+                                    $sql .= " AND a.fk_project=" . (is_numeric($value) ? $value : 0);
+                }
+                if ($key == 'actiontype') {
+                                    $sql .= " AND c.type = '" . $this->db->escape($value) . "'";
+                }
+                if ($key == 'notactiontype') {
+                                    $sql .= " AND c.type <> '" . $this->db->escape($value) . "'";
+                }
                 // We must filter on assignement table
-                if ($key == 'logint')
-                    $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+                if ($key == 'logint') {
+                                    $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+                }
                 if ($key == 'logina') {
                     $logina = $value;
                     $condition = '=';
@@ -1485,10 +1572,11 @@ 
                     }
                     $userforfilter = new User($this->db);
                     $result = $userforfilter->fetch('', $logina);
-                    if ($result > 0)
-                        $sql .= " AND a.fk_user_author " . $condition . " " . $userforfilter->id;
-                    elseif ($result < 0 || $condition == '=')
-                        $sql .= " AND a.fk_user_author = 0";
+                    if ($result > 0) {
+                                            $sql .= " AND a.fk_user_author " . $condition . " " . $userforfilter->id;
+                    } elseif ($result < 0 || $condition == '=') {
+                                            $sql .= " AND a.fk_user_author = 0";
+                    }
                 }
                 if ($key == 'logint') {
                     $logint = $value;
@@ -1499,10 +1587,11 @@ 
                     }
                     $userforfilter = new User($this->db);
                     $result = $userforfilter->fetch('', $logint);
-                    if ($result > 0)
-                        $sql .= " AND ar.fk_element = " . $userforfilter->id;
-                    elseif ($result < 0 || $condition == '=')
-                        $sql .= " AND ar.fk_element = 0";
+                    if ($result > 0) {
+                                            $sql .= " AND ar.fk_element = " . $userforfilter->id;
+                    } elseif ($result < 0 || $condition == '=') {
+                                            $sql .= " AND ar.fk_element = 0";
+                    }
                 }
             }
             $sql .= " AND a.datep IS NOT NULL";  // To exclude corrupted events and avoid errors in lightning/sunbird import
@@ -1560,14 +1649,18 @@ 
 
             // Define title and desc
             $more = '';
-            if ($login)
-                $more = $langs->transnoentities("User") . ' ' . $login;
-            if ($logina)
-                $more = $langs->transnoentities("ActionsAskedBy") . ' ' . $logina;
-            if ($logint)
-                $more = $langs->transnoentities("ActionsToDoBy") . ' ' . $logint;
-            if ($logind)
-                $more = $langs->transnoentities("ActionsDoneBy") . ' ' . $logind;
+            if ($login) {
+                            $more = $langs->transnoentities("User") . ' ' . $login;
+            }
+            if ($logina) {
+                            $more = $langs->transnoentities("ActionsAskedBy") . ' ' . $logina;
+            }
+            if ($logint) {
+                            $more = $langs->transnoentities("ActionsToDoBy") . ' ' . $logint;
+            }
+            if ($logind) {
+                            $more = $langs->transnoentities("ActionsDoneBy") . ' ' . $logind;
+            }
             if ($more) {
                 $title = 'Dolibarr actions ' . $mysoc->name . ' - ' . $more;
                 $desc = $more;
@@ -1583,17 +1676,18 @@ 
             @chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
             // Write file
-            if ($format == 'vcal')
-                $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-            elseif ($format == 'ical')
-                $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-            elseif ($format == 'rss')
-                $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+            if ($format == 'vcal') {
+                            $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+            } elseif ($format == 'ical') {
+                            $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+            } elseif ($format == 'rss') {
+                            $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+            }
 
             if ($result >= 0) {
-                if (dol_move($outputfiletmp, $outputfile, 0, 1))
-                    $result = 1;
-                else {
+                if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+                                    $result = 1;
+                } else {
                     $this->error = 'Failed to rename ' . $outputfiletmp . ' into ' . $outputfile;
                     dol_syslog(get_class($this) . "::build_exportfile " . $this->error, LOG_ERR);
                     dol_delete_file($outputfiletmp, 0, 1);