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

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

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

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

@@ -28,9 +28,9 @@
 block discarded – undo
 
 // Load Dolibarr environment
 require '../main.inc.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';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));

Please login to merge, or discard this patch.

htdocs/hrm/skill_note.php 2 patches

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

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

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

@@ -29,8 +29,8 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

Please login to merge, or discard this patch.

htdocs/hrm/job_note.php 2 patches

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

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

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

@@ -29,8 +29,8 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

Please login to merge, or discard this patch.

htdocs/hrm/position_agenda.php 2 patches

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

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

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

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.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/job.class.php';
 
 
 // Load translation files required by the page
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
 		$filters['search_agenda_label'] = $search_agenda_label;
 		$filters['search_rowid'] = $search_rowid;
 
-		$object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
+		$object->fields['label'] = array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
 
 		// TODO Replace this with same code than into list.php
 		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);

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.

		@@ -136,8 +136,12 @@
		block discarded – undo
136	136	//if ($user->socid > 0) $socid = $user->socid;
137	137	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138	138	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139		-if (empty($conf->hrm->enabled)) accessforbidden();
140		-if (!$permissiontoread) accessforbidden();
	139	+if (empty($conf->hrm->enabled)) {
	140	+ accessforbidden();
	141	+}
	142	+if (!$permissiontoread) {
	143	+ accessforbidden();
	144	+}
141	145
142	146
143	147	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
136	136	//if ($user->socid > 0) $socid = $user->socid;
137	137	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138	138	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139		-if (empty($conf->hrm->enabled)) accessforbidden();
140		-if (!$permissiontoread) accessforbidden();
	139	+if (empty($conf->hrm->enabled)) {
	140	+ accessforbidden();
	141	+}
	142	+if (!$permissiontoread) {
	143	+ accessforbidden();
	144	+}
141	145
142	146
143	147	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
136	136	//if ($user->socid > 0) $socid = $user->socid;
137	137	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138	138	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139		-if (empty($conf->hrm->enabled)) accessforbidden();
140		-if (!$permissiontoread) accessforbidden();
	139	+if (empty($conf->hrm->enabled)) {
	140	+ accessforbidden();
	141	+}
	142	+if (!$permissiontoread) {
	143	+ accessforbidden();
	144	+}
141	145
142	146
143	147	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
136	136	//if ($user->socid > 0) $socid = $user->socid;
137	137	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138	138	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139		-if (empty($conf->hrm->enabled)) accessforbidden();
140		-if (!$permissiontoread) accessforbidden();
	139	+if (empty($conf->hrm->enabled)) {
	140	+ accessforbidden();
	141	+}
	142	+if (!$permissiontoread) {
	143	+ accessforbidden();
	144	+}
141	145
142	146
143	147	/*

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

		@@ -28,9 +28,9 @@
		block discarded – undo
28	28
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
32		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
	31	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
34	34
35	35	// Load translation files required by the page
36	36	$langs->loadLangs(array('hrm', 'companies'));

		@@ -29,8 +29,8 @@ discard block
		block discarded – undo
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31	31
32		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
34	34
35	35	// Load translation files required by the page
36	36	$langs->loadLangs(array('hrm', 'companies'));
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
105	105
106	106	$morehtmlref = '<div class="refid">';
107		- $morehtmlref.= $object->label;
	107	+ $morehtmlref .= $object->label;
108	108	$morehtmlref .= '</div>';
109	109
110	110

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
35	35	require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
36	36	require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
37		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
	37	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
38	38
39	39
40	40	// Load translation files required by the page
		@@ -227,7 +227,7 @@ discard block
		block discarded – undo
227	227	$filters['search_agenda_label'] = $search_agenda_label;
228	228	$filters['search_rowid'] = $search_rowid;
229	229
230		- $object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
	230	+ $object->fields['label'] = array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
231	231
232	232	// TODO Replace this with same code than into list.php
233	233	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);

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

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

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

Dolibarr / dolibarr

Branch — develop (f5af02)

Status

Category

Braces +6 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 +6 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 +6 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 +6 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

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