Dolibarr / dolibarr

htdocs/accountancy/admin/productaccount.php

Spacing +12 added lines, -12 removed lines

@@ -211,8 +211,8 @@ 
 					$ko++;
 				} else {
 					if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-						$sql_exists  = "SELECT rowid FROM " . MAIN_DB_PREFIX . "product_perentity";
-						$sql_exists .= " WHERE fk_product = " . ((int) $productid) . " AND entity = " . ((int) $conf->entity);
+						$sql_exists  = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_perentity";
+						$sql_exists .= " WHERE fk_product = ".((int) $productid)." AND entity = ".((int) $conf->entity);
 						$resql_exists = $db->query($sql_exists);
 						if (!$resql_exists) {
 							$msg .= '<div><span class="error">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br> <pre>'.json_encode($resql_exists).'</pre></span></div>';
@@ -221,14 +221,14 @@ 
 							$nb_exists = $db->num_rows($resql_exists);
 							if ($nb_exists <= 0) {
 								// insert
-								$sql  = "INSERT INTO " . MAIN_DB_PREFIX . "product_perentity (fk_product, entity, " . $db->sanitize($accountancy_field_name) . ")";
-								$sql .= " VALUES (" . ((int) $productid) . ", " . ((int) $conf->entity) . ", '" . $db->escape($accounting->account_number) . "')";
+								$sql  = "INSERT INTO ".MAIN_DB_PREFIX."product_perentity (fk_product, entity, ".$db->sanitize($accountancy_field_name).")";
+								$sql .= " VALUES (".((int) $productid).", ".((int) $conf->entity).", '".$db->escape($accounting->account_number)."')";
 							} else {
 								$obj_exists = $db->fetch_object($resql_exists);
 								// update
-								$sql  = "UPDATE " . MAIN_DB_PREFIX . "product_perentity";
-								$sql .= " SET " . $db->sanitize($accountancy_field_name) . " = '" . $db->escape($accounting->account_number) . "'";
-								$sql .= " WHERE rowid = " . ((int) $obj_exists->rowid);
+								$sql  = "UPDATE ".MAIN_DB_PREFIX."product_perentity";
+								$sql .= " SET ".$db->sanitize($accountancy_field_name)." = '".$db->escape($accounting->account_number)."'";
+								$sql .= " WHERE rowid = ".((int) $obj_exists->rowid);
 							}
 						}
 					} else {
@@ -331,17 +331,17 @@ 
 $sql .= " aa.rowid as aaid";
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ppe." . $db->sanitize($accountancy_field_name) . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.account_number = ppe.".$db->sanitize($accountancy_field_name)." AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
 } else {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = p." . $db->sanitize($accountancy_field_name) . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.account_number = p.".$db->sanitize($accountancy_field_name)." AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
 }
 if (!empty($searchCategoryProductList)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if (strlen(trim($search_current_account))) {
-	$sql .= natural_search((!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p." : "ppe.") . $db->sanitize($accountancy_field_name), $search_current_account);
+	$sql .= natural_search((!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p." : "ppe.").$db->sanitize($accountancy_field_name), $search_current_account);
 }
 if ($search_current_account_valid == 'withoutvalidaccount') {
 	$sql .= " AND aa.account_number IS NULL";
@@ -630,7 +630,7 @@ 
 	} else {
 		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
-	print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p." : "ppe.") . $accountancy_field_name, "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p." : "ppe.").$accountancy_field_name, "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AssignDedicatedAccountingAccount");
 	// Action column
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

htdocs/webportal/admin/setup.php

Spacing +9 added lines, -9 removed lines

@@ -25,8 +25,8 @@ 
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "webportal", "website"));
@@ -37,7 +37,7 @@ 
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -56,7 +56,7 @@ 
 $useFormSetup = 1;
 
 if (!class_exists('FormSetup')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 }
 $formSetup = new FormSetup($db);
 
@@ -65,7 +65,7 @@ 
 $item->nameText = $langs->transnoentities('UrlPublicInterfaceLabelAdmin');
 $item->fieldAttr = array('placeholder' => 'https://');
 $item->helpText = $langs->transnoentities('UrlPublicInterfaceHelpAdmin');
-require_once __DIR__ . '/../class/context.class.php';
+require_once __DIR__.'/../class/context.class.php';
 //$context = Context::getInstance();
 //$item->fieldOutputOverride = '<a target="_blank" href="'.Context::getRootConfigUrl().'" >'.img_picto('', 'globe', 'class="pictofixedwidth"').Context::getRootConfigUrl().'</a>';
 
@@ -127,7 +127,7 @@ 
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 // Force always edit mode
 if (empty($action) || $action == 'update') {
@@ -147,7 +147,7 @@ 
 llxHeader('', $langs->trans($title), $help_url);
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -188,10 +188,10 @@ 
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 } else {
-	print '<br>' . $langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 // Page end

htdocs/webportal/lib/webportal.lib.php

Spacing +3 added lines, -3 removed lines

@@ -37,17 +37,17 @@
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/webportal/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/webportal/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/webportal/admin/setup_theme.php';
+	$head[$h][0] = DOL_URL_ROOT.'/webportal/admin/setup_theme.php';
 	$head[$h][1] = $langs->trans("SkinAndColors");
 	$head[$h][2] = 'themesettings';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/webportal/admin/configcss.php';
+	$head[$h][0] = DOL_URL_ROOT.'/webportal/admin/configcss.php';
 	$head[$h][1] = $langs->trans("CSSPage");
 	$head[$h][2] = 'css';
 	$h++;

htdocs/variants/class/ProductCombination.class.php

Spacing +2 added lines, -2 removed lines

@@ -633,7 +633,7 @@ 
 			 * @param mixed $v Feature information of a product.
 			 * @return bool
 			 */
-			static function ($v) {
+			static function($v) {
 				return !empty($v);
 			}
 		);
@@ -830,7 +830,7 @@ 
 
 			if ($forced_refvar === false) {
 				if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
-					$newproduct->ref .= getDolGlobalString('PRODUIT_ATTRIBUTES_SEPARATOR') . $prodattrval->ref;
+					$newproduct->ref .= getDolGlobalString('PRODUIT_ATTRIBUTES_SEPARATOR').$prodattrval->ref;
 				} else {
 					$newproduct->ref .= '_'.$prodattrval->ref;
 				}

htdocs/ai/ajax/generate_content.php

Spacing +2 added lines, -2 removed lines

@@ -72,10 +72,10 @@
 	if (!empty($generatedContent['code']) && $generatedContent['code'] == 429) {
 		print "Quota or allowed period exceeded. Retry Later !";
 	} elseif ($generatedContent['code'] >= 400) {
-		print "Error : " . $generatedContent['message'];
+		print "Error : ".$generatedContent['message'];
 		print '<br><a href="'.DOL_MAIN_URL_ROOT.'/ai/admin/setup.php">'.$langs->trans('ErrorGoToModuleSetup').'</a>';
 	} else {
-		print "Error returned by API call: " . $generatedContent['message'];
+		print "Error returned by API call: ".$generatedContent['message'];
 	}
 } else {
 	print $generatedContent;

htdocs/ai/class/ai.class.php

Spacing +2 added lines, -2 removed lines

@@ -129,7 +129,7 @@ 
 			]);
 
 			$headers = ([
-				'Authorization: Bearer ' . $this->apiKey,
+				'Authorization: Bearer '.$this->apiKey,
 				'Content-Type: application/json'
 			]);
 			$response = getURLContent($this->apiEndpoint, 'POST', $payload, 1, $headers);
@@ -138,7 +138,7 @@ 
 				throw new Exception('API request failed. No http received');
 			}
 			if (!empty($response['http_code']) && $response['http_code'] != 200) {
-				throw new Exception('API request failed with status code ' . $response['http_code']);
+				throw new Exception('API request failed with status code '.$response['http_code']);
 			}
 			// Decode JSON response
 			$decodedResponse = json_decode($response['content'], true);

htdocs/core/modules/modStock.class.php

Spacing +8 added lines, -8 removed lines

@@ -199,7 +199,7 @@ 
 
 		// Exports
 		//--------
-		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Export warehouses
 		$r++;
@@ -217,8 +217,8 @@ 
 			'd.code_departement' => 'List:c_departements:code_departement:code_departement:', 'c.code' => 'List:c_country:code:code:',
 			'e.phone' => 'Text', 'e.fax' => 'Text', 'e.statut' => 'Text', 'pe.rowid' => 'List:entrepot:ref:rowid:stock', 'pe.ref' => 'Text'
 		);
-		$this->export_entities_array[$r] = array();	// We define here only fields that use another icon that the one defined into export_icon
-		$this->export_aggregate_array[$r] = array();	// TODO Not used yet
+		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon
+		$this->export_aggregate_array[$r] = array(); // TODO Not used yet
 		$keyforselect = 'warehouse';
 		$keyforelement = 'warehouse';
 		$keyforaliasextra = 'extra';
@@ -265,7 +265,7 @@ 
 			'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product',
 			'ps.reel' => 'stock',
 			'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'product',
-		);	// We define here only fields that use another icon that the one defined into export_icon
+		); // We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
@@ -273,7 +273,7 @@ 
 		$this->export_dependencies_array[$r] = array('stock' => array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them.
 		$keyforselect = 'product';
 		$keyforelement = 'product';
-		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ps.reel' => 'Stock'));
 
@@ -324,7 +324,7 @@ 
 				'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product',
 				'pb.rowid' => 'batch', 'pb.batch' => 'batch', 'pb.qty' => 'batch',
 				'pl.eatby' => 'batch', 'pl.sellby' => 'batch'
-			);	// We define here only fields that use another icon that the one defined into export_icon
+			); // We define here only fields that use another icon that the one defined into export_icon
 			if (isModEnabled('barcode')) {
 				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 			}
@@ -332,7 +332,7 @@ 
 			$this->export_dependencies_array[$r] = array('stockbatch' => array('pb.rowid'), 'batch' => array('pb.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 			$keyforselect = 'product_lot';
 			$keyforelement = 'batch';
-			$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -374,7 +374,7 @@ 
 			'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse',
 			'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product",
 			'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product'
-		);	// We define here only fields that use another icon that the one defined into export_icon
+		); // We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('productbatch')) {
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['sm.batch'] = 'Text';

htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php

Spacing +2 added lines, -2 removed lines

@@ -92,8 +92,8 @@
 						$task->fk_project = $object->id;
 						$defaultref = '';
 						$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-						if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . ".php")) {
-							require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . '.php';
+						if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
+							require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').'.php';
 							$modTask = new $obj();
 							$defaultref = $modTask->getNextValue($object->thirdparty, null);
 						}