Inspection of "Daily Inspection: FIX Bad filter on menu Services..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (9d8368)

unknown

created 2023-10-19 16:00 UTC

Status

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

@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";

Please login to merge, or discard this patch.

htdocs/accountancy/customer/lines.php 1 patch

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

@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -215,13 +215,13 @@  discard block
 block discarded – undo
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0";

Please login to merge, or discard this patch.

htdocs/adherents/stats/geo.php 1 patch

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

@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 
 llxHeader('', $title, '', '', 0, 0, $arrayjs);
 
-print load_fiche_titre($title, '',  $memberstatic->picto);
+print load_fiche_titre($title, '', $memberstatic->picto);
 
 //dol_mkdir($dir);
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
 			if ($mode == 'memberbyregion') { //+
 				$data[] = array(
 					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
 					'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
 					'nb'=>$obj->nb,
 					'lastdate'=>$db->jdate($obj->lastdate),

Please login to merge, or discard this patch.

htdocs/adherents/cartes/carte.php 1 patch

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

@@ -156,7 +156,7 @@
 block discarded – undo
 				$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 				if (is_numeric($foruserid) || $foruserlogin) {
-					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];	// $_Avery_Labels is defined into an include
+					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include
 					if ($nb <= 0) {
 						$nb = 1; // Protection to avoid empty page
 					}

Please login to merge, or discard this patch.

htdocs/adherents/type_translation.php 1 patch

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

@@ -74,7 +74,7 @@
 block discarded – undo
 
 	// update of object
 	if ($forcelangprod == $current_lang) {
-		$object->label		 = GETPOST("libelle", 'alphanohtml');
+		$object->label = GETPOST("libelle", 'alphanohtml');
 		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
 		//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	} else {

Please login to merge, or discard this patch.

htdocs/multicurrency/class/multicurrency.class.php 1 patch

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

@@ -644,7 +644,7 @@
 block discarded – undo
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 		$urlendpoint = 'http://api.currencylayer.com/live?access_key='.$key;
-		$urlendpoint .= '&source=' . (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
+		$urlendpoint .= '&source='.(empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
 
 		dol_syslog("Call url endpoint ".$urlendpoint);
 

Please login to merge, or discard this patch.

htdocs/core/tpl/extrafields_list_print_fields.tpl.php 1 patch

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

@@ -45,7 +45,7 @@
 block discarded – undo
 				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
 				$title = dol_string_nohtmltag($valuetoshow);
 
-				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
+				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
 				print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
 				print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
 				print '>';

Please login to merge, or discard this patch.

htdocs/expedition/document.php 1 patch

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

@@ -76,7 +76,7 @@
 block discarded – undo
 }
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
-$permissiontoadd = $user->rights->expedition->creer;	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php
 
 
 /*

Please login to merge, or discard this patch.

htdocs/compta/sociales/document.php 1 patch

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

@@ -78,7 +78,7 @@
 block discarded – undo
 }
 $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
 
-$permissiontoadd = $user->rights->tax->charges->creer;	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
 
 
 /*

Please login to merge, or discard this patch.

		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	$search_date_endday = GETPOST('search_date_endday', 'int');
61	61	$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
62	62	$search_date_endyear = GETPOST('search_date_endyear', 'int');
63		-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
	63	+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64	64	$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65	65	$search_country = GETPOST('search_country', 'alpha');
66	66	$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
		@@ -216,13 +216,13 @@ discard block
		block discarded – undo
216	216	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
217	217	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
218	218	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
219		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
	219	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
220	220	}
221	221	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
222	222	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
223	223	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
224	224	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
225		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
	225	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
226	226	}
227	227	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
228	228	$sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";

		@@ -156,7 +156,7 @@
		block discarded – undo
156	156	$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
157	157
158	158	if (is_numeric($foruserid) \|\| $foruserlogin) {
159		- $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include
	159	+ $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include
160	160	if ($nb <= 0) {
161	161	$nb = 1; // Protection to avoid empty page
162	162	}

		@@ -644,7 +644,7 @@
		block discarded – undo
644	644	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
645	645
646	646	$urlendpoint = 'http://api.currencylayer.com/live?access_key='.$key;
647		- $urlendpoint .= '&source=' . (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
	647	+ $urlendpoint .= '&source='.(empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
648	648
649	649	dol_syslog("Call url endpoint ".$urlendpoint);
650	650

		@@ -45,7 +45,7 @@
		block discarded – undo
45	45	$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
46	46	$title = dol_string_nohtmltag($valuetoshow);
47	47
48		- print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
	48	+ print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
49	49	print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
50	50	print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
51	51	print '>';

		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	$search_date_endday = GETPOST('search_date_endday', 'int');
60	60	$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
61	61	$search_date_endyear = GETPOST('search_date_endyear', 'int');
62		-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
	62	+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
63	63	$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
64	64	$search_country = GETPOST('search_country', 'alpha');
65	65	$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
		@@ -215,13 +215,13 @@ discard block
		block discarded – undo
215	215	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
216	216	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
217	217	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
218		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
	218	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
219	219	}
220	220	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
221	221	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
222	222	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
223	223	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
224		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
	224	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
225	225	}
226	226	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
227	227	$sql .= " WHERE fd.fk_code_ventilation > 0";

		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76
77	77	llxHeader('', $title, '', '', 0, 0, $arrayjs);
78	78
79		-print load_fiche_titre($title, '', $memberstatic->picto);
	79	+print load_fiche_titre($title, '', $memberstatic->picto);
80	80
81	81	//dol_mkdir($dir);
82	82
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	if ($mode == 'memberbyregion') { //+
173	173	$data[] = array(
174	174	'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
175		- 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
	175	+ 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
176	176	'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
177	177	'nb'=>$obj->nb,
178	178	'lastdate'=>$db->jdate($obj->lastdate),

		@@ -74,7 +74,7 @@
		block discarded – undo
74	74
75	75	// update of object
76	76	if ($forcelangprod == $current_lang) {
77		- $object->label = GETPOST("libelle", 'alphanohtml');
	77	+ $object->label = GETPOST("libelle", 'alphanohtml');
78	78	$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
79	79	//$object->other = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
80	80	} else {

		@@ -76,7 +76,7 @@
		block discarded – undo
76	76	}
77	77	$result = restrictedArea($user, 'expedition', $object->id, '');
78	78
79		-$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php
	79	+$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php
80	80
81	81
82	82	/*

		@@ -78,7 +78,7 @@
		block discarded – undo
78	78	}
79	79	$result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
80	80
81		-$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
	81	+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
82	82
83	83
84	84	/*

Dolibarr / dolibarr

Branch — develop (9d8368)

Status

Category

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

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

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

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

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

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

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