Inspection of "Daily Inspection: Merge branch '19.0' of git@githu..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (936be1)

unknown

created 2024-01-15 16:28 UTC

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,9 @@
 block discarded – undo
 <?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';
+}
 ?>

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
     <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>

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
 <?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 @@  discard block
 block discarded – undo
              $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>';
                  }

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
 <?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 @@  discard block
 block discarded – undo
 <!-- 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 @@  discard block
 block discarded – undo
                  {
                     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");
      }

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
 <?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 './page185.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page185.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page185.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page185.tpl.php';
+}
 ?>

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
 <?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 './page181.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page181.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page181.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page181.tpl.php';
+}
 ?>

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
 <?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 './page187.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page187.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page187.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page187.tpl.php';
+}
 ?>

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
                       <p class="font-italic text-white">Follow Us:</p>
                       <ul class="list-inline">
                           <?php foreach($mysoc->socialnetworks as $key => $value) {
-                            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>';
-                          } ?>
+							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>';
+						  } ?>
                       </ul>
                     </div>
                   </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
 <?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
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
                     <div class="group-sm group-middle">
                       <p class="font-italic text-white">Follow Us:</p>
                       <ul class="list-inline">
-                          <?php foreach($mysoc->socialnetworks as $key => $value) {
+                          <?php foreach ($mysoc->socialnetworks as $key => $value) {
                             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>';
                           } ?>
                       </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
 <?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 @@  discard block
 block discarded – undo
 <!-- 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>

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
             <div class="container"><div class="text-align: center"><br>
             <h2>The crew...</h2><br> <br><br> 
             <?php 
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-            $websitepage = new WebsitePage($db);
-            $fuser = new User($db);
-            $arrayofusers = array();
-            $MAXNB=10;
-            $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
-            $resql = $db->query($sql);
-            if (! $resql) dol_print_error($db);
-            while ($obj = $db->fetch_object($resql))
-            {
-                $arrayofusers[]=$obj->rowid;
-            }
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+			$websitepage = new WebsitePage($db);
+			$fuser = new User($db);
+			$arrayofusers = array();
+			$MAXNB=10;
+			$sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
+			$resql = $db->query($sql);
+			if (! $resql) dol_print_error($db);
+			while ($obj = $db->fetch_object($resql))
+			{
+				$arrayofusers[]=$obj->rowid;
+			}
            
-            print '<div class="row justify-content-sm-center row-40">';
-            foreach($arrayofusers as $id)
-            {
-                $fuser->fetch($id);
+			print '<div class="row justify-content-sm-center row-40">';
+			foreach($arrayofusers as $id)
+			{
+				$fuser->fetch($id);
 
-                print '<div class="col-sm-8 col-md-7 col-lg-4">';
-                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;">';
-                print '<div class="post-boxed-img-wrap" style="height: 164px">';
-                if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
-                //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
-                else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
-                print '</div>';
-                print '<div class="post-boxed-caption">';
-                print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
-                print '<ul class="list-inline list-inline-dashed text-uppercase">';
-                //print '<li>September 24, 2018</li>';
-                if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
-                else print '<li></li>';
-                print '</ul>';
-                print '</div>';
-                print '</div>';
-                print '</div>';
-            }
-            print '</div>';
+				print '<div class="col-sm-8 col-md-7 col-lg-4">';
+				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;">';
+				print '<div class="post-boxed-img-wrap" style="height: 164px">';
+				if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
+				//print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
+				else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
+				print '</div>';
+				print '<div class="post-boxed-caption">';
+				print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
+				print '<ul class="list-inline list-inline-dashed text-uppercase">';
+				//print '<li>September 24, 2018</li>';
+				if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
+				else print '<li></li>';
+				print '</ul>';
+				print '</div>';
+				print '</div>';
+				print '</div>';
+			}
+			print '</div>';
 
-            ?>
+			?>
             </div></div>
         </section>
 

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
 <?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
@@ -63,17 +63,17 @@  discard block
 block discarded – undo
             $websitepage = new WebsitePage($db);
             $fuser = new User($db);
             $arrayofusers = array();
-            $MAXNB=10;
-            $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
+            $MAXNB = 10;
+            $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
             $resql = $db->query($sql);
-            if (! $resql) dol_print_error($db);
+            if (!$resql) dol_print_error($db);
             while ($obj = $db->fetch_object($resql))
             {
-                $arrayofusers[]=$obj->rowid;
+                $arrayofusers[] = $obj->rowid;
             }
            
             print '<div class="row justify-content-sm-center row-40">';
-            foreach($arrayofusers as $id)
+            foreach ($arrayofusers as $id)
             {
                 $fuser->fetch($id);
 

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
 <?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 @@  discard block
 block discarded – undo
 <!-- 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>
@@ -66,7 +71,9 @@  discard block
 block discarded – undo
             $MAXNB=10;
             $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB;
             $resql = $db->query($sql);
-            if (! $resql) dol_print_error($db);
+            if (! $resql) {
+            	dol_print_error($db);
+            }
             while ($obj = $db->fetch_object($resql))
             {
                 $arrayofusers[]=$obj->rowid;
@@ -80,16 +87,23 @@  discard block
 block discarded – undo
                 print '<div class="col-sm-8 col-md-7 col-lg-4">';
                 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;">';
                 print '<div class="post-boxed-img-wrap" style="height: 164px">';
-                if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
+                if ($fuser->photo) {
+                	print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0);
+                }
                 //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&amp;file='.$fuser->photo.'" width="129" height="129" alt="">';
-                else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
+                else {
+                	print '<img class="img-circle" src="/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">';
+                }
                 print '</div>';
                 print '<div class="post-boxed-caption">';
                 print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>';
                 print '<ul class="list-inline list-inline-dashed text-uppercase">';
                 //print '<li>September 24, 2018</li>';
-                if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
-                else print '<li></li>';
+                if ($fuser->job) {
+                	print '<li><span class="text-primary">'.$fuser->job.'</span></li>';
+                } else {
+                	print '<li></li>';
+                }
                 print '</ul>';
                 print '</div>';
                 print '</div>';

Please login to merge, or discard this patch.

doctemplates/websites/website_template-corporate/containers/product-p.php 1 patch

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,9 @@
 block discarded – undo
 <?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 './page194.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page194.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page194.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page194.tpl.php';
+}
 ?>

Please login to merge, or discard this patch.

doctemplates/websites/website_template-corporate/containers/page179.tpl.php 3 patches

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -59,30 +59,30 @@
 block discarded – undo
             <div><br><div class="text-align: center">
             <!--<h2>The latest news...</h2><br><br><br> -->
             <?php 
-            $weblangs->load("main");
-            $fuser = new User($db);
-            $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
-            foreach($arrayofblogs as $blog)
-            {
-                print '<div class="row justify-content-sm-center row-40">';
-                print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
-                            print '<a class="centpercent" href="'.$blog->pageurl.'.php">';
-                            print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.str_replace('template-corporate', $website->ref, $blog->image) : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
-                            print '<div class="post-boxed-caption">';
-                            print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
-                            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.'</span></span></li>';
-                            print '</ul>';
-                            print '<span class="nohover">'.$blog->description.'</span>';
-                            print '</div>';
-                            //includeContainer($blog->pageurl);
-                            print '</a>';
-                print '</div>';
-                print '</div>';
-            }
-            ?>
+			$weblangs->load("main");
+			$fuser = new User($db);
+			$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
+			foreach($arrayofblogs as $blog)
+			{
+				print '<div class="row justify-content-sm-center row-40">';
+				print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
+							print '<a class="centpercent" href="'.$blog->pageurl.'.php">';
+							print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.str_replace('template-corporate', $website->ref, $blog->image) : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
+							print '<div class="post-boxed-caption">';
+							print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
+							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.'</span></span></li>';
+							print '</ul>';
+							print '<span class="nohover">'.$blog->description.'</span>';
+							print '</div>';
+							//includeContainer($blog->pageurl);
+							print '</a>';
+				print '</div>';
+				print '</div>';
+			}
+			?>
             </div></div>
         </section>
 

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
 <?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
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
             $weblangs->load("main");
             $fuser = new User($db);
             $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
-            foreach($arrayofblogs as $blog)
+            foreach ($arrayofblogs as $blog)
             {
                 print '<div class="row justify-content-sm-center row-40">';
                 print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';

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
 <?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 @@  discard block
 block discarded – undo
 <!-- 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>

Please login to merge, or discard this 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	?>

		@@ -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>

		@@ -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	}

		@@ -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	}

		@@ -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>

		@@ -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&file='.$fuser->photo.'" width="129" height="129" alt="">';
85		- else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&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&file='.$fuser->photo.'" width="129" height="129" alt="">';
	85	+ else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&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

		@@ -59,30 +59,30 @@
		block discarded – undo
59	59	<div><br><div class="text-align: center">
60	60	<!--<h2>The latest news...</h2><br><br><br> -->
61	61	<?php
62		- $weblangs->load("main");
63		- $fuser = new User($db);
64		- $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
65		- foreach($arrayofblogs as $blog)
66		- {
67		- print '<div class="row justify-content-sm-center row-40">';
68		- print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
69		- print '<a class="centpercent" href="'.$blog->pageurl.'.php">';
70		- print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.str_replace('template-corporate', $website->ref, $blog->image) : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
71		- print '<div class="post-boxed-caption">';
72		- print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
73		- print '<ul class="list-inline list-inline-dashed text-uppercase">';
74		- print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
75		- $fuser->fetch($blog->fk_user_creat);
76		- print '<li><span>by<span> <span class="text-primary">'.$fuser->firstname.'</span></span></li>';
77		- print '</ul>';
78		- print '<span class="nohover">'.$blog->description.'</span>';
79		- print '</div>';
80		- //includeContainer($blog->pageurl);
81		- print '</a>';
82		- print '</div>';
83		- print '</div>';
84		- }
85		- ?>
	62	+ $weblangs->load("main");
	63	+ $fuser = new User($db);
	64	+ $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'status'=>1, 'lang'=>'null,'.$websitepage->lang));
	65	+ foreach($arrayofblogs as $blog)
	66	+ {
	67	+ print '<div class="row justify-content-sm-center row-40">';
	68	+ print '<div class="container blog-box d-xl-inline-block margin-lr-30" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">';
	69	+ print '<a class="centpercent" href="'.$blog->pageurl.'.php">';
	70	+ print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.str_replace('template-corporate', $website->ref, $blog->image) : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
	71	+ print '<div class="post-boxed-caption">';
	72	+ print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
	73	+ print '<ul class="list-inline list-inline-dashed text-uppercase">';
	74	+ print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
	75	+ $fuser->fetch($blog->fk_user_creat);
	76	+ print '<li><span>by<span> <span class="text-primary">'.$fuser->firstname.'</span></span></li>';
	77	+ print '</ul>';
	78	+ print '<span class="nohover">'.$blog->description.'</span>';
	79	+ print '</div>';
	80	+ //includeContainer($blog->pageurl);
	81	+ print '</a>';
	82	+ print '</div>';
	83	+ print '</div>';
	84	+ }
	85	+ ?>
86	86	</div></div>
87	87	</section>
88	88

Dolibarr / dolibarr

Branch — develop (936be1)

Category

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +7 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch

Braces +5 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +7 added lines, -2 removed lines patch added patch discarded remove patch