Completed
Branch develop (936be1)
by
unknown
15:34
created
doctemplates/websites/website_template-stellar/containers/page23.tpl.php 2 patches
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
2
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4 4
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 5
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
6 6
 } // Not already loaded
Please login to merge, or discard this patch.
doctemplates/websites/website_template-stellar/containers/credits.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
3 3
 global $dolibarr_main_data_root;
4
-if (empty($dolibarr_main_data_root)) require '../page20.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page20.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require '../page20.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page20.tpl.php';
8
+}
Please login to merge, or discard this patch.
doctemplates/websites/website_template-stellar/containers/page20.tpl.php 2 patches
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
2
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4 4
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 5
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
6 6
 } // Not already loaded
Please login to merge, or discard this patch.
install/doctemplates/websites/website_template-stellar/containers/index.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.
3
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
4
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
5
-if (! empty($_GET['pageref']) || ! empty($_GET['pagealiasalt']) || ! empty($_GET['pageid'])) {
3
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
4
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
5
+if (!empty($_GET['pageref']) || !empty($_GET['pagealiasalt']) || !empty($_GET['pageid'])) {
6 6
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
7 7
 	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
8 8
 	redirectToContainer($_GET['pageref'], $_GET['pagealiasalt'], $_GET['pageid']);
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.
3
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
3
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
4
+	$websitepagefile=__FILE__;
5
+}
4 6
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
5 7
 if (! empty($_GET['pageref']) || ! empty($_GET['pagealiasalt']) || ! empty($_GET['pageid'])) {
6 8
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
Please login to merge, or discard this patch.
doctemplates/websites/website_template-stellar/containers/generic.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
3 3
 global $dolibarr_main_data_root;
4
-if (empty($dolibarr_main_data_root)) require '../page22.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page22.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require '../page22.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page22.tpl.php';
8
+}
Please login to merge, or discard this patch.
install/doctemplates/websites/website_template-stellar/containers/menu.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
3 3
 global $dolibarr_main_data_root;
4
-if (empty($dolibarr_main_data_root)) require '../page24.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page24.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require '../page24.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page24.tpl.php';
8
+}
Please login to merge, or discard this patch.
doctemplates/websites/website_template-stellar/containers/master.inc.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4
+	if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5 5
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 6
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3 3
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
4
+	if (! defined('USEEXTERNALSERVER')) {
5
+		define('USEEXTERNALSERVER', 1);
6
+	}
5 7
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 8
 }
Please login to merge, or discard this patch.
websites/website_template-stellar/containers/this-is-a-blog-post.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
3 3
 global $dolibarr_main_data_root;
4
-if (empty($dolibarr_main_data_root)) require './page25.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page25.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require './page25.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page25.tpl.php';
8
+}
Please login to merge, or discard this patch.
doctemplates/websites/website_template-stellar/containers/page22.tpl.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
2
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4 4
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 5
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
6 6
 } // Not already loaded
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 			<div class="center">
65 65
 			<?php
66 66
 			$keyword = '';
67
-			$weblangs->loadLangs(array("main","website"));
67
+			$weblangs->loadLangs(array("main", "website"));
68 68
 			$fuser = new User($db);
69
-			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));  // , 'keywords'=>$keyword
69
+			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang)); // , 'keywords'=>$keyword
70 70
 			if (is_numeric($arrayofblogs) && $arrayofblogs < 0) {
71 71
 				print '<div class="error">'.$weblangs->trans($websitepage->error).'</div>';
72
-			} elseif (is_array($arrayofblogs) && ! empty($arrayofblogs)) {
72
+			} elseif (is_array($arrayofblogs) && !empty($arrayofblogs)) {
73 73
 				foreach ($arrayofblogs as $blog) {
74 74
 					print '<div class="row justify-content-sm-center row-40">';
75 75
 					print '<div class="container blog-box centpercent" style="padding: 20px; transition: .3s all ease;">';
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 								print '<ul class="list-inline list-inline-dashed text-uppercase">';
81 81
 								print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
82 82
 								$fuser->fetch($blog->fk_user_creat);
83
-								print '<li><span>by<span> <span class="text-primary">'.($fuser->firstname?$fuser->firstname:$fuser->login).'</span></span></li>';
83
+								print '<li><span>by<span> <span class="text-primary">'.($fuser->firstname ? $fuser->firstname : $fuser->login).'</span></span></li>';
84 84
 								print '</ul>';
85 85
 								print '</div>';
86 86
 								//includeContainer($blog->pageurl);
Please login to merge, or discard this patch.
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.