Dolibarr / dolibarr

htdocs/core/modules/modHoliday.class.php

Spacing +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
 		$this->import_icon[$r] = 'holiday';
 		$this->import_tables_array[$r] = array('d' => MAIN_DB_PREFIX.'holiday');
 		$this->import_fields_array[$r] = array(
-			'd.ref' => 'Ref*', 'd.fk_user' => 'UserID*', 'd.fk_type' => 'TypeOfLeaveId*','d.fk_validator' => 'ApprovedBy*',
+			'd.ref' => 'Ref*', 'd.fk_user' => 'UserID*', 'd.fk_type' => 'TypeOfLeaveId*', 'd.fk_validator' => 'ApprovedBy*',
 			'd.date_debut' => 'DateStart*', 'd.date_fin' => 'DateEnd*', 'd.halfday' => 'HalfDay', 'd.description' => 'Description*',
 			'd.date_create' => 'DateCreation*'
 		);

htdocs/filefunc.inc.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 
-require_once 'version.inc.php';		// Define the DOL_VERSION
+require_once 'version.inc.php'; // Define the DOL_VERSION
 
 
 // Define syslog constants
@@ -125,7 +125,7 @@ 
 // Define localization of conf file
 // --- Start of part replaced by Dolibarr packager makepack-dolibarr
 $conffile = "conf/conf.php";
-$conffiletoshow = "htdocs/conf/conf.php";	// Used into the include
+$conffiletoshow = "htdocs/conf/conf.php"; // Used into the include
 // For debian/redhat like systems
 //$conffile = "/etc/dolibarr/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";

htdocs/webportal/controllers/document.controller.class.php

Spacing +18 added lines, -18 removed lines

@@ -23,7 +23,7 @@ 
 * \brief       This file is a controller for documents
 */
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 /**
@@ -152,7 +152,7 @@ 
 		}
 
 		// Security: Delete string ../ or ..\ into $original_file
-		$original_file = preg_replace('/\.\.+/', '..', $original_file);    // Replace '... or more' with '..'
+		$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
 		$original_file = str_replace('../', '/', $original_file);
 		$original_file = str_replace('..\\', '/', $original_file);
 
@@ -169,13 +169,13 @@ 
 		// check config access
 		// and file mime type (only PDF)
 		// and check login access
-		if (getDolGlobalInt('WEBPORTAL_' . $moduleNameUpperEn . '_LIST_ACCESS')
+		if (getDolGlobalInt('WEBPORTAL_'.$moduleNameUpperEn.'_LIST_ACCESS')
 			&& in_array($type, array('application/pdf'))
 			&& ($context->logged_thirdparty && $context->logged_thirdparty->id > 0)
 			&& $context->logged_thirdparty->id == $socId
 		) {
 			if (isModEnabled($moduleName) && isset($conf->{$moduleName}->multidir_output[$entity])) {
-				$original_file = $conf->{$moduleName}->multidir_output[$entity] . '/' . $original_file;
+				$original_file = $conf->{$moduleName}->multidir_output[$entity].'/'.$original_file;
 				$accessallowed = 1;
 			}
 		}
@@ -190,13 +190,13 @@ 
 		// Security:
 		// We refuse directory transversal change and pipes in file names
 		if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file)) {
-			dol_syslog("Refused to deliver file " . $fullpath_original_file);
-			print "ErrorFileNameInvalid: " . dol_escape_htmltag($original_file);
+			dol_syslog("Refused to deliver file ".$fullpath_original_file);
+			print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);
 			exit;
 		}
 
 		// Find the subdirectory name as the reference
-		$refname = basename(dirname($original_file) . "/");
+		$refname = basename(dirname($original_file)."/");
 
 		$filename = basename($fullpath_original_file);
 		$filename = preg_replace('/\.noexe$/i', '', $filename);
@@ -207,8 +207,8 @@ 
 
 		// This test if file exists should be useless. We keep it to find bug more easily
 		if (!file_exists($fullpath_original_file_osencoded)) {
-			dol_syslog("ErrorFileDoesNotExists: " . $fullpath_original_file);
-			print "ErrorFileDoesNotExists: " . $original_file;
+			dol_syslog("ErrorFileDoesNotExists: ".$fullpath_original_file);
+			print "ErrorFileDoesNotExists: ".$original_file;
 			exit;
 		}
 
@@ -217,8 +217,8 @@ 
 		if ($fileSizeMax && $fileSize > ($fileSizeMax * 1024)) {
 			// FIX: Convert limit from Ko to bytes for proper comparison
 			$fileSizeKb = round($fileSize / 1024, 2);
-			dol_syslog('ErrorFileSizeTooLarge: ' . $fileSize . ' bytes (' . $fileSizeKb . ' Kb) - max allowed: ' . $fileSizeMax . ' Kb');
-			print 'ErrorFileSizeTooLarge: ' . $fileSizeKb . ' Kb (max ' . $fileSizeMax . ' Kb)';
+			dol_syslog('ErrorFileSizeTooLarge: '.$fileSize.' bytes ('.$fileSizeKb.' Kb) - max allowed: '.$fileSizeMax.' Kb');
+			print 'ErrorFileSizeTooLarge: '.$fileSizeKb.' Kb (max '.$fileSizeMax.' Kb)';
 			exit;
 		}
 
@@ -230,9 +230,9 @@ 
 		$object = new stdClass();
 		$reshook = $hookmanager->executeHooks('downloadDocument', $parameters, $object, $action); // Note that $action and $object may have been
 		if ($reshook < 0) {
-			$errors = $hookmanager->error . (is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '') . implode(', ', $hookmanager->errors) : '');
-			dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : " . $errors);
-			print "ErrorDownloadDocumentHooks: " . $errors;
+			$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').implode(', ', $hookmanager->errors) : '');
+			dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);
+			print "ErrorDownloadDocumentHooks: ".$errors;
 			exit;
 		}
 
@@ -310,19 +310,19 @@ 
 		top_httphead($type);
 		header('Content-Description: File Transfer');
 		if ($encoding) {
-			header('Content-Encoding: ' . $encoding);
+			header('Content-Encoding: '.$encoding);
 		}
 		// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
 		if ($attachment) {
-			header('Content-Disposition: attachment; filename="' . $filename . '"');
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
 		} else {
-			header('Content-Disposition: inline; filename="' . $filename . '"');
+			header('Content-Disposition: inline; filename="'.$filename.'"');
 		}
 		header('Cache-Control: Public, must-revalidate');
 		header('Pragma: public');
 
 		// Send file now
-		header('Content-Length: ' . dol_filesize($fullpath_original_file));
+		header('Content-Length: '.dol_filesize($fullpath_original_file));
 		readfileLowMemory($fullpath_original_file_osencoded);
 	}
 }

htdocs/product/stock/class/api_productlots.class.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 
 use Luracast\Restler\RestException;
 
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/productlot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
 /**
  * API class for Product lots
@@ -269,7 +269,7 @@ 
 		if ($result) {
 			$this->productlot->fetch_optionals();
 			$this->productlot->fetch_userassigned();
-			$this->productlot->oldcopy = clone $this->productlot;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$this->productlot->oldcopy = clone $this->productlot; // @phan-suppress-current-line PhanTypeMismatchProperty
 		}
 		if (!$result) {
 			throw new RestException(404, 'productlot not found');
@@ -326,7 +326,7 @@ 
 		$result = $this->productlot->fetch($id);
 		if ($result) {
 			$this->productlot->fetch_optionals();
-			$this->productlot->oldcopy = clone $this->productlot;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$this->productlot->oldcopy = clone $this->productlot; // @phan-suppress-current-line PhanTypeMismatchProperty
 		}
 
 		if (!$result) {

Braces +6 added lines, -2 removed lines

@@ -161,7 +161,9 @@ 
 
 		while ($i < $max) {
 			$obj = $this->db->fetch_object($res);
-			if (!$obj) break;
+			if (!$obj) {
+				break;
+			}
 
 			$pl = new Productlot($this->db);
 			if ($pl->fetch((int) $obj->rowid) > 0) {
@@ -176,7 +178,9 @@ 
 			$totRes = $this->db->query($sqlTotals);
 			if ($totRes) {
 				$row = $this->db->fetch_object($totRes);
-				if ($row && isset($row->total)) $total = (int) $row->total;
+				if ($row && isset($row->total)) {
+					$total = (int) $row->total;
+				}
 			}
 
 			// Evite division par zéro

htdocs/version.inc.php

Spacing +1 added lines, -1 removed lines

@@ -43,5 +43,5 @@
 // DOL_VERSION is now a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('CERTIF_LNE')) {
-	define('CERTIF_LNE', '1');	// Set to 1 if the beta version is a candidate for certification or if the stable version has been certified. Use 2 for debug to force LNE features.
+	define('CERTIF_LNE', '1'); // Set to 1 if the beta version is a candidate for certification or if the stable version has been certified. Use 2 for debug to force LNE features.
 }

htdocs/fourn/facture/list.php

Spacing +12 added lines, -12 removed lines

@@ -93,7 +93,7 @@ 
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOST('search_status', 'intcomma');	// Can be '' or a numeric
+$search_status = GETPOST('search_status', 'intcomma'); // Can be '' or a numeric
 $search_paymentmode = GETPOST('search_paymentmode', 'intcomma');
 $search_paymentcond = GETPOST('search_paymentcond') ? GETPOSTINT('search_paymentcond') : '';
 $search_vat_reverse_charge = GETPOST('search_vat_reverse_charge', 'alpha');
@@ -692,10 +692,10 @@ 
 	$sql .= " AND f.vat_reverse_charge = ".((int) $search_vat_reverse_charge);
 }
 if ($search_date_start) {
-	$sql .= " AND f.datef >= '" . $db->idate($search_date_start) . "'";
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
 }
 if ($search_date_end) {
-	$sql .= " AND f.datef <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
 }
 if ($search_note_public) {
 	$sql .= " AND f.note_public LIKE '%".$db->escape($db->escapeforlike($search_note_public))."%'";
@@ -704,10 +704,10 @@ 
 	$sql .= " AND f.note_private LIKE '%".$db->escape($db->escapeforlike($search_note_private))."%'";
 }
 if ($search_datelimit_start) {
-	$sql .= " AND f.date_lim_reglement >= '" . $db->idate($search_datelimit_start) . "'";
+	$sql .= " AND f.date_lim_reglement >= '".$db->idate($search_datelimit_start)."'";
 }
 if ($search_datelimit_end) {
-	$sql .= " AND f.date_lim_reglement <= '" . $db->idate($search_datelimit_end) . "'";
+	$sql .= " AND f.date_lim_reglement <= '".$db->idate($search_datelimit_end)."'";
 }
 if ($option == 'late') {
 	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
@@ -737,7 +737,7 @@ 
 			if ($searchCategorySupplierInvoiceOperator == 0) {
 				$searchCategorySupplierInvoiceSqlList[] = " EXISTS (SELECT ck.fk_supplier_invoice FROM ".MAIN_DB_PREFIX."categorie_supplier_invoice as ck WHERE f.rowid = ck.fk_supplier_invoice AND ck.fk_categorie = ".((int) $searchCategorySupplierInvoice).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplierInvoice);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategorySupplierInvoice);
 			}
 		}
 	}
@@ -767,7 +767,7 @@ 
 			if ($searchCategorySupplierOperator == 0) {
 				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategorySupplier).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplier);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategorySupplier);
 			}
 		}
 	}
@@ -797,7 +797,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND fd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -904,8 +904,8 @@ 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-fourn-facture page-list');
 
 if ($search_fk_fac_rec_source) {
-	require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 	$object = new FactureFournisseurRec($db);
 	$object->fetch((int) $search_fk_fac_rec_source);
 
@@ -1055,7 +1055,7 @@ 
 	$param .= '&search_type_thirdparty='.$search_type_thirdparty;
 }
 if ($search_fk_fac_rec_source) {
-	$param .= '&search_fk_fac_rec_source=' . (int) $search_fk_fac_rec_source;
+	$param .= '&search_fk_fac_rec_source='.(int) $search_fk_fac_rec_source;
 }
 
 // Add $param from extra fields
@@ -1188,7 +1188,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');