Dolibarr / dolibarr

htdocs/reception/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 $langs->load("receptions");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date,ref', 'desc', 0, 0, 1);
-'@phan-var-force Reception[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Reception[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Reception[] $linkedObjectBlock */
 
 $total = 0;

htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 $langs->load("tasks");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date,ref', 'desc', 0, 0, 1);
-'@phan-var-force CommonObject[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force CommonObject[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Task[] $linkedObjectBlock */
 
 $total = 0;

htdocs/product/stock/stats/commande_fournisseur.php

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
 			}
 			$sql .= " WHERE cf.entity IN (".getEntity('product').")";
 			$sql .= " AND cfdi.batch = '".($db->escape($object->batch))."'";
-			$sql .= " AND cfdi.fk_product = " . (int) $object->fk_product;
+			$sql .= " AND cfdi.fk_product = ".(int) $object->fk_product;
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(cf.date_commande) IN ('.$db->sanitize((string) $search_month).')';
 			}

htdocs/product/stock/class/productlot.class.php

Spacing +35 added lines, -35 removed lines

@@ -413,7 +413,7 @@ 
 
 		if (!$error) {
 			// Insert request
-			$sql = 'INSERT INTO ' . $this->db->prefix() . $this->table_element . '(';
+			$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';
 			$sql .= 'entity,';
 			$sql .= 'fk_product,';
 			$sql .= 'batch,';
@@ -430,21 +430,21 @@ 
 			$sql .= 'fk_user_modif,';
 			$sql .= 'import_key';
 			$sql .= ') VALUES (';
-			$sql .= ' ' . (!isset($this->entity) ? $conf->entity : $this->entity) . ',';
-			$sql .= ' ' . (!isset($this->fk_product) ? 'NULL' : $this->fk_product) . ',';
-			$sql .= ' ' . (!isset($this->batch) ? 'NULL' : "'" . $this->db->escape($this->batch) . "'") . ',';
-			$sql .= ' ' . (!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'" . $this->db->idate($this->eatby) . "'") . ',';
-			$sql .= ' ' . (!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'" . $this->db->idate($this->sellby) . "'") . ',';
-			$sql .= ' ' . (!isset($this->eol_date) || dol_strlen($this->eol_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->eol_date) . "'") . ',';
-			$sql .= ' ' . (!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->manufacturing_date) . "'") . ',';
-			$sql .= ' ' . (!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->scrapping_date) . "'") . ',';
+			$sql .= ' '.(!isset($this->entity) ? $conf->entity : $this->entity).',';
+			$sql .= ' '.(!isset($this->fk_product) ? 'NULL' : $this->fk_product).',';
+			$sql .= ' '.(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").',';
+			$sql .= ' '.(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").',';
+			$sql .= ' '.(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").',';
+			$sql .= ' '.(!isset($this->eol_date) || dol_strlen($this->eol_date) == 0 ? 'NULL' : "'".$this->db->idate($this->eol_date)."'").',';
+			$sql .= ' '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) == 0 ? 'NULL' : "'".$this->db->idate($this->manufacturing_date)."'").',';
+			$sql .= ' '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'".$this->db->idate($this->scrapping_date)."'").',';
 			//$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
 			$sql .= ' '.(empty($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
 			$sql .= ' '.(empty($this->lifetime) ? 'NULL' : $this->lifetime).',';
-			$sql .= ' ' . "'" . $this->db->idate(dol_now()) . "'" . ',';
-			$sql .= ' ' . (!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat) . ',';
-			$sql .= ' ' . (!isset($this->fk_user_modif) ? 'NULL' : $this->fk_user_modif) . ',';
-			$sql .= ' ' . (!isset($this->import_key) ? 'NULL' : $this->import_key);
+			$sql .= ' '."'".$this->db->idate(dol_now())."'".',';
+			$sql .= ' '.(!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat).',';
+			$sql .= ' '.(!isset($this->fk_user_modif) ? 'NULL' : $this->fk_user_modif).',';
+			$sql .= ' '.(!isset($this->import_key) ? 'NULL' : $this->import_key);
 			$sql .= ')';
 
 			$this->db->begin();
@@ -452,11 +452,11 @@ 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
+				$this->errors[] = 'Error '.$this->db->lasterror();
 			}
 
 			if (!$error) {
-				$this->id = $this->db->last_insert_id($this->db->prefix() . $this->table_element);
+				$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 				// Actions on extra fields
 				if (!$error) {
@@ -485,7 +485,7 @@ 
 		}
 
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1 * $error;
 		} else {
 			return $this->id;
@@ -634,31 +634,31 @@ 
 
 		if (!$error) {
 			// Update request
-			$sql = 'UPDATE ' . $this->db->prefix() . $this->table_element . ' SET';
-			$sql .= ' entity = ' . (isset($this->entity) ? $this->entity : "null") . ',';
-			$sql .= ' fk_product = ' . (isset($this->fk_product) ? $this->fk_product : "null") . ',';
-			$sql .= ' batch = ' . (isset($this->batch) ? "'" . $this->db->escape($this->batch) . "'" : "null") . ',';
-			$sql .= ' eatby = ' . (!isset($this->eatby) || dol_strlen($this->eatby) != 0 ? "'" . $this->db->idate($this->eatby) . "'" : 'null') . ',';
-			$sql .= ' sellby = ' . (!isset($this->sellby) || dol_strlen($this->sellby) != 0 ? "'" . $this->db->idate($this->sellby) . "'" : 'null') . ',';
-			$sql .= ' eol_date = ' . (!isset($this->eol_date) || dol_strlen($this->eol_date) != 0 ? "'" . $this->db->idate($this->eol_date) . "'" : 'null') . ',';
-			$sql .= ' manufacturing_date = ' . (!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) != 0 ? "'" . $this->db->idate($this->manufacturing_date) . "'" : 'null') . ',';
-			$sql .= ' scrapping_date = ' . (!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) != 0 ? "'" . $this->db->idate($this->scrapping_date) . "'" : 'null') . ',';
+			$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET';
+			$sql .= ' entity = '.(isset($this->entity) ? $this->entity : "null").',';
+			$sql .= ' fk_product = '.(isset($this->fk_product) ? $this->fk_product : "null").',';
+			$sql .= ' batch = '.(isset($this->batch) ? "'".$this->db->escape($this->batch)."'" : "null").',';
+			$sql .= ' eatby = '.(!isset($this->eatby) || dol_strlen($this->eatby) != 0 ? "'".$this->db->idate($this->eatby)."'" : 'null').',';
+			$sql .= ' sellby = '.(!isset($this->sellby) || dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null').',';
+			$sql .= ' eol_date = '.(!isset($this->eol_date) || dol_strlen($this->eol_date) != 0 ? "'".$this->db->idate($this->eol_date)."'" : 'null').',';
+			$sql .= ' manufacturing_date = '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) != 0 ? "'".$this->db->idate($this->manufacturing_date)."'" : 'null').',';
+			$sql .= ' scrapping_date = '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) != 0 ? "'".$this->db->idate($this->scrapping_date)."'" : 'null').',';
 			//$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
 			$sql .= ' qc_frequency = '.(!empty($this->qc_frequency) ? (int) $this->qc_frequency : 'null').',';
 			$sql .= ' lifetime = '.(!empty($this->lifetime) ? (int) $this->lifetime : 'null').',';
-			$sql .= ' datec = ' . (dol_strlen((string) $this->datec) != 0 ? "'" . $this->db->idate($this->datec) . "'" : 'null') . ',';
-			$sql .= ' tms = ' . (dol_strlen((string) $this->tms) != 0 ? "'" . $this->db->idate($this->tms) . "'" : "'" . $this->db->idate(dol_now()) . "'") . ',';
-			$sql .= ' fk_user_creat = ' . (isset($this->fk_user_creat) ? $this->fk_user_creat : "null") . ',';
-			$sql .= ' fk_user_modif = ' . (isset($this->fk_user_modif) ? $this->fk_user_modif : "null") . ',';
-			$sql .= ' import_key = ' . (isset($this->import_key) ? $this->import_key : "null");
-			$sql .= ' WHERE rowid=' . ((int) $this->id);
+			$sql .= ' datec = '.(dol_strlen((string) $this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';
+			$sql .= ' tms = '.(dol_strlen((string) $this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
+			$sql .= ' fk_user_creat = '.(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").',';
+			$sql .= ' fk_user_modif = '.(isset($this->fk_user_modif) ? $this->fk_user_modif : "null").',';
+			$sql .= ' import_key = '.(isset($this->import_key) ? $this->import_key : "null");
+			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			$this->db->begin();
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
+				$this->errors[] = 'Error '.$this->db->lasterror();
 			}
 
 			// Actions on extra fields
@@ -687,7 +687,7 @@ 
 		}
 
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1 * $error;
 		} else {
 			return 1;
@@ -930,7 +930,7 @@ 
 		}
 		$sql .= " WHERE cf.entity IN (".getEntity('expedition').")";
 		$sql .= " AND cfdi.batch = '".($this->db->escape($this->batch))."'";
-		$sql .= " AND cfdi.fk_product = " . (int) $this->fk_product;
+		$sql .= " AND cfdi.fk_product = ".(int) $this->fk_product;
 		if (!$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
@@ -1095,7 +1095,7 @@ 
 				$obj = $this->db->fetch_object($result);
 				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
 				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
-				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;		// qty may be a float due to the SUM()
+				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0; // qty may be a float due to the SUM()
 			} else {
 				$this->error = $this->db->error();
 				$error++;

htdocs/fichinter/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 $langs->load("interventions");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date,ref', 'desc', 0, 0, 1);
-'@phan-var-force Fichinter[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Fichinter[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Fichinter[] $linkedObjectBlock */
 
 $ilink = 0;

htdocs/comm/propal/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 $langs->load("propal");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date,ref', 'desc', 0, 0, 1);
-'@phan-var-force Propal[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Propal[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Propal[] $linkedObjectBlock */
 
 $total = 0;

htdocs/comm/action/peruser.php

Spacing +18 added lines, -18 removed lines

@@ -50,7 +50,7 @@ 
  */
 
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
-$DELAYFORCACHE = 300;	// 300 seconds
+$DELAYFORCACHE = 300; // 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
@@ -86,7 +86,7 @@ 
 	$socid = '';
 }
 
-$canedit = 1;	// can read events of others
+$canedit = 1; // can read events of others
 if (!$user->hasRight('agenda', 'myactions', 'read')) {
 	accessforbidden();
 }
@@ -553,7 +553,7 @@ 
 	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
 	$sql .= " WHERE bc.status = 1";
 	$sql .= " AND ba.status = 1";
-	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 	if (!empty($filtert) && $filtert != '-1' && $filtert != '-2') {
 		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
 	}
@@ -594,9 +594,9 @@ 
 	// Holiday calendar
 	if ($user->hasRight("holiday", "read")) {
 		$s .= '
-            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '') . '>
+            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '').'>
                 <label for="check_holiday" class="labelcalendar">
-                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
+                    <span class="check_holiday_text">' . $langs->trans("Holidays").'</span>
                 </label> &nbsp;
             </div>';
 	}
@@ -604,7 +604,7 @@ 
 	// External calendars
 	if (count($showextcals) > 0) {
 		foreach ($showextcals as $val) {
-			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
+			$htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
 
 			$s .= '<script type="text/javascript">'."\n";
 			$s .= 'jQuery(document).ready(function () {'."\n";
@@ -649,7 +649,7 @@ 
 	$s .= "\n".'<!-- End div to calendars selectors -->'."\n";
 } else { // If javascript off
 	$newparam = $param; // newparam is for birthday links
-	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.($showbirthday ? '1' : '0'), $newparam);  // Always false @phpstan-ignore-line
+	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.($showbirthday ? '1' : '0'), $newparam); // Always false @phpstan-ignore-line
 	if (!preg_match('/showbirthday=/i', $newparam)) {
 		$newparam .= '&showbirthday=1';
 	}
@@ -698,7 +698,7 @@ 
 	// TODO Replace with a AND EXISTS
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 	$sql .= " ON ar.fk_actioncomm = a.id AND ar.element_type = 'user'";
-	if ($filtert != '' && $filtert != '-1' && $filtert != '-2'  && $filtert != '-3') {
+	if ($filtert != '' && $filtert != '-1' && $filtert != '-2' && $filtert != '-3') {
 		$sql .= " AND ar.fk_element IN (".$db->sanitize($filtert).")";
 	} elseif ($filtert == '-3') {
 		$sql .= " AND ar.fk_element IN (".$db->sanitize(implode(',', $user->getAllChildIds(1))).")";
@@ -709,14 +709,14 @@ 
 }
 
 $sql .= " WHERE a.fk_action = ca.id";
-$sql .= " AND a.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+$sql .= " AND a.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ((is_array($actioncode) && in_array('AC_NON_AUTO', $actioncode)) || $actioncode == 'AC_NON_AUTO') {
 			$sql .= " AND ca.type != 'systemauto'";
-		} elseif ((is_array($actioncode) && in_array('AC_ALL_AUTO', $actioncode))	|| $actioncode == 'AC_ALL_AUTO') {
+		} elseif ((is_array($actioncode) && in_array('AC_ALL_AUTO', $actioncode)) || $actioncode == 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
 		} else {
 			if ((is_array($actioncode) && in_array('AC_OTH', $actioncode)) || $actioncode == 'AC_OTH') {
@@ -729,7 +729,7 @@ 
 	} else {
 		if ((is_array($actioncode) && in_array('AC_NON_AUTO', $actioncode)) || $actioncode === 'AC_NON_AUTO') {
 			$sql .= " AND ca.type != 'systemauto'";
-		} elseif ((is_array($actioncode) && in_array('AC_ALL_AUTO', $actioncode))	|| $actioncode === 'AC_ALL_AUTO') {
+		} elseif ((is_array($actioncode) && in_array('AC_ALL_AUTO', $actioncode)) || $actioncode === 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
 		} elseif ((is_array($actioncode) && !in_array('-1', $actioncode) && !in_array('-3', $actioncode)) || ($actioncode !== '-1' && $actioncode !== '-3')) {
 			if (is_array($actioncode)) {
@@ -875,7 +875,7 @@ 
 		// event->datep and event->datef must be GMT date.
 		if ($event->fulldayevent) {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
-			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver'); // If saved in $tzforfullday = gmt, we must invert date to be in user tz
 			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
 		} else {
 			// Example: $obj->datep = '1970-01-01 01:00:00', jdate will return 0 if TZ of PHP server is Europe/Berlin (+1)
@@ -951,8 +951,8 @@ 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true;
 			$j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
-			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
 			/*
 			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
 			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
@@ -1154,9 +1154,9 @@ 
 					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
 						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
 					}
-					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
+					$eventarray[$daykey][] = $newevent; // We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
 				} else {
-					$eventarray[$daykey][] = $event;	// We can use the event unchanged
+					$eventarray[$daykey][] = $event; // We can use the event unchanged
 				}
 
 				$daykey += 60 * 60 * 24;
@@ -1918,8 +1918,8 @@ 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
 		$annee = (int) dol_print_date($daykey, '%Y', 'tzuserrel');
-		$mois =  (int) dol_print_date($daykey, '%m', 'tzuserrel');
-		$jour =  (int) dol_print_date($daykey, '%d', 'tzuserrel');
+		$mois = (int) dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour = (int) dol_print_date($daykey, '%d', 'tzuserrel');
 		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee ".dol_print_date($daykey, 'dayhour', 'gmt'));
 		//var_dump($notused);
 

htdocs/comm/action/index.php

Spacing +26 added lines, -26 removed lines

@@ -50,13 +50,13 @@ 
  */
 
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
-$DELAYFORCACHE = 300;	// 300 seconds
+$DELAYFORCACHE = 300; // 300 seconds
 
 $action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
-	$mode = $action;	// For backward compatibility
+	$mode = $action; // For backward compatibility
 }
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
@@ -149,8 +149,8 @@ 
 	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'));
 }
 
-$defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month');	// default for app
-$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview);	// default for user
+$defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month'); // default for app
+$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview); // default for user
 if (empty($mode) && !GETPOSTISSET('mode')) {
 	$mode = $defaultview;
 }
@@ -564,7 +564,7 @@ 
 
 $viewmode .= '</div>';
 
-$viewmode .= '<span class="marginrightonly"></span>';	// To add a space before the navigation tools
+$viewmode .= '<span class="marginrightonly"></span>'; // To add a space before the navigation tools
 
 
 $newparam = '';
@@ -599,7 +599,7 @@ 
 	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
 	$sql .= " WHERE bc.status = 1";
 	$sql .= " AND ba.status = 1";
-	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 	if (!empty($filtert) && $filtert != '-1') {
 		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
 	}
@@ -655,9 +655,9 @@ 
 	if ($user->hasRight("holiday", "read")) {
 		$s .= '
             <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday
-					? ' checked' : '') . '>
+					? ' checked' : '').'>
                 <label for="check_holiday" class="labelcalendar">
-                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
+                    <span class="check_holiday_text">' . $langs->trans("Holidays").'</span>
                 </label> &nbsp;
             </div>';
 	}
@@ -683,7 +683,7 @@ 
 		$s .= '</script>'."\n";
 
 		foreach ($showextcals as $val) {
-			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
+			$htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
 
 			if (!empty($val['default']) || GETPOSTINT('check_ext'.$htmlname)) {
 				$default = "checked";
@@ -773,7 +773,7 @@ 
 if (($filtert != '-1' && $filtert != '-2') || $usergroup > 0) {
 	// TODO Replace with a AND EXISTS
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar ON ar.fk_actioncomm = a.id AND ar.element_type = 'user'";
-	if ($filtert != '-1' && $filtert != '-2'  && $filtert != '-3') {
+	if ($filtert != '-1' && $filtert != '-2' && $filtert != '-3') {
 		$sql .= " AND (ar.fk_element IN (".$db->sanitize($filtert).") OR (ar.fk_element IS NULL AND a.fk_user_action = ".((int) $filtert)."))"; // The OR is for backward compatibility
 	} elseif ($filtert == '-3') {
 		$sql .= " AND ar.fk_element IN (".$db->sanitize(implode(',', $user->getAllChildIds(1))).")";
@@ -794,7 +794,7 @@ 
 $sql .= $hookmanager->resPrint;
 
 $sql .= " WHERE a.fk_action = ca.id";
-$sql .= " AND a.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+$sql .= " AND a.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -813,7 +813,7 @@ 
 	} else {
 		if ((is_array($actioncode) && in_array('AC_NON_AUTO', $actioncode)) || $actioncode === 'AC_NON_AUTO') {
 			$sql .= " AND ca.type != 'systemauto'";
-		} elseif ((is_array($actioncode) && in_array('AC_ALL_AUTO', $actioncode))	|| $actioncode === 'AC_ALL_AUTO') {
+		} elseif ((is_array($actioncode) && in_array('AC_ALL_AUTO', $actioncode)) || $actioncode === 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
 		} else {
 			if (is_array($actioncode)) {
@@ -824,7 +824,7 @@ 
 					 * @param string $value
 					 * @return	bool
 					 */
-					function ($value) {
+					function($value) {
 						return ((string) $value !== '-1');
 					}
 				);
@@ -951,7 +951,7 @@ 
 		// event->datep and event->datef must be GMT date.
 		if ($event->fulldayevent) {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
-			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver'); // If saved in $tzforfullday = gmt, we must invert date to be in user tz
 			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
 		} else {
 			// Example: $obj->datep = '1970-01-01 01:00:00', jdate will return 0 if TZ of PHP server is Europe/Berlin (+1)
@@ -1029,8 +1029,8 @@ 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true;
 			$j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
-			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
 			/*
 			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
 			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
@@ -1159,7 +1159,7 @@ 
 	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 	if ($mode == 'show_day') {
 		// Request only leaves for the current selected day
-		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
+		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin"; // date_debut and date_fin are date without time
 	} elseif ($mode == 'show_week') {
 		// Restrict on current month (we get more, but we will filter later)
 		$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
@@ -1244,9 +1244,9 @@ 
 					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
 						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
 					}
-					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
+					$eventarray[$daykey][] = $newevent; // We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
 				} else {
-					$eventarray[$daykey][] = $event;	// We can use the event unchanged
+					$eventarray[$daykey][] = $event; // We can use the event unchanged
 				}
 
 				$daykey += 60 * 60 * 24;
@@ -1759,7 +1759,7 @@ 
 
 	for ($iter_day = 0; $iter_day < 7; $iter_day++) {
 		// Show days of the current week
-		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');		// $firstdaytoshow is in timezone of server
+		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd'); // $firstdaytoshow is in timezone of server
 		$tmpday = (int) dol_print_date($curtime, '%d', 'tzuserrel');
 		$tmpmonth = (int) dol_print_date($curtime, '%m', 'tzuserrel');
 		$tmpyear = (int) dol_print_date($curtime, '%Y', 'tzuserrel');
@@ -1999,9 +1999,9 @@ 
 	$tmpholiday = new Holiday($db);
 
 	foreach ($eventarray as $daykey => $notused) {		// daykey is the 'YYYYMMDD' to show according to user
-		$annee = (int) dol_print_date($daykey, '%Y', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
-		$mois =  (int) dol_print_date($daykey, '%m', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
-		$jour =  (int) dol_print_date($daykey, '%d', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
+		$annee = (int) dol_print_date($daykey, '%Y', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
+		$mois = (int) dol_print_date($daykey, '%m', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
+		$jour = (int) dol_print_date($daykey, '%d', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
 
 		//print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' jour='.$jour.' mois='.$mois.' annee='.$annee."<br>\n";
 		//print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' day='.$day.' month='.$month.' year='.$year."<br>\n";
@@ -2271,7 +2271,7 @@ 
 								$event->label = $titletoshow;
 								// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
 								$titletoshow = (($event->type_picto || $event->type_code) ? $event->getTypePicto() : '');
-								$titletoshow .= $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title valignmiddle', '', 0, 0);	// do not add 'inline-block' in css here: it makes the title transformed completely into '...'
+								$titletoshow .= $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title valignmiddle', '', 0, 0); // do not add 'inline-block' in css here: it makes the title transformed completely into '...'
 								$event->label = $savlabel;
 							}
 
@@ -2315,7 +2315,7 @@ 
 									$thirdparty = $cachethirdparties[$thirdparty_id];
 								}
 								if (!empty($thirdparty->id)) {
-									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
+									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline'); // using inline-block make the content completely replace with ... when too large
 								}
 							}
 							if (!empty($contact_id) && $contact_id > 0) {
@@ -2330,7 +2330,7 @@ 
 									$linerelatedto .= '&nbsp;';
 								}
 								if (!empty($contact->id)) {
-									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
+									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline'); // using inline-block make the content completely replace with ... when too large
 								}
 							}
 							if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT')) {

htdocs/commande/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 $langs->load("orders");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date,ref', 'desc', 0, 0, 1);
-'@phan-var-force Commande[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Commande[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Commande[] $linkedObjectBlock */
 
 $total = 0;