Completed
Branch develop (22b42d)
by
unknown
15:07 queued 18s
created
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.
doctemplates/websites/website_template-stellar/containers/wrapper.php 1 patch
Braces   +57 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,7 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // BEGIN PHP File wrapper.php - DO NOT MODIFY - It is just a copy of file website/samples/wrapper.php
3 3
 $websitekey = basename(__DIR__);
4
-if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) die("Sample file for website module. Can be called directly.");
4
+if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) {
5
+	die("Sample file for website module. Can be called directly.");
6
+}
5 7
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
6 8
 include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
7 9
 
@@ -17,7 +19,9 @@  discard block
 block discarded – undo
17 19
 
18 20
 // Parameters for RSS
19 21
 $rss = GETPOST('rss', 'aZ09');
20
-if ($rss) $original_file = 'blog.rss';
22
+if ($rss) {
23
+	$original_file = 'blog.rss';
24
+}
21 25
 
22 26
 // If we have a hash public (hashp), we guess the original_file.
23 27
 if (!empty($hashp)) {
@@ -52,14 +56,23 @@  discard block
 block discarded – undo
52 56
 
53 57
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
54 58
 $attachment = true;
55
-if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
56
-if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
57
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
59
+if (preg_match('/\.(html|htm)$/i', $original_file)) {
60
+	$attachment = false;
61
+}
62
+if (isset($_GET["attachment"])) {
63
+	$attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
64
+}
65
+if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
66
+	$attachment = false;
67
+}
58 68
 
59 69
 // Define mime type
60 70
 $type = 'application/octet-stream';
61
-if (GETPOSTISSET('type')) $type = GETPOST('type', 'alpha');
62
-else $type = dol_mimetype($original_file);
71
+if (GETPOSTISSET('type')) {
72
+	$type = GETPOST('type', 'alpha');
73
+} else {
74
+	$type = dol_mimetype($original_file);
75
+}
63 76
 
64 77
 // Security: Delete string ../ into $original_file
65 78
 $original_file = str_replace("../", "/", $original_file);
@@ -90,7 +103,9 @@  discard block
 block discarded – undo
90 103
 	$website->fetch('', $websitekey);
91 104
 
92 105
 	$filters = array('type_container'=>'blogpost');
93
-	if ($l) $filters['lang'] = $l;
106
+	if ($l) {
107
+		$filters['lang'] = $l;
108
+	}
94 109
 
95 110
 	$MAXNEWS = ($limit ? $limit : 20);
96 111
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
@@ -143,8 +158,9 @@  discard block
 block discarded – undo
143 158
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
144 159
 
145 160
 		if ($result >= 0) {
146
-			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) $result = 1;
147
-			else {
161
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
162
+				$result = 1;
163
+			} else {
148 164
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
149 165
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
150 166
 				dol_delete_file($outputfiletmp, 0, 1);
@@ -162,26 +178,39 @@  discard block
 block discarded – undo
162 178
 
163 179
 	if ($result >= 0) {
164 180
 		$attachment = false;
165
-		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
181
+		if (isset($_GET["attachment"])) {
182
+			$attachment = $_GET["attachment"];
183
+		}
166 184
 		//$attachment = false;
167 185
 		$contenttype = 'application/rss+xml';
168
-		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
186
+		if (isset($_GET["contenttype"])) {
187
+			$contenttype = $_GET["contenttype"];
188
+		}
169 189
 		//$contenttype='text/plain';
170 190
 		$outputencoding = 'UTF-8';
171 191
 
172
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
173
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
192
+		if ($contenttype) {
193
+			header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
194
+		}
195
+		if ($attachment) {
196
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
197
+		}
174 198
 
175 199
 		// Ajout directives pour resoudre bug IE
176 200
 		//header('Cache-Control: Public, must-revalidate');
177 201
 		//header('Pragma: public');
178
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
179
-		else header('Cache-Control: private, must-revalidate');
202
+		if ($cachedelay) {
203
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
204
+		} else {
205
+			header('Cache-Control: private, must-revalidate');
206
+		}
180 207
 
181 208
 		// Clean parameters
182 209
 		$outputfile = $dir_temp.'/'.$filename;
183 210
 		$result = readfile($outputfile);
184
-		if (!$result) print 'File '.$outputfile.' was empty.';
211
+		if (!$result) {
212
+			print 'File '.$outputfile.' was empty.';
213
+		}
185 214
 
186 215
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
187 216
 		exit;
@@ -227,13 +256,20 @@  discard block
 block discarded – undo
227 256
 	//top_httphead($type);
228 257
 	header('Content-Type: '.$type);
229 258
 	header('Content-Description: File Transfer');
230
-	if ($encoding)   header('Content-Encoding: '.$encoding);
259
+	if ($encoding) {
260
+		header('Content-Encoding: '.$encoding);
261
+	}
231 262
 	// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
232
-	if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
233
-	else header('Content-Disposition: inline; filename="'.$filename.'"');
263
+	if ($attachment) {
264
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
265
+	} else {
266
+		header('Content-Disposition: inline; filename="'.$filename.'"');
267
+	}
234 268
 	header('Content-Length: '.dol_filesize($fullpath_original_file));
235 269
 
236 270
 	readfile($fullpath_original_file_osencoded);
237 271
 }
238
-if (is_object($db)) $db->close();
272
+if (is_object($db)) {
273
+	$db->close();
274
+}
239 275
 // END PHP
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/home.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,9 @@
 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 './page189.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page189.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require './page189.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page189.tpl.php';
8
+}
5 9
 ?>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page195.tpl.php 3 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -71,32 +71,32 @@
 block discarded – undo
71 71
     <br>
72 72
                       
73 73
      <?php
74
-     $weblangs->load("main");
74
+	 $weblangs->load("main");
75 75
      
76
-     if (function_exists('getPagesFromSearchCriterias'))
77
-     {
78
-         if (GETPOSTISSET('s'))
79
-         {
80
-             $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
81
-             if ($listofpages['code'] == 'OK')
82
-             {
83
-                 foreach($listofpages['list'] as $websitepagefound)
84
-                 {
85
-                    print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
86
-                 }
87
-             }
88
-             else
89
-             {
90
-                 // If error, show message
91
-                 print $listofpages['message'];
92
-             }
93
-         }
94
-     }
95
-     else
96
-     {
97
-         print $weblangs->trans("FeatureNotYetAvailable");
98
-     }
99
-     ?>
76
+	 if (function_exists('getPagesFromSearchCriterias'))
77
+	 {
78
+		 if (GETPOSTISSET('s'))
79
+		 {
80
+			 $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml'));
81
+			 if ($listofpages['code'] == 'OK')
82
+			 {
83
+				 foreach($listofpages['list'] as $websitepagefound)
84
+				 {
85
+					print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
86
+				 }
87
+			 }
88
+			 else
89
+			 {
90
+				 // If error, show message
91
+				 print $listofpages['message'];
92
+			 }
93
+		 }
94
+	 }
95
+	 else
96
+	 {
97
+		 print $weblangs->trans("FeatureNotYetAvailable");
98
+	 }
99
+	 ?>
100 100
                       
101 101
 <br><br><br><br><br><br>
102 102
 </center>
Please login to merge, or discard this 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.
Braces   +9 added lines, -6 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>
@@ -84,15 +89,13 @@  discard block
 block discarded – undo
84 89
                  {
85 90
                     print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
86 91
                  }
87
-             }
88
-             else
92
+             } else
89 93
              {
90 94
                  // If error, show message
91 95
                  print $listofpages['message'];
92 96
              }
93 97
          }
94
-     }
95
-     else
98
+     } else
96 99
      {
97 100
          print $weblangs->trans("FeatureNotYetAvailable");
98 101
      }
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/contact.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,9 @@
 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 './page185.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page185.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require './page185.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page185.tpl.php';
8
+}
5 9
 ?>
Please login to merge, or discard this patch.
containers/blog-our-new-web-site-has-been-launched.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,9 @@
 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 './page181.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page181.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require './page181.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page181.tpl.php';
8
+}
5 9
 ?>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/footer.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,9 @@
 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 './page187.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page187.tpl.php';
4
+if (empty($dolibarr_main_data_root)) {
5
+	require './page187.tpl.php';
6
+} else {
7
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page187.tpl.php';
8
+}
5 9
 ?>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page187.tpl.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@
 block discarded – undo
99 99
                       <p class="font-italic text-white">Follow Us:</p>
100 100
                       <ul class="list-inline">
101 101
                           <?php foreach($mysoc->socialnetworks as $key => $value) {
102
-                            print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>';
103
-                          } ?>
102
+							print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>';
103
+						  } ?>
104 104
                       </ul>
105 105
                     </div>
106 106
                   </div>
Please login to merge, or discard this 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
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
                     <div class="group-sm group-middle">
99 99
                       <p class="font-italic text-white">Follow Us:</p>
100 100
                       <ul class="list-inline">
101
-                          <?php foreach($mysoc->socialnetworks as $key => $value) {
101
+                          <?php foreach ($mysoc->socialnetworks as $key => $value) {
102 102
                             print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>';
103 103
                           } ?>
104 104
                       </ul>
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 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.
doctemplates/websites/website_template-corporate/containers/page190.tpl.php 3 patches
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -59,45 +59,45 @@
 block discarded – undo
59 59
             <div class="container"><div class="text-align: center"><br>
60 60
             <h2>The crew...</h2><br> <br><br> 
61 61
             <?php 
62
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
63
-            $websitepage = new WebsitePage($db);
64
-            $fuser = new User($db);
65
-            $arrayofusers = array();
66
-            $MAXNB=10;
67
-            $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
68
-            $resql = $db->query($sql);
69
-            if (! $resql) dol_print_error($db);
70
-            while ($obj = $db->fetch_object($resql))
71
-            {
72
-                $arrayofusers[]=$obj->rowid;
73
-            }
62
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
63
+			$websitepage = new WebsitePage($db);
64
+			$fuser = new User($db);
65
+			$arrayofusers = array();
66
+			$MAXNB=10;
67
+			$sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
68
+			$resql = $db->query($sql);
69
+			if (! $resql) dol_print_error($db);
70
+			while ($obj = $db->fetch_object($resql))
71
+			{
72
+				$arrayofusers[]=$obj->rowid;
73
+			}
74 74
            
75
-            print '<div class="row justify-content-sm-center row-40">';
76
-            foreach($arrayofusers as $id)
77
-            {
78
-                $fuser->fetch($id);
75
+			print '<div class="row justify-content-sm-center row-40">';
76
+			foreach($arrayofusers as $id)
77
+			{
78
+				$fuser->fetch($id);
79 79
 
80
-                print '<div class="col-sm-8 col-md-7 col-lg-4">';
81
-                print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
82
-                print '<div class="post-boxed-img-wrap" style="height: 164px">';
83
-                if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
84
-                //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
85
-                else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
86
-                print '</div>';
87
-                print '<div class="post-boxed-caption">';
88
-                print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
89
-                print '<ul class="list-inline list-inline-dashed text-uppercase">';
90
-                //print '<li>September 24, 2018</li>';
91
-                if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
92
-                else print '<li></li>';
93
-                print '</ul>';
94
-                print '</div>';
95
-                print '</div>';
96
-                print '</div>';
97
-            }
98
-            print '</div>';
80
+				print '<div class="col-sm-8 col-md-7 col-lg-4">';
81
+				print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
82
+				print '<div class="post-boxed-img-wrap" style="height: 164px">';
83
+				if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
84
+				//print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
85
+				else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
86
+				print '</div>';
87
+				print '<div class="post-boxed-caption">';
88
+				print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
89
+				print '<ul class="list-inline list-inline-dashed text-uppercase">';
90
+				//print '<li>September 24, 2018</li>';
91
+				if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
92
+				else print '<li></li>';
93
+				print '</ul>';
94
+				print '</div>';
95
+				print '</div>';
96
+				print '</div>';
97
+			}
98
+			print '</div>';
99 99
 
100
-            ?>
100
+			?>
101 101
             </div></div>
102 102
         </section>
103 103
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 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
@@ -63,17 +63,17 @@  discard block
 block discarded – undo
63 63
             $websitepage = new WebsitePage($db);
64 64
             $fuser = new User($db);
65 65
             $arrayofusers = array();
66
-            $MAXNB=10;
67
-            $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
66
+            $MAXNB = 10;
67
+            $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
68 68
             $resql = $db->query($sql);
69
-            if (! $resql) dol_print_error($db);
69
+            if (!$resql) dol_print_error($db);
70 70
             while ($obj = $db->fetch_object($resql))
71 71
             {
72
-                $arrayofusers[]=$obj->rowid;
72
+                $arrayofusers[] = $obj->rowid;
73 73
             }
74 74
            
75 75
             print '<div class="row justify-content-sm-center row-40">';
76
-            foreach($arrayofusers as $id)
76
+            foreach ($arrayofusers as $id)
77 77
             {
78 78
                 $fuser->fetch($id);
79 79
 
Please login to merge, or discard this patch.
Braces   +21 added lines, -7 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>
@@ -66,7 +71,9 @@  discard block
 block discarded – undo
66 71
             $MAXNB=10;
67 72
             $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
68 73
             $resql = $db->query($sql);
69
-            if (! $resql) dol_print_error($db);
74
+            if (! $resql) {
75
+            	dol_print_error($db);
76
+            }
70 77
             while ($obj = $db->fetch_object($resql))
71 78
             {
72 79
                 $arrayofusers[]=$obj->rowid;
@@ -80,16 +87,23 @@  discard block
 block discarded – undo
80 87
                 print '<div class="col-sm-8 col-md-7 col-lg-4">';
81 88
                 print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
82 89
                 print '<div class="post-boxed-img-wrap" style="height: 164px">';
83
-                if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
90
+                if ($fuser->photo) {
91
+                	print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
92
+                }
84 93
                 //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
85
-                else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
94
+                else {
95
+                	print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
96
+                }
86 97
                 print '</div>';
87 98
                 print '<div class="post-boxed-caption">';
88 99
                 print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
89 100
                 print '<ul class="list-inline list-inline-dashed text-uppercase">';
90 101
                 //print '<li>September 24, 2018</li>';
91
-                if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
92
-                else print '<li></li>';
102
+                if ($fuser->job) {
103
+                	print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
104
+                } else {
105
+                	print '<li></li>';
106
+                }
93 107
                 print '</ul>';
94 108
                 print '</div>';
95 109
                 print '</div>';
Please login to merge, or discard this patch.