alxarafe / alixar

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

Indentation +19 added lines, -19 removed lines

@@ -106,7 +106,7 @@ 
                 return 1;
             }
             else
-			{
+            {
                 $this->db->free($resql);
                 return 0;
             }
@@ -176,30 +176,30 @@ 
 
                     if ($qualified)
                     {
-                    	$keyfortrans='';
-                    	$transcode='';
-                    	$code=$obj->code;
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') $code='AC_MANUAL';
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
-                    	if ($shortlabel)
-                    	{
-                    		$keyfortrans="Action".$code.'Short';
-                    		$transcode=$langs->trans($keyfortrans);
-                    	}
-                    	if (empty($keyfortrans) || $keyfortrans == $transcode)
-                    	{
-                    		$keyfortrans="Action".$code;
-                    		$transcode=$langs->trans($keyfortrans);
-                    	}
-                    	$label = (($transcode!=$keyfortrans) ? $transcode : $langs->trans($obj->label));
+                        $keyfortrans='';
+                        $transcode='';
+                        $code=$obj->code;
+                        if ($onlyautoornot > 0 && $code == 'AC_OTH') $code='AC_MANUAL';
+                        if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
+                        if ($shortlabel)
+                        {
+                            $keyfortrans="Action".$code.'Short';
+                            $transcode=$langs->trans($keyfortrans);
+                        }
+                        if (empty($keyfortrans) || $keyfortrans == $transcode)
+                        {
+                            $keyfortrans="Action".$code;
+                            $transcode=$langs->trans($keyfortrans);
+                        }
+                        $label = (($transcode!=$keyfortrans) ? $transcode : $langs->trans($obj->label));
                         if ($onlyautoornot == -1 && ! empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! preg_match('/auto/i', $code))
                         {
                             $label='  '.$label;
                             $repid[-99]=$langs->trans("ActionAC_MANUAL");
                             $repcode['AC_NON_AUTO']=$langs->trans("ActionAC_MANUAL");
                         }
-                    	$repid[$obj->id] = $label;
-                    	$repcode[$obj->code] = $label;
+                        $repid[$obj->id] = $label;
+                        $repcode[$obj->code] = $label;
                         if ($onlyautoornot > 0 && preg_match('/^module/',$obj->type) && $obj->module) $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
                     }
                     $i++;

Spacing +46 added lines, -46 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var DoliDB Database handler.
@@ -45,7 +45,7 @@ 
 
     public $code;
     public $type;
-    public $libelle;       // deprecated
+    public $libelle; // deprecated
 
     /**
      * @var string Type of agenda event label
@@ -60,7 +60,7 @@ 
      */
     public $picto;
 
-    public $type_actions=array();
+    public $type_actions = array();
 
 
     /**
@@ -82,12 +82,12 @@ 
     function fetch($id)
     {
         $sql = "SELECT id, code, type, libelle as label, color, active, picto";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        if (is_numeric($id)) $sql.= " WHERE id=".$id;
-        else $sql.= " WHERE code='".$id."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
+        if (is_numeric($id)) $sql .= " WHERE id=".$id;
+        else $sql .= " WHERE code='".$id."'";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
@@ -97,7 +97,7 @@ 
                 $this->id      = $obj->id;
                 $this->code    = $obj->code;
                 $this->type    = $obj->type;
-                $this->libelle = $obj->label;   // deprecated
+                $this->libelle = $obj->label; // deprecated
                 $this->label   = $obj->label;
                 $this->active  = $obj->active;
                 $this->color   = $obj->color;
@@ -113,7 +113,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -130,25 +130,25 @@ 
      *  @param	int			$shortlabel		1=Get short label instead of long label
      *  @return mixed      					Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
      */
-    function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0, $morefilter='', $shortlabel=0)
+    function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0)
     {
         // phpcs:enable
-        global $langs,$conf;
+        global $langs, $conf;
         $langs->load("commercial");
 
         $repid = array();
         $repcode = array();
 
         $sql = "SELECT id, code, libelle as label, module, type, color, picto";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        $sql.= " WHERE 1=1";
-        if ($active != '') $sql.=" AND active=".$active;
-        if (! empty($excludetype)) $sql.=" AND type <> '".$excludetype."'";
-        if ($morefilter) $sql.=" AND ".$morefilter;
-        $sql.= " ORDER BY module, position, type";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
+        $sql .= " WHERE 1=1";
+        if ($active != '') $sql .= " AND active=".$active;
+        if (!empty($excludetype)) $sql .= " AND type <> '".$excludetype."'";
+        if ($morefilter) $sql .= " AND ".$morefilter;
+        $sql .= " ORDER BY module, position, type";
 
         dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $nump = $this->db->num_rows($resql);
@@ -159,59 +159,59 @@ 
                 {
                     $obj = $this->db->fetch_object($resql);
 
-                    $qualified=1;
+                    $qualified = 1;
 
                     // $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
-                    if ($qualified && $onlyautoornot > 0 && preg_match('/^system/',$obj->type) && ! preg_match('/^AC_OTH/',$obj->code)) $qualified=0;	// We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+                    if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 
                     if ($qualified && $obj->module)
                     {
-                        if ($obj->module == 'invoice' && ! $conf->facture->enabled)	 $qualified=0;
-                        if ($obj->module == 'order'   && ! $conf->commande->enabled) $qualified=0;
-                        if ($obj->module == 'propal'  && ! $conf->propal->enabled)	 $qualified=0;
-                        if ($obj->module == 'invoice_supplier' && ! $conf->fournisseur->enabled)   $qualified=0;
-                        if ($obj->module == 'order_supplier'   && ! $conf->fournisseur->enabled)   $qualified=0;
-                        if ($obj->module == 'shipping'  && ! $conf->expedition->enabled)	 $qualified=0;
+                        if ($obj->module == 'invoice' && !$conf->facture->enabled)	 $qualified = 0;
+                        if ($obj->module == 'order' && !$conf->commande->enabled) $qualified = 0;
+                        if ($obj->module == 'propal' && !$conf->propal->enabled)	 $qualified = 0;
+                        if ($obj->module == 'invoice_supplier' && !$conf->fournisseur->enabled)   $qualified = 0;
+                        if ($obj->module == 'order_supplier' && !$conf->fournisseur->enabled)   $qualified = 0;
+                        if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified = 0;
                     }
 
                     if ($qualified)
                     {
-                    	$keyfortrans='';
-                    	$transcode='';
-                    	$code=$obj->code;
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') $code='AC_MANUAL';
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
+                    	$keyfortrans = '';
+                    	$transcode = '';
+                    	$code = $obj->code;
+                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') $code = 'AC_MANUAL';
+                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
                     	if ($shortlabel)
                     	{
-                    		$keyfortrans="Action".$code.'Short';
-                    		$transcode=$langs->trans($keyfortrans);
+                    		$keyfortrans = "Action".$code.'Short';
+                    		$transcode = $langs->trans($keyfortrans);
                     	}
                     	if (empty($keyfortrans) || $keyfortrans == $transcode)
                     	{
-                    		$keyfortrans="Action".$code;
-                    		$transcode=$langs->trans($keyfortrans);
+                    		$keyfortrans = "Action".$code;
+                    		$transcode = $langs->trans($keyfortrans);
                     	}
-                    	$label = (($transcode!=$keyfortrans) ? $transcode : $langs->trans($obj->label));
-                        if ($onlyautoornot == -1 && ! empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! preg_match('/auto/i', $code))
+                    	$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
+                        if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE) && !preg_match('/auto/i', $code))
                         {
-                            $label='&nbsp; '.$label;
-                            $repid[-99]=$langs->trans("ActionAC_MANUAL");
-                            $repcode['AC_NON_AUTO']=$langs->trans("ActionAC_MANUAL");
+                            $label = '&nbsp; '.$label;
+                            $repid[-99] = $langs->trans("ActionAC_MANUAL");
+                            $repcode['AC_NON_AUTO'] = $langs->trans("ActionAC_MANUAL");
                         }
                     	$repid[$obj->id] = $label;
                     	$repcode[$obj->code] = $label;
-                        if ($onlyautoornot > 0 && preg_match('/^module/',$obj->type) && $obj->module) $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
+                        if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) $repcode[$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
                     }
                     $i++;
                 }
             }
-            if ($idorcode == 'id') $this->liste_array=$repid;
-            if ($idorcode == 'code') $this->liste_array=$repcode;
+            if ($idorcode == 'id') $this->liste_array = $repid;
+            if ($idorcode == 'code') $this->liste_array = $repcode;
             return $this->liste_array;
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -223,12 +223,12 @@ 
      *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
      *  @return string			      	Label of action type
      */
-    function getNomUrl($withpicto=0)
+    function getNomUrl($withpicto = 0)
     {
         global $langs;
 
         // Check if translation available
-        $transcode=$langs->trans("Action".$this->code);
+        $transcode = $langs->trans("Action".$this->code);
         if ($transcode != "Action".$this->code) return $transcode;
     }
 }

Braces +57 added lines, -24 removed lines

@@ -83,8 +83,11 @@ 
     {
         $sql = "SELECT id, code, type, libelle as label, color, active, picto";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        if (is_numeric($id)) $sql.= " WHERE id=".$id;
-        else $sql.= " WHERE code='".$id."'";
+        if (is_numeric($id)) {
+            $sql.= " WHERE id=".$id;
+        } else {
+            $sql.= " WHERE code='".$id."'";
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -104,14 +107,12 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
+            } else
 			{
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -142,9 +143,15 @@ 
         $sql = "SELECT id, code, libelle as label, module, type, color, picto";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
         $sql.= " WHERE 1=1";
-        if ($active != '') $sql.=" AND active=".$active;
-        if (! empty($excludetype)) $sql.=" AND type <> '".$excludetype."'";
-        if ($morefilter) $sql.=" AND ".$morefilter;
+        if ($active != '') {
+            $sql.=" AND active=".$active;
+        }
+        if (! empty($excludetype)) {
+            $sql.=" AND type <> '".$excludetype."'";
+        }
+        if ($morefilter) {
+            $sql.=" AND ".$morefilter;
+        }
         $sql.= " ORDER BY module, position, type";
 
         dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
@@ -162,16 +169,31 @@ 
                     $qualified=1;
 
                     // $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
-                    if ($qualified && $onlyautoornot > 0 && preg_match('/^system/',$obj->type) && ! preg_match('/^AC_OTH/',$obj->code)) $qualified=0;	// We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+                    if ($qualified && $onlyautoornot > 0 && preg_match('/^system/',$obj->type) && ! preg_match('/^AC_OTH/',$obj->code)) {
+                        $qualified=0;
+                    }
+                    // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 
                     if ($qualified && $obj->module)
                     {
-                        if ($obj->module == 'invoice' && ! $conf->facture->enabled)	 $qualified=0;
-                        if ($obj->module == 'order'   && ! $conf->commande->enabled) $qualified=0;
-                        if ($obj->module == 'propal'  && ! $conf->propal->enabled)	 $qualified=0;
-                        if ($obj->module == 'invoice_supplier' && ! $conf->fournisseur->enabled)   $qualified=0;
-                        if ($obj->module == 'order_supplier'   && ! $conf->fournisseur->enabled)   $qualified=0;
-                        if ($obj->module == 'shipping'  && ! $conf->expedition->enabled)	 $qualified=0;
+                        if ($obj->module == 'invoice' && ! $conf->facture->enabled) {
+                            $qualified=0;
+                        }
+                        if ($obj->module == 'order'   && ! $conf->commande->enabled) {
+                            $qualified=0;
+                        }
+                        if ($obj->module == 'propal'  && ! $conf->propal->enabled) {
+                            $qualified=0;
+                        }
+                        if ($obj->module == 'invoice_supplier' && ! $conf->fournisseur->enabled) {
+                            $qualified=0;
+                        }
+                        if ($obj->module == 'order_supplier'   && ! $conf->fournisseur->enabled) {
+                            $qualified=0;
+                        }
+                        if ($obj->module == 'shipping'  && ! $conf->expedition->enabled) {
+                            $qualified=0;
+                        }
                     }
 
                     if ($qualified)
@@ -179,8 +201,12 @@ 
                     	$keyfortrans='';
                     	$transcode='';
                     	$code=$obj->code;
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') $code='AC_MANUAL';
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
+                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') {
+                    	    $code='AC_MANUAL';
+                    	}
+                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') {
+                    	    $code='AC_AUTO';
+                    	}
                     	if ($shortlabel)
                     	{
                     		$keyfortrans="Action".$code.'Short';
@@ -200,16 +226,21 @@ 
                         }
                     	$repid[$obj->id] = $label;
                     	$repcode[$obj->code] = $label;
-                        if ($onlyautoornot > 0 && preg_match('/^module/',$obj->type) && $obj->module) $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
+                        if ($onlyautoornot > 0 && preg_match('/^module/',$obj->type) && $obj->module) {
+                            $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
+                        }
                     }
                     $i++;
                 }
             }
-            if ($idorcode == 'id') $this->liste_array=$repid;
-            if ($idorcode == 'code') $this->liste_array=$repcode;
+            if ($idorcode == 'id') {
+                $this->liste_array=$repid;
+            }
+            if ($idorcode == 'code') {
+                $this->liste_array=$repcode;
+            }
             return $this->liste_array;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;
@@ -229,6 +260,8 @@ 
 
         // Check if translation available
         $transcode=$langs->trans("Action".$this->code);
-        if ($transcode != "Action".$this->code) return $transcode;
+        if ($transcode != "Action".$this->code) {
+            return $transcode;
+        }
     }
 }

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

Indentation +205 added lines, -205 removed lines

@@ -30,212 +30,212 @@
  */
 class ActionCommReminder extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'actioncomm_reminder';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'actioncomm_reminder';
-
-	/**
-	 * @var array  Does actioncommreminder support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 */
-	public $ismultientitymanaged = 0;
-
-	/**
-	 * @var string String with name of icon for actioncommreminder. Must be the part after the 'object_' into object_actioncommreminder.png
-	 */
-	public $picto = 'generic';
-
-
-	/**
-	 *  'type' if the field format.
-	 *  'label' the translation key.
-	 *  'enabled' is a condition when the field must be managed.
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'position' is the sort order of field.
-	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'help' is a string visible as a tooltip on field
-	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-	 *  'showoncombobox' if field must be shown into the label of combobox
-	 */
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
-		'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
-		'fk_user' => array('type'=>'integer', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>65, 'notnull'=>1, 'index'=>1,),
-		'offsetvalue' => array('type'=>'integer', 'label'=>'OffsetValue', 'visible'=>1, 'enabled'=>1, 'position'=>56, 'notnull'=>1,),
-		'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"m, h, d, w",),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
-	);
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	public $dateremind;
-	public $typeremind;
-
-	/**
-	 * @var int User ID
-	 */
-	public $fk_user;
-
-	public $offsetvalue;
-	public $offsetunit;
-
-	/**
-	 * @var int Status
-	 */
-	public $status;
-
-	// END MODULEBUILDER PROPERTIES
-
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		global $conf;
-
-		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		return $this->createCommon($user, $notrigger);
-	}
-
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id   Id object
-	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		$result = $this->fetchCommon($id, $ref);
-		return $result;
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		return $this->updateCommon($user, $notrigger);
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		return $this->deleteCommon($user, $notrigger);
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element = 'actioncomm_reminder';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'actioncomm_reminder';
+
+    /**
+     * @var array  Does actioncommreminder support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     */
+    public $ismultientitymanaged = 0;
+
+    /**
+     * @var string String with name of icon for actioncommreminder. Must be the part after the 'object_' into object_actioncommreminder.png
+     */
+    public $picto = 'generic';
+
+
+    /**
+     *  'type' if the field format.
+     *  'label' the translation key.
+     *  'enabled' is a condition when the field must be managed.
+     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+     *  'index' if we want an index in database.
+     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+     *  'position' is the sort order of field.
+     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+     *  'help' is a string visible as a tooltip on field
+     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+     *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+     *  'showoncombobox' if field must be shown into the label of combobox
+     */
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+        'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
+        'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
+        'fk_user' => array('type'=>'integer', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>65, 'notnull'=>1, 'index'=>1,),
+        'offsetvalue' => array('type'=>'integer', 'label'=>'OffsetValue', 'visible'=>1, 'enabled'=>1, 'position'=>56, 'notnull'=>1,),
+        'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"m, h, d, w",),
+        'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
+    );
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    public $dateremind;
+    public $typeremind;
+
+    /**
+     * @var int User ID
+     */
+    public $fk_user;
+
+    public $offsetvalue;
+    public $offsetunit;
+
+    /**
+     * @var int Status
+     */
+    public $status;
+
+    // END MODULEBUILDER PROPERTIES
+
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        global $conf;
+
+        $this->db = $db;
+
+        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+        if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        return $this->createCommon($user, $notrigger);
+    }
+
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id   Id object
+     * @param string $ref  Ref
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null)
+    {
+        $result = $this->fetchCommon($id, $ref);
+        return $result;
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        return $this->updateCommon($user, $notrigger);
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user       User that deletes
+     * @param bool $notrigger  false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        return $this->deleteCommon($user, $notrigger);
+    }
+
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Done');
-			elseif ($status == 0) return $langs->trans('ToDo');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->initAsSpecimenCommon();
-	}
+        global $langs;
+
+        if ($mode == 0 || $mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Done');
+            elseif ($status == 0) return $langs->trans('ToDo');
+        }
+        elseif ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
+            elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+        }
+        elseif ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Done'),'statut4');
+            elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5');
+        }
+        elseif ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
+            elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+        }
+        elseif ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
+            elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+        }
+        elseif ($mode == 6)
+        {
+            if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
+            elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->initAsSpecimenCommon();
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -72,7 +72,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
 		'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
@@ -118,8 +118,8 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
 	}
 
 	/**
@@ -178,9 +178,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -191,7 +191,7 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -203,28 +203,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
+			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4');
+			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
+			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
+			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
+			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
 		}
 	}
 

Braces +41 added lines, -24 removed lines

@@ -118,8 +118,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		    $this->fields['rowid']['visible']=0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+		    $this->fields['entity']['enabled']=0;
+		}
 	}
 
 	/**
@@ -198,33 +202,46 @@ 
 
 		if ($mode == 0 || $mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Done');
-			elseif ($status == 0) return $langs->trans('ToDo');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Done');
+			} elseif ($status == 0) {
+			    return $langs->trans('ToDo');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 3)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
+			} elseif ($status == 0) {
+			    return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+			}
+		} elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5');
-		}
-		elseif ($mode == 4)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Done'),'statut4');
+			} elseif ($status == 0) {
+			    return img_picto($langs->trans('ToDo'),'statut5');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 5)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
+			} elseif ($status == 0) {
+			    return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+			}
+		} elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
-		}
-		elseif ($mode == 6)
+			if ($status == 1) {
+			    return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
+			} elseif ($status == 0) {
+			    return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+			if ($status == 1) {
+			    return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
+			} elseif ($status == 0) {
+			    return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+			}
 		}
 	}
 

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

Indentation +36 added lines, -36 removed lines

@@ -62,8 +62,8 @@ 
         $tmparray=file($file);
         if (is_array($tmparray))
         {
-        	$file_text = join("", $tmparray); //load file
-        	$file_text = preg_replace("/[\r\n]{1,} /","",$file_text);
+            $file_text = join("", $tmparray); //load file
+            $file_text = preg_replace("/[\r\n]{1,} /","",$file_text);
         }
         return $file_text; // return all text
     }
@@ -121,7 +121,7 @@ 
             {
                 // get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin
                 list($key, $value) = $this->retun_key_value($text);
-				//var_dump($text.' -> '.$key.' - '.$value);
+                //var_dump($text.' -> '.$key.' - '.$value);
 
                 switch ($text) // search special string
                 {
@@ -167,30 +167,30 @@ 
                         break;
 
                     default: // no special string (SUMMARY, DESCRIPTION, ...)
-                    	if ($tmpvalue)
-						{
-							$tmpvalue .= $text;
-							if (! preg_match('/=$/',$text))	// No more lines
-							{
-								$key=$tmpkey;
-								$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue));
-								$tmpkey='';
-								$tmpvalue='';
-							}
-						}
-                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
-                    	{
-                    		if (preg_match('/=$/',$value))
-                    		{
-                    			$tmpkey=$key;
-                    			$tmpvalue=$tmpvalue.preg_replace('/=$/',"",$value);	// We must wait to have next line to have complete message
-                    		}
-                    		else
-                    		{
-                    			$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue.$value));
-                    		}
-                    	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
-                    	if (! $insidealarm && ! $tmpkey) $this->add_to_array($type, $key, $value); // add to array
+                        if ($tmpvalue)
+                        {
+                            $tmpvalue .= $text;
+                            if (! preg_match('/=$/',$text))	// No more lines
+                            {
+                                $key=$tmpkey;
+                                $value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue));
+                                $tmpkey='';
+                                $tmpvalue='';
+                            }
+                        }
+                        elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
+                        {
+                            if (preg_match('/=$/',$value))
+                            {
+                                $tmpkey=$key;
+                                $tmpvalue=$tmpvalue.preg_replace('/=$/',"",$value);	// We must wait to have next line to have complete message
+                            }
+                            else
+                            {
+                                $value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue.$value));
+                            }
+                        }                    	//$value=quotedPrintDecode($tmpvalue.$value);
+                        if (! $insidealarm && ! $tmpkey) $this->add_to_array($type, $key, $value); // add to array
                         break;
                 }
             }
@@ -231,14 +231,14 @@ 
 
         if (stristr($key,"DTSTART") || stristr($key,"DTEND") || stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
         {
-        	if (stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
-        	{
-        		list($key,$value) = array($key,$value);
-        	}
-        	else
-        	{
-        		list($key,$value) = $this->ical_dt_date($key,$value);
-        	}
+            if (stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
+            {
+                list($key,$value) = array($key,$value);
+            }
+            else
+            {
+                list($key,$value) = $this->ical_dt_date($key,$value);
+            }
         }
 
         switch ($type)
@@ -377,7 +377,7 @@ 
             return $temp;
         }
         else
-       {
+        {
             return false;
         }
     }

Spacing +38 added lines, -38 removed lines

@@ -57,13 +57,13 @@ 
     {
         // phpcs:enable
         $this->file = $file;
-        $file_text='';
+        $file_text = '';
 
-        $tmparray=file($file);
+        $tmparray = file($file);
         if (is_array($tmparray))
         {
         	$file_text = join("", $tmparray); //load file
-        	$file_text = preg_replace("/[\r\n]{1,} /","",$file_text);
+        	$file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
         }
         return $file_text; // return all text
     }
@@ -110,10 +110,10 @@ 
         $this->file_text = preg_split("[\n]", $this->file_text);
 
         // is this text vcalendar standart text ? on line 1 is BEGIN:VCALENDAR
-        if (!stristr($this->file_text[0],'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
+        if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
 
-        $insidealarm=0;
-        $tmpkey='';$tmpvalue=''; $type='';
+        $insidealarm = 0;
+        $tmpkey = ''; $tmpvalue = ''; $type = '';
         foreach ($this->file_text as $text)
         {
             $text = trim($text); // trim one line
@@ -126,17 +126,17 @@ 
                 switch ($text) // search special string
                 {
                     case "BEGIN:VTODO":
-                        $this->todo_count = $this->todo_count+1; // new to do begin
+                        $this->todo_count = $this->todo_count + 1; // new to do begin
                         $type = "VTODO";
                         break;
 
                     case "BEGIN:VEVENT":
-                        $this->event_count = $this->event_count+1; // new event begin
+                        $this->event_count = $this->event_count + 1; // new event begin
                         $type = "VEVENT";
                         break;
 
                     case "BEGIN:VFREEBUSY":
-                        $this->freebusy_count = $this->freebusy_count+1; // new event begin
+                        $this->freebusy_count = $this->freebusy_count + 1; // new event begin
                         $type = "VFREEBUSY";
                         break;
 
@@ -160,37 +160,37 @@ 
 
                     // Manage VALARM that are inside a VEVENT to avoid fields of VALARM to overwrites fields of VEVENT
                     case "BEGIN:VALARM":
-                        $insidealarm=1;
+                        $insidealarm = 1;
                         break;
                     case "END:VALARM":
-                        $insidealarm=0;
+                        $insidealarm = 0;
                         break;
 
                     default: // no special string (SUMMARY, DESCRIPTION, ...)
                     	if ($tmpvalue)
 						{
 							$tmpvalue .= $text;
-							if (! preg_match('/=$/',$text))	// No more lines
+							if (!preg_match('/=$/', $text))	// No more lines
 							{
-								$key=$tmpkey;
-								$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue));
-								$tmpkey='';
-								$tmpvalue='';
+								$key = $tmpkey;
+								$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue));
+								$tmpkey = '';
+								$tmpvalue = '';
 							}
 						}
-                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
+                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
                     	{
-                    		if (preg_match('/=$/',$value))
+                    		if (preg_match('/=$/', $value))
                     		{
-                    			$tmpkey=$key;
-                    			$tmpvalue=$tmpvalue.preg_replace('/=$/',"",$value);	// We must wait to have next line to have complete message
+                    			$tmpkey = $key;
+                    			$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
                     		}
                     		else
                     		{
-                    			$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue.$value));
+                    			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
                     		}
                     	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
-                    	if (! $insidealarm && ! $tmpkey) $this->add_to_array($type, $key, $value); // add to array
+                    	if (!$insidealarm && !$tmpkey) $this->add_to_array($type, $key, $value); // add to array
                         break;
                 }
             }
@@ -220,24 +220,24 @@ 
             $key = $this->last_key;
             switch ($type)
             {
-                case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value;break;
-                case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value;break;
-                case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value;break;
+                case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value; break;
+                case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value; break;
+                case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value; break;
             }
         }
 
         if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
         //if ($key == "RRULE" ) $value = $this->ical_rrule($value);
 
-        if (stristr($key,"DTSTART") || stristr($key,"DTEND") || stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
+        if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
         {
-        	if (stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
+        	if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
         	{
-        		list($key,$value) = array($key,$value);
+        		list($key, $value) = array($key, $value);
         	}
         	else
         	{
-        		list($key,$value) = $this->ical_dt_date($key,$value);
+        		list($key, $value) = $this->ical_dt_date($key, $value);
         	}
         }
 
@@ -284,7 +284,7 @@ 
             $matches = array_splice($matches, 1, 2);
             return $matches;
         }*/
-        return explode(':',$text,2);
+        return explode(':', $text, 2);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -298,7 +298,7 @@ 
     {
         // phpcs:enable
         $result = array();
-        $rrule = explode(';',$value);
+        $rrule = explode(';', $value);
         foreach ($rrule as $line)
         {
             $rcontent = explode('=', $line);
@@ -320,14 +320,14 @@ 
         $ical_date = str_replace('T', '', $ical_date);
         $ical_date = str_replace('Z', '', $ical_date);
 
-        $ntime=0;
+        $ntime = 0;
         // TIME LIMITED EVENT
         if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
-            $ntime=dol_mktime($date[4], $date[5], $date[6], $date[2],$date[3], $date[1], true);
+            $ntime = dol_mktime($date[4], $date[5], $date[6], $date[2], $date[3], $date[1], true);
 
         //if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
         //print dol_print_date($ntime,'dayhour');exit;
-        return $ntime;      // ntime is a GTM time
+        return $ntime; // ntime is a GTM time
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -345,12 +345,12 @@ 
         $value = $this->ical_date_to_unix($value);
 
         // Analyse TZID
-        $temp = explode(";",$key);
+        $temp = explode(";", $key);
 
         if (empty($temp[1])) // not TZID
         {
             $value = str_replace('T', '', $value);
-            return array($key,$value);
+            return array($key, $value);
         }
 
         $key = $temp[0];
@@ -358,7 +358,7 @@ 
         $return_value[$temp[0]] = $temp[1];
         $return_value['unixtime'] = $value;
 
-        return array($key,$return_value);
+        return array($key, $return_value);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -405,7 +405,7 @@ 
     function get_event_list()
     {
         // phpcs:enable
-        return (! empty($this->cal['VEVENT'])?$this->cal['VEVENT']:'');
+        return (!empty($this->cal['VEVENT']) ? $this->cal['VEVENT'] : '');
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

Braces +23 added lines, -15 removed lines

@@ -110,7 +110,9 @@ 
         $this->file_text = preg_split("[\n]", $this->file_text);
 
         // is this text vcalendar standart text ? on line 1 is BEGIN:VCALENDAR
-        if (!stristr($this->file_text[0],'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
+        if (!stristr($this->file_text[0],'BEGIN:VCALENDAR')) {
+            return 'error not VCALENDAR';
+        }
 
         $insidealarm=0;
         $tmpkey='';$tmpvalue=''; $type='';
@@ -170,27 +172,30 @@ 
                     	if ($tmpvalue)
 						{
 							$tmpvalue .= $text;
-							if (! preg_match('/=$/',$text))	// No more lines
+							if (! preg_match('/=$/',$text)) {
+							    // No more lines
 							{
 								$key=$tmpkey;
+							}
 								$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue));
 								$tmpkey='';
 								$tmpvalue='';
 							}
-						}
-                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
+						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
                     	{
                     		if (preg_match('/=$/',$value))
                     		{
                     			$tmpkey=$key;
                     			$tmpvalue=$tmpvalue.preg_replace('/=$/',"",$value);	// We must wait to have next line to have complete message
-                    		}
-                    		else
+                    		} else
                     		{
                     			$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue.$value));
                     		}
                     	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
-                    	if (! $insidealarm && ! $tmpkey) $this->add_to_array($type, $key, $value); // add to array
+                    	if (! $insidealarm && ! $tmpkey) {
+                    	    $this->add_to_array($type, $key, $value);
+                    	}
+                    	// add to array
                         break;
                 }
             }
@@ -226,7 +231,9 @@ 
             }
         }
 
-        if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
+        if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) {
+            $value = $this->ical_date_to_unix($value);
+        }
         //if ($key == "RRULE" ) $value = $this->ical_rrule($value);
 
         if (stristr($key,"DTSTART") || stristr($key,"DTEND") || stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
@@ -234,8 +241,7 @@ 
         	if (stristr($key,"DTSTART;VALUE=DATE") || stristr($key,"DTEND;VALUE=DATE"))
         	{
         		list($key,$value) = array($key,$value);
-        	}
-        	else
+        	} else
         	{
         		list($key,$value) = $this->ical_dt_date($key,$value);
         	}
@@ -322,8 +328,9 @@ 
 
         $ntime=0;
         // TIME LIMITED EVENT
-        if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
-            $ntime=dol_mktime($date[4], $date[5], $date[6], $date[2],$date[3], $date[1], true);
+        if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date)) {
+                    $ntime=dol_mktime($date[4], $date[5], $date[6], $date[2],$date[3], $date[1], true);
+        }
 
         //if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
         //print dol_print_date($ntime,'dayhour');exit;
@@ -347,9 +354,11 @@ 
         // Analyse TZID
         $temp = explode(";",$key);
 
-        if (empty($temp[1])) // not TZID
+        if (empty($temp[1])) {
+            // not TZID
         {
             $value = str_replace('T', '', $value);
+        }
             return array($key,$value);
         }
 
@@ -375,8 +384,7 @@ 
         {
             usort($temp, array(&$this, "ical_dtstart_compare"));
             return $temp;
-        }
-        else
+        } else
        {
             return false;
         }

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

Indentation +73 added lines, -73 removed lines

@@ -16,9 +16,9 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+    use Luracast\Restler\RestException;
 
- require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 /**
  * API class for Agenda Events
@@ -58,7 +58,7 @@ 
      *
      * @param       int         $id         ID of Agenda Events
      * @return 	    array|mixed             Data without useless information
-	 *
+     *
      * @throws 	RestException
      */
     function get($id)
@@ -76,14 +76,14 @@ 
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
 
-		if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id,'actioncomm','','fk_soc','id')) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id,'actioncomm','','fk_soc','id')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
-		$result = $this->actioncomm->fetch_optionals();
+        $result = $this->actioncomm->fetch_optionals();
 
         $this->actioncomm->fetchObjectLinked();
-		return $this->_cleanObjectDatas($this->actioncomm);
+        return $this->_cleanObjectDatas($this->actioncomm);
     }
 
     /**
@@ -116,17 +116,17 @@ 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-		if (empty($conf->societe->enabled)) $search_sale = 0;	// If module thirdparty not enabled, sale representative is something that does not exists
+        if (empty($conf->societe->enabled)) $search_sale = 0;	// If module thirdparty not enabled, sale representative is something that does not exists
 
         $sql = "SELECT t.id as rowid";
         if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
         if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
         if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
         if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
         // Insert sale filter
@@ -141,7 +141,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -160,7 +160,7 @@ 
 
         if ($result)
         {
-        	$i=0;
+            $i=0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
@@ -179,7 +179,7 @@ 
         if ( ! count($obj_ret)) {
             throw new RestException(404, 'No Agenda Event found');
         }
-		return $obj_ret;
+        return $obj_ret;
     }
 
     /**
@@ -190,12 +190,12 @@ 
      */
     function post($request_data = null)
     {
-      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
-		  }
-      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-		  }
+        if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+                throw new RestException(401, "Insuffisant rights to create your Agenda Event");
+            }
+        if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+                throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+            }
 
         // Check mandatory fields
         $result = $this->_validate($request_data);
@@ -266,22 +266,22 @@ 
     function delete($id)
     {
         if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
-			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
-		}
+                throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
+        }
 
-		$result = $this->actioncomm->fetch($id);
+        $result = $this->actioncomm->fetch($id);
 
         if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
-		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-		}
+                throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+        }
 
-		if( ! $result ) {
+        if( ! $result ) {
             throw new RestException(404, 'Agenda Event not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
         if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
@@ -322,48 +322,48 @@ 
     function _cleanObjectDatas($object)
     {
 
-    	$object = parent::_cleanObjectDatas($object);
-
-    	unset($object->usermod);
-    	unset($object->libelle);
-    	unset($object->context);
-    	unset($object->canvas);
-    	unset($object->contact);
-    	unset($object->contact_id);
-    	unset($object->thirdparty);
-    	unset($object->user);
-    	unset($object->origin);
-    	unset($object->origin_id);
-    	unset($object->ref_ext);
-    	unset($object->statut);
-    	unset($object->country);
-    	unset($object->country_id);
-    	unset($object->country_code);
-    	unset($object->barcode_type);
-    	unset($object->barcode_type_code);
-    	unset($object->barcode_type_label);
-    	unset($object->barcode_type_coder);
-    	unset($object->mode_reglement_id);
-    	unset($object->cond_reglement_id);
-    	unset($object->cond_reglement);
-    	unset($object->fk_delivery_address);
-    	unset($object->shipping_method_id);
-    	unset($object->fk_account);
-    	unset($object->total_ht);
-    	unset($object->total_tva);
-    	unset($object->total_localtax1);
-    	unset($object->total_localtax2);
-    	unset($object->total_ttc);
-    	unset($object->fk_incoterms);
-    	unset($object->libelle_incoterms);
-    	unset($object->location_incoterms);
-    	unset($object->name);
-    	unset($object->lastname);
-    	unset($object->firstname);
-    	unset($object->civility_id);
-    	unset($object->contact);
-    	unset($object->societe);
-
-    	return $object;
+        $object = parent::_cleanObjectDatas($object);
+
+        unset($object->usermod);
+        unset($object->libelle);
+        unset($object->context);
+        unset($object->canvas);
+        unset($object->contact);
+        unset($object->contact_id);
+        unset($object->thirdparty);
+        unset($object->user);
+        unset($object->origin);
+        unset($object->origin_id);
+        unset($object->ref_ext);
+        unset($object->statut);
+        unset($object->country);
+        unset($object->country_id);
+        unset($object->country_code);
+        unset($object->barcode_type);
+        unset($object->barcode_type_code);
+        unset($object->barcode_type_label);
+        unset($object->barcode_type_coder);
+        unset($object->mode_reglement_id);
+        unset($object->cond_reglement_id);
+        unset($object->cond_reglement);
+        unset($object->fk_delivery_address);
+        unset($object->shipping_method_id);
+        unset($object->fk_account);
+        unset($object->total_ht);
+        unset($object->total_tva);
+        unset($object->total_localtax1);
+        unset($object->total_localtax2);
+        unset($object->total_ttc);
+        unset($object->fk_incoterms);
+        unset($object->libelle_incoterms);
+        unset($object->location_incoterms);
+        unset($object->name);
+        unset($object->lastname);
+        unset($object->firstname);
+        unset($object->civility_id);
+        unset($object->contact);
+        unset($object->societe);
+
+        return $object;
     }
 }

Spacing +33 added lines, -33 removed lines

@@ -63,20 +63,20 @@ 
      */
     function get($id)
     {
-        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read an event");
         }
 
         $result = $this->actioncomm->fetch($id);
-        if ( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Agenda Events not found');
         }
 
-        if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
+        if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
 
-		if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id,'actioncomm','','fk_soc','id')) {
+		if (!DolibarrApi::_checkAccessToResource('agenda', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -105,30 +105,30 @@ 
 
         $obj_ret = array();
 
-        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read events");
         }
 
         // case of external user
         $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+        if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-		if (empty($conf->societe->enabled)) $search_sale = 0;	// If module thirdparty not enabled, sale representative is something that does not exists
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if (empty($conf->societe->enabled)) $search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
 
         $sql = "SELECT t.id as rowid";
-        if (! empty($conf->societe->enabled))
+        if (!empty($conf->societe->enabled))
         	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+        if (!empty($conf->societe->enabled))
+        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
+        if (!empty($conf->societe->enabled))
+        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+        if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
+        if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -137,30 +137,30 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
 
         if ($result)
         {
-        	$i=0;
+        	$i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
@@ -176,7 +176,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
-        if ( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No Agenda Event found');
         }
 		return $obj_ret;
@@ -190,17 +190,17 @@ 
      */
     function post($request_data = null)
     {
-      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+      if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+      if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->actioncomm->$field = $value;
         }
         /*if (isset($request_data["lines"])) {
@@ -265,25 +265,25 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
 			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
 		}
 
 		$result = $this->actioncomm->fetch($id);
 
-        if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
+        if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
 		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		}
 
-		if( ! $result ) {
+		if (!$result) {
             throw new RestException(404, 'Agenda Event not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
+		if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
+        if (!$this->actioncomm->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
         }
 

Braces +31 added lines, -15 removed lines

@@ -111,24 +111,40 @@ 
 
         // case of external user
         $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+        if (! empty(DolibarrApiAccess::$user->socid)) {
+            $socid = DolibarrApiAccess::$user->socid;
+        }
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-		if (empty($conf->societe->enabled)) $search_sale = 0;	// If module thirdparty not enabled, sale representative is something that does not exists
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+            $search_sale = DolibarrApiAccess::$user->id;
+        }
+		if (empty($conf->societe->enabled)) {
+		    $search_sale = 0;
+		}
+		// If module thirdparty not enabled, sale representative is something that does not exists
 
         $sql = "SELECT t.id as rowid";
-        if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if (! empty($conf->societe->enabled)) {
+                	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user";
+        }
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if (! empty($conf->societe->enabled)) {
+                	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
+        // We need this table joined to the select in order to filter by sale
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if (! empty($conf->societe->enabled))
-        	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+        if (! empty($conf->societe->enabled)) {
+                	if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+        }
+        if ($user_ids) {
+            $sql.=" AND t.fk_user_action IN (".$user_ids.")";
+        }
+        if ($socid > 0) {
+            $sql.= " AND t.fk_soc = ".$socid;
+        }
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -172,8 +188,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
         if ( ! count($obj_ret)) {
@@ -306,8 +321,9 @@ 
     {
         $event = array();
         foreach (AgendaEvents::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $event[$field] = $data[$field];
         }
         return $event;

dolibarr/htdocs/comm/action/info.php

Indentation +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
 // Security check
 if ($user->societe_id > 0)
 {
-  $action = '';
-  $socid = $user->societe_id;
+    $action = '';
+    $socid = $user->societe_id;
 }
 
 $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');

Braces +3 added lines, -1 removed lines

@@ -95,7 +95,9 @@
         $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
         $morehtmlref.=$proj->ref;
         $morehtmlref.='</a>';
-        if ($proj->title) $morehtmlref.=' - '.$proj->title;
+        if ($proj->title) {
+            $morehtmlref.=' - '.$proj->title;
+        }
     } else {
         $morehtmlref.='';
     }

Spacing +34 added lines, -34 removed lines

@@ -25,21 +25,21 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-if (! empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+if (!empty($conf->projet->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
 $langs->load("commercial");
 
-$id = GETPOST('id','int');
+$id = GETPOST('id', 'int');
 
 // Security check
 if ($user->societe_id > 0)
@@ -55,57 +55,57 @@ 
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
+llxHeader('', $langs->trans("Agenda"), $help_url);
 
 $object = new ActionComm($db);
 $object->fetch($id);
 $object->info($object->id);
 
-$head=actions_prepare_head($object);
+$head = actions_prepare_head($object);
 dol_fiche_head($head, 'info', $langs->trans("Action"), -1, 'action');
 
-$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
+$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
+$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
 
 // Link to other agenda views
-$out='';
-$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
-$out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
-$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
-$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
-$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
-
-$linkback.=$out;
-
-$morehtmlref='<div class="refidno">';
+$out = '';
+$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
+$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
+$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
+$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+
+$linkback .= $out;
+
+$morehtmlref = '<div class="refidno">';
 // Thirdparty
 //$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 // Project
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 {
     $langs->load("projects");
     //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-    $morehtmlref.=$langs->trans('Project') . ': ';
-    if (! empty($object->fk_project)) {
+    $morehtmlref .= $langs->trans('Project').': ';
+    if (!empty($object->fk_project)) {
         $proj = new Project($db);
         $proj->fetch($object->fk_project);
-        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-        $morehtmlref.=$proj->ref;
-        $morehtmlref.='</a>';
-        if ($proj->title) $morehtmlref.=' - '.$proj->title;
+        $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+        $morehtmlref .= $proj->ref;
+        $morehtmlref .= '</a>';
+        if ($proj->title) $morehtmlref .= ' - '.$proj->title;
     } else {
-        $morehtmlref.='';
+        $morehtmlref .= '';
     }
 }
-$morehtmlref.='</div>';
+$morehtmlref .= '</div>';
 
-dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
+dol_banner_tab($object, 'id', $linkback, ($user->societe_id ? 0 : 1), 'id', 'ref', $morehtmlref);
 
 print '<div class="underbanner clearboth"></div>';
 

dolibarr/htdocs/comm/action/document.php

Indentation +156 added lines, -156 removed lines

@@ -48,8 +48,8 @@ 
 if ($user->societe_id) $socid=$user->societe_id;
 if ($user->societe_id > 0)
 {
-	unset($_GET["action"]);
-	$action='';
+    unset($_GET["action"]);
+    $action='';
 }
 $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
 
@@ -57,8 +57,8 @@ 
 
 if ($id > 0)
 {
-	$ret = $object->fetch($id);
-	$object->fetch_thirdparty();
+    $ret = $object->fetch($id);
+    $object->fetch_thirdparty();
 }
 
 // Get parameters
@@ -94,178 +94,178 @@ 
 
 if ($object->id > 0)
 {
-	$result1=$object->fetch($id);
-	$result2=$object->fetch_thirdparty();
-	$result3=$object->fetch_contact();
-	$result4=$object->fetch_userassigned();
-	$result5=$object->fetch_optionals();
-
-	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
-	{
-		dol_print_error($db,$object->error);
-		exit;
-	}
-
-	if ($object->authorid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
-	if ($object->usermodid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
-
-	$author=new User($db);
-	$author->fetch($object->author->id);
-	$object->author=$author;
-
-
-	$head=actions_prepare_head($object);
-
-	$now=dol_now();
-	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
-
-	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
-
-	$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
-
-	// Link to other agenda views
-	$out='';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
-
-	$linkback.=$out;
-
-	$morehtmlref='<div class="refidno">';
-	// Thirdparty
-	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    $morehtmlref.=$langs->trans('Project') . ': ';
-	    if (! empty($object->fk_project)) {
-	        $proj = new Project($db);
-	        $proj->fetch($object->fk_project);
-	        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	        $morehtmlref.=$proj->ref;
-	        $morehtmlref.='</a>';
-	        if ($proj->title) $morehtmlref.=' - '.$proj->title;
-	    } else {
-	        $morehtmlref.='';
-	    }
-	}
-	$morehtmlref.='</div>';
-
-	dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-
-	// Affichage fiche action en mode visu
-	print '<table class="border" width="100%">';
-
-	// Type
-	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
-		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
-	}
-
-	// Full day event
-	print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
-
-	// Date start
-	print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
-	if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
-	else print dol_print_date($object->datep,'day');
-	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
-	print '</td>';
-	print '</tr>';
-
-	// Date end
-	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-	if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
-	else print dol_print_date($object->datef,'day');
-	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
-	print '</td></tr>';
-
-	// Location
-	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-	{
-		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
-	}
-
-	// Assigned to
-	print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
-	$listofuserid=array();
-	if (empty($donotclearsession))
-	{
-		if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
-		if (! empty($object->userassigned))	// Now concat assigned users
-		{
-			// Restore array with key with same value than param 'id'
-			$tmplist1=$object->userassigned; $tmplist2=array();
-			foreach($tmplist1 as $key => $val)
-			{
-				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
-			}
-		}
-		$_SESSION['assignedtouser']=json_encode($listofuserid);
-	}
-	else
-	{
-		if (!empty($_SESSION['assignedtouser']))
-		{
-			$listofuserid=json_decode($_SESSION['assignedtouser'], true);
-		}
-	}
-	$listofcontactid=array();	// not used yet
-	$listofotherid=array();	// not used yet
-	print '<div class="assignedtouser">';
-	print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', ($object->datep != $object->datef)?1:0, $listofuserid, $listofcontactid, $listofotherid);
-	print '</div>';
-	/*if (in_array($user->id,array_keys($listofuserid)))
+    $result1=$object->fetch($id);
+    $result2=$object->fetch_thirdparty();
+    $result3=$object->fetch_contact();
+    $result4=$object->fetch_userassigned();
+    $result5=$object->fetch_optionals();
+
+    if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
+    {
+        dol_print_error($db,$object->error);
+        exit;
+    }
+
+    if ($object->authorid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
+    if ($object->usermodid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
+
+    $author=new User($db);
+    $author->fetch($object->author->id);
+    $object->author=$author;
+
+
+    $head=actions_prepare_head($object);
+
+    $now=dol_now();
+    $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
+
+    dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
+
+    $linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
+    $linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
+
+    // Link to other agenda views
+    $out='';
+    $out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
+    $out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
+    $out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
+    $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
+    $out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
+    $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
+    $out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
+    $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
+
+    $linkback.=$out;
+
+    $morehtmlref='<div class="refidno">';
+    // Thirdparty
+    //$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+        $morehtmlref.=$langs->trans('Project') . ': ';
+        if (! empty($object->fk_project)) {
+            $proj = new Project($db);
+            $proj->fetch($object->fk_project);
+            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+            $morehtmlref.=$proj->ref;
+            $morehtmlref.='</a>';
+            if ($proj->title) $morehtmlref.=' - '.$proj->title;
+        } else {
+            $morehtmlref.='';
+        }
+    }
+    $morehtmlref.='</div>';
+
+    dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
+
+    print '<div class="fichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+
+    // Affichage fiche action en mode visu
+    print '<table class="border" width="100%">';
+
+    // Type
+    if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+    {
+        print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
+    }
+
+    // Full day event
+    print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
+
+    // Date start
+    print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
+    if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
+    else print dol_print_date($object->datep,'day');
+    if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+    print '</td>';
+    print '</tr>';
+
+    // Date end
+    print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
+    if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
+    else print dol_print_date($object->datef,'day');
+    if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
+    print '</td></tr>';
+
+    // Location
+    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+    {
+        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
+    }
+
+    // Assigned to
+    print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+    $listofuserid=array();
+    if (empty($donotclearsession))
+    {
+        if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
+        if (! empty($object->userassigned))	// Now concat assigned users
+        {
+            // Restore array with key with same value than param 'id'
+            $tmplist1=$object->userassigned; $tmplist2=array();
+            foreach($tmplist1 as $key => $val)
+            {
+                if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+            }
+        }
+        $_SESSION['assignedtouser']=json_encode($listofuserid);
+    }
+    else
+    {
+        if (!empty($_SESSION['assignedtouser']))
+        {
+            $listofuserid=json_decode($_SESSION['assignedtouser'], true);
+        }
+    }
+    $listofcontactid=array();	// not used yet
+    $listofotherid=array();	// not used yet
+    print '<div class="assignedtouser">';
+    print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', ($object->datep != $object->datef)?1:0, $listofuserid, $listofcontactid, $listofotherid);
+    print '</div>';
+    /*if (in_array($user->id,array_keys($listofuserid)))
 	{
 		print '<div class="myavailability">';
 		print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
 		print '</div>';
 	}*/
-	print '	</td></tr>';
+    print '	</td></tr>';
 
-	print '</table>';
+    print '</table>';
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
 
 
-	print '<tr><td class="titlefield" class="nowrap">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '<tr><td class="titlefield" class="nowrap">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
-	print '</table>';
+    print '</table>';
 
     print '</div>';
 
     dol_fiche_end();
 
 
-	$modulepart = 'actions';
-	$permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    $modulepart = 'actions';
+    $permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	print $langs->trans("ErrorUnknown");
+    print $langs->trans("ErrorUnknown");
 }
 
 // End of page

Braces +45 added lines, -19 removed lines

@@ -34,7 +34,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (! empty($conf->projet->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'commercial', 'other', 'bills'));
@@ -45,7 +47,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 if ($user->societe_id > 0)
 {
 	unset($_GET["action"]);
@@ -69,8 +73,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart='actions';
@@ -152,7 +160,9 @@ 
 	        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
 	        $morehtmlref.=$proj->ref;
 	        $morehtmlref.='</a>';
-	        if ($proj->title) $morehtmlref.=' - '.$proj->title;
+	        if ($proj->title) {
+	            $morehtmlref.=' - '.$proj->title;
+	        }
 	    } else {
 	        $morehtmlref.='';
 	    }
@@ -179,17 +189,27 @@ 
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
-	if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
-	else print dol_print_date($object->datep,'day');
-	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+	if (! $object->fulldayevent) {
+	    print dol_print_date($object->datep,'dayhour');
+	} else {
+	    print dol_print_date($object->datep,'day');
+	}
+	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) {
+	    print img_warning($langs->trans("Late"));
+	}
 	print '</td>';
 	print '</tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-	if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
-	else print dol_print_date($object->datef,'day');
-	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
+	if (! $object->fulldayevent) {
+	    print dol_print_date($object->datef,'dayhour');
+	} else {
+	    print dol_print_date($object->datef,'day');
+	}
+	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) {
+	    print img_warning($langs->trans("Late"));
+	}
 	print '</td></tr>';
 
 	// Location
@@ -203,19 +223,26 @@ 
 	$listofuserid=array();
 	if (empty($donotclearsession))
 	{
-		if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
-		if (! empty($object->userassigned))	// Now concat assigned users
+		if ($object->userownerid > 0) {
+		    $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);
+		}
+		// Owner first
+		if (! empty($object->userassigned)) {
+		    // Now concat assigned users
 		{
 			// Restore array with key with same value than param 'id'
-			$tmplist1=$object->userassigned; $tmplist2=array();
+			$tmplist1=$object->userassigned;
+		}
+		$tmplist2=array();
 			foreach($tmplist1 as $key => $val)
 			{
-				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+				if ($val['id'] && $val['id'] != $object->userownerid) {
+				    $listofuserid[$val['id']]=$val;
+				}
 			}
 		}
 		$_SESSION['assignedtouser']=json_encode($listofuserid);
-	}
-	else
+	} else
 	{
 		if (!empty($_SESSION['assignedtouser']))
 		{
@@ -262,8 +289,7 @@ 
 	$permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
 	$param = '&id=' . $object->id;
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	print $langs->trans("ErrorUnknown");
 }

Spacing +77 added lines, -77 removed lines

@@ -29,7 +29,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
@@ -37,22 +37,22 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'commercial', 'other', 'bills'));
 
 $id = GETPOST('id', 'int');
-$action=GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 if ($user->societe_id > 0)
 {
 	unset($_GET["action"]);
-	$action='';
+	$action = '';
 }
 $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
 
@@ -65,24 +65,24 @@ 
 }
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$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 = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
 
 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
-$modulepart='actions';
+$modulepart = 'actions';
 
 
 /*
  * Actions
  */
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
@@ -91,78 +91,78 @@ 
 
 $form = new Form($db);
 
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
+llxHeader('', $langs->trans("Agenda"), $help_url);
 
 
 if ($object->id > 0)
 {
-	$result1=$object->fetch($id);
-	$result2=$object->fetch_thirdparty();
-	$result3=$object->fetch_contact();
-	$result4=$object->fetch_userassigned();
-	$result5=$object->fetch_optionals();
+	$result1 = $object->fetch($id);
+	$result2 = $object->fetch_thirdparty();
+	$result3 = $object->fetch_contact();
+	$result4 = $object->fetch_userassigned();
+	$result5 = $object->fetch_optionals();
 
 	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 		exit;
 	}
 
-	if ($object->authorid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
-	if ($object->usermodid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
+	if ($object->authorid > 0) { $tmpuser = new User($db); $res = $tmpuser->fetch($object->authorid); $object->author = $tmpuser; }
+	if ($object->usermodid > 0) { $tmpuser = new User($db); $res = $tmpuser->fetch($object->usermodid); $object->usermod = $tmpuser; }
 
-	$author=new User($db);
+	$author = new User($db);
 	$author->fetch($object->author->id);
-	$object->author=$author;
+	$object->author = $author;
 
 
-	$head=actions_prepare_head($object);
+	$head = actions_prepare_head($object);
 
-	$now=dol_now();
-	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
+	$now = dol_now();
+	$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
-	$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Link to other agenda views
-	$out='';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
-	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
-
-	$linkback.=$out;
-
-	$morehtmlref='<div class="refidno">';
+	$out = '';
+	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
+	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
+	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
+	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+
+	$linkback .= $out;
+
+	$morehtmlref = '<div class="refidno">';
 	// Thirdparty
 	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 	    $langs->load("projects");
 	    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    $morehtmlref.=$langs->trans('Project') . ': ';
-	    if (! empty($object->fk_project)) {
+	    $morehtmlref .= $langs->trans('Project').': ';
+	    if (!empty($object->fk_project)) {
 	        $proj = new Project($db);
 	        $proj->fetch($object->fk_project);
-	        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	        $morehtmlref.=$proj->ref;
-	        $morehtmlref.='</a>';
-	        if ($proj->title) $morehtmlref.=' - '.$proj->title;
+	        $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+	        $morehtmlref .= $proj->ref;
+	        $morehtmlref .= '</a>';
+	        if ($proj->title) $morehtmlref .= ' - '.$proj->title;
 	    } else {
-	        $morehtmlref.='';
+	        $morehtmlref .= '';
 	    }
 	}
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
-	dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, ($user->societe_id ? 0 : 1), 'id', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 
@@ -172,7 +172,7 @@ 
 	print '<table class="border" width="100%">';
 
 	// Type
-	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
 		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
 	}
@@ -182,17 +182,17 @@ 
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
-	if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
-	else print dol_print_date($object->datep,'day');
+	if (!$object->fulldayevent) print dol_print_date($object->datep, 'dayhour');
+	else print dol_print_date($object->datep, 'day');
 	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 	print '</td>';
 	print '</tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-	if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
-	else print dol_print_date($object->datef,'day');
-	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
+	if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
+	else print dol_print_date($object->datef, 'day');
+	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 	print '</td></tr>';
 
 	// Location
@@ -203,32 +203,32 @@ 
 
 	// Assigned to
 	print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
-	$listofuserid=array();
+	$listofuserid = array();
 	if (empty($donotclearsession))
 	{
-		if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
-		if (! empty($object->userassigned))	// Now concat assigned users
+		if ($object->userownerid > 0) $listofuserid[$object->userownerid] = array('id'=>$object->userownerid, 'transparency'=>$object->transparency); // Owner first
+		if (!empty($object->userassigned))	// Now concat assigned users
 		{
 			// Restore array with key with same value than param 'id'
-			$tmplist1=$object->userassigned; $tmplist2=array();
-			foreach($tmplist1 as $key => $val)
+			$tmplist1 = $object->userassigned; $tmplist2 = array();
+			foreach ($tmplist1 as $key => $val)
 			{
-				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']] = $val;
 			}
 		}
-		$_SESSION['assignedtouser']=json_encode($listofuserid);
+		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	}
 	else
 	{
 		if (!empty($_SESSION['assignedtouser']))
 		{
-			$listofuserid=json_decode($_SESSION['assignedtouser'], true);
+			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 		}
 	}
-	$listofcontactid=array();	// not used yet
-	$listofotherid=array();	// not used yet
+	$listofcontactid = array(); // not used yet
+	$listofotherid = array(); // not used yet
 	print '<div class="assignedtouser">';
-	print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', ($object->datep != $object->datef)?1:0, $listofuserid, $listofcontactid, $listofotherid);
+	print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', ($object->datep != $object->datef) ? 1 : 0, $listofuserid, $listofcontactid, $listofotherid);
 	print '</div>';
 	/*if (in_array($user->id,array_keys($listofuserid)))
 	{
@@ -243,11 +243,11 @@ 
 	print '<table class="border" width="100%">';
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
 
@@ -262,9 +262,9 @@ 
 
 
 	$modulepart = 'actions';
-	$permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	$permission = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {

dolibarr/htdocs/comm/action/pertype.php

Indentation +402 added lines, -402 removed lines

@@ -51,7 +51,7 @@ 
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
-	$filtert=$user->id;
+    $filtert=$user->id;
 }
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -103,9 +103,9 @@ 
 $dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth','int'), GETPOST('dateselectday','int'), GETPOST('dateselectyear','int'));
 if ($dateselect > 0)
 {
-	$day=GETPOST('dateselectday','int');
-	$month=GETPOST('dateselectmonth','int');
-	$year=GETPOST('dateselectyear','int');
+    $day=GETPOST('dateselectday','int');
+    $month=GETPOST('dateselectmonth','int');
+    $year=GETPOST('dateselectyear','int');
 }
 
 $tmp=empty($conf->global->MAIN_DEFAULT_WORKING_HOURS)?'9-18':$conf->global->MAIN_DEFAULT_WORKING_HOURS;
@@ -288,53 +288,53 @@ 
 // Legend
 if ($conf->use_javascript_ajax)
 {
-	$s='';
-	$s.='<script type="text/javascript">' . "\n";
-	$s.='jQuery(document).ready(function () {' . "\n";
-	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
-	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
-	$s.='jQuery(".family_birthday").toggle();' . "\n";
-	if ($action=="show_week" || $action=="show_month" || empty($action))
-	{
-    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
-	}
-  	$s.='});' . "\n";
-	$s.='</script>' . "\n";
-	if (! empty($conf->use_javascript_ajax))
-	{
-		$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
-		if (is_array($showextcals) && count($showextcals) > 0)
-		{
-			foreach ($showextcals as $val)
-			{
-				$htmlname = md5($val['name']);
-				$s.='<script type="text/javascript">' . "\n";
-				$s.='jQuery(document).ready(function () {' . "\n";
-				$s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
-				$s.=' 		/* alert("'.$htmlname.'"); */';
-				$s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
-				$s.='		});' . "\n";
-				$s.='});' . "\n";
-				$s.='</script>' . "\n";
-				$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val ['name'] . ' &nbsp; </div>';
-			}
-		}
+    $s='';
+    $s.='<script type="text/javascript">' . "\n";
+    $s.='jQuery(document).ready(function () {' . "\n";
+    $s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
+    $s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
+    $s.='jQuery(".family_birthday").toggle();' . "\n";
+    if ($action=="show_week" || $action=="show_month" || empty($action))
+    {
+        $s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+        $s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+    }
+        $s.='});' . "\n";
+    $s.='</script>' . "\n";
+    if (! empty($conf->use_javascript_ajax))
+    {
+        $s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+        if (is_array($showextcals) && count($showextcals) > 0)
+        {
+            foreach ($showextcals as $val)
+            {
+                $htmlname = md5($val['name']);
+                $s.='<script type="text/javascript">' . "\n";
+                $s.='jQuery(document).ready(function () {' . "\n";
+                $s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
+                $s.=' 		/* alert("'.$htmlname.'"); */';
+                $s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
+                $s.='		});' . "\n";
+                $s.='});' . "\n";
+                $s.='</script>' . "\n";
+                $s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val ['name'] . ' &nbsp; </div>';
+            }
+        }
 
-		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+        //$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
-		// Calendars from hooks
-	    $parameters=array(); $object=null;
-		$reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
-	    if (empty($reshook))
-	    {
-			$s.= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
-		{
-	    	$s = $hookmanager->resPrint;
-	    }
-	}
+        // Calendars from hooks
+        $parameters=array(); $object=null;
+        $reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
+        if (empty($reshook))
+        {
+            $s.= $hookmanager->resPrint;
+        }
+        elseif ($reshook > 1)
+        {
+            $s = $hookmanager->resPrint;
+        }
+    }
 }
 
 
@@ -452,8 +452,8 @@ 
         // Discard auto action if option is on
         if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
         {
-        	$i++;
-        	continue;
+            $i++;
+            continue;
         }
 
         $datep=$db->jdate($obj->datep);
@@ -487,15 +487,15 @@ 
         // They are date start and end of action but modified to not be outside calendar view.
         if ($event->percentage <= 0)
         {
-        	$event->date_start_in_calendar=$datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-        	else $event->date_end_in_calendar=$datep;
+            $event->date_start_in_calendar=$datep;
+            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
+            else $event->date_end_in_calendar=$datep;
         }
         else
         {
-        	$event->date_start_in_calendar=$datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-        	else $event->date_end_in_calendar=$datep;
+            $event->date_start_in_calendar=$datep;
+            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
+            else $event->date_end_in_calendar=$datep;
         }
         // Define ponctual property
         if ($event->date_start_in_calendar == $event->date_end_in_calendar)
@@ -508,14 +508,14 @@ 
         $event->date_start_in_calendar >= $lastdaytoshow)
         {
             // This record is out of visible range
-        	unset($event);
+            unset($event);
         }
         else
-		{
-			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
-			$event->fetch_userassigned();				// This load $event->userassigned
+        {
+            //print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
+            $event->fetch_userassigned();				// This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
+            if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
             if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
 
             // Add an entry in actionarray for each day
@@ -528,7 +528,7 @@ 
             $loop=true; $j=0;
             $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
             do
-			{
+            {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][]=$event;
@@ -603,9 +603,9 @@ 
 $i=0;
 for ($h = $begin_d; $h < $end_d; $h++)
 {
-	echo '<td align="center">';
-	print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
-	print "</td>";
+    echo '<td align="center">';
+    print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
+    print "</td>";
 }
 echo "</td>\n";
 echo "</tr>\n";
@@ -620,8 +620,8 @@ 
 $resql=$db->query($sql);
 while ($obj = $db->fetch_object($resql))
 {
-	$colorsbytype[$obj->code]=$obj->color;
-	$labelbytype[$obj->code]=$obj->libelle;
+    $colorsbytype[$obj->code]=$obj->color;
+    $labelbytype[$obj->code]=$obj->libelle;
 }
 
 // Loop on each user to show calendar
@@ -631,40 +631,40 @@ 
 $var = false;
 foreach ($typeofevents as $typeofevent)
 {
-	$var = ! $var;
-	echo "<tr>";
-	echo '<td class="cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">' . $username->getNomUrl(1). '</td>';
-	$tmpday = $sav;
-
-	// Lopp on each day of week
-	$i = 0;
-	for ($iter_day = 0; $iter_day < 8; $iter_day++)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
-			$i++;
-			continue;
-		}
+    $var = ! $var;
+    echo "<tr>";
+    echo '<td class="cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">' . $username->getNomUrl(1). '</td>';
+    $tmpday = $sav;
+
+    // Lopp on each day of week
+    $i = 0;
+    for ($iter_day = 0; $iter_day < 8; $iter_day++)
+    {
+        if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+        {
+            $i++;
+            continue;
+        }
 
         // Show days of the current week
-		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-		$tmparray = dol_getdate($curtime,'fast');
-		$tmpday = $tmparray['mday'];
-		$tmpmonth = $tmparray['mon'];
-		$tmpyear = $tmparray['year'];
-
-		$style='cal_current_month';
-		if ($iter_day == 6) $style.=' cal_other_month';
-		$today=0;
-		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
-		if ($today) $style='cal_today_peruser';
-
-		show_day_events_pertype($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
-
-		$i++;
-	}
-	echo "</tr>\n";
-	$showheader = false;
+        $curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
+        $tmparray = dol_getdate($curtime,'fast');
+        $tmpday = $tmparray['mday'];
+        $tmpmonth = $tmparray['mon'];
+        $tmpyear = $tmparray['year'];
+
+        $style='cal_current_month';
+        if ($iter_day == 6) $style.=' cal_other_month';
+        $today=0;
+        if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
+        if ($today) $style='cal_today_peruser';
+
+        show_day_events_pertype($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
+
+        $i++;
+    }
+    echo "</tr>\n";
+    $showheader = false;
 }
 
 echo "</table>\n";
@@ -672,23 +672,23 @@ 
 
 if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-	$langs->load("commercial");
-	print '<br>'.$langs->trans("Legend").': <br>';
-	foreach($colorsbytype as $code => $color)
-	{
-		if ($color)
-		{
-			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
-			print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
-			//print $code;
-			print '</div>';
-		}
-	}
-	//$color=sprintf("%02x%02x%02x",$theme_datacolor[0][0],$theme_datacolor[0][1],$theme_datacolor[0][2]);
-	print '<div style="float: left; padding: 2px; margin-right: 6px;"><div class="peruser_busy" style="width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
-	print $langs->trans("Other");
-	print '</div>';
-	/* TODO Show this if at least one cumulated event
+    $langs->load("commercial");
+    print '<br>'.$langs->trans("Legend").': <br>';
+    foreach($colorsbytype as $code => $color)
+    {
+        if ($color)
+        {
+            print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+            print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
+            //print $code;
+            print '</div>';
+        }
+    }
+    //$color=sprintf("%02x%02x%02x",$theme_datacolor[0][0],$theme_datacolor[0][1],$theme_datacolor[0][2]);
+    print '<div style="float: left; padding: 2px; margin-right: 6px;"><div class="peruser_busy" style="width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+    print $langs->trans("Other");
+    print '</div>';
+    /* TODO Show this if at least one cumulated event
 	print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="background: #222222; width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
 	print $langs->trans("SeveralEvents");
 	print '</div>';
@@ -759,298 +759,298 @@ 
  */
 function show_day_events_pertype($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)
 {
-	global $db;
-	global $user, $conf, $langs, $hookmanager, $action;
-	global $filter, $filtert, $status, $actioncode;	// Filters used into search form
-	global $theme_datacolor;	// Array with a list of different we can use (come from theme)
-	global $cachethirdparties, $cachecontacts, $cacheprojects, $colorindexused;
-	global $begin_h, $end_h;
+    global $db;
+    global $user, $conf, $langs, $hookmanager, $action;
+    global $filter, $filtert, $status, $actioncode;	// Filters used into search form
+    global $theme_datacolor;	// Array with a list of different we can use (come from theme)
+    global $cachethirdparties, $cachecontacts, $cacheprojects, $colorindexused;
+    global $begin_h, $end_h;
 
-	$cases1 = array();	// Color first half hour
-	$cases2 = array(); // Color second half hour
+    $cases1 = array();	// Color first half hour
+    $cases2 = array(); // Color second half hour
 
-	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
+    $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
 
-	$i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
-	$ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+    $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
+    $ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
 
-	$nextindextouse=count($colorindexused);	// At first run, this is 0, so fist user has 0, next 1, ...
-	//if ($username->id && $day==1) var_dump($eventarray);
+    $nextindextouse=count($colorindexused);	// At first run, this is 0, so fist user has 0, next 1, ...
+    //if ($username->id && $day==1) var_dump($eventarray);
 
-	// We are in a particular day for $username, now we scan all events
-	foreach ($eventarray as $daykey => $notused)
-	{
-		$annee = date('Y',$daykey);
-		$mois = date('m',$daykey);
-		$jour = date('d',$daykey);
-		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
+    // We are in a particular day for $username, now we scan all events
+    foreach ($eventarray as $daykey => $notused)
+    {
+        $annee = date('Y',$daykey);
+        $mois = date('m',$daykey);
+        $jour = date('d',$daykey);
+        //print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
 
-		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
-		{
-			// Scan all event for this date
-			foreach ($eventarray[$daykey] as $index => $event)
-			{
-				//var_dump($event);
-
-				$keysofuserassigned=array_keys($event->userassigned);
-				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
-				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
-
-				$parameters=array();
-				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
-
-				// Define $color (Hex string like '0088FF') and $cssclass of event
-				$color=-1; $cssclass=''; $colorindex=-1;
-				if (in_array($user->id, $keysofuserassigned))
-				{
-					$nummytasks++; $cssclass='family_mytasks';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
-				}
-				else if ($event->type_code == 'ICALEVENT')
-				{
-					$numical++;
-					if (! empty($event->icalname))
-					{
-						if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
-							$numicals[dol_string_nospecial($event->icalname)] = 0;
-						}
-						$numicals[dol_string_nospecial($event->icalname)]++;
-					}
-
-					$color=$event->icalcolor;
-					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
-				}
-				else if ($event->type_code == 'BIRTHDAY')
-				{
-					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-				}
-				else
-				{
-					$numother++; $cssclass='family_other';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
-				}
-
-				if ($color < 0)	// Color was not forced. Set color according to color index.
-				{
-					// Define color index if not yet defined
-					$idusertouse=($event->userownerid?$event->userownerid:0);
-					if (isset($colorindexused[$idusertouse]))
-					{
-						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
-					}
-					else
-					{
-						$colorindex=$nextindextouse;
-						$colorindexused[$idusertouse]=$colorindex;
-						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
-					}
-					// Define color
-					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-				}
-				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
-
-				// Define all rects with event (cases1 is first half hour, cases2 is second half hour)
-				for ($h = $begin_h; $h < $end_h; $h++)
-				{
-					//if ($username->id == 1 && $day==1) print 'h='.$h;
-					$newcolor = ''; //init
-					if (empty($event->fulldayevent))
-					{
-						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
-						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
-						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
-
-						$dateendtouse=$event->date_end_in_calendar;
-						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
-
-						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
-
-						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
-						{
-							$busy=$event->transparency;
-							$cases1[$h][$event->id]['busy']=$busy;
-							$cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
-		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
-			        		}
-							$cases1[$h][$event->id]['string'].=' - '.$event->label;
-							$cases1[$h][$event->id]['typecode']=$event->type_code;
-							$cases1[$h][$event->id]['color']=$color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
-									$tmpproj=new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
-								}
-								$cases1[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
-									$tmpthirdparty=new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
-								}
-								$cases1[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contactid > 0)
-							{
-								if (empty($cachecontacts[$event->contactid]))
-								{
-									$tmpcontact=new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
-								}
-								$cases1[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
-							}
-						}
-						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
-						{
-							$busy=$event->transparency;
-							$cases2[$h][$event->id]['busy']=$busy;
-							$cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
-							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
-			        		}
-							$cases2[$h][$event->id]['string'].=' - '.$event->label;
-							$cases2[$h][$event->id]['typecode']=$event->type_code;
-							$cases2[$h][$event->id]['color']=$color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
-									$tmpproj=new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
-								}
-								$cases2[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
-									$tmpthirdparty=new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
-								}
-								$cases2[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contactid > 0)
-							{
-								if (empty($cachecontacts[$event->contactid]))
-								{
-									$tmpcontact=new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
-								}
-								$cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
-							}
-						}
-					}
-					else
-					{
-						$busy=$event->transparency;
-						$cases1[$h][$event->id]['busy']=$busy;
-						$cases2[$h][$event->id]['busy']=$busy;
-						$cases1[$h][$event->id]['string']=$event->label;
-						$cases2[$h][$event->id]['string']=$event->label;
-						$cases1[$h][$event->id]['typecode']=$event->type_code;
-						$cases2[$h][$event->id]['typecode']=$event->type_code;
-						$cases1[$h][$event->id]['color']=$color;
-						$cases2[$h][$event->id]['color']=$color;
-					}
-				}
-				$i++;
-			}
-
-			break;	// We found the date we were looking for. No need to search anymore.
-		}
-	}
-
-	// Now output $casesX
-	for ($h = $begin_h; $h < $end_h; $h++)
-	{
-		$color1='';$color2='';
-		$style1='';$style2='';
-		$string1='&nbsp;';$string2='&nbsp;';
-		$title1='';$title2='';
-		if (isset($cases1[$h]) && $cases1[$h] != '')
-		{
-			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string1='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
-			else $style1='peruser_busy';
-			foreach($cases1[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style1='peruser_busy';
-			}
-		}
-		if (isset($cases2[$h]) && $cases2[$h] != '')
-		{
-			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string2='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
-			else $style2='peruser_busy';
-			foreach($cases2[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style2='peruser_busy';
-			}
-		}
+        if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+        {
+            // Scan all event for this date
+            foreach ($eventarray[$daykey] as $index => $event)
+            {
+                //var_dump($event);
+
+                $keysofuserassigned=array_keys($event->userassigned);
+                if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+                //if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
+
+                $parameters=array();
+                $reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+                $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+
+                // Define $color (Hex string like '0088FF') and $cssclass of event
+                $color=-1; $cssclass=''; $colorindex=-1;
+                if (in_array($user->id, $keysofuserassigned))
+                {
+                    $nummytasks++; $cssclass='family_mytasks';
+                    if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+                }
+                else if ($event->type_code == 'ICALEVENT')
+                {
+                    $numical++;
+                    if (! empty($event->icalname))
+                    {
+                        if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
+                            $numicals[dol_string_nospecial($event->icalname)] = 0;
+                        }
+                        $numicals[dol_string_nospecial($event->icalname)]++;
+                    }
+
+                    $color=$event->icalcolor;
+                    $cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
+                }
+                else if ($event->type_code == 'BIRTHDAY')
+                {
+                    $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+                }
+                else
+                {
+                    $numother++; $cssclass='family_other';
+                    if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+                }
+
+                if ($color < 0)	// Color was not forced. Set color according to color index.
+                {
+                    // Define color index if not yet defined
+                    $idusertouse=($event->userownerid?$event->userownerid:0);
+                    if (isset($colorindexused[$idusertouse]))
+                    {
+                        $colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
+                    }
+                    else
+                    {
+                        $colorindex=$nextindextouse;
+                        $colorindexused[$idusertouse]=$colorindex;
+                        if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+                    }
+                    // Define color
+                    $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+                }
+                //$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
+
+                // Define all rects with event (cases1 is first half hour, cases2 is second half hour)
+                for ($h = $begin_h; $h < $end_h; $h++)
+                {
+                    //if ($username->id == 1 && $day==1) print 'h='.$h;
+                    $newcolor = ''; //init
+                    if (empty($event->fulldayevent))
+                    {
+                        $a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
+                        $b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
+                        $c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
+
+                        $dateendtouse=$event->date_end_in_calendar;
+                        if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+
+                        //print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
+
+                        if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
+                        {
+                            $busy=$event->transparency;
+                            $cases1[$h][$event->id]['busy']=$busy;
+                            $cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+                            if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+                            {
+                                $tmpa=dol_getdate($event->date_start_in_calendar,true);
+                                $tmpb=dol_getdate($event->date_end_in_calendar,true);
+                                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+                                else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+                            }
+                            $cases1[$h][$event->id]['string'].=' - '.$event->label;
+                            $cases1[$h][$event->id]['typecode']=$event->type_code;
+                            $cases1[$h][$event->id]['color']=$color;
+                            if ($event->fk_project > 0)
+                            {
+                                if (empty($cacheprojects[$event->fk_project]))
+                                {
+                                    $tmpproj=new Project($db);
+                                    $tmpproj->fetch($event->fk_project);
+                                    $cacheprojects[$event->fk_project]=$tmpproj;
+                                }
+                                $cases1[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+                            }
+                            if ($event->socid > 0)
+                            {
+                                if (empty($cachethirdparties[$event->socid]))
+                                {
+                                    $tmpthirdparty=new Societe($db);
+                                    $tmpthirdparty->fetch($event->socid);
+                                    $cachethirdparties[$event->socid]=$tmpthirdparty;
+                                }
+                                $cases1[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+                            }
+                            if ($event->contactid > 0)
+                            {
+                                if (empty($cachecontacts[$event->contactid]))
+                                {
+                                    $tmpcontact=new Contact($db);
+                                    $tmpcontact->fetch($event->contactid);
+                                    $cachecontacts[$event->contactid]=$tmpcontact;
+                                }
+                                $cases1[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+                            }
+                        }
+                        if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
+                        {
+                            $busy=$event->transparency;
+                            $cases2[$h][$event->id]['busy']=$busy;
+                            $cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+                            if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+                            {
+                                $tmpa=dol_getdate($event->date_start_in_calendar,true);
+                                $tmpb=dol_getdate($event->date_end_in_calendar,true);
+                                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+                                else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+                            }
+                            $cases2[$h][$event->id]['string'].=' - '.$event->label;
+                            $cases2[$h][$event->id]['typecode']=$event->type_code;
+                            $cases2[$h][$event->id]['color']=$color;
+                            if ($event->fk_project > 0)
+                            {
+                                if (empty($cacheprojects[$event->fk_project]))
+                                {
+                                    $tmpproj=new Project($db);
+                                    $tmpproj->fetch($event->fk_project);
+                                    $cacheprojects[$event->fk_project]=$tmpproj;
+                                }
+                                $cases2[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+                            }
+                            if ($event->socid > 0)
+                            {
+                                if (empty($cachethirdparties[$event->socid]))
+                                {
+                                    $tmpthirdparty=new Societe($db);
+                                    $tmpthirdparty->fetch($event->socid);
+                                    $cachethirdparties[$event->socid]=$tmpthirdparty;
+                                }
+                                $cases2[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+                            }
+                            if ($event->contactid > 0)
+                            {
+                                if (empty($cachecontacts[$event->contactid]))
+                                {
+                                    $tmpcontact=new Contact($db);
+                                    $tmpcontact->fetch($event->contactid);
+                                    $cachecontacts[$event->contactid]=$tmpcontact;
+                                }
+                                $cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        $busy=$event->transparency;
+                        $cases1[$h][$event->id]['busy']=$busy;
+                        $cases2[$h][$event->id]['busy']=$busy;
+                        $cases1[$h][$event->id]['string']=$event->label;
+                        $cases2[$h][$event->id]['string']=$event->label;
+                        $cases1[$h][$event->id]['typecode']=$event->type_code;
+                        $cases2[$h][$event->id]['typecode']=$event->type_code;
+                        $cases1[$h][$event->id]['color']=$color;
+                        $cases2[$h][$event->id]['color']=$color;
+                    }
+                }
+                $i++;
+            }
 
-		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+            break;	// We found the date we were looking for. No need to search anymore.
+        }
+    }
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
-		{
-			$output = array_slice($cases1[$h], 0, 1);
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		else if (count($cases1[$h]) > 1)
-		{
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			$color1='222222';
-		}
+    // Now output $casesX
+    for ($h = $begin_h; $h < $end_h; $h++)
+    {
+        $color1='';$color2='';
+        $style1='';$style2='';
+        $string1='&nbsp;';$string2='&nbsp;';
+        $title1='';$title2='';
+        if (isset($cases1[$h]) && $cases1[$h] != '')
+        {
+            //$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            $string1='&nbsp;';
+            if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
+            else $style1='peruser_busy';
+            foreach($cases1[$h] as $id => $ev)
+            {
+                if ($ev['busy']) $style1='peruser_busy';
+            }
+        }
+        if (isset($cases2[$h]) && $cases2[$h] != '')
+        {
+            //$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            $string2='&nbsp;';
+            if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
+            else $style2='peruser_busy';
+            foreach($cases2[$h] as $id => $ev)
+            {
+                if ($ev['busy']) $style2='peruser_busy';
+            }
+        }
 
-		if (count($cases2[$h]) == 1)	// only 1 event
-		{
-			$output = array_slice($cases2[$h], 0, 1);
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		else if (count($cases2[$h]) > 1)
-		{
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			$color2='222222';
-		}
-		print '<table class="nobordernopadding" width="100%">';
-		print '<tr><td '.($color1?'style="background: #'.$color1.';"':'').'class="'.($style1?$style1.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
-		print $string1;
-		print '</td><td '.($color2?'style="background: #'.$color2.';"':'').'class="'.($style2?$style2.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
-		print $string2;
-		print '</td></tr>';
-		print '</table>';
-		print '</td>';
-	}
+        $ids1='';$ids2='';
+        if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
+        if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+
+        if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+        else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+        if (count($cases1[$h]) == 1)	// only 1 event
+        {
+            $output = array_slice($cases1[$h], 0, 1);
+            $title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
+            if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
+            if ($output[0]['color']) $color1 = $output[0]['color'];
+        }
+        else if (count($cases1[$h]) > 1)
+        {
+            $title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
+            $color1='222222';
+        }
+
+        if (count($cases2[$h]) == 1)	// only 1 event
+        {
+            $output = array_slice($cases2[$h], 0, 1);
+            $title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
+            if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
+            if ($output[0]['color']) $color2 = $output[0]['color'];
+        }
+        else if (count($cases2[$h]) > 1)
+        {
+            $title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
+            $color2='222222';
+        }
+        print '<table class="nobordernopadding" width="100%">';
+        print '<tr><td '.($color1?'style="background: #'.$color1.';"':'').'class="'.($style1?$style1.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
+        print $string1;
+        print '</td><td '.($color2?'style="background: #'.$color2.';"':'').'class="'.($style2?$style2.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
+        print $string2;
+        print '</td></tr>';
+        print '</table>';
+        print '</td>';
+    }
 }

Braces +271 added lines, -118 removed lines

@@ -39,7 +39,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+    $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+}
 
 $filter = GETPOST("filter",'alpha',3);
 $filtert = GETPOST("filtert","int",3);
@@ -60,22 +62,36 @@ 
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="a.datec";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="a.datec";
+}
 
 // Security check
 $socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid='';
+if ($socid < 0) {
+    $socid='';
+}
 
 $canedit=1;
-if (! $user->rights->agenda->myactions->read) accessforbidden();
-if (! $user->rights->agenda->allactions->read) $canedit=0;
-if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
+if (! $user->rights->agenda->myactions->read) {
+    accessforbidden();
+}
+if (! $user->rights->agenda->allactions->read) {
+    $canedit=0;
+}
+if (! $user->rights->agenda->allactions->read || $filter =='mine') {
+    // If no permission to see all, we show only affected to me
 {
     $filtert=$user->id;
 }
+}
 
 //$action=GETPOST('action','alpha');
 $action='show_pertype';
@@ -92,13 +108,16 @@ 
 if (GETPOST('actioncode','array'))
 {
     $actioncode=GETPOST('actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
-}
-else
+    if (! count($actioncode)) {
+        $actioncode='0';
+    }
+    } else
 {
     $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode","alpha")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) {
+    $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 
 $dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth','int'), GETPOST('dateselectday','int'), GETPOST('dateselectyear','int'));
 if ($dateselect > 0)
@@ -112,17 +131,27 @@ 
 $tmparray=explode('-',$tmp);
 $begin_h = GETPOST('begin_h','int')!=''?GETPOST('begin_h','int'):($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h','int')?GETPOST('end_h','int'):($tmparray[1] != '' ? $tmparray[1] : 18);
-if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
-if ($end_h < 1 || $end_h > 24) $end_h = 18;
-if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+if ($begin_h < 0 || $begin_h > 23) {
+    $begin_h = 9;
+}
+if ($end_h < 1 || $end_h > 24) {
+    $end_h = 18;
+}
+if ($end_h <= $begin_h) {
+    $end_h = $begin_h + 1;
+}
 
 $tmp=empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)?'1-5':$conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmparray=explode('-',$tmp);
 $begin_d = 1;
 $end_d   = 53;
 
-if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) {
+    $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
+if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) {
+    $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+}
 
 if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser')  {
     $action='show_month'; $day='';
@@ -197,21 +226,47 @@ 
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
 $title=$langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title=$langs->trans("DoneActions");
-if ($status == 'todo') $title=$langs->trans("ToDoActions");
+if ($status == 'done') {
+    $title=$langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+    $title=$langs->trans("ToDoActions");
+}
 
 $param='';
-if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
-if ($resourceid > 0) $param.="&resourceid=".$resourceid;
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
-if ($filter)  $param.="&filter=".$filter;
-if ($filtert) $param.="&filtert=".$filtert;
-if ($usergroup) $param.="&usergroup=".$usergroup;
-if ($socid)   $param.="&socid=".$socid;
-if ($showbirthday) $param.="&showbirthday=1";
-if ($pid)     $param.="&projectid=".$pid;
-if ($type)   $param.="&type=".$type;
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser' || $action != 'show_pertype') $param.='&action='.$action;
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) {
+    $param.="&actioncode=".$actioncode;
+}
+if ($resourceid > 0) {
+    $param.="&resourceid=".$resourceid;
+}
+if ($status || isset($_GET['status']) || isset($_POST['status'])) {
+    $param.="&status=".$status;
+}
+if ($filter) {
+    $param.="&filter=".$filter;
+}
+if ($filtert) {
+    $param.="&filtert=".$filtert;
+}
+if ($usergroup) {
+    $param.="&usergroup=".$usergroup;
+}
+if ($socid) {
+    $param.="&socid=".$socid;
+}
+if ($showbirthday) {
+    $param.="&showbirthday=1";
+}
+if ($pid) {
+    $param.="&projectid=".$pid;
+}
+if ($type) {
+    $param.="&type=".$type;
+}
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser' || $action != 'show_pertype') {
+    $param.='&action='.$action;
+}
 $param.="&maxprint=".$maxprint;
 
 $prev = dol_get_first_day($year, 1);
@@ -329,8 +384,7 @@ 
 	    if (empty($reshook))
 	    {
 			$s.= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
@@ -347,7 +401,9 @@ 
 $eventarray=array();
 
 $sql = 'SELECT';
-if ($usergroup > 0) $sql.=" DISTINCT";
+if ($usergroup > 0) {
+    $sql.=" DISTINCT";
+}
 $sql.= ' a.id, a.label,';
 $sql.= ' a.datep,';
 $sql.= ' a.datep2,';
@@ -357,12 +413,20 @@ 
 $sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql.= ' ca.code, ca.color';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 // We must filter on resource table
-if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) {
+    $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+if ($filtert > 0 || $usergroup > 0) {
+    $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql.= ' WHERE a.fk_action = ca.id';
 $sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
@@ -370,30 +434,47 @@ 
 {
     if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
-        else
+        if ($actioncode == 'AC_NON_AUTO') {
+            $sql.= " AND ca.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+            $sql.= " AND ca.type = 'systemauto'";
+        } else
         {
-            if ($actioncode == 'AC_OTH') $sql.= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql.= " AND ca.type = 'systemauto'";
+            if ($actioncode == 'AC_OTH') {
+                $sql.= " AND ca.type != 'systemauto'";
+            }
+            if ($actioncode == 'AC_OTH_AUTO') {
+                $sql.= " AND ca.type = 'systemauto'";
+            }
         }
-    }
-    else
+    } else
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
-        else
+        if ($actioncode == 'AC_NON_AUTO') {
+            $sql.= " AND ca.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+            $sql.= " AND ca.type = 'systemauto'";
+        } else
         {
             $sql.=" AND ca.code IN ('".implode("','", explode(',',$actioncode))."')";
         }
     }
 }
-if ($resourceid > 0) $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+if ($resourceid > 0) {
+    $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+}
+if ($pid) {
+    $sql.=" AND a.fk_project=".$db->escape($pid);
+}
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+}
+if ($socid > 0) {
+    $sql.= ' AND a.fk_soc = '.$socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+if ($filtert > 0 || $usergroup > 0) {
+    $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
 if ($action == 'show_day')
 {
     $sql.= " AND (";
@@ -406,8 +487,7 @@ 
     $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
     $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
     $sql.= ')';
-}
-else
+} else
 {
     // To limit array
     $sql.= " AND (";
@@ -421,7 +501,9 @@ 
     $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,12,31,$year)+(60*60*24*7))."')";
     $sql.= ')';
 }
-if ($type) $sql.= " AND ca.id = ".$type;
+if ($type) {
+    $sql.= " AND ca.id = ".$type;
+}
 if ($status == '0') { $sql.= " AND a.percent = 0"; }
 if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
@@ -431,8 +513,12 @@ 
 if ($filtert > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
-    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    if ($filtert > 0) {
+        $sql.= "ar.fk_element = ".$filtert;
+    }
+    if ($usergroup > 0) {
+        $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    }
     $sql.= ")";
 }
 // Sort on date
@@ -488,14 +574,19 @@ 
         if ($event->percentage <= 0)
         {
         	$event->date_start_in_calendar=$datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-        	else $event->date_end_in_calendar=$datep;
-        }
-        else
+        	if ($datep2 != '' && $datep2 >= $datep) {
+        	    $event->date_end_in_calendar=$datep2;
+        	} else {
+        	    $event->date_end_in_calendar=$datep;
+        	}
+        } else
         {
         	$event->date_start_in_calendar=$datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-        	else $event->date_end_in_calendar=$datep;
+        	if ($datep2 != '' && $datep2 >= $datep) {
+        	    $event->date_end_in_calendar=$datep2;
+        	} else {
+        	    $event->date_end_in_calendar=$datep;
+        	}
         }
         // Define ponctual property
         if ($event->date_start_in_calendar == $event->date_end_in_calendar)
@@ -509,14 +600,17 @@ 
         {
             // This record is out of visible range
         	unset($event);
-        }
-        else
+        } else
 		{
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned();				// This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+			    $event->date_start_in_calendar=$firstdaytoshow;
+			}
+            if ($event->date_end_in_calendar >= $lastdaytoshow) {
+                $event->date_end_in_calendar=($lastdaytoshow - 1);
+            }
 
             // Add an entry in actionarray for each day
             $daycursor=$event->date_start_in_calendar;
@@ -535,7 +629,9 @@ 
                 $j++;
 
                 $daykey+=60*60*24;
-                if ($daykey > $event->date_end_in_calendar) $loop=false;
+                if ($daykey > $event->date_end_in_calendar) {
+                    $loop=false;
+                }
             }
             while ($loop);
 
@@ -544,8 +640,7 @@ 
         }
         $i++;
     }
-}
-else
+} else
 {
     dol_print_error($db);
 }
@@ -560,7 +655,9 @@ 
 {
     include_once $color_file;
 }
-if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+if (! is_array($theme_datacolor)) {
+    $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+}
 
 
 $newparam=$param;   // newparam is for birthday links
@@ -654,10 +751,16 @@ 
 		$tmpyear = $tmparray['year'];
 
 		$style='cal_current_month';
-		if ($iter_day == 6) $style.=' cal_other_month';
+		if ($iter_day == 6) {
+		    $style.=' cal_other_month';
+		}
 		$today=0;
-		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
-		if ($today) $style='cal_today_peruser';
+		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) {
+		    $today=1;
+		}
+		if ($today) {
+		    $style='cal_today_peruser';
+		}
 
 		show_day_events_pertype($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -785,7 +888,8 @@ 
 		$jour = date('d',$daykey);
 		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
 
-		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+		if ($day==$jour && $month==$mois && $year==$annee) {
+		    // Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
@@ -793,12 +897,18 @@ 
 				//var_dump($event);
 
 				$keysofuserassigned=array_keys($event->userassigned);
-				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+		}
+				if (! in_array($username->id,$keysofuserassigned)) {
+				    continue;
+				}
+				// We discard record if event is from another user than user we want to show
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
 				$parameters=array();
 				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+				    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 
 				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
 
@@ -807,9 +917,10 @@ 
 				if (in_array($user->id, $keysofuserassigned))
 				{
 					$nummytasks++; $cssclass='family_mytasks';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
-				}
-				else if ($event->type_code == 'ICALEVENT')
+					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+					    $color=$event->type_color;
+					}
+				} else if ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (! empty($event->icalname))
@@ -822,30 +933,34 @@ 
 
 					$color=$event->icalcolor;
 					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
-				}
-				else if ($event->type_code == 'BIRTHDAY')
+				} else if ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-				}
-				else
+				} else
 				{
 					$numother++; $cssclass='family_other';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+					    $color=$event->type_color;
+					}
 				}
 
-				if ($color < 0)	// Color was not forced. Set color according to color index.
+				if ($color < 0) {
+				    // Color was not forced. Set color according to color index.
 				{
 					// Define color index if not yet defined
 					$idusertouse=($event->userownerid?$event->userownerid:0);
+				}
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
-					}
-					else
+					} else
 					{
 						$colorindex=$nextindextouse;
 						$colorindexused[$idusertouse]=$colorindex;
-						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+						if (! empty($theme_datacolor[$nextindextouse+1])) {
+						    $nextindextouse++;
+						}
+						// Prepare to use next color
 					}
 					// Define color
 					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
@@ -864,7 +979,9 @@ 
 						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
 
 						$dateendtouse=$event->date_end_in_calendar;
-						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+						if ($dateendtouse==$event->date_start_in_calendar) {
+						    $dateendtouse++;
+						}
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
@@ -877,8 +994,11 @@ 
 			        		{
 				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
 				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+				        		    $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+				        		} else {
+				        		    $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		}
 			        		}
 							$cases1[$h][$event->id]['string'].=' - '.$event->label;
 							$cases1[$h][$event->id]['typecode']=$event->type_code;
@@ -923,8 +1043,11 @@ 
 			        		{
 				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
 				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+				        		    $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+				        		} else {
+				        		    $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		}
 			        		}
 							$cases2[$h][$event->id]['string'].=' - '.$event->label;
 							$cases2[$h][$event->id]['typecode']=$event->type_code;
@@ -960,8 +1083,7 @@ 
 								$cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
-					}
-					else
+					} else
 					{
 						$busy=$event->transparency;
 						$cases1[$h][$event->id]['busy']=$busy;
@@ -991,55 +1113,86 @@ 
 		if (isset($cases1[$h]) && $cases1[$h] != '')
 		{
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			if (count($cases1[$h]) > 1) {
+			    $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			}
 			$string1='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
-			else $style1='peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			    $style1='peruser_notbusy';
+			} else {
+			    $style1='peruser_busy';
+			}
 			foreach($cases1[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style1='peruser_busy';
+				if ($ev['busy']) {
+				    $style1='peruser_busy';
+				}
 			}
 		}
 		if (isset($cases2[$h]) && $cases2[$h] != '')
 		{
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			if (count($cases2[$h]) > 1) {
+			    $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			}
 			$string2='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
-			else $style2='peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			    $style2='peruser_notbusy';
+			} else {
+			    $style2='peruser_busy';
+			}
 			foreach($cases2[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style2='peruser_busy';
+				if ($ev['busy']) {
+				    $style2='peruser_busy';
+				}
 			}
 		}
 
 		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+		if (count($cases1[$h]) && array_keys($cases1[$h])) {
+		    $ids1=join(',',array_keys($cases1[$h]));
+		}
+		if (count($cases2[$h]) && array_keys($cases2[$h])) {
+		    $ids2=join(',',array_keys($cases2[$h]));
+		}
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
+		if ($h == $begin_h) {
+		    echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+		} else {
+		    echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+		}
+		if (count($cases1[$h]) == 1) {
+		    // only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
 		}
-		else if (count($cases1[$h]) > 1)
+			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
+			if ($output[0]['string']) {
+			    $title1.=($title1?' - ':'').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+			    $color1 = $output[0]['color'];
+			}
+		} else if (count($cases1[$h]) > 1)
 		{
 			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
 			$color1='222222';
 		}
 
-		if (count($cases2[$h]) == 1)	// only 1 event
+		if (count($cases2[$h]) == 1) {
+		    // only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
 		}
-		else if (count($cases2[$h]) > 1)
+			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
+			if ($output[0]['string']) {
+			    $title2.=($title2?' - ':'').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+			    $color2 = $output[0]['color'];
+			}
+		} else if (count($cases2[$h]) > 1)
 		{
 			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
 			$color2='222222';

Spacing +405 added lines, -405 removed lines

@@ -31,7 +31,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -42,11 +42,11 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 
-$filter = GETPOST("filter",'alpha',3);
-$filtert = GETPOST("filtert","int",3);
-$usergroup = GETPOST("usergroup","int",3);
+$filter = GETPOST("filter", 'alpha', 3);
+$filtert = GETPOST("filtert", "int", 3);
+$usergroup = GETPOST("usergroup", "int", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 $showbirthday = 0;
@@ -54,90 +54,90 @@ 
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
-	$filtert=$user->id;
+	$filtert = $user->id;
 }
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page","int");
+$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
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="a.datec";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "a.datec";
 
 // Security check
-$socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST("socid", "int");
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid='';
+if ($socid < 0) $socid = '';
 
-$canedit=1;
-if (! $user->rights->agenda->myactions->read) accessforbidden();
-if (! $user->rights->agenda->allactions->read) $canedit=0;
-if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
+$canedit = 1;
+if (!$user->rights->agenda->myactions->read) accessforbidden();
+if (!$user->rights->agenda->allactions->read) $canedit = 0;
+if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
 {
-    $filtert=$user->id;
+    $filtert = $user->id;
 }
 
 //$action=GETPOST('action','alpha');
-$action='show_pertype';
-$resourceid=GETPOST("resourceid","int");
-$year=GETPOST("year","int")?GETPOST("year","int"):date("Y");
-$month=GETPOST("month","int")?GETPOST("month","int"):date("m");
-$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
-$day=GETPOST("day","int")?GETPOST("day","int"):date("d");
-$pid=GETPOST("projectid","int",3);
-$status=GETPOST("status",'alpha');
-$type=GETPOST("type",'alpha');
-$maxprint=((GETPOST("maxprint",'int')!='')?GETPOST("maxprint",'int'):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$action = 'show_pertype';
+$resourceid = GETPOST("resourceid", "int");
+$year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
+$month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
+$week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
+$day = GETPOST("day", "int") ?GETPOST("day", "int") : date("d");
+$pid = GETPOST("projectid", "int", 3);
+$status = GETPOST("status", 'alpha');
+$type = GETPOST("type", 'alpha');
+$maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('actioncode','array'))
+if (GETPOST('actioncode', 'array'))
 {
-    $actioncode=GETPOST('actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
+    $actioncode = GETPOST('actioncode', 'array', 3);
+    if (!count($actioncode)) $actioncode = '0';
 }
 else
 {
-    $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode","alpha")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
-$dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth','int'), GETPOST('dateselectday','int'), GETPOST('dateselectyear','int'));
+$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
 if ($dateselect > 0)
 {
-	$day=GETPOST('dateselectday','int');
-	$month=GETPOST('dateselectmonth','int');
-	$year=GETPOST('dateselectyear','int');
+	$day = GETPOST('dateselectday', 'int');
+	$month = GETPOST('dateselectmonth', 'int');
+	$year = GETPOST('dateselectyear', 'int');
 }
 
-$tmp=empty($conf->global->MAIN_DEFAULT_WORKING_HOURS)?'9-18':$conf->global->MAIN_DEFAULT_WORKING_HOURS;
-$tmparray=explode('-',$tmp);
-$begin_h = GETPOST('begin_h','int')!=''?GETPOST('begin_h','int'):($tmparray[0] != '' ? $tmparray[0] : 9);
-$end_h   = GETPOST('end_h','int')?GETPOST('end_h','int'):($tmparray[1] != '' ? $tmparray[1] : 18);
+$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmparray = explode('-', $tmp);
+$begin_h = GETPOST('begin_h', 'int') != '' ?GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOST('end_h', 'int') ?GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
 if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
 if ($end_h < 1 || $end_h > 24) $end_h = 18;
 if ($end_h <= $begin_h) $end_h = $begin_h + 1;
 
-$tmp=empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)?'1-5':$conf->global->MAIN_DEFAULT_WORKING_DAYS;
-$tmparray=explode('-',$tmp);
+$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
+$tmparray = explode('-', $tmp);
 $begin_d = 1;
 $end_d   = 53;
 
-if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 
-if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser')  {
-    $action='show_month'; $day='';
+if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
+    $action = 'show_month'; $day = '';
 }                                                   // View by month
-if (GETPOST('viewweek','alpha') || $action == 'show_week') {
-    $action='show_week'; $week=($week?$week:date("W")); $day=($day?$day:date("d"));
+if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
+    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
-if (GETPOST('viewday','alpha') || $action == 'show_day')  {
-    $action='show_day'; $day=($day?$day:date("d"));
+if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
+    $action = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
-if (GETPOST('viewyear','alpha') || $action == 'show_year')  {
-    $action='show_year';
+if (GETPOST('viewyear', 'alpha') || $action == 'show_year') {
+    $action = 'show_year';
 }                                  // View by year
 
 // Load translation files required by the page
@@ -151,11 +151,11 @@ 
  * Actions
  */
 
-if ($action =='delete_action')
+if ($action == 'delete_action')
 {
     $event = new ActionComm($db);
     $event->fetch($actionid);
-    $result=$event->delete();
+    $result = $event->delete();
 }
 
 
@@ -164,21 +164,21 @@ 
  * View
  */
 
-$form=new Form($db);
-$companystatic=new Societe($db);
+$form = new Form($db);
+$companystatic = new Societe($db);
 
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
+llxHeader('', $langs->trans("Agenda"), $help_url);
 
-$now=dol_now();
-$nowarray=dol_getdate($now);
-$nowyear=$nowarray['year'];
-$nowmonth=$nowarray['mon'];
-$nowday=$nowarray['mday'];
+$now = dol_now();
+$nowarray = dol_getdate($now);
+$nowyear = $nowarray['year'];
+$nowmonth = $nowarray['mon'];
+$nowday = $nowarray['mday'];
 
 
 // Define list of all external calendars (global setup)
-$listofextcals=array();
+$listofextcals = array();
 
 $prev = dol_get_first_day($year, $month);
 $first_day   = 1;
@@ -193,36 +193,36 @@ 
 $next_month = $month;
 $next_day   = $day;
 
-$max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
 //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
-$title=$langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title=$langs->trans("DoneActions");
-if ($status == 'todo') $title=$langs->trans("ToDoActions");
-
-$param='';
-if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
-if ($resourceid > 0) $param.="&resourceid=".$resourceid;
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
-if ($filter)  $param.="&filter=".$filter;
-if ($filtert) $param.="&filtert=".$filtert;
-if ($usergroup) $param.="&usergroup=".$usergroup;
-if ($socid)   $param.="&socid=".$socid;
-if ($showbirthday) $param.="&showbirthday=1";
-if ($pid)     $param.="&projectid=".$pid;
-if ($type)   $param.="&type=".$type;
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser' || $action != 'show_pertype') $param.='&action='.$action;
-$param.="&maxprint=".$maxprint;
+$title = $langs->trans("DoneAndToDoActions");
+if ($status == 'done') $title = $langs->trans("DoneActions");
+if ($status == 'todo') $title = $langs->trans("ToDoActions");
+
+$param = '';
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param .= "&actioncode=".$actioncode;
+if ($resourceid > 0) $param .= "&resourceid=".$resourceid;
+if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&status=".$status;
+if ($filter)  $param .= "&filter=".$filter;
+if ($filtert) $param .= "&filtert=".$filtert;
+if ($usergroup) $param .= "&usergroup=".$usergroup;
+if ($socid)   $param .= "&socid=".$socid;
+if ($showbirthday) $param .= "&showbirthday=1";
+if ($pid)     $param .= "&projectid=".$pid;
+if ($type)   $param .= "&type=".$type;
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser' || $action != 'show_pertype') $param .= '&action='.$action;
+$param .= "&maxprint=".$maxprint;
 
 $prev = dol_get_first_day($year, 1);
 $prev_year  = $year - 1;
 $prev_month = $month;
 $prev_day   = $day;
 $first_day  = 1;
-$first_month= 1;
+$first_month = 1;
 $first_year = $year;
 
 $week = $prev['week'];
@@ -234,52 +234,52 @@ 
 $next_day   = $day;
 
 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
-$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
+$lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
 //print dol_print_date($firstdaytoshow,'dayhour');
 //print dol_print_date($lastdaytoshow,'dayhour');
 
-$max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
 
-$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
-$nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y")."</span> \n";
-$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
-$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
-$picto='calendarweek';
-
-$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-$nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-$nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
-$nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
-$nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
-$nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
-$nav.='<input type="hidden" name="status" value="' . $status . '">';
-$nav.='<input type="hidden" name="socid" value="' . $socid . '">';
-$nav.='<input type="hidden" name="projectid" value="' . $projectid . '">';
-$nav.='<input type="hidden" name="begin_h" value="' . $begin_h . '">';
-$nav.='<input type="hidden" name="end_h" value="' . $end_h . '">';
-$nav.='<input type="hidden" name="begin_d" value="' . $begin_d . '">';
-$nav.='<input type="hidden" name="end_d" value="' . $end_d . '">';
-$nav.='<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
-
-$nav.= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
-$nav.='</form>';
+$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y")."</span> \n";
+$nav .= "<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$picto = 'calendarweek';
+
+$nav .= ' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+$nav .= '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+$nav .= '<input type="hidden" name="action" value="'.$action.'">';
+$nav .= '<input type="hidden" name="filtert" value="'.$filtert.'">';
+$nav .= '<input type="hidden" name="usergroup" value="'.$usergroup.'">';
+$nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+$nav .= '<input type="hidden" name="resourceid" value="'.$resourceid.'">';
+$nav .= '<input type="hidden" name="status" value="'.$status.'">';
+$nav .= '<input type="hidden" name="socid" value="'.$socid.'">';
+$nav .= '<input type="hidden" name="projectid" value="'.$projectid.'">';
+$nav .= '<input type="hidden" name="begin_h" value="'.$begin_h.'">';
+$nav .= '<input type="hidden" name="end_h" value="'.$end_h.'">';
+$nav .= '<input type="hidden" name="begin_d" value="'.$begin_d.'">';
+$nav .= '<input type="hidden" name="end_d" value="'.$end_d.'">';
+$nav .= '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
+
+$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
+$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav .= '</form>';
 
 // Must be after the nav definition
-$param.='&year='.$year.'&month='.$month.($day?'&day='.$day:'');
+$param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
 //print 'x'.$param;
 
 
 
 
-$tabactive='cardpertype';
+$tabactive = 'cardpertype';
 
-$paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
+$paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
 $head = calendars_prepare_head($paramnoaction);
 
@@ -287,51 +287,51 @@ 
 print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
 dol_fiche_end();
 
-$showextcals=$listofextcals;
+$showextcals = $listofextcals;
 // Legend
 if ($conf->use_javascript_ajax)
 {
-	$s='';
-	$s.='<script type="text/javascript">' . "\n";
-	$s.='jQuery(document).ready(function () {' . "\n";
-	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
-	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
-	$s.='jQuery(".family_birthday").toggle();' . "\n";
-	if ($action=="show_week" || $action=="show_month" || empty($action))
+	$s = '';
+	$s .= '<script type="text/javascript">'."\n";
+	$s .= 'jQuery(document).ready(function () {'."\n";
+	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
+	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
+	$s .= 'jQuery(".family_birthday").toggle();'."\n";
+	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+    	$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+    	$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
-  	$s.='});' . "\n";
-	$s.='</script>' . "\n";
-	if (! empty($conf->use_javascript_ajax))
+  	$s .= '});'."\n";
+	$s .= '</script>'."\n";
+	if (!empty($conf->use_javascript_ajax))
 	{
-		$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+		$s .= '<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 		if (is_array($showextcals) && count($showextcals) > 0)
 		{
 			foreach ($showextcals as $val)
 			{
 				$htmlname = md5($val['name']);
-				$s.='<script type="text/javascript">' . "\n";
-				$s.='jQuery(document).ready(function () {' . "\n";
-				$s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
-				$s.=' 		/* alert("'.$htmlname.'"); */';
-				$s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
-				$s.='		});' . "\n";
-				$s.='});' . "\n";
-				$s.='</script>' . "\n";
-				$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val ['name'] . ' &nbsp; </div>';
+				$s .= '<script type="text/javascript">'."\n";
+				$s .= 'jQuery(document).ready(function () {'."\n";
+				$s .= '		jQuery("#check_ext'.$htmlname.'").click(function() {';
+				$s .= ' 		/* alert("'.$htmlname.'"); */';
+				$s .= ' 		jQuery(".family_ext'.$htmlname.'").toggle();';
+				$s .= '		});'."\n";
+				$s .= '});'."\n";
+				$s .= '</script>'."\n";
+				$s .= '<div class="nowrap float"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> '.$val ['name'].' &nbsp; </div>';
 			}
 		}
 
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-	    $parameters=array(); $object=null;
-		$reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
+	    $parameters = array(); $object = null;
+		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
 	    if (empty($reshook))
 	    {
-			$s.= $hookmanager->resPrint;
+			$s .= $hookmanager->resPrint;
 	    }
 	    elseif ($reshook > 1)
 		{
@@ -342,168 +342,168 @@ 
 
 
 
-$link='';
+$link = '';
 print load_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav, '');
 
 
 // Get event in an array
-$eventarray=array();
+$eventarray = array();
 
 $sql = 'SELECT';
-if ($usergroup > 0) $sql.=" DISTINCT";
-$sql.= ' a.id, a.label,';
-$sql.= ' a.datep,';
-$sql.= ' a.datep2,';
-$sql.= ' a.percent,';
-$sql.= ' a.fk_user_author,a.fk_user_action,';
-$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
-$sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
-$sql.= ' ca.code, ca.color';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if ($usergroup > 0) $sql .= " DISTINCT";
+$sql .= ' a.id, a.label,';
+$sql .= ' a.datep,';
+$sql .= ' a.datep2,';
+$sql .= ' a.percent,';
+$sql .= ' a.fk_user_author,a.fk_user_action,';
+$sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
+$sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
+$sql .= ' ca.code, ca.color';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 // We must filter on resource table
-if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
-$sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
+if ($filtert > 0 || $usergroup > 0) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+$sql .= ' WHERE a.fk_action = ca.id';
+$sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
-if (! empty($actioncode))
+if (!empty($actioncode))
 {
     if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
+        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else
         {
-            if ($actioncode == 'AC_OTH') $sql.= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql.= " AND ca.type = 'systemauto'";
+            if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
+            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
     }
     else
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
+        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else
         {
-            $sql.=" AND ca.code IN ('".implode("','", explode(',',$actioncode))."')";
+            $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
         }
     }
 }
-if ($resourceid > 0) $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
-    $sql.= " AND (";
-    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
-    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
-    $sql.= " OR ";
-    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
-    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
-    $sql.= " OR ";
-    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
-    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
-    $sql.= ')';
+    $sql .= " AND (";
+    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+    $sql .= " OR ";
+    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+    $sql .= " OR ";
+    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+    $sql .= ')';
 }
 else
 {
     // To limit array
-    $sql.= " AND (";
-    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,1,1,$year)-(60*60*24*7))."'";   // Start 7 days before
-    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,12,31,$year)+(60*60*24*7))."')";     // End 7 days after
-    $sql.= " OR ";
-    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,1,1,$year)-(60*60*24*7))."'";
-    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,12,31,$year)+(60*60*24*7))."')";
-    $sql.= " OR ";
-    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,12,1,$year)-(60*60*24*7))."'";
-    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,12,31,$year)+(60*60*24*7))."')";
-    $sql.= ')';
+    $sql .= " AND (";
+    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')"; // End 7 days after
+    $sql .= " OR ";
+    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'";
+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
+    $sql .= " OR ";
+    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, 12, 1, $year) - (60 * 60 * 24 * 7))."'";
+    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
+    $sql .= ')';
 }
-if ($type) $sql.= " AND ca.id = ".$type;
-if ($status == '0') { $sql.= " AND a.percent = 0"; }
-if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
-if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
-if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100)"; }
-if ($status == 'todo') { $sql.= " AND (a.percent >= 0 AND a.percent < 100)"; }
+if ($type) $sql .= " AND ca.id = ".$type;
+if ($status == '0') { $sql .= " AND a.percent = 0"; }
+if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
+if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
+if ($status == 'done' || $status == '100') { $sql .= " AND (a.percent = 100)"; }
+if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql.= " AND (";
-    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
-    $sql.= ")";
+    $sql .= " AND (";
+    if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
+    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+    $sql .= ")";
 }
 // Sort on date
-$sql.= ' ORDER BY fk_user_action, datep'; //fk_user_action
+$sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
 //print $sql;
 
 dol_syslog("comm/action/index.php", LOG_DEBUG);
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
-    $i=0;
+    $i = 0;
     while ($i < $num)
     {
         $obj = $db->fetch_object($resql);
 
         // Discard auto action if option is on
-        if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
         {
         	$i++;
         	continue;
         }
 
-        $datep=$db->jdate($obj->datep);
-        $datep2=$db->jdate($obj->datep2);
+        $datep = $db->jdate($obj->datep);
+        $datep2 = $db->jdate($obj->datep2);
 
         // Create a new object action
-        $event=new ActionComm($db);
-        $event->id=$obj->id;
-        $event->datep=$datep;      // datep and datef are GMT date
-        $event->datef=$datep2;
-        $event->type_code=$obj->code;
-        $event->type_color=$obj->color;
-        $event->label=$obj->label;
-        $event->percentage=$obj->percent;
-        $event->authorid=$obj->fk_user_author;		// user id of creator
-        $event->userownerid=$obj->fk_user_action;	// user id of owner
-        $event->priority=$obj->priority;
-        $event->fulldayevent=$obj->fulldayevent;
-        $event->location=$obj->location;
-        $event->transparency=$obj->transparency;
-
-        $event->fk_project=$obj->fk_project;
-
-        $event->socid=$obj->fk_soc;
-        $event->contactid=$obj->fk_contact;
-
-        $event->fk_element=$obj->fk_element;
-        $event->elementtype=$obj->elementtype;
+        $event = new ActionComm($db);
+        $event->id = $obj->id;
+        $event->datep = $datep; // datep and datef are GMT date
+        $event->datef = $datep2;
+        $event->type_code = $obj->code;
+        $event->type_color = $obj->color;
+        $event->label = $obj->label;
+        $event->percentage = $obj->percent;
+        $event->authorid = $obj->fk_user_author; // user id of creator
+        $event->userownerid = $obj->fk_user_action; // user id of owner
+        $event->priority = $obj->priority;
+        $event->fulldayevent = $obj->fulldayevent;
+        $event->location = $obj->location;
+        $event->transparency = $obj->transparency;
+
+        $event->fk_project = $obj->fk_project;
+
+        $event->socid = $obj->fk_soc;
+        $event->contactid = $obj->fk_contact;
+
+        $event->fk_element = $obj->fk_element;
+        $event->elementtype = $obj->elementtype;
 
         // Defined date_start_in_calendar and date_end_in_calendar property
         // They are date start and end of action but modified to not be outside calendar view.
         if ($event->percentage <= 0)
         {
-        	$event->date_start_in_calendar=$datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-        	else $event->date_end_in_calendar=$datep;
+        	$event->date_start_in_calendar = $datep;
+        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+        	else $event->date_end_in_calendar = $datep;
         }
         else
         {
-        	$event->date_start_in_calendar=$datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-        	else $event->date_end_in_calendar=$datep;
+        	$event->date_start_in_calendar = $datep;
+        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+        	else $event->date_end_in_calendar = $datep;
         }
         // Define ponctual property
         if ($event->date_start_in_calendar == $event->date_end_in_calendar)
         {
-            $event->ponctuel=1;
+            $event->ponctuel = 1;
         }
 
         // Check values
@@ -516,29 +516,29 @@ 
         else
 		{
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
-			$event->fetch_userassigned();				// This load $event->userassigned
+			$event->fetch_userassigned(); // This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
+            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
             // Add an entry in actionarray for each day
-            $daycursor=$event->date_start_in_calendar;
-            $annee = date('Y',$daycursor);
-            $mois = date('m',$daycursor);
-            $jour = date('d',$daycursor);
+            $daycursor = $event->date_start_in_calendar;
+            $annee = date('Y', $daycursor);
+            $mois = date('m', $daycursor);
+            $jour = date('d', $daycursor);
 
             // Loop on each day covered by action to prepare an index to show on calendar
-            $loop=true; $j=0;
-            $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
+            $loop = true; $j = 0;
+            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
             do
 			{
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
-                $eventarray[$daykey][]=$event;
+                $eventarray[$daykey][] = $event;
                 $j++;
 
-                $daykey+=60*60*24;
-                if ($daykey > $event->date_end_in_calendar) $loop=false;
+                $daykey += 60 * 60 * 24;
+                if ($daykey > $event->date_end_in_calendar) $loop = false;
             }
             while ($loop);
 
@@ -553,9 +553,9 @@ 
     dol_print_error($db);
 }
 
-$maxnbofchar=18;
-$cachethirdparties=array();
-$cachecontacts=array();
+$maxnbofchar = 18;
+$cachethirdparties = array();
+$cachecontacts = array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
@@ -563,24 +563,24 @@ 
 {
     include_once $color_file;
 }
-if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 
 
-$newparam=$param;   // newparam is for birthday links
-$newparam=preg_replace('/showbirthday=/i','showbirthday_=',$newparam);	// To avoid replacement when replace day= is done
-$newparam=preg_replace('/action=show_month&?/i','',$newparam);
-$newparam=preg_replace('/action=show_week&?/i','',$newparam);
-$newparam=preg_replace('/day=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
-$newparam.='&viewweek=1';
+$newparam = $param; // newparam is for birthday links
+$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
+$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
+$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+$newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/viewweek=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
+$newparam .= '&viewweek=1';
 
 echo '<form id="move_event" action="" method="POST"><input type="hidden" name="action" value="mupdate">';
 echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 echo '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-echo '<input type="hidden" name="newdate" id="newdate">' ;
+echo '<input type="hidden" name="newdate" id="newdate">';
 echo '</form>';
 
 
@@ -593,7 +593,7 @@ 
 
 echo '<tr class="liste_titre">';
 echo '<td></td>';
-$i=0;	// 0 = sunday,
+$i = 0; // 0 = sunday,
 echo '<td align="center" colspan="'.($end_d - $begin_d).'">';
 echo $langs->trans("Year");
 print "<br>";
@@ -603,40 +603,40 @@ 
 
 echo '<tr class="liste_titre">';
 echo '<td></td>';
-$i=0;
+$i = 0;
 for ($h = $begin_d; $h < $end_d; $h++)
 {
 	echo '<td align="center">';
-	print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
+	print '<small style="font-family: courier">'.sprintf("%02d", $h).'</small>';
 	print "</td>";
 }
 echo "</td>\n";
 echo "</tr>\n";
 
 
-$typeofevents=array();
+$typeofevents = array();
 
 // Load array of colors by type
-$colorsbytype=array();
-$labelbytype=array();
-$sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm";
-$resql=$db->query($sql);
+$colorsbytype = array();
+$labelbytype = array();
+$sql = "SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm";
+$resql = $db->query($sql);
 while ($obj = $db->fetch_object($resql))
 {
-	$colorsbytype[$obj->code]=$obj->color;
-	$labelbytype[$obj->code]=$obj->libelle;
+	$colorsbytype[$obj->code] = $obj->color;
+	$labelbytype[$obj->code] = $obj->libelle;
 }
 
 // Loop on each user to show calendar
-$todayarray=dol_getdate($now,'fast');
+$todayarray = dol_getdate($now, 'fast');
 $sav = $tmpday;
 $showheader = true;
 $var = false;
 foreach ($typeofevents as $typeofevent)
 {
-	$var = ! $var;
+	$var = !$var;
 	echo "<tr>";
-	echo '<td class="cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">' . $username->getNomUrl(1). '</td>';
+	echo '<td class="cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">'.$username->getNomUrl(1).'</td>';
 	$tmpday = $sav;
 
 	// Lopp on each day of week
@@ -651,16 +651,16 @@ 
 
         // Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-		$tmparray = dol_getdate($curtime,'fast');
+		$tmparray = dol_getdate($curtime, 'fast');
 		$tmpday = $tmparray['mday'];
 		$tmpmonth = $tmparray['mon'];
 		$tmpyear = $tmparray['year'];
 
-		$style='cal_current_month';
-		if ($iter_day == 6) $style.=' cal_other_month';
-		$today=0;
-		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
-		if ($today) $style='cal_today_peruser';
+		$style = 'cal_current_month';
+		if ($iter_day == 6) $style .= ' cal_other_month';
+		$today = 0;
+		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
+		if ($today) $style = 'cal_today_peruser';
 
 		show_day_events_pertype($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -673,16 +673,16 @@ 
 echo "</table>\n";
 
 
-if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
-	foreach($colorsbytype as $code => $color)
+	foreach ($colorsbytype as $code => $color)
 	{
 		if ($color)
 		{
-			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
-			print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
+			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color ? 'background: #'.$color.';' : '').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+			print $langs->trans("Action".$code) != "Action".$code ? $langs->trans("Action".$code) : $labelbytype[$code];
 			//print $code;
 			print '</div>';
 		}
@@ -760,98 +760,98 @@ 
  * @param	bool	$var			true or false for alternat style on tr/td
  * @return	void
  */
-function show_day_events_pertype($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)
+function show_day_events_pertype($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $showheader = false, $colorsbytype = array(), $var = false)
 {
 	global $db;
 	global $user, $conf, $langs, $hookmanager, $action;
-	global $filter, $filtert, $status, $actioncode;	// Filters used into search form
-	global $theme_datacolor;	// Array with a list of different we can use (come from theme)
+	global $filter, $filtert, $status, $actioncode; // Filters used into search form
+	global $theme_datacolor; // Array with a list of different we can use (come from theme)
 	global $cachethirdparties, $cachecontacts, $cacheprojects, $colorindexused;
 	global $begin_h, $end_h;
 
-	$cases1 = array();	// Color first half hour
+	$cases1 = array(); // Color first half hour
 	$cases2 = array(); // Color second half hour
 
 	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
 
-	$i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
-	$ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+	$i = 0; $nummytasks = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
+	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
-	$nextindextouse=count($colorindexused);	// At first run, this is 0, so fist user has 0, next 1, ...
+	$nextindextouse = count($colorindexused); // At first run, this is 0, so fist user has 0, next 1, ...
 	//if ($username->id && $day==1) var_dump($eventarray);
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused)
 	{
-		$annee = date('Y',$daykey);
-		$mois = date('m',$daykey);
-		$jour = date('d',$daykey);
+		$annee = date('Y', $daykey);
+		$mois = date('m', $daykey);
+		$jour = date('d', $daykey);
 		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
 
-		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
 			{
 				//var_dump($event);
 
-				$keysofuserassigned=array_keys($event->userassigned);
-				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+				$keysofuserassigned = array_keys($event->userassigned);
+				if (!in_array($username->id, $keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
-				$parameters=array();
-				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formatEvent', $parameters, $event, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
-				$color=-1; $cssclass=''; $colorindex=-1;
+				$color = -1; $cssclass = ''; $colorindex = -1;
 				if (in_array($user->id, $keysofuserassigned))
 				{
-					$nummytasks++; $cssclass='family_mytasks';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+					$nummytasks++; $cssclass = 'family_mytasks';
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
 				}
 				else if ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
-					if (! empty($event->icalname))
+					if (!empty($event->icalname))
 					{
-						if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
+						if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
 							$numicals[dol_string_nospecial($event->icalname)] = 0;
 						}
 						$numicals[dol_string_nospecial($event->icalname)]++;
 					}
 
-					$color=$event->icalcolor;
-					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
+					$color = $event->icalcolor;
+					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
 				}
 				else if ($event->type_code == 'BIRTHDAY')
 				{
-					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
 				else
 				{
-					$numother++; $cssclass='family_other';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+					$numother++; $cssclass = 'family_other';
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
 				}
 
 				if ($color < 0)	// Color was not forced. Set color according to color index.
 				{
 					// Define color index if not yet defined
-					$idusertouse=($event->userownerid?$event->userownerid:0);
+					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
 					if (isset($colorindexused[$idusertouse]))
 					{
-						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
+						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					}
 					else
 					{
-						$colorindex=$nextindextouse;
-						$colorindexused[$idusertouse]=$colorindex;
-						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+						$colorindex = $nextindextouse;
+						$colorindexused[$idusertouse] = $colorindex;
+						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
 					}
 					// Define color
-					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
 				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
 
@@ -862,195 +862,195 @@ 
 					$newcolor = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
-						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
-						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
+						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, false, 0);
+						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, false, 0);
+						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, false, 0);
 
-						$dateendtouse=$event->date_end_in_calendar;
-						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+						$dateendtouse = $event->date_end_in_calendar;
+						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
 						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
 						{
-							$busy=$event->transparency;
-							$cases1[$h][$event->id]['busy']=$busy;
-							$cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+							$busy = $event->transparency;
+							$cases1[$h][$event->id]['busy'] = $busy;
+							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
+				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+				        		else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
 			        		}
-							$cases1[$h][$event->id]['string'].=' - '.$event->label;
-							$cases1[$h][$event->id]['typecode']=$event->type_code;
-							$cases1[$h][$event->id]['color']=$color;
+							$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
+							$cases1[$h][$event->id]['typecode'] = $event->type_code;
+							$cases1[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
 							{
 								if (empty($cacheprojects[$event->fk_project]))
 								{
-									$tmpproj=new Project($db);
+									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
+									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
-								$cases1[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+								$cases1[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
 							if ($event->socid > 0)
 							{
 								if (empty($cachethirdparties[$event->socid]))
 								{
-									$tmpthirdparty=new Societe($db);
+									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
+									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
-								$cases1[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
 							if ($event->contactid > 0)
 							{
 								if (empty($cachecontacts[$event->contactid]))
 								{
-									$tmpcontact=new Contact($db);
+									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
+									$cachecontacts[$event->contactid] = $tmpcontact;
 								}
-								$cases1[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
 						{
-							$busy=$event->transparency;
-							$cases2[$h][$event->id]['busy']=$busy;
-							$cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+							$busy = $event->transparency;
+							$cases2[$h][$event->id]['busy'] = $busy;
+							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
+				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+				        		else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
 			        		}
-							$cases2[$h][$event->id]['string'].=' - '.$event->label;
-							$cases2[$h][$event->id]['typecode']=$event->type_code;
-							$cases2[$h][$event->id]['color']=$color;
+							$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
+							$cases2[$h][$event->id]['typecode'] = $event->type_code;
+							$cases2[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
 							{
 								if (empty($cacheprojects[$event->fk_project]))
 								{
-									$tmpproj=new Project($db);
+									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
+									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
-								$cases2[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+								$cases2[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
 							if ($event->socid > 0)
 							{
 								if (empty($cachethirdparties[$event->socid]))
 								{
-									$tmpthirdparty=new Societe($db);
+									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
+									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
-								$cases2[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
 							if ($event->contactid > 0)
 							{
 								if (empty($cachecontacts[$event->contactid]))
 								{
-									$tmpcontact=new Contact($db);
+									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
+									$cachecontacts[$event->contactid] = $tmpcontact;
 								}
-								$cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
 					}
 					else
 					{
-						$busy=$event->transparency;
-						$cases1[$h][$event->id]['busy']=$busy;
-						$cases2[$h][$event->id]['busy']=$busy;
-						$cases1[$h][$event->id]['string']=$event->label;
-						$cases2[$h][$event->id]['string']=$event->label;
-						$cases1[$h][$event->id]['typecode']=$event->type_code;
-						$cases2[$h][$event->id]['typecode']=$event->type_code;
-						$cases1[$h][$event->id]['color']=$color;
-						$cases2[$h][$event->id]['color']=$color;
+						$busy = $event->transparency;
+						$cases1[$h][$event->id]['busy'] = $busy;
+						$cases2[$h][$event->id]['busy'] = $busy;
+						$cases1[$h][$event->id]['string'] = $event->label;
+						$cases2[$h][$event->id]['string'] = $event->label;
+						$cases1[$h][$event->id]['typecode'] = $event->type_code;
+						$cases2[$h][$event->id]['typecode'] = $event->type_code;
+						$cases1[$h][$event->id]['color'] = $color;
+						$cases2[$h][$event->id]['color'] = $color;
 					}
 				}
 				$i++;
 			}
 
-			break;	// We found the date we were looking for. No need to search anymore.
+			break; // We found the date we were looking for. No need to search anymore.
 		}
 	}
 
 	// Now output $casesX
 	for ($h = $begin_h; $h < $end_h; $h++)
 	{
-		$color1='';$color2='';
-		$style1='';$style2='';
-		$string1='&nbsp;';$string2='&nbsp;';
-		$title1='';$title2='';
+		$color1 = ''; $color2 = '';
+		$style1 = ''; $style2 = '';
+		$string1 = '&nbsp;'; $string2 = '&nbsp;';
+		$title1 = ''; $title2 = '';
 		if (isset($cases1[$h]) && $cases1[$h] != '')
 		{
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string1='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
-			else $style1='peruser_busy';
-			foreach($cases1[$h] as $id => $ev)
+			if (count($cases1[$h]) > 1) $title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			$string1 = '&nbsp;';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1 = 'peruser_notbusy';
+			else $style1 = 'peruser_busy';
+			foreach ($cases1[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style1='peruser_busy';
+				if ($ev['busy']) $style1 = 'peruser_busy';
 			}
 		}
 		if (isset($cases2[$h]) && $cases2[$h] != '')
 		{
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string2='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
-			else $style2='peruser_busy';
-			foreach($cases2[$h] as $id => $ev)
+			if (count($cases2[$h]) > 1) $title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			$string2 = '&nbsp;';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2 = 'peruser_notbusy';
+			else $style2 = 'peruser_busy';
+			foreach ($cases2[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style2='peruser_busy';
+				if ($ev['busy']) $style2 = 'peruser_busy';
 			}
 		}
 
-		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+		$ids1 = ''; $ids2 = '';
+		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
+		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		else echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
 		if (count($cases1[$h]) == 1)	// only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
+			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
+			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
 		}
 		else if (count($cases1[$h]) > 1)
 		{
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			$color1='222222';
+			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
+			$color1 = '222222';
 		}
 
 		if (count($cases2[$h]) == 1)	// only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
+			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
+			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
 		}
 		else if (count($cases2[$h]) > 1)
 		{
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			$color2='222222';
+			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
+			$color2 = '222222';
 		}
 		print '<table class="nobordernopadding" width="100%">';
-		print '<tr><td '.($color1?'style="background: #'.$color1.';"':'').'class="'.($style1?$style1.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
+		print '<tr><td '.($color1 ? 'style="background: #'.$color1.';"' : '').'class="'.($style1 ? $style1.' ' : '').'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
-		print '</td><td '.($color2?'style="background: #'.$color2.';"':'').'class="'.($style2?$style2.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
+		print '</td><td '.($color2 ? 'style="background: #'.$color2.';"' : '').'class="'.($style2 ? $style2.' ' : '').'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';

dolibarr/htdocs/comm/action/rapport/index.php

Indentation +95 added lines, -95 removed lines

@@ -59,12 +59,12 @@ 
 
 if ($action == 'builddoc')
 {
-	$cat = new CommActionRapport($db, $month, $year);
-	$result=$cat->write_file(GETPOST('id','int'));
-	if ($result < 0)
-	{
-		setEventMessages($cat->error, $cat->errors, 'errors');
-	}
+    $cat = new CommActionRapport($db, $month, $year);
+    $result=$cat->write_file(GETPOST('id','int'));
+    if ($result < 0)
+    {
+        setEventMessages($cat->error, $cat->errors, 'errors');
+    }
 }
 
 
@@ -95,8 +95,8 @@ 
     $nbtotalofrecords = $db->num_rows($result);
     if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
     {
-    	$page = 0;
-    	$offset = 0;
+        $page = 0;
+        $offset = 0;
     }
 }
 
@@ -107,106 +107,106 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
-	$param='';
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($langs->trans("EventReports"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
+    print_barre_liste($langs->trans("EventReports"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
 
-	$moreforfilter='';
+    $moreforfilter='';
 
-	$i = 0;
+    $i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
     print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Period").'</td>';
-	print '<td align="center">'.$langs->trans("EventsNb").'</td>';
-	print '<td align="center">'.$langs->trans("Action").'</td>';
-	print '<td>'.$langs->trans("PDF").'</td>';
-	print '<td align="center">'.$langs->trans("Date").'</td>';
-	print '<td align="center">'.$langs->trans("Size").'</td>';
-	print "</tr>\n";
-
-	while ($i < min($num,$limit))
-	{
-		$obj=$db->fetch_object($resql);
-
-		if ($obj)
-		{
-
-			print '<tr class="oddeven">';
-
-			// Date
-			print "<td>".$obj->df."</td>\n";
-
-			// Nb of events
-			print '<td align="center">'.$obj->cc.'</td>';
-
-			// Button to build doc
-			print '<td align="center">';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'),'filenew').'</a>';
-			print '</td>';
-
-			$name = "actions-".$obj->month."-".$obj->year.".pdf";
-			$relativepath= $name;
-			$file = $conf->agenda->dir_temp."/".$name;
-			$modulepart = 'actionsreport';
-			$documenturl= DOL_URL_ROOT.'/document.php';
-			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
-
-			if (file_exists($file))
-			{
-				print '<td class="tdoverflowmax300">';
-				//print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
-
-				$filearray=array('name'=>basename($file),'fullname'=>$file,'type'=>'file');
-				$out='';
-
-				// Show file name with link to download
-				$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
-				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
-				$out.= ' target="_blank">';
-				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]);
-				$out.= $filearray["name"];
-				$out.= '</a>'."\n";
-				$out.= $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
-				print $out;
-
-				print '</td>';
-				print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
-				print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
-			}
-			else {
-				print '<td>&nbsp;</td>';
-				print '<td>&nbsp;</td>';
-				print '<td>&nbsp;</td>';
-			}
-
-			print "</tr>\n";
-		}
-		$i++;
-	}
-	print "</table>";
-	print '</div>';
-	print '</form>';
-
-	$db->free($resql);
+    print '<td>'.$langs->trans("Period").'</td>';
+    print '<td align="center">'.$langs->trans("EventsNb").'</td>';
+    print '<td align="center">'.$langs->trans("Action").'</td>';
+    print '<td>'.$langs->trans("PDF").'</td>';
+    print '<td align="center">'.$langs->trans("Date").'</td>';
+    print '<td align="center">'.$langs->trans("Size").'</td>';
+    print "</tr>\n";
+
+    while ($i < min($num,$limit))
+    {
+        $obj=$db->fetch_object($resql);
+
+        if ($obj)
+        {
+
+            print '<tr class="oddeven">';
+
+            // Date
+            print "<td>".$obj->df."</td>\n";
+
+            // Nb of events
+            print '<td align="center">'.$obj->cc.'</td>';
+
+            // Button to build doc
+            print '<td align="center">';
+            print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'),'filenew').'</a>';
+            print '</td>';
+
+            $name = "actions-".$obj->month."-".$obj->year.".pdf";
+            $relativepath= $name;
+            $file = $conf->agenda->dir_temp."/".$name;
+            $modulepart = 'actionsreport';
+            $documenturl= DOL_URL_ROOT.'/document.php';
+            if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+
+            if (file_exists($file))
+            {
+                print '<td class="tdoverflowmax300">';
+                //print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
+
+                $filearray=array('name'=>basename($file),'fullname'=>$file,'type'=>'file');
+                $out='';
+
+                // Show file name with link to download
+                $out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+                $mime=dol_mimetype($relativepath,'',0);
+                if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+                $out.= ' target="_blank">';
+                $out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]);
+                $out.= $filearray["name"];
+                $out.= '</a>'."\n";
+                $out.= $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
+                print $out;
+
+                print '</td>';
+                print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
+                print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
+            }
+            else {
+                print '<td>&nbsp;</td>';
+                print '<td>&nbsp;</td>';
+                print '<td>&nbsp;</td>';
+            }
+
+            print "</tr>\n";
+        }
+        $i++;
+    }
+    print "</table>";
+    print '</div>';
+    print '</form>';
+
+    $db->free($resql);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 // End of page

Braces +27 added lines, -12 removed lines

@@ -44,12 +44,18 @@ 
 $page = GETPOST("page",'int');
 if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $limit * $page ;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="a.datep";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="a.datep";
+}
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
 
 
@@ -93,9 +99,11 @@ 
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    if (($page * $limit) > $nbtotalofrecords) {
+        // if total resultset is smaller then paging size (filtering), goto and load page 0
     {
     	$page = 0;
+    }
     	$offset = 0;
     }
 }
@@ -110,10 +118,14 @@ 
 	$num = $db->num_rows($resql);
 
 	$param='';
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+	    $param.='&limit='.$limit;
+	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    if ($optioncss != '') {
+        print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    }
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -163,7 +175,10 @@ 
 			$file = $conf->agenda->dir_temp."/".$name;
 			$modulepart = 'actionsreport';
 			$documenturl= DOL_URL_ROOT.'/document.php';
-			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
+			    $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
+			}
+			// To use another wrapper
 
 			if (file_exists($file))
 			{
@@ -176,7 +191,9 @@ 
 				// Show file name with link to download
 				$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+				if (preg_match('/text/',$mime)) {
+				    $out.= ' target="_blank"';
+				}
 				$out.= ' target="_blank">';
 				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]);
 				$out.= $filearray["name"];
@@ -187,8 +204,7 @@ 
 				print '</td>';
 				print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
 				print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
@@ -203,8 +219,7 @@ 
 	print '</form>';
 
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +48 added lines, -48 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -37,22 +37,22 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "commercial"));
 
-$action=GETPOST('action','alpha');
-$month=GETPOST('month');
-$year=GETPOST('year');
+$action = GETPOST('action', 'alpha');
+$month = GETPOST('month');
+$year = GETPOST('year');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1 || $page == null) { $page = 0 ; }
-$offset = $limit * $page ;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="a.datep";
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if ($page == -1 || $page == null) { $page = 0; }
+$offset = $limit * $page;
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "a.datep";
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
 
 
@@ -63,7 +63,7 @@ 
 if ($action == 'builddoc')
 {
 	$cat = new CommActionRapport($db, $month, $year);
-	$result=$cat->write_file(GETPOST('id','int'));
+	$result = $cat->write_file(GETPOST('id', 'int'));
 	if ($result < 0)
 	{
 		setEventMessages($cat->error, $cat->errors, 'errors');
@@ -75,21 +75,21 @@ 
  * View
  */
 
-$formfile=new FormFile($db);
+$formfile = new FormFile($db);
 
 llxHeader();
 
 $sql = "SELECT count(*) as cc,";
-$sql.= " date_format(a.datep, '%m/%Y') as df,";
-$sql.= " date_format(a.datep, '%m') as month,";
-$sql.= " date_format(a.datep, '%Y') as year";
-$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a,";
-$sql.= " ".MAIN_DB_PREFIX."user as u";
-$sql.= " WHERE a.fk_user_author = u.rowid";
-$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
+$sql .= " date_format(a.datep, '%m/%Y') as df,";
+$sql .= " date_format(a.datep, '%m') as month,";
+$sql .= " date_format(a.datep, '%Y') as year";
+$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a,";
+$sql .= " ".MAIN_DB_PREFIX."user as u";
+$sql .= " WHERE a.fk_user_author = u.rowid";
+$sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 //$sql.= " AND percent = 100";
-$sql.= " GROUP BY year, month, df";
-$sql.= " ORDER BY year DESC, month DESC, df DESC";
+$sql .= " GROUP BY year, month, df";
+$sql .= " ORDER BY year DESC, month DESC, df DESC";
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -103,17 +103,17 @@ 
     }
 }
 
-$sql.= $db->plimit($limit+1,$offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
 dol_syslog("select", LOG_DEBUG);
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-	$param='';
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	$param = '';
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -126,11 +126,11 @@ 
 
 	print_barre_liste($langs->trans("EventReports"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
 
-	$moreforfilter='';
+	$moreforfilter = '';
 
 	$i = 0;
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
     print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Period").'</td>';
@@ -141,9 +141,9 @@ 
 	print '<td align="center">'.$langs->trans("Size").'</td>';
 	print "</tr>\n";
 
-	while ($i < min($num,$limit))
+	while ($i < min($num, $limit))
 	{
-		$obj=$db->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 
 		if ($obj)
 		{
@@ -158,37 +158,37 @@ 
 
 			// Button to build doc
 			print '<td align="center">';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'),'filenew').'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'), 'filenew').'</a>';
 			print '</td>';
 
 			$name = "actions-".$obj->month."-".$obj->year.".pdf";
-			$relativepath= $name;
+			$relativepath = $name;
 			$file = $conf->agenda->dir_temp."/".$name;
 			$modulepart = 'actionsreport';
-			$documenturl= DOL_URL_ROOT.'/document.php';
-			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+			$documenturl = DOL_URL_ROOT.'/document.php';
+			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
 
 			if (file_exists($file))
 			{
 				print '<td class="tdoverflowmax300">';
 				//print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
 
-				$filearray=array('name'=>basename($file),'fullname'=>$file,'type'=>'file');
-				$out='';
+				$filearray = array('name'=>basename($file), 'fullname'=>$file, 'type'=>'file');
+				$out = '';
 
 				// Show file name with link to download
-				$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
-				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
-				$out.= ' target="_blank">';
-				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]);
-				$out.= $filearray["name"];
-				$out.= '</a>'."\n";
-				$out.= $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
+				$out .= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
+				$mime = dol_mimetype($relativepath, '', 0);
+				if (preg_match('/text/', $mime)) $out .= ' target="_blank"';
+				$out .= ' target="_blank">';
+				$out .= img_mime($filearray["name"], $langs->trans("File").': '.$filearray["name"]);
+				$out .= $filearray["name"];
+				$out .= '</a>'."\n";
+				$out .= $formfile->showPreview($filearray, $modulepart, $relativepath, 0, $param);
 				print $out;
 
 				print '</td>';
-				print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
+				print '<td align="center">'.dol_print_date(dol_filemtime($file), 'dayhour').'</td>';
 				print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
 			}
 			else {

dolibarr/htdocs/comm/action/peruser.php

Indentation +566 added lines, -566 removed lines

@@ -51,7 +51,7 @@ 
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
-	$filtert=$user->id;
+    $filtert=$user->id;
 }
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -103,9 +103,9 @@ 
 $dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth','int'), GETPOST('dateselectday','int'), GETPOST('dateselectyear','int'));
 if ($dateselect > 0)
 {
-	$day=GETPOST('dateselectday','int');
-	$month=GETPOST('dateselectmonth','int');
-	$year=GETPOST('dateselectyear','int');
+    $day=GETPOST('dateselectday','int');
+    $month=GETPOST('dateselectmonth','int');
+    $year=GETPOST('dateselectyear','int');
 }
 
 $tmp=empty($conf->global->MAIN_DEFAULT_WORKING_HOURS)?'9-18':$conf->global->MAIN_DEFAULT_WORKING_HOURS;
@@ -202,9 +202,9 @@ 
 
 $param='';
 if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
-	if(is_array($actioncode)) {
-		foreach($actioncode as $str_action) $param.="&search_actioncode[]=".urlencode($str_action);
-	} else $param.="&search_actioncode=".urlencode($actioncode);
+    if(is_array($actioncode)) {
+        foreach($actioncode as $str_action) $param.="&search_actioncode[]=".urlencode($str_action);
+    } else $param.="&search_actioncode=".urlencode($actioncode);
 }
 if ($resourceid > 0) $param.="&search_resourceid=".urlencode($resourceid);
 if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&search_status=".urlencode($status);
@@ -308,68 +308,68 @@ 
 // Legend
 if ($conf->use_javascript_ajax)
 {
-	$s='';
-	$s.='<script type="text/javascript">' . "\n";
-	$s.='jQuery(document).ready(function () {' . "\n";
-	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
-	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
-	$s.='jQuery(".family_birthday").toggle();' . "\n";
-	if ($action=="show_week" || $action=="show_month" || empty($action))
-	{
-    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
-	}
-  	$s.='});' . "\n";
-	$s.='</script>' . "\n";
-	if (! empty($conf->use_javascript_ajax))
-	{
-		$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
-		if (is_array($showextcals) && count($showextcals) > 0)
-		{
-			foreach ($showextcals as $val)
-			{
-				$htmlname = md5($val['name']);
-				$s.='<script type="text/javascript">' . "\n";
-				$s.='jQuery(document).ready(function () {' . "\n";
-				$s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
-				$s.=' 		/* alert("'.$htmlname.'"); */';
-				$s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
-				$s.='		});' . "\n";
-				$s.='});' . "\n";
-				$s.='</script>' . "\n";
-				$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val ['name'] . ' &nbsp; </div>';
-			}
-		}
+    $s='';
+    $s.='<script type="text/javascript">' . "\n";
+    $s.='jQuery(document).ready(function () {' . "\n";
+    $s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
+    $s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
+    $s.='jQuery(".family_birthday").toggle();' . "\n";
+    if ($action=="show_week" || $action=="show_month" || empty($action))
+    {
+        $s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+        $s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+    }
+        $s.='});' . "\n";
+    $s.='</script>' . "\n";
+    if (! empty($conf->use_javascript_ajax))
+    {
+        $s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+        if (is_array($showextcals) && count($showextcals) > 0)
+        {
+            foreach ($showextcals as $val)
+            {
+                $htmlname = md5($val['name']);
+                $s.='<script type="text/javascript">' . "\n";
+                $s.='jQuery(document).ready(function () {' . "\n";
+                $s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
+                $s.=' 		/* alert("'.$htmlname.'"); */';
+                $s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
+                $s.='		});' . "\n";
+                $s.='});' . "\n";
+                $s.='</script>' . "\n";
+                $s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val ['name'] . ' &nbsp; </div>';
+            }
+        }
 
-		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+        //$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
-		// Calendars from hooks
-	    $parameters=array(); $object=null;
-		$reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
-	    if (empty($reshook))
-	    {
-			$s.= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
-		{
-	    	$s = $hookmanager->resPrint;
-	    }
-	}
+        // Calendars from hooks
+        $parameters=array(); $object=null;
+        $reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
+        if (empty($reshook))
+        {
+            $s.= $hookmanager->resPrint;
+        }
+        elseif ($reshook > 1)
+        {
+            $s = $hookmanager->resPrint;
+        }
+    }
 }
 
 
 $newcardbutton='';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
 {
-	$tmpforcreatebutton=dol_getdate(dol_now(), true);
+    $tmpforcreatebutton=dol_getdate(dol_now(), true);
 
-	$newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+    $newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
-	//$param='month='.$monthshown.'&year='.$year;
-	$hourminsec='100000';
-	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$tmpforcreatebutton['year'],$tmpforcreatebutton['mon'],$tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
-	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-	$newcardbutton.= '</a>';
+    //$param='month='.$monthshown.'&year='.$year;
+    $hourminsec='100000';
+    $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$tmpforcreatebutton['year'],$tmpforcreatebutton['mon'],$tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
+    $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+    $newcardbutton.= '</a>';
 }
 
 $link='';
@@ -418,14 +418,14 @@ 
         elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
         else
         {
-		if (is_array($actioncode))
-  		{
-  	        	$sql.=" AND ca.code IN ('".implode("','", $actioncode)."')";
-  		}
-  		else
-  		{
-  	        	$sql.=" AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
-  		}
+        if (is_array($actioncode))
+            {
+                    $sql.=" AND ca.code IN ('".implode("','", $actioncode)."')";
+            }
+            else
+            {
+                    $sql.=" AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+            }
         }
     }
 }
@@ -494,8 +494,8 @@ 
         // Discard auto action if option is on
         if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
         {
-        	$i++;
-        	continue;
+            $i++;
+            continue;
         }
 
         $datep=$db->jdate($obj->datep);
@@ -534,7 +534,7 @@ 
             else $event->date_end_in_calendar=$datep;
         }
         else
-		{
+        {
             $event->date_start_in_calendar=$datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
             else $event->date_end_in_calendar=$datep;
@@ -553,11 +553,11 @@ 
             unset($event);
         }
         else
-		{
-			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
-        	$event->fetch_userassigned();				// This load $event->userassigned
+        {
+            //print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
+            $event->fetch_userassigned();				// This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
+            if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
             if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
 
             // Add an entry in actionarray for each day
@@ -570,7 +570,7 @@ 
             $loop=true; $j=0;
             $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
             do
-			{
+            {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][]=$event;
@@ -632,105 +632,105 @@ 
 
 while($currentdaytoshow<$lastdaytoshow) {
 
-	echo '<table width="100%" class="noborder nocellnopadd cal_month">';
+    echo '<table width="100%" class="noborder nocellnopadd cal_month">';
 
-	echo '<tr class="liste_titre">';
-	echo '<td></td>';
-	$i=0;	// 0 = sunday,
-	while ($i < 7)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
-			$i++;
-			continue;
-		}
-		echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
-		echo $langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7));
-		print "<br>";
-		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'),'day');
-		else print dol_print_date($currentdaytoshow,'day');
-		echo "</td>\n";
-		$i++;
-	}
-	echo "</tr>\n";
+    echo '<tr class="liste_titre">';
+    echo '<td></td>';
+    $i=0;	// 0 = sunday,
+    while ($i < 7)
+    {
+        if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+        {
+            $i++;
+            continue;
+        }
+        echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
+        echo $langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7));
+        print "<br>";
+        if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'),'day');
+        else print dol_print_date($currentdaytoshow,'day');
+        echo "</td>\n";
+        $i++;
+    }
+    echo "</tr>\n";
 
-	echo '<tr class="liste_titre">';
-	echo '<td></td>';
-	$i=0;
-	while ($i < 7)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
-			$i++;
-			continue;
-		}
-		for ($h = $begin_h; $h < $end_h; $h++)
-		{
-			echo '<td align="center">';
-			print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
-			print "</td>";
-		}
-		echo "</td>\n";
-		$i++;
-	}
-	echo "</tr>\n";
+    echo '<tr class="liste_titre">';
+    echo '<td></td>';
+    $i=0;
+    while ($i < 7)
+    {
+        if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+        {
+            $i++;
+            continue;
+        }
+        for ($h = $begin_h; $h < $end_h; $h++)
+        {
+            echo '<td align="center">';
+            print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
+            print "</td>";
+        }
+        echo "</td>\n";
+        $i++;
+    }
+    echo "</tr>\n";
 
 
-	// Define $usernames
-	$usernames = array(); //init
-	$usernamesid = array();
-	/* Use this to have list of users only if users have events */
-	if (! empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW))
-	{
-		foreach ($eventarray as $daykey => $notused)
-		{
-		   // Get all assigned users for each event
-		   foreach ($eventarray[$daykey] as $index => $event)
-		   {
-			   	$event->fetch_userassigned();
-				$listofuserid=$event->userassigned;
-				foreach($listofuserid as $userid => $tmp)
-				{
-				   	if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
-				}
-		   }
-		}
-	}
-	/* Use this list to have for all users */
-	else
-	{
-		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
-		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
-		$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
-		if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
-		//print $sql;
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-		    $num = $db->num_rows($resql);
-		    $i = 0;
-		    if ($num)
-		    {
-		        while ($i < $num)
-		        {
-		            $obj = $db->fetch_object($resql);
-					$usernamesid[$obj->rowid]=$obj->rowid;
-					$i++;
-		        }
-		    }
-		}
-		else dol_print_error($db);
-	}
-	//var_dump($usernamesid);
-	foreach($usernamesid as $id)
-	{
-		$tmpuser=new User($db);
-		$result=$tmpuser->fetch($id);
-		$usernames[]=$tmpuser;
-	}
+    // Define $usernames
+    $usernames = array(); //init
+    $usernamesid = array();
+    /* Use this to have list of users only if users have events */
+    if (! empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW))
+    {
+        foreach ($eventarray as $daykey => $notused)
+        {
+            // Get all assigned users for each event
+            foreach ($eventarray[$daykey] as $index => $event)
+            {
+                    $event->fetch_userassigned();
+                $listofuserid=$event->userassigned;
+                foreach($listofuserid as $userid => $tmp)
+                {
+                        if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
+                }
+            }
+        }
+    }
+    /* Use this list to have for all users */
+    else
+    {
+        $sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
+        $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+        if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+        $sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
+        if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
+        //print $sql;
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    $usernamesid[$obj->rowid]=$obj->rowid;
+                    $i++;
+                }
+            }
+        }
+        else dol_print_error($db);
+    }
+    //var_dump($usernamesid);
+    foreach($usernamesid as $id)
+    {
+        $tmpuser=new User($db);
+        $result=$tmpuser->fetch($id);
+        $usernames[]=$tmpuser;
+    }
 
-	/*
+    /*
 	if ($filtert > 0)
 	{
 		$tmpuser = new User($db);
@@ -750,90 +750,90 @@ 
 		$usernames = $tmpgroup->listUsersForGroup();
 	}*/
 
-	// Load array of colors by type
-	$colorsbytype=array();
-	$labelbytype=array();
-	$sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
-	$resql=$db->query($sql);
-	while ($obj = $db->fetch_object($resql))
-	{
-		$colorsbytype[$obj->code]=$obj->color;
-		$labelbytype[$obj->code]=$obj->libelle;
-	}
+    // Load array of colors by type
+    $colorsbytype=array();
+    $labelbytype=array();
+    $sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
+    $resql=$db->query($sql);
+    while ($obj = $db->fetch_object($resql))
+    {
+        $colorsbytype[$obj->code]=$obj->color;
+        $labelbytype[$obj->code]=$obj->libelle;
+    }
 
-	// Loop on each user to show calendar
-	$todayarray=dol_getdate($now,'fast');
-	$sav = $tmpday;
-	$showheader = true;
-	$var = false;
-	foreach ($usernames as $username)
-	{
-		$var = ! $var;
-		echo "<tr>";
-		echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">';
-		print $username->getNomUrl(-1,'',0,0,20,1,'');
-		print '</td>';
-		$tmpday = $sav;
-
-		// Lopp on each day of week
-		$i = 0;
-		for ($iter_day = 0; $iter_day < 8; $iter_day++)
-		{
+    // Loop on each user to show calendar
+    $todayarray=dol_getdate($now,'fast');
+    $sav = $tmpday;
+    $showheader = true;
+    $var = false;
+    foreach ($usernames as $username)
+    {
+        $var = ! $var;
+        echo "<tr>";
+        echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">';
+        print $username->getNomUrl(-1,'',0,0,20,1,'');
+        print '</td>';
+        $tmpday = $sav;
+
+        // Lopp on each day of week
+        $i = 0;
+        for ($iter_day = 0; $iter_day < 8; $iter_day++)
+        {
 
-			if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-			{
-				$i++;
-				continue;
-			}
+            if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+            {
+                $i++;
+                continue;
+            }
 
-	        // Show days of the current week
-			$curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
-			$tmparray = dol_getdate($curtime,'fast');
-			$tmpday = $tmparray['mday'];
-			$tmpmonth = $tmparray['mon'];
-			$tmpyear = $tmparray['year'];
+            // Show days of the current week
+            $curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
+            $tmparray = dol_getdate($curtime,'fast');
+            $tmpday = $tmparray['mday'];
+            $tmpmonth = $tmparray['mon'];
+            $tmpyear = $tmparray['year'];
 
-			$style='cal_current_month';
-			if ($iter_day == 6) $style.=' cal_other_month';
-			$today=0;
-			if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
-			if ($today) $style='cal_today_peruser';
+            $style='cal_current_month';
+            if ($iter_day == 6) $style.=' cal_other_month';
+            $today=0;
+            if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
+            if ($today) $style='cal_today_peruser';
 
-			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
+            show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
-			$i++;
-		}
-		echo "</tr>\n";
-		$showheader = false;
-	}
+            $i++;
+        }
+        echo "</tr>\n";
+        $showheader = false;
+    }
 
-	echo "</table>\n";
-	echo "<br>";
+    echo "</table>\n";
+    echo "<br>";
 
-	$currentdaytoshow =  dol_time_plus_duree($currentdaytoshow, 7, 'd');
+    $currentdaytoshow =  dol_time_plus_duree($currentdaytoshow, 7, 'd');
 }
 
 echo '</div>';
 
 if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE))
 {
-	$langs->load("commercial");
-	print '<br>'.$langs->trans("Legend").': <br>';
-	foreach($colorsbytype as $code => $color)
-	{
-		if ($color)
-		{
-			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
-			print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
-			//print $code;
-			print '</div>';
-		}
-	}
-	//$color=sprintf("%02x%02x%02x",$theme_datacolor[0][0],$theme_datacolor[0][1],$theme_datacolor[0][2]);
-	print '<div style="float: left; padding: 2px; margin-right: 6px;"><div class="peruser_busy" style="width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
-	print $langs->trans("Other");
-	print '</div>';
-	/* TODO Show this if at least one cumulated event
+    $langs->load("commercial");
+    print '<br>'.$langs->trans("Legend").': <br>';
+    foreach($colorsbytype as $code => $color)
+    {
+        if ($color)
+        {
+            print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+            print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
+            //print $code;
+            print '</div>';
+        }
+    }
+    //$color=sprintf("%02x%02x%02x",$theme_datacolor[0][0],$theme_datacolor[0][1],$theme_datacolor[0][2]);
+    print '<div style="float: left; padding: 2px; margin-right: 6px;"><div class="peruser_busy" style="width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+    print $langs->trans("Other");
+    print '</div>';
+    /* TODO Show this if at least one cumulated event
 	print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="background: #222222; width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
 	print $langs->trans("SeveralEvents");
 	print '</div>';
@@ -907,341 +907,341 @@ 
  */
 function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)
 {
-	global $db;
-	global $user, $conf, $langs, $hookmanager, $action;
-	global $filter, $filtert, $status, $actioncode;	// Filters used into search form
-	global $theme_datacolor;	// Array with a list of different we can use (come from theme)
-	global $cachethirdparties, $cachecontacts, $cacheusers, $cacheprojects, $colorindexused;
-	global $begin_h, $end_h;
+    global $db;
+    global $user, $conf, $langs, $hookmanager, $action;
+    global $filter, $filtert, $status, $actioncode;	// Filters used into search form
+    global $theme_datacolor;	// Array with a list of different we can use (come from theme)
+    global $cachethirdparties, $cachecontacts, $cacheusers, $cacheprojects, $colorindexused;
+    global $begin_h, $end_h;
 
-	$cases1 = array();	// Color first half hour
-	$cases2 = array(); // Color second half hour
+    $cases1 = array();	// Color first half hour
+    $cases2 = array(); // Color second half hour
 
-	$curtime = dol_mktime(0, 0, 0, $month, $day, $year, false, 0);
+    $curtime = dol_mktime(0, 0, 0, $month, $day, $year, false, 0);
 
-	$i=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
-	$ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+    $i=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
+    $ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
 
-	$colorindexused[$user->id] = 0;			// Color index for current user (user->id) is always 0
-	$nextindextouse=count($colorindexused);	// At first run this is 0, so first user has 0, next 1, ...
-	//if ($username->id && $day==1) var_dump($eventarray);
+    $colorindexused[$user->id] = 0;			// Color index for current user (user->id) is always 0
+    $nextindextouse=count($colorindexused);	// At first run this is 0, so first user has 0, next 1, ...
+    //if ($username->id && $day==1) var_dump($eventarray);
 
-	// We are in a particular day for $username, now we scan all events
-	foreach ($eventarray as $daykey => $notused)
-	{
-		$annee = date('Y',$daykey);
-		$mois = date('m',$daykey);
-		$jour = date('d',$daykey);
-		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
+    // We are in a particular day for $username, now we scan all events
+    foreach ($eventarray as $daykey => $notused)
+    {
+        $annee = date('Y',$daykey);
+        $mois = date('m',$daykey);
+        $jour = date('d',$daykey);
+        //print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
 
-		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
-		{
-			// Scan all event for this date
-			foreach ($eventarray[$daykey] as $index => $event)
-			{
-				//var_dump($event);
-
-				$keysofuserassigned=array_keys($event->userassigned);
-				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
-
-				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
-				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
-
-				$parameters=array();
-				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-				// Define $color (Hex string like '0088FF') and $cssclass of event
-				$color=-1; $cssclass=''; $colorindex=-1;
-				if (in_array($user->id, $keysofuserassigned))
-				{
-					$cssclass='family_mytasks';
-
-					if (empty($cacheusers[$event->userownerid]))
-					{
-						$newuser=new User($db);
-						$newuser->fetch($event->userownerid);
-						$cacheusers[$event->userownerid]=$newuser;
-					}
-					//var_dump($cacheusers[$event->userownerid]->color);
-
-					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
-
-					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
-				}
-				else if ($event->type_code == 'ICALEVENT')
-				{
-					$numical++;
-					if (! empty($event->icalname))
-					{
-						if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
-							$numicals[dol_string_nospecial($event->icalname)] = 0;
-						}
-						$numicals[dol_string_nospecial($event->icalname)]++;
-					}
-
-					$color=$event->icalcolor;
-					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
-				}
-				else if ($event->type_code == 'BIRTHDAY')
-				{
-					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-				}
-				else
-				{
-					$numother++;
-					$color=($event->icalcolor?$event->icalcolor:-1);
-					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other');
-
-					if (empty($cacheusers[$event->userownerid]))
-					{
-						$newuser=new User($db);
-						$newuser->fetch($event->userownerid);
-						$cacheusers[$event->userownerid]=$newuser;
-					}
-					//var_dump($cacheusers[$event->userownerid]->color);
-
-					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
-
-					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
-				}
-
-				if ($color < 0)	// Color was not set on user card. Set color according to color index.
-				{
-					// Define color index if not yet defined
-					$idusertouse=($event->userownerid?$event->userownerid:0);
-					if (isset($colorindexused[$idusertouse]))
-					{
-						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
-					}
-					else
-					{
-						$colorindex=$nextindextouse;
-						$colorindexused[$idusertouse]=$colorindex;
-						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
-					}
-					// Define color
-					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-				}
-				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
-
-				// Define all rects with event (cases1 is first half hour, cases2 is second half hour)
-				for ($h = $begin_h; $h < $end_h; $h++)
-				{
-					//if ($username->id == 1 && $day==1) print 'h='.$h;
-					$newcolor = ''; //init
-					if (empty($event->fulldayevent))
-					{
-						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
-						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
-						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
-
-						$dateendtouse=$event->date_end_in_calendar;
-						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
-
-						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
-
-						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
-						{
-							$busy=$event->transparency;
-							$cases1[$h][$event->id]['busy']=$busy;
-							$cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
-		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
-			        		}
-							if ($event->label) $cases1[$h][$event->id]['string'].=' - '.$event->label;
-							$cases1[$h][$event->id]['typecode']=$event->type_code;
-							$cases1[$h][$event->id]['color']=$color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
-									$tmpproj=new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
-								}
-								$cases1[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
-									$tmpthirdparty=new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
-								}
-								$cases1[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contactid > 0)
-							{
-								if (empty($cachecontacts[$event->contactid]))
-								{
-									$tmpcontact=new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
-								}
-								$cases1[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
-							}
-						}
-						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
-						{
-							$busy=$event->transparency;
-							$cases2[$h][$event->id]['busy']=$busy;
-							$cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
-							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
-			        		}
-							if ($event->label) $cases2[$h][$event->id]['string'].=' - '.$event->label;
-							$cases2[$h][$event->id]['typecode']=$event->type_code;
-							$cases2[$h][$event->id]['color']=$color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
-									$tmpproj=new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
-								}
-								$cases2[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
-									$tmpthirdparty=new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
-								}
-								$cases2[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contactid > 0)
-							{
-								if (empty($cachecontacts[$event->contactid]))
-								{
-									$tmpcontact=new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
-								}
-								$cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
-							}
-						}
-					}
-					else
-					{
-						$busy=$event->transparency;
-						$cases1[$h][$event->id]['busy']=$busy;
-						$cases2[$h][$event->id]['busy']=$busy;
-						$cases1[$h][$event->id]['string']=$event->label;
-						$cases2[$h][$event->id]['string']=$event->label;
-						$cases1[$h][$event->id]['typecode']=$event->type_code;
-						$cases2[$h][$event->id]['typecode']=$event->type_code;
-						$cases1[$h][$event->id]['color']=$color;
-						$cases2[$h][$event->id]['color']=$color;
-					}
-				}
-				$i++;
-			}
-
-			break;	// We found the date we were looking for. No need to search anymore.
-		}
-	}
+        if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+        {
+            // Scan all event for this date
+            foreach ($eventarray[$daykey] as $index => $event)
+            {
+                //var_dump($event);
+
+                $keysofuserassigned=array_keys($event->userassigned);
+                $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+
+                if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+                //if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
+
+                $parameters=array();
+                $reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+                // Define $color (Hex string like '0088FF') and $cssclass of event
+                $color=-1; $cssclass=''; $colorindex=-1;
+                if (in_array($user->id, $keysofuserassigned))
+                {
+                    $cssclass='family_mytasks';
+
+                    if (empty($cacheusers[$event->userownerid]))
+                    {
+                        $newuser=new User($db);
+                        $newuser->fetch($event->userownerid);
+                        $cacheusers[$event->userownerid]=$newuser;
+                    }
+                    //var_dump($cacheusers[$event->userownerid]->color);
+
+                    // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+                    if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+
+                    if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
+                }
+                else if ($event->type_code == 'ICALEVENT')
+                {
+                    $numical++;
+                    if (! empty($event->icalname))
+                    {
+                        if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
+                            $numicals[dol_string_nospecial($event->icalname)] = 0;
+                        }
+                        $numicals[dol_string_nospecial($event->icalname)]++;
+                    }
+
+                    $color=$event->icalcolor;
+                    $cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
+                }
+                else if ($event->type_code == 'BIRTHDAY')
+                {
+                    $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+                }
+                else
+                {
+                    $numother++;
+                    $color=($event->icalcolor?$event->icalcolor:-1);
+                    $cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other');
+
+                    if (empty($cacheusers[$event->userownerid]))
+                    {
+                        $newuser=new User($db);
+                        $newuser->fetch($event->userownerid);
+                        $cacheusers[$event->userownerid]=$newuser;
+                    }
+                    //var_dump($cacheusers[$event->userownerid]->color);
+
+                    // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+                    if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+
+                    if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
+                }
+
+                if ($color < 0)	// Color was not set on user card. Set color according to color index.
+                {
+                    // Define color index if not yet defined
+                    $idusertouse=($event->userownerid?$event->userownerid:0);
+                    if (isset($colorindexused[$idusertouse]))
+                    {
+                        $colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
+                    }
+                    else
+                    {
+                        $colorindex=$nextindextouse;
+                        $colorindexused[$idusertouse]=$colorindex;
+                        if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+                    }
+                    // Define color
+                    $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+                }
+                //$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
+
+                // Define all rects with event (cases1 is first half hour, cases2 is second half hour)
+                for ($h = $begin_h; $h < $end_h; $h++)
+                {
+                    //if ($username->id == 1 && $day==1) print 'h='.$h;
+                    $newcolor = ''; //init
+                    if (empty($event->fulldayevent))
+                    {
+                        $a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
+                        $b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
+                        $c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
+
+                        $dateendtouse=$event->date_end_in_calendar;
+                        if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+
+                        //print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
+
+                        if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
+                        {
+                            $busy=$event->transparency;
+                            $cases1[$h][$event->id]['busy']=$busy;
+                            $cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+                            if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+                            {
+                                $tmpa=dol_getdate($event->date_start_in_calendar,true);
+                                $tmpb=dol_getdate($event->date_end_in_calendar,true);
+                                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+                                else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+                            }
+                            if ($event->label) $cases1[$h][$event->id]['string'].=' - '.$event->label;
+                            $cases1[$h][$event->id]['typecode']=$event->type_code;
+                            $cases1[$h][$event->id]['color']=$color;
+                            if ($event->fk_project > 0)
+                            {
+                                if (empty($cacheprojects[$event->fk_project]))
+                                {
+                                    $tmpproj=new Project($db);
+                                    $tmpproj->fetch($event->fk_project);
+                                    $cacheprojects[$event->fk_project]=$tmpproj;
+                                }
+                                $cases1[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+                            }
+                            if ($event->socid > 0)
+                            {
+                                if (empty($cachethirdparties[$event->socid]))
+                                {
+                                    $tmpthirdparty=new Societe($db);
+                                    $tmpthirdparty->fetch($event->socid);
+                                    $cachethirdparties[$event->socid]=$tmpthirdparty;
+                                }
+                                $cases1[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+                            }
+                            if ($event->contactid > 0)
+                            {
+                                if (empty($cachecontacts[$event->contactid]))
+                                {
+                                    $tmpcontact=new Contact($db);
+                                    $tmpcontact->fetch($event->contactid);
+                                    $cachecontacts[$event->contactid]=$tmpcontact;
+                                }
+                                $cases1[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+                            }
+                        }
+                        if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
+                        {
+                            $busy=$event->transparency;
+                            $cases2[$h][$event->id]['busy']=$busy;
+                            $cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+                            if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+                            {
+                                $tmpa=dol_getdate($event->date_start_in_calendar,true);
+                                $tmpb=dol_getdate($event->date_end_in_calendar,true);
+                                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+                                else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+                            }
+                            if ($event->label) $cases2[$h][$event->id]['string'].=' - '.$event->label;
+                            $cases2[$h][$event->id]['typecode']=$event->type_code;
+                            $cases2[$h][$event->id]['color']=$color;
+                            if ($event->fk_project > 0)
+                            {
+                                if (empty($cacheprojects[$event->fk_project]))
+                                {
+                                    $tmpproj=new Project($db);
+                                    $tmpproj->fetch($event->fk_project);
+                                    $cacheprojects[$event->fk_project]=$tmpproj;
+                                }
+                                $cases2[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+                            }
+                            if ($event->socid > 0)
+                            {
+                                if (empty($cachethirdparties[$event->socid]))
+                                {
+                                    $tmpthirdparty=new Societe($db);
+                                    $tmpthirdparty->fetch($event->socid);
+                                    $cachethirdparties[$event->socid]=$tmpthirdparty;
+                                }
+                                $cases2[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+                            }
+                            if ($event->contactid > 0)
+                            {
+                                if (empty($cachecontacts[$event->contactid]))
+                                {
+                                    $tmpcontact=new Contact($db);
+                                    $tmpcontact->fetch($event->contactid);
+                                    $cachecontacts[$event->contactid]=$tmpcontact;
+                                }
+                                $cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        $busy=$event->transparency;
+                        $cases1[$h][$event->id]['busy']=$busy;
+                        $cases2[$h][$event->id]['busy']=$busy;
+                        $cases1[$h][$event->id]['string']=$event->label;
+                        $cases2[$h][$event->id]['string']=$event->label;
+                        $cases1[$h][$event->id]['typecode']=$event->type_code;
+                        $cases2[$h][$event->id]['typecode']=$event->type_code;
+                        $cases1[$h][$event->id]['color']=$color;
+                        $cases2[$h][$event->id]['color']=$color;
+                    }
+                }
+                $i++;
+            }
 
-	// Now output $casesX
-	for ($h = $begin_h; $h < $end_h; $h++)
-	{
-		$color1='';$color2='';
-		$style1='';$style2='';
-		$string1='&nbsp;';$string2='&nbsp;';
-		$title1='';$title2='';
-		if (isset($cases1[$h]) && $cases1[$h] != '')
-		{
-			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string1='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
-			else $style1='peruser_busy';
-			foreach($cases1[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style1='peruser_busy';
-			}
-		}
-		if (isset($cases2[$h]) && $cases2[$h] != '')
-		{
-			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string2='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
-			else $style2='peruser_busy';
-			foreach($cases2[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style2='peruser_busy';
-			}
-		}
+            break;	// We found the date we were looking for. No need to search anymore.
+        }
+    }
 
-		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+    // Now output $casesX
+    for ($h = $begin_h; $h < $end_h; $h++)
+    {
+        $color1='';$color2='';
+        $style1='';$style2='';
+        $string1='&nbsp;';$string2='&nbsp;';
+        $title1='';$title2='';
+        if (isset($cases1[$h]) && $cases1[$h] != '')
+        {
+            //$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            $string1='&nbsp;';
+            if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
+            else $style1='peruser_busy';
+            foreach($cases1[$h] as $id => $ev)
+            {
+                if ($ev['busy']) $style1='peruser_busy';
+            }
+        }
+        if (isset($cases2[$h]) && $cases2[$h] != '')
+        {
+            //$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+            $string2='&nbsp;';
+            if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
+            else $style2='peruser_busy';
+            foreach($cases2[$h] as $id => $ev)
+            {
+                if ($ev['busy']) $style2='peruser_busy';
+            }
+        }
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
-		{
-			$output = array_slice($cases1[$h], 0, 1);
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		else if (count($cases1[$h]) > 1)
-		{
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			$color1='222222';
-		}
+        $ids1='';$ids2='';
+        if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
+        if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
 
-		if (count($cases2[$h]) == 1)	// only 1 event
-		{
-			$output = array_slice($cases2[$h], 0, 1);
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		else if (count($cases2[$h]) > 1)
-		{
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			$color2='222222';
-		}
-		print '<table class="nobordernopadding" width="100%">';
-		print '<tr><td ';
-		if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1?$color1:"888").' !important" ';
-		elseif ($color1)
-		{
-			print ($color1?'style="background: #'.$color1.';"':'');
-		}
-		print 'class="';
-		print ($style1?$style1.' ':'');
-		print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
-		print $string1;
-		print '</td><td ';
-		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2?$color2:"888").' !important" ';
-		elseif ($color2)
-		{
-			print ($color2?'style="background: #'.$color2.';"':'');
-		}
-		print 'class="';
-		print ($style2?$style2.' ':'');
-		print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
-		print $string2;
-		print '</td></tr>';
-		print '</table>';
-		print '</td>';
-	}
+        if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+        else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+        if (count($cases1[$h]) == 1)	// only 1 event
+        {
+            $output = array_slice($cases1[$h], 0, 1);
+            $title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
+            if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
+            if ($output[0]['color']) $color1 = $output[0]['color'];
+        }
+        else if (count($cases1[$h]) > 1)
+        {
+            $title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
+            $color1='222222';
+        }
+
+        if (count($cases2[$h]) == 1)	// only 1 event
+        {
+            $output = array_slice($cases2[$h], 0, 1);
+            $title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
+            if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
+            if ($output[0]['color']) $color2 = $output[0]['color'];
+        }
+        else if (count($cases2[$h]) > 1)
+        {
+            $title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
+            $color2='222222';
+        }
+        print '<table class="nobordernopadding" width="100%">';
+        print '<tr><td ';
+        if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1?$color1:"888").' !important" ';
+        elseif ($color1)
+        {
+            print ($color1?'style="background: #'.$color1.';"':'');
+        }
+        print 'class="';
+        print ($style1?$style1.' ':'');
+        print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
+        print $string1;
+        print '</td><td ';
+        if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2?$color2:"888").' !important" ';
+        elseif ($color2)
+        {
+            print ($color2?'style="background: #'.$color2.';"':'');
+        }
+        print 'class="';
+        print ($style2?$style2.' ':'');
+        print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
+        print $string2;
+        print '</td></tr>';
+        print '</table>';
+        print '</td>';
+    }
 }

Braces +346 added lines, -148 removed lines

@@ -39,7 +39,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+    $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+}
 
 $filter = GETPOST("search_filter",'alpha',3)?GETPOST("search_filter",'alpha',3):GETPOST("filter",'alpha',3);
 $filtert = GETPOST("search_filtert","int",3)?GETPOST("search_filtert","int",3):GETPOST("filtert","int",3);
@@ -60,22 +62,36 @@ 
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="a.datec";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="a.datec";
+}
 
 // Security check
 $socid = GETPOST("search_socid","int")?GETPOST("search_socid","int"):GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid='';
+if ($socid < 0) {
+    $socid='';
+}
 
 $canedit=1;
-if (! $user->rights->agenda->myactions->read) accessforbidden();
-if (! $user->rights->agenda->allactions->read) $canedit=0;
-if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
+if (! $user->rights->agenda->myactions->read) {
+    accessforbidden();
+}
+if (! $user->rights->agenda->allactions->read) {
+    $canedit=0;
+}
+if (! $user->rights->agenda->allactions->read || $filter =='mine') {
+    // If no permission to see all, we show only affected to me
 {
     $filtert=$user->id;
 }
+}
 
 //$action=GETPOST('action','alpha');
 $action='show_peruser'; //We use 'show_week' mode
@@ -92,13 +108,16 @@ 
 if (GETPOST('search_actioncode','array'))
 {
     $actioncode=GETPOST('search_actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
-}
-else
+    if (! count($actioncode)) {
+        $actioncode='0';
+    }
+    } else
 {
     $actioncode=GETPOST("search_actioncode","alpha",3)?GETPOST("search_actioncode","alpha",3):(GETPOST("search_actioncode","alpha")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) {
+    $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 
 $dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth','int'), GETPOST('dateselectday','int'), GETPOST('dateselectyear','int'));
 if ($dateselect > 0)
@@ -112,20 +131,36 @@ 
 $tmparray=explode('-',$tmp);
 $begin_h = GETPOST('begin_h','int')!=''?GETPOST('begin_h','int'):($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h','int')?GETPOST('end_h','int'):($tmparray[1] != '' ? $tmparray[1] : 18);
-if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
-if ($end_h < 1 || $end_h > 24) $end_h = 18;
-if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+if ($begin_h < 0 || $begin_h > 23) {
+    $begin_h = 9;
+}
+if ($end_h < 1 || $end_h > 24) {
+    $end_h = 18;
+}
+if ($end_h <= $begin_h) {
+    $end_h = $begin_h + 1;
+}
 
 $tmp=empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)?'1-5':$conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmparray=explode('-',$tmp);
 $begin_d = GETPOST('begin_d','int')?GETPOST('begin_d','int'):($tmparray[0] != '' ? $tmparray[0] : 1);
 $end_d   = GETPOST('end_d','int')?GETPOST('end_d','int'):($tmparray[1] != '' ? $tmparray[1] : 5);
-if ($begin_d < 1 || $begin_d > 7) $begin_d = 1;
-if ($end_d < 1 || $end_d > 7) $end_d = 7;
-if ($end_d < $begin_d) $end_d = $begin_d + 1;
+if ($begin_d < 1 || $begin_d > 7) {
+    $begin_d = 1;
+}
+if ($end_d < 1 || $end_d > 7) {
+    $end_d = 7;
+}
+if ($end_d < $begin_d) {
+    $end_d = $begin_d + 1;
+}
 
-if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) {
+    $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
+if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) {
+    $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+}
 
 if (GETPOST('viewcal','alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser')  {
     $action='show_month'; $day='';
@@ -197,29 +232,65 @@ 
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
 $title=$langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title=$langs->trans("DoneActions");
-if ($status == 'todo') $title=$langs->trans("ToDoActions");
+if ($status == 'done') {
+    $title=$langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+    $title=$langs->trans("ToDoActions");
+}
 
 $param='';
 if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
 	if(is_array($actioncode)) {
-		foreach($actioncode as $str_action) $param.="&search_actioncode[]=".urlencode($str_action);
-	} else $param.="&search_actioncode=".urlencode($actioncode);
-}
-if ($resourceid > 0) $param.="&search_resourceid=".urlencode($resourceid);
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&search_status=".urlencode($status);
-if ($filter)        $param.="&search_filter=".urlencode($filter);
-if ($filtert)       $param.="&search_filtert=".urlencode($filtert);
-if ($usergroup)     $param.="&search_usergroup=".urlencode($usergroup);
-if ($socid)         $param.="&search_socid=".urlencode($socid);
-if ($showbirthday)  $param.="&search_showbirthday=1";
-if ($pid)           $param.="&search_projectid=".urlencode($pid);
-if ($type)          $param.="&search_type=".urlencode($type);
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param.='&action='.urlencode($action);
-if ($begin_h != '') $param.='&begin_h='.urlencode($begin_h);
-if ($end_h != '')   $param.='&end_h='.urlencode($end_h);
-if ($begin_d != '') $param.='&begin_d='.urlencode($begin_d);
-if ($end_d != '')   $param.='&end_d='.urlencode($end_d);
+		foreach($actioncode as $str_action) {
+		    $param.="&search_actioncode[]=".urlencode($str_action);
+		}
+	} else {
+	    $param.="&search_actioncode=".urlencode($actioncode);
+	}
+	}
+if ($resourceid > 0) {
+    $param.="&search_resourceid=".urlencode($resourceid);
+}
+if ($status || isset($_GET['status']) || isset($_POST['status'])) {
+    $param.="&search_status=".urlencode($status);
+}
+if ($filter) {
+    $param.="&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+    $param.="&search_filtert=".urlencode($filtert);
+}
+if ($usergroup) {
+    $param.="&search_usergroup=".urlencode($usergroup);
+}
+if ($socid) {
+    $param.="&search_socid=".urlencode($socid);
+}
+if ($showbirthday) {
+    $param.="&search_showbirthday=1";
+}
+if ($pid) {
+    $param.="&search_projectid=".urlencode($pid);
+}
+if ($type) {
+    $param.="&search_type=".urlencode($type);
+}
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
+    $param.='&action='.urlencode($action);
+}
+if ($begin_h != '') {
+    $param.='&begin_h='.urlencode($begin_h);
+}
+if ($end_h != '') {
+    $param.='&end_h='.urlencode($end_h);
+}
+if ($begin_d != '') {
+    $param.='&begin_d='.urlencode($begin_d);
+}
+if ($end_d != '') {
+    $param.='&end_d='.urlencode($end_d);
+}
 $param.="&maxprint=".urlencode($maxprint);
 
 
@@ -288,11 +359,21 @@ 
 
 
 $tabactive='';
-if ($action == 'show_month') $tabactive='cardmonth';
-if ($action == 'show_week') $tabactive='cardweek';
-if ($action == 'show_day')  $tabactive='cardday';
-if ($action == 'show_list') $tabactive='cardlist';
-if ($action == 'show_peruser') $tabactive='cardperuser';
+if ($action == 'show_month') {
+    $tabactive='cardmonth';
+}
+if ($action == 'show_week') {
+    $tabactive='cardweek';
+}
+if ($action == 'show_day') {
+    $tabactive='cardday';
+}
+if ($action == 'show_list') {
+    $tabactive='cardlist';
+}
+if ($action == 'show_peruser') {
+    $tabactive='cardperuser';
+}
 
 $paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
 
@@ -349,8 +430,7 @@ 
 	    if (empty($reshook))
 	    {
 			$s.= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
@@ -381,7 +461,9 @@ 
 $eventarray=array();
 
 $sql = 'SELECT';
-if ($usergroup > 0) $sql.=" DISTINCT";
+if ($usergroup > 0) {
+    $sql.=" DISTINCT";
+}
 $sql.= ' a.id, a.label,';
 $sql.= ' a.datep,';
 $sql.= ' a.datep2,';
@@ -391,12 +473,20 @@ 
 $sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql.= ' ca.code, ca.color';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 // We must filter on resource table
-if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) {
+    $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+if ($filtert > 0 || $usergroup > 0) {
+    $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql.= ' WHERE a.fk_action = ca.id';
 $sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
@@ -404,37 +494,53 @@ 
 {
     if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
-        else
+        if ($actioncode == 'AC_NON_AUTO') {
+            $sql.= " AND ca.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+            $sql.= " AND ca.type = 'systemauto'";
+        } else
         {
-            if ($actioncode == 'AC_OTH') $sql.= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql.= " AND ca.type = 'systemauto'";
+            if ($actioncode == 'AC_OTH') {
+                $sql.= " AND ca.type != 'systemauto'";
+            }
+            if ($actioncode == 'AC_OTH_AUTO') {
+                $sql.= " AND ca.type = 'systemauto'";
+            }
         }
-    }
-    else
+    } else
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
-        else
+        if ($actioncode == 'AC_NON_AUTO') {
+            $sql.= " AND ca.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+            $sql.= " AND ca.type = 'systemauto'";
+        } else
         {
 		if (is_array($actioncode))
   		{
   	        	$sql.=" AND ca.code IN ('".implode("','", $actioncode)."')";
-  		}
-  		else
+  		} else
   		{
   	        	$sql.=" AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
   		}
         }
     }
 }
-if ($resourceid > 0) $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+if ($resourceid > 0) {
+    $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+}
+if ($pid) {
+    $sql.=" AND a.fk_project=".$db->escape($pid);
+}
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+}
+if ($socid > 0) {
+    $sql.= ' AND a.fk_soc = '.$socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+if ($filtert > 0 || $usergroup > 0) {
+    $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
 if ($action == 'show_day')
 {
     $sql.= " AND (";
@@ -447,8 +553,7 @@ 
     $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
     $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
     $sql.= ')';
-}
-else
+} else
 {
     // To limit array
     $sql.= " AND (";
@@ -462,7 +567,9 @@ 
     $sql.= " AND a.datep2 > '".$db->idate($lastdaytoshow+(60*60*24*2))."')";
     $sql.= ')';
 }
-if ($type) $sql.= " AND ca.id = ".$type;
+if ($type) {
+    $sql.= " AND ca.id = ".$type;
+}
 if ($status == '0') { $sql.= " AND a.percent = 0"; }
 if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
@@ -472,8 +579,12 @@ 
 if ($filtert > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
-    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    if ($filtert > 0) {
+        $sql.= "ar.fk_element = ".$filtert;
+    }
+    if ($usergroup > 0) {
+        $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    }
     $sql.= ")";
 }
 // Sort on date
@@ -530,14 +641,19 @@ 
         if ($event->percentage <= 0)
         {
             $event->date_start_in_calendar=$datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-            else $event->date_end_in_calendar=$datep;
-        }
-        else
+            if ($datep2 != '' && $datep2 >= $datep) {
+                $event->date_end_in_calendar=$datep2;
+            } else {
+                $event->date_end_in_calendar=$datep;
+            }
+        } else
 		{
             $event->date_start_in_calendar=$datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-            else $event->date_end_in_calendar=$datep;
+            if ($datep2 != '' && $datep2 >= $datep) {
+                $event->date_end_in_calendar=$datep2;
+            } else {
+                $event->date_end_in_calendar=$datep;
+            }
         }
         // Define ponctual property
         if ($event->date_start_in_calendar == $event->date_end_in_calendar)
@@ -551,14 +667,17 @@ 
         {
             // This record is out of visible range
             unset($event);
-        }
-        else
+        } else
 		{
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
         	$event->fetch_userassigned();				// This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+			    $event->date_start_in_calendar=$firstdaytoshow;
+			}
+            if ($event->date_end_in_calendar >= $lastdaytoshow) {
+                $event->date_end_in_calendar=($lastdaytoshow - 1);
+            }
 
             // Add an entry in actionarray for each day
             $daycursor=$event->date_start_in_calendar;
@@ -577,7 +696,9 @@ 
                 $j++;
 
                 $daykey+=60*60*24;
-                if ($daykey > $event->date_end_in_calendar) $loop=false;
+                if ($daykey > $event->date_end_in_calendar) {
+                    $loop=false;
+                }
             }
             while ($loop);
 
@@ -587,8 +708,7 @@ 
         $i++;
     }
     $db->free($resql);
-}
-else
+} else
 {
     dol_print_error($db);
 }
@@ -604,7 +724,9 @@ 
 {
     include_once $color_file;
 }
-if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+if (! is_array($theme_datacolor)) {
+    $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+}
 
 
 $newparam=$param;   // newparam is for birthday links
@@ -647,8 +769,11 @@ 
 		echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
 		echo $langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7));
 		print "<br>";
-		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'),'day');
-		else print dol_print_date($currentdaytoshow,'day');
+		if ($i) {
+		    print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'),'day');
+		} else {
+		    print dol_print_date($currentdaytoshow,'day');
+		}
 		echo "</td>\n";
 		$i++;
 	}
@@ -691,7 +816,9 @@ 
 				$listofuserid=$event->userassigned;
 				foreach($listofuserid as $userid => $tmp)
 				{
-				   	if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
+				   	if (! in_array($userid, $usernamesid)) {
+				   	    $usernamesid[$userid] = $userid;
+				   	}
 				}
 		   }
 		}
@@ -701,9 +828,13 @@ 
 	{
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		if ($usergroup > 0) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		}
 		$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
-		if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
+		if ($usergroup > 0) {
+		    $sql.= " AND ug.fk_usergroup = ".$usergroup;
+		}
 		//print $sql;
 		$resql=$db->query($sql);
 		if ($resql)
@@ -719,8 +850,9 @@ 
 					$i++;
 		        }
 		    }
+		} else {
+		    dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
 	foreach($usernamesid as $id)
@@ -794,10 +926,16 @@ 
 			$tmpyear = $tmparray['year'];
 
 			$style='cal_current_month';
-			if ($iter_day == 6) $style.=' cal_other_month';
+			if ($iter_day == 6) {
+			    $style.=' cal_other_month';
+			}
 			$today=0;
-			if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
-			if ($today) $style='cal_today_peruser';
+			if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) {
+			    $today=1;
+			}
+			if ($today) {
+			    $style='cal_today_peruser';
+			}
 
 			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -934,7 +1072,8 @@ 
 		$jour = date('d',$daykey);
 		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
 
-		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+		if ($day==$jour && $month==$mois && $year==$annee) {
+		    // Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
@@ -942,14 +1081,20 @@ 
 				//var_dump($event);
 
 				$keysofuserassigned=array_keys($event->userassigned);
+		}
 				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
 
-				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+				if (! in_array($username->id,$keysofuserassigned)) {
+				    continue;
+				}
+				// We discard record if event is from another user than user we want to show
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
 				$parameters=array();
 				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+				    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
 				$color=-1; $cssclass=''; $colorindex=-1;
@@ -966,11 +1111,14 @@ 
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+					if (! empty($cacheusers[$event->userownerid]->color)) {
+					    $color=$cacheusers[$event->userownerid]->color;
+					}
 
-					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
-				}
-				else if ($event->type_code == 'ICALEVENT')
+					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+					    $color=$event->type_color;
+					}
+				} else if ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (! empty($event->icalname))
@@ -983,12 +1131,10 @@ 
 
 					$color=$event->icalcolor;
 					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
-				}
-				else if ($event->type_code == 'BIRTHDAY')
+				} else if ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-				}
-				else
+				} else
 				{
 					$numother++;
 					$color=($event->icalcolor?$event->icalcolor:-1);
@@ -1003,24 +1149,32 @@ 
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+					if (! empty($cacheusers[$event->userownerid]->color)) {
+					    $color=$cacheusers[$event->userownerid]->color;
+					}
 
-					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
+					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+					    $color=$event->type_color;
+					}
 				}
 
-				if ($color < 0)	// Color was not set on user card. Set color according to color index.
+				if ($color < 0) {
+				    // Color was not set on user card. Set color according to color index.
 				{
 					// Define color index if not yet defined
 					$idusertouse=($event->userownerid?$event->userownerid:0);
+				}
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
-					}
-					else
+					} else
 					{
 						$colorindex=$nextindextouse;
 						$colorindexused[$idusertouse]=$colorindex;
-						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+						if (! empty($theme_datacolor[$nextindextouse+1])) {
+						    $nextindextouse++;
+						}
+						// Prepare to use next color
 					}
 					// Define color
 					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
@@ -1039,7 +1193,9 @@ 
 						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
 
 						$dateendtouse=$event->date_end_in_calendar;
-						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+						if ($dateendtouse==$event->date_start_in_calendar) {
+						    $dateendtouse++;
+						}
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
@@ -1052,10 +1208,15 @@ 
 			        		{
 				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
 				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+				        		    $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+				        		} else {
+				        		    $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		}
 			        		}
-							if ($event->label) $cases1[$h][$event->id]['string'].=' - '.$event->label;
+							if ($event->label) {
+							    $cases1[$h][$event->id]['string'].=' - '.$event->label;
+							}
 							$cases1[$h][$event->id]['typecode']=$event->type_code;
 							$cases1[$h][$event->id]['color']=$color;
 							if ($event->fk_project > 0)
@@ -1098,10 +1259,15 @@ 
 			        		{
 				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
 				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+				        		    $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+				        		} else {
+				        		    $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		}
 			        		}
-							if ($event->label) $cases2[$h][$event->id]['string'].=' - '.$event->label;
+							if ($event->label) {
+							    $cases2[$h][$event->id]['string'].=' - '.$event->label;
+							}
 							$cases2[$h][$event->id]['typecode']=$event->type_code;
 							$cases2[$h][$event->id]['color']=$color;
 							if ($event->fk_project > 0)
@@ -1135,8 +1301,7 @@ 
 								$cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
-					}
-					else
+					} else
 					{
 						$busy=$event->transparency;
 						$cases1[$h][$event->id]['busy']=$busy;
@@ -1166,63 +1331,95 @@ 
 		if (isset($cases1[$h]) && $cases1[$h] != '')
 		{
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			if (count($cases1[$h]) > 1) {
+			    $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			}
 			$string1='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
-			else $style1='peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			    $style1='peruser_notbusy';
+			} else {
+			    $style1='peruser_busy';
+			}
 			foreach($cases1[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style1='peruser_busy';
+				if ($ev['busy']) {
+				    $style1='peruser_busy';
+				}
 			}
 		}
 		if (isset($cases2[$h]) && $cases2[$h] != '')
 		{
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			if (count($cases2[$h]) > 1) {
+			    $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			}
 			$string2='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
-			else $style2='peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			    $style2='peruser_notbusy';
+			} else {
+			    $style2='peruser_busy';
+			}
 			foreach($cases2[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style2='peruser_busy';
+				if ($ev['busy']) {
+				    $style2='peruser_busy';
+				}
 			}
 		}
 
 		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+		if (count($cases1[$h]) && array_keys($cases1[$h])) {
+		    $ids1=join(',',array_keys($cases1[$h]));
+		}
+		if (count($cases2[$h]) && array_keys($cases2[$h])) {
+		    $ids2=join(',',array_keys($cases2[$h]));
+		}
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
+		if ($h == $begin_h) {
+		    echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+		} else {
+		    echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+		}
+		if (count($cases1[$h]) == 1) {
+		    // only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
 		}
-		else if (count($cases1[$h]) > 1)
+			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
+			if ($output[0]['string']) {
+			    $title1.=($title1?' - ':'').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+			    $color1 = $output[0]['color'];
+			}
+		} else if (count($cases1[$h]) > 1)
 		{
 			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
 			$color1='222222';
 		}
 
-		if (count($cases2[$h]) == 1)	// only 1 event
+		if (count($cases2[$h]) == 1) {
+		    // only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
 		}
-		else if (count($cases2[$h]) > 1)
+			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
+			if ($output[0]['string']) {
+			    $title2.=($title2?' - ':'').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+			    $color2 = $output[0]['color'];
+			}
+		} else if (count($cases2[$h]) > 1)
 		{
 			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
 			$color2='222222';
 		}
 		print '<table class="nobordernopadding" width="100%">';
 		print '<tr><td ';
-		if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1?$color1:"888").' !important" ';
-		elseif ($color1)
+		if ($style1 == 'peruser_notbusy') {
+		    print 'style="border: 1px solid #'.($color1?$color1:"888").' !important" ';
+		} elseif ($color1)
 		{
 			print ($color1?'style="background: #'.$color1.';"':'');
 		}
@@ -1231,8 +1428,9 @@ 
 		print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
 		print $string1;
 		print '</td><td ';
-		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2?$color2:"888").' !important" ';
-		elseif ($color2)
+		if ($style2 == 'peruser_notbusy') {
+		    print 'style="border: 1px solid #'.($color2?$color2:"888").' !important" ';
+		} elseif ($color2)
 		{
 			print ($color2?'style="background: #'.$color2.';"':'');
 		}

Spacing +441 added lines, -441 removed lines

@@ -31,7 +31,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -42,11 +42,11 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 
-$filter = GETPOST("search_filter",'alpha',3)?GETPOST("search_filter",'alpha',3):GETPOST("filter",'alpha',3);
-$filtert = GETPOST("search_filtert","int",3)?GETPOST("search_filtert","int",3):GETPOST("filtert","int",3);
-$usergroup = GETPOST("search_usergroup","int",3)?GETPOST("search_usergroup","int",3):GETPOST("usergroup","int",3);
+$filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
+$filtert = GETPOST("search_filtert", "int", 3) ?GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
+$usergroup = GETPOST("search_usergroup", "int", 3) ?GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 $showbirthday = 0;
@@ -54,90 +54,90 @@ 
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
-	$filtert=$user->id;
+	$filtert = $user->id;
 }
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page","int");
+$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
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="a.datec";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "a.datec";
 
 // Security check
-$socid = GETPOST("search_socid","int")?GETPOST("search_socid","int"):GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid='';
+if ($socid < 0) $socid = '';
 
-$canedit=1;
-if (! $user->rights->agenda->myactions->read) accessforbidden();
-if (! $user->rights->agenda->allactions->read) $canedit=0;
-if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
+$canedit = 1;
+if (!$user->rights->agenda->myactions->read) accessforbidden();
+if (!$user->rights->agenda->allactions->read) $canedit = 0;
+if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
 {
-    $filtert=$user->id;
+    $filtert = $user->id;
 }
 
 //$action=GETPOST('action','alpha');
-$action='show_peruser'; //We use 'show_week' mode
-$resourceid=GETPOST("search_resourceid","int")?GETPOST("search_resourceid","int"):GETPOST("resourceid","int");
-$year=GETPOST("year","int")?GETPOST("year","int"):date("Y");
-$month=GETPOST("month","int")?GETPOST("month","int"):date("m");
-$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
-$day=GETPOST("day","int")?GETPOST("day","int"):date("d");
-$pid=GETPOST("search_projectid","int",3)?GETPOST("search_projectid","int",3):GETPOST("projectid","int",3);
-$status=GETPOST("search_status",'alpha')?GETPOST("search_status",'alpha'):GETPOST("status",'alpha');
-$type=GETPOST("search_type",'alpha')?GETPOST("search_type",'alpha'):GETPOST("type",'alpha');
-$maxprint=((GETPOST("maxprint",'int')!='')?GETPOST("maxprint",'int'):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$action = 'show_peruser'; //We use 'show_week' mode
+$resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
+$year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
+$month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
+$week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
+$day = GETPOST("day", "int") ?GETPOST("day", "int") : date("d");
+$pid = GETPOST("search_projectid", "int", 3) ?GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
+$status = GETPOST("search_status", 'alpha') ?GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
+$type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
+$maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode','array'))
+if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode=GETPOST('search_actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
+    $actioncode = GETPOST('search_actioncode', 'array', 3);
+    if (!count($actioncode)) $actioncode = '0';
 }
 else
 {
-    $actioncode=GETPOST("search_actioncode","alpha",3)?GETPOST("search_actioncode","alpha",3):(GETPOST("search_actioncode","alpha")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
-$dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth','int'), GETPOST('dateselectday','int'), GETPOST('dateselectyear','int'));
+$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
 if ($dateselect > 0)
 {
-	$day=GETPOST('dateselectday','int');
-	$month=GETPOST('dateselectmonth','int');
-	$year=GETPOST('dateselectyear','int');
+	$day = GETPOST('dateselectday', 'int');
+	$month = GETPOST('dateselectmonth', 'int');
+	$year = GETPOST('dateselectyear', 'int');
 }
 
-$tmp=empty($conf->global->MAIN_DEFAULT_WORKING_HOURS)?'9-18':$conf->global->MAIN_DEFAULT_WORKING_HOURS;
-$tmparray=explode('-',$tmp);
-$begin_h = GETPOST('begin_h','int')!=''?GETPOST('begin_h','int'):($tmparray[0] != '' ? $tmparray[0] : 9);
-$end_h   = GETPOST('end_h','int')?GETPOST('end_h','int'):($tmparray[1] != '' ? $tmparray[1] : 18);
+$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmparray = explode('-', $tmp);
+$begin_h = GETPOST('begin_h', 'int') != '' ?GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOST('end_h', 'int') ?GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
 if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
 if ($end_h < 1 || $end_h > 24) $end_h = 18;
 if ($end_h <= $begin_h) $end_h = $begin_h + 1;
 
-$tmp=empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)?'1-5':$conf->global->MAIN_DEFAULT_WORKING_DAYS;
-$tmparray=explode('-',$tmp);
-$begin_d = GETPOST('begin_d','int')?GETPOST('begin_d','int'):($tmparray[0] != '' ? $tmparray[0] : 1);
-$end_d   = GETPOST('end_d','int')?GETPOST('end_d','int'):($tmparray[1] != '' ? $tmparray[1] : 5);
+$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
+$tmparray = explode('-', $tmp);
+$begin_d = GETPOST('begin_d', 'int') ?GETPOST('begin_d', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 1);
+$end_d   = GETPOST('end_d', 'int') ?GETPOST('end_d', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 5);
 if ($begin_d < 1 || $begin_d > 7) $begin_d = 1;
 if ($end_d < 1 || $end_d > 7) $end_d = 7;
 if ($end_d < $begin_d) $end_d = $begin_d + 1;
 
-if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 
-if (GETPOST('viewcal','alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser')  {
-    $action='show_month'; $day='';
+if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
+    $action = 'show_month'; $day = '';
 }                                                   // View by month
-if (GETPOST('viewweek','alpha') || $action == 'show_week') {
-    $action='show_week'; $week=($week?$week:date("W")); $day=($day?$day:date("d"));
+if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
+    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
-if (GETPOST('viewday','alpha') || $action == 'show_day')  {
-    $action='show_day'; $day=($day?$day:date("d"));
+if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
+    $action = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
 
 // Load translation files required by the page
@@ -151,11 +151,11 @@ 
  * Actions
  */
 
-if ($action =='delete_action')
+if ($action == 'delete_action')
 {
     $event = new ActionComm($db);
     $event->fetch($actionid);
-    $result=$event->delete();
+    $result = $event->delete();
 }
 
 
@@ -164,21 +164,21 @@ 
  * View
  */
 
-$form=new Form($db);
-$companystatic=new Societe($db);
+$form = new Form($db);
+$companystatic = new Societe($db);
 
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
+llxHeader('', $langs->trans("Agenda"), $help_url);
 
-$now=dol_now();
-$nowarray=dol_getdate($now);
-$nowyear=$nowarray['year'];
-$nowmonth=$nowarray['mon'];
-$nowday=$nowarray['mday'];
+$now = dol_now();
+$nowarray = dol_getdate($now);
+$nowyear = $nowarray['year'];
+$nowmonth = $nowarray['mon'];
+$nowday = $nowarray['mday'];
 
 
 // Define list of all external calendars (global setup)
-$listofextcals=array();
+$listofextcals = array();
 
 $prev = dol_get_first_day_week($day, $month, $year);
 $first_day   = $prev['first_day'];
@@ -193,37 +193,37 @@ 
 $next_month = $next['month'];
 $next_day   = $next['day'];
 
-$max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
 //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
-$title=$langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title=$langs->trans("DoneActions");
-if ($status == 'todo') $title=$langs->trans("ToDoActions");
+$title = $langs->trans("DoneAndToDoActions");
+if ($status == 'done') $title = $langs->trans("DoneActions");
+if ($status == 'todo') $title = $langs->trans("ToDoActions");
 
-$param='';
+$param = '';
 if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
-	if(is_array($actioncode)) {
-		foreach($actioncode as $str_action) $param.="&search_actioncode[]=".urlencode($str_action);
-	} else $param.="&search_actioncode=".urlencode($actioncode);
+	if (is_array($actioncode)) {
+		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
+	} else $param .= "&search_actioncode=".urlencode($actioncode);
 }
-if ($resourceid > 0) $param.="&search_resourceid=".urlencode($resourceid);
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&search_status=".urlencode($status);
-if ($filter)        $param.="&search_filter=".urlencode($filter);
-if ($filtert)       $param.="&search_filtert=".urlencode($filtert);
-if ($usergroup)     $param.="&search_usergroup=".urlencode($usergroup);
-if ($socid)         $param.="&search_socid=".urlencode($socid);
-if ($showbirthday)  $param.="&search_showbirthday=1";
-if ($pid)           $param.="&search_projectid=".urlencode($pid);
-if ($type)          $param.="&search_type=".urlencode($type);
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param.='&action='.urlencode($action);
-if ($begin_h != '') $param.='&begin_h='.urlencode($begin_h);
-if ($end_h != '')   $param.='&end_h='.urlencode($end_h);
-if ($begin_d != '') $param.='&begin_d='.urlencode($begin_d);
-if ($end_d != '')   $param.='&end_d='.urlencode($end_d);
-$param.="&maxprint=".urlencode($maxprint);
+if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
+if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status);
+if ($filter)        $param .= "&search_filter=".urlencode($filter);
+if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
+if ($usergroup)     $param .= "&search_usergroup=".urlencode($usergroup);
+if ($socid)         $param .= "&search_socid=".urlencode($socid);
+if ($showbirthday)  $param .= "&search_showbirthday=1";
+if ($pid)           $param .= "&search_projectid=".urlencode($pid);
+if ($type)          $param .= "&search_type=".urlencode($type);
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param .= '&action='.urlencode($action);
+if ($begin_h != '') $param .= '&begin_h='.urlencode($begin_h);
+if ($end_h != '')   $param .= '&end_h='.urlencode($end_h);
+if ($begin_d != '') $param .= '&begin_d='.urlencode($begin_d);
+if ($end_d != '')   $param .= '&end_d='.urlencode($end_d);
+$param .= "&maxprint=".urlencode($maxprint);
 
 
 $prev = dol_get_first_day_week($day, $month, $year);
@@ -233,7 +233,7 @@ 
 $prev_month = $prev['prev_month'];
 $prev_day   = $prev['prev_day'];
 $first_day  = $prev['first_day'];
-$first_month= $prev['first_month'];
+$first_month = $prev['first_month'];
 $first_year = $prev['first_year'];
 
 $week = $prev['week'];
@@ -245,24 +245,24 @@ 
 $next_day   = $next['day'];
 
 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
 
-$nb_weeks_to_show = (! empty($conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER)) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
-$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
+$nb_weeks_to_show = (!empty($conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER)) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
+$lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
 //print dol_print_date($firstdaytoshow,'dayhour');
 //print dol_print_date($lastdaytoshow,'dayhour');
 
-$max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
-$picto='calendarweek';
+$picto = 'calendarweek';
 
-$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp; \n";
-$nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
-$nav.=" </span>\n";
-$nav.=" &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp; \n";
+$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
+$nav .= " </span>\n";
+$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
+$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 
 /*$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -280,24 +280,24 @@ 
 $nav.='<input type="hidden" name="end_d" value="' . $end_d . '">';
 $nav.='<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
 */
-$nav.= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
+$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 //$nav.='</form>';
 
 // Must be after the nav definition
-$param.='&year='.urlencode($year).'&month='.urlencode($month).($day?'&day='.urlencode($day):'');
+$param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
 //print 'x'.$param;
 
 
 
-$tabactive='';
-if ($action == 'show_month') $tabactive='cardmonth';
-if ($action == 'show_week') $tabactive='cardweek';
-if ($action == 'show_day')  $tabactive='cardday';
-if ($action == 'show_list') $tabactive='cardlist';
-if ($action == 'show_peruser') $tabactive='cardperuser';
+$tabactive = '';
+if ($action == 'show_month') $tabactive = 'cardmonth';
+if ($action == 'show_week') $tabactive = 'cardweek';
+if ($action == 'show_day')  $tabactive = 'cardday';
+if ($action == 'show_list') $tabactive = 'cardlist';
+if ($action == 'show_peruser') $tabactive = 'cardperuser';
 
-$paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
+$paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
 $head = calendars_prepare_head($paramnoaction);
 
@@ -307,51 +307,51 @@ 
 print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
 dol_fiche_end();
 
-$showextcals=$listofextcals;
+$showextcals = $listofextcals;
 // Legend
 if ($conf->use_javascript_ajax)
 {
-	$s='';
-	$s.='<script type="text/javascript">' . "\n";
-	$s.='jQuery(document).ready(function () {' . "\n";
-	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
-	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
-	$s.='jQuery(".family_birthday").toggle();' . "\n";
-	if ($action=="show_week" || $action=="show_month" || empty($action))
+	$s = '';
+	$s .= '<script type="text/javascript">'."\n";
+	$s .= 'jQuery(document).ready(function () {'."\n";
+	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
+	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
+	$s .= 'jQuery(".family_birthday").toggle();'."\n";
+	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+    	$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+    	$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
-  	$s.='});' . "\n";
-	$s.='</script>' . "\n";
-	if (! empty($conf->use_javascript_ajax))
+  	$s .= '});'."\n";
+	$s .= '</script>'."\n";
+	if (!empty($conf->use_javascript_ajax))
 	{
-		$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+		$s .= '<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 		if (is_array($showextcals) && count($showextcals) > 0)
 		{
 			foreach ($showextcals as $val)
 			{
 				$htmlname = md5($val['name']);
-				$s.='<script type="text/javascript">' . "\n";
-				$s.='jQuery(document).ready(function () {' . "\n";
-				$s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
-				$s.=' 		/* alert("'.$htmlname.'"); */';
-				$s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
-				$s.='		});' . "\n";
-				$s.='});' . "\n";
-				$s.='</script>' . "\n";
-				$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val ['name'] . ' &nbsp; </div>';
+				$s .= '<script type="text/javascript">'."\n";
+				$s .= 'jQuery(document).ready(function () {'."\n";
+				$s .= '		jQuery("#check_ext'.$htmlname.'").click(function() {';
+				$s .= ' 		/* alert("'.$htmlname.'"); */';
+				$s .= ' 		jQuery(".family_ext'.$htmlname.'").toggle();';
+				$s .= '		});'."\n";
+				$s .= '});'."\n";
+				$s .= '</script>'."\n";
+				$s .= '<div class="nowrap float"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> '.$val ['name'].' &nbsp; </div>';
 			}
 		}
 
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-	    $parameters=array(); $object=null;
-		$reshook=$hookmanager->executeHooks('addCalendarChoice',$parameters,$object,$action);
+	    $parameters = array(); $object = null;
+		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
 	    if (empty($reshook))
 	    {
-			$s.= $hookmanager->resPrint;
+			$s .= $hookmanager->resPrint;
 	    }
 	    elseif ($reshook > 1)
 		{
@@ -361,191 +361,191 @@ 
 }
 
 
-$newcardbutton='';
+$newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
 {
-	$tmpforcreatebutton=dol_getdate(dol_now(), true);
+	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
-	$newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
 	//$param='month='.$monthshown.'&year='.$year;
-	$hourminsec='100000';
-	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$tmpforcreatebutton['year'],$tmpforcreatebutton['mon'],$tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
-	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-	$newcardbutton.= '</a>';
+	$hourminsec = '100000';
+	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')).'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
+	$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton .= '</a>';
 }
 
-$link='';
+$link = '';
 print load_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav.' '.$newcardbutton, '');
 
 
 
 // Get event in an array
-$eventarray=array();
+$eventarray = array();
 
 $sql = 'SELECT';
-if ($usergroup > 0) $sql.=" DISTINCT";
-$sql.= ' a.id, a.label,';
-$sql.= ' a.datep,';
-$sql.= ' a.datep2,';
-$sql.= ' a.percent,';
-$sql.= ' a.fk_user_author,a.fk_user_action,';
-$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
-$sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
-$sql.= ' ca.code, ca.color';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if ($usergroup > 0) $sql .= " DISTINCT";
+$sql .= ' a.id, a.label,';
+$sql .= ' a.datep,';
+$sql .= ' a.datep2,';
+$sql .= ' a.percent,';
+$sql .= ' a.fk_user_author,a.fk_user_action,';
+$sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
+$sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
+$sql .= ' ca.code, ca.color';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 // We must filter on resource table
-if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
-$sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
+if ($filtert > 0 || $usergroup > 0) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+$sql .= ' WHERE a.fk_action = ca.id';
+$sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
-if (! empty($actioncode))
+if (!empty($actioncode))
 {
     if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
+        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else
         {
-            if ($actioncode == 'AC_OTH') $sql.= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql.= " AND ca.type = 'systemauto'";
+            if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
+            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
     }
     else
     {
-        if ($actioncode == 'AC_NON_AUTO') $sql.= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND ca.type = 'systemauto'";
+        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
         else
         {
 		if (is_array($actioncode))
   		{
-  	        	$sql.=" AND ca.code IN ('".implode("','", $actioncode)."')";
+  	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
   		}
   		else
   		{
-  	        	$sql.=" AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+  	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
   		}
         }
     }
 }
-if ($resourceid > 0) $sql.=" AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
-    $sql.= " AND (";
-    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
-    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
-    $sql.= " OR ";
-    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
-    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
-    $sql.= " OR ";
-    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
-    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
-    $sql.= ')';
+    $sql .= " AND (";
+    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+    $sql .= " OR ";
+    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+    $sql .= " OR ";
+    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+    $sql .= ')';
 }
 else
 {
     // To limit array
-    $sql.= " AND (";
-    $sql.= " (a.datep BETWEEN '".$db->idate($firstdaytoshow-(60*60*24*2))."'";   	// Start 2 day before $firstdaytoshow
-    $sql.= " AND '".$db->idate($lastdaytoshow+(60*60*24*2))."')";   				// End 2 day after $lastdaytoshow
-    $sql.= " OR ";
-    $sql.= " (a.datep2 BETWEEN '".$db->idate($firstdaytoshow-(60*60*24*2))."'";
-    $sql.= " AND '".$db->idate($lastdaytoshow+(60*60*24*2))."')";
-    $sql.= " OR ";
-    $sql.= " (a.datep < '".$db->idate($firstdaytoshow-(60*60*24*2))."'";
-    $sql.= " AND a.datep2 > '".$db->idate($lastdaytoshow+(60*60*24*2))."')";
-    $sql.= ')';
+    $sql .= " AND (";
+    $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
+    $sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')"; // End 2 day after $lastdaytoshow
+    $sql .= " OR ";
+    $sql .= " (a.datep2 BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
+    $sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
+    $sql .= " OR ";
+    $sql .= " (a.datep < '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
+    $sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
+    $sql .= ')';
 }
-if ($type) $sql.= " AND ca.id = ".$type;
-if ($status == '0') { $sql.= " AND a.percent = 0"; }
-if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
-if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
-if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100)"; }
-if ($status == 'todo') { $sql.= " AND (a.percent >= 0 AND a.percent < 100)"; }
+if ($type) $sql .= " AND ca.id = ".$type;
+if ($status == '0') { $sql .= " AND a.percent = 0"; }
+if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
+if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
+if ($status == 'done' || $status == '100') { $sql .= " AND (a.percent = 100)"; }
+if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql.= " AND (";
-    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
-    $sql.= ")";
+    $sql .= " AND (";
+    if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
+    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+    $sql .= ")";
 }
 // Sort on date
-$sql.= ' ORDER BY fk_user_action, datep'; //fk_user_action
+$sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
 
 
 dol_syslog("comm/action/peruser.php", LOG_DEBUG);
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
 
-    $i=0;
+    $i = 0;
     while ($i < $num)
     {
         $obj = $db->fetch_object($resql);
 
         // Discard auto action if option is on
-        if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
         {
         	$i++;
         	continue;
         }
 
-        $datep=$db->jdate($obj->datep);
-        $datep2=$db->jdate($obj->datep2);
+        $datep = $db->jdate($obj->datep);
+        $datep2 = $db->jdate($obj->datep2);
 
         // Create a new object action
-        $event=new ActionComm($db);
-        $event->id=$obj->id;
-        $event->datep=$datep;      // datep and datef are GMT date
-        $event->datef=$datep2;
-        $event->type_code=$obj->code;
-        $event->type_color=$obj->color;
-        $event->label=$obj->label;
-        $event->percentage=$obj->percent;
-        $event->authorid=$obj->fk_user_author;		// user id of creator
-        $event->userownerid=$obj->fk_user_action;	// user id of owner
-        $event->priority=$obj->priority;
-        $event->fulldayevent=$obj->fulldayevent;
-        $event->location=$obj->location;
-        $event->transparency=$obj->transparency;
-
-        $event->fk_project=$obj->fk_project;
-
-        $event->socid=$obj->fk_soc;
-        $event->contactid=$obj->fk_contact;
-
-        $event->fk_element=$obj->fk_element;
-        $event->elementtype=$obj->elementtype;
+        $event = new ActionComm($db);
+        $event->id = $obj->id;
+        $event->datep = $datep; // datep and datef are GMT date
+        $event->datef = $datep2;
+        $event->type_code = $obj->code;
+        $event->type_color = $obj->color;
+        $event->label = $obj->label;
+        $event->percentage = $obj->percent;
+        $event->authorid = $obj->fk_user_author; // user id of creator
+        $event->userownerid = $obj->fk_user_action; // user id of owner
+        $event->priority = $obj->priority;
+        $event->fulldayevent = $obj->fulldayevent;
+        $event->location = $obj->location;
+        $event->transparency = $obj->transparency;
+
+        $event->fk_project = $obj->fk_project;
+
+        $event->socid = $obj->fk_soc;
+        $event->contactid = $obj->fk_contact;
+
+        $event->fk_element = $obj->fk_element;
+        $event->elementtype = $obj->elementtype;
 
         // Defined date_start_in_calendar and date_end_in_calendar property
         // They are date start and end of action but modified to not be outside calendar view.
         if ($event->percentage <= 0)
         {
-            $event->date_start_in_calendar=$datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-            else $event->date_end_in_calendar=$datep;
+            $event->date_start_in_calendar = $datep;
+            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+            else $event->date_end_in_calendar = $datep;
         }
         else
 		{
-            $event->date_start_in_calendar=$datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar=$datep2;
-            else $event->date_end_in_calendar=$datep;
+            $event->date_start_in_calendar = $datep;
+            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+            else $event->date_end_in_calendar = $datep;
         }
         // Define ponctual property
         if ($event->date_start_in_calendar == $event->date_end_in_calendar)
         {
-            $event->ponctuel=1;
+            $event->ponctuel = 1;
         }
 
         // Check values
@@ -558,29 +558,29 @@ 
         else
 		{
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
-        	$event->fetch_userassigned();				// This load $event->userassigned
+        	$event->fetch_userassigned(); // This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
+            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
             // Add an entry in actionarray for each day
-            $daycursor=$event->date_start_in_calendar;
-            $annee = date('Y',$daycursor);
-            $mois = date('m',$daycursor);
-            $jour = date('d',$daycursor);
+            $daycursor = $event->date_start_in_calendar;
+            $annee = date('Y', $daycursor);
+            $mois = date('m', $daycursor);
+            $jour = date('d', $daycursor);
 
             // Loop on each day covered by action to prepare an index to show on calendar
-            $loop=true; $j=0;
-            $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
+            $loop = true; $j = 0;
+            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
             do
 			{
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
-                $eventarray[$daykey][]=$event;
+                $eventarray[$daykey][] = $event;
                 $j++;
 
-                $daykey+=60*60*24;
-                if ($daykey > $event->date_end_in_calendar) $loop=false;
+                $daykey += 60 * 60 * 24;
+                if ($daykey > $event->date_end_in_calendar) $loop = false;
             }
             while ($loop);
 
@@ -596,10 +596,10 @@ 
     dol_print_error($db);
 }
 
-$maxnbofchar=18;
-$cachethirdparties=array();
-$cachecontacts=array();
-$cacheusers=array();
+$maxnbofchar = 18;
+$cachethirdparties = array();
+$cachecontacts = array();
+$cacheusers = array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
@@ -607,23 +607,23 @@ 
 {
     include_once $color_file;
 }
-if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 
 
-$newparam=$param;   // newparam is for birthday links
-$newparam=preg_replace('/showbirthday=/i','showbirthday_=',$newparam);	// To avoid replacement when replace day= is done
-$newparam=preg_replace('/action=show_month&?/i','',$newparam);
-$newparam=preg_replace('/action=show_week&?/i','',$newparam);
-$newparam=preg_replace('/day=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
-$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
-$newparam.='&viewweek=1';
+$newparam = $param; // newparam is for birthday links
+$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
+$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
+$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+$newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/viewweek=[0-9]+&?/i', '', $newparam);
+$newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
+$newparam .= '&viewweek=1';
 
 echo '<input type="hidden" name="actionmove" value="mupdate">';
 echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
-echo '<input type="hidden" name="newdate" id="newdate">' ;
+echo '<input type="hidden" name="newdate" id="newdate">';
 
 
 // Line header with list of days
@@ -633,13 +633,13 @@ 
 $currentdaytoshow = $firstdaytoshow;
 echo '<div class="div-table-responsive">';
 
-while($currentdaytoshow<$lastdaytoshow) {
+while ($currentdaytoshow < $lastdaytoshow) {
 
 	echo '<table width="100%" class="noborder nocellnopadd cal_month">';
 
 	echo '<tr class="liste_titre">';
 	echo '<td></td>';
-	$i=0;	// 0 = sunday,
+	$i = 0; // 0 = sunday,
 	while ($i < 7)
 	{
 		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
@@ -648,10 +648,10 @@ 
 			continue;
 		}
 		echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
-		echo $langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7));
+		echo $langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7));
 		print "<br>";
-		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'),'day');
-		else print dol_print_date($currentdaytoshow,'day');
+		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
+		else print dol_print_date($currentdaytoshow, 'day');
 		echo "</td>\n";
 		$i++;
 	}
@@ -659,7 +659,7 @@ 
 
 	echo '<tr class="liste_titre">';
 	echo '<td></td>';
-	$i=0;
+	$i = 0;
 	while ($i < 7)
 	{
 		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
@@ -670,7 +670,7 @@ 
 		for ($h = $begin_h; $h < $end_h; $h++)
 		{
 			echo '<td align="center">';
-			print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
+			print '<small style="font-family: courier">'.sprintf("%02d", $h).'</small>';
 			print "</td>";
 		}
 		echo "</td>\n";
@@ -683,7 +683,7 @@ 
 	$usernames = array(); //init
 	$usernamesid = array();
 	/* Use this to have list of users only if users have events */
-	if (! empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW))
+	if (!empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW))
 	{
 		foreach ($eventarray as $daykey => $notused)
 		{
@@ -691,10 +691,10 @@ 
 		   foreach ($eventarray[$daykey] as $index => $event)
 		   {
 			   	$event->fetch_userassigned();
-				$listofuserid=$event->userassigned;
-				foreach($listofuserid as $userid => $tmp)
+				$listofuserid = $event->userassigned;
+				foreach ($listofuserid as $userid => $tmp)
 				{
-				   	if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
+				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
 				}
 		   }
 		}
@@ -703,12 +703,12 @@ 
 	else
 	{
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
-		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
-		$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
-		if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
+		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		$sql .= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
+		if ($usergroup > 0)	$sql .= " AND ug.fk_usergroup = ".$usergroup;
 		//print $sql;
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 		    $num = $db->num_rows($resql);
@@ -718,7 +718,7 @@ 
 		        while ($i < $num)
 		        {
 		            $obj = $db->fetch_object($resql);
-					$usernamesid[$obj->rowid]=$obj->rowid;
+					$usernamesid[$obj->rowid] = $obj->rowid;
 					$i++;
 		        }
 		    }
@@ -726,11 +726,11 @@ 
 		else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
-	foreach($usernamesid as $id)
+	foreach ($usernamesid as $id)
 	{
-		$tmpuser=new User($db);
-		$result=$tmpuser->fetch($id);
-		$usernames[]=$tmpuser;
+		$tmpuser = new User($db);
+		$result = $tmpuser->fetch($id);
+		$usernames[] = $tmpuser;
 	}
 
 	/*
@@ -754,27 +754,27 @@ 
 	}*/
 
 	// Load array of colors by type
-	$colorsbytype=array();
-	$labelbytype=array();
-	$sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
-	$resql=$db->query($sql);
+	$colorsbytype = array();
+	$labelbytype = array();
+	$sql = "SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
+	$resql = $db->query($sql);
 	while ($obj = $db->fetch_object($resql))
 	{
-		$colorsbytype[$obj->code]=$obj->color;
-		$labelbytype[$obj->code]=$obj->libelle;
+		$colorsbytype[$obj->code] = $obj->color;
+		$labelbytype[$obj->code] = $obj->libelle;
 	}
 
 	// Loop on each user to show calendar
-	$todayarray=dol_getdate($now,'fast');
+	$todayarray = dol_getdate($now, 'fast');
 	$sav = $tmpday;
 	$showheader = true;
 	$var = false;
 	foreach ($usernames as $username)
 	{
-		$var = ! $var;
+		$var = !$var;
 		echo "<tr>";
-		echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">';
-		print $username->getNomUrl(-1,'',0,0,20,1,'');
+		echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">';
+		print $username->getNomUrl(-1, '', 0, 0, 20, 1, '');
 		print '</td>';
 		$tmpday = $sav;
 
@@ -791,16 +791,16 @@ 
 
 	        // Show days of the current week
 			$curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
-			$tmparray = dol_getdate($curtime,'fast');
+			$tmparray = dol_getdate($curtime, 'fast');
 			$tmpday = $tmparray['mday'];
 			$tmpmonth = $tmparray['mon'];
 			$tmpyear = $tmparray['year'];
 
-			$style='cal_current_month';
-			if ($iter_day == 6) $style.=' cal_other_month';
-			$today=0;
-			if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
-			if ($today) $style='cal_today_peruser';
+			$style = 'cal_current_month';
+			if ($iter_day == 6) $style .= ' cal_other_month';
+			$today = 0;
+			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
+			if ($today) $style = 'cal_today_peruser';
 
 			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -813,21 +813,21 @@ 
 	echo "</table>\n";
 	echo "<br>";
 
-	$currentdaytoshow =  dol_time_plus_duree($currentdaytoshow, 7, 'd');
+	$currentdaytoshow = dol_time_plus_duree($currentdaytoshow, 7, 'd');
 }
 
 echo '</div>';
 
-if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE))
+if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && !empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE))
 {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
-	foreach($colorsbytype as $code => $color)
+	foreach ($colorsbytype as $code => $color)
 	{
 		if ($color)
 		{
-			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
-			print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
+			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color ? 'background: #'.$color.';' : '').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+			print $langs->trans("Action".$code) != "Action".$code ? $langs->trans("Action".$code) : $labelbytype[$code];
 			//print $code;
 			print '</div>';
 		}
@@ -908,125 +908,125 @@ 
  * @param	bool	$var			true or false for alternat style on tr/td
  * @return	void
  */
-function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)
+function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $showheader = false, $colorsbytype = array(), $var = false)
 {
 	global $db;
 	global $user, $conf, $langs, $hookmanager, $action;
-	global $filter, $filtert, $status, $actioncode;	// Filters used into search form
-	global $theme_datacolor;	// Array with a list of different we can use (come from theme)
+	global $filter, $filtert, $status, $actioncode; // Filters used into search form
+	global $theme_datacolor; // Array with a list of different we can use (come from theme)
 	global $cachethirdparties, $cachecontacts, $cacheusers, $cacheprojects, $colorindexused;
 	global $begin_h, $end_h;
 
-	$cases1 = array();	// Color first half hour
+	$cases1 = array(); // Color first half hour
 	$cases2 = array(); // Color second half hour
 
 	$curtime = dol_mktime(0, 0, 0, $month, $day, $year, false, 0);
 
-	$i=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
-	$ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+	$i = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
+	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
-	$colorindexused[$user->id] = 0;			// Color index for current user (user->id) is always 0
-	$nextindextouse=count($colorindexused);	// At first run this is 0, so first user has 0, next 1, ...
+	$colorindexused[$user->id] = 0; // Color index for current user (user->id) is always 0
+	$nextindextouse = count($colorindexused); // At first run this is 0, so first user has 0, next 1, ...
 	//if ($username->id && $day==1) var_dump($eventarray);
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused)
 	{
-		$annee = date('Y',$daykey);
-		$mois = date('m',$daykey);
-		$jour = date('d',$daykey);
+		$annee = date('Y', $daykey);
+		$mois = date('m', $daykey);
+		$jour = date('d', $daykey);
 		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
 
-		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
 			{
 				//var_dump($event);
 
-				$keysofuserassigned=array_keys($event->userassigned);
-				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+				$keysofuserassigned = array_keys($event->userassigned);
+				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
-				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+				if (!in_array($username->id, $keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
-				$parameters=array();
-				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formatEvent', $parameters, $event, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
-				$color=-1; $cssclass=''; $colorindex=-1;
+				$color = -1; $cssclass = ''; $colorindex = -1;
 				if (in_array($user->id, $keysofuserassigned))
 				{
-					$cssclass='family_mytasks';
+					$cssclass = 'family_mytasks';
 
 					if (empty($cacheusers[$event->userownerid]))
 					{
-						$newuser=new User($db);
+						$newuser = new User($db);
 						$newuser->fetch($event->userownerid);
-						$cacheusers[$event->userownerid]=$newuser;
+						$cacheusers[$event->userownerid] = $newuser;
 					}
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
 
-					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
+					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
 				}
 				else if ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
-					if (! empty($event->icalname))
+					if (!empty($event->icalname))
 					{
-						if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
+						if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
 							$numicals[dol_string_nospecial($event->icalname)] = 0;
 						}
 						$numicals[dol_string_nospecial($event->icalname)]++;
 					}
 
-					$color=$event->icalcolor;
-					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
+					$color = $event->icalcolor;
+					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
 				}
 				else if ($event->type_code == 'BIRTHDAY')
 				{
-					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
 				else
 				{
 					$numother++;
-					$color=($event->icalcolor?$event->icalcolor:-1);
-					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other');
+					$color = ($event->icalcolor ? $event->icalcolor : -1);
+					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
 
 					if (empty($cacheusers[$event->userownerid]))
 					{
-						$newuser=new User($db);
+						$newuser = new User($db);
 						$newuser->fetch($event->userownerid);
-						$cacheusers[$event->userownerid]=$newuser;
+						$cacheusers[$event->userownerid] = $newuser;
 					}
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
 
-					if (! empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color=$event->type_color;
+					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
 				}
 
 				if ($color < 0)	// Color was not set on user card. Set color according to color index.
 				{
 					// Define color index if not yet defined
-					$idusertouse=($event->userownerid?$event->userownerid:0);
+					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
 					if (isset($colorindexused[$idusertouse]))
 					{
-						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
+						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					}
 					else
 					{
-						$colorindex=$nextindextouse;
-						$colorindexused[$idusertouse]=$colorindex;
-						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+						$colorindex = $nextindextouse;
+						$colorindexused[$idusertouse] = $colorindex;
+						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
 					}
 					// Define color
-					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
 				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
 
@@ -1037,211 +1037,211 @@ 
 					$newcolor = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
-						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
-						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
+						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, false, 0);
+						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, false, 0);
+						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, false, 0);
 
-						$dateendtouse=$event->date_end_in_calendar;
-						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+						$dateendtouse = $event->date_end_in_calendar;
+						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
 						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
 						{
-							$busy=$event->transparency;
-							$cases1[$h][$event->id]['busy']=$busy;
-							$cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+							$busy = $event->transparency;
+							$cases1[$h][$event->id]['busy'] = $busy;
+							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
+				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+				        		else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
 			        		}
-							if ($event->label) $cases1[$h][$event->id]['string'].=' - '.$event->label;
-							$cases1[$h][$event->id]['typecode']=$event->type_code;
-							$cases1[$h][$event->id]['color']=$color;
+							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
+							$cases1[$h][$event->id]['typecode'] = $event->type_code;
+							$cases1[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
 							{
 								if (empty($cacheprojects[$event->fk_project]))
 								{
-									$tmpproj=new Project($db);
+									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
+									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
-								$cases1[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+								$cases1[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
 							if ($event->socid > 0)
 							{
 								if (empty($cachethirdparties[$event->socid]))
 								{
-									$tmpthirdparty=new Societe($db);
+									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
+									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
-								$cases1[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
 							if ($event->contactid > 0)
 							{
 								if (empty($cachecontacts[$event->contactid]))
 								{
-									$tmpcontact=new Contact($db);
+									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
+									$cachecontacts[$event->contactid] = $tmpcontact;
 								}
-								$cases1[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
 						{
-							$busy=$event->transparency;
-							$cases2[$h][$event->id]['busy']=$busy;
-							$cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+							$busy = $event->transparency;
+							$cases2[$h][$event->id]['busy'] = $busy;
+							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 			        		{
-				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
-				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
-				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
+				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+				        		else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
 			        		}
-							if ($event->label) $cases2[$h][$event->id]['string'].=' - '.$event->label;
-							$cases2[$h][$event->id]['typecode']=$event->type_code;
-							$cases2[$h][$event->id]['color']=$color;
+							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
+							$cases2[$h][$event->id]['typecode'] = $event->type_code;
+							$cases2[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
 							{
 								if (empty($cacheprojects[$event->fk_project]))
 								{
-									$tmpproj=new Project($db);
+									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project]=$tmpproj;
+									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
-								$cases2[$h][$event->id]['string'].=', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
+								$cases2[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
 							if ($event->socid > 0)
 							{
 								if (empty($cachethirdparties[$event->socid]))
 								{
-									$tmpthirdparty=new Societe($db);
+									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid]=$tmpthirdparty;
+									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
-								$cases2[$h][$event->id]['string'].=', '.$cachethirdparties[$event->socid]->name;
+								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
 							if ($event->contactid > 0)
 							{
 								if (empty($cachecontacts[$event->contactid]))
 								{
-									$tmpcontact=new Contact($db);
+									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid]=$tmpcontact;
+									$cachecontacts[$event->contactid] = $tmpcontact;
 								}
-								$cases2[$h][$event->id]['string'].=', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
 					}
 					else
 					{
-						$busy=$event->transparency;
-						$cases1[$h][$event->id]['busy']=$busy;
-						$cases2[$h][$event->id]['busy']=$busy;
-						$cases1[$h][$event->id]['string']=$event->label;
-						$cases2[$h][$event->id]['string']=$event->label;
-						$cases1[$h][$event->id]['typecode']=$event->type_code;
-						$cases2[$h][$event->id]['typecode']=$event->type_code;
-						$cases1[$h][$event->id]['color']=$color;
-						$cases2[$h][$event->id]['color']=$color;
+						$busy = $event->transparency;
+						$cases1[$h][$event->id]['busy'] = $busy;
+						$cases2[$h][$event->id]['busy'] = $busy;
+						$cases1[$h][$event->id]['string'] = $event->label;
+						$cases2[$h][$event->id]['string'] = $event->label;
+						$cases1[$h][$event->id]['typecode'] = $event->type_code;
+						$cases2[$h][$event->id]['typecode'] = $event->type_code;
+						$cases1[$h][$event->id]['color'] = $color;
+						$cases2[$h][$event->id]['color'] = $color;
 					}
 				}
 				$i++;
 			}
 
-			break;	// We found the date we were looking for. No need to search anymore.
+			break; // We found the date we were looking for. No need to search anymore.
 		}
 	}
 
 	// Now output $casesX
 	for ($h = $begin_h; $h < $end_h; $h++)
 	{
-		$color1='';$color2='';
-		$style1='';$style2='';
-		$string1='&nbsp;';$string2='&nbsp;';
-		$title1='';$title2='';
+		$color1 = ''; $color2 = '';
+		$style1 = ''; $style2 = '';
+		$string1 = '&nbsp;'; $string2 = '&nbsp;';
+		$title1 = ''; $title2 = '';
 		if (isset($cases1[$h]) && $cases1[$h] != '')
 		{
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string1='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
-			else $style1='peruser_busy';
-			foreach($cases1[$h] as $id => $ev)
+			if (count($cases1[$h]) > 1) $title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			$string1 = '&nbsp;';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1 = 'peruser_notbusy';
+			else $style1 = 'peruser_busy';
+			foreach ($cases1[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style1='peruser_busy';
+				if ($ev['busy']) $style1 = 'peruser_busy';
 			}
 		}
 		if (isset($cases2[$h]) && $cases2[$h] != '')
 		{
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			$string2='&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
-			else $style2='peruser_busy';
-			foreach($cases2[$h] as $id => $ev)
+			if (count($cases2[$h]) > 1) $title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			$string2 = '&nbsp;';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2 = 'peruser_notbusy';
+			else $style2 = 'peruser_busy';
+			foreach ($cases2[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style2='peruser_busy';
+				if ($ev['busy']) $style2 = 'peruser_busy';
 			}
 		}
 
-		$ids1='';$ids2='';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h]));
+		$ids1 = ''; $ids2 = '';
+		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
+		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var?' cal_impair '.$style.'_impair':'').'">';
+		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		else echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
 		if (count($cases1[$h]) == 1)	// only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
+			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
+			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
 		}
 		else if (count($cases1[$h]) > 1)
 		{
-			$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
-			$color1='222222';
+			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
+			$color1 = '222222';
 		}
 
 		if (count($cases2[$h]) == 1)	// only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
+			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
+			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
 		}
 		else if (count($cases2[$h]) > 1)
 		{
-			$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
-			$color2='222222';
+			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
+			$color2 = '222222';
 		}
 		print '<table class="nobordernopadding" width="100%">';
 		print '<tr><td ';
-		if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1?$color1:"888").' !important" ';
+		if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
 		elseif ($color1)
 		{
-			print ($color1?'style="background: #'.$color1.';"':'');
+			print ($color1 ? 'style="background: #'.$color1.';"' : '');
 		}
 		print 'class="';
-		print ($style1?$style1.' ':'');
-		print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
+		print ($style1 ? $style1.' ' : '');
+		print 'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td><td ';
-		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2?$color2:"888").' !important" ';
+		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
 		elseif ($color2)
 		{
-			print ($color2?'style="background: #'.$color2.';"':'');
+			print ($color2 ? 'style="background: #'.$color2.';"' : '');
 		}
 		print 'class="';
-		print ($style2?$style2.' ':'');
-		print 'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
+		print ($style2 ? $style2.' ' : '');
+		print 'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';