Dolibarr / dolibarr

htdocs/expensereport/document.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 	}
 }
 
-$permissiontoadd = $user->hasRight('expensereport', 'creer');	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

htdocs/public/webportal/webportal.main.inc.php

Spacing +15 added lines, -16 removed lines

@@ -24,15 +24,14 @@ 
 			   $dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php
 
 		$tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ?
-			(empty($dolibarr_main_cookie_cryptkey) ? '' :
-				$dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id;
+			(empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id;
 		// Unique id of instance
 
 		// The recommended value (may be not defined for old versions)
 		if (!empty($tmp_instance_unique_id)) {
-			return sha1('webportal' . $tmp_instance_unique_id);
+			return sha1('webportal'.$tmp_instance_unique_id);
 		} else {
-			return sha1('webportal' . $_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_ROOT'].DOL_DOCUMENT_ROOT);
+			return sha1('webportal'.$_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_ROOT'].DOL_DOCUMENT_ROOT);
 		}
 	}
 }
@@ -40,14 +39,14 @@ 
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 $res = 0;
-if (!$res && file_exists('../../main.inc.php')) $res = @include '../../main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res && file_exists('../../../main.inc.php')) $res = @include '../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../main.inc.php')) $res = @include '../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../../main.inc.php')) $res = @include '../../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../../../main.inc.php')) $res = @include '../../../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../main.inc.php')) $res = @include '../../main.inc.php'; // to work if your module directory is into dolibarr root htdocs directory
+if (!$res && file_exists('../../../main.inc.php')) $res = @include '../../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../../../main.inc.php')) $res = @include '../../../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../../../../main.inc.php')) $res = @include '../../../../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../../../../../main.inc.php')) $res = @include '../../../../../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory
 if (!$res) die('Include of main fails');
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 dol_include_once('/public/webportal/lib/webportal.lib.php');
 dol_include_once('/webportal/class/context.class.php');
 dol_include_once('/webportal/class/webportalmember.class.php');
@@ -57,9 +56,9 @@ 
 // Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
 // Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
 $prefix = dol_getprefix('');
-$sessionname = 'WEBPORTAL_SESSID_' . $prefix;
-$sessiontimeout = 'WEBPORTAL_SESSTIMEOUT_' . $prefix;
-if (!empty($_COOKIE[$sessiontimeout]) && session_status()===PHP_SESSION_NONE) {
+$sessionname = 'WEBPORTAL_SESSID_'.$prefix;
+$sessiontimeout = 'WEBPORTAL_SESSTIMEOUT_'.$prefix;
+if (!empty($_COOKIE[$sessiontimeout]) && session_status() === PHP_SESSION_NONE) {
 	ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 }
 
@@ -77,7 +76,7 @@ 
 
 if (!defined('WEBPORTAL_NOREQUIRETRAN') || (!defined('WEBPORTAL_NOLOGIN') && !empty($context->controllerInstance->accessNeedLoggedUser))) {
 	if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-		include_once DOL_DOCUMENT_ROOT . '/core/class/translate.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate("", $conf);
 		$langcode = (GETPOST('lang', 'aZ09', 1) ? GETPOST('lang', 'aZ09', 1) : (empty($logged_user->conf->MAIN_LANG_DEFAULT) ? (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $logged_user->conf->MAIN_LANG_DEFAULT));
 		if (defined('MAIN_LANG_DEFAULT')) {
@@ -223,7 +222,7 @@ 
 					if (!$error) {
 						if ($logged_thirdparty->default_lang != $langs->defaultlang && !defined('WEBPORTAL_NOREQUIRETRAN')) {
 							if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-								include_once DOL_DOCUMENT_ROOT . '/core/class/translate.class.php';
+								include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 								$langs = new Translate("", $conf);
 								$langs->setDefaultLang($logged_thirdparty->default_lang);
 							}

htdocs/public/webportal/tpl/menu.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 	$navUserMenu['user_logout'] = array(
 		'id' => 'user_logout',
 		'rank' => 99999,
-		'url' => $context->getControllerUrl() . 'logout.php',
+		'url' => $context->getControllerUrl().'logout.php',
 		'name' => $langs->trans('Logout'),
 	);
 }
@@ -111,7 +111,7 @@ 
 	'maxTopMenu' => & $maxTopMenu
 );
 
-$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook
 if ($reshook < 0) $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
@@ -170,9 +170,9 @@ 
 		$brandTitle = getDolGlobalString('WEBPORTAL_TITLE') ? getDolGlobalString('WEBPORTAL_TITLE') : getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
 		print '<a class="brand__logo-link"  href="'.$context->getControllerUrl().'" >';
 		if (!empty($context->theme->menuLogoUrl)) {
-			print '<img class="brand__logo-img" src="' . dol_escape_htmltag($context->theme->menuLogoUrl) . '" alt="' . dol_escape_htmltag($brandTitle) . '" >';
+			print '<img class="brand__logo-img" src="'.dol_escape_htmltag($context->theme->menuLogoUrl).'" alt="'.dol_escape_htmltag($brandTitle).'" >';
 		} else {
-			print '<span class="brand__name">' . $brandTitle . '</span>';
+			print '<span class="brand__name">'.$brandTitle.'</span>';
 		}
 		print '</a>';
 		?>

htdocs/product/class/api_products.class.php

Spacing +4 added lines, -4 removed lines

@@ -190,7 +190,7 @@ 
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
 		$sql .= " FROM ".$this->db->prefix()."product as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
 		if ($category > 0) {
 			$sql .= ", ".$this->db->prefix()."categorie_product as c";
 		}
@@ -230,7 +230,7 @@ 
 		}
 
 		//this query will return total products with the filters given
-		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
+		$sqlTotals = str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
@@ -290,7 +290,7 @@ 
 			$obj_ret['pagination'] = array(
 				'total' => (int) $total,
 				'page' => $page, //count starts from 0
-				'page_count' => ceil((int) $total/$limit),
+				'page_count' => ceil((int) $total / $limit),
 				'limit' => $limit
 			);
 		}
@@ -1999,7 +1999,7 @@ 
 		unset($object->fk_bank);
 		unset($object->fk_account);
 
-		unset($object->supplierprices);	// Must use another API to get them
+		unset($object->supplierprices); // Must use another API to get them
 
 		if (!DolibarrApiAccess::$user->hasRight('stock', 'lire')) {
 			unset($object->stock_reel);

htdocs/reception/class/api_receptions.class.php

Indentation +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 	public $reception;
 
 	/**
-		* Constructor
+	 * Constructor
 	 */
 	public function __construct()
 	{
@@ -621,15 +621,15 @@ 
 	*/
 
 	/**
-	* Close a reception (Classify it as "Delivered")
-	*
-	* @param	int     $id             Reception ID
-	* @param	int     $notrigger      Disabled triggers
-	*
-	* @url POST    {id}/close
-	*
-	* @return  Object
-	*/
+	 * Close a reception (Classify it as "Delivered")
+	 *
+	 * @param	int     $id             Reception ID
+	 * @param	int     $notrigger      Disabled triggers
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  Object
+	 */
 	public function close($id, $notrigger = 0)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {

htdocs/website/index.php

Spacing +29 added lines, -29 removed lines

@@ -348,7 +348,7 @@ 
 }
 
 $usercanedit = $user->hasRight('website', 'write');
-$permissiontoadd = $user->hasRight('website', 'write');	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+$permissiontoadd = $user->hasRight('website', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 $permissiontodelete = $user->hasRight('website', 'delete');
 
 
@@ -415,7 +415,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;
 //var_dump($backtopage);
@@ -1528,7 +1528,7 @@ 
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconMustBeASquaredImage'), array(), 'errors');
 				}
-				if (! $error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
+				if (!$error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconSize'), array(), 'errors');
 				}
@@ -1540,7 +1540,7 @@ 
 				if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 					$action = 'preview';
 					if ($backtopage) {
-						$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+						$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 						header("Location: ".$backtopage);
 						exit;
 					}
@@ -1573,7 +1573,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$htmlheadercontent = '';
@@ -1611,7 +1611,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$csscontent = '';
@@ -1654,7 +1654,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$jscontent = '';
@@ -1692,7 +1692,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$robotcontent = '';
@@ -1730,7 +1730,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$htaccesscontent = '';
@@ -1754,7 +1754,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$manifestjsoncontent = '';
@@ -1792,7 +1792,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$readmecontent = '';
@@ -1830,7 +1830,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$licensecontent = '';
@@ -1872,7 +1872,7 @@ 
 			if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 				$action = 'preview';
 				if ($backtopage) {
-					$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+					$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 					header("Location: ".$backtopage);
 					exit;
 				}
@@ -1891,7 +1891,7 @@ 
 
 	$object->fk_default_home = $pageid;
 	$res = $object->update($user);
-	if (! ($res > 0)) {
+	if (!($res > 0)) {
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -2282,7 +2282,7 @@ 
 
 			$phpfullcodestringold = dolKeepOnlyPhpCode($objectpage->content);
 
-			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');	// any HTML content allowed
+			$objectpage->content = GETPOST('PAGE_CONTENT', 'none'); // any HTML content allowed
 
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 
@@ -2487,7 +2487,7 @@ 
 				$fileofzip = '';
 				if (GETPOSTISSET('templateuserfile')) {
 					// Case we selected one template
-					$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');	// $fileofzip will be sanitized later into the importWebSite()
+					$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha'); // $fileofzip will be sanitized later into the importWebSite()
 				} elseif (!empty($_FILES) && is_array($_FILES['userfile'])) {
 					// Case we upload a new template
 					if (is_array($_FILES['userfile']['tmp_name'])) {
@@ -2569,7 +2569,7 @@ 
 	if ($website->virtualhost) {
 		$domainname = $website->virtualhost;
 	}
-	if (! preg_match('/^http/i', $domainname)) {
+	if (!preg_match('/^http/i', $domainname)) {
 		$domainname = 'https://'.$domainname;
 	}
 
@@ -2635,7 +2635,7 @@ 
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
 				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
+					$changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
 					$url->appendChild($changefreq);
 				}
 				// Add higher priority for home page
@@ -2740,7 +2740,7 @@ 
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
 				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
+					$changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
 					$url->appendChild($changefreq);
 				}
 
@@ -3335,7 +3335,7 @@ 
 						$formquestion[] = array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly');
 					}
 
-					$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
+					$value = $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
 					$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
 
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
@@ -3363,7 +3363,7 @@ 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
 
-				print '<div class="inline-block marginrightonly">';	// Button includes dynamic content
+				print '<div class="inline-block marginrightonly">'; // Button includes dynamic content
 				print $langs->trans("ShowSubcontainers");
 				if (!getDolGlobalString('WEBSITE_SUBCONTAINERSINLINE')) {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
@@ -3372,7 +3372,7 @@ 
 				}
 				print '</div>';
 
-				print '<div class="inline-block marginrightonly">';	// Button edit inline
+				print '<div class="inline-block marginrightonly">'; // Button edit inline
 
 				print '<span id="switchckeditorinline">'."\n";
 				// Enable CKEditor inline with js on section and div with conteneditable=true
@@ -3490,7 +3490,7 @@ 
 				} else {
 					$disabled = '';
 					$title = '';
-					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref);	// action=delete for webpage, deletesite for website
+					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref); // action=delete for webpage, deletesite for website
 				}
 				print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
 				print '</span>';
@@ -3699,7 +3699,7 @@ 
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
 	} else {
-		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');	// We must use 'nohtml' and not 'alphanohtml' because we must accept "
+		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
 	}
 	if (!trim($htaccesscontent)) {
 		$htaccesscontent .= "# Order allow,deny\n";
@@ -3801,7 +3801,7 @@ 
 	$maxfilesizearray = getMaxFileSizeArray();
 	$maxmin = $maxfilesizearray['maxmin'];
 	if ($maxmin > 0) {
-		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 	}
 	print '<input type="file" class="flat minwidth300" name="addedfile" id="addedfile"/>';
 
@@ -4057,7 +4057,7 @@ 
 		$maxfilesizearray = getMaxFileSizeArray();
 		$maxmin = $maxfilesizearray['maxmin'];
 		if ($maxmin > 0) {
-			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 		print '<input type="submit" class="button small" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
@@ -4576,7 +4576,7 @@ 
 
 
 	$module = 'medias';
-	$formalreadyopen = 2;	// So the form to submit a new file will not be opened another time inside the core/tpl/filemanager.tpl.php
+	$formalreadyopen = 2; // So the form to submit a new file will not be opened another time inside the core/tpl/filemanager.tpl.php
 	if (empty($url)) {
 		$url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
 	}
@@ -4629,7 +4629,7 @@ 
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$poscursor = array('x'=>GETPOST('PAGE_CONTENT_x'), 'y'=>GETPOST('PAGE_CONTENT_y'));
-	$doleditor=new DolEditor('PAGE_CONTENT', $contentforedit, '', 500, 'Full', '', true, true, true, ROWS_5, '90%', 0, $poscursor);
+	$doleditor = new DolEditor('PAGE_CONTENT', $contentforedit, '', 500, 'Full', '', true, true, true, ROWS_5, '90%', 0, $poscursor);
 	$doleditor->Create(0, '', false);
 }
 
@@ -4807,7 +4807,7 @@ 
 			print getTitleFieldOfList("Categories", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList("Language", 0, $_SERVER['PHP_SELF'], 'lang', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
-			print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";		// Date last modif
+			print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; // Date last modif
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 			print '</tr>';

htdocs/delivery/card.php

Spacing +3 added lines, -3 removed lines

@@ -90,10 +90,10 @@ 
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);       // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Delete Link
 $permissiondellink = $user->hasRight('expedition', 'delivery', 'supprimer'); // Used by the include of actions_dellink.inc.php
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';     // Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 if ($action == 'add') {
 	$db->begin();
@@ -326,7 +326,7 @@ 
 			$morehtmlref = '<div class="refidno">';
 			// Ref customer shipment
 			$morehtmlref .= $form->editfieldkey("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string', '', 0, 1);
-			$morehtmlref .= $form->editfieldval("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+			$morehtmlref .= $form->editfieldval("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 			$morehtmlref .= '<br>'.$langs->trans("RefDeliveryReceipt").' : '.$object->ref;
 			// Thirdparty
 			$morehtmlref .= '<br>'.$expedition->thirdparty->getNomUrl(1);

htdocs/expedition/document.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 }
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
-$permissiontoadd = $user->hasRight('expedition', 'creer');	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('expedition', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

htdocs/expedition/class/api_shipments.class.php

Indentation +9 added lines, -9 removed lines

@@ -623,15 +623,15 @@
 	*/
 
 	/**
-	* Close a shipment (Classify it as "Delivered")
-	*
-	* @param   int     $id             Expedition ID
-	* @param   int     $notrigger      Disabled triggers
-	*
-	* @url POST    {id}/close
-	*
-	* @return  object
-	*/
+	 * Close a shipment (Classify it as "Delivered")
+	 *
+	 * @param   int     $id             Expedition ID
+	 * @param   int     $notrigger      Disabled triggers
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  object
+	 */
 	public function close($id, $notrigger = 0)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('expedition', 'creer')) {