Dolibarr / dolibarr

htdocs/comm/index.php

Spacing +3 added lines, -3 removed lines

@@ -552,9 +552,9 @@
 			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
-				$fichinterstatic->id=$obj->rowid;
-				$fichinterstatic->ref=$obj->ref;
-				$fichinterstatic->statut=$obj->fk_statut;
+				$fichinterstatic->id = $obj->rowid;
+				$fichinterstatic->ref = $obj->ref;
+				$fichinterstatic->statut = $obj->fk_statut;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;

htdocs/cron/list.php

Spacing +1 added lines, -1 removed lines

@@ -611,7 +611,7 @@
 		print '<td class="center tdlastresultcode" title="'.dol_escape_htmltag($obj->lastresult).'">';
 		if ($obj->lastresult != '') {
 			if (empty($obj->lastresult)) {
-				print $obj->lastresult;		// Print '0'
+				print $obj->lastresult; // Print '0'
 			} else {
 				print '<span class="error">'.dol_escape_htmltag(dol_trunc($obj->lastresult)).'</div>';
 			}

htdocs/admin/accountant.php

Spacing +14 added lines, -14 removed lines

@@ -46,26 +46,26 @@
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); 	// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 || ($action == 'updateedit')) {
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME",    GETPOST("nom", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN",    GETPOST("town", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP",     GETPOST("zipcode", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE",   GETPOST("state_id", 'int'),            'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION",  GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'),          'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE",   GETPOST("tel", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX",     GETPOST("fax", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL",    GETPOST("mail", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB",     GETPOST("web", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE",    GETPOST("code", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE",    GETPOST("note", 'restricthtml'),       'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity);
 
 	if ($action != 'updateedit' && !$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php

Spacing +3 added lines, -3 removed lines

@@ -208,12 +208,12 @@
 
 		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
+		if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
 			$literaltype = '';
-			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
+			$literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type
 			switch ($literaltype) {
 				case 'EAN13': //EAN13 rowid = 2
-					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
+					if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
 							$eansum = barcode_gen_ean_sum($ean);
 							$ean .= $eansum; //substitute the las character by the key

htdocs/core/lib/files.lib.php

Braces +12 added lines, -4 removed lines

@@ -1003,7 +1003,9 @@ 
 				$files = dol_dir_list($newpathofdestdir);
 				if (!empty($files) && is_array($files)) {
 					foreach ($files as $key => $file) {
-						if (!file_exists($file["fullname"])) continue;
+						if (!file_exists($file["fullname"])) {
+							continue;
+						}
 						$filepath = $file["path"];
 						$oldname = $file["name"];
 
@@ -1718,7 +1720,9 @@ 
 					// Update index table of files (llx_ecm_files)
 					if ($donotupdatesession == 1) {
 						$sharefile = 0;
-						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && !empty($conf->global->PRODUCT_ALLOW_EXTERNAL_DOWNLOAD)) $sharefile = 1;
+						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && !empty($conf->global->PRODUCT_ALLOW_EXTERNAL_DOWNLOAD)) {
+							$sharefile = 1;
+						}
 						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', $sharefile, $object);
 						if ($result < 0) {
 							if ($allowoverwrite) {
@@ -1873,8 +1877,12 @@ 
 				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
 				return -1;
 			}
-			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
-			if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
+			if (isset($object->src_object_description)) {
+				$ecmfile->description = $object->src_object_description;
+			}
+			if (isset($object->src_object_keywords)) {
+				$ecmfile->keywords = $object->src_object_keywords;
+			}
 		}
 
 		if (!empty($conf->global->MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE)) {

Spacing +7 added lines, -7 removed lines

@@ -1818,7 +1818,7 @@ 
 					$maxwidthmini = $tmparraysize['maxwidthmini'];
 					$maxheightmini = $tmparraysize['maxheightmini'];
 					//$quality = $tmparraysize['quality'];
-					$quality = 50;	// For thumbs, we force quality to 50
+					$quality = 50; // For thumbs, we force quality to 50
 
 					// Generate thumbs.
 					if ($generatethumbs) {
@@ -1997,7 +1997,7 @@ 
 			if (isset($object->table_element)) {
 				$ecmfile->src_object_type = $object->table_element;
 			} else {
-				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
+				dol_syslog('Error: object '.get_class($object).' has no table_element attribute.');
 				return -1;
 			}
 			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
@@ -2197,9 +2197,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);
 						$relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1);
@@ -2461,9 +2461,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);
 						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1);
@@ -2524,7 +2524,7 @@ 
 function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
 {
 	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
-	return isset($tmparray[0])?$tmparray[0]:null;
+	return isset($tmparray[0]) ? $tmparray[0] : null;
 }
 
 /**

htdocs/holiday/card_group.php

Braces +3 added lines, -1 removed lines

@@ -335,7 +335,9 @@
 								if ($AutoSendMail && !$error) {
 									// send a mail to the user
 									$returnSendMail = sendMail($result, $cancreate, $now, $autoValidation);
-									if (!empty($returnSendMail->msg))  setEventMessage($returnSendMail->msg, $returnSendMail->style);
+									if (!empty($returnSendMail->msg)) {
+										setEventMessage($returnSendMail->msg, $returnSendMail->style);
+									}
 								}
 							}
 						}

Spacing +20 added lines, -20 removed lines

@@ -46,14 +46,14 @@ 
 $action 		= GETPOST('action', 'aZ09');
 $cancel 		= GETPOST('cancel', 'alpha');
 $confirm 		= GETPOST('confirm', 'alpha');
-$id 			= GETPOST('id', 'int');
-$ref 			= GETPOST('ref', 'alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 $fuserid 		= (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
-$users 			=  (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id));
+$users 			= (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id));
 $groups 		= GETPOST('groups', 'array');
 $socid 			= GETPOST('socid', 'int');
-$autoValidation 	= GETPOST('autoValidation', 'int');
-$AutoSendMail   = GETPOST('AutoSendMail', 'int');
+$autoValidation = GETPOST('autoValidation', 'int');
+$AutoSendMail = GETPOST('AutoSendMail', 'int');
 // Load translation files required by the page
 $langs->loadLangs(array("other", "holiday", "mails", "trips"));
 
@@ -163,8 +163,8 @@ 
 		}
 
 		if (!$error) {
-			$users 		=  GETPOST('users', 'array');
-			$groups 	=  GETPOST('groups', 'array');
+			$users 		= GETPOST('users', 'array');
+			$groups 	= GETPOST('groups', 'array');
 
 			$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
 			$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
@@ -264,9 +264,9 @@ 
 				// usergroup  select
 				// better perf on single sql
 				/** GROUPS */
-				$sql = ' SELECT DISTINCT u.rowid,u.lastname,u.firstname from ' . MAIN_DB_PREFIX . 'user as  u';
-				$sql .= ' LEFT JOIN  ' . MAIN_DB_PREFIX . 'usergroup_user as ug on ug.fk_user = u.rowid  ';
-				$sql .= ' WHERE  fk_usergroup in (' .$db->sanitize(implode(',', $groups)) . ')';
+				$sql = ' SELECT DISTINCT u.rowid,u.lastname,u.firstname from '.MAIN_DB_PREFIX.'user as  u';
+				$sql .= ' LEFT JOIN  '.MAIN_DB_PREFIX.'usergroup_user as ug on ug.fk_user = u.rowid  ';
+				$sql .= ' WHERE  fk_usergroup in ('.$db->sanitize(implode(',', $groups)).')';
 				$resql = $db->query($sql);
 
 				if ($resql) {
@@ -290,7 +290,7 @@ 
 						$result = $userError->fetch($u);
 
 						if ($result) {
-							setEventMessages($langs->trans("UseralreadyCPexist", $userError->firstname . ' '. $userError->lastname), null, 'errors');
+							setEventMessages($langs->trans("UseralreadyCPexist", $userError->firstname.' '.$userError->lastname), null, 'errors');
 						} else {
 							setEventMessages($langs->trans("ErrorUserFetch", $u), null, 'errors');
 						}
@@ -327,7 +327,7 @@ 
 								$htemp->statut = Holiday::STATUS_VALIDATED;
 								$resultValidated = $htemp->update($approverid);
 
-								if ($resultValidated < 0 ) {
+								if ($resultValidated < 0) {
 									setEventMessages($object->error, $object->errors, 'errors');
 									$error++;
 								}
@@ -495,7 +495,7 @@ 
 		print '<td>';
 		print img_picto($langs->trans("groups"), 'group', 'class="pictofixedwidth"');
 
-		$sql =' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup WHERE entity IN ('.getEntity('usergroup').')';
+		$sql = ' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup WHERE entity IN ('.getEntity('usergroup').')';
 		$resql = $db->query($sql);
 		$Tgroup = array();
 		while ($obj = $db->fetch_object($resql)) {
@@ -524,7 +524,7 @@ 
 			}
 		}
 
-		print img_picto('', 'users') . $form->multiselectarray('users', $userlist, GETPOST('users', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+		print img_picto('', 'users').$form->multiselectarray('users', $userlist, GETPOST('users', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print '</td>';
 
 		// Type
@@ -700,7 +700,7 @@ 
 					$objStd->error++;
 					$objStd->msg = $langs->trans('ErroremailTo');
 					$objStd->status = 'error';
-					$objStd->style="warnings";
+					$objStd->style = "warnings";
 					return $objStd;
 				}
 
@@ -726,7 +726,7 @@ 
 
 				// option to warn the validator in case of too short delay
 				if (empty($conf->global->HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY)) {
-					$delayForRequest = 0;		// TODO Set delay depending of holiday leave type
+					$delayForRequest = 0; // TODO Set delay depending of holiday leave type
 					if ($delayForRequest) {
 						$nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd');
 
@@ -762,7 +762,7 @@ 
 					$endhalfdaykey = "Afternoon";
 				}
 
-				$link = dol_buildpath("/holiday/card.php", 3) . '?id='.$object->id;
+				$link = dol_buildpath("/holiday/card.php", 3).'?id='.$object->id;
 
 				$message .= "<ul>";
 				$message .= "<li>".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n";
@@ -781,7 +781,7 @@ 
 				if (!$result) {
 					$objStd->error++;
 					$objStd->msg = $langs->trans('ErroreSendmail');
-					$objStd->style="warnings";
+					$objStd->style = "warnings";
 					$objStd->status = 'error';
 				} else {
 					$objStd->msg = $langs->trans('mailSended');
@@ -792,7 +792,7 @@ 
 				$objStd->error++;
 				$objStd->msg = $langs->trans('ErroreVerif');
 				$objStd->status = 'error';
-				$objStd->style="errors";
+				$objStd->style = "errors";
 				return $objStd;
 			}
 		}
@@ -800,7 +800,7 @@ 
 		$objStd->error++;
 		$objStd->msg = $langs->trans('ErrorloadUserOnSendingMail');
 		$objStd->status = 'error';
-		$objStd->style="warnings";
+		$objStd->style = "warnings";
 		return $objStd;
 	}
 

htdocs/projet/tasks/note.php

Spacing +2 added lines, -2 removed lines

@@ -115,9 +115,9 @@
 
 $now = dol_now();
 
-$title = $object->ref . ' - ' . $langs->trans("Notes");
+$title = $object->ref.' - '.$langs->trans("Notes");
 if (!empty($withproject)) {
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
 }
 $help_url = '';
 

htdocs/projet/tasks/document.php

Spacing +2 added lines, -2 removed lines

@@ -121,9 +121,9 @@
  */
 $form = new Form($db);
 
-$title = $object->ref . ' - ' . $langs->trans("Documents");
+$title = $object->ref.' - '.$langs->trans("Documents");
 if (!empty($withproject)) {
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
 }
 $help_url = '';
 

htdocs/projet/tasks/contact.php

Spacing +2 added lines, -2 removed lines

@@ -146,9 +146,9 @@
 $userstatic = new User($db);
 $result = $projectstatic->fetch($object->fk_project);
 
-$title = $object->ref . ' - ' . $langs->trans("Contacts");
+$title = $object->ref.' - '.$langs->trans("Contacts");
 if (!empty($withproject)) {
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
 }
 $help_url = '';