Dolibarr / dolibarr

htdocs/core/lib/website2.lib.php

Spacing +48 added lines, -48 removed lines

@@ -154,7 +154,7 @@ 
 	if (dol_is_file($filetpl)) {
 		if ($backupold) {
 			$result = archiveOrBackupFile($filetpl);
-			if (! $result) {
+			if (!$result) {
 				return false;
 			}
 		} else {
@@ -344,48 +344,48 @@ 
 		if ($objectpage->type_container == 'setup') {
 			$content = '<div id="websitetemplateconfigpage">'."\n";
 			$content .= '<?php'."\n";
-			$content .= '/*' . "\n";
-			$content .= ' * Actions' . "\n";
-			$content .= ' */' . "\n";
-			$content .= '$websitetemplateconf = GETPOSTINT(\'websitetemplateconf\');' . "\n";
-			$content .= 'include DOL_DOCUMENT_ROOT.\'/core/actions_setmoduleoptions.inc.php\';' . "\n";
-			$content .= '' . "\n";
-			$content .= '/*' . "\n";
-			$content .= ' * View' . "\n";
-			$content .= ' */' . "\n";
-			$content .= 'print load_fiche_titre($langs->trans(\'SetupAndProperties\'), \'\', \'title_setup\');' . "\n";
-			$content .= '' . "\n";
-			$content .= 'if (!empty($message)) {' . "\n";
-			$content .= '    print $message;' . "\n";
-			$content .= '}' . "\n";
-			$content .= '' . "\n";
-			$content .= 'if (!empty($formSetup->items)) {' . "\n";
-			$content .= '    $html = \'\';' . "\n";
-			$content .= '' . "\n";
-			$content .= '    $html .= \'<form action="config.php" method="POST">\';' . "\n";
-			$content .= '    // Generate hidden values from $formSetup->formHiddenInputs' . "\n";
-			$content .= '    if (!empty($formSetup->formHiddenInputs) && is_array($formSetup->formHiddenInputs)) {' . "\n";
-			$content .= '        foreach ($formSetup->formHiddenInputs as $hiddenKey => $hiddenValue) {' . "\n";
-			$content .= '            $html .= \'<input type="hidden" name="\' . dol_escape_htmltag($hiddenKey) . \'" value="\' . dol_escape_htmltag($hiddenValue) . \'">\';' . "\n";
-			$content .= '        }' . "\n";
-			$content .= '    }' . "\n";
-			$content .= '' . "\n";
-			$content .= '    // Generate output table' . "\n";
-			$content .= '    $html .= $formSetup->generateTableOutput(true);' . "\n";
-			$content .= '' . "\n";
-			$content .= '    // Submit button' . "\n";
-			$content .= '    $html .= \'<input type="hidden" name="action" value="save">\';' . "\n";
-			$content .= '    $html .= \'<input type="hidden" name="websitetemplateconf" value="1">\';' . "\n";
-			$content .= '    $html .= \'<br>\';' . "\n";
-			$content .= '    $html .= \'<div class="form-setup-button-container center">\';' . "\n";
-			$content .= '    $html .= \'<input class="button button-submit" type="submit" value="\' . $langs->trans("Save") . \'">\';' . "\n";
-			$content .= '    $html .= \'</div>\';' . "\n";
-			$content .= '    $html .= \'</form>\';' . "\n";
-			$content .= '' . "\n";
-			$content .= '    print $html;' . "\n";
-			$content .= '}' . "\n";
-			$content .= '?>' . "\n";
-			$content .= '</div>' . "\n";
+			$content .= '/*'."\n";
+			$content .= ' * Actions'."\n";
+			$content .= ' */'."\n";
+			$content .= '$websitetemplateconf = GETPOSTINT(\'websitetemplateconf\');'."\n";
+			$content .= 'include DOL_DOCUMENT_ROOT.\'/core/actions_setmoduleoptions.inc.php\';'."\n";
+			$content .= ''."\n";
+			$content .= '/*'."\n";
+			$content .= ' * View'."\n";
+			$content .= ' */'."\n";
+			$content .= 'print load_fiche_titre($langs->trans(\'SetupAndProperties\'), \'\', \'title_setup\');'."\n";
+			$content .= ''."\n";
+			$content .= 'if (!empty($message)) {'."\n";
+			$content .= '    print $message;'."\n";
+			$content .= '}'."\n";
+			$content .= ''."\n";
+			$content .= 'if (!empty($formSetup->items)) {'."\n";
+			$content .= '    $html = \'\';'."\n";
+			$content .= ''."\n";
+			$content .= '    $html .= \'<form action="config.php" method="POST">\';'."\n";
+			$content .= '    // Generate hidden values from $formSetup->formHiddenInputs'."\n";
+			$content .= '    if (!empty($formSetup->formHiddenInputs) && is_array($formSetup->formHiddenInputs)) {'."\n";
+			$content .= '        foreach ($formSetup->formHiddenInputs as $hiddenKey => $hiddenValue) {'."\n";
+			$content .= '            $html .= \'<input type="hidden" name="\' . dol_escape_htmltag($hiddenKey) . \'" value="\' . dol_escape_htmltag($hiddenValue) . \'">\';'."\n";
+			$content .= '        }'."\n";
+			$content .= '    }'."\n";
+			$content .= ''."\n";
+			$content .= '    // Generate output table'."\n";
+			$content .= '    $html .= $formSetup->generateTableOutput(true);'."\n";
+			$content .= ''."\n";
+			$content .= '    // Submit button'."\n";
+			$content .= '    $html .= \'<input type="hidden" name="action" value="save">\';'."\n";
+			$content .= '    $html .= \'<input type="hidden" name="websitetemplateconf" value="1">\';'."\n";
+			$content .= '    $html .= \'<br>\';'."\n";
+			$content .= '    $html .= \'<div class="form-setup-button-container center">\';'."\n";
+			$content .= '    $html .= \'<input class="button button-submit" type="submit" value="\' . $langs->trans("Save") . \'">\';'."\n";
+			$content .= '    $html .= \'</div>\';'."\n";
+			$content .= '    $html .= \'</form>\';'."\n";
+			$content .= ''."\n";
+			$content .= '    print $html;'."\n";
+			$content .= '}'."\n";
+			$content .= '?>'."\n";
+			$content .= '</div>'."\n";
 			$tplcontent .= $content."\n";
 		}
 
@@ -395,7 +395,7 @@ 
 
 		$tplcontent .= '<?php // BEGIN PHP'."\n";
 		$tplcontent .= '} catch(Exception $e) { print $e->getMessage(); }'."\n";
-		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";	// replace with ob_get_clean ?
+		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n"; // replace with ob_get_clean ?
 
 		$tplcontent .= "// Now fix the content for SEO or multilanguage\n";
 		// Old method for custom SEO
@@ -526,7 +526,7 @@ 
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
 						$indexcontent .= "}\n";
-						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .
+						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of .
 						$indexcontent .= '// END PHP ?>'."\n";
 						$result = file_put_contents($fileindexsub, $indexcontent);
 						if ($result === false) {
@@ -784,7 +784,7 @@ 
 					dol_delete_file($dest.'.zip');
 
 					// Compress it
-					global $errormsg;	// Used by dol_compress_dir
+					global $errormsg; // Used by dol_compress_dir
 					$errormsg = '';
 					$result = dol_compress_dir($src, $dest.'.zip', 'zip');
 					if ($result < 0) {
@@ -965,7 +965,7 @@ 
 		//$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
 		if (!getDolGlobalString('WEBSITE_PHP_ALLOW_EXEC')) {    // If option is not on, we disallow functions to execute commands
 			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("exec", "passthru", "shell_exec", "system", "proc_open", "popen"));
-			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond"));	// native dolibarr functions
+			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond")); // native dolibarr functions
 			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 		}
 		if (!getDolGlobalString('WEBSITE_PHP_ALLOW_WRITE')) {    // If option is not on, we disallow functions to write files
@@ -974,7 +974,7 @@ 
 		}
 		//$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include"));
 
-		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function
+		$forbiddenphpmethods = array('invoke', 'invokeArgs'); // Method of ReflectionFunction to execute a function
 
 		foreach ($forbiddenphpstrings as $forbiddenphpstring) {
 			if (preg_match('/'.preg_quote($forbiddenphpstring, '/').'/ims', $phpfullcodestring)) {

htdocs/core/modules/DolibarrModules.class.php

Spacing +38 added lines, -38 removed lines

@@ -143,7 +143,7 @@ 
 
 	const KEY_ID = 0;
 	const KEY_LABEL = 1;
-	const KEY_TYPE = 2;	// deprecated
+	const KEY_TYPE = 2; // deprecated
 	const KEY_DEFAULT = 3;
 	const KEY_FIRST_LEVEL = 4;
 	const KEY_SECOND_LEVEL = 5;
@@ -729,7 +729,7 @@ 
 				$moduleNameInConf = 'supplier_proposal';
 			}
 
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
 			return 1;
 		} else {
@@ -825,7 +825,7 @@ 
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
 			if ((float) DOL_VERSION >= 6.0) {  // @phpstan-ignore-line
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1589,7 +1589,7 @@ 
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1612,9 +1612,9 @@ 
 	public function insert_cronjobs()
 	{
 		// phpcs:enable
-		include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 		global $conf, $user;
 
@@ -1625,7 +1625,7 @@ 
 		$err = 0;
 
 		if (is_array($this->cronjobs)) {
-			dol_syslog(get_class($this) . "::insert_cronjobs", LOG_DEBUG);
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 
 			foreach ($this->cronjobs as $key => $value) {
 				$now = dol_now();
@@ -1652,7 +1652,7 @@ 
 				$test = isset($value['test']) ? $value['test'] : ''; // Line must be enabled or not (so visible or not)
 
 				// Search if cron entry already present
-				$sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "cronjob";
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
 				//$sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";
 				$sql .= " WHERE label = '".$this->db->escape($label)."'";
 				/* unique key is on label,entity so no need for this test
@@ -1672,7 +1672,7 @@ 
 					$sql .= " AND params = '" . $this->db->escape($params) . "'";
 				}
 				*/
-				$sql .= " AND entity = " . ((int) $entity); // Must be exact entity
+				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
 
 				$result = $this->db->query($sql);
 				if (!$result) {
@@ -2003,9 +2003,9 @@ 
 
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id = $this->rights[$key][self::KEY_ID];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
+					$r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_label = $this->rights[$key][self::KEY_LABEL];
-					$r_type	= $this->rights[$key][self::KEY_TYPE] ?? 'w';	// TODO deprecated
+					$r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
 					$r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
 					$r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
 					$r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -2029,7 +2029,7 @@ 
 					}
 
 					// condition to show or hide a user right (default: 1) (eg isModEnabled('anothermodule') or ($conf->global->MAIN_FEATURES_LEVEL > 0) or etc..)
-					$r_enabled	= $this->rights[$key][self::KEY_ENABLED] ?? '1';
+					$r_enabled = $this->rights[$key][self::KEY_ENABLED] ?? '1';
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -2046,7 +2046,7 @@ 
 							$sql .= ", libelle";
 							$sql .= ", module";
 							$sql .= ", module_origin";
-							$sql .= ", type";	// TODO deprecated
+							$sql .= ", type"; // TODO deprecated
 							$sql .= ", bydefault";
 							$sql .= ", perms";
 							$sql .= ", subperms";
@@ -2057,7 +2057,7 @@ 
 							$sql .= ", '".$this->db->escape($r_label)."'";
 							$sql .= ", '".$this->db->escape($r_module)."'";
 							$sql .= ", '".$this->db->escape($r_module_origin)."'";
-							$sql .= ", '".$this->db->escape($r_type)."'";	// TODO deprecated
+							$sql .= ", '".$this->db->escape($r_type)."'"; // TODO deprecated
 							$sql .= ", ".((int) $r_default);
 							$sql .= ", '".$this->db->escape($r_perms)."'";
 							$sql .= ", '".$this->db->escape($r_subperms)."'";
@@ -2279,7 +2279,7 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
 		$sql .= " WHERE module = '".$this->db->escape($module)."'";
-		$sql .= " AND menu_handler = 'all'";	// We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
+		$sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
 		$sql .= " AND entity IN (0, ".$conf->entity.")";
 
 		dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
@@ -2463,7 +2463,7 @@ 
 						dol_delete_file($dest.'.zip');
 
 						// Compress it
-						global $errormsg;	// Used by dol_compress_dir
+						global $errormsg; // Used by dol_compress_dir
 						$errormsg = '';
 						$result = dol_compress_dir($src, $dest.'.zip', 'zip');
 						if ($result < 0) {
@@ -2663,36 +2663,36 @@ 
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
-			$return .=  $this->getVersion(1);
-			$return .=  '</span>';
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
+			$return .= $this->getVersion(1);
+			$return .= '</span>';
 		}
 
-		$return .=  '</div>
+		$return .= '</div>
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-		$return .=  '</div><br>';
-
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
-		$return .=  $codetoconfig;
-		$return .=  '</div>';
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
-		$return .=  $codeenabledisable;
-		$return .=  '</div>';
-		$return .=  '</div>';
-
-		$return .=  '
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+		$return .= '</div><br>';
+
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
+		$return .= $codetoconfig;
+		$return .= '</div>';
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
+		$return .= $codeenabledisable;
+		$return .= '</div>';
+		$return .= '</div>';
+
+		$return .= '
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
@@ -2712,7 +2712,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);
@@ -2749,7 +2749,7 @@ 
 		if (empty($conf->cache['noncompliantmodules'])) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-			$result = getURLContent(self::URL_FOR_BLACKLISTED_MODULES, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$result = getURLContent(self::URL_FOR_BLACKLISTED_MODULES, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($result['content']) && $result['http_code'] == 200) {
 				$langs->load("errors");
 

htdocs/install/doctemplates/websites/website_template-association_exp/containers/styles.css.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
-if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
+if (!headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
 header('Cache-Control: max-age=3600, public, must-revalidate');
 header('Content-type: text/css');
 }
@@ -11382,8 +11382,8 @@ 
 :root {
     /*--main-color: #5d5b6a;
     --secondary-color: #FF7F50;*/
-    --main-color: <?php print getDolGlobalString('WS_' . strtoupper($website->ref) . '_MAIN_COLOR') ?: '#5d5b6a'; ?>;
-    --secondary-color: <?php print getDolGlobalString('WS_' . strtoupper($website->ref) . '_SECONDARY_COLOR') ?: '#FF7F50'; ?>;
+    --main-color: <?php print getDolGlobalString('WS_'.strtoupper($website->ref).'_MAIN_COLOR') ?: '#5d5b6a'; ?>;
+    --secondary-color: <?php print getDolGlobalString('WS_'.strtoupper($website->ref).'_SECONDARY_COLOR') ?: '#FF7F50'; ?>;
     --secondary-border-color: #999;
     /*--light-secondary-color: rgb(255, 249, 241);*/
     --light-secondary-color: color-mix(in srgb, var(--secondary-color) 20%, white);

htdocs/install/doctemplates/websites/website_template-association_exp/containers/javascript.js.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();

htdocs/install/doctemplates/websites/website_template-association_exp/containers/wrapper.php

Spacing +2 added lines, -2 removed lines

@@ -130,13 +130,13 @@
 
 
 // Cache or not
-$cachestring = GETPOST("cache", 'aZ09');	// May be 1, or an int (delay in second of the cache if < 999999, or a timestamp), or a hash
+$cachestring = GETPOST("cache", 'aZ09'); // May be 1, or an int (delay in second of the cache if < 999999, or a timestamp), or a hash
 $cachedelay = GETPOSTINT('cachedelay') ? GETPOSTINT('cachedelay') : ((is_numeric($cachestring) && (int) $cachestring > 1 && (int) $cachestring < 999999) ? $cachestring : '3600');
 if ($cachestring || image_format_supported($original_file) >= 0) {
 	// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 	header('Cache-Control: max-age='.$cachedelay.', public, must-revalidate');
 	header('Pragma: cache'); // This is to avoid having Pragma: no-cache
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + (int) $cachedelay).' 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() + (int) $cachedelay).' GMT'); // This is to avoid to have Expires set by proxy or web server
 }
 
 $refname = basename(dirname($original_file)."/");

htdocs/install/doctemplates/websites/website_template-association_exp/containers/manifest.json.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();