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

Completed

Branch — develop (f5af02)

unknown

created 2023-11-16 16:07 UTC

Status

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

@@ -51,7 +51,7 @@
 block discarded – undo
 	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
 	//var_dump($result['content']);
 	if (function_exists('simplexml_load_string')) {
-		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
 	} else {
 		setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors');
 	}

Please login to merge, or discard this patch.

htdocs/admin/system/filecheck.php 1 patch

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

@@ -165,13 +165,13 @@
 block discarded – undo
 	}
 }
 if (GETPOST('target') == 'remote') {
-	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only. Same is used into api_setup.class.php.
+	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php.
 
 	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
 	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
 		$xmlfile = $xmlarray['content'];
 		//print "xmlfilestart".$xmlfile."xmlfileend";
-		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
 	} else {
 		$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
 		setEventMessages($errormsg, null, 'errors');

Please login to merge, or discard this patch.

htdocs/projet/index.php 1 patch

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

@@ -152,7 +152,7 @@
 block discarded – undo
 	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 		$listofoppstatus[$objp->rowid] = $objp->percent;
-		$listofopplabel[$objp->rowid] = $objp->label;		// default label if translation from "OppStatus".code not found.
+		$listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
 		$listofoppcode[$objp->rowid] = $objp->code;
 		switch ($objp->code) {
 			case 'PROSP':

Please login to merge, or discard this patch.

htdocs/hrm/position_document.php 1 patch

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

@@ -81,9 +81,9 @@
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("hrm", "companies", "other", "mails"));

Please login to merge, or discard this patch.

htdocs/takepos/printbox.php 1 patch

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

@@ -91,8 +91,8 @@
 block discarded – undo
 	$label_default = getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT');
 	$qty_default = 1;
 
-	print '<input type="text" id="label" name="label" class="takepospay" value="' . $label_default . '" style="width:40%;" placeholder="' . $langs->trans('Label') . '">';
-	print '<input type="text" id="qty" name="qty" class="takepospay" value="' . $qty_default . '" style="width:10%;" placeholder="' . $langs->trans('Qty') . '">';
+	print '<input type="text" id="label" name="label" class="takepospay" value="'.$label_default.'" style="width:40%;" placeholder="'.$langs->trans('Label').'">';
+	print '<input type="text" id="qty" name="qty" class="takepospay" value="'.$qty_default.'" style="width:10%;" placeholder="'.$langs->trans('Qty').'">';
 }
 ?>
 <input type="button" class="button takepospay clearboth" value="OK" onclick="Save();">

Please login to merge, or discard this patch.

htdocs/takepos/admin/receipt.php 1 patch

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

@@ -273,7 +273,7 @@
 block discarded – undo
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('PrintWithoutDetailsLabelDefault');
 	print '<td colspan="2">';
-	print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />';
+	print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />';
 	print "</td></tr>\n";
 }
 

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.

		@@ -165,13 +165,13 @@
		block discarded – undo
165	165	}
166	166	}
167	167	if (GETPOST('target') == 'remote') {
168		- $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php.
	168	+ $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php.
169	169
170	170	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
171	171	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
172	172	$xmlfile = $xmlarray['content'];
173	173	//print "xmlfilestart".$xmlfile."xmlfileend";
174		- $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA\|LIBXML_NONET);
	174	+ $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA \| LIBXML_NONET);
175	175	} else {
176	176	$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
177	177	setEventMessages($errormsg, null, 'errors');

		@@ -81,9 +81,9 @@
		block discarded – undo
81	81	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
82	82	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
83	83	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
84		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
85		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
86		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
	84	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
	85	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
	86	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
87	87
88	88	// Load translation files required by the page
89	89	$langs->loadLangs(array("hrm", "companies", "other", "mails"));

		@@ -91,8 +91,8 @@
		block discarded – undo
91	91	$label_default = getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT');
92	92	$qty_default = 1;
93	93
94		- print '<input type="text" id="label" name="label" class="takepospay" value="' . $label_default . '" style="width:40%;" placeholder="' . $langs->trans('Label') . '">';
95		- print '<input type="text" id="qty" name="qty" class="takepospay" value="' . $qty_default . '" style="width:10%;" placeholder="' . $langs->trans('Qty') . '">';
	94	+ print '<input type="text" id="label" name="label" class="takepospay" value="'.$label_default.'" style="width:40%;" placeholder="'.$langs->trans('Label').'">';
	95	+ print '<input type="text" id="qty" name="qty" class="takepospay" value="'.$qty_default.'" style="width:10%;" placeholder="'.$langs->trans('Qty').'">';
96	96	}
97	97	?>
98	98	<input type="button" class="button takepospay clearboth" value="OK" onclick="Save();">

		@@ -273,7 +273,7 @@
		block discarded – undo
273	273	print '<tr class="oddeven"><td>';
274	274	print $langs->trans('PrintWithoutDetailsLabelDefault');
275	275	print '<td colspan="2">';
276		- print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />';
	276	+ print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />';
277	277	print "</td></tr>\n";
278	278	}
279	279

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

		@@ -51,7 +51,7 @@
		block discarded – undo
51	51	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
52	52	//var_dump($result['content']);
53	53	if (function_exists('simplexml_load_string')) {
54		- $sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA\|LIBXML_NONET);
	54	+ $sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA \| LIBXML_NONET);
55	55	} else {
56	56	setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors');
57	57	}

		@@ -152,7 +152,7 @@
		block discarded – undo
152	152	while ($i < $num) {
153	153	$objp = $db->fetch_object($resql);
154	154	$listofoppstatus[$objp->rowid] = $objp->percent;
155		- $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
	155	+ $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
156	156	$listofoppcode[$objp->rowid] = $objp->code;
157	157	switch ($objp->code) {
158	158	case 'PROSP':

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

Dolibarr / dolibarr

Branch — develop (f5af02)

Status

Category

Spacing +1 added lines, -1 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 +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 +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