Dolibarr / dolibarr

htdocs/install/doctemplates/websites/website_template-stellar/containers/index.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 // BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
-if (! empty($_GET['pageref']) || ! empty($_GET['pagealiasalt']) || ! empty($_GET['pageid'])) {
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
+if (!empty($_GET['pageref']) || !empty($_GET['pagealiasalt']) || !empty($_GET['pageid'])) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 	redirectToContainer($_GET['pageref'], $_GET['pagealiasalt'], $_GET['pageid']);

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
+	$websitepagefile=__FILE__;
+}
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
 if (! empty($_GET['pageref']) || ! empty($_GET['pagealiasalt']) || ! empty($_GET['pageid'])) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';

htdocs/install/doctemplates/websites/website_template-stellar/containers/generic.php

Braces +5 added lines, -1 removed lines

@@ -1,4 +1,8 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require '../page22.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page22.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require '../page22.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page22.tpl.php';
+}

htdocs/install/doctemplates/websites/website_template-stellar/containers/menu.php

Braces +5 added lines, -1 removed lines

@@ -1,4 +1,8 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require '../page24.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page24.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require '../page24.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page24.tpl.php';
+}

htdocs/install/doctemplates/websites/website_template-stellar/containers/master.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+	if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	if (! defined('USEEXTERNALSERVER')) {
+		define('USEEXTERNALSERVER', 1);
+	}
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/install/doctemplates/websites/website_template-stellar/containers/this-is-a-blog-post.php

Braces +5 added lines, -1 removed lines

@@ -1,4 +1,8 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page25.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page25.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page25.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page25.tpl.php';
+}

htdocs/install/doctemplates/websites/website_template-stellar/containers/page22.tpl.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
 } // Not already loaded
@@ -64,12 +64,12 @@ 
 			<div class="center">
 			<?php
 			$keyword = '';
-			$weblangs->loadLangs(array("main","website"));
+			$weblangs->loadLangs(array("main", "website"));
 			$fuser = new User($db);
-			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));  // , 'keywords'=>$keyword
+			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang)); // , 'keywords'=>$keyword
 			if (is_numeric($arrayofblogs) && $arrayofblogs < 0) {
 				print '<div class="error">'.$weblangs->trans($websitepage->error).'</div>';
-			} elseif (is_array($arrayofblogs) && ! empty($arrayofblogs)) {
+			} elseif (is_array($arrayofblogs) && !empty($arrayofblogs)) {
 				foreach ($arrayofblogs as $blog) {
 					print '<div class="row justify-content-sm-center row-40">';
 					print '<div class="container blog-box centpercent" style="padding: 20px; transition: .3s all ease;">';
@@ -80,7 +80,7 @@ 
 								print '<ul class="list-inline list-inline-dashed text-uppercase">';
 								print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
 								$fuser->fetch($blog->fk_user_creat);
-								print '<li><span>by<span> <span class="text-primary">'.($fuser->firstname?$fuser->firstname:$fuser->login).'</span></span></li>';
+								print '<li><span>by<span> <span class="text-primary">'.($fuser->firstname ? $fuser->firstname : $fuser->login).'</span></span></li>';
 								print '</ul>';
 								print '</div>';
 								//includeContainer($blog->pageurl);

Braces +7 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
+	$websitepagefile=__FILE__;
+}
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
@@ -26,7 +28,10 @@ 
 <!-- Include link to JS file -->
 <script src="/javascript.js.php"></script>
 <!-- Include HTML header from common file -->
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
+}
+?>
 <!-- Include HTML header from page header block -->
 
 </head>

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

Braces +57 added lines, -21 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 // BEGIN PHP File wrapper.php - DO NOT MODIFY - It is just a copy of file website/samples/wrapper.php
 $websitekey = basename(__DIR__);
-if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) die("Sample file for website module. Can be called directly.");
+if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) {
+	die("Sample file for website module. Can be called directly.");
+}
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
 include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -17,7 +19,9 @@ 
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
-if ($rss) $original_file = 'blog.rss';
+if ($rss) {
+	$original_file = 'blog.rss';
+}
 
 // If we have a hash public (hashp), we guess the original_file.
 if (!empty($hashp)) {
@@ -52,14 +56,23 @@ 
 
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
-if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
+if (preg_match('/\.(html|htm)$/i', $original_file)) {
+	$attachment = false;
+}
+if (isset($_GET["attachment"])) {
+	$attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
+}
+if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
+	$attachment = false;
+}
 
 // Define mime type
 $type = 'application/octet-stream';
-if (GETPOSTISSET('type')) $type = GETPOST('type', 'alpha');
-else $type = dol_mimetype($original_file);
+if (GETPOSTISSET('type')) {
+	$type = GETPOST('type', 'alpha');
+} else {
+	$type = dol_mimetype($original_file);
+}
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../", "/", $original_file);
@@ -90,7 +103,9 @@ 
 	$website->fetch('', $websitekey);
 
 	$filters = array('type_container'=>'blogpost');
-	if ($l) $filters['lang'] = $l;
+	if ($l) {
+		$filters['lang'] = $l;
+	}
 
 	$MAXNEWS = ($limit ? $limit : 20);
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
@@ -143,8 +158,9 @@ 
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) $result = 1;
-			else {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
+				$result = 1;
+			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
@@ -162,26 +178,39 @@ 
 
 	if ($result >= 0) {
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment = $_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype = 'application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype = $_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
+		}
 
 		// Ajout directives pour resoudre bug IE
 		//header('Cache-Control: Public, must-revalidate');
 		//header('Pragma: public');
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile = $dir_temp.'/'.$filename;
 		$result = readfile($outputfile);
-		if (!$result) print 'File '.$outputfile.' was empty.';
+		if (!$result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
@@ -227,13 +256,20 @@ 
 	//top_httphead($type);
 	header('Content-Type: '.$type);
 	header('Content-Description: File Transfer');
-	if ($encoding)   header('Content-Encoding: '.$encoding);
+	if ($encoding) {
+		header('Content-Encoding: '.$encoding);
+	}
 	// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
-	if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-	else header('Content-Disposition: inline; filename="'.$filename.'"');
+	if ($attachment) {
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
+	} else {
+		header('Content-Disposition: inline; filename="'.$filename.'"');
+	}
 	header('Content-Length: '.dol_filesize($fullpath_original_file));
 
 	readfile($fullpath_original_file_osencoded);
 }
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
 // END PHP

htdocs/install/doctemplates/websites/website_template-corporate/containers/home.php

Braces +5 added lines, -1 removed lines

@@ -1,5 +1,9 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page189.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page189.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page189.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page189.tpl.php';
+}
 ?>

htdocs/install/doctemplates/websites/website_template-corporate/containers/page195.tpl.php

Indentation +25 added lines, -25 removed lines

@@ -71,32 +71,32 @@
     <br>
                       
      <?php
-     $weblangs->load("main");
+	 $weblangs->load("main");
      
-     if (function_exists('getPagesFromSearchCriterias'))
-     {
-         if (GETPOSTISSET('s'))
-         {
-             $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
-             if ($listofpages['code'] == 'OK')
-             {
-                 foreach($listofpages['list'] as $websitepagefound)
-                 {
-                    print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
-                 }
-             }
-             else
-             {
-                 // If error, show message
-                 print $listofpages['message'];
-             }
-         }
-     }
-     else
-     {
-         print $weblangs->trans("FeatureNotYetAvailable");
-     }
-     ?>
+	 if (function_exists('getPagesFromSearchCriterias'))
+	 {
+		 if (GETPOSTISSET('s'))
+		 {
+			 $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
+			 if ($listofpages['code'] == 'OK')
+			 {
+				 foreach($listofpages['list'] as $websitepagefound)
+				 {
+					print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
+				 }
+			 }
+			 else
+			 {
+				 // If error, show message
+				 print $listofpages['message'];
+			 }
+		 }
+	 }
+	 else
+	 {
+		 print $weblangs->trans("FeatureNotYetAvailable");
+	 }
+	 ?>
                       
 <br><br><br><br><br><br>
 </center>

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
 } // Not already loaded
@@ -80,7 +80,7 @@ 
              $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
              if ($listofpages['code'] == 'OK')
              {
-                 foreach($listofpages['list'] as $websitepagefound)
+                 foreach ($listofpages['list'] as $websitepagefound)
                  {
                     print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
                  }

Braces +9 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
+	$websitepagefile=__FILE__;
+}
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@ 
 <!-- Include link to JS file -->
 <script async src="/javascript.js.php"></script>
 <!-- Include HTML header from common file -->
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
+}
+?>
 <!-- Include HTML header from page header block -->
 
 </head>
@@ -84,15 +89,13 @@ 
                  {
                     print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
                  }
-             }
-             else
+             } else
              {
                  // If error, show message
                  print $listofpages['message'];
              }
          }
-     }
-     else
+     } else
      {
          print $weblangs->trans("FeatureNotYetAvailable");
      }