Dolibarr / dolibarr

htdocs/core/lib/date.lib.php

Doc Comments +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 /**
  *  Return an array with timezone values
  *
- *  @return     array   Array with timezone values
+ *  @return     string[]   Array with timezone values
  */
 function get_tz_array()
 {
@@ -76,7 +76,7 @@ 
  * Return server timezone int.
  *
  * @param	string	$refgmtdate		Reference period for timezone (timezone differs on winter and summer. May be 'now', 'winter' or 'summer')
- * @return 	int						An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
+ * @return 	double						An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
  */
 function getServerTimeZoneInt($refgmtdate='now')
 {
@@ -419,7 +419,7 @@ 
  *
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
- * 	@param		mixed		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
+ * 	@param		boolean		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
  *                          			Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, after a dol_print_date will return 1970-01-01 00:00:00
  *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00
  *  @return		int						Date for first day, '' if error
@@ -464,7 +464,7 @@ 
  * 	@param		int		$month		Month
  *  @param		int		$year		Year
  * 	@param		int		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
- *	@return		array				year,month,week,first_day,first_month,first_year,prev_day,prev_month,prev_year
+ *	@return		integer				year,month,week,first_day,first_month,first_year,prev_day,prev_month,prev_year
  */
 function dol_get_first_day_week($day,$month,$year,$gm=false)
 {
@@ -797,7 +797,7 @@ 
  *
  *	@param	Translate	$outputlangs	Object langs
  *  @param	int			$short			1=Return short label
- *	@return array						Month string or array if selected < 0
+ *	@return string[]						Month string or array if selected < 0
  */
 function monthArray($outputlangs,$short=0)
 {

Braces +306 added lines, -110 removed lines

@@ -86,16 +86,19 @@ 
     {
         // Method 1 (include daylight)
         $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
-        if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
-        else $newrefgmtdate=$yearref.'-01-01';
+        if ($refgmtdate == 'now') {
+        	$newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
+        } elseif ($refgmtdate == 'summer') {
+        	$newrefgmtdate=$yearref.'-08-01';
+        } else {
+        	$newrefgmtdate=$yearref.'-01-01';
+        }
         $newrefgmtdate.='T00:00:00+00:00';
         $localtz = new DateTimeZone(getServerTimeZoneString());
         $localdt = new DateTime($newrefgmtdate, $localtz);
         $tmp=-1*$localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
-    }
-    else
+    } else
     {
     	$tmp=0;
     	dol_print_error('','PHP version must be 5.3+');
@@ -117,9 +120,15 @@ 
 {
 	global $conf;
 
-	if ($duration_value == 0)  return $time;
-	if ($duration_unit == 'h') return $time + (3600*$duration_value);
-	if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
+	if ($duration_value == 0) {
+		return $time;
+	}
+	if ($duration_unit == 'h') {
+		return $time + (3600*$duration_value);
+	}
+	if ($duration_unit == 'w') {
+		return $time + (3600*24*7*$duration_value);
+	}
 
 	$deltastring='P';
 
@@ -130,12 +139,17 @@ 
 	if ($duration_unit == 'y') { $deltastring.="Y"; }
 
 	$date = new DateTime();
-	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) {
+		$date->setTimezone(new DateTimeZone('UTC'));
+	}
 	$date->setTimestamp($time);
 	$interval = new DateInterval($deltastring);
 
-	if($sub) $date->sub($interval);
-	else $date->add( $interval );
+	if($sub) {
+		$date->sub($interval);
+	} else {
+		$date->add( $interval );
+	}
 
 	return $date->getTimestamp();
 }
@@ -169,12 +183,21 @@ 
 {
 	global $langs;
 
-	if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
+	if (empty($lengthOfDay)) {
+		$lengthOfDay = 86400;
+	}
+	// 1 day = 24 hours
+    if (empty($lengthOfWeek)) {
+    	$lengthOfWeek = 7;
+    }
+    // 1 week = 7 days
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
 	{
-		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
+		if ((int) $iSecond === 0) {
+			return '0';
+		}
+		// This is to avoid having 0 return a 12:00 AM for en_US
 
         $sTime='';
         $sDay=0;
@@ -188,7 +211,9 @@ 
 				$iSecond-=$lengthOfDay;
 			}
 			$dayTranslate = $langs->trans("Day");
-			if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
+			if ($iSecond >= ($lengthOfDay*2)) {
+				$dayTranslate = $langs->trans("Days");
+			}
 		}
 
 		if ($lengthOfWeek < 7)
@@ -200,7 +225,9 @@ 
                     $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
                     $sDay = $sDay % $lengthOfWeek;
                     $weekTranslate = $langs->trans("DurationWeek");
-                    if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
+                    if ($sWeek >= 2) {
+                    	$weekTranslate = $langs->trans("DurationWeeks");
+                    }
                     $sTime.=$sWeek.' '.$weekTranslate.' ';
                 }
             }
@@ -208,7 +235,9 @@ 
 		if ($sDay>0)
 		{
 			$dayTranslate = $langs->trans("Day");
-			if ($sDay > 1) $dayTranslate = $langs->trans("Days");
+			if ($sDay > 1) {
+				$dayTranslate = $langs->trans("Days");
+			}
 			$sTime.=$sDay.' '.$dayTranslate.' ';
 		}
 
@@ -227,37 +256,40 @@ 
 		{
 			return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
 		}
-	}
-	else if ($format == 'hour')	// only hour part
+	} else if ($format == 'hour') {
+		// only hour part
 	{
 		$sTime=dol_print_date($iSecond,'%H',true);
 	}
-	else if ($format == 'fullhour')
+	} else if ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
 			$iSecond=$iSecond/3600;
-		}
-		else {
+		} else {
 			$iSecond=0;
 		}
 		$sTime=$iSecond;
-	}
-	else if ($format == 'min')	// only min part
+	} else if ($format == 'min') {
+		// only min part
 	{
 		$sTime=dol_print_date($iSecond,'%M',true);
 	}
-    else if ($format == 'sec')	// only sec part
+	} else if ($format == 'sec') {
+    	// only sec part
     {
         $sTime=dol_print_date($iSecond,'%S',true);
     }
-    else if ($format == 'month')	// only month part
+    } else if ($format == 'month') {
+    	// only month part
     {
         $sTime=dol_print_date($iSecond,'%m',true);
     }
-    else if ($format == 'year')	// only year part
+    } else if ($format == 'year') {
+    	// only year part
     {
         $sTime=dol_print_date($iSecond,'%Y',true);
     }
+    }
     return trim($sTime);
 }
 
@@ -294,11 +326,14 @@ 
         $shour = $reg[4];
         $smin = $reg[5];
         $ssec = $reg[6];
-        if ($syear < 50) $syear+=1900;
-        if ($syear >= 50 && $syear < 100) $syear+=2000;
+        if ($syear < 50) {
+        	$syear+=1900;
+        }
+        if ($syear >= 50 && $syear < 100) {
+        	$syear+=2000;
+        }
         $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
-    }
-    else if (
+    } else if (
     	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
     	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
@@ -362,8 +397,7 @@ 
 	{
 		$prev_month = 12;
 		$prev_year  = $year - 1;
-	}
-	else
+	} else
 	{
 		$prev_month = $month-1;
 		$prev_year  = $year;
@@ -383,8 +417,7 @@ 
 	{
 		$next_month = 1;
 		$next_year  = $year + 1;
-	}
-	else
+	} else
 	{
 		$next_month = $month + 1;
 		$next_year  = $year;
@@ -441,7 +474,9 @@ 
  */
 function dol_get_first_day($year,$month=1,$gm=false)
 {
-	if ($year > 9999) return '';
+	if ($year > 9999) {
+		return '';
+	}
 	return dol_mktime(0,0,0,$month,1,$year,$gm);
 }
 
@@ -455,13 +490,14 @@ 
  */
 function dol_get_last_day($year,$month=12,$gm=false)
 {
-	if ($year > 9999) return '';
+	if ($year > 9999) {
+		return '';
+	}
 	if ($month == 12)
 	{
 		$month = 1;
 		$year += 1;
-	}
-	else
+	} else
 	{
 		$month += 1;
 	}
@@ -495,7 +531,9 @@ 
 
 	//Calculate days = offset from current day
 	$days = $start_week - $tmparray['wday'];
- 	if ($days>=1) $days=7-$days;
+ 	if ($days>=1) {
+ 		$days=7-$days;
+ 	}
  	$days = abs($days);
     $seconds = $days*24*60*60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
@@ -515,8 +553,7 @@ 
     		$prev_month = 12;
     		$prev_year  = $year-1;
     	}
-    }
-    else
+    } else
     {
     	$prev_month = $month;
 		$prev_year  = $year;
@@ -564,13 +601,17 @@ 
 	$nbFerie = 0;
 
 	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
+	if ((($timestampEnd - $timestampStart) % 86400) != 0) {
+		return 'ErrorDates must use same hours and must be GMT dates';
+	}
 
 	$i=0;
 	while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
-	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
+	    && ($i < 50000)) {
+		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie=false;
+	}
 		$countryfound=0;
 
 		$jour  = date("d", $timestampStart);
@@ -581,20 +622,46 @@ 
 			$countryfound=1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // 1er janvier
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1er mai
-			if($jour == 8 && $mois == 5)   $ferie=true; // 5 mai
-			if($jour == 14 && $mois == 7)  $ferie=true; // 14 juillet
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 aout
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 novembre
-			if($jour == 11 && $mois == 11) $ferie=true; // 11 novembre
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
+			if($jour == 1 && $mois == 1) {
+				$ferie=true;
+			}
+			// 1er janvier
+			if($jour == 1 && $mois == 5) {
+				$ferie=true;
+			}
+			// 1er mai
+			if($jour == 8 && $mois == 5) {
+				$ferie=true;
+			}
+			// 5 mai
+			if($jour == 14 && $mois == 7) {
+				$ferie=true;
+			}
+			// 14 juillet
+			if($jour == 15 && $mois == 8) {
+				$ferie=true;
+			}
+			// 15 aout
+			if($jour == 1 && $mois == 11) {
+				$ferie=true;
+			}
+			// 1 novembre
+			if($jour == 11 && $mois == 11) {
+				$ferie=true;
+			}
+			// 11 novembre
+			if($jour == 25 && $mois == 12) {
+				$ferie=true;
+			}
+			// 25 decembre
 
 			// Calcul du jour de paques
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if($jour_paques == $jour && $mois_paques == $mois) {
+				$ferie=true;
+			}
 			// Paques
 
 			// Calcul du jour de l ascension (38 jours apres Paques)
@@ -608,7 +675,9 @@ 
             );
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
-			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
+			if($jour_ascension == $jour && $mois_ascension == $mois) {
+				$ferie=true;
+			}
 			//Ascension
 
 			// Calcul de Pentecote (11 jours apres Paques)
@@ -622,13 +691,17 @@ 
             );
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
-			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+			if($jour_pentecote == $jour && $mois_pentecote == $mois) {
+				$ferie=true;
+			}
 			//Pentecote
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if($jour_semaine == 0 || $jour_semaine == 6) {
+				$ferie=true;
+			}
 			//Samedi (6) et dimanche (0)
 		}
 
@@ -639,28 +712,62 @@ 
 			$countryfound=1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1) $ferie=true; // Capodanno
-			if($jour == 6 && $mois == 1) $ferie=true; // Epifania
-			if($jour == 25 && $mois == 4) $ferie=true; // Anniversario Liberazione
-			if($jour == 1 && $mois == 5) $ferie=true; // Festa del Lavoro
-			if($jour == 2 && $mois == 6) $ferie=true; // Festa della Repubblica
-			if($jour == 15 && $mois == 8) $ferie=true; // Ferragosto
-			if($jour == 1 && $mois == 11) $ferie=true; // Tutti i Santi
-			if($jour == 8 && $mois == 12) $ferie=true; // Immacolata Concezione
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
-			if($jour == 26 && $mois == 12) $ferie=true; // Santo Stefano
+			if($jour == 1 && $mois == 1) {
+				$ferie=true;
+			}
+			// Capodanno
+			if($jour == 6 && $mois == 1) {
+				$ferie=true;
+			}
+			// Epifania
+			if($jour == 25 && $mois == 4) {
+				$ferie=true;
+			}
+			// Anniversario Liberazione
+			if($jour == 1 && $mois == 5) {
+				$ferie=true;
+			}
+			// Festa del Lavoro
+			if($jour == 2 && $mois == 6) {
+				$ferie=true;
+			}
+			// Festa della Repubblica
+			if($jour == 15 && $mois == 8) {
+				$ferie=true;
+			}
+			// Ferragosto
+			if($jour == 1 && $mois == 11) {
+				$ferie=true;
+			}
+			// Tutti i Santi
+			if($jour == 8 && $mois == 12) {
+				$ferie=true;
+			}
+			// Immacolata Concezione
+			if($jour == 25 && $mois == 12) {
+				$ferie=true;
+			}
+			// 25 decembre
+			if($jour == 26 && $mois == 12) {
+				$ferie=true;
+			}
+			// Santo Stefano
 
 			// Calcul du jour de paques
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if($jour_paques == $jour && $mois_paques == $mois) {
+				$ferie=true;
+			}
 			// Paques
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if($jour_semaine == 0 || $jour_semaine == 6) {
+				$ferie=true;
+			}
 			//Samedi (6) et dimanche (0)
 		}
 
@@ -669,21 +776,50 @@ 
 			$countryfound=1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
-			if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
-			if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
-			if($jour == 6 && $mois == 12) $ferie=true; // Constitución
-			if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
+			if($jour == 1 && $mois == 1) {
+				$ferie=true;
+			}
+			// Año nuevo
+			if($jour == 6 && $mois == 1) {
+				$ferie=true;
+			}
+			// Día Reyes
+			if($jour == 1 && $mois == 5) {
+				$ferie=true;
+			}
+			// 1 Mayo
+			if($jour == 15 && $mois == 8) {
+				$ferie=true;
+			}
+			// 15 Agosto
+			if($jour == 12 && $mois == 10) {
+				$ferie=true;
+			}
+			// Día Hispanidad
+			if($jour == 1 && $mois == 11) {
+				$ferie=true;
+			}
+			// 1 noviembre
+			if($jour == 6 && $mois == 12) {
+				$ferie=true;
+			}
+			// Constitución
+			if($jour == 8 && $mois == 12) {
+				$ferie=true;
+			}
+			// Inmaculada
+			if($jour == 25 && $mois == 12) {
+				$ferie=true;
+			}
+			// 25 diciembre
 
 			// Calcul día de Pascua
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if($jour_paques == $jour && $mois_paques == $mois) {
+				$ferie=true;
+			}
 			// Paques
 
 			// Viernes Santo
@@ -697,13 +833,17 @@ 
             );
 			$jour_viernes = date("d", $date_viernes);
 			$mois_viernes = date("m", $date_viernes);
-			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+			if($jour_viernes == $jour && $mois_viernes == $mois) {
+				$ferie=true;
+			}
 			//Viernes Santo
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if($jour_semaine == 0 || $jour_semaine == 6) {
+				$ferie=true;
+			}
 			//Samedi (6) et dimanche (0)
 		}
 		
@@ -712,23 +852,58 @@ 
 		    $countryfound=1;
 		    
 		    // Definition des dates feriees fixes
-		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
-		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
-		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
-		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
-		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
-		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
-		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
-		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
-		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
-		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
-		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+		    if($jour == 1 && $mois == 1) {
+		    	$ferie=true;
+		    }
+		    // Neujahr
+		    if($jour == 6 && $mois == 1) {
+		    	$ferie=true;
+		    }
+		    // Hl. 3 Koenige
+		    if($jour == 1 && $mois == 5) {
+		    	$ferie=true;
+		    }
+		    // 1. Mai
+		    if($jour == 15 && $mois == 8) {
+		    	$ferie=true;
+		    }
+		    // Mariae Himmelfahrt
+		    if($jour == 26 && $mois == 10) {
+		    	$ferie=true;
+		    }
+		    // 26. Oktober
+		    if($jour == 1 && $mois == 11) {
+		    	$ferie=true;
+		    }
+		    // Allerheiligen
+		    if($jour == 8 && $mois == 12) {
+		    	$ferie=true;
+		    }
+		    // Mariae Empfaengnis
+		    if($jour == 24 && $mois == 12) {
+		    	$ferie=true;
+		    }
+		    // Heilig abend
+		    if($jour == 25 && $mois == 12) {
+		    	$ferie=true;
+		    }
+		    // Christtag
+		    if($jour == 26 && $mois == 12) {
+		    	$ferie=true;
+		    }
+		    // Stefanietag
+		    if($jour == 31 && $mois == 12) {
+		    	$ferie=true;
+		    }
+		    // Silvester
 		    
 		    // Easter calculation
 		    $date_paques = easter_date($annee);
 		    $jour_paques = date("d", $date_paques);
 		    $mois_paques = date("m", $date_paques);
-		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+		    if($jour_paques == $jour && $mois_paques == $mois) {
+		    	$ferie=true;
+		    }
 		    // Easter sunday
 		    
 		    // Monday after easter
@@ -742,7 +917,9 @@ 
 		        );
 		    $jour_eastermonday = date("d", $date_eastermonday);
 		    $mois_eastermonday = date("m", $date_eastermonday);
-		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) {
+		    	$ferie=true;
+		    }
 		    // Easter monday
 		    
 		    // Christi Himmelfahrt (39 days after easter sunday)
@@ -756,7 +933,9 @@ 
 		        );
 		    $jour_ch = date("d", $date_ch);
 		    $mois_ch = date("m", $date_ch);
-		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+		    if($jour_ch == $jour && $mois_ch == $mois) {
+		    	$ferie=true;
+		    }
 		    // Christi Himmelfahrt
 		    
 		    // Pfingsten (50 days after easter sunday)
@@ -770,7 +949,9 @@ 
 		        );
 		    $jour_pentecote = date("d", $date_pentecote);
 		    $mois_pentecote = date("m", $date_pentecote);
-		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+		    if($jour_pentecote == $jour && $mois_pentecote == $mois) {
+		    	$ferie=true;
+		    }
 		    // Pfingsten
 		    
 		    // Fronleichnam (60 days after easter sunday)
@@ -784,13 +965,17 @@ 
 		        );
 		    $jour_fronleichnam = date("d", $date_fronleichnam);
 		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {
+		    	$ferie=true;
+		    }
 		    // Fronleichnam
 
 		    // Calul des samedis et dimanches
 		    $jour_julien = unixtojd($timestampStart);
 		    $jour_semaine = jddayofweek($jour_julien, 0);
-		    if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+		    if($jour_semaine == 0 || $jour_semaine == 6) {
+		    	$ferie=true;
+		    }
 		    //Samedi (6) et dimanche (0)
 		}
 
@@ -800,12 +985,16 @@ 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if($jour_semaine == 0 || $jour_semaine == 6) {
+				$ferie=true;
+			}
 			//Samedi (6) et dimanche (0)
 		}
 
 		// On incremente compteur
-		if ($ferie) $nbFerie++;
+		if ($ferie) {
+			$nbFerie++;
+		}
 
 		// Increase number of days (on go up into loop)
 		$timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
@@ -834,8 +1023,7 @@ 
 		if ($lastday == 1)
 		{
 			$bit = 0;
-		}
-		else
+		} else
 		{
 			$bit = 1;
 		}
@@ -861,13 +1049,19 @@ 
 {
 	global $langs,$mysoc;
 
-	if (empty($country_code)) $country_code=$mysoc->country_code;
+	if (empty($country_code)) {
+		$country_code=$mysoc->country_code;
+	}
 
 	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
 
 	// Check parameters
-	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
-	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+	if (! is_int($timestampStart) && ! is_float($timestampStart)) {
+		return 'ErrorBadParameter_num_open_day';
+	}
+	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) {
+		return 'ErrorBadParameter_num_open_day';
+	}
 
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
@@ -876,16 +1070,18 @@ 
 		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
 		$nbOpenDay = $numdays - $numholidays;
 		$nbOpenDay.= " " . $langs->trans("Days");
-		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		if ($inhour == 1 && $nbOpenDay <= 3) {
+			$nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		}
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	elseif ($timestampStart == $timestampEnd)
+	} elseif ($timestampStart == $timestampEnd)
 	{
 		$nbOpenDay=$lastday;
-		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		if ($inhour == 1) {
+			$nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		}
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	else
+	} else
 	{
 		return $langs->trans("Error");
 	}

Indentation +272 added lines, -272 removed lines

@@ -32,34 +32,34 @@ 
  */
 function get_tz_array()
 {
-    $tzarray=array(
-        -11=>"Pacific/Midway",
-        -10=>"Pacific/Fakaofo",
-        -9=>"America/Anchorage",
-        -8=>"America/Los_Angeles",
-        -7=>"America/Dawson_Creek",
-        -6=>"America/Chicago",
-        -5=>"America/Bogota",
-        -4=>"America/Anguilla",
-        -3=>"America/Araguaina",
-        -2=>"America/Noronha",
-        -1=>"Atlantic/Azores",
-        0=>"Africa/Abidjan",
-        1=>"Europe/Paris",
-        2=>"Europe/Helsinki",
-        3=>"Europe/Moscow",
-        4=>"Asia/Dubai",
-        5=>"Asia/Karachi",
-        6=>"Indian/Chagos",
-        7=>"Asia/Jakarta",
-        8=>"Asia/Hong_Kong",
-        9=>"Asia/Tokyo",
-        10=>"Australia/Sydney",
-        11=>"Pacific/Noumea",
-        12=>"Pacific/Auckland",
-        13=>"Pacific/Enderbury"
-    );
-    return $tzarray;
+	$tzarray=array(
+		-11=>"Pacific/Midway",
+		-10=>"Pacific/Fakaofo",
+		-9=>"America/Anchorage",
+		-8=>"America/Los_Angeles",
+		-7=>"America/Dawson_Creek",
+		-6=>"America/Chicago",
+		-5=>"America/Bogota",
+		-4=>"America/Anguilla",
+		-3=>"America/Araguaina",
+		-2=>"America/Noronha",
+		-1=>"Atlantic/Azores",
+		0=>"Africa/Abidjan",
+		1=>"Europe/Paris",
+		2=>"Europe/Helsinki",
+		3=>"Europe/Moscow",
+		4=>"Asia/Dubai",
+		5=>"Asia/Karachi",
+		6=>"Indian/Chagos",
+		7=>"Asia/Jakarta",
+		8=>"Asia/Hong_Kong",
+		9=>"Asia/Tokyo",
+		10=>"Australia/Sydney",
+		11=>"Pacific/Noumea",
+		12=>"Pacific/Auckland",
+		13=>"Pacific/Enderbury"
+	);
+	return $tzarray;
 }
 
 
@@ -70,7 +70,7 @@ 
  */
 function getServerTimeZoneString()
 {
-    return @date_default_timezone_get();
+	return @date_default_timezone_get();
 }
 
 /**
@@ -81,27 +81,27 @@ 
  */
 function getServerTimeZoneInt($refgmtdate='now')
 {
-    global $conf;
-    if (method_exists('DateTimeZone','getOffset'))
-    {
-        // Method 1 (include daylight)
-        $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
-        if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
-        else $newrefgmtdate=$yearref.'-01-01';
-        $newrefgmtdate.='T00:00:00+00:00';
-        $localtz = new DateTimeZone(getServerTimeZoneString());
-        $localdt = new DateTime($newrefgmtdate, $localtz);
-        $tmp=-1*$localtz->getOffset($localdt);
-        //print $refgmtdate.'='.$tmp;
-    }
-    else
-    {
-    	$tmp=0;
-    	dol_print_error('','PHP version must be 5.3+');
-    }
-    $tz=round(($tmp<0?1:-1)*abs($tmp/3600));
-    return $tz;
+	global $conf;
+	if (method_exists('DateTimeZone','getOffset'))
+	{
+		// Method 1 (include daylight)
+		$gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
+		if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
+		elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
+		else $newrefgmtdate=$yearref.'-01-01';
+		$newrefgmtdate.='T00:00:00+00:00';
+		$localtz = new DateTimeZone(getServerTimeZoneString());
+		$localdt = new DateTime($newrefgmtdate, $localtz);
+		$tmp=-1*$localtz->getOffset($localdt);
+		//print $refgmtdate.'='.$tmp;
+	}
+	else
+	{
+		$tmp=0;
+		dol_print_error('','PHP version must be 5.3+');
+	}
+	$tz=round(($tmp<0?1:-1)*abs($tmp/3600));
+	return $tz;
 }
 
 
@@ -173,15 +173,15 @@ 
 	global $langs;
 
 	if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
+	if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
 	{
 		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
 
-        $sTime='';
-        $sDay=0;
-        $sWeek=0;
+		$sTime='';
+		$sDay=0;
+		$sWeek=0;
 
 		if ($iSecond >= $lengthOfDay)
 		{
@@ -196,17 +196,17 @@ 
 
 		if ($lengthOfWeek < 7)
 		{
-        	if ($sDay)
-            {
-                if ($sDay >= $lengthOfWeek)
-                {
-                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
-                    $sDay = $sDay % $lengthOfWeek;
-                    $weekTranslate = $langs->trans("DurationWeek");
-                    if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
-                    $sTime.=$sWeek.' '.$weekTranslate.' ';
-                }
-            }
+			if ($sDay)
+			{
+				if ($sDay >= $lengthOfWeek)
+				{
+					$sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
+					$sDay = $sDay % $lengthOfWeek;
+					$weekTranslate = $langs->trans("DurationWeek");
+					if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
+					$sTime.=$sWeek.' '.$weekTranslate.' ';
+				}
+			}
 		}
 		if ($sDay>0)
 		{
@@ -224,7 +224,7 @@ 
 		}
 		if ($format == 'allhourmin')
 		{
-		    return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d",((int) floor(($iSecond % 3600)/60)));
+			return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d",((int) floor(($iSecond % 3600)/60)));
 		}
 		if ($format == 'allhour')
 		{
@@ -249,19 +249,19 @@ 
 	{
 		$sTime=dol_print_date($iSecond,'%M',true);
 	}
-    else if ($format == 'sec')	// only sec part
-    {
-        $sTime=dol_print_date($iSecond,'%S',true);
-    }
-    else if ($format == 'month')	// only month part
-    {
-        $sTime=dol_print_date($iSecond,'%m',true);
-    }
-    else if ($format == 'year')	// only year part
-    {
-        $sTime=dol_print_date($iSecond,'%Y',true);
-    }
-    return trim($sTime);
+	else if ($format == 'sec')	// only sec part
+	{
+		$sTime=dol_print_date($iSecond,'%S',true);
+	}
+	else if ($format == 'month')	// only month part
+	{
+		$sTime=dol_print_date($iSecond,'%m',true);
+	}
+	else if ($format == 'year')	// only year part
+	{
+		$sTime=dol_print_date($iSecond,'%Y',true);
+	}
+	return trim($sTime);
 }
 
 
@@ -285,41 +285,41 @@ 
  */
 function dol_stringtotime($string, $gm=1)
 {
-    // Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
-    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$string,$reg))
-    {
-        dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
-        // Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
-        // Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
-        $sday = $reg[1];
-        $smonth = $reg[2];
-        $syear = $reg[3];
-        $shour = $reg[4];
-        $smin = $reg[5];
-        $ssec = $reg[6];
-        if ($syear < 50) $syear+=1900;
-        if ($syear >= 50 && $syear < 100) $syear+=2000;
-        $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
-    }
-    else if (
-    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
-    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
+	// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
+	if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$string,$reg))
+	{
+		dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
+		// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
+		// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
+		$sday = $reg[1];
+		$smonth = $reg[2];
+		$syear = $reg[3];
+		$shour = $reg[4];
+		$smin = $reg[5];
+		$ssec = $reg[6];
+		if ($syear < 50) $syear+=1900;
+		if ($syear >= 50 && $syear < 100) $syear+=2000;
+		$string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
+	}
+	else if (
+		   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+		|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
-    )
-    {
-        $syear = $reg[1];
-        $smonth = $reg[2];
-        $sday = $reg[3];
-        $shour = $reg[4];
-        $smin = $reg[5];
-        $ssec = $reg[6];
-        $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
-    }
-
-    $string=preg_replace('/([^0-9])/i','',$string);
-    $tmp=$string.'000000';
-    $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),($gm?1:0));
-    return $date;
+	)
+	{
+		$syear = $reg[1];
+		$smonth = $reg[2];
+		$sday = $reg[3];
+		$shour = $reg[4];
+		$smin = $reg[5];
+		$ssec = $reg[6];
+		$string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
+	}
+
+	$string=preg_replace('/([^0-9])/i','',$string);
+	$tmp=$string.'000000';
+	$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),($gm?1:0));
+	return $date;
 }
 
 
@@ -500,30 +500,30 @@ 
 	$days = $start_week - $tmparray['wday'];
  	if ($days>=1) $days=7-$days;
  	$days = abs($days);
-    $seconds = $days*24*60*60;
+	$seconds = $days*24*60*60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
-    //Get first day of week
-    $tmpdaytms = date($tmparray[0])-$seconds; // $tmparray[0] is day of parameters
+	//Get first day of week
+	$tmpdaytms = date($tmparray[0])-$seconds; // $tmparray[0] is day of parameters
 	$tmpday = date("d",$tmpdaytms);
 
 	//Check first day of week is in same month than current day or not
 	if ($tmpday>$day)
-    {
-    	$prev_month = $month-1;
+	{
+		$prev_month = $month-1;
 		$prev_year  = $year;
 
-    	if ($prev_month==0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year-1;
-    	}
-    }
-    else
-    {
-    	$prev_month = $month;
+		if ($prev_month==0)
+		{
+			$prev_month = 12;
+			$prev_year  = $year-1;
+		}
+	}
+	else
+	{
+		$prev_month = $month;
 		$prev_year  = $year;
-    }
+	}
 	$tmpmonth = $prev_month;
 	$tmpyear = $prev_year;
 
@@ -531,22 +531,22 @@ 
 	$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
 	$tmptime-=24*60*60*7;
 	$tmparray=dol_getdate($tmptime,true);
-    $prev_day   = $tmparray['mday'];
+	$prev_day   = $tmparray['mday'];
 
-    //Check prev day of week is in same month than first day or not
+	//Check prev day of week is in same month than first day or not
 	if ($prev_day > $tmpday)
-    {
-    	$prev_month = $month-1;
+	{
+		$prev_month = $month-1;
 		$prev_year  = $year;
 
-    	if ($prev_month==0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year-1;
-    	}
-    }
+		if ($prev_month==0)
+		{
+			$prev_month = 12;
+			$prev_year  = $year-1;
+		}
+	}
 
-    $week = date("W",dol_mktime(0,0,0,$tmpmonth,$tmpday,$tmpyear,$gm));
+	$week = date("W",dol_mktime(0,0,0,$tmpmonth,$tmpday,$tmpyear,$gm));
 
 	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
@@ -571,7 +571,7 @@ 
 
 	$i=0;
 	while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
-	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
+		&& ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie=false;
 		$countryfound=0;
@@ -601,28 +601,28 @@ 
 			// Paques
 
 			// Calcul du jour de l ascension (38 jours apres Paques)
-            $date_ascension = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 38,
-                date("Y", $date_paques)
-            );
+			$date_ascension = mktime(
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 38,
+				date("Y", $date_paques)
+			);
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
 			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
 			//Ascension
 
 			// Calcul de Pentecote (11 jours apres Paques)
-            $date_pentecote = mktime(
-                date("H", $date_ascension),
-                date("i", $date_ascension),
-                date("s", $date_ascension),
-                date("m", $date_ascension),
-                date("d", $date_ascension) + 11,
-                date("Y", $date_ascension)
-            );
+			$date_pentecote = mktime(
+				date("H", $date_ascension),
+				date("i", $date_ascension),
+				date("s", $date_ascension),
+				date("m", $date_ascension),
+				date("d", $date_ascension) + 11,
+				date("Y", $date_ascension)
+			);
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
 			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
@@ -690,14 +690,14 @@ 
 			// Paques
 
 			// Viernes Santo
-            $date_viernes = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) -2,
-                date("Y", $date_paques)
-            );
+			$date_viernes = mktime(
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) -2,
+				date("Y", $date_paques)
+			);
 			$jour_viernes = date("d", $date_viernes);
 			$mois_viernes = date("m", $date_viernes);
 			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
@@ -712,89 +712,89 @@ 
 
 		if ($countrycode == 'AT')
 		{
-		    $countryfound=1;
-
-		    // Definition des dates feriees fixes
-		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
-		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
-		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
-		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
-		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
-		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
-		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
-		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
-		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
-		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
-		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
-
-		    // Easter calculation
-		    $date_paques = easter_date($annee);
-		    $jour_paques = date("d", $date_paques);
-		    $mois_paques = date("m", $date_paques);
-		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
-		    // Easter sunday
-
-		    // Monday after easter
-		    $date_eastermonday = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 1,
-		        date("Y", $date_paques)
-		        );
-		    $jour_eastermonday = date("d", $date_eastermonday);
-		    $mois_eastermonday = date("m", $date_eastermonday);
-		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
-		    // Easter monday
-
-		    // Christi Himmelfahrt (39 days after easter sunday)
-		    $date_ch = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 39,
-		        date("Y", $date_paques)
-		        );
-		    $jour_ch = date("d", $date_ch);
-		    $mois_ch = date("m", $date_ch);
-		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
-		    // Christi Himmelfahrt
-
-		    // Pfingsten (50 days after easter sunday)
-		    $date_pentecote = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 50,
-		        date("Y", $date_paques)
-		        );
-		    $jour_pentecote = date("d", $date_pentecote);
-		    $mois_pentecote = date("m", $date_pentecote);
-		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
-		    // Pfingsten
-
-		    // Fronleichnam (60 days after easter sunday)
-		    $date_fronleichnam = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 60,
-		        date("Y", $date_paques)
-		        );
-		    $jour_fronleichnam = date("d", $date_fronleichnam);
-		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
-		    // Fronleichnam
-
-		    // Calul des samedis et dimanches
-		    $jour_julien = unixtojd($timestampStart);
-		    $jour_semaine = jddayofweek($jour_julien, 0);
-		    if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
-		    //Samedi (6) et dimanche (0)
+			$countryfound=1;
+
+			// Definition des dates feriees fixes
+			if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
+			if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
+			if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
+			if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
+			if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
+			if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
+			if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
+			if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
+			if($jour == 25 && $mois == 12) $ferie=true; // Christtag
+			if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
+			if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+
+			// Easter calculation
+			$date_paques = easter_date($annee);
+			$jour_paques = date("d", $date_paques);
+			$mois_paques = date("m", $date_paques);
+			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			// Easter sunday
+
+			// Monday after easter
+			$date_eastermonday = mktime(
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 1,
+				date("Y", $date_paques)
+				);
+			$jour_eastermonday = date("d", $date_eastermonday);
+			$mois_eastermonday = date("m", $date_eastermonday);
+			if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+			// Easter monday
+
+			// Christi Himmelfahrt (39 days after easter sunday)
+			$date_ch = mktime(
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 39,
+				date("Y", $date_paques)
+				);
+			$jour_ch = date("d", $date_ch);
+			$mois_ch = date("m", $date_ch);
+			if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+			// Christi Himmelfahrt
+
+			// Pfingsten (50 days after easter sunday)
+			$date_pentecote = mktime(
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 50,
+				date("Y", $date_paques)
+				);
+			$jour_pentecote = date("d", $date_pentecote);
+			$mois_pentecote = date("m", $date_pentecote);
+			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+			// Pfingsten
+
+			// Fronleichnam (60 days after easter sunday)
+			$date_fronleichnam = mktime(
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 60,
+				date("Y", $date_paques)
+				);
+			$jour_fronleichnam = date("d", $date_fronleichnam);
+			$mois_fronleichnam = date("m", $date_fronleichnam);
+			if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+			// Fronleichnam
+
+			// Calul des samedis et dimanches
+			$jour_julien = unixtojd($timestampStart);
+			$jour_semaine = jddayofweek($jour_julien, 0);
+			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			//Samedi (6) et dimanche (0)
 		}
 
 		// Cas pays non defini
@@ -907,35 +907,35 @@ 
 function monthArray($outputlangs,$short=0)
 {
 	$montharray = array (
-	    1  => $outputlangs->trans("January"),
-	    2  => $outputlangs->trans("February"),
-	    3  => $outputlangs->trans("March"),
-	    4  => $outputlangs->trans("April"),
-	    5  => $outputlangs->trans("May"),
-	    6  => $outputlangs->trans("June"),
-	    7  => $outputlangs->trans("July"),
-	    8  => $outputlangs->trans("August"),
-	    9  => $outputlangs->trans("September"),
-	    10 => $outputlangs->trans("October"),
-	    11 => $outputlangs->trans("November"),
-	    12 => $outputlangs->trans("December")
-    );
+		1  => $outputlangs->trans("January"),
+		2  => $outputlangs->trans("February"),
+		3  => $outputlangs->trans("March"),
+		4  => $outputlangs->trans("April"),
+		5  => $outputlangs->trans("May"),
+		6  => $outputlangs->trans("June"),
+		7  => $outputlangs->trans("July"),
+		8  => $outputlangs->trans("August"),
+		9  => $outputlangs->trans("September"),
+		10 => $outputlangs->trans("October"),
+		11 => $outputlangs->trans("November"),
+		12 => $outputlangs->trans("December")
+	);
 
 	if (! empty($short))
 	{
 		$montharray = array (
-		    1  => $outputlangs->trans("JanuaryMin"),
-		    2  => $outputlangs->trans("FebruaryMin"),
-		    3  => $outputlangs->trans("MarchMin"),
-		    4  => $outputlangs->trans("AprilMin"),
-		    5  => $outputlangs->trans("MayMin"),
-		    6  => $outputlangs->trans("JuneMin"),
-		    7  => $outputlangs->trans("JulyMin"),
-		    8  => $outputlangs->trans("AugustMin"),
-		    9  => $outputlangs->trans("SeptemberMin"),
-		    10 => $outputlangs->trans("OctoberMin"),
-		    11 => $outputlangs->trans("NovemberMin"),
-		    12 => $outputlangs->trans("DecemberMin")
+			1  => $outputlangs->trans("JanuaryMin"),
+			2  => $outputlangs->trans("FebruaryMin"),
+			3  => $outputlangs->trans("MarchMin"),
+			4  => $outputlangs->trans("AprilMin"),
+			5  => $outputlangs->trans("MayMin"),
+			6  => $outputlangs->trans("JuneMin"),
+			7  => $outputlangs->trans("JulyMin"),
+			8  => $outputlangs->trans("AugustMin"),
+			9  => $outputlangs->trans("SeptemberMin"),
+			10 => $outputlangs->trans("OctoberMin"),
+			11 => $outputlangs->trans("NovemberMin"),
+			12 => $outputlangs->trans("DecemberMin")
 			);
 	}
 

Spacing +183 added lines, -183 removed lines

@@ -32,7 +32,7 @@ 
  */
 function get_tz_array()
 {
-    $tzarray=array(
+    $tzarray = array(
         -11=>"Pacific/Midway",
         -10=>"Pacific/Fakaofo",
         -9=>"America/Anchorage",
@@ -79,28 +79,28 @@ 
  * @param	string	$refgmtdate		Reference period for timezone (timezone differs on winter and summer. May be 'now', 'winter' or 'summer')
  * @return 	int						An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
  */
-function getServerTimeZoneInt($refgmtdate='now')
+function getServerTimeZoneInt($refgmtdate = 'now')
 {
     global $conf;
-    if (method_exists('DateTimeZone','getOffset'))
+    if (method_exists('DateTimeZone', 'getOffset'))
     {
         // Method 1 (include daylight)
-        $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
-        if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
-        else $newrefgmtdate=$yearref.'-01-01';
-        $newrefgmtdate.='T00:00:00+00:00';
+        $gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
+        if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
+        elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
+        else $newrefgmtdate = $yearref.'-01-01';
+        $newrefgmtdate .= 'T00:00:00+00:00';
         $localtz = new DateTimeZone(getServerTimeZoneString());
         $localdt = new DateTime($newrefgmtdate, $localtz);
-        $tmp=-1*$localtz->getOffset($localdt);
+        $tmp = -1 * $localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
     }
     else
     {
-    	$tmp=0;
-    	dol_print_error('','PHP version must be 5.3+');
+    	$tmp = 0;
+    	dol_print_error('', 'PHP version must be 5.3+');
     }
-    $tz=round(($tmp<0?1:-1)*abs($tmp/3600));
+    $tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
     return $tz;
 }
 
@@ -118,24 +118,24 @@ 
 	global $conf;
 
 	if ($duration_value == 0)  return $time;
-	if ($duration_unit == 'h') return $time + (3600*$duration_value);
-	if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
+	if ($duration_unit == 'h') return $time + (3600 * $duration_value);
+	if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);
 
-	$deltastring='P';
+	$deltastring = 'P';
 
-	if ($duration_value > 0){ $deltastring.=abs($duration_value); $sub= false; }
-	if ($duration_value < 0){ $deltastring.=abs($duration_value); $sub= true; }
-	if ($duration_unit == 'd') { $deltastring.="D"; }
-	if ($duration_unit == 'm') { $deltastring.="M"; }
-	if ($duration_unit == 'y') { $deltastring.="Y"; }
+	if ($duration_value > 0) { $deltastring .= abs($duration_value); $sub = false; }
+	if ($duration_value < 0) { $deltastring .= abs($duration_value); $sub = true; }
+	if ($duration_unit == 'd') { $deltastring .= "D"; }
+	if ($duration_unit == 'm') { $deltastring .= "M"; }
+	if ($duration_unit == 'y') { $deltastring .= "Y"; }
 
 	$date = new DateTime();
-	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+	if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
 	$date->setTimestamp($time);
 	$interval = new DateInterval($deltastring);
 
-	if($sub) $date->sub($interval);
-	else $date->add( $interval );
+	if ($sub) $date->sub($interval);
+	else $date->add($interval);
 
 	return $date->getTimestamp();
 }
@@ -150,9 +150,9 @@ 
  * @return     int						Time into seconds
  * @see convertSecondToTime
  */
-function convertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0)
+function convertTime2Seconds($iHours = 0, $iMinutes = 0, $iSeconds = 0)
 {
-	$iResult=($iHours*3600)+($iMinutes*60)+$iSeconds;
+	$iResult = ($iHours * 3600) + ($iMinutes * 60) + $iSeconds;
 	return $iResult;
 }
 
@@ -168,30 +168,30 @@ 
  * 	                                		Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00
  *      @see convertTime2Seconds
  */
-function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengthOfWeek=7)
+function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $lengthOfWeek = 7)
 {
 	global $langs;
 
-	if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
+	if (empty($lengthOfDay))  $lengthOfDay = 86400; // 1 day = 24 hours
+    if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
 	{
-		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
+		if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
 
-        $sTime='';
-        $sDay=0;
-        $sWeek=0;
+        $sTime = '';
+        $sDay = 0;
+        $sWeek = 0;
 
 		if ($iSecond >= $lengthOfDay)
 		{
-			for($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay )
+			for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay)
 			{
 				$sDay++;
-				$iSecond-=$lengthOfDay;
+				$iSecond -= $lengthOfDay;
 			}
 			$dayTranslate = $langs->trans("Day");
-			if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
+			if ($iSecond >= ($lengthOfDay * 2)) $dayTranslate = $langs->trans("Days");
 		}
 
 		if ($lengthOfWeek < 7)
@@ -200,66 +200,66 @@ 
             {
                 if ($sDay >= $lengthOfWeek)
                 {
-                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
+                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
                     $sDay = $sDay % $lengthOfWeek;
                     $weekTranslate = $langs->trans("DurationWeek");
                     if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
-                    $sTime.=$sWeek.' '.$weekTranslate.' ';
+                    $sTime .= $sWeek.' '.$weekTranslate.' ';
                 }
             }
 		}
-		if ($sDay>0)
+		if ($sDay > 0)
 		{
 			$dayTranslate = $langs->trans("Day");
 			if ($sDay > 1) $dayTranslate = $langs->trans("Days");
-			$sTime.=$sDay.' '.$dayTranslate.' ';
+			$sTime .= $sDay.' '.$dayTranslate.' ';
 		}
 
 		if ($format == 'all')
 		{
 			if ($iSecond || empty($sDay))
 			{
-				$sTime.= dol_print_date($iSecond,'hourduration',true);
+				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
 		}
 		if ($format == 'allhourmin')
 		{
-		    return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d",((int) floor(($iSecond % 3600)/60)));
+		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
 		}
 		if ($format == 'allhour')
 		{
-			return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
 		}
 	}
 	else if ($format == 'hour')	// only hour part
 	{
-		$sTime=dol_print_date($iSecond,'%H',true);
+		$sTime = dol_print_date($iSecond, '%H', true);
 	}
 	else if ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
-			$iSecond=$iSecond/3600;
+			$iSecond = $iSecond / 3600;
 		}
 		else {
-			$iSecond=0;
+			$iSecond = 0;
 		}
-		$sTime=$iSecond;
+		$sTime = $iSecond;
 	}
 	else if ($format == 'min')	// only min part
 	{
-		$sTime=dol_print_date($iSecond,'%M',true);
+		$sTime = dol_print_date($iSecond, '%M', true);
 	}
     else if ($format == 'sec')	// only sec part
     {
-        $sTime=dol_print_date($iSecond,'%S',true);
+        $sTime = dol_print_date($iSecond, '%S', true);
     }
     else if ($format == 'month')	// only month part
     {
-        $sTime=dol_print_date($iSecond,'%m',true);
+        $sTime = dol_print_date($iSecond, '%m', true);
     }
     else if ($format == 'year')	// only year part
     {
-        $sTime=dol_print_date($iSecond,'%Y',true);
+        $sTime = dol_print_date($iSecond, '%Y', true);
     }
     return trim($sTime);
 }
@@ -283,10 +283,10 @@ 
  *
  *  @see    dol_print_date, dol_mktime, dol_getdate
  */
-function dol_stringtotime($string, $gm=1)
+function dol_stringtotime($string, $gm = 1)
 {
     // Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
-    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$string,$reg))
+    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
     {
         dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
         // Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
@@ -297,14 +297,14 @@ 
         $shour = $reg[4];
         $smin = $reg[5];
         $ssec = $reg[6];
-        if ($syear < 50) $syear+=1900;
-        if ($syear >= 50 && $syear < 100) $syear+=2000;
-        $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
+        if ($syear < 50) $syear += 1900;
+        if ($syear >= 50 && $syear < 100) $syear += 2000;
+        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
     }
     else if (
-    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
-    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
-   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
+    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
+   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
     )
     {
         $syear = $reg[1];
@@ -313,12 +313,12 @@ 
         $shour = $reg[4];
         $smin = $reg[5];
         $ssec = $reg[6];
-        $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
+        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
     }
 
-    $string=preg_replace('/([^0-9])/i','',$string);
-    $tmp=$string.'000000';
-    $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),($gm?1:0));
+    $string = preg_replace('/([^0-9])/i', '', $string);
+    $tmp = $string.'000000';
+    $date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
     return $date;
 }
 
@@ -332,9 +332,9 @@ 
  */
 function dol_get_prev_day($day, $month, $year)
 {
-	$time=dol_mktime(12,0,0,$month,$day,$year,1,0);
-	$time-=24*60*60;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
+	$time -= 24 * 60 * 60;
+	$tmparray = dol_getdate($time, true);
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
@@ -347,9 +347,9 @@ 
  */
 function dol_get_next_day($day, $month, $year)
 {
-	$time=dol_mktime(12,0,0,$month,$day,$year,1,0);
-	$time+=24*60*60;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
+	$time += 24 * 60 * 60;
+	$tmparray = dol_getdate($time, true);
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
@@ -368,7 +368,7 @@ 
 	}
 	else
 	{
-		$prev_month = $month-1;
+		$prev_month = $month - 1;
 		$prev_year  = $year;
 	}
 	return array('year' => $prev_year, 'month' => $prev_month);
@@ -407,9 +407,9 @@ 
 {
 	$tmparray = dol_get_first_day_week($day, $month, $year);
 
-	$time=dol_mktime(12,0,0,$month,$tmparray['first_day'],$year,1,0);
-	$time-=24*60*60*7;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $month, $tmparray['first_day'], $year, 1, 0);
+	$time -= 24 * 60 * 60 * 7;
+	$tmparray = dol_getdate($time, true);
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
@@ -425,9 +425,9 @@ 
 {
 	$tmparray = dol_get_first_day_week($day, $month, $year);
 
-	$time=dol_mktime(12,0,0,$tmparray['first_month'],$tmparray['first_day'],$tmparray['first_year'],1,0);
-	$time+=24*60*60*7;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $tmparray['first_month'], $tmparray['first_day'], $tmparray['first_year'], 1, 0);
+	$time += 24 * 60 * 60 * 7;
+	$tmparray = dol_getdate($time, true);
 
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 
@@ -442,10 +442,10 @@ 
  *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00
  *  @return		int						Date for first day, '' if error
  */
-function dol_get_first_day($year,$month=1,$gm=false)
+function dol_get_first_day($year, $month = 1, $gm = false)
 {
 	if ($year > 9999) return '';
-	return dol_mktime(0,0,0,$month,1,$year,$gm);
+	return dol_mktime(0, 0, 0, $month, 1, $year, $gm);
 }
 
 
@@ -456,7 +456,7 @@ 
  * 	@param		boolean		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
  *	@return		int						Date for first day, '' if error
  */
-function dol_get_last_day($year,$month=12,$gm=false)
+function dol_get_last_day($year, $month = 12, $gm = false)
 {
 	if ($year > 9999) return '';
 	if ($month == 12)
@@ -470,7 +470,7 @@ 
 	}
 
 	// On se deplace au debut du mois suivant, et on retire un jour
-	$datelim=dol_mktime(23,59,59,$month,1,$year,$gm);
+	$datelim = dol_mktime(23, 59, 59, $month, 1, $year, $gm);
 	$datelim -= (3600 * 24);
 
 	return $datelim;
@@ -484,69 +484,69 @@ 
  * 	@param		int		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
  *	@return		array				year,month,week,first_day,first_month,first_year,prev_day,prev_month,prev_year
  */
-function dol_get_first_day_week($day,$month,$year,$gm=false)
+function dol_get_first_day_week($day, $month, $year, $gm = false)
 {
 	global $conf;
 
 	//$day=2; $month=2; $year=2015;
-	$date = dol_mktime(0,0,0,$month,$day,$year,$gm);
+	$date = dol_mktime(0, 0, 0, $month, $day, $year, $gm);
 
 	//Checking conf of start week
-	$start_week = (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1);
+	$start_week = (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1);
 
-	$tmparray = dol_getdate($date,true);	// detail of current day
+	$tmparray = dol_getdate($date, true); // detail of current day
 
 	//Calculate days = offset from current day
 	$days = $start_week - $tmparray['wday'];
- 	if ($days>=1) $days=7-$days;
+ 	if ($days >= 1) $days = 7 - $days;
  	$days = abs($days);
-    $seconds = $days*24*60*60;
+    $seconds = $days * 24 * 60 * 60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
     //Get first day of week
-    $tmpdaytms = date($tmparray[0])-$seconds; // $tmparray[0] is day of parameters
-	$tmpday = date("d",$tmpdaytms);
+    $tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
+	$tmpday = date("d", $tmpdaytms);
 
 	//Check first day of week is in same month than current day or not
-	if ($tmpday>$day)
+	if ($tmpday > $day)
     {
-    	$prev_month = $month-1;
-		$prev_year  = $year;
+    	$prev_month = $month - 1;
+		$prev_year = $year;
 
-    	if ($prev_month==0)
+    	if ($prev_month == 0)
     	{
     		$prev_month = 12;
-    		$prev_year  = $year-1;
+    		$prev_year  = $year - 1;
     	}
     }
     else
     {
     	$prev_month = $month;
-		$prev_year  = $year;
+		$prev_year = $year;
     }
 	$tmpmonth = $prev_month;
 	$tmpyear = $prev_year;
 
 	//Get first day of next week
-	$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
-	$tmptime-=24*60*60*7;
-	$tmparray=dol_getdate($tmptime,true);
-    $prev_day   = $tmparray['mday'];
+	$tmptime = dol_mktime(12, 0, 0, $month, $tmpday, $year, 1, 0);
+	$tmptime -= 24 * 60 * 60 * 7;
+	$tmparray = dol_getdate($tmptime, true);
+    $prev_day = $tmparray['mday'];
 
     //Check prev day of week is in same month than first day or not
 	if ($prev_day > $tmpday)
     {
-    	$prev_month = $month-1;
-		$prev_year  = $year;
+    	$prev_month = $month - 1;
+		$prev_year = $year;
 
-    	if ($prev_month==0)
+    	if ($prev_month == 0)
     	{
     		$prev_month = 12;
-    		$prev_year  = $year-1;
+    		$prev_year  = $year - 1;
     	}
     }
 
-    $week = date("W",dol_mktime(0,0,0,$tmpmonth,$tmpday,$tmpyear,$gm));
+    $week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));
 
 	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
@@ -562,42 +562,42 @@ 
  *	@return   	int								Nombre de jours feries
  *  @see num_between_day, num_open_day
  */
-function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $lastday=0)
+function num_public_holiday($timestampStart, $timestampEnd, $countrycode = 'FR', $lastday = 0)
 {
 	$nbFerie = 0;
 
 	// Check to ensure we use correct parameters
 	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
 
-	$i=0;
-	while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
+	$i = 0;
+	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
 	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
-		$ferie=false;
-		$countryfound=0;
+		$ferie = false;
+		$countryfound = 0;
 
 		$jour  = date("d", $timestampStart);
 		$mois  = date("m", $timestampStart);
 		$annee = date("Y", $timestampStart);
 		if ($countrycode == 'FR')
 		{
-			$countryfound=1;
+			$countryfound = 1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // 1er janvier
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1er mai
-			if($jour == 8 && $mois == 5)   $ferie=true; // 5 mai
-			if($jour == 14 && $mois == 7)  $ferie=true; // 14 juillet
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 aout
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 novembre
-			if($jour == 11 && $mois == 11) $ferie=true; // 11 novembre
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
+			if ($jour == 1 && $mois == 1)   $ferie = true; // 1er janvier
+			if ($jour == 1 && $mois == 5)   $ferie = true; // 1er mai
+			if ($jour == 8 && $mois == 5)   $ferie = true; // 5 mai
+			if ($jour == 14 && $mois == 7)  $ferie = true; // 14 juillet
+			if ($jour == 15 && $mois == 8)  $ferie = true; // 15 aout
+			if ($jour == 1 && $mois == 11)  $ferie = true; // 1 novembre
+			if ($jour == 11 && $mois == 11) $ferie = true; // 11 novembre
+			if ($jour == 25 && $mois == 12) $ferie = true; // 25 decembre
 
 			// Calcul du jour de paques
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 			// Paques
 
 			// Calcul du jour de l ascension (38 jours apres Paques)
@@ -611,7 +611,7 @@ 
             );
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
-			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
+			if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
 			//Ascension
 
 			// Calcul de Pentecote (11 jours apres Paques)
@@ -625,13 +625,13 @@ 
             );
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
-			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
 			//Pentecote
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if ($jour_semaine == 0 || $jour_semaine == 6) $ferie = true;
 			//Samedi (6) et dimanche (0)
 		}
 
@@ -639,54 +639,54 @@ 
 		// Pentecoste is 50 days after Easter, Ascensione 40
 		if ($countrycode == 'IT')
 		{
-			$countryfound=1;
+			$countryfound = 1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1) $ferie=true; // Capodanno
-			if($jour == 6 && $mois == 1) $ferie=true; // Epifania
-			if($jour == 25 && $mois == 4) $ferie=true; // Anniversario Liberazione
-			if($jour == 1 && $mois == 5) $ferie=true; // Festa del Lavoro
-			if($jour == 2 && $mois == 6) $ferie=true; // Festa della Repubblica
-			if($jour == 15 && $mois == 8) $ferie=true; // Ferragosto
-			if($jour == 1 && $mois == 11) $ferie=true; // Tutti i Santi
-			if($jour == 8 && $mois == 12) $ferie=true; // Immacolata Concezione
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
-			if($jour == 26 && $mois == 12) $ferie=true; // Santo Stefano
+			if ($jour == 1 && $mois == 1) $ferie = true; // Capodanno
+			if ($jour == 6 && $mois == 1) $ferie = true; // Epifania
+			if ($jour == 25 && $mois == 4) $ferie = true; // Anniversario Liberazione
+			if ($jour == 1 && $mois == 5) $ferie = true; // Festa del Lavoro
+			if ($jour == 2 && $mois == 6) $ferie = true; // Festa della Repubblica
+			if ($jour == 15 && $mois == 8) $ferie = true; // Ferragosto
+			if ($jour == 1 && $mois == 11) $ferie = true; // Tutti i Santi
+			if ($jour == 8 && $mois == 12) $ferie = true; // Immacolata Concezione
+			if ($jour == 25 && $mois == 12) $ferie = true; // 25 decembre
+			if ($jour == 26 && $mois == 12) $ferie = true; // Santo Stefano
 
 			// Calcul du jour de paques
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 			// Paques
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if ($jour_semaine == 0 || $jour_semaine == 6) $ferie = true;
 			//Samedi (6) et dimanche (0)
 		}
 
 		if ($countrycode == 'ES')
 		{
-			$countryfound=1;
+			$countryfound = 1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
-			if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
-			if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
-			if($jour == 6 && $mois == 12) $ferie=true; // Constitución
-			if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
+			if ($jour == 1 && $mois == 1)   $ferie = true; // Año nuevo
+			if ($jour == 6 && $mois == 1)   $ferie = true; // Día Reyes
+			if ($jour == 1 && $mois == 5)   $ferie = true; // 1 Mayo
+			if ($jour == 15 && $mois == 8)  $ferie = true; // 15 Agosto
+			if ($jour == 12 && $mois == 10)  $ferie = true; // Día Hispanidad
+			if ($jour == 1 && $mois == 11)  $ferie = true; // 1 noviembre
+			if ($jour == 6 && $mois == 12) $ferie = true; // Constitución
+			if ($jour == 8 && $mois == 12)  $ferie = true; // Inmaculada
+			if ($jour == 25 && $mois == 12) $ferie = true; // 25 diciembre
 
 			// Calcul día de Pascua
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 			// Paques
 
 			// Viernes Santo
@@ -695,43 +695,43 @@ 
                 date("i", $date_paques),
                 date("s", $date_paques),
                 date("m", $date_paques),
-                date("d", $date_paques) -2,
+                date("d", $date_paques) - 2,
                 date("Y", $date_paques)
             );
 			$jour_viernes = date("d", $date_viernes);
 			$mois_viernes = date("m", $date_viernes);
-			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+			if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
 			//Viernes Santo
 
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if ($jour_semaine == 0 || $jour_semaine == 6) $ferie = true;
 			//Samedi (6) et dimanche (0)
 		}
 
 		if ($countrycode == 'AT')
 		{
-		    $countryfound=1;
+		    $countryfound = 1;
 
 		    // Definition des dates feriees fixes
-		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
-		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
-		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
-		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
-		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
-		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
-		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
-		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
-		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
-		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
-		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+		    if ($jour == 1 && $mois == 1)   $ferie = true; // Neujahr
+		    if ($jour == 6 && $mois == 1)   $ferie = true; // Hl. 3 Koenige
+		    if ($jour == 1 && $mois == 5)   $ferie = true; // 1. Mai
+		    if ($jour == 15 && $mois == 8)  $ferie = true; // Mariae Himmelfahrt
+		    if ($jour == 26 && $mois == 10) $ferie = true; // 26. Oktober
+		    if ($jour == 1 && $mois == 11)  $ferie = true; // Allerheiligen
+		    if ($jour == 8 && $mois == 12)  $ferie = true; // Mariae Empfaengnis
+		    if ($jour == 24 && $mois == 12) $ferie = true; // Heilig abend
+		    if ($jour == 25 && $mois == 12) $ferie = true; // Christtag
+		    if ($jour == 26 && $mois == 12) $ferie = true; // Stefanietag
+		    if ($jour == 31 && $mois == 12) $ferie = true; // Silvester
 
 		    // Easter calculation
 		    $date_paques = easter_date($annee);
 		    $jour_paques = date("d", $date_paques);
 		    $mois_paques = date("m", $date_paques);
-		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+		    if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 		    // Easter sunday
 
 		    // Monday after easter
@@ -745,7 +745,7 @@ 
 		        );
 		    $jour_eastermonday = date("d", $date_eastermonday);
 		    $mois_eastermonday = date("m", $date_eastermonday);
-		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+		    if ($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie = true;
 		    // Easter monday
 
 		    // Christi Himmelfahrt (39 days after easter sunday)
@@ -759,7 +759,7 @@ 
 		        );
 		    $jour_ch = date("d", $date_ch);
 		    $mois_ch = date("m", $date_ch);
-		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+		    if ($jour_ch == $jour && $mois_ch == $mois) $ferie = true;
 		    // Christi Himmelfahrt
 
 		    // Pfingsten (50 days after easter sunday)
@@ -773,7 +773,7 @@ 
 		        );
 		    $jour_pentecote = date("d", $date_pentecote);
 		    $mois_pentecote = date("m", $date_pentecote);
-		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+		    if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
 		    // Pfingsten
 
 		    // Fronleichnam (60 days after easter sunday)
@@ -787,23 +787,23 @@ 
 		        );
 		    $jour_fronleichnam = date("d", $date_fronleichnam);
 		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+		    if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
 		    // Fronleichnam
 
 		    // Calul des samedis et dimanches
 		    $jour_julien = unixtojd($timestampStart);
 		    $jour_semaine = jddayofweek($jour_julien, 0);
-		    if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+		    if ($jour_semaine == 0 || $jour_semaine == 6) $ferie = true;
 		    //Samedi (6) et dimanche (0)
 		}
 
 		// Cas pays non defini
-		if (! $countryfound)
+		if (!$countryfound)
 		{
 			// Calul des samedis et dimanches
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if ($jour_semaine == 0 || $jour_semaine == 6) $ferie = true;
 			//Samedi (6) et dimanche (0)
 		}
 
@@ -811,7 +811,7 @@ 
 		if ($ferie) $nbFerie++;
 
 		// Increase number of days (on go up into loop)
-		$timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
+		$timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');
 		//var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
 
 		$i++;
@@ -830,7 +830,7 @@ 
  *	@return    int								Number of days
  *  @see also num_public_holiday, num_open_day
  */
-function num_between_day($timestampStart, $timestampEnd, $lastday=0)
+function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 {
 	if ($timestampStart < $timestampEnd)
 	{
@@ -842,7 +842,7 @@ 
 		{
 			$bit = 1;
 		}
-		$nbjours = (int) floor(($timestampEnd - $timestampStart)/(60*60*24)) + 1 - $bit;
+		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
 	}
 	//print ($timestampEnd - $timestampStart) - $lastday;
 	return $nbjours;
@@ -860,17 +860,17 @@ 
  *	@return    	int								Number of days or hours
  *  @see also num_between_day, num_public_holiday
  */
-function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='')
+function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0, $halfday = 0, $country_code = '')
 {
-	global $langs,$mysoc;
+	global $langs, $mysoc;
 
-	if (empty($country_code)) $country_code=$mysoc->country_code;
+	if (empty($country_code)) $country_code = $mysoc->country_code;
 
 	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
 
 	// Check parameters
-	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
-	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+	if (!is_int($timestampStart) && !is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
+	if (!is_int($timestampEnd) && !is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
 
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
@@ -878,14 +878,14 @@ 
 		$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
 		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
 		$nbOpenDay = $numdays - $numholidays;
-		$nbOpenDay.= " " . $langs->trans("Days");
-		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		$nbOpenDay .= " ".$langs->trans("Days");
+		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
 	elseif ($timestampStart == $timestampEnd)
 	{
-		$nbOpenDay=$lastday;
-		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		$nbOpenDay = $lastday;
+		if ($inhour == 1) $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
 	else
@@ -904,9 +904,9 @@ 
  *  @param	int			$short			1=Return short label
  *	@return array						Month string or array if selected < 0
  */
-function monthArray($outputlangs,$short=0)
+function monthArray($outputlangs, $short = 0)
 {
-	$montharray = array (
+	$montharray = array(
 	    1  => $outputlangs->trans("January"),
 	    2  => $outputlangs->trans("February"),
 	    3  => $outputlangs->trans("March"),
@@ -921,9 +921,9 @@ 
 	    12 => $outputlangs->trans("December")
     );
 
-	if (! empty($short))
+	if (!empty($short))
 	{
-		$montharray = array (
+		$montharray = array(
 		    1  => $outputlangs->trans("JanuaryMin"),
 		    2  => $outputlangs->trans("FebruaryMin"),
 		    3  => $outputlangs->trans("MarchMin"),

htdocs/core/lib/project.lib.php

Doc Comments +2 added lines, -2 removed lines

@@ -269,7 +269,7 @@ 
  * @param	int			$projectsListId		List of id of project allowed to user (string separated with comma)
  * @param	int			$addordertick		Add a tick to move task
  * @param   int         $projectidfortotallink     0 or Id of project to use on total line (link to see all time consumed for project)
- * @return	void
+ * @return	string
  */
 function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0)
 {
@@ -865,7 +865,7 @@ 
  * @param 	int		$parent				Id of parent task to start
  * @param 	array	$lines				Array of all tasks
  * @param	string	$taskrole			Array of task filtered on a particular user
- * @return	int							1 if there is
+ * @return	string							1 if there is
  */
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {

Spacing +344 added lines, -344 removed lines

@@ -44,16 +44,16 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 	$head[$h][2] = 'contact';
 	$h++;
 
-	if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
-	|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
-	|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+	if (!empty($conf->fournisseur->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
+	|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
+	|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ProjectOverview");
@@ -65,29 +65,29 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
 		$h++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -98,15 +98,15 @@ 
 		$head[$h][1] = $langs->trans("Tasks");
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-		$taskstatic=new Task($db);
-		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		$taskstatic = new Task($db);
+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+		if ($nbTasks > 0) $head[$h][1] .= ' <span class="badge">'.($nbTasks).'</span>';
 		$head[$h][2] = 'tasks';
 		$h++;
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Gantt");
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		if ($nbTasks > 0) $head[$h][1] .= ' <span class="badge">'.($nbTasks).'</span>';
 		$head[$h][2] = 'gantt';
 		$h++;
 	}
@@ -117,22 +117,22 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) $head[$h][1] .= ' <span class="badge">'.$nbComments.'</span>';
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
-	$head[$h][1].= $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	$head[$h][1] .= $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
-		$head[$h][1].= '/';
-		$head[$h][1].= $langs->trans("Agenda");
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
 	}
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');
 
 	return $head;
 }
@@ -150,20 +150,20 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'task_task';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 	$head[$h][2] = 'task_contact';
 	$h++;
 
 	// Is there timespent ?
-	$nbTimeSpent=0;
+	$nbTimeSpent = 0;
 	$sql = "SELECT t.rowid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 	$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
@@ -172,13 +172,13 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
+		if ($obj) $nbTimeSpent = 1;
 	}
 	else dol_print_error($db);
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+	if ($nbTimeSpent > 0) $head[$h][1] .= ' <span class="badge">...</span>';
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -186,28 +186,28 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task');
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'task_notes';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
+	$filesdir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
+	$nbFiles = count(dol_dir_list($filesdir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'task_document';
 	$h++;
 
@@ -215,14 +215,14 @@ 
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
 	{
 		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) $head[$h][1] .= ' <span class="badge">'.$nbComments.'</span>';
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task', 'remove');
 
 	return $head;
 }
@@ -234,7 +234,7 @@ 
  * @param   string  $fuser      Filter on user
  * @return  array				Array of tabs to show
  */
-function project_timesheet_prepare_head($mode, $fuser=null)
+function project_timesheet_prepare_head($mode, $fuser = null)
 {
 	global $langs, $conf, $user;
 	$h = 0;
@@ -242,13 +242,13 @@ 
 
 	$h = 0;
 
-	$param='';
-	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+	$param = '';
+	$param .= ($mode ? '&mode='.$mode : '');
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param .= '&search_usertoprocessid='.$fuser->id;
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
@@ -256,7 +256,7 @@ 
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
 		$h++;
@@ -270,9 +270,9 @@ 
 		$h++;
 	}*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet', 'remove');
 
 	return $head;
 }
@@ -296,7 +296,7 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin');
 
 	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
 	$head[$h][1] = $langs->trans("ExtraFieldsProject");
@@ -308,7 +308,7 @@ 
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin', 'remove');
 
 	return $head;
 }
@@ -329,29 +329,29 @@ 
  * @param   int         $projectidfortotallink     0 or Id of project to use on total line (link to see all time consumed for project)
  * @return	void
  */
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0)
+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0)
 {
 	global $user, $bc, $langs;
 	global $projectstatic, $taskstatic;
 
-	$lastprojectid=0;
+	$lastprojectid = 0;
 
-	$projectsArrayId=explode(',',$projectsListId);
+	$projectsArrayId = explode(',', $projectsListId);
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// We declare counter as global because we want to edit them into recursive call
-	global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
+	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned;
 	if ($level == 0)
 	{
-		$total_projectlinesa_spent=0;
-		$total_projectlinesa_planned=0;
-		$total_projectlinesa_spent_if_planned=0;
+		$total_projectlinesa_spent = 0;
+		$total_projectlinesa_planned = 0;
+		$total_projectlinesa_spent_if_planned = 0;
 	}
 
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($parent == 0 && $level >= 0) $level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
@@ -359,26 +359,26 @@ 
 		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
 		{
 			// Show task line.
-			$showline=1;
-			$showlineingray=0;
+			$showline = 1;
+			$showlineingray = 0;
 
 			// If there is filters to use
 			if (is_array($taskrole))
 			{
 				// If task not legitimate to show, search if a legitimate task exists later in tree
-				if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
+				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
 				{
 					// So search if task has a subtask legitimate to show
-					$foundtaskforuserdeeper=0;
-					searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
+					$foundtaskforuserdeeper = 0;
+					searchTaskInChild($foundtaskforuserdeeper, $lines[$i]->id, $lines, $taskrole);
 					//print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
 					if ($foundtaskforuserdeeper > 0)
 					{
-						$showlineingray=1;		// We will show line but in gray
+						$showlineingray = 1; // We will show line but in gray
 					}
 					else
 					{
-						$showline=0;			// No reason to show line
+						$showline = 0; // No reason to show line
 					}
 				}
 			}
@@ -389,12 +389,12 @@ 
 				if (empty($user->rights->projet->all->lire))
 				{
 					// User is not allowed on this project and project is not public, so we hide line
-					if (! in_array($lines[$i]->fk_project, $projectsArrayId))
+					if (!in_array($lines[$i]->fk_project, $projectsArrayId))
 					{
 						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
 						// because assignement on task can be done only on contact of project.
 						// If assignement was done and after, was removed from contact of project, then we can hide the line.
-						$showline=0;
+						$showline = 0;
 					}
 				}
 			}
@@ -405,7 +405,7 @@ 
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
 					$var = !$var;
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 				}
 
 				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
@@ -415,18 +415,18 @@ 
 					// Project ref
 					print "<td>";
 					//if ($showlineingray) print '<i>';
-					$projectstatic->id=$lines[$i]->fk_project;
-					$projectstatic->ref=$lines[$i]->projectref;
-					$projectstatic->public=$lines[$i]->public;
-					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
+					$projectstatic->id = $lines[$i]->fk_project;
+					$projectstatic->ref = $lines[$i]->projectref;
+					$projectstatic->public = $lines[$i]->public;
+					$projectstatic->title = $lines[$i]->projectlabel;
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
+					else print $projectstatic->getNomUrl(1, 'nolink');
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
 					// Project status
 					print '<td>';
-					$projectstatic->statut=$lines[$i]->projectstatus;
+					$projectstatic->statut = $lines[$i]->projectstatus;
 					print $projectstatic->getLibStatut(2);
 					print "</td>";
 				}
@@ -435,14 +435,14 @@ 
 				print '<td>';
 				if ($showlineingray)
 				{
-					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
+					print '<i>'.img_object('', 'projecttask').' '.$lines[$i]->ref.'</i>';
 				}
 				else
 				{
-					$taskstatic->id=$lines[$i]->id;
-					$taskstatic->ref=$lines[$i]->ref;
-					$taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
-					print $taskstatic->getNomUrl(1,'withproject');
+					$taskstatic->id = $lines[$i]->id;
+					$taskstatic->ref = $lines[$i]->ref;
+					$taskstatic->label = ($taskrole[$lines[$i]->id] ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');
+					print $taskstatic->getNomUrl(1, 'withproject');
 				}
 				print '</td>';
 
@@ -450,7 +450,7 @@ 
 				print "<td>";
 				if ($showlineingray) print '<i>';
 				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
-				for ($k = 0 ; $k < $level ; $k++)
+				for ($k = 0; $k < $level; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
@@ -461,7 +461,7 @@ 
 
 				// Date start
 				print '<td align="center">';
-				print dol_print_date($lines[$i]->date_start,'dayhour');
+				print dol_print_date($lines[$i]->date_start, 'dayhour');
 				print '</td>';
 
 				// Date end
@@ -470,19 +470,19 @@ 
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
-				print dol_print_date($lines[$i]->date_end,'dayhour');
+				print dol_print_date($lines[$i]->date_end, 'dayhour');
 				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
 				print '</td>';
 
-				$plannedworkloadoutputformat='allhourmin';
-				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				$plannedworkloadoutputformat = 'allhourmin';
+				$timespentoutputformat = 'allhourmin';
+				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 
 				// Planned Workload (in working hours)
 				print '<td align="right">';
-				$fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
-				$workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+				$fullhour = convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat);
+				$workingdelay = convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
 				if ($lines[$i]->planned_workload != '')
 				{
 					print $fullhour;
@@ -495,8 +495,8 @@ 
 				// Time spent
 				print '<td align="right">';
 				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';
+				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
 				else print '--:--';
 				if ($showlineingray) print '</i>';
 				else print '</a>';
@@ -506,7 +506,7 @@ 
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
 					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
 				}
 				print '</td>';
@@ -527,7 +527,7 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (!$showlineingray) $inc++;
 
 				if ($level >= 0)    // Call sublevels
 				{
@@ -559,12 +559,12 @@ 
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject ? '' : '&withproject=1').'">';
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
 		if ($projectidfortotallink > 0) print '</a>';
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %';
 		print '</td>';
 		print '<td></td>';
 		if ($addordertick) print '<td class="hideonsmartphone"></td>';
@@ -592,48 +592,48 @@ 
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
  */
-function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
+function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$lastprojectid=0;
-	$totalforeachline=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$totalforeachline = array();
+	$workloadforid = array();
+	$lineswithoutlevel0 = array();
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0; $i < $numlines; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
 	if (empty($oldprojectforbreak))
 	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		//if ($lines[$i]->fk_task_parent == $parent)
 		//{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 					if ($preselectedday)
 					{
 						$projectstatic->id = $lines[$i]->fk_project;
@@ -644,31 +644,31 @@ 
 				{
 					if ($preselectedday)
 					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-						$workloadforid[$projectstatic->id]=1;
+						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+						$workloadforid[$projectstatic->id] = 1;
 					}
 				}
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->project_ref;
-				$projectstatic->title=$lines[$i]->project_label;
-				$projectstatic->public=$lines[$i]->public;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->project_ref;
+				$projectstatic->title = $lines[$i]->project_label;
+				$projectstatic->public = $lines[$i]->public;
 
-				$taskstatic->id=$lines[$i]->task_id;
-				$taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
-				$taskstatic->label=$lines[$i]->task_label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				$taskstatic->id = $lines[$i]->task_id;
+				$taskstatic->ref = ($lines[$i]->task_ref ? $lines[$i]->task_ref : $lines[$i]->task_id);
+				$taskstatic->label = $lines[$i]->task_label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
+				$thirdpartystatic->id = $lines[$i]->socid;
+				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
+				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="11">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -693,7 +693,7 @@ 
 				print "<td>";
 				if ($oldprojectforbreak == -1)
 				{
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 					print '<br>'.$projectstatic->title;
 				}
 				print "</td>";
@@ -706,11 +706,11 @@ 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -719,47 +719,47 @@ 
 
 				// Date
 				print '<td align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'day');
+				print dol_print_date($lines[$i]->timespent_datehour, 'day');
 				print '</td>';
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				// Hour
 				print '<td class="nowrap" align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'hour');
+				print dol_print_date($lines[$i]->timespent_datehour, 'hour');
 				print '</td>';
 
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				$cssonholiday = '';
+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
 				// Duration
-				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
+				print '<td align="center" class="duration'.($cssonholiday ? ' '.$cssonholiday : '').'">';
 
 				$dayWorkLoad = $lines[$i]->timespent_duration;
-				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
+				$totalforeachline[$preselectedday] += $lines[$i]->timespent_duration;
 
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				$alreadyspent = '';
+				if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
 
-				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
 
-				$modeinput='hours';
+				$modeinput = 'hours';
 
 				print '<script type="text/javascript">';
 				print "jQuery(document).ready(function () {\n";
@@ -771,7 +771,7 @@ 
 
 				// Note
 				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask ? ' disabled="disabled"' : '').'>';
 				print $lines[$i]->timespent_note;
 				print '</textarea>';
 				print '</td>';
@@ -818,48 +818,48 @@ 
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
  */
-function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
+function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$lastprojectid=0;
-	$totalforeachday=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$totalforeachday = array();
+	$workloadforid = array();
+	$lineswithoutlevel0 = array();
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0; $i < $numlines; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
 	if (empty($oldprojectforbreak))
 	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 					if ($preselectedday)
 					{
 						$projectstatic->id = $lines[$i]->fk_project;
@@ -870,31 +870,31 @@ 
 				{
 					if ($preselectedday)
 					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		   				$workloadforid[$projectstatic->id]=1;
+						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+		   				$workloadforid[$projectstatic->id] = 1;
 					}
 				}
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->projectref;
+				$projectstatic->title = $lines[$i]->projectlabel;
+				$projectstatic->public = $lines[$i]->public;
 
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
+				$taskstatic->label = $lines[$i]->label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
+				$thirdpartystatic->id = $lines[$i]->socid;
+				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
+				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="11">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -917,7 +917,7 @@ 
 
 				// Project
 				print "<td>";
-				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";
 
 				// Thirdparty
@@ -928,11 +928,11 @@ 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -941,13 +941,13 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
 				else print '--:--';
 				print '</td>';
 
 				// Progress declared %
 				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 				print '</td>';
 
 				// Time spent by everybody
@@ -956,7 +956,7 @@ 
 				if ($lines[$i]->duration)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
 				}
 				else print '--:--';
@@ -964,68 +964,68 @@ 
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
 				else print '--:--';
 				print "</td>\n";
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				// Form to add new time
 				print '<td class="nowrap leftborder" align="center">';
-				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
+				$tableCell = $form->select_date($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, 1, $disabledtask);
 				print $tableCell;
 				print '</td>';
 
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				$cssonholiday = '';
+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
 				global $daytoparse;
-				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
+				$tmparray = dol_getdate($daytoparse, true); // detail of current day
 				$idw = $tmparray['wday'];
 
 				global $numstartworkingday, $numendworkingday;
-				$cssweekend='';
+				$cssweekend = '';
 				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
 				{
-					$cssweekend='weekend';
+					$cssweekend = 'weekend';
 				}
 
 				// Duration
-				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+				print '<td class="center duration'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
-				$totalforeachday[$preselectedday]+=$dayWorkLoad;
+				$totalforeachday[$preselectedday] += $dayWorkLoad;
 
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				$alreadyspent = '';
+				if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
 
 				$idw = 0;
 
-				$tableCell='';
-				$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-				$tableCell.='<span class="hideonsmartphone"> + </span>';
+				$tableCell = '';
+				$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+				$tableCell .= '<span class="hideonsmartphone"> + </span>';
 				//$tableCell.='&nbsp;&nbsp;&nbsp;';
-				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
+				$tableCell .= $form->select_duration($lines[$i]->id.'duration', '', $disabledtask, 'text', 0, 1);
 				//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
 				print $tableCell;
 
-				$modeinput='hours';
+				$modeinput = 'hours';
 
 				print '<script type="text/javascript">';
 				print "jQuery(document).ready(function () {\n";
@@ -1037,19 +1037,19 @@ 
 
 				// Note
 				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask ? ' disabled="disabled"' : '').'>';
 				print '</textarea>';
 				print '</td>';
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
    					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
 
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
 				print '</td>';
 
@@ -1065,9 +1065,9 @@ 
 				$ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach($ret as $key => $val)
+				foreach ($ret as $key => $val)
 				{
-					$totalforeachday[$key]+=$val;
+					$totalforeachday[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
 				//var_dump($totalforeachday);
@@ -1101,24 +1101,24 @@ 
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
  */
-function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak=0)
+function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
-	$lastprojectid=0;
-	$workloadforid=array();
-	$totalforeachday=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$workloadforid = array();
+	$totalforeachday = array();
+	$lineswithoutlevel0 = array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0; $i < $numlines; $i++)
 		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
@@ -1126,24 +1126,24 @@ 
 
 	if (empty($oldprojectforbreak))
 	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 					$projectstatic->id = $lines[$i]->fk_project;
 				}
 
@@ -1151,33 +1151,33 @@ 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 				if (empty($workloadforid[$projectstatic->id]))
 				{
-					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-					$workloadforid[$projectstatic->id]=1;
+					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+					$workloadforid[$projectstatic->id] = 1;
 				}
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 				//var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-				$projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->projectref;
+				$projectstatic->title = $lines[$i]->projectlabel;
+				$projectstatic->public = $lines[$i]->public;
+				$projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
 
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
+				$taskstatic->label = $lines[$i]->label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 
-				$thirdpartystatic->id=$lines[$i]->thirdparty_id;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
+				$thirdpartystatic->id = $lines[$i]->thirdparty_id;
+				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
+				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="15">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -1200,7 +1200,7 @@ 
 
 				// Project
 				print '<td class="nowrap">';
-				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";
 
 				// Thirdparty
@@ -1211,11 +1211,11 @@ 
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				print $taskstatic->label;
 				//print "<br>";
@@ -1225,13 +1225,13 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
 				else print '--:--';
 				print '</td>';
 
 				// Progress declared %
 				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 				print '</td>';
 
 				// Time spent by everybody
@@ -1240,7 +1240,7 @@ 
 				if ($lines[$i]->duration)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
 				}
 				else print '--:--';
@@ -1248,80 +1248,80 @@ 
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
 				else print '--:--';
 				print "</td>\n";
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 
 				// Fields to show current time
-				$tableCell=''; $modeinput='hours';
+				$tableCell = ''; $modeinput = 'hours';
 				for ($idw = 0; $idw < 7; $idw++)
 				{
-					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+					$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
-					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+					$cssonholiday = '';
+					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+					elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+					elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
-					$tmparray=dol_getdate($tmpday);
+					$tmparray = dol_getdate($tmpday);
 					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
-					$totalforeachday[$tmpday]+=$dayWorkLoad;
+					$totalforeachday[$tmpday] += $dayWorkLoad;
 
-					$alreadyspent='';
-					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
+					$alreadyspent = '';
+					if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+					$alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);
 
 					global $numstartworkingday, $numendworkingday;
-					$cssweekend='';
+					$cssweekend = '';
 					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
 					{
-						$cssweekend='weekend';
+						$cssweekend = 'weekend';
 					}
 
-					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+					$tableCell = '<td align="center" class="hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 					if ($alreadyspent)
 					{
-						$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
-						$placeholder='';
+						$placeholder = '';
 					 	//$tableCell.='+';
 					}
-				  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
-					$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-				   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-				   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-				   	$tableCell.='</td>';
+				  	$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
+				   	$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+				   	$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+				   	$tableCell .= '</td>';
 					print $tableCell;
 				}
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
    					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
 
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
 				print '</td>';
 
@@ -1338,9 +1338,9 @@ 
 				$ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach($ret as $key => $val)
+				foreach ($ret as $key => $val)
 				{
-					$totalforeachday[$key]+=$val;
+					$totalforeachday[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
 				//var_dump($totalforeachday);
@@ -1369,8 +1369,8 @@ 
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {
 	//print 'Search in line with parent id = '.$parent.'<br>';
-	$numlines=count($lines);
-	for ($i = 0 ; $i < $numlines ; $i++)
+	$numlines = count($lines);
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		// Process line $lines[$i]
 		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
@@ -1406,52 +1406,52 @@ 
  * @param   array   $hiddenfields       List of info to not show ('projectlabel', 'declaredprogress', '...', )
  * @return	void
  */
-function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array(),$hiddenfields=array())
+function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $statut = -1, $listofoppstatus = array(), $hiddenfields = array())
 {
-	global $langs,$conf,$user,$bc;
+	global $langs, $conf, $user, $bc;
 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-	$projectstatic=new Project($db);
-	$thirdpartystatic=new Societe($db);
+	$projectstatic = new Project($db);
+	$thirdpartystatic = new Societe($db);
 
-	$sortfield='';
-	$sortorder='';
-	$project_year_filter=0;
+	$sortfield = '';
+	$sortorder = '';
+	$project_year_filter = 0;
 
-	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	$title = $langs->trans("Projects");
+	if (strcmp($statut, '') && $statut >= 0) $title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
-	$arrayidtypeofcontact=array();
+	$arrayidtypeofcontact = array();
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 
-	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 	if ($mytasks)
 	{
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 	}
 	else
 	{
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
-	$sql.= " WHERE p.entity IN (".getEntity('project').")";
-	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	$sql .= " WHERE p.entity IN (".getEntity('project').")";
+	$sql .= " AND p.rowid IN (".$projectsListId.")";
+	if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	if ($mytasks)
 	{
-		$sql.= " AND p.rowid = t.fk_projet";
-		$sql.= " AND ec.element_id = t.rowid";
-		$sql.= " AND ec.fk_socpeople = ".$user->id;
-		$sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
-		$sql.= " AND ctc.element = 'project_task'";
+		$sql .= " AND p.rowid = t.fk_projet";
+		$sql .= " AND ec.element_id = t.rowid";
+		$sql .= " AND ec.fk_socpeople = ".$user->id;
+		$sql .= " AND ec.fk_c_type_contact = ctc.rowid"; // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
+		$sql .= " AND ctc.element = 'project_task'";
 	}
 	if ($statut >= 0)
 	{
-		$sql.= " AND p.fk_statut = ".$statut;
+		$sql .= " AND p.fk_statut = ".$statut;
 	}
 	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
 	{
@@ -1463,40 +1463,40 @@ 
 			{
 				$project_year_filter = date("Y");
 			}
-			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
-			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
+			$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter, 12, false)).")";
+			$sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter, 1, false)).")";
 		}
 	}
 
 	// Get id of project we must show tasks
-	$arrayidofprojects=array();
+	$arrayidofprojects = array();
 	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql;
+	$sql1 .= $sql;
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
-		$i=0;
+		$i = 0;
 		$num = $db->num_rows($resql);
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			$arrayidofprojects[$objp->projectid]=$objp->projectid;
+			$arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
 	}
 	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
+	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
-	$sql2.= " p.dateo, p.datee,";
-	$sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
-	$sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-	$sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
-	$sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
-	$sql2.= " ORDER BY p.title, p.ref";
+	$sql2 .= " p.dateo, p.datee,";
+	$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
+	$sql2 .= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+	$sql2 .= " WHERE p.rowid IN (".join(',', $arrayidofprojects).")";
+	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
+	$sql2 .= " ORDER BY p.title, p.ref";
 
 	$resql = $db->query($sql2);
 	if ($resql)
@@ -1509,20 +1509,20 @@ 
 		$i = 0;
 
 		print '<tr class="liste_titre">';
-		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-			print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre("OpportunityAmount", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+			print_liste_field_titre("OpportunityStatus", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+			if (!in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+			if (!in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 		}
-		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre("Status", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 		print "</tr>\n";
 
 		while ($i < $num)
@@ -1537,7 +1537,7 @@ 
 			$userAccess = $projectstatic->restrictedProjectArea($user);
 			if ($userAccess >= 0)
 			{
-				$projectstatic->ref=$objp->ref;
+				$projectstatic->ref = $objp->ref;
 				$projectstatic->statut = $objp->status;
 				$projectstatic->title = $objp->title;
 				$projectstatic->datee = $db->jdate($objp->datee);
@@ -1547,18 +1547,18 @@ 
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+				if (!in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title, 24);
 				print '</td>';
 				print '<td>';
 				if ($objp->fk_soc > 0)
 				{
-					$thirdpartystatic->id=$objp->fk_soc;
-					$thirdpartystatic->ref=$objp->socname;
-					$thirdpartystatic->name=$objp->socname;
+					$thirdpartystatic->id = $objp->fk_soc;
+					$thirdpartystatic->ref = $objp->socname;
+					$thirdpartystatic->name = $objp->socname;
 					print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
-				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
 					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
@@ -1572,19 +1572,19 @@ 
 				{
 					print '<td align="right">'.$objp->nb.'</td>';
 
-					$plannedworkload=$objp->planned_workload;
-					$total_plannedworkload+=$plannedworkload;
-					if (! in_array('plannedworkload', $hiddenfields))
+					$plannedworkload = $objp->planned_workload;
+					$total_plannedworkload += $plannedworkload;
+					if (!in_array('plannedworkload', $hiddenfields))
 					{
-						print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+						print '<td align="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
 					}
-					if (! in_array('declaredprogress', $hiddenfields))
+					if (!in_array('declaredprogress', $hiddenfields))
 					{
-						$declaredprogressworkload=$objp->declared_progess_workload;
-						$total_declaredprogressworkload+=$declaredprogressworkload;
+						$declaredprogressworkload = $objp->declared_progess_workload;
+						$total_declaredprogressworkload += $declaredprogressworkload;
 						print '<td align="right">';
 						//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-						print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
+						print ($plannedworkload ?round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');
 						print '</td>';
 					}
 				}
@@ -1602,7 +1602,7 @@ 
 
 		print '<tr class="liste_total">';
 		print '<td colspan="2">'.$langs->trans("Total")."</td>";
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
 			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
 			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
@@ -1610,8 +1610,8 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print '<td class="liste_total" align="right">'.$total_task.'</td>';
-			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			if (!in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';
+			if (!in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
 		}
 		print '<td class="liste_total"></td>';
 		print '</tr>';

Braces +317 added lines, -128 removed lines

@@ -47,7 +47,9 @@ 
 	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+		$head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'contact';
 	$h++;
 
@@ -71,11 +73,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if(!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'notes';
 		$h++;
 	}
@@ -87,7 +95,9 @@ 
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+		$head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -100,13 +110,17 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic=new Task($db);
 		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		if ($nbTasks > 0) {
+			$head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		}
 		$head[$h][2] = 'tasks';
 		$h++;
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Gantt");
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		if ($nbTasks > 0) {
+			$head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		}
 		$head[$h][2] = 'gantt';
 		$h++;
 	}
@@ -117,7 +131,9 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
@@ -158,7 +174,9 @@ 
 	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+		$head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'task_contact';
 	$h++;
 
@@ -172,13 +190,18 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
+		if ($obj) {
+			$nbTimeSpent=1;
+		}
+	} else {
+		dol_print_error($db);
 	}
-	else dol_print_error($db);
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+	if ($nbTimeSpent > 0) {
+		$head[$h][1].= ' <span class="badge">...</span>';
+	}
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -191,11 +214,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if(!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'task_notes';
 		$h++;
 	}
@@ -207,7 +236,9 @@ 
 	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+		$head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'task_document';
 	$h++;
 
@@ -217,7 +248,9 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
@@ -244,7 +277,9 @@ 
 
 	$param='';
 	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {
+		$param.='&search_usertoprocessid='.$fuser->id;
+	}
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
@@ -351,15 +386,20 @@ 
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($parent == 0 && $level >= 0) {
+			$level = 0;
+		}
+		// if $level = -1, we dont' use sublevel recursion, we show all lines
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
 
-		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($lines[$i]->fk_parent == $parent || $level < 0) {
+			// if $level = -1, we dont' use sublevel recursion, we show all lines
 		{
 			// Show task line.
 			$showline=1;
+		}
 			$showlineingray=0;
 
 			// If there is filters to use
@@ -375,14 +415,12 @@ 
 					if ($foundtaskforuserdeeper > 0)
 					{
 						$showlineingray=1;		// We will show line but in gray
-					}
-					else
+					} else
 					{
 						$showline=0;			// No reason to show line
 					}
 				}
-			}
-			else
+			} else
 			{
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
@@ -419,8 +457,11 @@ 
 					$projectstatic->ref=$lines[$i]->projectref;
 					$projectstatic->public=$lines[$i]->public;
 					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) {
+						print $projectstatic->getNomUrl(1);
+					} else {
+						print $projectstatic->getNomUrl(1,'nolink');
+					}
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
@@ -436,8 +477,7 @@ 
 				if ($showlineingray)
 				{
 					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
-				}
-				else
+				} else
 				{
 					$taskstatic->id=$lines[$i]->id;
 					$taskstatic->ref=$lines[$i]->ref;
@@ -448,14 +488,18 @@ 
 
 				// Title of task
 				print "<td>";
-				if ($showlineingray) print '<i>';
+				if ($showlineingray) {
+					print '<i>';
+				}
 				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 				for ($k = 0 ; $k < $level ; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
 				print $lines[$i]->label;
-				if ($showlineingray) print '</i>';
+				if ($showlineingray) {
+					print '</i>';
+				}
 				//else print '</a>';
 				print "</td>\n";
 
@@ -471,13 +515,19 @@ 
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
 				print dol_print_date($lines[$i]->date_end,'dayhour');
-				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
+				if ($taskstatic->hasDelay()) {
+					print img_warning($langs->trans("Late"));
+				}
 				print '</td>';
 
 				$plannedworkloadoutputformat='allhourmin';
 				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
+					$plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				}
+				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
+					$timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				}
 
 				// Planned Workload (in working hours)
 				print '<td align="right">';
@@ -494,20 +544,32 @@ 
 
 				// Time spent
 				print '<td align="right">';
-				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
-				else print '--:--';
-				if ($showlineingray) print '</i>';
-				else print '</a>';
+				if ($showlineingray) {
+					print '<i>';
+				} else {
+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
+				}
+				if ($lines[$i]->duration) {
+					print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+				} else {
+					print '--:--';
+				}
+				if ($showlineingray) {
+					print '</i>';
+				} else {
+					print '</a>';
+				}
 				print '</td>';
 
 				// Progress calculated (Note: ->duration is time spent)
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
-					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+					if ($lines[$i]->planned_workload) {
+						print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					} else {
+						print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+					}
 				}
 				print '</td>';
 
@@ -527,21 +589,28 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (! $showlineingray) {
+					$inc++;
+				}
 
-				if ($level >= 0)    // Call sublevels
+				if ($level >= 0) {
+					// Call sublevels
 				{
 					$level++;
-					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+				}
+					if ($lines[$i]->id) {
+						projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+					}
 					$level--;
 				}
 
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
-				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				if ($lines[$i]->planned_workload) {
+					$total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				}
 			}
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -551,7 +620,9 @@ 
 	{
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-		if ($showproject) print '<td></td><td></td>';
+		if ($showproject) {
+			print '<td></td><td></td>';
+		}
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
@@ -559,15 +630,23 @@ 
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		if ($projectidfortotallink > 0) {
+			print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		}
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
-		if ($projectidfortotallink > 0) print '</a>';
+		if ($projectidfortotallink > 0) {
+			print '</a>';
+		}
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) {
+			print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		}
 		print '</td>';
 		print '<td></td>';
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
+		if ($addordertick) {
+			print '<td class="hideonsmartphone"></td>';
+		}
 		print '</tr>';
 	}
 
@@ -605,11 +684,16 @@ 
 	$numlines=count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+		// Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[]=$lines[$i];
+			}
 		}
 	}
 
@@ -621,7 +705,9 @@ 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		//if ($lines[$i]->fk_task_parent == $parent)
 		//{
@@ -678,7 +764,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -700,17 +788,23 @@ 
 
 				// Thirdparty
 				print '<td class="tdoverflowmax100">';
-				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				if ($thirdpartystatic->id > 0) {
+					print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				}
 				print '</td>';
 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -744,9 +838,13 @@ 
 				print '</td>';
 
 				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayallday ';
+				} elseif (! $isavailable[$preselectedday]['morning']) {
+					$cssonholiday.='onholidaymorning ';
+				} elseif (! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayafternoon ';
+				}
 
 				// Duration
 				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
@@ -755,7 +853,9 @@ 
 				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
 
 				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				if ($dayWorkLoad > 0) {
+					$alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				}
 
 				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
 
@@ -831,11 +931,16 @@ 
 	$numlines=count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+		// Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[]=$lines[$i];
+			}
 		}
 	}
 
@@ -847,7 +952,9 @@ 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
@@ -904,7 +1011,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -917,22 +1026,30 @@ 
 
 				// Project
 				print "<td>";
-				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				if ($oldprojectforbreak == -1) {
+					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				}
 				print "</td>";
 
 				// Thirdparty
 				print '<td class="tdoverflowmax100">';
-				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				if ($thirdpartystatic->id > 0) {
+					print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				}
 				print '</td>';
 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -941,8 +1058,11 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+					print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -958,15 +1078,19 @@ 
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration,'allhourmin');
 					print '</a>';
+				} else {
+					print '--:--';
 				}
-				else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td align="right">';
 				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject=1;$disabledtask=1;
@@ -992,9 +1116,13 @@ 
 				print '</td>';
 
 				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayallday ';
+				} elseif (! $isavailable[$preselectedday]['morning']) {
+					$cssonholiday.='onholidaymorning ';
+				} elseif (! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayafternoon ';
+				}
 
 				global $daytoparse;
 				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
@@ -1002,10 +1130,12 @@ 
 
 				global $numstartworkingday, $numendworkingday;
 				$cssweekend='';
-				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday) {
+					// This is a day is not inside the setup of working days, so we use a week-end css.
 				{
 					$cssweekend='weekend';
 				}
+				}
 
 				// Duration
 				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
@@ -1013,7 +1143,9 @@ 
 				$totalforeachday[$preselectedday]+=$dayWorkLoad;
 
 				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				if ($dayWorkLoad > 0) {
+					$alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				}
 
 				$idw = 0;
 
@@ -1043,11 +1175,14 @@ 
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
+   				if ((! $lines[$i]->public) && $disabledproject) {
+   					print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				} else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					if ($fuser->id != $user->id) {
+   						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					}
 
    					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
@@ -1073,8 +1208,7 @@ 
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -1114,11 +1248,16 @@ 
 	$lineswithoutlevel0=array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+		// Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		   if ($lines[$i]->fk_task_parent) {
+		   	$lineswithoutlevel0[]=$lines[$i];
+		   }
 		}
 	}
 
@@ -1131,7 +1270,9 @@ 
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
@@ -1187,7 +1328,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -1200,22 +1343,30 @@ 
 
 				// Project
 				print '<td class="nowrap">';
-				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				if ($oldprojectforbreak == -1) {
+					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				}
 				print "</td>";
 
 				// Thirdparty
 				print '<td class="tdoverflowmax100">';
-				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
+				if ($thirdpartystatic->id > 0) {
+					print $thirdpartystatic->getNomUrl(1, 'project');
+				}
 				print '</td>';
 
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				print $taskstatic->label;
 				//print "<br>";
@@ -1225,8 +1376,11 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+					print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -1242,15 +1396,19 @@ 
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration,'allhourmin');
 					print '</a>';
+				} else {
+					print '--:--';
 				}
-				else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td align="right">';
 				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject=1;$disabledtask=1;
@@ -1278,24 +1436,32 @@ 
 					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon']) {
+						$cssonholiday.='onholidayallday ';
+					} elseif (! $isavailable[$tmpday]['morning']) {
+						$cssonholiday.='onholidaymorning ';
+					} elseif (! $isavailable[$tmpday]['afternoon']) {
+						$cssonholiday.='onholidayafternoon ';
+					}
 
 					$tmparray=dol_getdate($tmpday);
 					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
 					$totalforeachday[$tmpday]+=$dayWorkLoad;
 
 					$alreadyspent='';
-					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					if ($dayWorkLoad > 0) {
+						$alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					}
 					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
 
 					global $numstartworkingday, $numendworkingday;
 					$cssweekend='';
-					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday) {
+						// This is a day is not inside the setup of working days, so we use a week-end css.
 					{
 						$cssweekend='weekend';
 					}
+					}
 
 					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
 					if ($alreadyspent)
@@ -1315,11 +1481,14 @@ 
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
+   				if ((! $lines[$i]->public) && $disabledproject) {
+   					print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				} else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					if ($fuser->id != $user->id) {
+   						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					}
 
    					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
@@ -1346,8 +1515,7 @@ 
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -1386,7 +1554,9 @@ 
 			searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
 			//print 'Found inc='.$inc.'<br>';
 
-			if ($inc > 0) return $inc;
+			if ($inc > 0) {
+				return $inc;
+			}
 		}
 	}
 
@@ -1420,7 +1590,9 @@ 
 	$project_year_filter=0;
 
 	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	if (strcmp($statut, '') && $statut >= 0) {
+		$title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	}
 
 	$arrayidtypeofcontact=array();
 
@@ -1433,14 +1605,15 @@ 
 		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else
+	} else
 	{
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql.= " WHERE p.entity IN (".getEntity('project').")";
 	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	if ($socid) {
+		$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	}
 	if ($mytasks)
 	{
 		$sql.= " AND p.rowid = t.fk_projet";
@@ -1483,9 +1656,12 @@ 
 			$arrayidofprojects[$objp->projectid]=$objp->projectid;
 			$i++;
 		}
+	} else {
+		dol_print_error($db);
+	}
+	if (empty($arrayidofprojects)) {
+		$arrayidofprojects[0]=-1;
 	}
-	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
@@ -1519,8 +1695,12 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			if (! in_array('plannedworkload', $hiddenfields)) {
+				print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
+			}
+			if (! in_array('declaredprogress', $hiddenfields)) {
+				print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			}
 		}
 		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
 		print "</tr>\n";
@@ -1547,7 +1727,9 @@ 
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+				if (! in_array('projectlabel', $hiddenfields)) {
+					print '<br>'.dol_trunc($objp->title,24);
+				}
 				print '</td>';
 				print '<td>';
 				if ($objp->fk_soc > 0)
@@ -1561,11 +1743,15 @@ 
 				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
-					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					if ($objp->opp_amount) {
+						print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					}
 					print '</td>';
 					print '<td align="right">';
 					$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
-					if ($code) print $langs->trans("OppStatus".$code);
+					if ($code) {
+						print $langs->trans("OppStatus".$code);
+					}
 					print '</td>';
 				}
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
@@ -1610,15 +1796,18 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print '<td class="liste_total" align="right">'.$total_task.'</td>';
-			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			if (! in_array('plannedworkload', $hiddenfields)) {
+				print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
+			}
+			if (! in_array('declaredprogress', $hiddenfields)) {
+				print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			}
 		}
 		print '<td class="liste_total"></td>';
 		print '</tr>';
 
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

htdocs/core/modules/barcode/mod_barcode_product_standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs			Object langs
-	 * @param	Product		$objproduct		Object product
+	 * @param	integer		$objproduct		Object product
 	 * @return	string						Return string example
 	 */
 	function getExample($langs,$objproduct=0)

Indentation +6 added lines, -6 removed lines

@@ -260,7 +260,7 @@ 
 	 *	Return if a barcode value match syntax
 	 *
 	 *	@param	string	$codefortest	Code to check syntax
-     *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
+	 *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
 	 *	@return	int						0 if OK, <0 if KO
 	 */
 	function verif_syntax($codefortest, $typefortest)
@@ -284,11 +284,11 @@ 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
 		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
 		{
-    		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
-    	    {
-    	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
-    	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
-    	    }
+			if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
+			{
+				if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+				dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
+			}
 		}
 
 		$result=check_value($mask,$newcodefortest);

Braces +16 added lines, -17 removed lines

@@ -140,7 +140,9 @@ 
 
 		// Get Mask value
 		$mask = '';
-		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
+			$mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		}
 
 		if (empty($mask))
 		{
@@ -186,12 +188,10 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
@@ -199,19 +199,16 @@ 
 				if ($is_dispo <> 0)
 				{
 					$result=-3;
-				}
-				else
+				} else
 				{
 					$result=0;
 				}
-			}
-			else
+			} else
 			{
 				if (dol_strlen($code) == 0)
 				{
 					$result=-2;
-				}
-				else
+				} else
 				{
 					$result=-1;
 				}
@@ -235,7 +232,9 @@ 
 	{
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
 		$sql.= " WHERE barcode = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+		if ($product->id > 0) {
+			$sql.= " AND rowid <> ".$product->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -243,13 +242,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -282,11 +279,13 @@ 
 		$newcodefortest=$codefortest;
 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
+		if (in_array($typefortest,array('EAN13','ISBN'))) {
+			// We remove the CRC char not included into mask
 		{
     		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
     	    {
     	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+		}
     	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
     	    }
 		}

Spacing +56 added lines, -56 removed lines

@@ -33,13 +33,13 @@ 
  */
 class mod_barcode_product_standard extends ModeleNumRefBarCode
 {
-	var $name='Standard';				// Model Name
-	var $code_modifiable;				// Editable code
-	var $code_modifiable_invalide;		// Modified code if it is invalid
-	var $code_modifiable_null;			// Modified code if it is null
-	var $code_null;						// Optional code
-	var $version='dolibarr';    		// 'development', 'experimental', 'dolibarr'
-	var $code_auto;                     // Automatic Numbering
+	var $name = 'Standard'; // Model Name
+	var $code_modifiable; // Editable code
+	var $code_modifiable_invalide; // Modified code if it is invalid
+	var $code_modifiable_null; // Modified code if it is null
+	var $code_null; // Optional code
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $code_auto; // Automatic Numbering
 
 	var $searchcode; // Search string
 	var $numbitcounter; // Number of digits the counter
@@ -72,29 +72,29 @@ 
 
 		$langs->load("products");
 
-		$disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
+		$disabled = ((!empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="BARCODE_STANDARD_PRODUCT_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="BARCODE_STANDARD_PRODUCT_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("BarCode"),$langs->transnoentities("BarCode"));
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4c");
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4c");
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Mask parameter
 		//$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?$conf->global->BARCODE_STANDARD_PRODUCT_MASK:'').'"'.$disabled.'>',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
-		$texte.= '</tr>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? $conf->global->BARCODE_STANDARD_PRODUCT_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -107,17 +107,17 @@ 
 	 * @param	Product		$objproduct		Object product
 	 * @return	string						Return string example
 	 */
-	function getExample($langs,$objproduct=0)
+	function getExample($langs, $objproduct = 0)
 	{
-		$examplebarcode = $this->getNextValue($objproduct,'');
-		if (! $examplebarcode)
+		$examplebarcode = $this->getNextValue($objproduct, '');
+		if (!$examplebarcode)
 		{
 			$examplebarcode = $langs->trans('NotConfigured');
 		}
-		if($examplebarcode=="ErrorBadMask")
+		if ($examplebarcode == "ErrorBadMask")
 		{
 			$langs->load("errors");
-			$examplebarcode=$langs->trans($examplebarcode);
+			$examplebarcode = $langs->trans($examplebarcode);
 		}
 
 		return $examplebarcode;
@@ -130,29 +130,29 @@ 
 	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
 	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objproduct=null,$type='')
+	function getNextValue($objproduct = null, $type = '')
 	{
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// TODO
 
 		// Get Mask value
 		$mask = '';
-		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
 
 		if (empty($mask))
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return '';
 		}
 
-		$field='barcode';$where='';
+		$field = 'barcode'; $where = '';
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$numFinal=get_next_value($db,$mask,'product',$field,$where,'',$now);
+		$numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now);
 
 		return  $numFinal;
 	}
@@ -178,18 +178,18 @@ 
 
 		//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$result=0;
+		$result = 0;
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
@@ -198,22 +198,22 @@ 
 				$is_dispo = $this->verif_dispo($db, $code, $product);
 				if ($is_dispo <> 0)
 				{
-					$result=-3;
+					$result = -3;
 				}
 				else
 				{
-					$result=0;
+					$result = 0;
 				}
 			}
 			else
 			{
 				if (dol_strlen($code) == 0)
 				{
-					$result=-2;
+					$result = -2;
 				}
 				else
 				{
-					$result=-1;
+					$result = -1;
 				}
 			}
 		}
@@ -234,10 +234,10 @@ 
 	function verif_dispo($db, $code, $product)
 	{
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE barcode = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+		$sql .= " WHERE barcode = '".$code."'";
+		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)
@@ -270,28 +270,28 @@ 
 		$result = 0;
 
 		// Get Mask value
-		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?'':$conf->global->BARCODE_STANDARD_PRODUCT_MASK;
-		if (! $mask)
+		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? '' : $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return -1;
 		}
 
 		dol_syslog(get_class($this).'::verif_syntax codefortest='.$codefortest." typefortest=".$typefortest);
 
-		$newcodefortest=$codefortest;
+		$newcodefortest = $codefortest;
 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
+		if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
 		{
-    		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
+    		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
     	    {
-    	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+    	        if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
     	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
     	    }
 		}
 
-		$result=check_value($mask,$newcodefortest);
+		$result = check_value($mask, $newcodefortest);
 		if (is_string($result))
 		{
 			$this->error = $result;

htdocs/core/modules/cheque/mod_chequereceipt_mint.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
 	function getNextValue($objsoc,$object)

Indentation +12 added lines, -12 removed lines

@@ -35,16 +35,16 @@ 
 	var $name='Mint';
 
 
-    /**
-     *  Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
 
 
 	/**
@@ -127,8 +127,8 @@ 
 		$date=$object->date_bordereau;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Braces +13 added lines, -6 removed lines

@@ -114,10 +114,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
+		} else
 		{
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -127,8 +129,13 @@ 
 		$date=$object->date_bordereau;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    		$num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    		$num = sprintf("%04s",$max+1);
+    	}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Spacing +30 added lines, -30 removed lines

@@ -22,17 +22,17 @@ 
  * \brief      File containing class for numbering module Mint
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 
 /**
  *	Class to manage cheque receipts numbering rules Mint
  */
 class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='CHK';
-	var $error='';
-	var $name='Mint';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'CHK';
+	var $error = '';
+	var $name = 'Mint';
 
 
     /**
@@ -43,7 +43,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -66,26 +66,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$payyymm=''; $max='';
+		$payyymm = ''; $max = '';
 
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -99,23 +99,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+		$sql .= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -124,11 +124,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->date_bordereau;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->date_bordereau;
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -142,9 +142,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function chequereceipt_get_num($objsoc,$objforref)
+	function chequereceipt_get_num($objsoc, $objforref)
 	{
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 
 }

htdocs/core/modules/cheque/mod_chequereceipt_thyme.php

Doc Comments +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
     function getNextValue($objsoc,$object)

Indentation +29 added lines, -29 removed lines

@@ -35,14 +35,14 @@ 
 	var $name = 'Thyme';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 
@@ -73,20 +73,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+	 	global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -94,7 +94,7 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -103,8 +103,8 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
-    {
+	function getNextValue($objsoc,$object)
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -130,11 +130,11 @@ 
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    function chequereceipt_get_num($objsoc,$objforref)
-    {
-        return $this->getNextValue($objsoc,$objforref);
-    }
+	 */
+	function chequereceipt_get_num($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Thyme
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 
 
 /**
@@ -30,7 +30,7 @@ 
  */
 class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $name = 'Thyme';
 
@@ -42,35 +42,35 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -82,14 +82,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -103,22 +103,22 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask=$conf->global->CHEQUERECEIPTS_THYME_MASK;
+		$mask = $conf->global->CHEQUERECEIPTS_THYME_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'bordereau_cheque','ref','',$objsoc,$object->date_bordereau);
+		$numFinal = get_next_value($db, $mask, 'bordereau_cheque', 'ref', '', $objsoc, $object->date_bordereau);
 
 		return  $numFinal;
 	}
@@ -131,9 +131,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
      */
-    function chequereceipt_get_num($objsoc,$objforref)
+    function chequereceipt_get_num($objsoc, $objforref)
     {
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 
 }

htdocs/core/modules/expedition/doc/pdf_merou.modules.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$db      Database handler
+	 *  @param		integer		$db      Database handler
 	 */
 	function __construct($db=0)
 	{

Indentation +35 added lines, -35 removed lines

@@ -76,11 +76,11 @@ 
 	 *
 	 *	@param		Object		$object			Object expedition to generate (or id if old method)
 	 *	@param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
@@ -113,7 +113,7 @@ 
 
 			//Creation du destinataire
 			$idcontact = $object->$origin->getIdContact('external','SHIPPING');
-            $this->destinataire = new Contact($this->db);
+			$this->destinataire = new Contact($this->db);
 			if (! empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
 
 			//Creation du livreur
@@ -161,22 +161,22 @@ 
 				$pdf=pdf_getInstance($this->format,'mm','l');
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 0;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-			    if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+				$pdf->SetAutoPageBreak(1,0);
+
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb=0;
@@ -356,8 +356,8 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-                if (! empty($conf->global->MAIN_UMASK))
-                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
                 
@@ -419,7 +419,7 @@ 
 
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	PDF			$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
@@ -438,11 +438,11 @@ 
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("NameAndSignature"), 0, 'C');
 
 		// Show page nb only on iso languages (so default Helvetica font)
-        //if (pdf_getPDFFont($outputlangs) == 'Helvetica')
-        //{
-    	//    $pdf->SetXY(-10,-10);
-        //    $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-        //}
+		//if (pdf_getPDFFont($outputlangs) == 'Helvetica')
+		//{
+		//    $pdf->SetXY(-10,-10);
+		//    $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		//}
 	}
 
 
@@ -466,11 +466,11 @@ 
 			//Affiche le filigrane brouillon - Print Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->SENDING_DRAFT_WATERMARK)) )
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SENDING_DRAFT_WATERMARK);
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SENDING_DRAFT_WATERMARK);
 		}
 
-        $posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-100;
+		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-100;
 
 		$Xoff = 90;
 		$Yoff = 0;
@@ -487,8 +487,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo,10, 5, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo,10, 5, 0, $height);	// width=0 (auto)
 			}
 			else
 			{

Spacing +181 added lines, -181 removed lines

@@ -37,7 +37,7 @@ 
  */
 class pdf_merou extends ModelePdfExpedition
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 
 
 	/**
@@ -45,29 +45,29 @@ 
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function __construct($db=0)
+	function __construct($db = 0)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$this->db = $db;
 		$this->name = "merou";
 		$this->description = $langs->trans("DocumentModelMerou");
 
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = round($formatarray['height']/2);
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->page_hauteur = round($formatarray['height'] / 2);
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1;
 
 		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -82,15 +82,15 @@ 
      *  @param		int			$hideref			Do not show ref
      *  @return     int         	    			1=OK, 0=KO
 	 */
-	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file(&$object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $user,$conf,$langs,$mysoc,$hookmanager;
+		global $user, $conf, $langs, $mysoc, $hookmanager;
 
 		$object->fetch_thirdparty();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -112,33 +112,33 @@ 
 			$this->expediteur = $mysoc;
 
 			//Creation du destinataire
-			$idcontact = $object->$origin->getIdContact('external','SHIPPING');
+			$idcontact = $object->$origin->getIdContact('external', 'SHIPPING');
             $this->destinataire = new Contact($this->db);
-			if (! empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
+			if (!empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
 
 			//Creation du livreur
-			$idcontact = $object->$origin->getIdContact('internal','LIVREUR');
+			$idcontact = $object->$origin->getIdContact('internal', 'LIVREUR');
 			$this->livreur = new User($this->db);
-			if (! empty($idcontact[0])) $this->livreur->fetch($idcontact[0]);
+			if (!empty($idcontact[0])) $this->livreur->fetch($idcontact[0]);
 
 			// Definition de $dir et $file
 			if ($object->specimen)
 			{
 				$dir = $conf->expedition->dir_output."/sending";
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$expref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->expedition->dir_output . "/sending/" . $expref;
-				$file = $dir . "/" . $expref . ".pdf";
+				$dir = $conf->expedition->dir_output."/sending/".$expref;
+				$file = $dir."/".$expref.".pdf";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -146,24 +146,24 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				$nblignes = count($object->lines);
 
-				$pdf=pdf_getInstance($this->format,'mm','l');
+				$pdf = pdf_getInstance($this->format, 'mm', 'l');
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
-				$heightforinfotot = 0;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
+				$heightforinfotot = 0; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+                $pdf->SetAutoPageBreak(1, 0);
 
 			    if (class_exists('TCPDF'))
                 {
@@ -172,105 +172,105 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 3);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 3);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 52;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
 				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter;
 				$tab_height_newpage = $this->page_hauteur - $tab_top_newpage - $heightforfooter;
 
 				// Affiche notes
-				if (! empty($object->note_public))
+				if (!empty($object->note_public))
 				{
-					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
+					$height_note = $nexY - $tab_top;
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 
-				$pdf->SetFillColor(240,240,240);
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFillColor(240, 240, 240);
+				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetXY(10, $tab_top + 5);
 
 				$iniY = $tab_top + 7;
 				$curY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
-				$num=count($object->lines);
+				$num = count($object->lines);
 				// Loop on each lines
 				for ($i = 0; $i < $num; $i++)
 				{
 					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 3);
-					$pdf->SetTextColor(0,0,0);
+					$pdf->SetFont('', '', $default_font_size - 3);
+					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
+					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
 					// Description de la ligne produit
-					$libelleproduitservice = pdf_writelinedesc($pdf,$object,$i,$outputlangs,90,3,50,$curY,0,1);
+					$libelleproduitservice = pdf_writelinedesc($pdf, $object, $i, $outputlangs, 90, 3, 50, $curY, 0, 1);
 
 					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description is moved completely on next page
 					if ($pageposafter > $pageposbefore) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('','', $default_font_size - 3);
+					$pdf->SetFont('', '', $default_font_size - 3);
 
 					// Check boxes
-					$pdf->SetDrawColor(120,120,120);
-					$pdf->Rect(10+3, $curY, 3, 3);
-					$pdf->Rect(20+3, $curY, 3, 3);
+					$pdf->SetDrawColor(120, 120, 120);
+					$pdf->Rect(10 + 3, $curY, 3, 3);
+					$pdf->Rect(20 + 3, $curY, 3, 3);
 					
 					//Insertion de la reference du produit
 					$pdf->SetXY(30, $curY);
-					$pdf->SetFont('','B', $default_font_size - 3);
+					$pdf->SetFont('', 'B', $default_font_size - 3);
 					$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'L', 0);
 
 					$pdf->SetXY(140, $curY);
@@ -280,16 +280,16 @@ 
 					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY+=2;    // Passe espace entre les lignes
+					$nexY += 2; // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -303,12 +303,12 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
@@ -318,7 +318,7 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
 						$pagenb++;
@@ -329,34 +329,34 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-                if (! empty($conf->global->MAIN_UMASK))
+                if (!empty($conf->global->MAIN_UMASK))
                     @chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
@@ -365,13 +365,13 @@ 
 			}
 			else
 			{
-				$this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $outputlangs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$outputlangs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR");
+			$this->error = $outputlangs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -388,7 +388,7 @@ 
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -398,21 +398,21 @@ 
 
 		if (empty($hidetop))
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY(10,$tab_top);
-			$pdf->MultiCell(10,5,"LS",0,'C',1);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY(10, $tab_top);
+			$pdf->MultiCell(10, 5, "LS", 0, 'C', 1);
 			$pdf->line(20, $tab_top, 20, $tab_top + $tab_height);
-			$pdf->SetXY(20,$tab_top);
-			$pdf->MultiCell(10,5,"LR",0,'C',1);
+			$pdf->SetXY(20, $tab_top);
+			$pdf->MultiCell(10, 5, "LR", 0, 'C', 1);
 			$pdf->line(30, $tab_top, 30, $tab_top + $tab_height);
-			$pdf->SetXY(30,$tab_top);
-			$pdf->MultiCell(20,5,$outputlangs->transnoentities("Ref"),0,'C',1);
-			$pdf->SetXY(50,$tab_top);
-			$pdf->MultiCell(90,5,$outputlangs->transnoentities("Description"),0,'L',1);
-			$pdf->SetXY(140,$tab_top);
-			$pdf->MultiCell(30,5,$outputlangs->transnoentities("QtyOrdered"),0,'C',1);
-			$pdf->SetXY(170,$tab_top);
-			$pdf->MultiCell(30,5,$outputlangs->transnoentities("QtyToShip"),0,'C',1);
+			$pdf->SetXY(30, $tab_top);
+			$pdf->MultiCell(20, 5, $outputlangs->transnoentities("Ref"), 0, 'C', 1);
+			$pdf->SetXY(50, $tab_top);
+			$pdf->MultiCell(90, 5, $outputlangs->transnoentities("Description"), 0, 'L', 1);
+			$pdf->SetXY(140, $tab_top);
+			$pdf->MultiCell(30, 5, $outputlangs->transnoentities("QtyOrdered"), 0, 'C', 1);
+			$pdf->SetXY(170, $tab_top);
+			$pdf->MultiCell(30, 5, $outputlangs->transnoentities("QtyToShip"), 0, 'C', 1);
 		}
 		$pdf->Rect(10, $tab_top, 190, $tab_height);
 	}
@@ -426,15 +426,15 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	void
 	 */
-	function _pagefoot(&$pdf, $object, $outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetFont('', '', $default_font_size - 2);
 		$pdf->SetY(-23);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("GoodStatusDeclaration"), 0, 'L');
 		$pdf->SetY(-13);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ToAndDate"), 0, 'C');
-		$pdf->SetXY(120,-23);
+		$pdf->SetXY(120, -23);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("NameAndSignature"), 0, 'C');
 
 		// Show page nb only on iso languages (so default Helvetica font)
@@ -457,20 +457,20 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $conf, $langs,$hookmanager;
+		global $conf, $langs, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 			//Affiche le filigrane brouillon - Print Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->SENDING_DRAFT_WATERMARK)) )
+		if ($object->statut == 0 && (!empty($conf->global->SENDING_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SENDING_DRAFT_WATERMARK);
+            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SENDING_DRAFT_WATERMARK);
 		}
 
-        $posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-100;
+        $posy = $this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - 100;
 
 		$Xoff = 90;
 		$Yoff = 0;
@@ -481,47 +481,47 @@ 
 		$line = 2;
 
 		//*********************LOGO****************************
-		$pdf->SetXY(11,7);
-		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		$pdf->SetXY(11, 7);
+		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo,10, 5, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else
 		{
-			$text=$this->emetteur->name;
+			$text = $this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
 		//*********************Entete****************************
 		//Nom du Document
-		$pdf->SetXY($Xoff,7);
-		$pdf->SetFont('','B', $default_font_size + 2);
-		$pdf->SetTextColor(0,0,0);
-		$pdf->MultiCell(0, 3, $outputlangs->transnoentities("SendingSheet"), '', 'L');	// Bordereau expedition
+		$pdf->SetXY($Xoff, 7);
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->MultiCell(0, 3, $outputlangs->transnoentities("SendingSheet"), '', 'L'); // Bordereau expedition
 		//Num Expedition
-		$Yoff = $Yoff+7;
+		$Yoff = $Yoff + 7;
 		$Xoff = 142;
 		//$pdf->Rect($Xoff, $Yoff, 85, 8);
-		$pdf->SetXY($Xoff,$Yoff);
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetXY($Xoff, $Yoff);
+		$pdf->SetFont('', '', $default_font_size - 2);
+		$pdf->SetTextColor(0, 0, 0);
 		$pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefSending").': '.$outputlangs->convToOutputCharset($object->ref), '', 'R');
 		//$this->Code39($Xoff+43, $Yoff+1, $object->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
 
-		$origin 	= $object->origin;
-		$origin_id 	= $object->origin_id;
+		$origin = $object->origin;
+		$origin_id = $object->origin_id;
 
 		// Add list of linked elements
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size - 1, $hookmanager);
@@ -529,72 +529,72 @@ 
 		//$this->Code39($Xoff+43, $Yoff+1, $object->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
 		//Definition Emplacement du bloc Societe
 		$Xoff = 110;
-		$blSocX=90;
-		$blSocY=24;
-		$blSocW=50;
-		$blSocX2=$blSocW+$blSocX;
+		$blSocX = 90;
+		$blSocY = 24;
+		$blSocW = 50;
+		$blSocX2 = $blSocW + $blSocX;
 
 		// Sender name
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','B', $default_font_size - 3);
-		$pdf->SetXY($blSocX,$blSocY+1);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
+		$pdf->SetXY($blSocX, $blSocY + 1);
 		$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 
 		// Sender properties
 		$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetXY($blSocX,$blSocY+4);
+		$pdf->SetFont('', '', $default_font_size - 3);
+		$pdf->SetXY($blSocX, $blSocY + 4);
 		$pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L');
 
 
 		if ($object->thirdparty->code_client)
 		{
-			$Yoff+=3;
-			$posy=$Yoff;
-			$pdf->SetXY(100,$posy);
-			$pdf->SetTextColor(0,0,0);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$Yoff += 3;
+			$posy = $Yoff;
+			$pdf->SetXY(100, $posy);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Date Expedition
-		$Yoff = $Yoff+7;
-		$pdf->SetXY($blSocX-80,$blSocY+17);
+		$Yoff = $Yoff + 7;
+		$pdf->SetXY($blSocX - 80, $blSocY + 17);
 
-		$pdf->SetFont('','B', $default_font_size - 3);
-		$pdf->SetTextColor(0,0,0);
-		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '', 'L');
+		$pdf->SetFont('', 'B', $default_font_size - 3);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L');
 
-		$pdf->SetXY($blSocX-80,$blSocY+20);
-		$pdf->SetFont('','B', $default_font_size - 3);
-		$pdf->SetTextColor(0,0,0);
-		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : " . $object->tracking_number, '', 'L');
+		$pdf->SetXY($blSocX - 80, $blSocY + 20);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L');
 
 		// Deliverer
-		$pdf->SetXY($blSocX-80,$blSocY+23);
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetXY($blSocX - 80, $blSocY + 23);
+		$pdf->SetFont('', '', $default_font_size - 3);
+		$pdf->SetTextColor(0, 0, 0);
 
-		if (! empty($object->tracking_number))
+		if (!empty($object->tracking_number))
 		{
 			$object->GetUrlTrackingStatus($object->tracking_number);
-			if (! empty($object->tracking_url))
+			if (!empty($object->tracking_url))
 			{
 				if ($object->shipping_method_id > 0)
 				{
 					// Get code using getLabelFromKey
-					$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
+					$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 
-					$label='';
-					$label.=$outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
+					$label = '';
+					$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 					//var_dump($object->tracking_url != $object->tracking_number);exit;
 					if ($object->tracking_url != $object->tracking_number)
 					{
-						$label.=" : ";
-						$label.=$object->tracking_url;
+						$label .= " : ";
+						$label .= $object->tracking_url;
 					}
-					$pdf->SetFont('','B', $default_font_size - 3);
+					$pdf->SetFont('', 'B', $default_font_size - 3);
 					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
 				}
 			}
@@ -607,20 +607,20 @@ 
 
 		// Shipping company (My Company)
 		$Yoff = $blSocY;
-		$blExpX=$Xoff-20;
-		$blW=52;
+		$blExpX = $Xoff - 20;
+		$blW = 52;
 		$Ydef = $Yoff;
 		$pdf->Rect($blExpX, $Yoff, $blW, 26);
 
 		$object->fetch_thirdparty();
 
 		// If SHIPPING contact defined on order, we use it
-		$usecontact=false;
-		$arrayidcontact=$object->$origin->getIdContact('external','SHIPPING');
+		$usecontact = false;
+		$arrayidcontact = $object->$origin->getIdContact('external', 'SHIPPING');
 		if (count($arrayidcontact) > 0)
 		{
-			$usecontact=true;
-			$result=$object->fetch_contact($arrayidcontact[0]);
+			$usecontact = true;
+			$result = $object->fetch_contact($arrayidcontact[0]);
 		}
 
 		// Recipient name
@@ -631,30 +631,30 @@ 
 			$thirdparty = $object->thirdparty;
 		}
 
-		$carac_client_name=pdfBuildThirdpartyName($thirdparty, $outputlangs);
+		$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-		$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails',$object);
+		$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ((!empty($object->contact)) ? $object->contact : null), $usecontact, 'targetwithdetails', $object);
 
-		$blDestX=$blExpX+55;
-		$blW=54;
-		$Yoff = $Ydef +1;
+		$blDestX = $blExpX + 55;
+		$blW = 54;
+		$Yoff = $Ydef + 1;
 
 		// Show Recipient frame
-		$pdf->SetFont('','B', $default_font_size - 3);
-		$pdf->SetXY($blDestX,$Yoff-4);
-		$pdf->MultiCell($blW,3, $outputlangs->transnoentities("Recipient"), 0, 'L');
-		$pdf->Rect($blDestX, $Yoff-1, $blW, 26);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
+		$pdf->SetXY($blDestX, $Yoff - 4);
+		$pdf->MultiCell($blW, 3, $outputlangs->transnoentities("Recipient"), 0, 'L');
+		$pdf->Rect($blDestX, $Yoff - 1, $blW, 26);
 
 		// Show recipient name
-		$pdf->SetFont('','B', $default_font_size - 3);
-		$pdf->SetXY($blDestX,$Yoff);
-		$pdf->MultiCell($blW,3, $carac_client_name, 0, 'L');
+		$pdf->SetFont('', 'B', $default_font_size - 3);
+		$pdf->SetXY($blDestX, $Yoff);
+		$pdf->MultiCell($blW, 3, $carac_client_name, 0, 'L');
 
 		$posy = $pdf->getY();
 
 		// Show recipient information
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetXY($blDestX,$posy);
+		$pdf->SetFont('', '', $default_font_size - 3);
+		$pdf->SetXY($blDestX, $posy);
 		$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 	}
 }

Braces +38 added lines, -30 removed lines

@@ -67,7 +67,10 @@ 
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -88,9 +91,13 @@ 
 
 		$object->fetch_thirdparty();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output='ISO-8859-1';
+		}
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -114,20 +121,23 @@ 
 			//Creation du destinataire
 			$idcontact = $object->$origin->getIdContact('external','SHIPPING');
             $this->destinataire = new Contact($this->db);
-			if (! empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
+			if (! empty($idcontact[0])) {
+				$this->destinataire->fetch($idcontact[0]);
+			}
 
 			//Creation du livreur
 			$idcontact = $object->$origin->getIdContact('internal','LIVREUR');
 			$this->livreur = new User($this->db);
-			if (! empty($idcontact[0])) $this->livreur->fetch($idcontact[0]);
+			if (! empty($idcontact[0])) {
+				$this->livreur->fetch($idcontact[0]);
+			}
 
 			// Definition de $dir et $file
 			if ($object->specimen)
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output . "/sending/" . $expref;
@@ -182,14 +192,18 @@ 
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
 
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -220,8 +234,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -298,8 +311,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -313,8 +325,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -330,8 +341,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -339,7 +349,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -356,20 +368,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-                if (! empty($conf->global->MAIN_UMASK))
-                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+                if (! empty($conf->global->MAIN_UMASK)) {
+                                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+                }
 
 				$this->result = array('fullpath'=>$file);
                 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$outputlangs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR");
 			return 0;
@@ -489,16 +500,14 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo,10, 5, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
+		} else
 		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -598,8 +607,7 @@ 
 					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
 				}
 			}
-		}
-		else
+		} else
 		{
 			$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '', 'L');
 		}

htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	/**
 	 *	Constructor
 	 *
-	 *	@param	DoliDB	$db		Database handler
+	 *	@param	integer	$db		Database handler
 	 */
 	function __construct($db=0)
 	{

Indentation +109 added lines, -109 removed lines

@@ -87,17 +87,17 @@ 
 
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-		    $this->posxweightvol-=20;
-		    $this->posxpicture-=20;
-		    $this->posxqtyordered-=20;
-		    $this->posxqtytoship-=20;
+			$this->posxweightvol-=20;
+			$this->posxpicture-=20;
+			$this->posxqtyordered-=20;
+			$this->posxqtytoship-=20;
 		}
 
 		if (! empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
 		{
-		    $this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
-		    $this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
-		    $this->posxqtyordered = $this->posxqtytoship;
+			$this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
+			$this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
+			$this->posxqtyordered = $this->posxqtytoship;
 		}
 	}
 
@@ -106,11 +106,11 @@ 
 	 *
 	 *	@param		Object		$object			Object expedition to generate (or id if old method)
 	 *	@param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
@@ -129,20 +129,20 @@ 
 		$outputlangs->load("products");
 		$outputlangs->load("propal");
 		$outputlangs->load("deliveries");
-        $outputlangs->load("sendings");
+		$outputlangs->load("sendings");
 		$outputlangs->load("productbatch");
 
 		$nblignes = count($object->lines);
 
-        // Loop on each lines to detect if there is at least one image to show
-        $realpatharray=array();
-        if (! empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-        {
-            $objphoto = new Product($this->db);
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray=array();
+		if (! empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
+		{
+			$objphoto = new Product($this->db);
 
-            for ($i = 0 ; $i < $nblignes ; $i++)
-            {
-                if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0 ; $i < $nblignes ; $i++)
+			{
+				if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -152,33 +152,33 @@ 
 
 				$realpath='';
 
-                foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
-                        {
-                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-                            {
-                                if ($obj['photo_vignette'])
-                                {
-                                    $filename= $obj['photo_vignette'];
-                                }
-                                else
-                                {
-                                    $filename=$obj['photo'];
-                                }
-                            }
-                            else
-                            {
-                                $filename=$obj['photo'];
-                            }
-
-                            $realpath = $dir.$filename;
-                            break;
-                }
-
-                if ($realpath) $realpatharray[$i]=$realpath;
-            }
-        }
-
-        if (count($realpatharray) == 0) $this->posxpicture=$this->posxweightvol;
+				foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+						{
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+							{
+								if ($obj['photo_vignette'])
+								{
+									$filename= $obj['photo_vignette'];
+								}
+								else
+								{
+									$filename=$obj['photo'];
+								}
+							}
+							else
+							{
+								$filename=$obj['photo'];
+							}
+
+							$realpath = $dir.$filename;
+							break;
+				}
+
+				if ($realpath) $realpatharray[$i]=$realpath;
+			}
+		}
+
+		if (count($realpatharray) == 0) $this->posxpicture=$this->posxweightvol;
 
 		if ($conf->expedition->dir_output)
 		{
@@ -223,22 +223,22 @@ 
 				$pdf=pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 8;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+				$pdf->SetAutoPageBreak(1,0);
+
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb=0;
@@ -458,12 +458,12 @@ 
 					$weighttxt='';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight)
 					{
-					    $weighttxt=round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->weight_units,"weight");
+						$weighttxt=round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->weight_units,"weight");
 					}
 					$voltxt='';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume)
 					{
-					    $voltxt=round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->volume_units?$object->lines[$i]->volume_units:0,"volume");
+						$voltxt=round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->volume_units?$object->lines[$i]->volume_units:0,"volume");
 					}
 
 					$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt, 0, 0, false, true, 'C');
@@ -598,9 +598,9 @@ 
 	{
 		global $conf,$mysoc;
 
-        $sign=1;
+		$sign=1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
@@ -630,8 +630,8 @@ 
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $object->trueVolume=price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
-		    $object->volume_units=$object->size_units * 3;
+			$object->trueVolume=price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+			$object->volume_units=$object->size_units * 3;
 		}
 
 		if ($totalWeight!='') $totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
@@ -639,43 +639,43 @@ 
 		if ($object->trueWeight) $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
 		if ($object->trueVolume) $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 
-    	$pdf->SetFillColor(255,255,255);
-    	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    	$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+		$pdf->SetFillColor(255,255,255);
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
 
-        if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-        {
-            $pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
-        	$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
-        }
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+		{
+			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
+		}
 
-    	$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
-    	$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
+		$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
 
 		if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
 
-	    	$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
-	    	$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
 
-	    	$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
-	    	$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
+			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
 
 		}
 
 		// Total Weight
 		if ($totalWeighttoshow)
 		{
-    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
 
-    		$index++;
+			$index++;
 		}
 		if ($totalVolumetoshow)
 		{
-    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
 
-		    $index++;
+			$index++;
 		}
 		if (! $totalWeighttoshow && ! $totalVolumetoshow) $index++;
 
@@ -731,15 +731,15 @@ 
 			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"),'','C');
 		}
 
-        if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-        {
-            $pdf->line($this->posxqtyordered-1, $tab_top, $this->posxqtyordered-1, $tab_top + $tab_height);
-    		if (empty($hidetop))
-    		{
-    			$pdf->SetXY($this->posxqtyordered-1, $tab_top+1);
-    			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"),'','C');
-    		}
-        }
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+		{
+			$pdf->line($this->posxqtyordered-1, $tab_top, $this->posxqtyordered-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxqtyordered-1, $tab_top+1);
+				$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"),'','C');
+			}
+		}
 
 		$pdf->line($this->posxqtytoship-1, $tab_top, $this->posxqtytoship-1, $tab_top + $tab_height);
 		if (empty($hidetop))
@@ -790,7 +790,7 @@ 
 		// Show Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->SHIPPING_DRAFT_WATERMARK)) )
 		{
-            		pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SHIPPING_DRAFT_WATERMARK);
+					pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
 		//Prepare la suite
@@ -810,8 +810,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -873,10 +873,10 @@ 
 		// Date planned delivery
 		if (! empty($object->date_delivery))
 		{
-    			$posy+=4;
-    			$pdf->SetXY($posx,$posy);
-    			$pdf->SetTextColor(0,0,60);
-    			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery,"day",false,$outputlangs,true), '', 'R');
+				$posy+=4;
+				$pdf->SetXY($posx,$posy);
+				$pdf->SetTextColor(0,0,60);
+				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery,"day",false,$outputlangs,true), '', 'R');
 		}
 
 		if (! empty($object->thirdparty->code_client))
@@ -895,7 +895,7 @@ 
 		$origin 	= $object->origin;
 		$origin_id 	= $object->origin_id;
 
-	    // TODO move to external function
+		// TODO move to external function
 		if (! empty($conf->$origin->enabled))     // commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
@@ -905,7 +905,7 @@ 
 			$result=$linkedobject->fetch($origin_id);
 			if ($result >= 0)
 			{
-			    //$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
+				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('','', $default_font_size - 2);
 				$text=$linkedobject->ref;
@@ -1018,7 +1018,7 @@ 
 
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	PDF			$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output

Spacing +314 added lines, -314 removed lines

@@ -36,7 +36,7 @@ 
  */
 class pdf_rouget extends ModelePdfExpedition
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 
 
 	/**
@@ -44,57 +44,57 @@ 
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function __construct($db=0)
+	function __construct($db = 0)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$this->db = $db;
 		$this->name = "rouget";
 		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1;
 
 		// Get source company
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
 		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
-		$this->posxweightvol=$this->page_largeur - $this->marge_droite - 78;
-		$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 56;
-		$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 28;
-		$this->posxpuht=$this->page_largeur - $this->marge_droite;
+		$this->posxdesc = $this->marge_gauche + 1;
+		$this->posxweightvol = $this->page_largeur - $this->marge_droite - 78;
+		$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 56;
+		$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 28;
+		$this->posxpuht = $this->page_largeur - $this->marge_droite;
 
 		if (!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
 
-			$this->posxweightvol=$this->page_largeur - $this->marge_droite - 118;
-			$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 96;
-			$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 68;
-			$this->posxpuht=$this->page_largeur - $this->marge_droite - 40;
-			$this->posxtotalht=$this->page_largeur - $this->marge_droite - 20;
+			$this->posxweightvol = $this->page_largeur - $this->marge_droite - 118;
+			$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 96;
+			$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 68;
+			$this->posxpuht = $this->page_largeur - $this->marge_droite - 40;
+			$this->posxtotalht = $this->page_largeur - $this->marge_droite - 20;
 		}
 
-		$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-		    $this->posxweightvol-=20;
-		    $this->posxpicture-=20;
-		    $this->posxqtyordered-=20;
-		    $this->posxqtytoship-=20;
+		    $this->posxweightvol -= 20;
+		    $this->posxpicture -= 20;
+		    $this->posxqtyordered -= 20;
+		    $this->posxqtytoship -= 20;
 		}
 
-		if (! empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+		if (!empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
 		{
 		    $this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
 		    $this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
@@ -113,15 +113,15 @@ 
      *  @param		int			$hideref			Do not show ref
      *  @return     int         	    			1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $user,$conf,$langs,$hookmanager;
+		global $user, $conf, $langs, $hookmanager;
 
 		$object->fetch_thirdparty();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -136,50 +136,50 @@ 
 		$nblignes = count($object->lines);
 
         // Loop on each lines to detect if there is at least one image to show
-        $realpatharray=array();
-        if (! empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
+        $realpatharray = array();
+        if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
         {
             $objphoto = new Product($this->db);
 
-            for ($i = 0 ; $i < $nblignes ; $i++)
+            for ($i = 0; $i < $nblignes; $i++)
             {
                 if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
+				$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 				$dir = $conf->product->dir_output.'/'.$pdir;
 
-				$realpath='';
+				$realpath = '';
 
-                foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+                foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
                         {
                             if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
                             {
                                 if ($obj['photo_vignette'])
                                 {
-                                    $filename= $obj['photo_vignette'];
+                                    $filename = $obj['photo_vignette'];
                                 }
                                 else
                                 {
-                                    $filename=$obj['photo'];
+                                    $filename = $obj['photo'];
                                 }
                             }
                             else
                             {
-                                $filename=$obj['photo'];
+                                $filename = $obj['photo'];
                             }
 
                             $realpath = $dir.$filename;
                             break;
                 }
 
-                if ($realpath) $realpatharray[$i]=$realpath;
+                if ($realpath) $realpatharray[$i] = $realpath;
             }
         }
 
-        if (count($realpatharray) == 0) $this->posxpicture=$this->posxweightvol;
+        if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
 
 		if ($conf->expedition->dir_output)
 		{
@@ -187,20 +187,20 @@ 
 			if ($object->specimen)
 			{
 				$dir = $conf->expedition->dir_output."/sending";
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$expref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->expedition->dir_output."/sending/" . $expref;
-				$file = $dir . "/" . $expref . ".pdf";
+				$dir = $conf->expedition->dir_output."/sending/".$expref;
+				$file = $dir."/".$expref.".pdf";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -208,25 +208,25 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Set nblignes with the new facture lines content after hook
 				$nblignes = count($object->lines);
 
-				$pdf=pdf_getInstance($this->format);
+				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
-				$heightforinfotot = 8;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
+				$heightforinfotot = 8; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+                $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -235,38 +235,38 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 90;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
@@ -279,52 +279,52 @@ 
 					{
 						$tab_top = 88;
 
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
+						$height_incoterms = $nexY - $tab_top;
 
 						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
 
-						$tab_top = $nexY+6;
+						$tab_top = $nexY + 6;
 						$height_incoterms += 4;
 					}
 				}
 
-				if (! empty($object->note_public) || ! empty($object->tracking_number))
+				if (!empty($object->note_public) || !empty($object->tracking_number))
 				{
 					$tab_top = 88 + $height_incoterms;
 					$tab_top_alt = $tab_top;
 
-					$pdf->SetFont('','B', $default_font_size - 2);
-					$pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top-1, $outputlangs->transnoentities("TrackingNumber")." : " . $object->tracking_number, 0, 1, false, true, 'L');
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
 
 					$tab_top_alt = $pdf->GetY();
 					//$tab_top_alt += 1;
 
 					// Tracking number
-					if (! empty($object->tracking_number))
+					if (!empty($object->tracking_number))
 					{
 						$object->GetUrlTrackingStatus($object->tracking_number);
-						if (! empty($object->tracking_url))
+						if (!empty($object->tracking_url))
 						{
 							if ($object->shipping_method_id > 0)
 							{
 								// Get code using getLabelFromKey
-								$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
-								$label='';
-								if ($object->tracking_url != $object->tracking_number) $label.=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
-								$label.=$outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
+								$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+								$label = '';
+								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
 								if ($object->tracking_url != $object->tracking_number)
 								{
-									$label.=" : ";
-									$label.=$object->tracking_url;
+									$label .= " : ";
+									$label .= $object->tracking_url;
 								}
-								$pdf->SetFont('','B', $default_font_size - 2);
-								$pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top_alt, $label, 0, 1, false, true, 'L');
+								$pdf->SetFont('', 'B', $default_font_size - 2);
+								$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top_alt, $label, 0, 1, false, true, 'L');
 
 								$tab_top_alt = $pdf->GetY();
 							}
@@ -332,25 +332,25 @@ 
 					}
 
 					// Notes
-					if (! empty($object->note_public))
+					if (!empty($object->note_public))
 					{
-						$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top_alt, dol_htmlentitiesbr($object->note_public), 0, 1);
+						$pdf->SetFont('', '', $default_font_size - 1); // Dans boucle pour gerer multi-page
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, dol_htmlentitiesbr($object->note_public), 0, 1);
 					}
 
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
+					$height_note = $nexY - $tab_top;
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -361,87 +361,87 @@ 
 				for ($i = 0; $i < $nblignes; $i++)
 				{
 					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
-					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-					$showpricebeforepagebreak=1;
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
 					{
-						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pdf->AddPage('', '', true);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->setPage($pageposbefore+1);
+						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
-						$showpricebeforepagebreak=0;
+						$showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
 					{
-						$curX = $this->posxpicture-1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxweightvol-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+						$curX = $this->posxpicture - 1;
+						$pdf->Image($realpatharray[$i], $curX + (($this->posxweightvol - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
-						$posYAfterImage=$curY+$imglinesize['height'];
+						$posYAfterImage = $curY + $imglinesize['height'];
 					}
 
 					// Description of product line
-					$curX = $this->posxdesc-1;
+					$curX = $this->posxdesc - 1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
-					$pageposafter=$pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
+						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
+						$pageposafter = $pdf->getPage();
+						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
 						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
 							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								$pdf->AddPage('', '', true);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
+								$pdf->setPage($pageposafter + 1);
 							}
 						}
 						else
 						{
 							// We found a page break
-							$showpricebeforepagebreak=0;
+							$showpricebeforepagebreak = 0;
 						}
 					}
 					else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
-					$posYAfterDescription=$pdf->GetY();
+					$posYAfterDescription = $pdf->GetY();
 
 					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
+					$pageposafter = $pdf->getPage();
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -453,51 +453,51 @@ 
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					$pdf->SetXY($this->posxweightvol, $curY);
-					$weighttxt='';
+					$weighttxt = '';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight)
 					{
-					    $weighttxt=round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->weight_units,"weight");
+					    $weighttxt = round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->weight_units, "weight");
 					}
-					$voltxt='';
+					$voltxt = '';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume)
 					{
-					    $voltxt=round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->volume_units?$object->lines[$i]->volume_units:0,"volume");
+					    $voltxt = round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuring_units_string($object->lines[$i]->volume_units ? $object->lines[$i]->volume_units : 0, "volume");
 					}
 
-					$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt, 0, 0, false, true, 'C');
+					$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, 0, 0, false, true, 'C');
 					//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 
 					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
 					{
 					   $pdf->SetXY($this->posxqtyordered, $curY);
-					   $pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked,'','C');
+					   $pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
 					}
 
 					$pdf->SetXY($this->posxqtytoship, $curY);
-					$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped,'','C');
+					$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped, '', 'C');
 
-					if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT))
+					if (!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT))
 					{
 						$pdf->SetXY($this->posxpuht, $curY);
-						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht-1), 3, price($object->lines[$i]->subprice, 0, $outputlangs),'','R');
+						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
 
 						$pdf->SetXY($this->posxtotalht, $curY);
-						$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 3, price($object->lines[$i]->total_ht, 0, $outputlangs),'','R');
+						$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 3, price($object->lines[$i]->total_ht, 0, $outputlangs), '', 'R');
 					}
 
-					$nexY+=3;
-					if ($weighttxt && $voltxt) $nexY+=2;
+					$nexY += 3;
+					if ($weighttxt && $voltxt) $nexY += 2;
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY-1, $this->page_largeur - $this->marge_droite, $nexY-1);
+						$pdf->line($this->marge_gauche, $nexY - 1, $this->page_largeur - $this->marge_droite, $nexY - 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
@@ -513,13 +513,13 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
@@ -529,10 +529,10 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
@@ -542,47 +542,47 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
 				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;	// No error
+				return 1; // No error
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR");
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -599,18 +599,18 @@ 
 	 */
 	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
-        $sign=1;
+        $sign = 1;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('','B', $default_font_size - 1);
+		$pdf->SetFont('', 'B', $default_font_size - 1);
 
 		// Tableau total
-		$col1x = $this->posxweightvol-50; $col2x = $this->posxweightvol;
+		$col1x = $this->posxweightvol - 50; $col2x = $this->posxweightvol;
 		/*if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x-=20;
@@ -618,33 +618,33 @@ 
 		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
 		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
 
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 
-		$totalWeighttoshow='';
-		$totalVolumetoshow='';
+		$totalWeighttoshow = '';
+		$totalVolumetoshow = '';
 
 		// Load dim data
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
-		$totalOrdered=$tmparray['ordered'];
-		$totalToShip=$tmparray['toship'];
+		$tmparray = $object->getTotalWeightVolume();
+		$totalWeight = $tmparray['weight'];
+		$totalVolume = $tmparray['volume'];
+		$totalOrdered = $tmparray['ordered'];
+		$totalToShip = $tmparray['toship'];
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $object->trueVolume=price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
-		    $object->volume_units=$object->size_units * 3;
+		    $object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+		    $object->volume_units = $object->size_units * 3;
 		}
 
-		if ($totalWeight!='') $totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume!='') $totalVolumetoshow=showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 
-    	$pdf->SetFillColor(255,255,255);
+    	$pdf->SetFillColor(255, 255, 255);
     	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    	$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+    	$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
 
         if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
         {
@@ -655,7 +655,7 @@ 
     	$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
     	$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
 
-		if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
+		if (!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
 
 	    	$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
 	    	$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
@@ -680,9 +680,9 @@ 
 
 		    $index++;
 		}
-		if (! $totalWeighttoshow && ! $totalVolumetoshow) $index++;
+		if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 
 		return ($tab2_top + ($tab2_hl * $index));
 	}
@@ -699,72 +699,72 @@ 
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf;
 
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size - 2);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		if (empty($hidetop))
 		{
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
 
-			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
+			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqtyordered - $this->posxdesc, 2, $outputlangs->transnoentities("Description"), '', 'L');
 		}
 
-		$pdf->line($this->posxweightvol-1, $tab_top, $this->posxweightvol-1, $tab_top + $tab_height);
+		$pdf->line($this->posxweightvol - 1, $tab_top, $this->posxweightvol - 1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->posxweightvol-1, $tab_top+1);
-			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"),'','C');
+			$pdf->SetXY($this->posxweightvol - 1, $tab_top + 1);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"), '', 'C');
 		}
 
         if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
         {
-            $pdf->line($this->posxqtyordered-1, $tab_top, $this->posxqtyordered-1, $tab_top + $tab_height);
+            $pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
     		if (empty($hidetop))
     		{
-    			$pdf->SetXY($this->posxqtyordered-1, $tab_top+1);
-    			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"),'','C');
+    			$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
+    			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
     		}
         }
 
-		$pdf->line($this->posxqtytoship-1, $tab_top, $this->posxqtytoship-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqtytoship - 1, $tab_top, $this->posxqtytoship - 1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->posxqtytoship, $tab_top+1);
-			$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities("QtyToShip"),'','C');
+			$pdf->SetXY($this->posxqtytoship, $tab_top + 1);
+			$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities("QtyToShip"), '', 'C');
 		}
 
-		if(!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
+		if (!empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT)) {
 
-			$pdf->line($this->posxpuht-1, $tab_top, $this->posxpuht-1, $tab_top + $tab_height);
+			$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
 			if (empty($hidetop))
 			{
-				$pdf->SetXY($this->posxpuht-1, $tab_top+1);
-				$pdf->MultiCell(($this->posxtotalht - $this->posxpuht), 2, $outputlangs->transnoentities("PriceUHT"),'','C');
+				$pdf->SetXY($this->posxpuht - 1, $tab_top + 1);
+				$pdf->MultiCell(($this->posxtotalht - $this->posxpuht), 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 			}
 
-			$pdf->line($this->posxtotalht-1, $tab_top, $this->posxtotalht-1, $tab_top + $tab_height);
+			$pdf->line($this->posxtotalht - 1, $tab_top, $this->posxtotalht - 1, $tab_top + $tab_height);
 			if (empty($hidetop))
 			{
-				$pdf->SetXY($this->posxtotalht-1, $tab_top+1);
-				$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 2, $outputlangs->transnoentities("TotalHT"),'','C');
+				$pdf->SetXY($this->posxtotalht - 1, $tab_top + 1);
+				$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 			}
 
 		}
@@ -782,73 +782,73 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("orders");
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->SHIPPING_DRAFT_WATERMARK)) )
+		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK)))
 		{
-            		pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SHIPPING_DRAFT_WATERMARK);
+            		pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
 		//Prepare la suite
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
 		$w = 110;
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-$w;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
 		else
 		{
-			$text=$this->emetteur->name;
+			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
 		// Show barcode
-		if (! empty($conf->barcode->enabled))
+		if (!empty($conf->barcode->enabled))
 		{
-			$posx=105;
+			$posx = 105;
 		}
 		else
 		{
-			$posx=$this->marge_gauche+3;
+			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (! empty($conf->barcode->enabled))
+		if (!empty($conf->barcode->enabled))
 		{
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
-		$pdf->SetDrawColor(128,128,128);
-		if (! empty($conf->barcode->enabled))
+		$pdf->SetDrawColor(128, 128, 128);
+		if (!empty($conf->barcode->enabled))
 		{
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
@@ -856,125 +856,125 @@ 
 		}
 
 
-		$posx=$this->page_largeur - $w - $this->marge_droite;
-		$posy=$this->marge_haute;
+		$posx = $this->page_largeur - $w - $this->marge_droite;
+		$posy = $this->marge_haute;
 
-		$pdf->SetFont('','B', $default_font_size + 2);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("SendingSheet");
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("SendingSheet");
 		$pdf->MultiCell($w, 4, $title, '', 'R');
 
-		$pdf->SetFont('','', $default_font_size + 1);
+		$pdf->SetFont('', '', $default_font_size + 1);
 
-		$posy+=5;
+		$posy += 5;
 
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("RefSending") ." : ".$object->ref, '', 'R');
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("RefSending")." : ".$object->ref, '', 'R');
 
 		// Date planned delivery
-		if (! empty($object->date_delivery))
+		if (!empty($object->date_delivery))
 		{
-    			$posy+=4;
-    			$pdf->SetXY($posx,$posy);
-    			$pdf->SetTextColor(0,0,60);
-    			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery,"day",false,$outputlangs,true), '', 'R');
+    			$posy += 4;
+    			$pdf->SetXY($posx, $posy);
+    			$pdf->SetTextColor(0, 0, 60);
+    			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (! empty($object->thirdparty->code_client))
+		if (!empty($object->thirdparty->code_client))
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 
-		$pdf->SetFont('','', $default_font_size + 3);
-		$Yoff=25;
+		$pdf->SetFont('', '', $default_font_size + 3);
+		$Yoff = 25;
 
 		// Add list of linked orders
-		$origin 	= $object->origin;
-		$origin_id 	= $object->origin_id;
+		$origin = $object->origin;
+		$origin_id = $object->origin_id;
 
 	    // TODO move to external function
-		if (! empty($conf->$origin->enabled))     // commonly $origin='commande'
+		if (!empty($conf->$origin->enabled))     // commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
 
 			$classname = ucfirst($origin);
 			$linkedobject = new $classname($this->db);
-			$result=$linkedobject->fetch($origin_id);
+			$result = $linkedobject->fetch($origin_id);
 			if ($result >= 0)
 			{
 			    //$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
-				$pdf->SetFont('','', $default_font_size - 2);
-				$text=$linkedobject->ref;
-				if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')';
-				$Yoff = $Yoff+8;
-				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w,$Yoff);
-				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R');
-				$Yoff = $Yoff+3;
-				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w,$Yoff);
-				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date,"day",false,$outputlangs,true), 0, 'R');
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$text = $linkedobject->ref;
+				if ($linkedobject->ref_client) $text .= ' ('.$linkedobject->ref_client.')';
+				$Yoff = $Yoff + 8;
+				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
+				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), 0, 'R');
+				$Yoff = $Yoff + 3;
+				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
+				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date, "day", false, $outputlangs, true), 0, 'R');
 			}
 		}
 
 		if ($showaddress)
 		{
 			// Sender properties
-			$carac_emetteur='';
+			$carac_emetteur = '';
 		 	// Add internal contact of origin element if defined
-			$arrayidcontact=array();
-			if (! empty($origin) && is_object($object->$origin)) $arrayidcontact=$object->$origin->getIdContact('internal','SALESREPFOLL');
+			$arrayidcontact = array();
+			if (!empty($origin) && is_object($object->$origin)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
 		 	if (count($arrayidcontact) > 0)
 		 	{
 		 		$object->fetch_user(reset($arrayidcontact));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 		 	}
 
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
 			// Show sender
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
 
-			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
-			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
 
 			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("Sender").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("Sender").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(255,255,255);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->SetFillColor(255, 255, 255);
 
 			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B',$default_font_size);
-			$pdf->MultiCell($widthrecbox-2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy = $pdf->getY();
 
 			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
 
 
 			// If SHIPPING contact defined, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->$origin->getIdContact('external','SHIPPING');
+			$usecontact = false;
+			$arrayidcontact = $object->$origin->getIdContact('external', 'SHIPPING');
 			if (count($arrayidcontact) > 0)
 			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			//Recipient name
@@ -985,38 +985,38 @@ 
 				$thirdparty = $object->thirdparty;
 			}
 
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails',$object);
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (!empty($object->contact) ? $object->contact : null), $usecontact, 'targetwithdetails', $object);
 
 			// Show recipient
-			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posx=$this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
 			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
 			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 	}
 
 	/**
@@ -1028,11 +1028,11 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'SHIPPING_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 }

Braces +135 added lines, -69 removed lines

@@ -66,7 +66,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
@@ -86,9 +89,11 @@ 
 
 		$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
 
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+			// To work with US executive format
 		{
 		    $this->posxweightvol-=20;
+		}
 		    $this->posxpicture-=20;
 		    $this->posxqtyordered-=20;
 		    $this->posxqtytoship-=20;
@@ -119,9 +124,13 @@ 
 
 		$object->fetch_thirdparty();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output='ISO-8859-1';
+		}
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -143,7 +152,9 @@ 
 
             for ($i = 0 ; $i < $nblignes ; $i++)
             {
-                if (empty($object->lines[$i]->fk_product)) continue;
+                if (empty($object->lines[$i]->fk_product)) {
+                	continue;
+                }
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -155,18 +166,18 @@ 
 
                 foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
                         {
-                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
+                            	// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
                             {
                                 if ($obj['photo_vignette'])
                                 {
                                     $filename= $obj['photo_vignette'];
-                                }
-                                else
+                            }
+                                } else
                                 {
                                     $filename=$obj['photo'];
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $filename=$obj['photo'];
                             }
@@ -175,11 +186,15 @@ 
                             break;
                 }
 
-                if ($realpath) $realpatharray[$i]=$realpath;
+                if ($realpath) {
+                	$realpatharray[$i]=$realpath;
+                }
             }
         }
 
-        if (count($realpatharray) == 0) $this->posxpicture=$this->posxweightvol;
+        if (count($realpatharray) == 0) {
+        	$this->posxpicture=$this->posxweightvol;
+        }
 
 		if ($conf->expedition->dir_output)
 		{
@@ -188,8 +203,7 @@ 
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/" . $expref;
@@ -245,20 +259,26 @@ 
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
 
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
@@ -315,7 +335,9 @@ 
 								// Get code using getLabelFromKey
 								$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
 								$label='';
-								if ($object->tracking_url != $object->tracking_number) $label.=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+									$label.=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label.=$outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
 								if ($object->tracking_url != $object->tracking_number)
@@ -347,8 +369,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -366,7 +387,9 @@ 
 
 					// Define size of image if we need it
 					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					if (! empty($realpatharray[$i])) {
+						$imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
@@ -377,11 +400,17 @@ 
 					$posYAfterDescription=0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+						// If photo too high, we moved completely on new page
 					{
 						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+						if (! empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore+1);
 
 						$curY = $tab_top_newpage;
@@ -403,9 +432,11 @@ 
 					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 
 					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					if ($pageposafter > $pageposbefore) {
+						// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
+					}
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -414,23 +445,27 @@ 
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+							// There is no space left for total+free text
 						{
 							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 							{
 								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+								if (! empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter+1);
 							}
-						}
-						else
+						} else
 						{
 							// We found a page break
 							$showpricebeforepagebreak=0;
 						}
-					}
-					else	// No pagebreak
+					} else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -489,7 +524,9 @@ 
 					}
 
 					$nexY+=3;
-					if ($weighttxt && $voltxt) $nexY+=2;
+					if ($weighttxt && $voltxt) {
+						$nexY+=2;
+					}
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -508,8 +545,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -517,24 +553,29 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -543,8 +584,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -555,7 +595,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -567,20 +609,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;	// No error
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR");
 			return 0;
@@ -615,8 +656,11 @@ 
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		} else {
+			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		}
 
 		$useborder=0;
 		$index = 0;
@@ -637,10 +681,18 @@ 
 		    $object->volume_units=$object->size_units * 3;
 		}
 
-		if ($totalWeight!='') $totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume!='') $totalVolumetoshow=showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight!='') {
+			$totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume!='') {
+			$totalVolumetoshow=showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		if ($object->trueWeight) {
+			$totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		}
+		if ($object->trueVolume) {
+			$totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		}
 
     	$pdf->SetFillColor(255,255,255);
     	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -680,7 +732,9 @@ 
 
 		    $index++;
 		}
-		if (! $totalWeighttoshow && ! $totalVolumetoshow) $index++;
+		if (! $totalWeighttoshow && ! $totalVolumetoshow) {
+			$index++;
+		}
 
 		$pdf->SetTextColor(0,0,0);
 
@@ -705,7 +759,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+			$hidetop=-1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -815,16 +871,14 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
+		} else
 		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -834,8 +888,7 @@ 
 		if (! empty($conf->barcode->enabled))
 		{
 			$posx=105;
-		}
-		else
+		} else
 		{
 			$posx=$this->marge_gauche+3;
 		}
@@ -899,9 +952,11 @@ 
 		$origin_id 	= $object->origin_id;
 
 	    // TODO move to external function
-		if (! empty($conf->$origin->enabled))     // commonly $origin='commande'
+		if (! empty($conf->$origin->enabled)) {
+			// commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
+		}
 
 			$classname = ucfirst($origin);
 			$linkedobject = new $classname($this->db);
@@ -912,7 +967,9 @@ 
 
 				$pdf->SetFont('','', $default_font_size - 2);
 				$text=$linkedobject->ref;
-				if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+					$text.=' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff+8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w,$Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -928,7 +985,9 @@ 
 			$carac_emetteur='';
 		 	// Add internal contact of origin element if defined
 			$arrayidcontact=array();
-			if (! empty($origin) && is_object($object->$origin)) $arrayidcontact=$object->$origin->getIdContact('internal','SALESREPFOLL');
+			if (! empty($origin) && is_object($object->$origin)) {
+				$arrayidcontact=$object->$origin->getIdContact('internal','SALESREPFOLL');
+			}
 		 	if (count($arrayidcontact) > 0)
 		 	{
 		 		$object->fetch_user(reset($arrayidcontact));
@@ -940,7 +999,9 @@ 
 			// Show sender
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx=$this->page_largeur-$this->marge_droite-80;
+			}
 
 			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -991,10 +1052,15 @@ 
 
 			// Show recipient
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox=84;
+			}
+			// To work with US executive format
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx=$this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);

htdocs/core/modules/fichinter/mod_arctic.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param	integer		$objsoc     Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */

Indentation +30 added lines, -30 removed lines

@@ -38,13 +38,13 @@ 
 
 
 	/**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 
@@ -75,20 +75,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     * Renvoi un exemple de numerotation
-     *
-     * @return     string      Example
-     */
-    function getExample()
-    {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 * Renvoi un exemple de numerotation
+	 *
+	 * @return     string      Example
+	 */
+	function getExample()
+	{
+	 	global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -96,7 +96,7 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -105,8 +105,8 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc=0,$object='')
-    {
+	function getNextValue($objsoc=0,$object='')
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -129,14 +129,14 @@ 
 	/**
 	 * 	Return next free value
 	 *
-     *  @param	Societe		$objsoc     Object third party
+	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	Object		$objforref	Object for number to search
-     *  @return string      			Next free value
-     */
-    function getNumRef($objsoc,$objforref)
-    {
-        return $this->getNextValue($objsoc,$objforref);
-    }
+	 *  @return string      			Next free value
+	 */
+	function getNumRef($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -25,14 +25,14 @@ 
  *	\ingroup    fiche intervention
  *	\brief      File with Arctic numbering module for interventions
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/fichinter/modules_fichinter.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 
 /**
  *	Class to manage numbering of intervention cards with rule Artic.
  */
 class mod_arctic extends ModeleNumRefFicheinter
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'arctic';
 
@@ -44,35 +44,35 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconst" value="FICHINTER_ARTIC_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("InterventionCard"),$langs->transnoentities("InterventionCard"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("InterventionCard"),$langs->transnoentities("InterventionCard"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconst" value="FICHINTER_ARTIC_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("InterventionCard"), $langs->transnoentities("InterventionCard"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("InterventionCard"), $langs->transnoentities("InterventionCard"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->FICHINTER_ARTIC_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->FICHINTER_ARTIC_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -84,14 +84,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -105,22 +105,22 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc=0,$object='')
+    function getNextValue($objsoc = 0, $object = '')
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On d�fini critere recherche compteur
-		$mask=$conf->global->FICHINTER_ARTIC_MASK;
+		$mask = $conf->global->FICHINTER_ARTIC_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'fichinter','ref','',$objsoc,$object->datec);
+		$numFinal = get_next_value($db, $mask, 'fichinter', 'ref', '', $objsoc, $object->datec);
 
 		return  $numFinal;
   }
@@ -133,9 +133,9 @@ 
 	 * 	@param	Object		$objforref	Object for number to search
      *  @return string      			Next free value
      */
-    function getNumRef($objsoc,$objforref)
+    function getNumRef($objsoc, $objforref)
     {
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 
 }

htdocs/core/modules/livraison/mod_livraison_jade.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	/**
 	 *  Return next free ref
 	 *
-     *  @param	Societe		$objsoc      	Object thirdparty
+     *  @param	integer		$objsoc      	Object thirdparty
      *  @param  Object		$object			Object livraison
      *  @return string      				Texte descripif
      */

Braces +16 added lines, -7 removed lines

@@ -122,20 +122,29 @@
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) $max = intval($obj->max);
-            else $max=0;
-        }
-        else
+            if ($obj) {
+            	$max = intval($obj->max);
+            } else {
+            	$max=0;
+            }
+        } else
         {
             return -1;
         }
 
         $date=$object->date_delivery;
-        if (empty($date)) $date=dol_now();
+        if (empty($date)) {
+        	$date=dol_now();
+        }
         $yymm = strftime("%y%m",$date);
         
-        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-        else $num = sprintf("%04s",$max+1);
+        if ($max >= (pow(10, 4) - 1)) {
+        	$num=$max+1;
+        }
+        // If counter > 9999, we do not format on 4 chars, we take number as it is
+        else {
+        	$num = sprintf("%04s",$max+1);
+        }
 
         dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
         return $this->prefix.$yymm."-".$num;

Indentation +88 added lines, -88 removed lines

@@ -38,7 +38,7 @@ 
 	var $error = '';
 	var $nom = "Jade";
 
-    var $prefix='BL';
+	var $prefix='BL';
 
 
 	/**
@@ -55,103 +55,103 @@ 
 	/**
 	 *  Renvoi un exemple de numerotation
 	 *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-        return $this->prefix."0501-0001";
-    }
-
-    /**
-     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *  de conflits qui empechera cette numerotation de fonctionner.
-     *
-     *  @return     boolean     false si conflit, true si ok
-     */
-    function canBeActivated()
-    {
-        global $langs,$conf,$db;
-
-        $langs->load("bills");
-
-        // Check invoice num
-        $fayymm=''; $max='';
-
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $row = $db->fetch_row($resql);
-            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
-        }
-        if ($fayymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$fayymm))
-        {
-            $langs->load("errors");
-            $this->error=$langs->trans('ErrorNumRefModel',$max);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+	/**
+	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *  @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		global $langs,$conf,$db;
+
+		$langs->load("bills");
+
+		// Check invoice num
+		$fayymm=''; $max='';
+
+		$posindice=8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
+		$sql.= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+		}
+		if ($fayymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		{
+			$langs->load("errors");
+			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
-    {
-        global $db,$conf;
-
-        // D'abord on recupere la valeur max
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-
-        $resql=$db->query($sql);
-        dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
-        if ($resql)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj) $max = intval($obj->max);
-            else $max=0;
-        }
-        else
-        {
-            return -1;
-        }
-
-        $date=$object->date_delivery;
-        if (empty($date)) $date=dol_now();
-        $yymm = strftime("%y%m",$date);
-
-        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-        else $num = sprintf("%04s",$max+1);
-
-        dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
-        return $this->prefix.$yymm."-".$num;
-    }
+	function getNextValue($objsoc,$object)
+	{
+		global $db,$conf;
+
+		// D'abord on recupere la valeur max
+		$posindice=8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
+		$sql.= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max=0;
+		}
+		else
+		{
+			return -1;
+		}
+
+		$date=$object->date_delivery;
+		if (empty($date)) $date=dol_now();
+		$yymm = strftime("%y%m",$date);
+
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
+
+		dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
 
 
 	/**
 	 *  Return next free ref
 	 *
-     *  @param	Societe		$objsoc      	Object thirdparty
-     *  @param  Object		$object			Object livraison
-     *  @return string      				Texte descripif
-     */
-    function livraison_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	 *  @param	Societe		$objsoc      	Object thirdparty
+	 *  @param  Object		$object			Object livraison
+	 *  @return string      				Texte descripif
+	 */
+	function livraison_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 
 }

Spacing +31 added lines, -31 removed lines

@@ -24,7 +24,7 @@ 
  *   \brief      Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 
 
 /**
@@ -34,11 +34,11 @@ 
 
 class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = "Jade";
 
-    var $prefix='BL';
+    var $prefix = 'BL';
 
 
 	/**
@@ -49,7 +49,7 @@ 
 	function info()
 	{
 		global $langs;
-		return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 	/**
@@ -70,29 +70,29 @@ 
      */
     function canBeActivated()
     {
-        global $langs,$conf,$db;
+        global $langs, $conf, $db;
 
         $langs->load("bills");
 
         // Check invoice num
-        $fayymm=''; $max='';
+        $fayymm = ''; $max = '';
 
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
+        $posindice = 8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+        $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+        $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql .= " AND entity = ".$conf->entity;
 
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $row = $db->fetch_row($resql);
-            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+            if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
         }
-        if ($fayymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+        if ($fayymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
         {
             $langs->load("errors");
-            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            $this->error = $langs->trans('ErrorNumRefModel', $max);
             return false;
         }
 
@@ -106,36 +106,36 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-        global $db,$conf;
+        global $db, $conf;
 
         // D'abord on recupere la valeur max
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
+        $posindice = 8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+        $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+        $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql .= " AND entity = ".$conf->entity;
 
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $max = intval($obj->max);
-            else $max=0;
+            else $max = 0;
         }
         else
         {
             return -1;
         }
 
-        $date=$object->date_delivery;
-        if (empty($date)) $date=dol_now();
-        $yymm = strftime("%y%m",$date);
+        $date = $object->date_delivery;
+        if (empty($date)) $date = dol_now();
+        $yymm = strftime("%y%m", $date);
 
-        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-        else $num = sprintf("%04s",$max+1);
+        if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s", $max + 1);
 
         dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
         return $this->prefix.$yymm."-".$num;
@@ -149,9 +149,9 @@ 
      *  @param  Object		$object			Object livraison
      *  @return string      				Texte descripif
      */
-    function livraison_get_num($objsoc=0,$object='')
+    function livraison_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 
 }