Dolibarr / dolibarr

htdocs/ai/class/ai.class.php

Spacing +3 added lines, -3 removed lines

@@ -64,19 +64,19 @@
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['prompt' => $instructions]));
 			curl_setopt($ch, CURLOPT_HTTPHEADER, [
-				'Authorization: Bearer ' . $this->apiKey,
+				'Authorization: Bearer '.$this->apiKey,
 				'Content-Type: application/json'
 			]);
 
 			$response = curl_exec($ch);
 
 			if (curl_errno($ch)) {
-				throw new Exception('cURL error: ' . curl_error($ch));
+				throw new Exception('cURL error: '.curl_error($ch));
 			}
 
 			$statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if ($statusCode != 200) {
-				throw new Exception('API request failed with status code ' . $statusCode);
+				throw new Exception('API request failed with status code '.$statusCode);
 			}
 
 			return $response;

htdocs/mrp/mo_production.php

Spacing +47 added lines, -47 removed lines

@@ -133,7 +133,7 @@ 
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
 		$result = $object->cancel($user, 0, $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
-			header("Location: " . dol_buildpath('/mrp/mo_card.php?id=' . $object->id, 1));
+			header("Location: ".dol_buildpath('/mrp/mo_card.php?id='.$object->id, 1));
 			exit;
 		} else {
 			$action = '';
@@ -143,7 +143,7 @@ 
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
 		$result = $object->delete($user, 0, $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
-			header("Location: " . $backurlforlist);
+			header("Location: ".$backurlforlist);
 			exit;
 		} else {
 			$action = '';
@@ -603,7 +603,7 @@ 
 				'value' => !getDolGlobalString('MO_ALSO_CANCEL_CONSUMED_AND_PRODUCED_LINES_BY_DEFAULT') ? 0 : 1
 			),
 		);
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CancelMo'), $langs->trans('ConfirmCancelMo'), 'confirm_cancel', $formquestion, 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CancelMo'), $langs->trans('ConfirmCancelMo'), 'confirm_cancel', $formquestion, 0, 1);
 	}
 
 	// Call Hook formConfirm
@@ -841,7 +841,7 @@ 
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
 		// Unit
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-			print '<td class="right">' . $langs->trans("Unit") . '</td>';
+			print '<td class="right">'.$langs->trans("Unit").'</td>';
 		}
 		// Cost price
 		if ($permissiontoupdatecost && getDolGlobalString('MRP_SHOW_COST_FOR_CONSUMPTION')) {
@@ -958,7 +958,7 @@ 
 
 		// Lines to consume
 
-		$bomcostupdated = 0;	// We will recalculate the unitary cost to produce a product using the real "products to consume into MO"
+		$bomcostupdated = 0; // We will recalculate the unitary cost to produce a product using the real "products to consume into MO"
 
 		if (!empty($object->lines)) {
 			$nblinetoconsume = 0;
@@ -989,8 +989,8 @@ 
 								$costprice = 0;
 							}
 						}
-						$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT');	// price for line for all quantities
-						$bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU');	// same but with full accuracy
+						$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); // price for line for all quantities
+						$bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU'); // same but with full accuracy
 					}
 
 					$bomcostupdated = price2num($bomcostupdated, 'MU');
@@ -1010,23 +1010,23 @@ 
 								$alreadyconsumed += $line2['qty'];
 							}
 						}
-						$suffix = '_' . $line->id;
-						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
+						$suffix = '_'.$line->id;
+						print '<!-- Line to dispatch '.$suffix.' -->'."\n";
 						// hidden fields for js function
-						print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $line->qty . '">';
+						print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
 						// Duration - Time spent
-						print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . $alreadyconsumed . '">';
+						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
 						print '<tr>';
-						print '<input name="lineid" type="hidden" value="' . $line->id . '">';
+						print '<input name="lineid" type="hidden" value="'.$line->id.'">';
 
 						// Product
-						print '<td>' . $tmpproduct->getNomUrl(1);
-						print '<br><div class="opacitymedium small tdoverflowmax150" title="' . dol_escape_htmltag($tmpproduct->label) . '">' . $tmpproduct->label . '</span>';
+						print '<td>'.$tmpproduct->getNomUrl(1);
+						print '<br><div class="opacitymedium small tdoverflowmax150" title="'.dol_escape_htmltag($tmpproduct->label).'">'.$tmpproduct->label.'</span>';
 						print '</td>';
 
 						// Qty
 						print '<td class="right nowraponall">';
-						print '<input class="width40" name="qty_lineProduce" value="'. $line->qty.'">';
+						print '<input class="width40" name="qty_lineProduce" value="'.$line->qty.'">';
 						print '</td>';
 						// Unit
 						if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
@@ -1036,7 +1036,7 @@ 
 						}
 						// Qty consumed
 						print '<td class="right">';
-						print ' ' . price2num($alreadyconsumed, 'MS');
+						print ' '.price2num($alreadyconsumed, 'MS');
 						print '</td>';
 						// Entrepot
 						print '<td class="right">';
@@ -1047,7 +1047,7 @@ 
 							if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
 								print img_warning($langs->trans('StockTooLow')).' ';
 							}
-							print '<span class="left">'. $tmpproduct->stock_reel  .' </span>';
+							print '<span class="left">'.$tmpproduct->stock_reel.' </span>';
 						}
 						print '</td>';
 
@@ -1059,8 +1059,8 @@ 
 
 						// Action delete line
 						print '<td colspan="2">';
-						print '<input type="submit" class="button buttongen button-add small nominwidth" name="save" value="' . $langs->trans("Save") . '">';
-						print '<input type="submit" class="button buttongen button-cancel small nominwidth" name="cancel" value="' . $langs->trans("Cancel") . '">';
+						print '<input type="submit" class="button buttongen button-add small nominwidth" name="save" value="'.$langs->trans("Save").'">';
+						print '<input type="submit" class="button buttongen button-cancel small nominwidth" name="cancel" value="'.$langs->trans("Cancel").'">';
 						print '</td>';
 
 						// Action delete line
@@ -1081,28 +1081,28 @@ 
 							}
 						}
 					} else {
-						$suffix = '_' . $line->id;
-						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
+						$suffix = '_'.$line->id;
+						print '<!-- Line to dispatch '.$suffix.' -->'."\n";
 						// hidden fields for js function
-						print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $line->qty . '">';
-						print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . $alreadyconsumed . '">';
+						print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
 
-						print '<tr data-line-id="' . $line->id . '">';
+						print '<tr data-line-id="'.$line->id.'">';
 						// Product
-						print '<td>' . $tmpproduct->getNomUrl(1);
-						print '<br><div class="opacitymedium small tdoverflowmax150" title="' . dol_escape_htmltag($tmpproduct->label) . '">' . $tmpproduct->label . '</div>';
+						print '<td>'.$tmpproduct->getNomUrl(1);
+						print '<br><div class="opacitymedium small tdoverflowmax150" title="'.dol_escape_htmltag($tmpproduct->label).'">'.$tmpproduct->label.'</div>';
 						print '</td>';
 						// Qty
 						print '<td class="right nowraponall">';
 						$help = '';
 						$picto = 'help';
 						if ($line->qty_frozen) {
-							$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("QuantityFrozen") . '</strong>: ' . yn(1) . ' (' . $langs->trans("QuantityConsumedInvariable") . ')';
-							print $form->textwithpicto('', $help, -1, 'lock') . ' ';
+							$help = ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
+							print $form->textwithpicto('', $help, -1, 'lock').' ';
 						}
 						if ($line->disable_stock_change) {
-							$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("DisableStockChange") . '</strong>: ' . yn(1) . ' (' . (($tmpproduct->type == Product::TYPE_SERVICE && !getDolGlobalString('STOCK_SUPPORTS_SERVICES')) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")) . ')';
-							print $form->textwithpicto('', $help, -1, 'help') . ' ';
+							$help = ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && !getDolGlobalString('STOCK_SUPPORTS_SERVICES')) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
+							print $form->textwithpicto('', $help, -1, 'help').' ';
 						}
 						print price2num($line->qty, 'MS');
 						print '</td>';
@@ -1123,9 +1123,9 @@ 
 						if ($alreadyconsumed) {
 							print '<script>';
 							print 'jQuery(document).ready(function() {
-								jQuery("#expandtoproduce' . $line->id . '").click(function() {
-									console.log("Expand mrp_production line ' . $line->id . '");
-									jQuery(".expanddetail' . $line->id . '").toggle();';
+								jQuery("#expandtoproduce' . $line->id.'").click(function() {
+									console.log("Expand mrp_production line ' . $line->id.'");
+									jQuery(".expanddetail' . $line->id.'").toggle();';
 							if ($nblinetoconsume == $nblinetoconsumecursor) {    // If it is the last line
 								print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
 							}
@@ -1134,9 +1134,9 @@ 
 							});';
 							print '</script>';
 							if (empty($conf->use_javascript_ajax)) {
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?collapse=' . $collapse . ',' . $line->id . '">';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
 							}
-							print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce' . $line->id . '"');
+							print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
 							if (empty($conf->use_javascript_ajax)) {
 								print '</a>';
 							}
@@ -1145,12 +1145,12 @@ 
 								print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
 							}
 						}
-						print ' ' . price2num($alreadyconsumed, 'MS');
+						print ' '.price2num($alreadyconsumed, 'MS');
 						print '</td>';
 						// Warehouse and/or workstation
 						print '<td>';
 						if (getDolGlobalString('STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE') && $tmpwarehouse->id > 0) {
-							print img_picto('', $tmpwarehouse->picto) . " " . $tmpwarehouse->label;
+							print img_picto('', $tmpwarehouse->picto)." ".$tmpwarehouse->label;
 						}
 						if (isModEnabled('workstation') && $line->fk_default_workstation > 0) {
 							$tmpworkstation = new Workstation($db);
@@ -1163,7 +1163,7 @@ 
 							print '<td class="nowraponall right">';
 							if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $tmpproduct->type != Product::TYPE_SERVICE) {
 								if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
-									print img_warning($langs->trans('StockTooLow')) . ' ';
+									print img_warning($langs->trans('StockTooLow')).' ';
 								}
 								if (!getDolGlobalString('STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE') || empty($tmpwarehouse->id)) {
 									print price2num($tmpproduct->stock_reel, 'MS'); // Available
@@ -1193,9 +1193,9 @@ 
 
 						// Action Edit line
 						if ($object->status == Mo::STATUS_DRAFT) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=editline&token='.newToken().'&lineid='.((int) $line->id);
 							print '<td class="center">';
-							print '<a class="reposition" href="' . $href . '">';
+							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
 							print '</a>';
 							print '</td>';
@@ -1203,9 +1203,9 @@ 
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=deleteline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id);
 							print '<td class="center">';
-							print '<a class="reposition" href="' . $href . '">';
+							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');
 							print '</a>';
 							print '</td>';
@@ -1278,9 +1278,9 @@ 
 
 						// Action Edit line
 						if ($object->status == Mo::STATUS_DRAFT) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=editline&token='.newToken().'&lineid='.((int) $line->id);
 							print '<td class="center">';
-							print '<a class="reposition" href="' . $href . '">';
+							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
 							print '</a>';
 							print '</td>';
@@ -1320,7 +1320,7 @@ 
 						print '<input type="hidden" name="product-'.$line->id.'-'.$i.'" value="'.$line->fk_product.'">';
 
 						// Qty
-						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-' . $line->id . '-' . $i . '" name="qty-' . $line->id . '-' . $i . '" value="' . $preselected . '" ' . $disable . '></td>';
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-'.$line->id.'-'.$i.'" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.'></td>';
 
 						// Unit
 						if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
@@ -1834,7 +1834,7 @@ 
 
 					$.ajax({
 						type: "POST",
-						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
+						url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
 						data: {
 							action: "updateselectbatchbywarehouse",
 							permissiontoproduce: <?php echo $permissiontoproduce ?>,
@@ -1895,7 +1895,7 @@ 
 
 					$.ajax({
 						type: "POST",
-						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
+						url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
 						data: {
 							action: "updateselectwarehousebybatch",
 							permissiontoproduce: <?php echo $permissiontoproduce ?>,

htdocs/adherents/list.php

Spacing +19 added lines, -19 removed lines

@@ -41,45 +41,45 @@ 
 
 
 // Get parameters
-$action 	= GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
-$toselect 	= GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss 	= GETPOST('optioncss', 'aZ');
-$mode 		= GETPOST('mode', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 // Search fields
-$search 			= GETPOST("search", 'alpha');
-$search_ref 		= GETPOST("search_ref", 'alpha');
+$search = GETPOST("search", 'alpha');
+$search_ref = GETPOST("search_ref", 'alpha');
 $search_lastname 	= GETPOST("search_lastname", 'alpha');
-$search_firstname 	= GETPOST("search_firstname", 'alpha');
+$search_firstname = GETPOST("search_firstname", 'alpha');
 $search_gender 		= GETPOST("search_gender", 'alpha');
 $search_civility 	= GETPOST("search_civility", 'alpha');
 $search_company 	= GETPOST('search_company', 'alphanohtml');
-$search_login 		= GETPOST("search_login", 'alpha');
+$search_login = GETPOST("search_login", 'alpha');
 $search_address 	= GETPOST("search_address", 'alpha');
-$search_zip 		= GETPOST("search_zip", 'alpha');
-$search_town 		= GETPOST("search_town", 'alpha');
-$search_state 		= GETPOST("search_state", 'alpha');  // county / departement / federal state
-$search_country 	= GETPOST("search_country", 'alpha');
+$search_zip = GETPOST("search_zip", 'alpha');
+$search_town = GETPOST("search_town", 'alpha');
+$search_state 		= GETPOST("search_state", 'alpha'); // county / departement / federal state
+$search_country = GETPOST("search_country", 'alpha');
 $search_phone 		= GETPOST("search_phone", 'alpha');
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
-$search_type 		= GETPOST("search_type", 'alpha');
+$search_type = GETPOST("search_type", 'alpha');
 $search_email 		= GETPOST("search_email", 'alpha');
 $search_categ 		= GETPOST("search_categ", 'int');
-$search_morphy 		= GETPOST("search_morphy", 'alpha');
-$search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
+$search_morphy = GETPOST("search_morphy", 'alpha');
+$search_import_key = trim(GETPOST("search_import_key", 'alpha'));
 
 $catid 		= GETPOST("catid", 'int');
 $socid 		= GETPOST('socid', 'int');
 
 $search_filter 		= GETPOST("search_filter", 'alpha');
-$search_status 		= GETPOST("search_status", 'intcomma');  // statut
+$search_status 		= GETPOST("search_status", 'intcomma'); // statut
 $search_datec_start = dol_mktime(0, 0, 0, GETPOST('search_datec_start_month', 'int'), GETPOST('search_datec_start_day', 'int'), GETPOST('search_datec_start_year', 'int'));
 $search_datec_end = dol_mktime(23, 59, 59, GETPOST('search_datec_end_month', 'int'), GETPOST('search_datec_end_day', 'int'), GETPOST('search_datec_end_year', 'int'));
 $search_datem_start = dol_mktime(0, 0, 0, GETPOST('search_datem_start_month', 'int'), GETPOST('search_datem_start_day', 'int'), GETPOST('search_datem_start_year', 'int'));
@@ -397,7 +397,7 @@ 
 $sqlfields = $sql; // $sql fields to remove for count total
 
 // SQL Alias adherent
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead of d
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead of d
 if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
 }
@@ -426,7 +426,7 @@ 
 			if ($searchCategoryContactOperator == 0) {
 				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryContact);
 			}
 		}
 	}
@@ -588,7 +588,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 

htdocs/resource/card.php

Spacing +17 added lines, -17 removed lines

@@ -42,12 +42,12 @@ 
 $ref					= GETPOST('ref', 'alpha');
 $address				= GETPOST('address', 'alpha');
 $zip					= GETPOST('zipcode', 'alpha');
-$town					= GETPOST('town', 'alpha');
+$town = GETPOST('town', 'alpha');
 $description			= GETPOST('description', 'restricthtml');
-$confirm				= GETPOST('confirm', 'aZ09');
-$fk_code_type_resource  = GETPOST('fk_code_type_resource', 'alpha');
+$confirm = GETPOST('confirm', 'aZ09');
+$fk_code_type_resource = GETPOST('fk_code_type_resource', 'alpha');
 $country_id				= GETPOST('country_id', 'int');
-$state_id				= GETPOST('state_id', 'int');
+$state_id = GETPOST('state_id', 'int');
 
 // Protection if external user
 if ($user->socid > 0) {
@@ -102,14 +102,14 @@ 
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 				$action = 'create';
 			} else {
-				$object->ref                    = $ref;
-				$object->address				= $address;
-				$object->zip					= $zip;
-				$object->town					= $town;
+				$object->ref = $ref;
+				$object->address = $address;
+				$object->zip = $zip;
+				$object->town = $town;
 				$object->description            = $description;
 				$object->fk_code_type_resource  = $fk_code_type_resource;
 				$object->country_id             = $country_id;
-				$object->state_id				= $state_id;
+				$object->state_id = $state_id;
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -146,14 +146,14 @@ 
 		if (!$error) {
 			$res = $object->fetch($id);
 			if ($res > 0) {
-				$object->ref          			= $ref;
-				$object->address				= $address;
-				$object->zip					= $zip;
-				$object->town					= $town;
-				$object->description  			= $description;
+				$object->ref = $ref;
+				$object->address = $address;
+				$object->zip = $zip;
+				$object->town = $town;
+				$object->description = $description;
 				$object->fk_code_type_resource  = $fk_code_type_resource;
 				$object->country_id             = $country_id;
-				$object->state_id				= $state_id;
+				$object->state_id = $state_id;
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -244,13 +244,13 @@ 
 		print '</td></tr>';
 
 		// Zip / Town
-		print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+		print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 		print $formresource->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 		print '</td>';
 		if ($conf->browser->layout == 'phone') {
 			print '</tr><tr>';
 		}
-		print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+		print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 		print $formresource->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 		print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
 		print '</td></tr>';

htdocs/resource/class/dolresource.class.php

Spacing +11 added lines, -11 removed lines

@@ -152,9 +152,9 @@ 
 		$sql .= "note_public,";
 		$sql .= "note_private";
 		$sql .= ") VALUES (";
-		$sql .= getEntity('resource') . ", ";
+		$sql .= getEntity('resource').", ";
 		foreach ($new_resource_values as $value) {
-			$sql .= " " . ((isset($value) && $value > 0) ? "'" . $this->db->escape($value) . "'" : 'NULL') . ",";
+			$sql .= " ".((isset($value) && $value > 0) ? "'".$this->db->escape($value)."'" : 'NULL').",";
 		}
 		$sql = rtrim($sql, ",");
 		$sql .= ")";
@@ -162,9 +162,9 @@ 
 		// Database session
 		$this->db->begin();
 		try {
-			dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		} catch (Exception $exception) {
-			error_log('dol_syslog error: ' . $exception->getMessage());
+			error_log('dol_syslog error: '.$exception->getMessage());
 		}
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -176,14 +176,14 @@ 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$result = $this->insertExtraFields();
 			if ($result < 0) {
-				$error=-1;
+				$error = -1;
 			}
 		}
 
 		if (!$error && !$no_trigger) {
 			$result = $this->call_trigger('RESOURCE_CREATE', $user);
 			if ($result < 0) {
-				$error=-1;
+				$error = -1;
 			}
 		}
 
@@ -191,9 +191,9 @@ 
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
 				try {
-					dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
+					dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				} catch (Exception $exception) {
-					error_log('dol_syslog error: ' . $exception->getMessage());
+					error_log('dol_syslog error: '.$exception->getMessage());
 				}
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -250,11 +250,11 @@ 
 				$this->address = $obj->address;
 				$this->zip = $obj->zip;
 				$this->town = $obj->town;
-				$this->description				= $obj->description;
+				$this->description = $obj->description;
 				$this->country_id = $obj->fk_country;
 				$this->state_id = $obj->fk_state;
 				$this->fk_code_type_resource = $obj->fk_code_type_resource;
-				$this->note_public				= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->type_label = $obj->type_label;
 
@@ -887,7 +887,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) {

htdocs/resource/class/html.formresource.class.php

Spacing +17 added lines, -17 removed lines

@@ -263,14 +263,14 @@ 
 
 		$size = '';
 		if (!empty($fieldsize)) {
-			$size = 'size="' . $fieldsize . '"';
+			$size = 'size="'.$fieldsize.'"';
 		}
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
-			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT . '/core/ajax/ziptown.php') . "\n";
+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
 			$moreattrib .= ' autocomplete="off"';
 		}
-		$out .= '<input id="' . $htmlname . '" class="maxwidthonsmartphone' . ($morecss ? ' ' . $morecss : '') . '" type="text"' . ($moreattrib ? ' ' . $moreattrib : '') . ' name="' . $htmlname . '" ' . $size . ' value="' . $selected . '">' . "\n";
+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
 		return $out;
 	}
@@ -294,7 +294,7 @@ 
 		// phpcs:enable
 		global $conf, $langs, $user;
 
-		dol_syslog(get_class($this) . "::select_departement selected=" . $selected . ", country_codeid=" . $country_codeid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
 
 		$langs->load("dict");
 
@@ -302,28 +302,28 @@ 
 
 		// Search active departements/cantons/province of a region and actif country
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " " . $this->db->prefix() . "c_departements as d, " . $this->db->prefix() . "c_regions as r," . $this->db->prefix() . "c_country as c";
+		$sql .= " ".$this->db->prefix()."c_departements as d, ".$this->db->prefix()."c_regions as r,".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 		if ($country_codeid && is_numeric($country_codeid)) {
-			$sql .= " AND c.rowid = '" . $this->db->escape($country_codeid) . "'";
+			$sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
 		}
 		if ($country_codeid && !is_numeric($country_codeid)) {
-			$sql .= " AND c.code = '" . $this->db->escape($country_codeid) . "'";
+			$sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
 		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!empty($htmlname)) {
-				$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';
+				$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			}
 			if ($country_codeid) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			dol_syslog(get_class($this) . "::select_departement num=" . $num, LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
 			if ($num) {
 				$country = '';
 				while ($i < $num) {
@@ -334,15 +334,15 @@ 
 						if (!$country || $country != $obj->country) {
 							// Show break if we are in list with multiple countries
 							if (!$country_codeid && $obj->country_code) {
-								$out .= '<option value="-1" disabled data-html="----- ' . $obj->country . ' -----">----- ' . $obj->country . " -----</option>\n";
+								$out .= '<option value="-1" disabled data-html="----- '.$obj->country.' -----">----- '.$obj->country." -----</option>\n";
 								$country = $obj->country;
 							}
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid) {
-							$out .= '<option value="' . $obj->rowid . '" selected>';
+							$out .= '<option value="'.$obj->rowid.'" selected>';
 						} else {
-							$out .= '<option value="' . $obj->rowid . '">';
+							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
 						// If translation exists use it, otherwise use default name
@@ -351,13 +351,13 @@ 
 							(getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 1 || getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')
 						) {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
-								$out .= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							} else {
-								$out .= $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						} else {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
-								$out .= $obj->region_name . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							} else {
 								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
@@ -372,7 +372,7 @@ 
 				$out .= '</select>';
 			}
 			if (!empty($htmlname) && $user->admin) {
-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 		} else {
 			dol_print_error($this->db);
@@ -380,7 +380,7 @@ 
 
 		// Make select dynamic
 		if (!empty($htmlname)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
 

htdocs/categories/class/categorie.class.php

Spacing +6 added lines, -6 removed lines

@@ -380,11 +380,11 @@ 
 				$this->id = $res['rowid'];
 				//$this->ref = $res['rowid'];
 				$this->fk_parent	= (int) $res['fk_parent'];
-				$this->label		= $res['label'];
+				$this->label = $res['label'];
 				$this->description = $res['description'];
 				$this->color    	= $res['color'];
-				$this->position    	= $res['position'];
-				$this->socid		= (int) $res['fk_soc'];
+				$this->position = $res['position'];
+				$this->socid = (int) $res['fk_soc'];
 				$this->visible = (int) $res['visible'];
 				$this->type = (int) $res['type'];
 				$this->ref_ext = $res['ref_ext'];
@@ -1035,10 +1035,10 @@ 
 				if ($category_static->fetch($obj->rowid)) {
 					$categories[$i]['id'] = $category_static->id;
 					$categories[$i]['fk_parent']		= $category_static->fk_parent;
-					$categories[$i]['label']			= $category_static->label;
+					$categories[$i]['label'] = $category_static->label;
 					$categories[$i]['description'] = $category_static->description;
 					$categories[$i]['color']    		= $category_static->color;
-					$categories[$i]['position']    		= $category_static->position;
+					$categories[$i]['position'] = $category_static->position;
 					$categories[$i]['socid']			= $category_static->socid;
 					$categories[$i]['ref_ext'] = $category_static->ref_ext;
 					$categories[$i]['visible'] = $category_static->visible;
@@ -1720,7 +1720,7 @@ 
 			$result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$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) {