Dolibarr / dolibarr

htdocs/core/login/functions_dolibarr.php

Spacing +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
 					}
 				} else {
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
-					sleep(1);	// Anti brut force protection. Must be same delay when password is not valid
+					sleep(1); // Anti brut force protection. Must be same delay when password is not valid
 
 					// Load translation files required by the page
 					$langs->loadLangs(array('main', 'errors'));
@@ -174,7 +174,7 @@ 
 			}
 		} else {
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO Too many attempts", LOG_NOTICE);
-			sleep(1);	// Anti brut force protection. Must be same delay when password is not valid
+			sleep(1); // Anti brut force protection. Must be same delay when password is not valid
 			// Load translation files required by the page
 			$langs->loadLangs(array('main', 'errors'));
 			$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorTooManyAttempts");

htdocs/core/login/functions_googleoauth.php

Spacing +3 added lines, -3 removed lines

@@ -75,12 +75,12 @@
 			//global $dolibarr_main_url_root;
 			//$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 			//$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-			$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+			$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current
 
 			//$shortscope = 'userinfo_email,userinfo_profile';
-			$shortscope = 'openid,email,profile';	// For openid connect
+			$shortscope = 'openid,email,profile'; // For openid connect
 
-			$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+			$oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
 			$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
 
 			$url = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode('forlogin-'.$shortscope.'-'.$oauthstateanticsrf).'&username='.urlencode($usertotest);

htdocs/asset/document.php

Spacing +6 added lines, -6 removed lines

@@ -117,7 +117,7 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . dol_buildpath('/asset/asset_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.dol_buildpath('/asset/asset_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
@@ -130,10 +130,10 @@ 
 	print '<table class="border centpercent tableforfield">';
 
 	// Number of files
-	print '<tr><td class="titlefield">' . $langs->trans("NbOfAttachedFiles") . '</td><td colspan="3">' . count($filearray) . '</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 	// Total size
-	print '<tr><td>' . $langs->trans("TotalSizeOfAttachedFiles") . '</td><td colspan="3">' . $totalsize . ' ' . $langs->trans("bytes") . '</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print '</table>';
 
@@ -146,12 +146,12 @@ 
 	//  $permissiontoadd = 1;
 	$permtoedit = $user->hasRight('asset', 'write');
 	//  $permtoedit = 1;
-	$param = '&id=' . $object->id;
+	$param = '&id='.$object->id;
 
 	//$relativepathwithnofile='asset/' . dol_sanitizeFileName($object->id).'/';
-	$relativepathwithnofile = dol_sanitizeFileName($object->ref) . '/';
+	$relativepathwithnofile = dol_sanitizeFileName($object->ref).'/';
 
-	include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	accessforbidden('', 0, 1);
 }

htdocs/asset/accountancy_codes.php

Spacing +17 added lines, -17 removed lines

@@ -24,9 +24,9 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "companies"));
@@ -42,15 +42,15 @@ 
 $object = new Asset($db);
 $assetaccountancycodes = new AssetAccountancyCodes($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('assetaccountancycodes', 'globalcard')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+	$upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
 }
 
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
@@ -109,7 +109,7 @@ 
 			$action = 'edit';
 		} else {
 			setEventMessage($langs->trans('RecordSaved'));
-			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
 	}
@@ -131,7 +131,7 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
@@ -143,19 +143,19 @@ 
 	print '</div>';
 
 	if ($action == 'edit') {
-		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update">';
 		if ($backtopage) {
-			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 		}
 		if ($backtopageforcancel) {
-			print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+			print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 		}
 
 		print dol_get_fiche_head(array(), '');
 
-		include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_edit.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/asset/tpl/accountancy_codes_edit.tpl.php';
 
 		print dol_get_fiche_end();
 
@@ -163,13 +163,13 @@ 
 
 		print '</form>';
 	} else {
-		include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/asset/tpl/accountancy_codes_view.tpl.php';
 	}
 
 	print dol_get_fiche_end();
 
 	if ($action != 'edit') {
-		print '<div class="tabsAction">' . "\n";
+		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) {
@@ -178,10 +178,10 @@ 
 
 		if (empty($reshook)) {
 			if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 			}
 		}
-		print '</div>' . "\n";
+		print '</div>'."\n";
 	}
 }
 

htdocs/asset/depreciation_options.php

Spacing +15 added lines, -15 removed lines

@@ -24,9 +24,9 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "companies"));
@@ -48,9 +48,9 @@ 
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+	$upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
 }
 
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
@@ -111,7 +111,7 @@ 
 			$action = 'edit';
 		} else {
 			setEventMessage($langs->trans('RecordSaved'));
-			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
 	}
@@ -145,19 +145,19 @@ 
 	print '</div>';
 
 	if ($action == 'edit') {
-		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update">';
 		if ($backtopage) {
-			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 		}
 		if ($backtopageforcancel) {
-			print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+			print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 		}
 
 		print dol_get_fiche_head(array(), '');
 
-		include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_edit.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/asset/tpl/depreciation_options_edit.tpl.php';
 
 		print dol_get_fiche_end();
 
@@ -165,13 +165,13 @@ 
 
 		print '</form>';
 	} else {
-		include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/asset/tpl/depreciation_options_view.tpl.php';
 	}
 
 	print dol_get_fiche_end();
 
 	if ($action != 'edit') {
-		print '<div class="tabsAction">' . "\n";
+		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) {
@@ -180,10 +180,10 @@ 
 
 		if (empty($reshook)) {
 			if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 			}
 		}
-		print '</div>' . "\n";
+		print '</div>'."\n";
 	}
 }
 

htdocs/asset/agenda.php

Spacing +10 added lines, -10 removed lines

@@ -139,7 +139,7 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
@@ -163,16 +163,16 @@ 
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin=' . urlencode($object->element . '@' . $object->module) . '&originid=' . urlencode($object->id);
-	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
-	$out .= '&backtopage=' . urlencode($urlbacktopage);
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid=' . urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode($objthirdparty->id);
 		}
-		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
@@ -183,18 +183,18 @@ 
 
 	if (isModEnabled('agenda')) {
 		if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '">' . $langs->trans("AddAction") . '</a>';
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
-			print '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AddAction") . '</a>';
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
 		}
 	}
 
 	print '</div>';
 
 	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
-		$param = '&id=' . $object->id . '&socid=' . $socid;
+		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-			$param .= '&contextpage=' . urlencode($contextpage);
+			$param .= '&contextpage='.urlencode($contextpage);
 		}
 		if ($limit > 0 && $limit != $conf->liste_limit) {
 			$param .= '&limit='.((int) $limit);

htdocs/resource/contact.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 $object = new Dolresource($db);
 
 // Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';     // Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
 
 // Security check
 if ($user->socid) {

htdocs/resource/element_resource.php

Spacing +2 added lines, -2 removed lines

@@ -537,8 +537,8 @@
 			// Ref customer
 			//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, $user->rights->ficheinter->creer, 'string', '', 0, 1);
 			//$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
-			$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', 0, 1);
-			$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', null, null, '', 1);
+			$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', 0, 1);
+			$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', null, null, '', 1);
 			// Thirdparty
 			$morehtmlref .= '<br>'.$fichinter->thirdparty->getNomUrl(1, 'customer');
 			// Project

htdocs/ecm/index_medias.php

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
 
 $websitekey = '';
 
-$permissiontoadd = $permissiontouploadfile;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+$permissiontoadd = $permissiontouploadfile; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('ecmmediascard', 'globalcard'));
@@ -117,7 +117,7 @@ 
 if ($sortorder) {
 	$backtopage .= '&sortorder='.urlencode($sortorder);
 }
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';	// This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
 
 $backtopage = $savbacktopage;