alxarafe / alixar

dolibarr/htdocs/core/class/infobox.class.php

Spacing +68 added lines, -68 removed lines

@@ -48,33 +48,33 @@ 
      *  @param  int         $includehidden  Include also hidden boxes
      *  @return array       	        	Array of boxes
      */
-    static function listBoxes($db, $mode, $zone, $user=null, $excludelist=array(), $includehidden=1)
+    static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
     {
         global $conf;
 
-        $boxes=array();
+        $boxes = array();
 
-        $confuserzone='MAIN_BOXES_'.$zone;
+        $confuserzone = 'MAIN_BOXES_'.$zone;
         if ($mode == 'activated')	// activated
         {
             $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
-            $sql.= " d.rowid as box_id, d.file, d.note, d.tms";
-            $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
-            $sql.= " WHERE b.box_id = d.rowid";
-            $sql.= " AND b.entity IN (0,".$conf->entity.")";
-            if ($zone >= 0) $sql.= " AND b.position = ".$zone;
-            if (is_object($user)) $sql.= " AND b.fk_user IN (0,".$user->id.")";
-            else $sql.= " AND b.fk_user = 0";
-            $sql.= " ORDER BY b.box_order";
+            $sql .= " d.rowid as box_id, d.file, d.note, d.tms";
+            $sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
+            $sql .= " WHERE b.box_id = d.rowid";
+            $sql .= " AND b.entity IN (0,".$conf->entity.")";
+            if ($zone >= 0) $sql .= " AND b.position = ".$zone;
+            if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
+            else $sql .= " AND b.fk_user = 0";
+            $sql .= " ORDER BY b.box_order";
         }
         else	// available
 		{
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
-            $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-           	$sql.= " WHERE d.entity IN (0,".$conf->entity.")";
+            $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
+           	$sql .= " WHERE d.entity IN (0,".$conf->entity.")";
         }
 
-        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
+        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
         {
@@ -84,18 +84,18 @@ 
             {
                 $obj = $db->fetch_object($resql);
 
-                if (! in_array($obj->box_id, $excludelist))
+                if (!in_array($obj->box_id, $excludelist))
                 {
 
-                    if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
+                    if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))
                     {
-                        $boxname = preg_replace('/\.php$/i','',$regs[1]);
+                        $boxname = preg_replace('/\.php$/i', '', $regs[1]);
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
                     }
                     else
                     {
-                        $boxname=preg_replace('/\.php$/i','',$obj->file);
+                        $boxname = preg_replace('/\.php$/i', '', $obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
 					}
 
@@ -107,48 +107,48 @@ 
                     dol_include_once($relsourcefile);
                     if (class_exists($boxname))
                     {
-                    	$box=new $boxname($db,$obj->note);		// Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+                    	$box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
                         //$box=new stdClass();
 
                         // box properties
-                        $box->rowid		= (empty($obj->rowid) ? '' : $obj->rowid);
-                        $box->id		= (empty($obj->box_id) ? '' : $obj->box_id);
-                        $box->position	= ($obj->position == '' ? '' : $obj->position);		// '0' must staty '0'
+                        $box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
+                        $box->id = (empty($obj->box_id) ? '' : $obj->box_id);
+                        $box->position = ($obj->position == '' ? '' : $obj->position); // '0' must staty '0'
                         $box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
-                        $box->fk_user	= (empty($obj->fk_user) ? 0 : $obj->fk_user);
-                        $box->sourcefile= $relsourcefile;
-                    	$box->class     = $boxname;
+                        $box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
+                        $box->sourcefile = $relsourcefile;
+                    	$box->class = $boxname;
 
-                    	if ($mode == 'activated' && ! is_object($user))	// List of activated box was not yet personalized into database
+                    	if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
                         {
                             if (is_numeric($box->box_order))
                             {
-                                if ($box->box_order % 2 == 1) $box->box_order='A'.$box->box_order;
-                                elseif ($box->box_order % 2 == 0) $box->box_order='B'.$box->box_order;
+                                if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
+                                elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
                             }
                         }
                         // box_def properties
-                        $box->box_id	= (empty($obj->box_id) ? '' : $obj->box_id);
-                        $box->note		= (empty($obj->note) ? '' : $obj->note);
+                        $box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);
+                        $box->note = (empty($obj->note) ? '' : $obj->note);
 
                         // Filter on box->enabled (used for example by box_comptes)
                         // Filter also on box->depends. Example: array("product|service") or array("contrat", "service")
-                        $enabled=$box->enabled;
+                        $enabled = $box->enabled;
                         if (isset($box->depends) && count($box->depends) > 0)
                         {
-                            foreach($box->depends as $moduleelem)
+                            foreach ($box->depends as $moduleelem)
                             {
-                            	$arrayelem=explode('|',$moduleelem);
-                            	$tmpenabled=0;	// $tmpenabled is used for the '|' test (OR)
-                            	foreach($arrayelem as $module)
+                            	$arrayelem = explode('|', $moduleelem);
+                            	$tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
+                            	foreach ($arrayelem as $module)
                             	{
-    	                        	$tmpmodule=preg_replace('/@[^@]+/','',$module);
-    	                        	if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
+    	                        	$tmpmodule = preg_replace('/@[^@]+/', '', $module);
+    	                        	if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
                             		//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
                             	}
                             	if (empty($tmpenabled))	// We found at least one module required that is disabled
         	                    {
-        	                    	$enabled=0;
+        	                    	$enabled = 0;
         	                    	break;
         	                    }
                             }
@@ -156,7 +156,7 @@ 
                         //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
 
                         //print 'xx module='.$module.' enabled='.$enabled;
-                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[]=$box;
+                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
                         else unset($box);
                     }
                     else
@@ -169,7 +169,7 @@ 
         }
         else
 		{
-			dol_syslog($db->lasterror(),LOG_ERR);
+			dol_syslog($db->lasterror(), LOG_ERR);
             return array('error'=>$db->lasterror());
         }
 
@@ -186,70 +186,70 @@ 
      *  @param  int     $userid     	Id of user
      *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
      */
-    static function saveboxorder($db, $zone,$boxorder,$userid=0)
+    static function saveboxorder($db, $zone, $boxorder, $userid = 0)
     {
         global $conf;
 
-        $error=0;
+        $error = 0;
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
         dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
 
-        if (! $userid || $userid == 0) return 0;
+        if (!$userid || $userid == 0) return 0;
 
         $user = new User($db);
-        $user->id=$userid;
+        $user->id = $userid;
 
         $db->begin();
 
         // Save parameters to say user has a dedicated setup
-        $tab=array();
-        $confuserzone='MAIN_BOXES_'.$zone;
-        $tab[$confuserzone]=1;
+        $tab = array();
+        $confuserzone = 'MAIN_BOXES_'.$zone;
+        $tab[$confuserzone] = 1;
         if (dol_set_user_param($db, $conf, $user, $tab) < 0)
         {
-            $error=$db->lasterror();
+            $error = $db->lasterror();
             $db->rollback();
             return -3;
         }
 
         // Delete all lines
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-        $sql.= " WHERE entity = ".$conf->entity;
-        $sql.= " AND fk_user = ".$userid;
-        $sql.= " AND position = ".$zone;
+        $sql .= " WHERE entity = ".$conf->entity;
+        $sql .= " AND fk_user = ".$userid;
+        $sql .= " AND position = ".$zone;
 
         dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
         $result = $db->query($sql);
         if ($result)
         {
-            $colonnes=explode('-',$boxorder);
+            $colonnes = explode('-', $boxorder);
             foreach ($colonnes as $collist)
             {
-                $part=explode(':',$collist);
-                $colonne=$part[0];
-                $list=$part[1];
+                $part = explode(':', $collist);
+                $colonne = $part[0];
+                $list = $part[1];
                 dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);
 
-                $i=0;
-                $listarray=explode(',',$list);
+                $i = 0;
+                $listarray = explode(',', $list);
                 foreach ($listarray as $id)
                 {
                     if (is_numeric($id))
                     {
                         //dol_syslog("aaaaa".count($listarray));
                         $i++;
-                        $ii=sprintf('%02d',$i);
+                        $ii = sprintf('%02d', $i);
                         $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
-                        $sql.= "(box_id, position, box_order, fk_user, entity)";
-                        $sql.= " values (";
-                        $sql.= " ".$id.",";
-                        $sql.= " ".$zone.",";
-                        $sql.= " '".$colonne.$ii."',";
-                        $sql.= " ".$userid.",";
-                        $sql.= " ".$conf->entity;
-                        $sql.= ")";
+                        $sql .= "(box_id, position, box_order, fk_user, entity)";
+                        $sql .= " values (";
+                        $sql .= " ".$id.",";
+                        $sql .= " ".$zone.",";
+                        $sql .= " '".$colonne.$ii."',";
+                        $sql .= " ".$userid.",";
+                        $sql .= " ".$conf->entity;
+                        $sql .= ")";
 
                         dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
                         $result = $db->query($sql);
@@ -263,7 +263,7 @@ 
             }
             if ($error)
             {
-                $error=$db->error();
+                $error = $db->error();
                 $db->rollback();
                 return -2;
             }
@@ -275,7 +275,7 @@ 
         }
         else
         {
-            $error=$db->lasterror();
+            $error = $db->lasterror();
             $db->rollback();
             dol_syslog(get_class()."::saveboxorder ".$error);
             return -1;

dolibarr/htdocs/core/class/html.formintervention.class.php

Spacing +29 added lines, -29 removed lines

@@ -35,7 +35,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -60,31 +60,31 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+	function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
 	{
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+		global $db, $user, $conf, $langs;
 
-		$out='';
+		$out = '';
 
-		$hideunselectables=false;
+		$hideunselectables = false;
 
 		// Search all contacts
 		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
-		$sql.= " WHERE f.entity = ".$conf->entity;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
+		$sql .= " WHERE f.entity = ".$conf->entity;
 		if ($socid != '')
 		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
+			if ($socid == '0') $sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			else $sql .= " AND f.fk_soc = ".$socid;
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';
+			if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -93,49 +93,49 @@ 
 				{
 					$obj = $db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
 					else
 					{
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							$disabled=0;
-							if (! $obj->fk_statut > 0)
+							$disabled = 0;
+							if (!$obj->fk_statut > 0)
 							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
+								$disabled = 1;
+								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
 							if ($hideunselectables && $disabled)
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
+								$resultat .= '>'.$labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.=$resultat;
+							$out .= $resultat;
 						}
 					}
 					$i++;
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 			$db->free($resql);
 			return $out;
 		}

dolibarr/htdocs/core/class/interfaces.class.php

Spacing +73 added lines, -73 removed lines

@@ -36,7 +36,7 @@ 
      */
     public $db;
 
-	var $dir;				// Directory with all core and external triggers files
+	var $dir; // Directory with all core and external triggers files
 
     /**
 	 * @var string[] Error codes (or messages)
@@ -65,22 +65,22 @@ 
      *   @param     Conf		$conf       Objet conf
      *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
      */
-    function run_triggers($action,$object,$user,$langs,$conf)
+    function run_triggers($action, $object, $user, $langs, $conf)
     {
         // phpcs:enable
         // Check parameters
-        if (! is_object($object) || ! is_object($conf))	// Error
+        if (!is_object($object) || !is_object($conf))	// Error
         {
-        	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+        	$this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-        	$this->errors[]=$this->error;
+        	$this->errors[] = $this->error;
             return -1;
         }
-        if (! is_object($langs))	// Warning
+        if (!is_object($langs))	// Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
         }
-        if (! is_object($user))	    // Warning
+        if (!is_object($user))	    // Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
             global $db;
@@ -92,43 +92,43 @@ 
         $files = array();
         $modules = array();
         $orders = array();
-		$i=0;
+		$i = 0;
 
-		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
-        foreach($dirtriggers as $reldir)
+		$dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
+        foreach ($dirtriggers as $reldir)
         {
-            $dir=dol_buildpath($reldir,0);
-            $newdir=dol_osencode($dir);
+            $dir = dol_buildpath($reldir, 0);
+            $newdir = dol_osencode($dir);
             //print "xx".$dir;exit;
 
             // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (!is_dir($newdir)) continue;
 
-            $handle=opendir($newdir);
+            $handle = opendir($newdir);
             if (is_resource($handle))
             {
-                while (($file = readdir($handle))!==false)
+                while (($file = readdir($handle)) !== false)
                 {
-                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
+                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
                     {
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
                         $nbfile++;
 
                         // Check if trigger file is disabled by name
-                        if (preg_match('/NORUN$/i',$file)) continue;
+                        if (preg_match('/NORUN$/i', $file)) continue;
                         // Check if trigger file is for a particular module
-                        $qualified=true;
+                        $qualified = true;
                         if (strtolower($reg[2]) != 'all')
                         {
-                            $module=preg_replace('/^mod/i','',$reg[2]);
-                            $constparam='MAIN_MODULE_'.strtoupper($module);
-                            if (empty($conf->global->$constparam)) $qualified=false;
+                            $module = preg_replace('/^mod/i', '', $reg[2]);
+                            $constparam = 'MAIN_MODULE_'.strtoupper($module);
+                            if (empty($conf->global->$constparam)) $qualified = false;
                         }
 
-                        if (! $qualified)
+                        if (!$qualified)
                         {
                             //dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
                             continue;
@@ -136,7 +136,7 @@ 
 
                         $modName = "Interface".ucfirst($reg[3]);
                         //print "file=$file - modName=$modName\n";
-                        if (in_array($modName,$modules))    // $modules = list of modName already loaded
+                        if (in_array($modName, $modules))    // $modules = list of modName already loaded
                         {
                             $langs->load("errors");
                             dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
@@ -148,7 +148,7 @@ 
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
                         }
-                        catch(Exception $e)
+                        catch (Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -156,7 +156,7 @@ 
                         $modules[$i] = $modName;
                         $files[$i] = $file;
                         $fullpathfiles[$modName] = $newdir.'/'.$file;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3;   // Set sort criteria value
+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
                         $i++;
                     }
@@ -175,17 +175,17 @@ 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
-            	$result=0;
+            	$result = 0;
 
 				if (method_exists($objMod, 'runTrigger'))	// New method to implement
 				{
 	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
+	                $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
 				}
 				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
 				{
 	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+					$result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
 				}
 				else
 				{
@@ -209,8 +209,8 @@ 
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
                     $nbtotal++;
                     $nbko++;
-                    if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors);
-                    else if (! empty($objMod->error))  $this->errors[]=$objMod->error;
+                    if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
+                    else if (!empty($objMod->error))  $this->errors[] = $objMod->error;
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
             }
@@ -239,7 +239,7 @@ 
      *	@param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
      * 	@return	array								Array list of triggers
      */
-    function getTriggersList($forcedirtriggers=null)
+    function getTriggersList($forcedirtriggers = null)
     {
         global $conf, $langs, $db;
 
@@ -251,39 +251,39 @@ 
         $orders = array();
         $i = 0;
 
-        $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
+        $dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
         if (is_array($forcedirtriggers))
         {
-        	$dirtriggers=$forcedirtriggers;
+        	$dirtriggers = $forcedirtriggers;
         }
 
-        foreach($dirtriggers as $reldir)
+        foreach ($dirtriggers as $reldir)
         {
-            $dir=dol_buildpath($reldir,0);
-            $newdir=dol_osencode($dir);
+            $dir = dol_buildpath($reldir, 0);
+            $newdir = dol_osencode($dir);
 
             // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (!is_dir($newdir)) continue;
 
-            $handle=opendir($newdir);
+            $handle = opendir($newdir);
             if (is_resource($handle))
             {
-                while (($file = readdir($handle))!==false)
+                while (($file = readdir($handle)) !== false)
                 {
-                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/',$file,$reg))
+                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
                     {
-                        if (preg_match('/\.back$/',$file)) continue;
+                        if (preg_match('/\.back$/', $file)) continue;
 
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
                         $modName = 'Interface'.ucfirst($reg[3]);
                         //print "file=$file"; print "modName=$modName"; exit;
-                        if (in_array($modName,$modules))
+                        if (in_array($modName, $modules))
                         {
                             $langs->load("errors");
-                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/").'</div>';
+                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
                         }
                         else
                         {
@@ -292,10 +292,10 @@ 
 
                         $files[$i] = $file;
                         $fullpath[$i] = $dir.'/'.$file;
-                        $relpath[$i] = preg_replace('/^\//','',$reldir).'/'.$file;
-                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/'?'internal':'external');
+                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
+                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');
                         $modules[$i] = $modName;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3;   // Set sort criteria value
+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
                         $i++;
                     }
@@ -315,7 +315,7 @@ 
             $modName = $modules[$key];
             if (empty($modName)) continue;
 
-            if (! class_exists($modName))
+            if (!class_exists($modName))
             {
 				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
             	continue;
@@ -324,45 +324,45 @@ 
             $objMod = new $modName($db);
 
             // Define disabledbyname and disabledbymodule
-            $disabledbyname=0;
-            $disabledbymodule=1;
-            $module='';
+            $disabledbyname = 0;
+            $disabledbymodule = 1;
+            $module = '';
 
             // Check if trigger file is disabled by name
-            if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
             // Check if trigger file is for a particular module
-            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i',$files[$key],$reg))
+            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
             {
-                $module=preg_replace('/^mod/i','',$reg[2]);
-                $constparam='MAIN_MODULE_'.strtoupper($module);
-                if (strtolower($module) == 'all') $disabledbymodule=0;
-                else if (empty($conf->global->$constparam)) $disabledbymodule=2;
-                $triggers[$j]['module']=strtolower($module);
+                $module = preg_replace('/^mod/i', '', $reg[2]);
+                $constparam = 'MAIN_MODULE_'.strtoupper($module);
+                if (strtolower($module) == 'all') $disabledbymodule = 0;
+                else if (empty($conf->global->$constparam)) $disabledbymodule = 2;
+                $triggers[$j]['module'] = strtolower($module);
             }
 
 			// We set info of modules
-            $triggers[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
+            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto) : img_object('', 'generic');
             $triggers[$j]['file'] = $files[$key];
             $triggers[$j]['fullpath'] = $fullpath[$key];
             $triggers[$j]['relpath'] = $relpath[$key];
             $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
             $triggers[$j]['version'] = $objMod->getVersion();
-            $triggers[$j]['status'] = img_picto($langs->trans("Active"),'tick');
+            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
             if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
 
-            $text ='<b>'.$langs->trans("Description").':</b><br>';
-            $text.=$objMod->getDesc().'<br>';
-            $text.='<br><b>'.$langs->trans("Status").':</b><br>';
+            $text = '<b>'.$langs->trans("Description").':</b><br>';
+            $text .= $objMod->getDesc().'<br>';
+            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';
             if ($disabledbyname == 1)
             {
-                $text.=$langs->trans("TriggerDisabledByName").'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                $text .= $langs->trans("TriggerDisabledByName").'<br>';
+                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
             }
             else
             {
-                if ($disabledbymodule == 0) $text.=$langs->trans("TriggerAlwaysActive").'<br>';
-                if ($disabledbymodule == 1) $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
+                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
+                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
             }
 
             $triggers[$j]['info'] = $text;

dolibarr/htdocs/core/class/google.class.php

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $key;
 
@@ -44,10 +44,10 @@ 
 	 * @param 	DoliDB		$db			Database handler
 	 * @param	string		$key		Google key
 	 */
-	function __construct($db,$key)
+	function __construct($db, $key)
 	{
-		$this->db=$db;
-		$this->key=$key;
+		$this->db = $db;
+		$this->key = $key;
 	}
 
 
@@ -63,7 +63,7 @@ 
 	{
 		global $conf;
 
-		$i=0;
+		$i = 0;
 
 		// Desired address
 		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
@@ -73,12 +73,12 @@ 
 
 		$code = strstr($page, '<coordinates>');
 		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
+		$val = strpos($code, "<");
+		$code = substr($code, 1, $val - 1);
 		//print $code;
 		//print "<br>";
 		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
 
 		// Output the coordinates
 		//echo "Longitude: $longitude ',' Latitude: $latitude";

dolibarr/htdocs/core/class/commoninvoice.class.php

Spacing +131 added lines, -131 removed lines

@@ -23,7 +23,7 @@ 
  *       \brief      File of the superclass of invoices classes (customer and supplier)
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * 	Superclass for invoices classes
@@ -97,12 +97,12 @@ 
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *	@return		double						Remain of amount to pay
 	 */
-	function getRemainToPay($multicurrency=0)
+	function getRemainToPay($multicurrency = 0)
 	{
-	    $alreadypaid=0;
-	    $alreadypaid+=$this->getSommePaiement($multicurrency);
-	    $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
-	    $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
+	    $alreadypaid = 0;
+	    $alreadypaid += $this->getSommePaiement($multicurrency);
+	    $alreadypaid += $this->getSumDepositsUsed($multicurrency);
+	    $alreadypaid += $this->getSumCreditNotesUsed($multicurrency);
     	return $this->total_ttc - $alreadypaid;
 	}
 
@@ -112,22 +112,22 @@ 
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *	@return		int						Amount of payment already done, <0 if KO
 	 */
-	function getSommePaiement($multicurrency=0)
+	function getSommePaiement($multicurrency = 0)
 	{
-		$table='paiement_facture';
-		$field='fk_facture';
+		$table = 'paiement_facture';
+		$field = 'fk_facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$table='paiementfourn_facturefourn';
-			$field='fk_facturefourn';
+			$table = 'paiementfourn_facturefourn';
+			$field = 'fk_facturefourn';
 		}
 
 		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql.= ' WHERE '.$field.' = '.$this->id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -137,7 +137,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -149,7 +149,7 @@ 
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
 	 */
-	function getSumDepositsUsed($multicurrency=0)
+	function getSumDepositsUsed($multicurrency = 0)
 	{
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 	    {
@@ -159,15 +159,15 @@ 
 
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
+	    $discountstatic = new DiscountAbsolute($this->db);
+	    $result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
 	    if ($result >= 0)
 	    {
 	        return $result;
 	    }
 	    else
 	    {
-	        $this->error=$discountstatic->error;
+	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
 	}
@@ -178,19 +178,19 @@ 
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
-	function getSumCreditNotesUsed($multicurrency=0)
+	function getSumCreditNotesUsed($multicurrency = 0)
 	{
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+	    $discountstatic = new DiscountAbsolute($this->db);
+	    $result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
 	    if ($result >= 0)
 	    {
 	        return $result;
 	    }
 	    else
 	    {
-	        $this->error=$discountstatic->error;
+	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
 	}
@@ -202,13 +202,13 @@ 
 	 */
 	function getListIdAvoirFromInvoice()
 	{
-		$idarray=array();
+		$idarray = array();
 
 		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type = 2';
-		$resql=$this->db->query($sql);
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' WHERE fk_facture_source = '.$this->id;
+		$sql .= ' AND type = 2';
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -216,7 +216,7 @@ 
 			while ($i < $num)
 			{
 				$row = $this->db->fetch_row($resql);
-				$idarray[]=$row[0];
+				$idarray[] = $row[0];
 				$i++;
 			}
 		}
@@ -233,21 +233,21 @@ 
 	 *	@param		string	$option		filtre sur statut ('', 'validated', ...)
 	 *	@return		int					<0 si KO, 0 si aucune facture ne remplace, id facture sinon
 	 */
-	function getIdReplacingInvoice($option='')
+	function getIdReplacingInvoice($option = '')
 	{
 		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type < 2';
-		if ($option == 'validated') $sql.= ' AND fk_statut = 1';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' WHERE fk_facture_source = '.$this->id;
+		$sql .= ' AND type < 2';
+		if ($option == 'validated') $sql .= ' AND fk_statut = 1';
 		// PROTECTION BAD DATA
 		// Au cas ou base corrompue et qu'il y a une facture de remplacement validee
 		// et une autre non, on donne priorite a la validee.
 		// Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes
 		// ont cree en meme temps une facture de remplacement pour la meme facture)
-		$sql.= ' ORDER BY fk_statut DESC';
+		$sql .= ' ORDER BY fk_statut DESC';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -274,43 +274,43 @@ 
 	 *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
 	 *  @return     array					Array with list of payments
 	 */
-	function getListOfPayments($filtertype='')
+	function getListOfPayments($filtertype = '')
 	{
-		$retarray=array();
+		$retarray = array();
 
-		$table='paiement_facture';
-		$table2='paiement';
-		$field='fk_facture';
-		$field2='fk_paiement';
-		$sharedentity='facture';
+		$table = 'paiement_facture';
+		$table2 = 'paiement';
+		$field = 'fk_facture';
+		$field2 = 'fk_paiement';
+		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$table='paiementfourn_facturefourn';
-			$table2='paiementfourn';
-			$field='fk_facturefourn';
-			$field2='fk_paiementfourn';
-			$sharedentity='facture_fourn';
+			$table = 'paiementfourn_facturefourn';
+			$table2 = 'paiementfourn';
+			$field = 'fk_facturefourn';
+			$field2 = 'fk_paiementfourn';
+			$sharedentity = 'facture_fourn';
 		}
 
 		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
-		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
+		$sql .= ' WHERE pf.'.$field.' = '.$this->id;
 		//$sql.= ' WHERE pf.'.$field.' = 1';
-		$sql.= ' AND pf.'.$field2.' = p.rowid';
-		$sql.= ' AND p.fk_paiement = t.id';
-		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
+		$sql .= ' AND pf.'.$field2.' = p.rowid';
+		$sql .= ' AND p.fk_paiement = t.id';
+		$sql .= ' AND p.entity IN ('.getEntity($sharedentity).')';
+		if ($filtertype) $sql .= " AND t.code='PRE'";
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+				$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -318,7 +318,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
 		}
@@ -352,7 +352,7 @@ 
 			return 1;
 		}
 
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
+		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
 
 		// If not a draft invoice and not temporary invoice
 		if ($tmppart !== 'PROV')
@@ -363,8 +363,8 @@ 
 			// Get last number of validated invoice
 			if ($this->element != 'invoice_supplier')
 			{
-				if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
-				$maxref = $this->getNextNumRef($this->thirdparty,'last');
+				if (empty($this->thirdparty)) $this->fetch_thirdparty(); // We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+				$maxref = $this->getNextNumRef($this->thirdparty, 'last');
 
 				// If there is no invoice into the reset range and not already dispatched, we can delete
 				// If invoice to delete is last one and not already dispatched, we can delete
@@ -376,7 +376,7 @@ 
 				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
 				{
 					$last = $this->is_last_in_cycle();
-					if (! $last) return -3;
+					if (!$last) return -3;
 				}
 			}
 		}
@@ -435,7 +435,7 @@ 
         elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
         elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
         elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
-        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma");           // Not used.
+        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
         elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
 		return $langs->trans("Unknown");
 	}
@@ -447,7 +447,7 @@ 
 	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
 	 *  @return     string			        Label of status
 	 */
-	function getLibStatut($mode=0, $alreadypaid=-1)
+	function getLibStatut($mode = 0, $alreadypaid = -1)
 	{
 		return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
 	}
@@ -463,7 +463,7 @@ 
 	 *	@param		int		$type			Type invoice
 	 *	@return     string        			Label of status
 	 */
-	function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0)
+	function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -472,8 +472,8 @@ 
 		//print "$paye,$status,$mode,$alreadypaid,$type";
 		if ($mode == 0)
 		{
-			$prefix='';
-			if (! $paye)
+			$prefix = '';
+			if (!$paye)
 			{
 				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
 				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
@@ -483,15 +483,15 @@ 
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
+				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
 				else return $langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
 		elseif ($mode == 1)
 		{
-			$prefix='Short';
-			if (! $paye)
+			$prefix = 'Short';
+			if (!$paye)
 			{
 				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
 				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
@@ -508,79 +508,79 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			$prefix='Short';
-			if (! $paye)
+			$prefix = 'Short';
+			if (!$paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
+				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'), 'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
+				else return img_picto($langs->trans('BillStatusStarted'), 'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
+				else return img_picto($langs->trans('BillStatusPaid'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
 		elseif ($mode == 3)
 		{
-			$prefix='Short';
-			if (! $paye)
+			$prefix = 'Short';
+			if (!$paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3');
+				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'), 'statut5');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9');
+				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1');
+				else return img_picto($langs->trans('BillStatusStarted'), 'statut3');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6');
+				else return img_picto($langs->trans('BillStatusPaid'), 'statut6');
 			}
 		}
 		elseif ($mode == 4)
 		{
-			$prefix='';
-			if (! $paye)
+			$prefix = '';
+			if (!$paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
+				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0').' '.$langs->trans('BillStatusDraft');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'), 'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1').' '.$langs->trans('BillStatusNotPaid');
+				else return img_picto($langs->trans('BillStatusStarted'), 'statut3').' '.$langs->trans('BillStatusStarted');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6').' '.$langs->trans('BillStatusConverted');
+				else return img_picto($langs->trans('BillStatusPaid'), 'statut6').' '.$langs->trans('BillStatusPaid');
 			}
 		}
 		elseif ($mode == 5 || $mode == 6)
 		{
-			$prefix='';
-			if ($mode == 5) $prefix='Short';
-			if (! $paye)
+			$prefix = '';
+			if ($mode == 5) $prefix = 'Short';
+			if (!$paye)
 			{
-				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'), 'statut0');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'), 'statut5');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9');
 				elseif ($alreadypaid <= 0)
 				{
-				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
-				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'), 'statut1');
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'), 'statut1');
 				}
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
+				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'), 'statut3');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6');
+				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'), 'statut6');
+				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'), 'statut6');
 			}
 		}
 	}
@@ -593,26 +593,26 @@ 
 	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
 	 *  @return     date     			       	Date limite de reglement si ok, <0 si ko
 	 */
-	function calculate_date_lim_reglement($cond_reglement=0)
+	function calculate_date_lim_reglement($cond_reglement = 0)
 	{
         // phpcs:enable
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
+		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_code;
+		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_id;
 
-		$cdr_nbjour=0;
-        $cdr_type=0;
-        $cdr_decalage=0;
+		$cdr_nbjour = 0;
+        $cdr_type = 0;
+        $cdr_decalage = 0;
 
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
-		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
+		if (is_numeric($cond_reglement)) $sqltemp .= " WHERE c.rowid=".$cond_reglement;
 		else {
-			$sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
-			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
+			$sqltemp .= " WHERE c.entity IN (".getEntity('c_payment_term').")";
+			$sqltemp .= " AND c.code='".$this->db->escape($cond_reglement)."'";
 		}
 
 		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
-		$resqltemp=$this->db->query($sqltemp);
+		$resqltemp = $this->db->query($sqltemp);
 		if ($resqltemp)
 		{
 			if ($this->db->num_rows($resqltemp))
@@ -625,7 +625,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 		$this->db->free($resqltemp);
@@ -644,8 +644,8 @@ 
 		{
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
-			$mois=date('m', $datelim);
-			$annee=date('Y', $datelim);
+			$mois = date('m', $datelim);
+			$annee = date('Y', $datelim);
 			if ($mois == 12)
 			{
 				$mois = 1;
@@ -656,7 +656,7 @@ 
 				$mois += 1;
 			}
 			// On se deplace au debut du mois suivant, et on retire un jour
-			$datelim=dol_mktime(12,0,0,$mois,1,$annee);
+			$datelim = dol_mktime(12, 0, 0, $mois, 1, $annee);
 			$datelim -= (3600 * 24);
 
 			$datelim += ($cdr_decalage * 3600 * 24);
@@ -666,9 +666,9 @@ 
 		{
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
-			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim),date('d', $datelim),date('Y', $datelim)); // Sans les heures minutes et secondes
+			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim), date('d', $datelim), date('Y', $datelim)); // Sans les heures minutes et secondes
 			$date_lim_current = dol_mktime(0, 0, 0, date('m', $datelim), $cdr_decalage, date('Y', $datelim)); // Sans les heures minutes et secondes
-			$date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm');	// Add 1 month
+			$date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm'); // Add 1 month
 
 			$diff = $date_piece - $date_lim_current;
 
@@ -683,7 +683,7 @@ 
 
 
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 
 /**
  *	Parent class of all other business classes for details of elements (invoices, contracts, proposals, orders, ...)

dolibarr/htdocs/core/class/comment.class.php

Spacing +93 added lines, -93 removed lines

@@ -24,17 +24,17 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='comment';
+	public $element = 'comment';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='comment';
+	public $table_element = 'comment';
 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element ='';
+	public $fk_element = '';
 
 	public $element_type;
 
@@ -82,30 +82,30 @@ 
 	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int 		        	<0 if KO, Id of created object if OK
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
-		$sql.= "description";
-		$sql.= ", datec";
-		$sql.= ", fk_element";
-		$sql.= ", element_type";
-		$sql.= ", fk_user_author";
-		$sql.= ", entity";
-		$sql.= ", import_key";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->description)."'";
-		$sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
-		$sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
-		$sql.= ", '".$this->db->escape($this->element_type)."'";
-		$sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
-		$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
-		$sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
+		$sql .= "description";
+		$sql .= ", datec";
+		$sql .= ", fk_element";
+		$sql .= ", element_type";
+		$sql .= ", fk_user_author";
+		$sql .= ", entity";
+		$sql .= ", import_key";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->description)."'";
+		$sql .= ", ".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", '".(isset($this->fk_element) ? $this->fk_element : "null")."'";
+		$sql .= ", '".$this->db->escape($this->element_type)."'";
+		$sql .= ", '".(isset($this->fk_user_author) ? $this->fk_user_author : "null")."'";
+		$sql .= ", ".(!empty($this->entity) ? $this->entity : '1');
+		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= ")";
 
 		//var_dump($this->db);
 		//echo $sql;
@@ -113,17 +113,17 @@ 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
+				$result = $this->call_trigger('TASK_COMMENT_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -132,13 +132,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -155,25 +155,25 @@ 
 	 *  @param	int		$ref		ref object
 	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
 	 */
-	function fetch($id, $ref='')
+	function fetch($id, $ref = '')
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " c.rowid,";
-		$sql.= " c.description,";
-		$sql.= " c.datec,";
-		$sql.= " c.tms,";
-		$sql.= " c.fk_element,";
-		$sql.= " c.element_type,";
-		$sql.= " c.fk_user_author,";
-		$sql.= " c.entity,";
-		$sql.= " c.import_key";
-		$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-		$sql.= " WHERE c.rowid = ".$id;
+		$sql .= " c.rowid,";
+		$sql .= " c.description,";
+		$sql .= " c.datec,";
+		$sql .= " c.tms,";
+		$sql .= " c.fk_element,";
+		$sql .= " c.element_type,";
+		$sql .= " c.fk_user_author,";
+		$sql .= " c.entity,";
+		$sql .= " c.import_key";
+		$sql .= " FROM ".MAIN_DB_PREFIX."comment as c";
+		$sql .= " WHERE c.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num_rows = $this->db->num_rows($resql);
@@ -182,14 +182,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id					= $obj->rowid;
-				$this->description			= $obj->description;
-				$this->element_type			= $obj->element_type;
-				$this->datec				= $this->db->jdate($obj->datec);
-				$this->tms					= $obj->tms;
-				$this->fk_user_author		= $obj->fk_user_author;
+				$this->id = $obj->rowid;
+				$this->description = $obj->description;
+				$this->element_type = $obj->element_type;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $obj->tms;
+				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_element			= $obj->fk_element;
-				$this->entity				= $obj->entity;
+				$this->entity = $obj->entity;
 				$this->import_key			= $obj->import_key;
 			}
 
@@ -200,7 +200,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -213,40 +213,40 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int			         	<=0 if KO, >0 if OK
 	 */
-	function update(User $user, $notrigger=0)
+	function update(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
-		if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
-		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);
+		if (isset($this->fk_user_author)) $this->fk_user_author = (int) trim($this->fk_user_author);
+		if (isset($this->description)) $this->description = trim($this->description);
 
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
-		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-		$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
-		$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
-		$sql.= " element_type='".$this->db->escape($this->element_type)."',";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
-		$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
+		$sql .= " datec=".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " fk_element=".(isset($this->fk_element) ? $this->fk_element : "null").",";
+		$sql .= " element_type='".$this->db->escape($this->element_type)."',";
+		$sql .= " fk_user_author=".(isset($this->fk_user_author) ? $this->fk_user_author : "null").",";
+		$sql .= " entity=".(!empty($this->entity) ? $this->entity : '1').",";
+		$sql .= " import_key=".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
+				$result = $this->call_trigger('TASK_COMMENT_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -255,13 +255,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -278,27 +278,27 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
+				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -307,14 +307,14 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
-		}else{
+			return -1 * $error;
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -330,25 +330,25 @@ 
 	 */
 	public function fetchAllFor($element_type, $fk_element)
 	{
-		global $db,$conf;
+		global $db, $conf;
 		$this->comments = array();
-		if(!empty($element_type) && !empty($fk_element)) {
+		if (!empty($element_type) && !empty($fk_element)) {
 			$sql = "SELECT";
-			$sql.= " c.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-			$sql.= " WHERE c.fk_element = ".$fk_element;
-			$sql.= " AND c.element_type = '".$db->escape($element_type)."'";
-			$sql.= " AND c.entity = ".$conf->entity;
-			$sql.= " ORDER BY c.tms DESC";
+			$sql .= " c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."comment as c";
+			$sql .= " WHERE c.fk_element = ".$fk_element;
+			$sql .= " AND c.element_type = '".$db->escape($element_type)."'";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC";
 
 			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$num_rows = $db->num_rows($resql);
 				if ($num_rows > 0)
 				{
-					while($obj = $db->fetch_object($resql))
+					while ($obj = $db->fetch_object($resql))
 					{
 						$comment = new self($db);
 						$comment->fetch($obj->rowid);
@@ -357,7 +357,7 @@ 
 				}
 				$db->free($resql);
 			} else {
-				$this->errors[]="Error ".$this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
 			}
 		}

dolibarr/htdocs/core/class/html.formactions.class.php

Spacing +76 added lines, -76 removed lines

@@ -37,7 +37,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -64,10 +64,10 @@ 
      *  @param  string  $morecss        More css on select field
      * 	@return	void
      */
-    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
+    function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
     {
         // phpcs:enable
-        global $langs,$conf;
+        global $langs, $conf;
 
         $listofstatus = array(
             '-1' => $langs->trans("ActionNotApplicable"),
@@ -77,7 +77,7 @@ 
         );
 		// +ActionUncomplete
 
-        if (! empty($conf->use_javascript_ajax))
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n";
             print "<script type=\"text/javascript\">
@@ -98,7 +98,7 @@ 
                 function select_status() {
                     var defaultvalue = $('#select' + htmlname).val();
                     var percentage = $('input[name=percentage]');
-                    var selected = '".(isset($selected)?$selected:'')."';
+                    var selected = '".(isset($selected) ? $selected : '')."';
                     var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
 
                     percentage.val(value);
@@ -125,13 +125,13 @@ 
                 }
                 </script>\n";
         }
-        if (! empty($conf->use_javascript_ajax) || $onlyselect)
+        if (!empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
-            foreach($listofstatus as $key => $val)
+        	if ($selected == 'done') $selected = '100';
+            print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
+            if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
+            foreach ($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
                 if ($key == '50' && $onlyselect == 2)
@@ -140,17 +140,17 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) $canedit = 0;
 
             if (empty($onlyselect))
             {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
         else
 		{
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
+            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
 
@@ -168,64 +168,64 @@ 
      *  @param	string	$morehtmlright			More html text on right of title line
      *	@return	int								<0 if KO, >=0 if OK
      */
-    function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='')
+    function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
     {
-        global $langs,$conf,$user;
+        global $langs, $conf, $user;
         global $bc;
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        $sortfield='a.datep,a.id';
-        $sortorder='DESC,DESC';
+        $sortfield = 'a.datep,a.id';
+        $sortorder = 'DESC,DESC';
 
-        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+        $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
-
-            $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
+        	if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
+        	elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
+        	elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
+            elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
+            elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+
+            $urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
 
             $projectid = $object->fk_project;
             if ($typeelement == 'project') $projectid = $object->id;
 
-            $newcardbutton='';
-			if (! empty($conf->agenda->enabled))
+            $newcardbutton = '';
+			if (!empty($conf->agenda->enabled))
 			{
-				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
-				$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-				$newcardbutton.= '</a>';
+				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
+				$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+				$newcardbutton .= '</a>';
 			}
 
         	print '<!-- formactions->showactions -->'."\n";
         	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
 
-        	$page=0; $param='';
+        	$page = 0; $param = '';
 
         	$total = 0;
 
         	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+        	print '<table class="noborder'.($morecss ? ' '.$morecss : '').'" width="100%">';
         	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
         	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
         	print '</tr>';
         	print "\n";
 
@@ -234,37 +234,37 @@ 
         	if (count($listofactions))
         	{
 	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
+	        	foreach ($listofactions as $action)
 	        	{
 	        		if ($max && $cursorevent >= $max) break;
 
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
+	        		$ref = $action->getNomUrl(1, -1);
+	        		$label = $action->getNomUrl(0, 38);
 
 	        		print '<tr class="oddeven">';
 	        		// Ref
 					print '<td>'.$ref.'</td>';
 					// Onwer
 	        		print '<td>';
-	        		if (! empty($action->userownerid))
+	        		if (!empty($action->userownerid))
 	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+	        			$userstatic->fetch($action->userownerid); // TODO Introduce a cache on users fetched
 	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
 	        		}
 	        		print '</td>';
 					// Type
 	        		print '<td>';
-					$imgpicto='';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+					$imgpicto = '';
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
+						if ($action->type_picto) $imgpicto = img_picto('', $action->type_picto);
 						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							if ($action->type_code == 'AC_RDV')       $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_TEL')   $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_FAX')   $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_INT')   $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							elseif (!preg_match('/_AUTO/', $action->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
 						}
 					}
 					print $imgpicto;
@@ -276,8 +276,8 @@ 
 	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
 	        		if ($action->datef)
 	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
+		        		$tmpa = dol_getdate($action->datep);
+		        		$tmpb = dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
 		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
@@ -286,7 +286,7 @@ 
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
+	        		if (!empty($action->author->id))
 	        		{
 	        			print $action->getLibStatut(3);
 	        		}
@@ -327,42 +327,42 @@ 
      *  @param  int             $nooutput       1=No output
      * 	@return	string
      */
-    function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
+    function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
     {
         // phpcs:enable
-        global $langs,$user,$form,$conf;
+        global $langs, $user, $form, $conf;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-        $caction=new CActionComm($this->db);
+        $caction = new CActionComm($this->db);
 
        	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+       	$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+       	array_unshift($arraylist, '&nbsp;'); // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') $selected = 'AC_OTH';
+       	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out='';
+       	$out = '';
 
-		if (! empty($multiselect))
+		if (!empty($multiselect))
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
-			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
+			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
 		else
 		{
-			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 		}
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {
-            $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
+            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
         }
 
         if ($nooutput) return $out;

dolibarr/htdocs/core/class/html.formcron.class.php

Spacing +23 added lines, -23 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Constructor
@@ -58,43 +58,43 @@ 
 	 * @param   integer	$readonly		Select is read only or not
 	 * @return	string					HTML select field
 	 */
-	function select_typejob($htmlname,$selected=0,$readonly=0)
+	function select_typejob($htmlname, $selected = 0, $readonly = 0)
 	{
         // phpcs:enable
 		global $langs;
 
 		$langs->load('cron@cron');
 		if (!empty($readonly)) {
-			if ($selected=='command') {
-				$out= $langs->trans('CronType_command');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
-				$out.='</SELECT>';
-			} elseif ($selected=='method') {
-				$out= $langs->trans('CronType_method');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
-				$out.='</SELECT>';
+			if ($selected == 'command') {
+				$out = $langs->trans('CronType_command');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
+				$out .= '</SELECT>';
+			} elseif ($selected == 'method') {
+				$out = $langs->trans('CronType_method');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
+				$out .= '</SELECT>';
 			}
-		}else {
+		} else {
 
-		$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
+		$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 
-		if ($selected=='command') {
-			$selected_attr=' selected ';
+		if ($selected == 'command') {
+			$selected_attr = ' selected ';
 		} else {
-			$selected_attr='';
+			$selected_attr = '';
 		}
-		$out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
+		$out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
 
-		if ($selected=='method') {
-			$selected_attr=' selected ';
+		if ($selected == 'method') {
+			$selected_attr = ' selected ';
 		} else {
-			$selected_attr='';
+			$selected_attr = '';
 		}
-		$out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
+		$out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
 
-		$out.='</SELECT>';
+		$out .= '</SELECT>';
 		}
 
 		return $out;

dolibarr/htdocs/core/class/html.formmailing.class.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
  *  \ingroup    core
  *	\brief      File of predefined functions for HTML forms for mailing module
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 /**
  *  Class to offer components to list and upload files
@@ -40,7 +40,7 @@ 
 	 * @param integer  $show_empty     Show empty option
 	 * @return string HTML select
 	 */
-    public function selectDestinariesStatus($selectedid='', $htmlname='dest_status', $show_empty=0)
+    public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
     {
 
 		global $langs;
@@ -52,7 +52,7 @@ 
 		$options = array();
 
 		if ($show_empty) {
-			$options[-2] = '';   // Note -1 is used for error
+			$options[-2] = ''; // Note -1 is used for error
 		}
 
         $options = $options + $mailing->statut_dest;