Dolibarr / dolibarr

htdocs/categories/viewcat.php

Spacing +1 added lines, -1 removed lines

@@ -1126,7 +1126,7 @@
 			if ($showclassifyform) {
 				print '<table class="noborder centpercent">';
 				print '<tr class="liste_titre"><td>';
-				$force_entity = getEntity($object->element);	// So we will get same filter than the getObjectsInCateg()
+				$force_entity = getEntity($object->element); // So we will get same filter than the getObjectsInCateg()
 				print img_picto('', $type, 'class="pictofixedwidth"');
 				print $form->select_dolusers('', 'elemid', 1, null, 0, '', '', $force_entity);
 				print '<input type="submit" class="button buttongen" name="addintocategory" value="'.$langs->trans("ClassifyInCategory").'"></td>';

htdocs/categories/index.php

Spacing +2 added lines, -2 removed lines

@@ -221,12 +221,12 @@
 	$entry .= '</td>';
 	$entry .= '<td class="right" width="30px;">';
 	if ($user->hasRight('categorie', 'creer')) {
-		$entry .= '<a class="editfielda" href="' . DOL_URL_ROOT . '/categories/edit.php?id=' . $val['id'] . '&type=' . urlencode($type) . $moreparam . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type)) . '">' . img_edit() . '</a>';
+		$entry .= '<a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].'&type='.urlencode($type).$moreparam.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.urlencode($type)).'">'.img_edit().'</a>';
 	}
 	$entry .= '</td>';
 	$entry .= '<td class="right" width="30px;">';
 	if ($user->hasRight('categorie', 'supprimer')) {
-		$entry .= '<a class="deletefilelink" href="' . DOL_URL_ROOT . '/categories/viewcat.php?action=delete&token=' . newToken() . '&id=' . $val['id'] . '&type=' . urlencode($type) . $moreparam . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type) . $moreparam) . '&backtolist=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type) . $moreparam) . '">' . img_delete() . '</a>';
+		$entry .= '<a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].'&type='.urlencode($type).$moreparam.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.urlencode($type).$moreparam).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.urlencode($type).$moreparam).'">'.img_delete().'</a>';
 	}
 	$entry .= '</td>';
 

htdocs/website/class/website.class.php

Spacing +11 added lines, -11 removed lines

@@ -1163,8 +1163,8 @@ 
 			$stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport);
-			$stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport);	// When we have a link src="image/websiteref/file.png" into html content
-			$stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport);	// When we have a link src="/image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content
 			$stringtoexport = str_replace('"js/'.$website->ref.'/', '"js/__WEBSITE_KEY__/', $stringtoexport);
 			$stringtoexport = str_replace('"/js/'.$website->ref.'/', '"/js/__WEBSITE_KEY__/', $stringtoexport);
 
@@ -1472,7 +1472,7 @@ 
 				foreach ($aliasesarray as $aliasshortcuttocreate) {
 					if (trim($aliasshortcuttocreate)) {
 						$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
-						$result = dolSavePageAlias($filealias, $object, $objectpagestatic);	// This includes also a copy into sublanguage directories.
+						$result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories.
 						if (!$result) {
 							$this->errors[] = 'Failed to write file '.basename($filealias);
 							$error++;
@@ -1493,7 +1493,7 @@ 
 				$filetpl = $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php';
 			}
 			$filewrapper = $pathofwebsite.'/wrapper.php';
-			dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);	// This includes also a version of index.php into sublanguage directories
+			dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories
 		}
 
 		if ($error) {
@@ -1940,7 +1940,7 @@ 
 				$destContent = file_get_contents($fileNeeded['fullname']);
 
 				$numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']);
-				$differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource));
+				$differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest, $numOfPageSource));
 				$differences['file_destination'] = $fileNeeded;
 			} else {
 				$differences = array();
@@ -1983,10 +1983,10 @@ 
 		$linefound = array();
 		$countNumPage = count($exceptNumPge);
 
-		for ($i = 0;$i < $countNumPage; $i++) {
+		for ($i = 0; $i < $countNumPage; $i++) {
 			$linefound[$i] = array();
-			$linefound[$i]['meta'] = '/content="' . preg_quote((string) $exceptNumPge[$i], '/') . '" \/>/';
-			$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote((string) $exceptNumPge[$i], '/') . '\);/';
+			$linefound[$i]['meta'] = '/content="'.preg_quote((string) $exceptNumPge[$i], '/').'" \/>/';
+			$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", '.preg_quote((string) $exceptNumPge[$i], '/').'\);/';
 		}
 
 		if (isset($linefound[1])) {
@@ -2009,13 +2009,13 @@ 
 				if ($lineContent1 !== $lineContent2) {
 					if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
 						// Ligne deleted de la source
-						$diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
+						$diff["Supprimée à la ligne ".($lineNum + 1)] = $lineContent1;
 					} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
 						// Nouvelle ligne added dans la destination
-						$diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
+						$diff["Ajoutée à la ligne ".($lineNum + 1)] = $lineContent2;
 					} else {
 						// Différence found it
-						$diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
+						$diff["Modifiée à la ligne ".($lineNum + 1)] = $lineContent2;
 					}
 				}
 			}

htdocs/admin/remotestore/class/dolistore.class.php

Spacing +6 added lines, -6 removed lines

@@ -140,7 +140,7 @@ 
 			} elseif ($trace[0]['args'][0] == 401) {
 				die('Bad auth key');
 			} else {
-				print 'Can not access to ' . getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV').'<br>';
+				print 'Can not access to '.getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV').'<br>';
 				print $e->getMessage();
 			}
 		}
@@ -179,7 +179,7 @@ 
 
 			// make a search to limit the id returned.
 			if ($this->search != '') {
-				$opt2['url'] = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV') . '/api/search?query='.$this->search.'&language='.$this->lang; // It seems for search, key start with
+				$opt2['url'] = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV').'/api/search?query='.$this->search.'&language='.$this->lang; // It seems for search, key start with
 
 				// Call
 				dol_syslog("Call API with opt2 = ".var_export($opt2, true));
@@ -226,7 +226,7 @@ 
 			} elseif ($trace[0]['args'][0] == 401) {
 				die('Bad auth key');
 			} else {
-				print 'Can not access to ' . getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV').'<br>';
+				print 'Can not access to '.getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV').'<br>';
 				print $e->getMessage();
 			}
 		}
@@ -378,16 +378,16 @@ 
 			//output template
 			$html .= '<tr class="app oddeven '.dol_escape_htmltag($compatible).'">';
 			$html .= '<td class="center" width="160"><div class="newAppParent">';
-			$html .= $newapp.$images;	// No dol_escape_htmltag, it is already escape html
+			$html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html
 			$html .= '</div></td>';
 			$html .= '<td class="margeCote"><h2 class="appTitle">';
 			$html .= dol_escape_htmltag(dol_string_nohtmltag($product->name->language[$this->lang - 1]));
 			$html .= '<br><small>';
-			$html .= $version;			// No dol_escape_htmltag, it is already escape html
+			$html .= $version; // No dol_escape_htmltag, it is already escape html
 			$html .= '</small></h2>';
 			$html .= '<small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.dol_escape_htmltag($product->reference).' - '.dol_escape_htmltag($langs->trans('Id')).': '.((int) $product->id).'</small><br>';
 			$html .= '<br>'.dol_escape_htmltag(dol_string_nohtmltag($product->description_short->language[$this->lang - 1]));
-			$html.= '</td>';
+			$html .= '</td>';
 			// do not load if display none
 			$html .= '<td class="margeCote center amount">';
 			$html .= $price;

htdocs/admin/modules.php

Spacing +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
 $options['end']       = ((int) (GETPOSTINT('end') ? GETPOSTINT('end') : 0));
 $options['search']    = GETPOST('search_keyword', 'alpha');
 
-$remotestore            = new Dolistore(false);
+$remotestore = new Dolistore(false);
 
 
 if (!$user->admin) {
@@ -313,7 +313,7 @@ 
 				//var_dump($modulenamearrays);exit;
 
 				// Lop on each packages (can have several if package is a metapackage)
-				if (! $error) {
+				if (!$error) {
 					foreach ($modulenamearrays as $modulenameval) {
 						if (strpos($modulenameval, '#') === 0) {
 							continue; // Discard comments
@@ -382,7 +382,7 @@ 
 			'search_version' => '-1'
 		);
 		$queryString = http_build_query($searchParams);
-		$redirectUrl = DOL_URL_ROOT . '/admin/modules.php?' . $queryString;
+		$redirectUrl = DOL_URL_ROOT.'/admin/modules.php?'.$queryString;
 
 		$message = $langs->trans("SetupIsReadyForUse", $redirectUrl, $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules"));
 
@@ -584,7 +584,7 @@ 
 								} else {
 									$familykey = $objMod->family;
 								}
-								'@phan-var-force string $familykey';  // if not, phan considers $familykey may be null
+								'@phan-var-force string $familykey'; // if not, phan considers $familykey may be null
 
 								$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
 								if ($objMod->isCoreOrExternalModule() == 'external' && $moduleposition < 100000) {
@@ -690,7 +690,7 @@ 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
-$deschelp  = '';
+$deschelp = '';
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
 	$desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}');
@@ -977,7 +977,7 @@ 
 		}
 
 		if ($objMod->isCoreOrExternalModule() == 'external' && $action == 'checklastversion' && !getDolGlobalString('DISABLE_CHECK_ON_MALWARE_MODULES')) {
-			$checkRes = $objMod->checkForCompliance();	// Check if module is reported as non compliant with Dolibarr rules and law
+			$checkRes = $objMod->checkForCompliance(); // Check if module is reported as non compliant with Dolibarr rules and law
 			if (!is_numeric($checkRes) && $checkRes != '') {
 				$langs->load("errors");
 				setEventMessages($objMod->getName().' : '.$langs->trans($checkRes), null, 'errors');
@@ -1309,7 +1309,7 @@ 
 			<div id="category-tree-left">
 				<ul class="tree">
 					<?php
-					echo $remotestore->get_categories();	// Do not use dol_escape_htmltag here, it is already a structured content?>
+					echo $remotestore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content?>
 				</ul>
 			</div>
 

htdocs/user/class/user.class.php

Spacing +45 added lines, -45 removed lines

@@ -688,11 +688,11 @@ 
 
 				$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;
@@ -824,7 +824,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) {
@@ -939,16 +939,16 @@ 
 		// Special case for external user
 		if (!empty($this->socid)) {
 			if ($module == 'societe' && ($permlevel1 == 'creer' || $permlevel1 == 'write')) {
-				return 0;	// An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself)
 			}
 			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)
 			}
 			if ($module == 'societe' && $permlevel1 == 'export') {
-				return 0;	// An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && ($permlevel1 == 'supprimer' || $permlevel1 == 'delete')) {
-				return 0;	// An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself)
 			}
 		}
 
@@ -1096,7 +1096,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";
@@ -1232,7 +1232,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity IN (".$this->db->sanitize($entity, 0, 0, 0, 0).")";
 			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 to remove his own important rights
@@ -1411,12 +1411,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 gu=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 have inserted record that make rubbish result here due to the duplicate record of
 				// other entities, so we are forced to add a filter on gu 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";
@@ -1970,7 +1970,7 @@ 
 		$this->civility_code = $member->civility_code;
 		$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;
@@ -2108,45 +2108,45 @@ 
 		$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->admin						= ($this->admin > 0 ? $this->admin : 0);
-
-		$this->accountancy_code_user_general	= trim((string) $this->accountancy_code_user_general);
+		$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_user_general = trim((string) $this->accountancy_code_user_general);
 		$this->accountancy_code				= trim((string) $this->accountancy_code);
-		$this->color						= trim((string) $this->color);
-		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
+		$this->color = trim((string) $this->color);
+		$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();
 
@@ -2914,7 +2914,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);
 		}
@@ -3175,7 +3175,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.'"' : '');
 		}
@@ -3414,11 +3414,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;
 	}
@@ -3633,7 +3633,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/user/bank.php

Spacing +3 added lines, -3 removed lines

@@ -104,8 +104,8 @@ 
 
 // Define value to know what current user can do on users
 $selfpermission = ($user->id == $id && $user->hasRight('user', 'self', 'creer'));
-$usercanadd = (!empty($user->admin) || $user->hasRight('user', 'user', 'creer') || $user->hasRight('hrm', 'write_personal_information', 'write') );
-$usercanread = (!empty($user->admin) || $user->hasRight('user', 'user', 'lire') || $user->hasRight('hrm', 'read_personal_information', 'read') );
+$usercanadd = (!empty($user->admin) || $user->hasRight('user', 'user', 'creer') || $user->hasRight('hrm', 'write_personal_information', 'write'));
+$usercanread = (!empty($user->admin) || $user->hasRight('user', 'user', 'lire') || $user->hasRight('hrm', 'read_personal_information', 'read'));
 $permissiontoaddbankaccount = ($user->hasRight('salaries', 'write') || $user->hasRight('hrm', 'employee', 'write') || $user->hasRight('user', 'user', 'creer') || $selfpermission);
 $permissiontoreadhr = $user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write');
 $permissiontowritehr = $user->hasRight('hrm', 'write_personal_information', 'write');
@@ -630,7 +630,7 @@ 
 			$accountingaccount->fetch(0, $object->accountancy_code_user_general, 1);
 			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 		}
-		$accountingAccountByDefault = " (" . $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')) . ")";
+		$accountingAccountByDefault = " (".$langs->trans("AccountingAccountByDefaultShort").": ".length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')).")";
 		print (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') ? $accountingAccountByDefault : '');
 		print '</td>';
 

htdocs/accountancy/journal/bankjournal.php

Indentation +18 added lines, -18 removed lines

@@ -548,7 +548,7 @@ 
 
 						if (empty($obj->typeop_user)) {	// Add test to avoid adding amount twice if a link already exists also on user.
 							$accountancy_code_user_general = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee;
-                            $compta_user = $userstatic->accountancy_code;
+							$compta_user = $userstatic->accountancy_code;
 							if ($compta_user) {
 								$tabtp[$obj->rowid][$compta_user] += $amounttouse;
 								$tabuser[$obj->rowid] = array(
@@ -1048,20 +1048,20 @@ 
 					print '"'.$key.'"'.$sep;
 					print '"'.$date.'"'.$sep;
 					print '"'.$val["type_payment"].'"'.$sep;
-                    if ($tabtype[$key] == 'payment_supplier') {
-                        $account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier;
-                        print '"'.length_accountg($account_ledger).'"'.$sep;
-                    } elseif ($tabtype[$key] == 'payment') {
-                        $account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer;
-                        print '"'.length_accountg($account_ledger).'"'.$sep;
-                    } elseif ($tabtype[$key] == 'payment_expensereport') {
-                        print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT')).'"'.$sep;
-                    } elseif ($tabtype[$key] == 'payment_salary') {
-                        $account_ledger = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee;
-                        print '"'.length_accountg($account_ledger).'"'.$sep;
-                    } else {
-                        print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-                    }
+					if ($tabtype[$key] == 'payment_supplier') {
+						$account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier;
+						print '"'.length_accountg($account_ledger).'"'.$sep;
+					} elseif ($tabtype[$key] == 'payment') {
+						$account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer;
+						print '"'.length_accountg($account_ledger).'"'.$sep;
+					} elseif ($tabtype[$key] == 'payment_expensereport') {
+						print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT')).'"'.$sep;
+					} elseif ($tabtype[$key] == 'payment_salary') {
+						$account_ledger = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee;
+						print '"'.length_accountg($account_ledger).'"'.$sep;
+					} else {
+						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					}
 					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 					print '"'.$reflabel.'"'.$sep;
 					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
@@ -1340,16 +1340,16 @@ 
 					$account_ledger = $k;
 					// Try to force general ledger account depending on type
 					if ($tabtype[$key] == 'payment') {
-                        $account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer;
+						$account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer;
 					}
 					if ($tabtype[$key] == 'payment_supplier') {
-                        $account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier;
+						$account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier;
 					}
 					if ($tabtype[$key] == 'payment_expensereport') {
 						$account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT');
 					}
 					if ($tabtype[$key] == 'payment_salary') {
-                        $account_ledger = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee;
+						$account_ledger = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee;
 					}
 					if ($tabtype[$key] == 'payment_vat') {
 						$account_ledger = getDolGlobalString('ACCOUNTING_VAT_PAY_ACCOUNT');

htdocs/accountancy/closure/index.php

Spacing +28 added lines, -28 removed lines

@@ -95,7 +95,7 @@ 
 			if ($fiscal_period_id == $fiscal_period['id'] || (empty($fiscal_period_id) && $fiscal_period['date_start'] <= $now && $now <= $fiscal_period['date_end'])) {
 				$current_fiscal_period = $fiscal_period;
 			} else {
-				$last_fiscal_period = $fiscal_period;	// $last_fiscal_period is in fact $previous_fiscal_period
+				$last_fiscal_period = $fiscal_period; // $last_fiscal_period is in fact $previous_fiscal_period
 			}
 		}
 	}
@@ -144,7 +144,7 @@ 
 			if ($result > 0) {
 				setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
 
-				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				header("Location: ".$_SERVER['PHP_SELF'].(isset($current_fiscal_period) ? '?fiscal_period_id='.$current_fiscal_period['id'] : ''));
 				exit;
 			} else {
 				setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
@@ -174,7 +174,7 @@ 
 				} else {
 					setEventMessages($langs->trans("AccountancyClosureCloseSuccessfully"), null, 'mesgs');
 
-					header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+					header("Location: ".$_SERVER['PHP_SELF'].(isset($current_fiscal_period) ? '?fiscal_period_id='.$current_fiscal_period['id'] : ''));
 					exit;
 				}
 			}
@@ -190,7 +190,7 @@ 
 			} else {
 				setEventMessages($langs->trans("AccountancyClosureInsertAccountingReversalSuccessfully"), null, 'mesgs');
 
-				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				header("Location: ".$_SERVER['PHP_SELF'].(isset($current_fiscal_period) ? '?fiscal_period_id='.$current_fiscal_period['id'] : ''));
 				exit;
 			}
 		}
@@ -231,7 +231,7 @@ 
 		);
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'],
 			$langs->trans('ValidateMovements'),
 			$langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")),
 			'confirm_step_1',
@@ -269,7 +269,7 @@ 
 		);
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'],
 			$langs->trans('AccountancyClosureClose'),
 			$langs->trans('AccountancyClosureConfirmClose'),
 			'confirm_step_2',
@@ -313,7 +313,7 @@ 
 		);
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'],
 			$langs->trans('AccountancyClosureAccountingReversal'),
 			$langs->trans('AccountancyClosureConfirmAccountingReversal'),
 			'confirm_step_3',
@@ -340,13 +340,13 @@ 
 
 $fiscal_period_nav_text = $langs->trans("FiscalPeriod");
 
-$fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($last_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $last_fiscal_period['id'] : '#" class="disabled') . '">' . img_previous() . '</a>';
-$fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($next_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $next_fiscal_period['id'] : '#" class="disabled') . '">' . img_next() . '</a>';
+$fiscal_period_nav_text .= '&nbsp;<a href="'.(isset($last_fiscal_period) ? $_SERVER["PHP_SELF"].'?fiscal_period_id='.$last_fiscal_period['id'] : '#" class="disabled').'">'.img_previous().'</a>';
+$fiscal_period_nav_text .= '&nbsp;<a href="'.(isset($next_fiscal_period) ? $_SERVER["PHP_SELF"].'?fiscal_period_id='.$next_fiscal_period['id'] : '#" class="disabled').'">'.img_next().'</a>';
 if (!empty($current_fiscal_period)) {
-	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;(' . (isset($current_fiscal_period) ? dol_print_date($current_fiscal_period['date_start'], 'day') . '&nbsp;-&nbsp;' . dol_print_date($current_fiscal_period['date_end'], 'day') . ')' : '');
+	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;('.(isset($current_fiscal_period) ? dol_print_date($current_fiscal_period['date_start'], 'day').'&nbsp;-&nbsp;'.dol_print_date($current_fiscal_period['date_end'], 'day').')' : '');
 }
 
-print load_fiche_titre($langs->trans("Closure") . " - " . $fiscal_period_nav_text, '', 'title_accountancy');
+print load_fiche_titre($langs->trans("Closure")." - ".$fiscal_period_nav_text, '', 'title_accountancy');
 
 if (empty($current_fiscal_period)) {
 	print $langs->trans('ErrorNoFiscalPeriodActiveFound', $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("FiscalPeriod"));
@@ -354,12 +354,12 @@ 
 	if (!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
 		// Step 1
 		$head = array();
-		$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+		$head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id'];
 		$head[0][1] = $langs->trans("Step").' 1 - '.$langs->trans("AccountancyClosureStep1");
 		$head[0][2] = 'step1';
 		print dol_get_fiche_head($head, 'step1', '', -1, '');
 
-		print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep1Desc") . '</span><br>';
+		print '<span class="opacitymedium">'.$langs->trans("AccountancyClosureStep1Desc").'</span><br>';
 
 		$count_by_month = $object->getCountByMonthForFiscalPeriod($current_fiscal_period['date_start'], $current_fiscal_period['date_end']);
 
@@ -368,9 +368,9 @@ 
 		}
 
 		if (empty($count_by_month['total'])) {
-			$buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("ValidateMovements") . '</a>';
+			$buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("ValidateMovements").'</a>';
 		} else {
-			$buttonvalidate = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_1&token='.newToken().'&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("ValidateMovements") . '</a>';
+			$buttonvalidate = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_1&token='.newToken().'&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("ValidateMovements").'</a>';
 		}
 		print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), 0, '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0);
 
@@ -380,24 +380,24 @@ 
 		print '<tr class="liste_titre">';
 		$nb_years = is_array($count_by_month['list']) ? count($count_by_month['list']) : 0;
 		if ($nb_years > 1) {
-			print '<td class="right">' . $langs->trans("Year") . '</td>';
+			print '<td class="right">'.$langs->trans("Year").'</td>';
 		}
 		for ($i = 1; $i <= 12; $i++) {
-			print '<td class="right">' . $langs->trans('MonthShort' . str_pad((string) $i, 2, '0', STR_PAD_LEFT)) . '</td>';
+			print '<td class="right">'.$langs->trans('MonthShort'.str_pad((string) $i, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
-		print '<td class="right"><b>' . $langs->trans("Total") . '</b></td>';
+		print '<td class="right"><b>'.$langs->trans("Total").'</b></td>';
 		print '</tr>';
 
 		if (is_array($count_by_month['list'])) {
 			foreach ($count_by_month['list'] as $info) {
 				print '<tr class="oddeven">';
 				if ($nb_years > 1) {
-					print '<td class="right">' . $info['year'] . '</td>';
+					print '<td class="right">'.$info['year'].'</td>';
 				}
 				for ($i = 1; $i <= 12; $i++) {
-					print '<td class="right">' . ((int) $info['count'][$i]) . '</td>';
+					print '<td class="right">'.((int) $info['count'][$i]).'</td>';
 				}
-				print '<td class="right"><b>' . $info['total'] . '</b></td></tr>';
+				print '<td class="right"><b>'.$info['total'].'</b></td></tr>';
 			}
 		}
 
@@ -409,7 +409,7 @@ 
 
 	// Step 2
 	$head = array();
-	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+	$head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id'];
 	$head[0][1] = $langs->trans("Step").(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2");
 	$head[0][2] = 'step2';
 	print dol_get_fiche_head($head, 'step2', '', -1, '');
@@ -418,12 +418,12 @@ 
 	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep2Desc") . '</span><br>';
 	if ((empty($count_by_month['total']) || getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) && empty($current_fiscal_period['status'])) {
 		// If no unlocked record and period still open
-		$button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_2&token='.newToken().'&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureClose") . '</a>';
+		$button = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_2&token='.newToken().'&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("AccountancyClosureClose").'</a>';
 	} else {
 		if (!empty($current_fiscal_period['status'])) {
-			$button = '<a class="butActionRefused classfortooltip" href="#" title="The period is already closed. Feature disabled.">' . $langs->trans("AccountancyClosureClose") . '</a>';
+			$button = '<a class="butActionRefused classfortooltip" href="#" title="The period is already closed. Feature disabled.">'.$langs->trans("AccountancyClosureClose").'</a>';
 		} elseif (!empty($count_by_month['total'])) {
-			$button = '<a class="butActionRefused classfortooltip" href="#" title="There is some lines not yet locked. Feature disabled.">' . $langs->trans("AccountancyClosureClose") . '</a>';
+			$button = '<a class="butActionRefused classfortooltip" href="#" title="There is some lines not yet locked. Feature disabled.">'.$langs->trans("AccountancyClosureClose").'</a>';
 		}
 	}
 	print_barre_liste('', 0, '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
@@ -432,7 +432,7 @@ 
 
 	// Step 3
 	$head = array();
-	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+	$head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id'];
 	$head[0][1] = $langs->trans("Step").(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3");
 	$head[0][2] = 'step3';
 	print dol_get_fiche_head($head, 'step3', '', -1, '');
@@ -440,9 +440,9 @@ 
 	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep3Desc") . '</span><br>';
 
 	if (empty($current_fiscal_period['status'])) {
-		$button = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>';
+		$button = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AccountancyClosureAccountingReversal").'</a>';
 	} else {
-		$button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_3&token='.newToken().'&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>';
+		$button = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_3&token='.newToken().'&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("AccountancyClosureAccountingReversal").'</a>';
 	}
 	print_barre_liste('', 0, '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
 }