Dolibarr / dolibarr

dev/build/generate_filelist_xml.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 if (!defined('NOREQUIREDB')) {
-	define('NOREQUIREDB', '1');	// Do not create database handler $db
+	define('NOREQUIREDB', '1'); // Do not create database handler $db
 }
 
 $sapi_type = php_sapi_name();
@@ -60,7 +60,7 @@ 
 $result = array();
 while ($i < $argc) {
 	if (!empty($argv[$i])) {
-		parse_str($argv[$i], $result);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
+		parse_str($argv[$i], $result); // set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
 	if (!empty($result["release"])) {
 		$release = $result["release"];
@@ -75,9 +75,9 @@ 
 		$buildzip = 1;
 	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
-		$tmp = explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
+		$tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {
-			print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
+			print "Error: Bad parameter includeconstant=".$result['includeconstant']."\n";
 			exit -1;
 		}
 		$includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
@@ -168,7 +168,7 @@ 
 
 // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
 $dir = '';
@@ -210,7 +210,7 @@ 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
 $regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude = '(custom|documents|conf|install)$';  // Exclude dirs
+$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 $needtoclose = 0;
@@ -250,7 +250,7 @@ 
 fputs($fp, '<dolibarr_unalterable_files version="'.$release.'">'."\n");
 
 $regextoinclude = '(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/blockedlog', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 $needtoclose = 0;
@@ -277,7 +277,7 @@ 
 }
 // Add the SQL file
 $regextoinclude = 'llx_blockedlog.*(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'files', 0, $regextoinclude, $regextoexclude, 'fullname');
 $needtoclose = 0;
 foreach ($files as $filetmp) {

htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 		$b = new BlockedLog($this->db);
-		$b->loadTrackedEvents();			// Get the list of tracked events into $b->trackedevents
+		$b->loadTrackedEvents(); // Get the list of tracked events into $b->trackedevents
 
 		// Tracked events
 		if (!in_array($action, array_keys($b->trackedevents))) {

htdocs/multicurrency/multicurrency_rate.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
-$mode       = GETPOST('mode', 'aZ'); // The display mode ('list', 'kanban', 'hierarchy', 'calendar', 'gantt', ...)
+$mode = GETPOST('mode', 'aZ'); // The display mode ('list', 'kanban', 'hierarchy', 'calendar', 'gantt', ...)
 
 // Load variable for pagination
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -486,7 +486,7 @@ 
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup
 	$selectedfields = (($mode != 'kanban' && $mode != 'kanbangroupby') ? $htmlofselectarray : '');
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -578,9 +578,9 @@ 
 				print '<td class="center">';
 				print '</td>';
 			}
-			print '<td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
-			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-			print '<td><input type="text" min="0" step="any" class="maxwidth100" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
+			print '<td><input class="minwidth200" name="dateinput" value="'.date('Y-m-d', dol_stringtotime($obj->date_sync)).'" type="date"></td>';
+			print '<td>'.$form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true).'</td>';
+			print '<td><input type="text" min="0" step="any" class="maxwidth100" name="rateinput" value="'.dol_escape_htmltag($obj->rate).'">';
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag((string) $page).'">';
 			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
 			print '<button type="submit" class="button small reposition" name="action" value="update">'.$langs->trans("Modify").'</button>';
@@ -626,7 +626,7 @@ 
 				print ' - <span class="opacitymedium">'.$obj->name.'</span>';
 				print "</td>\n";
 
-				if (! $i) {
+				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
@@ -636,7 +636,7 @@ 
 				print '<td class="tdoverflowmax200">';
 				print $obj->rate;
 				print "</td>\n";
-				if (! $i) {
+				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
@@ -646,7 +646,7 @@ 
 				print '<td class="tdoverflowmax200">';
 				print $obj->rate_indirect;
 				print "</td>\n";
-				if (! $i) {
+				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
@@ -654,7 +654,7 @@ 
 
 			// Fields from hook
 			$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
 			// Action

htdocs/holiday/class/holiday.class.php

Spacing +17 added lines, -17 removed lines

@@ -232,7 +232,7 @@ 
 		if (getDolGlobalString('HOLIDAY_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('HOLIDAY_ADDON') . ".php";
+			$file = getDolGlobalString('HOLIDAY_ADDON').".php";
 			$classname = getDolGlobalString('HOLIDAY_ADDON');
 
 			// Include file with class
@@ -462,7 +462,7 @@ 
 				$this->date_fin_gmt = $this->db->jdate($obj->date_fin, 1);
 				$this->halfday = $obj->halfday;
 				$this->status = $obj->status;
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->fk_validator = $obj->fk_validator;
 				$this->date_valid = $this->db->jdate($obj->date_valid);
 				$this->fk_user_valid = $obj->fk_user_valid;
@@ -828,8 +828,8 @@ 
 			// Rename directory if dir was a temporary ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
-				$sql = 'UPDATE ' . MAIN_DB_PREFIX . "ecm_files set filename = CONCAT('" . $this->db->escape($this->newref) . "', SUBSTR(filename, " . (strlen($this->ref) + 1) . ")), filepath = 'holiday/" . $this->db->escape($this->newref) . "'";
-				$sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'holiday/" . $this->db->escape($this->ref) . "' and entity = " . ((int) $conf->entity);
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'holiday/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'holiday/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -846,19 +846,19 @@ 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
-				$dirsource = $conf->holiday->multidir_output[$this->entity] . '/' . $oldref;
-				$dirdest = $conf->holiday->multidir_output[$this->entity] . '/' . $newref;
+				$dirsource = $conf->holiday->multidir_output[$this->entity].'/'.$oldref;
+				$dirdest = $conf->holiday->multidir_output[$this->entity].'/'.$newref;
 				if (!$error && file_exists($dirsource)) {
-					dol_syslog(get_class($this) . "::validate rename dir " . $dirsource . " into " . $dirdest);
+					dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
-						$listoffiles = dol_dir_list($dirdest, 'files', 1, '^' . preg_quote($oldref, '/'));
+						$listoffiles = dol_dir_list($dirdest, 'files', 1, '^'.preg_quote($oldref, '/'));
 						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
-							$dirdest = preg_replace('/^' . preg_quote($oldref, '/') . '/', $newref, $dirsource);
-							$dirsource = $fileentry['path'] . '/' . $dirsource;
-							$dirdest = $fileentry['path'] . '/' . $dirdest;
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
 							@rename($dirsource, $dirdest);
 						}
 					}
@@ -1386,7 +1386,7 @@ 
 			} else {
 				$labeltoshow = (($typeleaves[$this->fk_type]['code'] && $langs->trans($typeleaves[$this->fk_type]['code']) != $typeleaves[$this->fk_type]['code']) ? $langs->trans($typeleaves[$this->fk_type]['code']) : $typeleaves[$this->fk_type]['label']);
 			}
-			$datas['type'] = '<br><b>'.$langs->trans("Type") . ':</b> ' . $labeltoshow;
+			$datas['type'] = '<br><b>'.$langs->trans("Type").':</b> '.$labeltoshow;
 		}
 		if (isset($this->halfday) && !empty($this->date_debut) && !empty($this->date_fin)) {
 			$listhalfday = array(
@@ -1395,8 +1395,8 @@ 
 			);
 			$starthalfday = ($this->halfday == -1 || $this->halfday == 2) ? 'afternoon' : 'morning';
 			$endhalfday = ($this->halfday == 1 || $this->halfday == 2) ? 'morning' : 'afternoon';
-			$datas['date_start'] = '<br><b>'.$langs->trans('DateDebCP') . '</b>: '. dol_print_date($this->date_debut, 'day') . '&nbsp;&nbsp;<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-			$datas['date_end'] = '<br><b>'.$langs->trans('DateFinCP') . '</b>: '. dol_print_date($this->date_fin, 'day') . '&nbsp;&nbsp;<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+			$datas['date_start'] = '<br><b>'.$langs->trans('DateDebCP').'</b>: '.dol_print_date($this->date_debut, 'day').'&nbsp;&nbsp;<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+			$datas['date_end'] = '<br><b>'.$langs->trans('DateFinCP').'</b>: '.dol_print_date($this->date_fin, 'day').'&nbsp;&nbsp;<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
 		}
 
 
@@ -1477,7 +1477,7 @@ 
 		$result .= $linkend;
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -1678,7 +1678,7 @@ 
 			$now = dol_now();
 
 			// Get month of last update
-			$stringInDBForLastUpdate = $this->getConfCP('lastUpdate', dol_print_date($now, '%Y%m%d%H%M%S'));	// Example '20200101120000'
+			$stringInDBForLastUpdate = $this->getConfCP('lastUpdate', dol_print_date($now, '%Y%m%d%H%M%S')); // Example '20200101120000'
 			// Protection when $lastUpdate has a not valid value
 			if ($stringInDBForLastUpdate < '20000101000000') {
 				$stringInDBForLastUpdate = '20000101000000';
@@ -2367,7 +2367,7 @@ 
 		$sql = "SELECT rowid, code, label, affect, delay, newbymonth";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_holiday_types";
 		$sql .= " WHERE (fk_country IS NULL OR fk_country = ".((int) $mysoc->country_id).')';
-		$sql .= " AND entity IN (0, ".getEntity('c_holiday_types').")";		// Need entity 0 (holiday types common to all countries= + current entity).
+		$sql .= " AND entity IN (0, ".getEntity('c_holiday_types').")"; // Need entity 0 (holiday types common to all countries= + current entity).
 		if ($active >= 0) {
 			$sql .= " AND active = ".((int) $active);
 		}

htdocs/blockedlog/class/blockedlog.class.php

Spacing +7 added lines, -7 removed lines

@@ -464,7 +464,7 @@ 
 			'linkedObjectsIds',
 			'linkedObjects',
 			'fk_delivery_address',
-			'projet',          // There is already ->fk_project
+			'projet', // There is already ->fk_project
 			'restrictiononfksoc',
 			'specimen',
 		);
@@ -809,10 +809,10 @@ 
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) {
-				$this->id 				= $obj->rowid;
-				$this->entity 			= $obj->entity;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
 
-				$this->date_creation 	= $this->db->jdate($obj->date_creation);
+				$this->date_creation = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->tms);
 
 				$this->amounts			= (float) $obj->amounts;
@@ -830,7 +830,7 @@ 
 				$this->object_version = $obj->object_version;
 
 				$this->signature		= $obj->signature;
-				$this->signature_line 	= $obj->signature_line;
+				$this->signature_line = $obj->signature_line;
 				$this->certified		= ($obj->certified == 1);
 
 				return 1;
@@ -950,7 +950,7 @@ 
 
 		$previoushash = $this->getPreviousHash(1, 0); // This get last record and lock database until insert is done and transaction closed
 
-		$keyforsignature = $this->buildKeyForSignature();	// All the information for the hash (meta data + data saved)
+		$keyforsignature = $this->buildKeyForSignature(); // All the information for the hash (meta data + data saved)
 
 		$this->debuginfo = $this->buildFirstPartOfKeyForSignature();
 
@@ -979,7 +979,7 @@ 
 		$sql .= " fk_user,";
 		$sql .= " user_fullname,";
 		$sql .= " entity,";
-		$sql .= " debuginfo";	// Only stored
+		$sql .= " debuginfo"; // Only stored
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($this->date_creation)."',";
 		$sql .= "'".$this->db->escape($this->action)."',";