Dolibarr / dolibarr

htdocs/reception/list.php

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
 $search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday');
 $search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth');
 $search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear');
-$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
+$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
 $search_date_create_startday = GETPOSTINT('search_date_create_startday');
 $search_date_create_startmonth = GETPOSTINT('search_date_create_startmonth');
@@ -73,7 +73,7 @@ 
 $search_date_create_endday = GETPOSTINT('search_date_create_endday');
 $search_date_create_endmonth = GETPOSTINT('search_date_create_endmonth');
 $search_date_create_endyear = GETPOSTINT('search_date_create_endyear');
-$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear);	// Use tzserver
+$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver
 $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear);
 $search_billed = GETPOST("search_billed", 'intcomma');
 $search_status = GETPOST('search_status', 'intcomma');
@@ -140,7 +140,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 $error = 0;
 
@@ -331,7 +331,7 @@ 
 				// if the VAT reverse-charge is activated by default in supplier card to resume the information
 				$objecttmp->vat_reverse_charge = $soc->vat_reverse_charge;
 
-				$objecttmp->fk_project			= $rcp->fk_project;
+				$objecttmp->fk_project = $rcp->fk_project;
 				//$objecttmp->multicurrency_code = $rcp->multicurrency_code;
 				if (empty($createbills_onebythird)) {
 					$objecttmp->ref_supplier = $rcp->ref;
@@ -364,7 +364,7 @@ 
 					}
 				}
 
-				$res = $objecttmp->create($user);		// This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id
+				$res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id
 
 				//var_dump($objecttmp->error);exit;
 				if ($res > 0) {
@@ -571,8 +571,8 @@ 
 			$db->rollback();
 
 			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];		// Keep this ?
-			$_GET["originid"] = $_POST["originid"];	// Keep this ?
+			$_GET["origin"] = $_POST["origin"]; // Keep this ?
+			$_GET["originid"] = $_POST["originid"]; // Keep this ?
 			setEventMessages($object->error, $errors, 'errors');
 			$error++;
 		}

htdocs/product/fournisseurs.php

Spacing +5 added lines, -5 removed lines

@@ -66,8 +66,8 @@ 
 
 // If socid provided by ajax company selector
 if (GETPOSTINT('search_fourn_id')) {
-	$_GET['id_fourn'] = GETPOSTINT('search_fourn_id');	// Keep set to $_GET an $_POST. Used later.
-	$_POST['id_fourn'] = GETPOSTINT('search_fourn_id');	// Keep set to $_GET an $_POST. Used later.
+	$_GET['id_fourn'] = GETPOSTINT('search_fourn_id'); // Keep set to $_GET an $_POST. Used later.
+	$_POST['id_fourn'] = GETPOSTINT('search_fourn_id'); // Keep set to $_GET an $_POST. Used later.
 }
 
 // Security check
@@ -969,7 +969,7 @@ 
 							// Show field if not hidden
 							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
 								$extratitle = $langs->trans($value);
-								$arrayfields['ef.' . $key] = array('label'    => $extratitle, 'checked' => 0,
+								$arrayfields['ef.'.$key] = array('label'    => $extratitle, 'checked' => 0,
 																   'position' => (end($arrayfields)['position'] + 1),
 																   'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key],
 																   'help'     => $extrafields->attributes["product_fournisseur_price"]['help'][$key]);
@@ -1090,8 +1090,8 @@ 
 								} else {
 									$extratitle = $langs->trans($value);
 								}
-								if (!empty($arrayfields['ef.' . $key]['checked'])) {
-									print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.' . $key, '', $param, '', $sortfield, $sortorder, 'right ');
+								if (!empty($arrayfields['ef.'.$key]['checked'])) {
+									print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
 									$nbfields++;
 								}
 							}

htdocs/product/inventory/inventory.php

Spacing +15 added lines, -15 removed lines

@@ -163,7 +163,7 @@ 
 				$line = $db->fetch_object($resql);
 
 				$qty_stock = $line->qty_stock;
-				$qty_view = $line->qty_view;		// The quantity viewed by inventorier, the qty we target
+				$qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target
 
 
 				// Load real stock we have now.
@@ -220,7 +220,7 @@ 
 						}
 						$sqlupdate .= " WHERE rowid = ".((int) $line->rowid);
 						$resqlupdate = $db->query($sqlupdate);
-						if (! $resqlupdate) {
+						if (!$resqlupdate) {
 							$error++;
 							setEventMessages($db->lasterror(), null, 'errors');
 							break;
@@ -230,7 +230,7 @@ 
 					if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 						$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
 						$resqlpmp = $db->query($sqlpmp);
-						if (! $resqlpmp) {
+						if (!$resqlpmp) {
 							$error++;
 							setEventMessages($db->lasterror(), null, 'errors');
 							break;
@@ -238,7 +238,7 @@ 
 						if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 							$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
 							$resqlpmp = $db->query($sqlpmp);
-							if (! $resqlpmp) {
+							if (!$resqlpmp) {
 								$error++;
 								setEventMessages($db->lasterror(), null, 'errors');
 								break;
@@ -257,7 +257,7 @@ 
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -297,17 +297,17 @@ 
 						setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
 					}
 					if ($result > 0) {
-						$inventoryline->qty_stock = price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS');	// The new value that was set in as hidden field
-						$inventoryline->qty_view = $qtytoupdate;	// The new value we want
+						$inventoryline->qty_stock = price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field
+						$inventoryline->qty_view = $qtytoupdate; // The new value we want
 						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
 						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
-				} elseif (GETPOSTISSET('id_' . $lineid)) {
+				} elseif (GETPOSTISSET('id_'.$lineid)) {
 					// Delete record
 					$result = $inventoryline->fetch($lineid);
 					if ($result > 0) {
-						$inventoryline->qty_view = null;			// The new value we want
+						$inventoryline->qty_view = null; // The new value we want
 						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
 						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
@@ -323,12 +323,12 @@ 
 		}
 
 		// Update line with id of stock movement (and the start quantity if it has changed this last recording)
-		if (! $error) {
+		if (!$error) {
 			$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventory";
 			$sqlupdate .= " SET fk_user_modif = ".((int) $user->id);
 			$sqlupdate .= " WHERE rowid = ".((int) $object->id);
 			$resqlupdate = $db->query($sqlupdate);
-			if (! $resqlupdate) {
+			if (!$resqlupdate) {
 				$error++;
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
@@ -412,7 +412,7 @@ 
 				}
 			} else {
 				// Clear var
-				$_POST['batch'] = '';		// TODO Replace this with a var
+				$_POST['batch'] = ''; // TODO Replace this with a var
 				$_POST['qtytoadd'] = '';
 			}
 		}
@@ -1016,7 +1016,7 @@ 
 	$num = $db->num_rows($resql);
 
 	if (!empty($limit != 0) || $num > $limit || $page) {
-		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>', '', $limit);
 	}
 
 	$i = 0;
@@ -1168,7 +1168,7 @@ 
 				print '</td>';
 
 				print '<td class="right nowraponall">';
-				print $obj->qty_view;	// qty found
+				print $obj->qty_view; // qty found
 				print '</td>';
 
 				//PMP Real
@@ -1190,7 +1190,7 @@ 
 				$totalRealValuation += $pmp_valuation_real;
 			} else {
 				print '<td class="right nowraponall">';
-				print $obj->qty_view;	// qty found
+				print $obj->qty_view; // qty found
 				print '</td>';
 			}
 			print '<td>';

htdocs/commande/list.php

Spacing +9 added lines, -9 removed lines

@@ -184,7 +184,7 @@ 
 	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55),
 	'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60, 'csslist' => 'nowraponall'),
 	'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65, 'csslist' => 'nowraponall'),
-	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("shipping")),
+	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66, 'enabled' => isModEnabled("shipping")),
 	'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67),
 	'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68),
 	'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69),
@@ -207,7 +207,7 @@ 
 	'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130),
 	'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 135, 'searchall' => 1),
 	'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 140),
-	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("shipping")), 'position' => 990),
+	'shippable' => array('label' => "Shippable", 'checked' => 1, 'enabled' => (isModEnabled("shipping")), 'position' => 990),
 	'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995),
 	'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999),
 	'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
@@ -227,7 +227,7 @@ 
 $object->fields = dol_sort_array($object->fields, 'position');
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 
 // Security check
@@ -682,7 +682,7 @@ 
 			$db->rollback();
 
 			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];		// Keep GET and POST here ?
+			$_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ?
 			$_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ?
 			if (!empty($errors)) {
 				setEventMessages(null, $errors, 'errors');
@@ -1042,7 +1042,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -1072,7 +1072,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -2639,13 +2639,13 @@ 
 			print '<td class="center">';
 			if (!empty($show_shippable_command) && isModEnabled('stock')) {
 				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
-					$generic_commande->getLinesArray(); 	// Load array ->lines
-					$generic_commande->loadExpeditions();	// Load array ->expeditions
+					$generic_commande->getLinesArray(); // Load array ->lines
+					$generic_commande->loadExpeditions(); // Load array ->expeditions
 
 					$numlines = count($generic_commande->lines); // Loop on each line of order
 					for ($lig = 0; $lig < $numlines; $lig++) {
 						if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) {
-							$reliquat =  $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
+							$reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
 						} else {
 							$reliquat = $generic_commande->lines[$lig]->qty;
 						}

htdocs/user/class/user.class.php

Spacing +39 added lines, -39 removed lines

@@ -599,11 +599,11 @@ 
 				$this->socialnetworks = ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
 				$this->job = $obj->job;
 				$this->signature = $obj->signature;
-				$this->admin		= $obj->admin;
+				$this->admin = $obj->admin;
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 
-				$this->statut		= $obj->status;			// deprecated
+				$this->statut		= $obj->status; // deprecated
 				$this->status		= $obj->status;
 
 				$this->photo		= $obj->photo;
@@ -732,7 +732,7 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/defaultvalues.class.php';
 
 			$defaultValues = new DefaultValues($this->db);
-			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')');	// User 0 (all) + me (if defined)
+			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')'); // User 0 (all) + me (if defined)
 			//$result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity)));	// User 0 (all) + me (if defined)
 
 			if (!is_array($result) && $result < 0) {
@@ -846,7 +846,7 @@ 
 		// Special case for external user
 		if (!empty($this->socid)) {
 			if ($module = 'societe' && $permlevel1 = 'client' && $permlevel2 == 'voir') {
-				return 0;	// An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself)
 			}
 		}
 
@@ -994,7 +994,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
-				$sql .= " AND (".$whereforadd.")";	// Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
+				$sql .= " AND (".$whereforadd.")"; // Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
 			}
 
 			$sqldelete = "DELETE FROM ".$this->db->prefix()."user_rights";
@@ -1130,7 +1130,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($wherefordel) && $wherefordel != 'allmodules') {
-				$sql .= " AND (".$wherefordel.")";	// Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
+				$sql .= " AND (".$wherefordel.")"; // Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
 			}
 
 			// avoid admin can remove his own important rights
@@ -1304,12 +1304,12 @@ 
 					$sql .= " AND r.entity = ".((int) $conf->entity);
 				}
 			} else {
-				$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+				$sql .= " AND gr.entity = ".((int) $conf->entity); // Only groups created in current entity
 				// The entity on the table usergroup_user should be useless and should never be used because it is already into gr and r.
 				// but when using MULTICOMPANY_TRANSVERSE_MODE, we may insert record that make rubbish result due to duplicate record of
 				// other entities, so we are forced to add a filter here
 				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
-				$sql .= " AND r.entity = ".((int) $conf->entity);	// Only permission of modules enabled in current entity
+				$sql .= " AND r.entity = ".((int) $conf->entity); // Only permission of modules enabled in current entity
 			}
 			// End of strange business rule
 			$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
@@ -1843,7 +1843,7 @@ 
 		$this->civility_code = $member->civility_id;
 		$this->lastname     = $member->lastname;
 		$this->firstname    = $member->firstname;
-		$this->gender		= $member->gender;
+		$this->gender = $member->gender;
 		$this->email        = $member->email;
 		$this->fk_member    = $member->id;
 		$this->address      = $member->address;
@@ -1981,44 +1981,44 @@ 
 		$this->lastname						= trim((string) $this->lastname);
 		$this->firstname					= trim((string) $this->firstname);
 		$this->ref_employee					= trim((string) $this->ref_employee);
-		$this->national_registration_number	= trim((string) $this->national_registration_number);
+		$this->national_registration_number = trim((string) $this->national_registration_number);
 		$this->employee						= ($this->employee > 0 ? $this->employee : 0);
 		$this->login						= trim((string) $this->login);
-		$this->gender						= trim((string) $this->gender);
+		$this->gender = trim((string) $this->gender);
 
 		$this->pass							= trim((string) $this->pass);
-		$this->api_key						= trim((string) $this->api_key);
-		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
-		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+		$this->api_key = trim((string) $this->api_key);
+		$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
 
-		$this->address						= trim((string) $this->address);
-		$this->zip							= trim((string) $this->zip);
-		$this->town							= trim((string) $this->town);
+		$this->address = trim((string) $this->address);
+		$this->zip = trim((string) $this->zip);
+		$this->town = trim((string) $this->town);
 
-		$this->state_id						= ($this->state_id > 0 ? $this->state_id : 0);
+		$this->state_id = ($this->state_id > 0 ? $this->state_id : 0);
 		$this->country_id					= ($this->country_id > 0 ? $this->country_id : 0);
-		$this->office_phone					= trim((string) $this->office_phone);
+		$this->office_phone = trim((string) $this->office_phone);
 		$this->office_fax					= trim((string) $this->office_fax);
-		$this->user_mobile					= trim((string) $this->user_mobile);
-		$this->personal_mobile				= trim((string) $this->personal_mobile);
-		$this->email						= trim((string) $this->email);
-		$this->personal_email				= trim((string) $this->personal_email);
-
-		$this->job							= trim((string) $this->job);
-		$this->signature					= trim((string) $this->signature);
-		$this->note_public					= trim((string) $this->note_public);
-		$this->note_private					= trim((string) $this->note_private);
-		$this->openid						= trim((string) $this->openid);
+		$this->user_mobile = trim((string) $this->user_mobile);
+		$this->personal_mobile = trim((string) $this->personal_mobile);
+		$this->email = trim((string) $this->email);
+		$this->personal_email = trim((string) $this->personal_email);
+
+		$this->job = trim((string) $this->job);
+		$this->signature = trim((string) $this->signature);
+		$this->note_public = trim((string) $this->note_public);
+		$this->note_private = trim((string) $this->note_private);
+		$this->openid = trim((string) $this->openid);
 		$this->admin						= ($this->admin > 0 ? $this->admin : 0);
 
 		$this->accountancy_code				= trim((string) $this->accountancy_code);
 		$this->color						= trim((string) $this->color);
-		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
+		$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
 		$this->dateemploymentend			= empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
 
-		$this->birth						= empty($this->birth) ? '' : $this->birth;
-		$this->fk_warehouse					= (int) $this->fk_warehouse;
-		$this->fk_establishment				= (int) $this->fk_establishment;
+		$this->birth = empty($this->birth) ? '' : $this->birth;
+		$this->fk_warehouse = (int) $this->fk_warehouse;
+		$this->fk_establishment = (int) $this->fk_establishment;
 
 		$this->setUpperOrLowerCase();
 
@@ -2773,7 +2773,7 @@ 
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		if (empty($entity)) {
-			$sql .= " AND entity IN (0, 1)";	// group may be in entity 0 (so $entity=0) and link with user into entity 1.
+			$sql .= " AND entity IN (0, 1)"; // group may be in entity 0 (so $entity=0) and link with user into entity 1.
 		} else {
 			$sql .= " AND entity = ".((int) $entity);
 		}
@@ -3035,7 +3035,7 @@ 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
-			$linkclose .= $dataparams . ' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
+			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -3115,7 +3115,7 @@ 
 
 		if ($option == 'xxx') {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
-			$linkend = '</a>';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$linkend = '</a>'; // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 
 		if ($option == 'nolink') {
@@ -3274,11 +3274,11 @@ 
 		global $conf;
 		$dn = '';
 		if ($mode == 0) {
-			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')]."," . getDolGlobalString('LDAP_USER_DN');
+			$dn = getDolGlobalString('LDAP_KEY_USERS')."=".$info[getDolGlobalString('LDAP_KEY_USERS')].",".getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 1) {
 			$dn = getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 2) {
-			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')];
+			$dn = getDolGlobalString('LDAP_KEY_USERS')."=".$info[getDolGlobalString('LDAP_KEY_USERS')];
 		}
 		return $dn;
 	}
@@ -3491,7 +3491,7 @@ 
 		$this->iplastlogin = '127.0.0.1';
 		$this->datepreviouslogin = $now;
 		$this->ippreviouslogin = '127.0.0.1';
-		$this->statut = 1;		// deprecated
+		$this->statut = 1; // deprecated
 		$this->status = 1;
 
 		$this->entity = 1;

htdocs/index.php

Spacing +16 added lines, -16 removed lines

@@ -32,7 +32,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
-$_GET['mainmenu'] = GETPOST('mainmenu', 'aZ09') ? GETPOST('mainmenu', 'aZ09') : 'home';	// Keep this ?
+$_GET['mainmenu'] = GETPOST('mainmenu', 'aZ09') ? GETPOST('mainmenu', 'aZ09') : 'home'; // Keep this ?
 $action = GETPOST('action', 'aZ09');
 
 $hookmanager->initHooks(array('index'));
@@ -81,7 +81,7 @@ 
 // Title
 $title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
 if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
-	$title = $langs->trans("HomeArea").' - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
+	$title = $langs->trans("HomeArea").' - '.getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 llxHeader('', $title);
@@ -196,7 +196,7 @@ 
 	}
 
 	// Number of supplier proposals open (expired)
-	if (isModEnabled('supplier_proposal')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
+	if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
 		$langs->load("supplier_proposal");
 		include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 		$board = new SupplierProposal($db);
@@ -206,7 +206,7 @@ 
 	}
 
 	// Number of sales orders
-	if (isModEnabled('order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$board = new Commande($db);
 		// Number of customer orders to be shipped (validated and in progress)
@@ -220,7 +220,7 @@ 
 	}
 
 	// Number of suppliers orders
-	if (isModEnabled('supplier_order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
+	if (isModEnabled('supplier_order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 		$board = new CommandeFournisseur($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -228,7 +228,7 @@ 
 	}
 
 	// Number of contract / services enabled (delayed)
-	if (isModEnabled('contract')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contract') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 		$board = new Contrat($db);
 		$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
@@ -237,7 +237,7 @@ 
 	}
 
 	// Number of tickets open
-	if (isModEnabled('ticket')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
+	if (isModEnabled('ticket') && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
 		include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 		$board = new Ticket($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -260,7 +260,7 @@ 
 	}
 
 	// Number of transactions to conciliate
-	if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+	if (isModEnabled('bank') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
 		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$board = new Account($db);
 		$nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
@@ -271,26 +271,26 @@ 
 
 
 	// Number of cheque to send
-	if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+	if (isModEnabled('bank') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
 		if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT')) {
-			include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 			$board = new RemiseCheque($db);
 			$dashboardlines[$board->element] = $board->load_board($user);
 		}
 		if (isModEnabled('prelevement')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 			$board = new BonPrelevement($db);
-			$dashboardlines[$board->element . '_direct_debit'] = $board->load_board($user, 'direct_debit');
+			$dashboardlines[$board->element.'_direct_debit'] = $board->load_board($user, 'direct_debit');
 		}
 		if (isModEnabled('paymentbybanktransfer')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 			$board = new BonPrelevement($db);
-			$dashboardlines[$board->element . '_credit_transfer'] = $board->load_board($user, 'credit_transfer');
+			$dashboardlines[$board->element.'_credit_transfer'] = $board->load_board($user, 'credit_transfer');
 		}
 	}
 
 	// Number of foundation members
-	if (isModEnabled('member')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
+	if (isModEnabled('member') && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
 		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$board = new Adherent($db);
 		$dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');
@@ -298,21 +298,21 @@ 
 	}
 
 	// Number of expense reports to approve
-	if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
+	if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
 		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 		$board = new ExpenseReport($db);
 		$dashboardlines[$board->element.'_toapprove'] = $board->load_board($user, 'toapprove');
 	}
 
 	// Number of expense reports to pay
-	if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
+	if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
 		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 		$board = new ExpenseReport($db);
 		$dashboardlines[$board->element.'_topay'] = $board->load_board($user, 'topay');
 	}
 
 	// Number of holidays to approve
-	if (isModEnabled('holiday')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
+	if (isModEnabled('holiday') && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
 		include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 		$board = new Holiday($db);
 		$dashboardlines[$board->element] = $board->load_board($user);

htdocs/viewimage.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
 	if (empty($dolibarr_nocache)) {
 		header('Cache-Control: max-age=3600, public, must-revalidate');
 		header('Pragma: cache'); // This is to avoid to have Pragma: no-cache set by proxy or web server
-		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 3600).' GMT');	// This is to avoid to have Expires set by proxy or web server
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 3600).' GMT'); // This is to avoid to have Expires set by proxy or web server
 		//header('Expires: '.strtotime('+1 hour');
 	} else {
 		header('Cache-Control: no-cache');
@@ -224,7 +224,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);
 

htdocs/core/ajax/onlineSign.php

Spacing +89 added lines, -89 removed lines

@@ -48,18 +48,18 @@ 
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
-$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));	// Keep $_GET and $_POST here. GETPOST not yet defined.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); // Keep $_GET and $_POST here. GETPOST not yet defined.
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 include '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $action = GETPOST('action', 'aZ09');
 
 $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
-$mode = GETPOST('mode', 'aZ09');    // 'proposal', ...
+$mode = GETPOST('mode', 'aZ09'); // 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
 $online_sign_name = GETPOST("onlinesignname");
 
@@ -80,8 +80,8 @@ 
 	$securekeyseed = getDolGlobalString(strtoupper($type).'_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed . $type . $ref . (!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
-	httponly_accessforbidden('Bad value for securitykey. Value provided ' . dol_escape_htmltag($SECUREKEY) . ' does not match expected value for ref=' . dol_escape_htmltag($ref), 403);
+if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
+	httponly_accessforbidden('Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref), 403);
 }
 
 
@@ -105,29 +105,29 @@ 
 		$data = base64_decode($signature);
 
 		if ($mode == "propale" || $mode == 'proposal') {
-			require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Propal($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->propal->multidir_output[$object->entity]) ? $conf->propal->multidir_output[$object->entity] : $conf->propal->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
-			$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
 			$langs->loadLangs(array("main", "companies"));
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -137,12 +137,12 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('proposal');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc
 
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
-					$newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref . ".pdf";
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						// We build the new PDF
@@ -158,13 +158,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -183,7 +183,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -220,14 +220,14 @@ 
 
 				$online_sign_ip = getUserRemoteIP();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-				$sql .= " SET fk_statut = " . ((int) $object::STATUS_SIGNED) . ", note_private = '" . $db->escape($object->note_private) . "',";
-				$sql .= " date_signature = '" . $db->idate(dol_now()) . "',";
-				$sql .= " online_sign_ip = '" . $db->escape($online_sign_ip) . "'";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+				$sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$db->escape($object->note_private)."',";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
 				if ($online_sign_name) {
-					$sql .= ", online_sign_name = '" . $db->escape($online_sign_name) . "'";
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
 				}
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);
@@ -246,7 +246,7 @@ 
 						$result = $object->call_trigger('PROPAL_CLOSE_SIGNED', $user);
 						if ($result < 0) {
 							$error++;
-							$response = "error in trigger " . $object->error;
+							$response = "error in trigger ".$object->error;
 						} else {
 							$response = "success";
 						}
@@ -267,25 +267,25 @@ 
 				}
 			}
 		} elseif ($mode == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Contrat($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->contrat->multidir_output[$object->entity]) ? $conf->contrat->multidir_output[$object->entity] : $conf->contrat->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -295,11 +295,11 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('contrat');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
-					$newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref . ".pdf";
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						// We build the new PDF
@@ -315,13 +315,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -340,7 +340,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -375,8 +375,8 @@ 
 				}
 			}
 		} elseif ($mode == 'fichinter') {
-			require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Fichinter($db);
 			$object->fetch(0, $ref);
 
@@ -385,20 +385,20 @@ 
 
 			$langs->loadLangs(array("main", "companies"));
 
-			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);	// Must be
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -408,11 +408,11 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('fichinter');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
-					$newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref . ".pdf";
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						// We build the new PDF
@@ -428,13 +428,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -453,7 +453,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -489,8 +489,8 @@ 
 			}
 		} elseif ($mode == "societe_rib") {
 			$langs->load('withdrawals');
-			require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$modelpath = "core/modules/bank/doc/";
 			$object = new CompanyBankAccount($db);
 			$object->fetch($ref);
@@ -498,23 +498,23 @@ 
 				$object->fetch_thirdparty();
 
 
-				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/' . dol_sanitizeFileName($object->thirdparty->id) . '/';
+				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity].'/'.dol_sanitizeFileName($object->thirdparty->id).'/';
 
-				$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-				$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+				$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+				$default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
 				$langs->loadLangs(array("main", "companies"));
 
 				$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-				$filename = "signatures/" . $date . "_signature.png";
-				if (!is_dir($upload_dir . "signatures/")) {
-					if (!dol_mkdir($upload_dir . "signatures/")) {
-						$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+				$filename = "signatures/".$date."_signature.png";
+				if (!is_dir($upload_dir."signatures/")) {
+					if (!dol_mkdir($upload_dir."signatures/")) {
+						$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 						$error++;
 					}
 				}
 
 				if (!$error) {
-					$return = file_put_contents($upload_dir . $filename, $data);
+					$return = file_put_contents($upload_dir.$filename, $data);
 					if ($return == false) {
 						$error++;
 						$response = 'Error file_put_content: failed to create signature file.';
@@ -525,14 +525,14 @@ 
 					// Defined modele of doc
 					$last_main_doc_file = $object->last_main_doc;
 					$last_modelpdf = $object->model_pdf;
-					$directdownloadlink = $object->getLastMainDocLink('company');    // url to download the $object->last_main_doc
+					$directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc
 
 					if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 						$sourcefile = '';
 						$newpdffilename = '';
 						if ($last_modelpdf == 'sepamandate') {
-							$newpdffilename = $upload_dir . $langs->transnoentitiesnoconv("SepaMandateShort") . ' ' . dol_sanitizeFileName($object->ref) . "-" . dol_sanitizeFileName($object->rum) . "_signed-" . $date . ".pdf";
-							$sourcefile = $upload_dir . $langs->transnoentitiesnoconv("SepaMandateShort") . ' ' . dol_sanitizeFileName($object->ref) . "-" . dol_sanitizeFileName($object->rum) . ".pdf";
+							$newpdffilename = $upload_dir.$langs->transnoentitiesnoconv("SepaMandateShort").' '.dol_sanitizeFileName($object->ref)."-".dol_sanitizeFileName($object->rum)."_signed-".$date.".pdf";
+							$sourcefile = $upload_dir.$langs->transnoentitiesnoconv("SepaMandateShort").' '.dol_sanitizeFileName($object->ref)."-".dol_sanitizeFileName($object->rum).".pdf";
 						}
 						if (dol_is_file($sourcefile)) {
 							// We build the new PDF
@@ -548,9 +548,9 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -558,7 +558,7 @@ 
 									$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 									$pdf->useTemplate($tppl);
 								} catch (Exception $e) {
-									dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
+									dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 									$response = $e->getMessage();
 									$error++;
 								}
@@ -574,18 +574,18 @@ 
 								$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
 							}
 							foreach ($dirmodels as $reldir) {
-								$file = "pdf_" . $last_modelpdf . ".modules.php";
+								$file = "pdf_".$last_modelpdf.".modules.php";
 								// On vérifie l'emplacement du modele
-								$file = dol_buildpath($reldir . $modelpath . $file, 0);
+								$file = dol_buildpath($reldir.$modelpath.$file, 0);
 								if (file_exists($file)) {
 									$filefound = $file;
-									$classname = 'pdf_' . $last_modelpdf;
+									$classname = 'pdf_'.$last_modelpdf;
 									break;
 								}
 							}
 
 							if ($filefound === '') {
-								$response = $langs->trans("Error") . ' Failed to load doc generator with modelpaths=' . $modelpath . ' - modele=' . $last_modelpdf;
+								$response = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelpath.' - modele='.$last_modelpdf;
 								dol_syslog($response, LOG_ERR);
 								$error++;
 							}
@@ -609,7 +609,7 @@ 
 
 								$param = array();
 								$param['online_sign_name'] = $online_sign_name;
-								$param['pathtoimage'] = $upload_dir . $filename;
+								$param['pathtoimage'] = $upload_dir.$filename;
 
 								// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
 								// TODO Get position of box from PDF template
@@ -644,16 +644,16 @@ 
 
 				$online_sign_ip = getUserRemoteIP();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $object->table_element;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$object->table_element;
 				$sql .= " SET ";
-				$sql .= " date_signature = '" . $db->idate(dol_now()) . "',";
-				$sql .= " online_sign_ip = '" . $db->escape($online_sign_ip) . "'";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
 				if ($online_sign_name) {
-					$sql .= ", online_sign_name = '" . $db->escape($online_sign_name) . "'";
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
 				}
 				//$sql .= ", last_main_doc = '" . $db->escape($object->element'..') . "'";
 
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);
@@ -702,8 +702,8 @@ 
  */
 function dolPrintSignatureImage(TCPDF $pdf, $langs, $params)
 {
-	$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-	$default_font = pdf_getPDFFont($langs);	// Must be
+	$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+	$default_font = pdf_getPDFFont($langs); // Must be
 	$xforimgstart = $params['xforimgstart'];
 	$yforimgstart = $params['yforimgstart'];
 	$wforimg = $params['wforimg'];
@@ -711,7 +711,7 @@ 
 	$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
 	$pdf->SetFont($default_font, '', $default_font_size - 1);
 	$pdf->SetTextColor(80, 80, 80);
-	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature") . ': ' . dol_print_date(dol_now(), "day", false, $langs, true). ' - '.$params['online_sign_name'], 0, 'L');
+	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature").': '.dol_print_date(dol_now(), "day", false, $langs, true).' - '.$params['online_sign_name'], 0, 'L');
 	//$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
 	//$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
 

htdocs/modulebuilder/index.php

Spacing +32 added lines, -32 removed lines

@@ -250,7 +250,7 @@ 
 		// Copy last 'html.formsetup.class.php' to backport folder
 		if (getDolGlobalInt('MODULEBUILDER_SUPPORT_COMPATIBILITY_V16')) {
 			$tryToCopyFromSetupClass = true;
-			$backportDest = $destdir .'/backport/v16/core/class';
+			$backportDest = $destdir.'/backport/v16/core/class';
 			$backportFileSrc = DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 			$backportFileDest = $backportDest.'/html.formsetup.class.php';
 			$result = dol_mkdir($backportDest);
@@ -355,7 +355,7 @@ 
 			);
 
 			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
-				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' ' . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
+				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
 			}
 
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -384,7 +384,7 @@ 
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?module='.$modulename);
@@ -879,7 +879,7 @@ 
 			}
 			$stringLog = implode("\n", $strreplace);
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-			dolReplaceInFile($destfile, array('//include::ChangeLog.md[]' => '','__CHANGELOG__' => $stringLog));
+			dolReplaceInFile($destfile, array('//include::ChangeLog.md[]' => '', '__CHANGELOG__' => $stringLog));
 		}
 
 		// Delete old documentation files
@@ -1533,7 +1533,7 @@ 
 			}
 		}
 		$menus = $moduleobj->menu;
-		$counter = 0 ;
+		$counter = 0;
 		foreach ($menus as $menu) {
 			if ($menu['leftmenu'] == strtolower($objectname)) {
 				$counter++;
@@ -1575,7 +1575,7 @@ 
 			);
 
 			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
-				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' ' . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
+				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
 			}
 
 			$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
@@ -1675,7 +1675,7 @@ 
 		} else {
 			createNewDictionnary($module, $moduledescriptorfile, $newdicname, $dictionaries);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			clearstatcache(true);
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -1770,7 +1770,7 @@ 
 				'isameasure' => GETPOSTINT('propisameasure'),
 				'comment' => GETPOST('propcomment', 'alpha'),
 				'help' => GETPOST('prophelp', 'alpha'),
-				'css' => GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
+				'css' => GETPOST('propcss', 'alpha'), // Can be 'maxwidth500 widthcentpercentminusxx' for example
 				'cssview' => GETPOST('propcssview', 'alpha'),
 				'csslist' => GETPOST('propcsslist', 'alpha'),
 				'default' => GETPOST('propdefault', 'restricthtml'),
@@ -1925,7 +1925,7 @@ 
 
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 
 			header("Location: ".$_SERVER["PHP_SELF"].'?module=deletemodule');
@@ -2017,7 +2017,7 @@ 
 
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			$resultko = 0;
 			foreach ($filetodelete as $tmpfiletodelete) {
@@ -2037,7 +2037,7 @@ 
 	}
 
 	$action = '';
-	if (! $error) {
+	if (!$error) {
 		$tabobj = 'newobject';
 	} else {
 		$tabobj = 'deleteobject';
@@ -2140,7 +2140,7 @@ 
 			setEventMessages($langs->trans("DictionaryDeleted", ucfirst(substr($newdicname, 2))), null);
 		}
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 		clearstatcache(true);
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -2148,7 +2148,7 @@ 
 	}
 }
 if ($dirins && $action == 'updatedictionary' && GETPOST('dictionnarykey')) {
-	$keydict = GETPOST('dictionnarykey') - 1 ;
+	$keydict = GETPOST('dictionnarykey') - 1;
 
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 	$destdir = $dirins.'/'.strtolower($module);
@@ -2182,7 +2182,7 @@ 
 				setEventMessages($langs->trans("DictionaryNameUpdated", ucfirst(GETPOST('tablib'))), null);
 			}
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			clearstatcache(true);
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -2357,7 +2357,7 @@ 
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
 		exit;
@@ -2463,7 +2463,7 @@ 
 			setEventMessages($langs->trans('PermissionUpdatedSuccesfuly'), null);
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
 			exit;
@@ -2513,7 +2513,7 @@ 
 
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
@@ -2683,7 +2683,7 @@ 
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 
 		setEventMessages($langs->trans('MenuDeletedSuccessfuly'), null);
@@ -2740,7 +2740,7 @@ 
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Url")), null, 'errors');
 	}
 	if (!empty(GETPOST('target'))) {
-		$targets = array('_blank','_self','_parent','_top','');
+		$targets = array('_blank', '_self', '_parent', '_top', '');
 		if (!in_array(GETPOST('target'), $targets)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldValue", $langs->transnoentities("target")), null, 'errors');
@@ -2846,7 +2846,7 @@ 
 
 // Modify a menu entry
 if ($dirins && $action == "update_menu" && GETPOSTINT('menukey') && GETPOST('tabobj')) {
-	$objectname =  GETPOST('tabobj');
+	$objectname = GETPOST('tabobj');
 	$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
 	$destdir = $dirins.'/'.strtolower($module);
 	$objects = dolGetListOfObjectClasses($destdir);
@@ -2941,7 +2941,7 @@ 
 			}
 		}
 	} else {
-		$_POST['type'] = '';	// TODO Use a var here and later
+		$_POST['type'] = ''; // TODO Use a var here and later
 		$_POST['titre'] = '';
 		$_POST['fk_menu'] = '';
 		$_POST['leftmenu'] = '';
@@ -4010,8 +4010,8 @@ 
 				}
 				print '</table><br>'."\n";
 				print '<div class="center">';
-				print '<input type="submit" class="button button-save" name="add" value="' . dol_escape_htmltag($langs->trans('Create')) . '">';
-				print '<input type="button" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '" onclick="goBack()">';
+				print '<input type="submit" class="button button-save" name="add" value="'.dol_escape_htmltag($langs->trans('Create')).'">';
+				print '<input type="button" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans('Cancel')).'" onclick="goBack()">';
 				print '</div>';
 				print '</form>';
 				// javascript
@@ -4116,16 +4116,16 @@ 
 						// Define path for sql file
 						$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
 						$result = dol_buildpath($pathtosql);
-						if (! dol_is_file($result)) {
+						if (!dol_is_file($result)) {
 							$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
 							$result = dol_buildpath($pathtosql);
-							if (! dol_is_file($result)) {
+							if (!dol_is_file($result)) {
 								$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
 								$result = dol_buildpath($pathtosql);
-								if (! dol_is_file($result)) {
+								if (!dol_is_file($result)) {
 									$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
 									$result = dol_buildpath($pathtosql);
-									if (! dol_is_file($result)) {
+									if (!dol_is_file($result)) {
 										$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'.sql';
 										$pathtosqlextra = 'install/mysql/tables/llx_'.strtolower($module).'_extrafields.sql';
 										$result = dol_buildpath($pathtosql);
@@ -4144,7 +4144,7 @@ 
 						$pathtosqlroot = preg_replace('/\/llx_.*$/', '', $pathtosql);
 
 						$pathtosqlkey   = preg_replace('/\.sql$/', '.key.sql', $pathtosql);
-						$pathtosqlextrakey   = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
+						$pathtosqlextrakey = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
 
 						$pathtolib      = strtolower($module).'/lib/'.strtolower($module).'.lib.php';
 						$pathtoobjlib   = strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($tabobj).'.lib.php';
@@ -5430,7 +5430,7 @@ 
 						}
 					  });
 
-					var groupedRights = ' . $groupedRights_json . ';
+					var groupedRights = ' . $groupedRights_json.';
 					var objectsSelect = $("select[id=\'objects\']");
 					var permsSelect = $("select[id=\'perms\']");
 
@@ -5653,7 +5653,7 @@ 
 							if (in_array($perm[5], array('lire', 'read', 'creer', 'write', 'effacer', 'delete'))) {
 								print dol_escape_htmltag(ucfirst($perm[4]));
 							} else {
-								print '';	// No particular object
+								print ''; // No particular object
 							}
 							print '</td>';
 
@@ -6545,9 +6545,9 @@ 
 
 						print '<td>';
 						if ($tabName[0] === "+") {
-							print '<span class="badge badge-status4 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
+							print '<span class="badge badge-status4 badge-status">'.dol_escape_htmltag($tabName).'</span>';
 						} else {
-							print '<span class="badge badge-status8 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
+							print '<span class="badge badge-status8 badge-status">'.dol_escape_htmltag($tabName).'</span>';
 						}
 						print '</td>';