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

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

@@ -154,7 +154,7 @@  discard block
 block discarded – undo
 	if ($productid > 0) {
 		$sql .= " AND ps.fk_product = ".((int) $productid);
 	}
-	if (! empty($search_fk_warehouse)) {
+	if (!empty($search_fk_warehouse)) {
 		$sql .= " AND ps.fk_entrepot IN (".$db->sanitize(join(",", $search_fk_warehouse)).")";
 	}
 	if ($search_ref) {
@@ -562,9 +562,9 @@  discard block
 block discarded – undo
 
 		if ($mode == 'future') {
 			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0, $dateendofday);
-			$stock = $prod->stock_theorique;		// virtual stock at a date
+			$stock = $prod->stock_theorique; // virtual stock at a date
 			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0);
-			$virtualstock = $prod->stock_theorique;	// virtual stock in infinite future
+			$virtualstock = $prod->stock_theorique; // virtual stock in infinite future
 		} else {
 			$stock = $currentstock;
 			$nbofmovement = 0;

Please login to merge, or discard this patch.

htdocs/product/stock/stats/reception.php 1 patch

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

@@ -39,8 +39,8 @@
 block discarded – undo
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$batch  	= GETPOST('batch', 'alpha');
-$objectid  = GETPOST('productid', 'int');
+$batch = GETPOST('batch', 'alpha');
+$objectid = GETPOST('productid', 'int');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));

Please login to merge, or discard this patch.

htdocs/product/stock/stats/expedition.php 1 patch

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

@@ -39,8 +39,8 @@
 block discarded – undo
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$batch  	= GETPOST('batch', 'alpha');
-$objectid  = GETPOST('productid', 'int');
+$batch = GETPOST('batch', 'alpha');
+$objectid = GETPOST('productid', 'int');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));

Please login to merge, or discard this patch.

doctemplates/websites/website_template-noimg/containers/manifest.json.php 1 patch

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

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();

Please login to merge, or discard this patch.

install/doctemplates/websites/website_template-noimg/containers/index.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 './page80.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page80.tpl.php';
	4	+if (empty($dolibarr_main_data_root)) {
	5	+ require './page80.tpl.php';
	6	+} else {
	7	+ require $dolibarr_main_data_root.'/website/'.$website->ref.'/page80.tpl.php';
	8	+}

Please login to merge, or discard this patch.

doctemplates/websites/website_template-noimg/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
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+	if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

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
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	if (! defined('USEEXTERNALSERVER')) {
+		define('USEEXTERNALSERVER', 1);
+	}
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

Please login to merge, or discard this patch.

doctemplates/websites/website_template-noimg/containers/page80.tpl.php 2 patches

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

@@ -1,6 +1,6 @@
 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

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>
 		<meta charset="UTF-8" />

Please login to merge, or discard this patch.

doctemplates/websites/website_template-noimg/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
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
-if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
+if (!headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
 	header('Cache-Control: max-age=3600, public, must-revalidate');
 	header('Content-type: text/css');
 }

Please login to merge, or discard this patch.

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

Please login to merge, or discard this patch.

		@@ -154,7 +154,7 @@ discard block
		block discarded – undo
154	154	if ($productid > 0) {
155	155	$sql .= " AND ps.fk_product = ".((int) $productid);
156	156	}
157		- if (! empty($search_fk_warehouse)) {
	157	+ if (!empty($search_fk_warehouse)) {
158	158	$sql .= " AND ps.fk_entrepot IN (".$db->sanitize(join(",", $search_fk_warehouse)).")";
159	159	}
160	160	if ($search_ref) {
		@@ -562,9 +562,9 @@ discard block
		block discarded – undo
562	562
563	563	if ($mode == 'future') {
564	564	$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0, $dateendofday);
565		- $stock = $prod->stock_theorique; // virtual stock at a date
	565	+ $stock = $prod->stock_theorique; // virtual stock at a date
566	566	$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0);
567		- $virtualstock = $prod->stock_theorique; // virtual stock in infinite future
	567	+ $virtualstock = $prod->stock_theorique; // virtual stock in infinite future
568	568	} else {
569	569	$stock = $currentstock;
570	570	$nbofmovement = 0;

		@@ -39,8 +39,8 @@
		block discarded – undo
39	39
40	40	$id = GETPOST('id', 'int');
41	41	$ref = GETPOST('ref', 'alpha');
42		-$batch = GETPOST('batch', 'alpha');
43		-$objectid = GETPOST('productid', 'int');
	42	+$batch = GETPOST('batch', 'alpha');
	43	+$objectid = GETPOST('productid', 'int');
44	44
45	45	// Security check
46	46	$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));

		@@ -39,8 +39,8 @@
		block discarded – undo
39	39
40	40	$id = GETPOST('id', 'int');
41	41	$ref = GETPOST('ref', 'alpha');
42		-$batch = GETPOST('batch', 'alpha');
43		-$objectid = GETPOST('productid', 'int');
	42	+$batch = GETPOST('batch', 'alpha');
	43	+$objectid = GETPOST('productid', 'int');
44	44
45	45	// Security check
46	46	$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));

		@@ -1,6 +1,6 @@
		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();

		@@ -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 '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
6	8	}

		@@ -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	<head>
32	37	<meta charset="UTF-8" />

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

		@@ -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 './page249.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page249.tpl.php';
	4	+if (empty($dolibarr_main_data_root)) {
	5	+ require './page249.tpl.php';
	6	+} else {
	7	+ require $dolibarr_main_data_root.'/website/'.$website->ref.'/page249.tpl.php';
	8	+}
5	9	?>

Dolibarr / dolibarr

Branch — develop (936be1)

Category

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

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

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

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

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

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

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

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

Braces +7 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 +5 added lines, -1 removed lines patch added patch discarded remove patch