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

Completed

Branch — develop (3700b0)

unknown

created 2023-10-04 16:56 UTC

Status

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

@@ -100,10 +100,10 @@  discard block
 block discarded – undo
 function dolGetRandomBytes($length)
 {
 	if (function_exists('random_bytes')) {	// Available with PHP 7 only.
-		return bin2hex(random_bytes((int) floor($length / 2)));	// the bin2hex will double the number of bytes so we take length / 2
+		return bin2hex(random_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2
 	}
 
-	return bin2hex(openssl_random_pseudo_bytes((int) floor($length / 2)));		// the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.
+	return bin2hex(openssl_random_pseudo_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.
 }
 
 /**
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
 	global $conf;
 
 	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if (! empty($hash[0]) && $hash[0] == '$') {
+		if (!empty($hash[0]) && $hash[0] == '$') {
 			return password_verify($chain, $hash);
 		} elseif (dol_strlen($hash) == 32) {
 			return dol_verifyHash($chain, $hash, '3'); // md5
@@ -312,31 +312,31 @@  discard block
 block discarded – undo
 	$salt = substr(sha1(time()), 0, 8);
 
 	if ($type === 'md5') {
-		return '{MD5}' . base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)
+		return '{MD5}'.base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)
 	} elseif ($type === 'md5frommd5') {
-		return '{MD5}' . base64_encode(hex2bin($password)); // Create OpenLDAP MD5 password from Dolibarr MD5 password
+		return '{MD5}'.base64_encode(hex2bin($password)); // Create OpenLDAP MD5 password from Dolibarr MD5 password
 	} elseif ($type === 'smd5') {
-		return "{SMD5}" . base64_encode(hash("md5", $password . $salt, true) . $salt);
+		return "{SMD5}".base64_encode(hash("md5", $password.$salt, true).$salt);
 	} elseif ($type === 'sha') {
-		return '{SHA}' . base64_encode(hash("sha1", $password, true));
+		return '{SHA}'.base64_encode(hash("sha1", $password, true));
 	} elseif ($type === 'ssha') {
-		return "{SSHA}" . base64_encode(hash("sha1", $password . $salt, true) . $salt);
+		return "{SSHA}".base64_encode(hash("sha1", $password.$salt, true).$salt);
 	} elseif ($type === 'sha256') {
-		return "{SHA256}" . base64_encode(hash("sha256", $password, true));
+		return "{SHA256}".base64_encode(hash("sha256", $password, true));
 	} elseif ($type === 'ssha256') {
-		return "{SSHA256}" . base64_encode(hash("sha256", $password . $salt, true) . $salt);
+		return "{SSHA256}".base64_encode(hash("sha256", $password.$salt, true).$salt);
 	} elseif ($type === 'sha384') {
-		return "{SHA384}" . base64_encode(hash("sha384", $password, true));
+		return "{SHA384}".base64_encode(hash("sha384", $password, true));
 	} elseif ($type === 'ssha384') {
-		return "{SSHA384}" . base64_encode(hash("sha384", $password . $salt, true) . $salt);
+		return "{SSHA384}".base64_encode(hash("sha384", $password.$salt, true).$salt);
 	} elseif ($type === 'sha512') {
-		return "{SHA512}" . base64_encode(hash("sha512", $password, true));
+		return "{SHA512}".base64_encode(hash("sha512", $password, true));
 	} elseif ($type === 'ssha512') {
-		return "{SSHA512}" . base64_encode(hash("sha512", $password . $salt, true) . $salt);
+		return "{SSHA512}".base64_encode(hash("sha512", $password.$salt, true).$salt);
 	} elseif ($type === 'crypt') {
-		return '{CRYPT}' . crypt($password, $salt);
+		return '{CRYPT}'.crypt($password, $salt);
 	} elseif ($type === 'clear') {
-		return '{CLEAR}' . $password;  // Just for test, plain text password is not secured !
+		return '{CLEAR}'.$password; // Just for test, plain text password is not secured !
 	}
 	return "";
 }
@@ -370,13 +370,13 @@  discard block
 block discarded – undo
 	if (is_object($object)) {
 		$objectid = $object->id;
 	} else {
-		$objectid = $object;		// $objectid can be X or 'X,Y,Z'
+		$objectid = $object; // $objectid can be X or 'X,Y,Z'
 	}
 	if ($objectid == "-1") {
 		$objectid = 0;
 	}
 	if ($objectid) {
-		$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input
+		$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
 	}
 
 	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
@@ -853,9 +853,9 @@  discard block
 block discarded – undo
 	if (is_object($object)) {
 		$objectid = $object->id;
 	} else {
-		$objectid = $object;		// $objectid can be X or 'X,Y,Z'
+		$objectid = $object; // $objectid can be X or 'X,Y,Z'
 	}
-	$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input
+	$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
 
 	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
 	//print "user_id=".$user->id.", features=".join(',', $featuresarray).", objectid=".$objectid;
@@ -902,8 +902,8 @@  discard block
 block discarded – undo
 		$checkparentsoc = array('agenda', 'contact', 'contrat'); // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet', 'project'); // Test for project object
 		$checktask = array('projet_task'); // Test for task object
-		$checkhierarchy = array('expensereport', 'holiday');	// check permission among the hierarchy of user
-		$checkuser = array('bookmark');	// check permission among the fk_user (must be myself or null)
+		$checkhierarchy = array('expensereport', 'holiday'); // check permission among the hierarchy of user
+		$checkuser = array('bookmark'); // check permission among the fk_user (must be myself or null)
 		$nocheck = array('barcode', 'stock'); // No test
 
 		//$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).
@@ -916,7 +916,7 @@  discard block
 block discarded – undo
 
 		// To avoid an access forbidden with a numeric ref
 		if ($dbt_select != 'rowid' && $dbt_select != 'id') {
-			$objectid = "'".$objectid."'";	// Note: $objectid was already cast into int at begin of this method.
+			$objectid = "'".$objectid."'"; // Note: $objectid was already cast into int at begin of this method.
 		}
 		// Check permission for objectid on entity only
 		if (in_array($feature, $check) && $objectid > 0) {		// For $objectid = 0, no check

Please login to merge, or discard this patch.

htdocs/core/class/html.formprojet.class.php 1 patch

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

@@ -96,18 +96,18 @@  discard block
 block discarded – undo
 			$placeholder = '';
 
 			if ($selected && empty($selected_input_value)) {
-				require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$project = new Project($this->db);
 				$project->fetch($selected);
 				$selected_input_value = $project->ref;
 			}
-			$urloption = 'socid=' . ((int) $socid) . '&htmlname=' . urlencode($htmlname) . '&discardclosed=' . ((int) $discard_closed);
+			$urloption = 'socid='.((int) $socid).'&htmlname='.urlencode($htmlname).'&discardclosed='.((int) $discard_closed);
 			if ($morefilter == 'usage_organize_event=1') {
 				$urloption .= '&usage_organize_event=1';
 			}
-			$out .= '<input type="text" class="minwidth200' . ($morecss ? ' ' . $morecss : '') . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' />';
+			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 
-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array());
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array());
 		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss, $morefilter);
 		}
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
 		// phpcs:enable
 		global $user, $conf, $langs;
 
-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (empty($htmlid)) {
 			$htmlid = $htmlname;
@@ -175,26 +175,26 @@  discard block
 block discarded – undo
 
 		// Search all projects
 		$sql = "SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias";
-		$sql .= " FROM " . $this->db->prefix() . "projet as p LEFT JOIN " . $this->db->prefix() . "societe as s ON s.rowid = p.fk_soc";
-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+		$sql .= " FROM ".$this->db->prefix()."projet as p LEFT JOIN ".$this->db->prefix()."societe as s ON s.rowid = p.fk_soc";
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		if ($projectsListId !== false) {
-			$sql .= " AND p.rowid IN (" . $this->db->sanitize($projectsListId) . ")";
+			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
 		if ($socid == 0) {
 			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		}
 		if ($socid > 0) {
 			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
-				$sql .= " AND (p.fk_soc=" . ((int) $socid) . " OR p.fk_soc IS NULL)";
+				$sql .= " AND (p.fk_soc=".((int) $socid)." OR p.fk_soc IS NULL)";
 			} elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-				$sql .= " AND (p.fk_soc IN (" . $this->db->sanitize(((int) $socid) . ", " . $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) . ") OR p.fk_soc IS NULL)";
+				$sql .= " AND (p.fk_soc IN (".$this->db->sanitize(((int) $socid).", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY).") OR p.fk_soc IS NULL)";
 			}
 		}
 		if (!empty($filterkey)) {
 			$sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		}
 		if ($morefilter) {
-			$sql .= ' AND (' . $this->db->sanitize($morefilter, 0, 1) . ')';
+			$sql .= ' AND ('.$this->db->sanitize($morefilter, 0, 1).')';
 		}
 		$sql .= " ORDER BY p.ref ASC";
 
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
 				$morecss .= ' minwidth100';
 			}
 			if (empty($option_only)) {
-				$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlid . '" name="' . $htmlname . '">';
+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlid.'" name="'.$htmlname.'">';
 			}
 			if (!empty($show_empty)) {
 				if (is_numeric($show_empty)) {
@@ -230,37 +230,37 @@  discard block
 block discarded – undo
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow .= ', ' . dol_trunc($obj->title, $maxlength);
+						$labeltoshow .= ', '.dol_trunc($obj->title, $maxlength);
 						if ($obj->name) {
-							$labeltoshow .= ' - ' . $obj->name;
+							$labeltoshow .= ' - '.$obj->name;
 							if ($obj->name_alias) {
-								$labeltoshow .= ' (' . $obj->name_alias . ')';
+								$labeltoshow .= ' ('.$obj->name_alias.')';
 							}
 						}
 
 						$disabled = 0;
 						if ($obj->fk_statut == 0) {
 							$disabled = 1;
-							$labeltoshow .= ' - ' . $langs->trans("Draft");
+							$labeltoshow .= ' - '.$langs->trans("Draft");
 						} elseif ($obj->fk_statut == 2) {
 							if ($discard_closed == 2) {
 								$disabled = 1;
 							}
-							$labeltoshow .= ' - ' . $langs->trans("Closed");
+							$labeltoshow .= ' - '.$langs->trans("Closed");
 						} elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 							$disabled = 1;
-							$labeltoshow .= ' - ' . $langs->trans("LinkedToAnotherCompany");
+							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid) {
-							$out .= '<option value="' . $obj->rowid . '" selected';
+							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out .= '>' . $labeltoshow . '</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
 								$resultat = '';
 							} else {
-								$resultat = '<option value="' . $obj->rowid . '"';
+								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) {
 									$resultat .= ' disabled';
 								}
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
 								'value' => $obj->ref,
 								'ref' => $obj->ref,
 								'labelx' => $labeltoshow,
-								'label' => ($disabled ? '<span class="opacitymedium">' . $labeltoshow . '</span>' : $labeltoshow),
+								'label' => ($disabled ? '<span class="opacitymedium">'.$labeltoshow.'</span>' : $labeltoshow),
 								'disabled' => (bool) $disabled
 							);
 						}
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
 
 				// Use select2 selector
 				if (!empty($conf->use_javascript_ajax)) {
-					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 					$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
 					$out .= $comboenhancement;
 					$morecss .= ' minwidth100';
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
 	{
 		global $user, $conf, $langs;
 
-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (is_null($usertofilter)) {
 			$usertofilter = $user;
@@ -362,19 +362,19 @@  discard block
 block discarded – undo
 		$sql = "SELECT t.rowid, t.ref as tref, t.label as tlabel, t.progress,";
 		$sql .= " p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, p.usage_task,";
 		$sql .= " s.nom as name";
-		$sql .= " FROM " . $this->db->prefix() . "projet as p";
-		$sql .= " LEFT JOIN " . $this->db->prefix() . "societe as s ON s.rowid = p.fk_soc,";
-		$sql .= " " . $this->db->prefix() . "projet_task as t";
-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+		$sql .= " FROM ".$this->db->prefix()."projet as p";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON s.rowid = p.fk_soc,";
+		$sql .= " ".$this->db->prefix()."projet_task as t";
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		$sql .= " AND t.fk_projet = p.rowid";
 		if ($projectsListId) {
-			$sql .= " AND p.rowid IN (" . $this->db->sanitize($projectsListId) . ")";
+			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
 		if ($socid == 0) {
 			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		}
 		if ($socid > 0) {
-			$sql .= " AND (p.fk_soc=" . ((int) $socid) . " OR p.fk_soc IS NULL)";
+			$sql .= " AND (p.fk_soc=".((int) $socid)." OR p.fk_soc IS NULL)";
 		}
 		$sql .= " ORDER BY p.ref, t.ref ASC";
 
@@ -382,14 +382,14 @@  discard block
 block discarded – undo
 		if ($resql) {
 			// Use select2 selector
 			if (empty($option_only) && !empty($conf->use_javascript_ajax)) {
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
 				$out .= $comboenhancement;
 				$morecss .= ' minwidth150imp';
 			}
 
 			if (empty($option_only)) {
-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlname . '" name="' . $htmlname . '">';
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';
 			}
 			if (!empty($show_empty)) {
 				$out .= '<option value="0" class="optiongrey">';
@@ -435,58 +435,58 @@  discard block
 block discarded – undo
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
 							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
-							$labeltoshow .= ' ' . dol_trunc($obj->title, $maxlength);
+							$labeltoshow .= ' '.dol_trunc($obj->title, $maxlength);
 							$titletoshow = $labeltoshow;
 
 							if ($obj->name) {
-								$labeltoshow .= ' (' . $obj->name . ')';
-								$titletoshow .= ' <span class="opacitymedium">(' . $obj->name . ')</span>';
+								$labeltoshow .= ' ('.$obj->name.')';
+								$titletoshow .= ' <span class="opacitymedium">('.$obj->name.')</span>';
 							}
 
 							$disabled = 0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT) {
 								$disabled = 1;
-								$labeltoshow .= ' - ' . $langs->trans("Draft");
-								$titletoshow .= ' -  <span class="opacitymedium">' . $langs->trans("Draft") . '</span>';
+								$labeltoshow .= ' - '.$langs->trans("Draft");
+								$titletoshow .= ' -  <span class="opacitymedium">'.$langs->trans("Draft").'</span>';
 							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
 								if ($discard_closed == 2) {
 									$disabled = 1;
 								}
-								$labeltoshow .= ' - ' . $langs->trans("Closed");
-								$titletoshow .= ' - <span class="opacitymedium">' . $langs->trans("Closed") . '</span>';
+								$labeltoshow .= ' - '.$langs->trans("Closed");
+								$titletoshow .= ' - <span class="opacitymedium">'.$langs->trans("Closed").'</span>';
 							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
-								$labeltoshow .= ' - ' . $langs->trans("LinkedToAnotherCompany");
-								$titletoshow .= ' - <span class="opacitymedium">' . $langs->trans("LinkedToAnotherCompany") . '</span>';
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
+								$titletoshow .= ' - <span class="opacitymedium">'.$langs->trans("LinkedToAnotherCompany").'</span>';
 							}
 							$labeltoshow .= ' - ';
 							$titletoshow .= ' - ';
 						}
 
 						// Label for task
-						$labeltoshow .= $obj->tref . ' ' . dol_trunc($obj->tlabel, $maxlength);
-						$titletoshow .= $obj->tref . ' ' . dol_trunc($obj->tlabel, $maxlength);
+						$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
+						$titletoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 						if ($obj->usage_task && preg_match('/progress/', $showmore)) {
-							$labeltoshow .= ' <span class="opacitymedium">(' . $obj->progress . '%)</span>';
-							$titletoshow .= ' <span class="opacitymedium">(' . $obj->progress . '%)</span>';
+							$labeltoshow .= ' <span class="opacitymedium">('.$obj->progress.'%)</span>';
+							$titletoshow .= ' <span class="opacitymedium">('.$obj->progress.'%)</span>';
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid) {
-							$out .= '<option value="' . $obj->rowid . '" selected';
-							$out .= ' data-html="' . dol_escape_htmltag($titletoshow) . '"';
+							$out .= '<option value="'.$obj->rowid.'" selected';
+							$out .= ' data-html="'.dol_escape_htmltag($titletoshow).'"';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out .= '>' . $labeltoshow . '</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
 								$resultat = '';
 							} else {
-								$resultat = '<option value="' . $obj->rowid . '"';
+								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) {
 									$resultat .= ' disabled';
 								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat .= ' data-html="' . dol_escape_htmltag($titletoshow) . '"';
+								$resultat .= ' data-html="'.dol_escape_htmltag($titletoshow).'"';
 								$resultat .= '>';
 								$resultat .= $labeltoshow;
 								$resultat .= '</option>';
@@ -605,30 +605,30 @@  discard block
 block discarded – undo
 		if ($linkedtothirdparty) {
 			$sql .= ", s.nom as name";
 		}
-		$sql .= " FROM " . $this->db->prefix() . $table_element . " as t";
+		$sql .= " FROM ".$this->db->prefix().$table_element." as t";
 		if ($linkedtothirdparty) {
-			$sql .= ", " . $this->db->prefix() . "societe as s";
+			$sql .= ", ".$this->db->prefix()."societe as s";
 		}
-		$sql .= " WHERE " . $projectkey . " is null";
+		$sql .= " WHERE ".$projectkey." is null";
 		if (!empty($socid) && $linkedtothirdparty) {
 			if (is_numeric($socid)) {
-				$sql .= " AND t.fk_soc = " . ((int) $socid);
+				$sql .= " AND t.fk_soc = ".((int) $socid);
 			} else {
-				$sql .= " AND t.fk_soc IN (" . $this->db->sanitize($socid) . ")";
+				$sql .= " AND t.fk_soc IN (".$this->db->sanitize($socid).")";
 			}
 		}
 		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) {
-			$sql .= ' AND t.entity IN (' . getEntity('project') . ')';
+			$sql .= ' AND t.entity IN ('.getEntity('project').')';
 		}
 		if ($linkedtothirdparty) {
 			$sql .= " AND s.rowid = t.fk_soc";
 		}
 		if ($sqlfilter) {
-			$sql .= " AND " . $sqlfilter;
+			$sql .= " AND ".$sqlfilter;
 		}
 		$sql .= " ORDER BY ref DESC";
 
-		dol_syslog(get_class($this) . '::select_element', LOG_DEBUG);
+		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -636,18 +636,18 @@  discard block
 block discarded – undo
 			$sellist = '';
 
 			if ($num > 0) {
-				$sellist = '<select class="flat elementselect css' . $table_element . ($morecss ? ' ' . $morecss : '') . '" name="elementselect">';
-				$sellist .= '<option value="-1"' . ($placeholder ? ' class="optiongrey"' : '') . '>' . $placeholder . '</option>';
+				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
+				$sellist .= '<option value="-1"'.($placeholder ? ' class="optiongrey"' : '').'>'.$placeholder.'</option>';
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$ref = $obj->ref ? $obj->ref : $obj->rowid;
 					if (!empty($obj->ref_supplier)) {
-						$ref .= ' (' . $obj->ref_supplier . ')';
+						$ref .= ' ('.$obj->ref_supplier.')';
 					}
 					if (!empty($obj->name)) {
-						$ref .= ' - ' . $obj->name;
+						$ref .= ' - '.$obj->name;
 					}
-					$sellist .= '<option value="' . $obj->rowid . '">' . $ref . '</option>';
+					$sellist .= '<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
 				$sellist .= '</select>';
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::select_element ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
 		global $conf, $langs, $user;
 
 		$sql = "SELECT rowid, code, label, percent";
-		$sql .= " FROM " . $this->db->prefix() . 'c_lead_status';
+		$sql .= " FROM ".$this->db->prefix().'c_lead_status';
 		$sql .= " WHERE active = 1";
 		$sql .= " ORDER BY position";
 
@@ -699,31 +699,31 @@  discard block
 block discarded – undo
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num > 0) {
-				$sellist = '<select class="flat oppstatus' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '">';
+				$sellist = '<select class="flat oppstatus'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
 				if ($showempty) {
 					// Without &nbsp, strange move of screen when switching value
 					$sellist .= '<option value="-1">&nbsp;</option>';
 				}
 				if ($showallnone) {
-					$sellist .= '<option value="all"' . ($preselected == 'all' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("OnlyOpportunitiesShort") . '</option>';
-					$sellist .= '<option value="openedopp"' . ($preselected == 'openedopp' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("OpenedOpportunitiesShort") . '</option>';
-					$sellist .= '<option value="notopenedopp"' . ($preselected == 'notopenedopp' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("NotOpenedOpportunitiesShort") . '</option>';
-					$sellist .= '<option value="none"' . ($preselected == 'none' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("NotAnOpportunityShort") . '</option>';
+					$sellist .= '<option value="all"'.($preselected == 'all' ? ' selected="selected"' : '').'>-- '.$langs->trans("OnlyOpportunitiesShort").'</option>';
+					$sellist .= '<option value="openedopp"'.($preselected == 'openedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("OpenedOpportunitiesShort").'</option>';
+					$sellist .= '<option value="notopenedopp"'.($preselected == 'notopenedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").'</option>';
+					$sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotAnOpportunityShort").'</option>';
 				}
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
-					$sellist .= '<option value="' . $obj->rowid . '" defaultpercent="' . $obj->percent . '" elemcode="' . $obj->code . '"';
+					$sellist .= '<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
 					if ($obj->rowid == $preselected) {
 						$sellist .= ' selected="selected"';
 					}
 					$sellist .= '>';
 					if ($useshortlabel) {
-						$finallabel = ($langs->transnoentitiesnoconv("OppStatus" . $obj->code) != "OppStatus" . $obj->code ? $langs->transnoentitiesnoconv("OppStatus" . $obj->code) : $obj->label);
+						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 					} else {
-						$finallabel = ($langs->transnoentitiesnoconv("OppStatus" . $obj->code) != "OppStatus" . $obj->code ? $langs->transnoentitiesnoconv("OppStatus" . $obj->code) : $obj->label);
+						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 						if ($showpercent) {
-							$finallabel .= ' (' . $obj->percent . '%)';
+							$finallabel .= ' ('.$obj->percent.'%)';
 						}
 					}
 					$sellist .= $finallabel;
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
-			dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
 		if (is_array($selected)) {
 			$selectedarray = $selected;
 		} elseif ($selected == 99) {
-			$selectedarray = array(0,1);
+			$selectedarray = array(0, 1);
 		} else {
 			$selectedarray = explode(',', $selected);
 		}
@@ -810,24 +810,24 @@  discard block
 block discarded – undo
 	{
 		global $user, $conf, $langs;
 
-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		$out = '';
 		if (empty($lineOnly)) {
 			// Search Invoice
 			$sql = "SELECT f.rowid, f.ref as fref,";
 			$sql .= ' s.nom as name';
-			$sql .= ' FROM ' . $this->db->prefix() . 'projet as p';
-			$sql .= ' INNER JOIN ' . $this->db->prefix() . 'societe as s ON s.rowid = p.fk_soc';
-			$sql .= ' INNER JOIN ' . $this->db->prefix() . 'facture as f ON f.fk_projet = p.rowid';
-			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+			$sql .= ' FROM '.$this->db->prefix().'projet as p';
+			$sql .= ' INNER JOIN '.$this->db->prefix().'societe as s ON s.rowid = p.fk_soc';
+			$sql .= ' INNER JOIN '.$this->db->prefix().'facture as f ON f.fk_projet = p.rowid';
+			$sql .= " WHERE p.entity IN (".getEntity('project').")";
 			if (!empty($filters)) {
 				foreach ($filters as $key => $value) {
 					if ($key == 'p.rowid') {
-						$sql .= " AND p.rowid=" . (int) $value;
+						$sql .= " AND p.rowid=".(int) $value;
 					}
 					if ($key == 'f.rowid') {
-						$sql .= " AND f.rowid=" . (int) $value;
+						$sql .= " AND f.rowid=".(int) $value;
 					}
 				}
 			}
@@ -837,26 +837,26 @@  discard block
 block discarded – undo
 			if ($resql) {
 				// Use select2 selector
 				if (!empty($conf->use_javascript_ajax)) {
-					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 					$comboenhancement = ajax_combobox($htmlNameInvoice, array(array('method'=>'getLines', 'url'=>dol_buildpath('/core/ajax/ajaxinvoiceline.php', 1), 'htmlname'=>$htmlNameInvoiceLine)), 0, 0);
 					$out .= $comboenhancement;
 					$morecss = 'minwidth200imp maxwidth500';
 				}
 
-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlNameInvoice . '" name="' . $htmlNameInvoice . '">';
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlNameInvoice.'" name="'.$htmlNameInvoice.'">';
 				$num = $this->db->num_rows($resql);
 				if ($num) {
 					while ($obj = $this->db->fetch_object($resql)) {
 						$labeltoshow = $obj->fref; // Invoice ref
 						if ($obj->name) {
-							$labeltoshow .= ' - ' . $obj->name;
+							$labeltoshow .= ' - '.$obj->name;
 						}
 
-						$out .= '<option value="' . $obj->rowid . '" ';
+						$out .= '<option value="'.$obj->rowid.'" ';
 						if (!empty($selectedInvoiceId) && $selectedInvoiceId == $obj->rowid) {
 							$out .= ' selected ';
 						}
-						$out .= '>' . $labeltoshow . '</option>';
+						$out .= '>'.$labeltoshow.'</option>';
 					}
 				}
 				$out .= '</select>';
@@ -868,20 +868,20 @@  discard block
 block discarded – undo
 
 		// Search Invoice Line
 		$sql = "SELECT fd.rowid, fd.label, fd.description";
-		$sql .= ' FROM ' . $this->db->prefix() . 'projet as p';
-		$sql .= ' INNER JOIN ' . $this->db->prefix() . 'societe as s ON s.rowid = p.fk_soc';
-		$sql .= ' INNER JOIN ' . $this->db->prefix() . 'facture as f ON f.fk_projet = p.rowid';
-		$sql .= ' INNER JOIN ' . $this->db->prefix() . 'facturedet as fd ON fd.fk_facture = f.rowid';
-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+		$sql .= ' FROM '.$this->db->prefix().'projet as p';
+		$sql .= ' INNER JOIN '.$this->db->prefix().'societe as s ON s.rowid = p.fk_soc';
+		$sql .= ' INNER JOIN '.$this->db->prefix().'facture as f ON f.fk_projet = p.rowid';
+		$sql .= ' INNER JOIN '.$this->db->prefix().'facturedet as fd ON fd.fk_facture = f.rowid';
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		if (!empty($filters)) {
 			foreach ($filters as $key => $value) {
 				if ($key == 'p.rowid') {
-					$sql .= " AND p.rowid=" . (int) $value;
+					$sql .= " AND p.rowid=".(int) $value;
 				}
 			}
 		}
 		if (!empty($selectedInvoiceId)) {
-			$sql .= " AND f.rowid=" . (int) $selectedInvoiceId;
+			$sql .= " AND f.rowid=".(int) $selectedInvoiceId;
 		}
 		$sql .= " ORDER BY p.ref, f.ref ASC";
 		$resql = $this->db->query($sql);
@@ -889,24 +889,24 @@  discard block
 block discarded – undo
 			// Use select2 selector
 			if (empty($lineOnly)) {
 				if (!empty($conf->use_javascript_ajax)) {
-					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 					$comboenhancement = ajax_combobox($htmlNameInvoiceLine, '', 0, 0);
 					$out .= $comboenhancement;
 					$morecss = 'minwidth200imp maxwidth500';
 				}
 
-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlNameInvoiceLine . '" name="' . $htmlNameInvoiceLine . '">';
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlNameInvoiceLine.'" name="'.$htmlNameInvoiceLine.'">';
 			}
 			$num = $this->db->num_rows($resql);
 			if ($num) {
 				while ($obj = $this->db->fetch_object($resql)) {
 					$labeltoshow .= $obj->description; // Invoice ref
 
-					$out .= '<option value="' . $obj->rowid . '" ';
+					$out .= '<option value="'.$obj->rowid.'" ';
 					if (!empty($selectedLineId) && $selectedLineId == $obj->rowid) {
 						$out .= ' selected ';
 					}
-					$out .= '>' . $labeltoshow . '</option>';
+					$out .= '>'.$labeltoshow.'</option>';
 				}
 			}
 			if (empty($lineOnly)) {

Please login to merge, or discard this patch.

		@@ -100,10 +100,10 @@ discard block
		block discarded – undo
100	100	function dolGetRandomBytes($length)
101	101	{
102	102	if (function_exists('random_bytes')) { // Available with PHP 7 only.
103		- return bin2hex(random_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2
	103	+ return bin2hex(random_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2
104	104	}
105	105
106		- return bin2hex(openssl_random_pseudo_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.
	106	+ return bin2hex(openssl_random_pseudo_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.
107	107	}
108	108
109	109	/**
		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282	global $conf;
283	283
284	284	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
285		- if (! empty($hash[0]) && $hash[0] == '$') {
	285	+ if (!empty($hash[0]) && $hash[0] == '$') {
286	286	return password_verify($chain, $hash);
287	287	} elseif (dol_strlen($hash) == 32) {
288	288	return dol_verifyHash($chain, $hash, '3'); // md5
		@@ -312,31 +312,31 @@ discard block
		block discarded – undo
312	312	$salt = substr(sha1(time()), 0, 8);
313	313
314	314	if ($type === 'md5') {
315		- return '{MD5}' . base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)
	315	+ return '{MD5}'.base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)
316	316	} elseif ($type === 'md5frommd5') {
317		- return '{MD5}' . base64_encode(hex2bin($password)); // Create OpenLDAP MD5 password from Dolibarr MD5 password
	317	+ return '{MD5}'.base64_encode(hex2bin($password)); // Create OpenLDAP MD5 password from Dolibarr MD5 password
318	318	} elseif ($type === 'smd5') {
319		- return "{SMD5}" . base64_encode(hash("md5", $password . $salt, true) . $salt);
	319	+ return "{SMD5}".base64_encode(hash("md5", $password.$salt, true).$salt);
320	320	} elseif ($type === 'sha') {
321		- return '{SHA}' . base64_encode(hash("sha1", $password, true));
	321	+ return '{SHA}'.base64_encode(hash("sha1", $password, true));
322	322	} elseif ($type === 'ssha') {
323		- return "{SSHA}" . base64_encode(hash("sha1", $password . $salt, true) . $salt);
	323	+ return "{SSHA}".base64_encode(hash("sha1", $password.$salt, true).$salt);
324	324	} elseif ($type === 'sha256') {
325		- return "{SHA256}" . base64_encode(hash("sha256", $password, true));
	325	+ return "{SHA256}".base64_encode(hash("sha256", $password, true));
326	326	} elseif ($type === 'ssha256') {
327		- return "{SSHA256}" . base64_encode(hash("sha256", $password . $salt, true) . $salt);
	327	+ return "{SSHA256}".base64_encode(hash("sha256", $password.$salt, true).$salt);
328	328	} elseif ($type === 'sha384') {
329		- return "{SHA384}" . base64_encode(hash("sha384", $password, true));
	329	+ return "{SHA384}".base64_encode(hash("sha384", $password, true));
330	330	} elseif ($type === 'ssha384') {
331		- return "{SSHA384}" . base64_encode(hash("sha384", $password . $salt, true) . $salt);
	331	+ return "{SSHA384}".base64_encode(hash("sha384", $password.$salt, true).$salt);
332	332	} elseif ($type === 'sha512') {
333		- return "{SHA512}" . base64_encode(hash("sha512", $password, true));
	333	+ return "{SHA512}".base64_encode(hash("sha512", $password, true));
334	334	} elseif ($type === 'ssha512') {
335		- return "{SSHA512}" . base64_encode(hash("sha512", $password . $salt, true) . $salt);
	335	+ return "{SSHA512}".base64_encode(hash("sha512", $password.$salt, true).$salt);
336	336	} elseif ($type === 'crypt') {
337		- return '{CRYPT}' . crypt($password, $salt);
	337	+ return '{CRYPT}'.crypt($password, $salt);
338	338	} elseif ($type === 'clear') {
339		- return '{CLEAR}' . $password; // Just for test, plain text password is not secured !
	339	+ return '{CLEAR}'.$password; // Just for test, plain text password is not secured !
340	340	}
341	341	return "";
342	342	}
		@@ -370,13 +370,13 @@ discard block
		block discarded – undo
370	370	if (is_object($object)) {
371	371	$objectid = $object->id;
372	372	} else {
373		- $objectid = $object; // $objectid can be X or 'X,Y,Z'
	373	+ $objectid = $object; // $objectid can be X or 'X,Y,Z'
374	374	}
375	375	if ($objectid == "-1") {
376	376	$objectid = 0;
377	377	}
378	378	if ($objectid) {
379		- $objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
	379	+ $objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
380	380	}
381	381
382	382	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
		@@ -853,9 +853,9 @@ discard block
		block discarded – undo
853	853	if (is_object($object)) {
854	854	$objectid = $object->id;
855	855	} else {
856		- $objectid = $object; // $objectid can be X or 'X,Y,Z'
	856	+ $objectid = $object; // $objectid can be X or 'X,Y,Z'
857	857	}
858		- $objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
	858	+ $objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
859	859
860	860	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
861	861	//print "user_id=".$user->id.", features=".join(',', $featuresarray).", objectid=".$objectid;
		@@ -902,8 +902,8 @@ discard block
		block discarded – undo
902	902	$checkparentsoc = array('agenda', 'contact', 'contrat'); // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).
903	903	$checkproject = array('projet', 'project'); // Test for project object
904	904	$checktask = array('projet_task'); // Test for task object
905		- $checkhierarchy = array('expensereport', 'holiday'); // check permission among the hierarchy of user
906		- $checkuser = array('bookmark'); // check permission among the fk_user (must be myself or null)
	905	+ $checkhierarchy = array('expensereport', 'holiday'); // check permission among the hierarchy of user
	906	+ $checkuser = array('bookmark'); // check permission among the fk_user (must be myself or null)
907	907	$nocheck = array('barcode', 'stock'); // No test
908	908
909	909	//$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).
		@@ -916,7 +916,7 @@ discard block
		block discarded – undo
916	916
917	917	// To avoid an access forbidden with a numeric ref
918	918	if ($dbt_select != 'rowid' && $dbt_select != 'id') {
919		- $objectid = "'".$objectid."'"; // Note: $objectid was already cast into int at begin of this method.
	919	+ $objectid = "'".$objectid."'"; // Note: $objectid was already cast into int at begin of this method.
920	920	}
921	921	// Check permission for objectid on entity only
922	922	if (in_array($feature, $check) && $objectid > 0) { // For $objectid = 0, no check

Dolibarr / dolibarr

Branch — develop (3700b0)

Status

Category

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

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