Completed
Branch develop (f5af02)
by
unknown
17:35
created
websites/website_template-restaurant/containers/page252.tpl.php 1 patch
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
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 
52 52
          
53 53
                         <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
54
-                        foreach ($days as $day){
55
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
54
+                        foreach ($days as $day) {
55
+                            echo "<p> $day : ".getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")."</p>";    
56 56
                         }
57 57
                         ?>
58 58
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
                         <h6 class="text-white mb-lg-4 mb-3">Social</h6>
69 69
 
70 70
                         <ul class="social-icon">
71
-                             <?php foreach($mysoc->socialnetworks as $key => $value) {
72
-                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
71
+                             <?php foreach ($mysoc->socialnetworks as $key => $value) {
72
+                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
73 73
                              } ?>
74 74
 
75 75
                        
Please login to merge, or discard this patch.
websites/website_template-restaurant/containers/page249.tpl.php 1 patch
Spacing   +5 added lines, -5 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
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 <body id="bodywebsite" class="bodywebsite bodywebpage-contact">
35 35
 <!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
36 36
 <?php 
37
-if (GETPOST('action') == 'sendmail')    {
37
+if (GETPOST('action') == 'sendmail') {
38 38
     include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
39 39
     $from = GETPOST('email', 'alpha');
40 40
     $to = $mysoc->email;
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 
168 168
                             <div class=" mb-lg-3">
169 169
                                  <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
170
-                                   foreach ($days as $day){
171
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
170
+                                   foreach ($days as $day) {
171
+                            echo "<p> $day : ".getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")."</p>";    
172 172
                         }
173 173
                         ?>
174 174
                             </div>
Please login to merge, or discard this patch.
websites/website_template-restaurant/containers/page251.tpl.php 1 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-restaurant/containers/master.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 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
 }
7 7
 ?>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-restaurant/containers/styles.css.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__);
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
2
+$websitekey = basename(__DIR__);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
4 4
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
5 5
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
6 6
 ob_start();
7
-if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ 
7
+if (!headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ 
8 8
 header('Cache-Control: max-age=3600, public, must-revalidate');
9 9
 header('Content-type: text/css');
10 10
 }
Please login to merge, or discard this patch.
install/doctemplates/websites/website_template-stellar/containers/index.php 1 patch
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.
doctemplates/websites/website_template-stellar/containers/master.inc.php 1 patch
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.
doctemplates/websites/website_template-stellar/containers/page22.tpl.php 1 patch
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.
doctemplates/websites/website_template-corporate/containers/page195.tpl.php 1 patch
Spacing   +3 added lines, -3 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
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
              $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
81 81
              if ($listofpages['code'] == 'OK')
82 82
              {
83
-                 foreach($listofpages['list'] as $websitepagefound)
83
+                 foreach ($listofpages['list'] as $websitepagefound)
84 84
                  {
85 85
                     print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
86 86
                  }
Please login to merge, or discard this patch.