Inspection of "Daily Inspection: fix #25941 (#26206)" - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (30080e)

unknown

created 2023-10-13 16:01 UTC

Status

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

@@ -363,7 +363,10 @@
 block discarded – undo
 		];
 
 		$odf=new Odf($filename, array());
-		if (is_object($odf)) $result = 1; // Just to test
+		if (is_object($odf)) {
+			$result = 1;
+		}
+		// Just to test
 
 		foreach ($to_test as $case) {
 			if ($case['charset'] !== null) {

Please login to merge, or discard this patch.

test/other/test_serialize.php 1 patch

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

@@ -6,9 +6,15 @@  discard block
 block discarded – undo
 
 $res=@include_once $path.'/../htdocs/master.inc.php';
 $res=@include_once $path.'/../../htdocs/master.inc.php';
-if (! $res) @include_once '../../master.inc.php';
-if (! $res) @include_once '../master.inc.php';
-if (! $res) @include_once './master.inc.php';
+if (! $res) {
+	@include_once '../../master.inc.php';
+}
+if (! $res) {
+	@include_once '../master.inc.php';
+}
+if (! $res) {
+	@include_once './master.inc.php';
+}
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 
@@ -25,8 +31,10 @@  discard block
 block discarded – undo
 	))) {
 		continue; // Discard if not into a dedicated list
 	}
-	if (!is_object($value)) $object->thirdparty->{$key} = $value;
-}
+	if (!is_object($value)) {
+		$object->thirdparty->{$key} = $value;
+	}
+	}
 
 
 // Show information

Please login to merge, or discard this patch.

test/other/test_uncrypt.php 1 patch

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

@@ -6,9 +6,15 @@
 block discarded – undo
 
 $res=@include_once $path.'/../htdocs/master.inc.php';
 $res=@include_once $path.'/../../htdocs/master.inc.php';
-if (! $res) @include_once '../../master.inc.php';
-if (! $res) @include_once '../master.inc.php';
-if (! $res) @include_once './master.inc.php';
+if (! $res) {
+	@include_once '../../master.inc.php';
+}
+if (! $res) {
+	@include_once '../master.inc.php';
+}
+if (! $res) {
+	@include_once './master.inc.php';
+}
 
 
 print "Decode a value crypted with crypted:.... in conf.php file\n";

Please login to merge, or discard this patch.

websites/website_template-onepageblackpurple/containers/master.inc.php 1 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.

websites/website_template-onepageblackpurple/containers/page148.tpl.php 1 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.

websites/website_template-homesubmenu/containers/master.inc.php 1 patch

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

@@ -1,7 +1,9 @@
 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 '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

Please login to merge, or discard this patch.

websites/website_template-restaurant/containers/page248.tpl.php 1 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.

websites/website_template-restaurant/containers/page251.tpl.php 1 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.

websites/website_template-restaurant/containers/page253.tpl.php 1 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.

		@@ -363,7 +363,10 @@
		block discarded – undo
363	363	];
364	364
365	365	$odf=new Odf($filename, array());
366		- if (is_object($odf)) $result = 1; // Just to test
	366	+ if (is_object($odf)) {
	367	+ $result = 1;
	368	+ }
	369	+ // Just to test
367	370
368	371	foreach ($to_test as $case) {
369	372	if ($case['charset'] !== null) {

		@@ -6,9 +6,15 @@ discard block
		block discarded – undo
6	6
7	7	$res=@include_once $path.'/../htdocs/master.inc.php';
8	8	$res=@include_once $path.'/../../htdocs/master.inc.php';
9		-if (! $res) @include_once '../../master.inc.php';
10		-if (! $res) @include_once '../master.inc.php';
11		-if (! $res) @include_once './master.inc.php';
	9	+if (! $res) {
	10	+ @include_once '../../master.inc.php';
	11	+}
	12	+if (! $res) {
	13	+ @include_once '../master.inc.php';
	14	+}
	15	+if (! $res) {
	16	+ @include_once './master.inc.php';
	17	+}
12	18	include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
13	19
14	20
		@@ -25,8 +31,10 @@ discard block
		block discarded – undo
25	31	))) {
26	32	continue; // Discard if not into a dedicated list
27	33	}
28		- if (!is_object($value)) $object->thirdparty->{$key} = $value;
29		-}
	34	+ if (!is_object($value)) {
	35	+ $object->thirdparty->{$key} = $value;
	36	+ }
	37	+ }
30	38
31	39
32	40	// Show information

		@@ -6,9 +6,15 @@
		block discarded – undo
6	6
7	7	$res=@include_once $path.'/../htdocs/master.inc.php';
8	8	$res=@include_once $path.'/../../htdocs/master.inc.php';
9		-if (! $res) @include_once '../../master.inc.php';
10		-if (! $res) @include_once '../master.inc.php';
11		-if (! $res) @include_once './master.inc.php';
	9	+if (! $res) {
	10	+ @include_once '../../master.inc.php';
	11	+}
	12	+if (! $res) {
	13	+ @include_once '../master.inc.php';
	14	+}
	15	+if (! $res) {
	16	+ @include_once './master.inc.php';
	17	+}
12	18
13	19
14	20	print "Decode a value crypted with crypted:.... in conf.php file\n";

		@@ -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,7 +1,9 @@
		block discarded – undo
1	1	<?php
2	2	// File generated to link to the master file - DO NOT MODIFY - It is just an include
3	3	if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4		- if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
	4	+ if (! defined('USEEXTERNALSERVER')) {
	5	+ define('USEEXTERNALSERVER', 1);
	6	+ }
5	7	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6	8	}
7	9	?>

Dolibarr / dolibarr

Branch — develop (30080e)

Status

Category

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

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

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

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

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

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

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

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

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