Dolibarr / dolibarr

htdocs/admin/chequereceipts.php

Spacing +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 							print '</td>'."\n";
 
 							print '<td class="center">';
-							if (getDolGlobalString('CHEQUERECEIPTS_ADDON') == $file || getDolGlobalString('CHEQUERECEIPTS_ADDON') . '.php' == $file) {
+							if (getDolGlobalString('CHEQUERECEIPTS_ADDON') == $file || getDolGlobalString('CHEQUERECEIPTS_ADDON').'.php' == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';

htdocs/comm/card.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
@@ -311,7 +311,7 @@ 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
 		$object->fetch($id);
 
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -418,7 +418,7 @@ 
 					if ($object->accountancy_code_customer_general > 0) {
 						print ' - ';
 					}
-					$accountingAccountByDefault = '<span class="opacitymedium">' . $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER')) . '</span>';
+					$accountingAccountByDefault = '<span class="opacitymedium">'.$langs->trans("AccountingAccountByDefaultShort").": ".length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER')).'</span>';
 					print $accountingAccountByDefault;
 				}
 			}
@@ -928,7 +928,7 @@ 
 				print '<td class="nowraponall">';
 				$propal_static->id = $objp->propalid;
 				$propal_static->ref = $objp->ref;
-				$propal_static->ref_client = $objp->ref_client;	// deprecated
+				$propal_static->ref_client = $objp->ref_client; // deprecated
 				$propal_static->ref_customer = $objp->ref_client;
 				$propal_static->fk_project = $objp->fk_projet;
 				$propal_static->total_ht = $objp->total_ht;
@@ -1251,7 +1251,7 @@ 
 				$contrat->ref_customer = $objp->refcus;
 				$contrat->ref_supplier = $objp->refsup;
 				$contrat->fk_project = $objp->fk_projet;
-				$contrat->statut = $objp->contract_status;	// deprecated
+				$contrat->statut = $objp->contract_status; // deprecated
 				$contrat->status = $objp->contract_status;
 				$contrat->last_main_doc = $objp->last_main_doc;
 				$contrat->model_pdf = $objp->model_pdf;
@@ -1364,7 +1364,7 @@ 
 
 				$fichinter_static->id = $objp->id;
 				$fichinter_static->ref = $objp->ref;
-				$fichinter_static->statut = $objp->fk_statut;	// deprecated
+				$fichinter_static->statut = $objp->fk_statut; // deprecated
 				$fichinter_static->status = $objp->fk_statut;
 				$fichinter_static->fk_project = $objp->fk_projet;
 
@@ -1589,7 +1589,7 @@ 
 				$facturestatic->total_ht = $objp->total_ht;
 				$facturestatic->total_tva = $objp->total_tva;
 				$facturestatic->total_ttc = $objp->total_ttc;
-				$facturestatic->statut = $objp->status;	// deprecated
+				$facturestatic->statut = $objp->status; // deprecated
 				$facturestatic->status = $objp->status;
 				$facturestatic->paye = $objp->paye;
 

htdocs/salaries/card.php

Spacing +15 added lines, -15 removed lines

@@ -314,9 +314,9 @@ 
 			// Create a line of payments
 			$paiement = new PaymentSalary($db);
 			$paiement->fk_salary    = $object->id;
-			$paiement->chid         = $object->id;	// deprecated
+			$paiement->chid         = $object->id; // deprecated
 			$paiement->datep        = $datep;
-			$paiement->datev		= $datev;
+			$paiement->datev = $datev;
 			$paiement->amounts      = array($object->id => $amount); // Tableau de montant
 			$paiement->fk_typepayment = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
@@ -345,10 +345,10 @@ 
 
 			if (GETPOST('saveandnew', 'alpha')) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				header("Location: card.php?action=create&fk_project=" . urlencode((string) ($projectid)) . "&accountid=" . urlencode((string) ($accountid)) . '&paymenttype=' . urlencode((string) (GETPOSTINT('paymenttype'))) . '&datepday=' . GETPOSTINT("datepday") . '&datepmonth=' . GETPOSTINT("datepmonth") . '&datepyear=' . GETPOSTINT("datepyear"));
+				header("Location: card.php?action=create&fk_project=".urlencode((string) ($projectid))."&accountid=".urlencode((string) ($accountid)).'&paymenttype='.urlencode((string) (GETPOSTINT('paymenttype'))).'&datepday='.GETPOSTINT("datepday").'&datepmonth='.GETPOSTINT("datepmonth").'&datepyear='.GETPOSTINT("datepyear"));
 				exit;
 			} else {
-				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id);
 				exit;
 			}
 		} else {
@@ -638,7 +638,7 @@ 
 
 	// Auto create payment
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";	// Date payment
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_paiement) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; // Date payment
 
 	// Bank
 	if (isModEnabled("bank")) {
@@ -906,10 +906,10 @@ 
 			$userstatic = new User($db);
 			$result = $userstatic->fetch($object->fk_user);
 			if ($result > 0) {
-				$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
+				$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 			}
 		} else {
-			$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1);
+			$morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1);
 
 			if (!empty($object->fk_user)) {
 				$userstatic = new User($db);
@@ -961,7 +961,7 @@ 
 	$totalpaid = $object->getSommePaiement();
 
 	$object->totalpaid = $totalpaid;
-	$object->alreadypaid = $totalpaid;	// Same then $totalpaid because there is no amount of credit note or deposits for salary payments.
+	$object->alreadypaid = $totalpaid; // Same then $totalpaid because there is no amount of credit note or deposits for salary payments.
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
@@ -977,7 +977,7 @@ 
 		print "</td></tr>";
 	} else {
 		print "<tr>";
-		print '<td class="titlefieldmiddle">' . $langs->trans("DateStartPeriod") . '</td><td>';
+		print '<td class="titlefieldmiddle">'.$langs->trans("DateStartPeriod").'</td><td>';
 		print dol_print_date($object->datesp, 'day');
 		print '</td></tr>';
 	}
@@ -988,7 +988,7 @@ 
 		print "</td></tr>";
 	} else {
 		print "<tr>";
-		print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>';
+		print '<td>'.$langs->trans("DateEndPeriod").'</td><td>';
 		print dol_print_date($object->dateep, 'day');
 		print '</td></tr>';
 	}
@@ -1003,9 +1003,9 @@ 
 	print '</td></tr>';*/
 
 	if ($action == 'edit') {
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 	}
 
 	// Default mode of payment
@@ -1191,7 +1191,7 @@ 
 			if (empty($user->socid)) {
 				$canSendMail = true;
 
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
 			}
 		}
 
@@ -1207,12 +1207,12 @@ 
 
 		// Transfer request
 		if ($object->status == $object::STATUS_UNPAID && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $permissiontoadd) {
-			print dolGetButtonAction('', $langs->trans('MakeTransferRequest'), 'default', DOL_URL_ROOT . '/salaries/virement_request.php?id=' . $object->id, '');
+			print dolGetButtonAction('', $langs->trans('MakeTransferRequest'), 'default', DOL_URL_ROOT.'/salaries/virement_request.php?id='.$object->id, '');
 		}
 
 		// Emit payment
 		if ($object->status == $object::STATUS_UNPAID && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $permissiontoadd) {
-			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, '');
+			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='.$object->id, '');
 		}
 
 		// Classify 'paid'

htdocs/salaries/class/salary.class.php

Spacing +7 added lines, -7 removed lines

@@ -93,7 +93,7 @@ 
 	/**
 	 * @var int
 	 */
-	public $type_payment;	// TODO Rename into type_payment_id
+	public $type_payment; // TODO Rename into type_payment_id
 	/**
 	 * @var string
 	 */
@@ -167,7 +167,7 @@ 
 		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 12, 'notnull' => 0, 'visible' => 1),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => 0, 'position' => 30),
 		'datep' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 0, 'position' => 40, 'comment' => 'Date'),
-		'datev' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 0,  'position' => 50, 'comment' => 'Date'),
+		'datev' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 0, 'position' => 50, 'comment' => 'Date'),
 		'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Employee', 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'visible' => 1, 'picto' => 'user'),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 20),
 		'salary' => array('type' => 'double(24,8)', 'label' => 'salary', 'enabled' => 1, 'visible' => 0, 'position' => 70),
@@ -334,10 +334,10 @@ 
 				$this->datesp			= $this->db->jdate($obj->datesp);
 				$this->dateep			= $this->db->jdate($obj->dateep);
 				$this->note				= $obj->note_private;
-				$this->note_private		= $obj->note_private;
-				$this->note_public		= $obj->note_public;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
 				$this->paye 			= $obj->paye;
-				$this->status 			= $obj->paye;
+				$this->status = $obj->paye;
 				$this->fk_bank          = $obj->fk_bank;
 				$this->fk_user_author   = $obj->fk_user_author;
 				$this->fk_user_modif    = $obj->fk_user_modif;
@@ -682,11 +682,11 @@ 
 					//$this->totalpaid = $obj->amount;
 					//$this->totalpaid_multicurrency = $obj->multicurrency_amount;
 					//return array('alreadypaid'=>(float) $obj->amount, 'alreadypaid_multicurrency'=>(float) $obj->multicurrency_amount);
-					return array();	// Not yet supported
+					return array(); // Not yet supported
 				} elseif ($multicurrency) {
 					//$this->totalpaid_multicurrency = $obj->multicurrency_amount;
 					//return (float) $obj->multicurrency_amount;
-					return -1;		// Not yet supported
+					return -1; // Not yet supported
 				} else {
 					//$this->totalpaid = $obj->amount;
 					return (float) $obj->amount;

htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php

Spacing +4 added lines, -4 removed lines

@@ -80,10 +80,10 @@ 
 		$errors = 0;
 		$errorforhistory = 0;
 		$static_object = new Target($this->db);
-		$target_url = $static_object->fetchAll();	// TODO Replace this with a search with filter on $action trigger to avoid to filter later.
+		$target_url = $static_object->fetchAll(); // TODO Replace this with a search with filter on $action trigger to avoid to filter later.
 
 		if (is_numeric($target_url) && $target_url < 0) {
-			dol_syslog("Error Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Error Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$this->errors = array_merge($this->errors, $static_object->errors);
 			return -1;
 		}
@@ -140,7 +140,7 @@ 
 					$nbPosts++;
 				} else {
 					$errormsg = "The WebHook for ".$action." failed to get URL ".$tmpobject->url." with httpcode=".(!empty($response['http_code']) ? $response['http_code'] : "")." curl_error_no=".(!empty($response['curl_error_no']) ? $response['curl_error_no'] : "");
-					$errorforhistory ++;
+					$errorforhistory++;
 
 					if ($tmpobject->type == Target::TYPE_BLOCKING) {
 						$errors++;
@@ -170,7 +170,7 @@ 
 			}
 		}
 
-		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id." -> nbPost=".$nbPosts);
+		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id." -> nbPost=".$nbPosts);
 
 		if (!empty($errors)) {
 			return $errors * -1;

htdocs/core/lib/security.lib.php

Spacing +24 added lines, -24 removed lines

@@ -102,10 +102,10 @@ 
 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.
 }
 
 
@@ -270,7 +270,7 @@ 
 
 	// Salt value
 	if (getDolGlobalString('MAIN_SECURITY_SALT') && $type != '4' && $type !== 'openldap' && empty($nosalt)) {
-		$chain = getDolGlobalString('MAIN_SECURITY_SALT') . $chain;
+		$chain = getDolGlobalString('MAIN_SECURITY_SALT').$chain;
 	}
 
 	if ($type == '1' || $type == 'sha1') {
@@ -347,7 +347,7 @@ 
 {
 	if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {
 		// Try to autodetect which algo we used
-		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
@@ -377,31 +377,31 @@ 
 	$salt = substr(sha1((string) 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 "";
 }
@@ -434,13 +434,13 @@ 
 	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\.\,]/', '', (string) $objectid);	// For the case value is coming from a non sanitized user input
+		$objectid = preg_replace('/[^0-9\.\,]/', '', (string) $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");
@@ -946,9 +946,9 @@ 
 	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;
@@ -998,8 +998,8 @@ 
 		$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', 'webhook'); // 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...).
@@ -1012,7 +1012,7 @@ 
 
 		// 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

htdocs/core/class/commoninvoice.class.php

Spacing +80 added lines, -80 removed lines

@@ -275,7 +275,7 @@ 
 	const CLOSECODE_DISCOUNTVAT = 'discount_vat'; // Abandoned remain - escompte
 	const CLOSECODE_BADDEBT = 'badcustomer'; // Abandoned remain - bad customer
 	const CLOSECODE_BANKCHARGE = 'bankcharge'; // Abandoned remain - bank charge
-	const CLOSECODE_WITHHOLDINGTAX = 'withholdingtax';	// Abandoned remain - source tax
+	const CLOSECODE_WITHHOLDINGTAX = 'withholdingtax'; // Abandoned remain - source tax
 	const CLOSECODE_OTHER = 'other'; // Abandoned remain - other
 
 	const CLOSECODE_ABANDONED = 'abandon'; // Abandoned - other
@@ -572,7 +572,7 @@ 
 	public function getListOfPayments($filtertype = '', $multicurrency = 0, $mode = 0)
 	{
 		$retarray = array();
-		$this->error = '';	// By default no error, list can be empty.
+		$this->error = ''; // By default no error, list can be empty.
 
 		$table = 'paiement_facture';
 		$table2 = 'paiement';
@@ -592,7 +592,7 @@ 
 
 		// List of payments
 		if (empty($mode) || $mode == 1) {
-			$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3 . $field4;
+			$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3.$field4;
 			$sql .= " FROM ".$this->db->prefix().$table." as pf, ".$this->db->prefix().$table2." as p, ".$this->db->prefix()."c_paiement as t";
 			$sql .= " WHERE pf.".$field." = ".((int) $this->id);
 			$sql .= " AND pf.".$field2." = p.rowid";
@@ -850,12 +850,12 @@ 
 	{
 		$subtypeLabel = '';
 		if ($table === 'facture' || $table === 'facture_fourn') {
-			$sql = "SELECT s.label FROM " . $this->db->prefix() . $table . " AS f";
-			$sql .= " INNER JOIN " . $this->db->prefix() . "c_invoice_subtype AS s ON f.subtype = s.rowid";
+			$sql = "SELECT s.label FROM ".$this->db->prefix().$table." AS f";
+			$sql .= " INNER JOIN ".$this->db->prefix()."c_invoice_subtype AS s ON f.subtype = s.rowid";
 			$sql .= " WHERE f.ref = '".$this->db->escape($this->ref)."'";
 		} elseif ($table === 'facture_rec' || $table === 'facture_fourn_rec') {
-			$sql = "SELECT s.label FROM " . $this->db->prefix() . $table . " AS f";
-			$sql .= " INNER JOIN " . $this->db->prefix() . "c_invoice_subtype AS s ON f.subtype = s.rowid";
+			$sql = "SELECT s.label FROM ".$this->db->prefix().$table." AS f";
+			$sql .= " INNER JOIN ".$this->db->prefix()."c_invoice_subtype AS s ON f.subtype = s.rowid";
 			$sql .= " WHERE f.titre = '".$this->db->escape($this->title)."'";
 		} else {
 			return -1;
@@ -887,11 +887,11 @@ 
 		$effs = array();
 
 		$sql = "SELECT rowid, code, label as label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . 'c_invoice_subtype';
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_invoice_subtype';
 		$sql .= " WHERE active = 1 AND fk_country = ".((int) $mysoc->country_id)." AND entity IN(".getEntity('c_invoice_subtype').")";
 		$sql .= " ORDER by rowid, code";
 
-		dol_syslog(get_class($this) . '::getArrayOfInvoiceSubtypes', LOG_DEBUG);
+		dol_syslog(get_class($this).'::getArrayOfInvoiceSubtypes', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -1329,7 +1329,7 @@ 
 		if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {
 			// Get the default payment mode for BAN payment of the third party
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-			$bac = new CompanyBankAccount($this->db);	// Table societe_rib
+			$bac = new CompanyBankAccount($this->db); // Table societe_rib
 			$result = $bac->fetch(0, '', $this->socid, 1, 'ban');
 			if ($result <= 0 || empty($bac->id)) {
 				$this->error = $langs->trans("ThirdpartyHasNoDefaultBanAccount");
@@ -1343,16 +1343,16 @@ 
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
 			$sql .= " WHERE rowid = ".((int) $did);
 			if ($type != 'bank-transfer' && $type != 'credit-transfer') {
-				$sql .= " AND fk_facture = ".((int) $this->id);				// Add a protection to not pay another invoice than current one
+				$sql .= " AND fk_facture = ".((int) $this->id); // Add a protection to not pay another invoice than current one
 			}
 			if ($type != 'direct-debit') {
 				if ($sourcetype == 'salary') {
-					$sql .= " AND fk_salary = ".((int) $this->id);			// Add a protection to not pay another salary than current one
+					$sql .= " AND fk_salary = ".((int) $this->id); // Add a protection to not pay another salary than current one
 				} else {
-					$sql .= " AND fk_facture_fourn = ".((int) $this->id);	// Add a protection to not pay another invoice than current one
+					$sql .= " AND fk_facture_fourn = ".((int) $this->id); // Add a protection to not pay another invoice than current one
 				}
 			}
-			$sql .= " AND traite = 0";	// To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
+			$sql .= " AND traite = 0"; // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
 
 			dol_syslog(get_class($this)."::makeStripeSepaRequest load requests to process", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1368,7 +1368,7 @@ 
 
 				if (is_numeric($amount) && $amount != 0) {
 					require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
-					$companypaymentmode = new CompanyPaymentMode($this->db);	// table societe_rib
+					$companypaymentmode = new CompanyPaymentMode($this->db); // table societe_rib
 					$companypaymentmode->fetch($bac->id);
 
 					$this->stripechargedone = 0;
@@ -1378,11 +1378,11 @@ 
 
 					$currency = $conf->currency;
 
-					$errorforinvoice = 0;     // We reset the $errorforinvoice at each invoice loop
+					$errorforinvoice = 0; // We reset the $errorforinvoice at each invoice loop
 
 					$this->fetch_thirdparty();
 
-					dol_syslog("makeStripeSepaRequest Process payment request amount=".$amount." thirdparty_id=" . $this->thirdparty->id . ", thirdparty_name=" . $this->thirdparty->name . " ban id=" . $bac->id, LOG_DEBUG);
+					dol_syslog("makeStripeSepaRequest Process payment request amount=".$amount." thirdparty_id=".$this->thirdparty->id.", thirdparty_name=".$this->thirdparty->name." ban id=".$bac->id, LOG_DEBUG);
 
 					//$alreadypayed = $this->getSommePaiement();
 					//$amount_credit_notes_included = $this->getSumCreditNotesUsed();
@@ -1397,7 +1397,7 @@ 
 						$amountstripe *= 100;
 					}
 
-					$fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');		// Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
+					$fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'); // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
 					if (!($fk_bank_account > 0)) {
 						$error++;
 						$errorforinvoice++;
@@ -1458,44 +1458,44 @@ 
 								}
 
 								//var_dump($companypaymentmode);
-								dol_syslog("makeStripeSepaRequest We will try to pay with companypaymentmodeid=" . $companypaymentmode->id . " stripe_card_ref=" . $companypaymentmode->stripe_card_ref . " mode=" . $companypaymentmode->status, LOG_DEBUG);
+								dol_syslog("makeStripeSepaRequest We will try to pay with companypaymentmodeid=".$companypaymentmode->id." stripe_card_ref=".$companypaymentmode->stripe_card_ref." mode=".$companypaymentmode->status, LOG_DEBUG);
 
 								$thirdparty = new Societe($this->db);
 								$resultthirdparty = $thirdparty->fetch($this->socid);
 
-								include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php
+								include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; // This include the include of htdocs/stripe/config.php
 								// So it inits or erases the $stripearrayofkeysbyenv
 								$stripe = new Stripe($this->db);
 
 								if (empty($savstripearrayofkeysbyenv)) {
 									$savstripearrayofkeysbyenv = $stripearrayofkeysbyenv;
 								}
-								dol_syslog("makeStripeSepaRequest Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
+								dol_syslog("makeStripeSepaRequest Current Stripe environment is ".$stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
 								dol_syslog("makeStripeSepaRequest Current Saved Stripe environment is ".$savstripearrayofkeysbyenv[$servicestatus]['publishable_key']);
 
 								$foundalternativestripeaccount = '';
 
 								// Force stripe to another value (by default this value is empty)
-								if (! empty($forcestripe)) {
+								if (!empty($forcestripe)) {
 									dol_syslog("makeStripeSepaRequest A dedicated stripe account was forced, so we switch to it.");
 
 									$tmparray = explode('@', $forcestripe);
-									if (! empty($tmparray[1])) {
+									if (!empty($tmparray[1])) {
 										$tmparray2 = explode(':', $tmparray[1]);
-										if (! empty($tmparray2[1])) {
+										if (!empty($tmparray2[1])) {
 											$stripearrayofkeysbyenv[$servicestatus]["publishable_key"] = $tmparray2[0];
 											$stripearrayofkeysbyenv[$servicestatus]["secret_key"] = $tmparray2[1];
 
 											$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
 											\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 
-											$foundalternativestripeaccount = $tmparray[0];    // Store the customer id
+											$foundalternativestripeaccount = $tmparray[0]; // Store the customer id
 
 											dol_syslog("makeStripeSepaRequest We use now customer=".$foundalternativestripeaccount." publishable_key=".$stripearrayofkeys['publishable_key'], LOG_DEBUG);
 										}
 									}
 
-									if (! $foundalternativestripeaccount) {
+									if (!$foundalternativestripeaccount) {
 										$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;
 
 										$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];
@@ -1510,7 +1510,7 @@ 
 									dol_syslog("makeStripeSepaRequest No dedicated Stripe Account requested, so we use global one, so ".$stripearrayofkeys['publishable_key'], LOG_DEBUG);
 								}
 
-								$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)
+								$stripeacc = $stripe->getStripeAccount($service, $this->socid); // Get Stripe OAuth connect account if it exists (no network access here)
 
 								if ($foundalternativestripeaccount) {
 									if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
@@ -1520,7 +1520,7 @@ 
 									}
 								} else {
 									$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
-									if (empty($customer) && ! empty($stripe->error)) {
+									if (empty($customer) && !empty($stripe->error)) {
 										$this->error = $stripe->error;
 										$this->errors[] = $this->error;
 									}
@@ -1549,15 +1549,15 @@ 
 										}
 
 										if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
-											$FULLTAG = 'DID='.$did.'-INV=' . $this->id . '-CUS=' . $thirdparty->id;
-											$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' did='.$did.' ref=' . $this->ref;
+											$FULLTAG = 'DID='.$did.'-INV='.$this->id.'-CUS='.$thirdparty->id;
+											$description = 'Stripe payment from makeStripeSepaRequest: '.$FULLTAG.' did='.$did.' ref='.$this->ref;
 
 											$stripefailurecode = '';
 											$stripefailuremessage = '';
 											$stripefailuredeclinecode = '';
 
 											// Using new SCA method
-											dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+											dol_syslog("* Create payment on SEPA ".$stripecard->id.", amounttopay=".$amounttopay.", amountstripe=".$amountstripe.", FULLTAG=".$FULLTAG, LOG_DEBUG);
 
 											// Create payment intent and charge payment (confirmnow = true)
 											$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1, 1, $did);
@@ -1578,7 +1578,7 @@ 
 												$charge->failure_message = $stripe->error;
 												$charge->failure_declinecode = $stripe->declinecode;
 												$stripefailurecode = $stripe->code;
-												$stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
+												$stripefailuremessage = 'Action required. Contact the support at '; // . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
 												$stripefailuredeclinecode = $stripe->declinecode;
 											} else {
 												dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
@@ -1599,7 +1599,7 @@ 
 
 											// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
 											if (empty($charge) || $charge->status == 'failed') {
-												dol_syslog('Failed to charge payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
+												dol_syslog('Failed to charge payment mode '.$stripecard->id.' stripefailurecode='.$stripefailurecode.' stripefailuremessage='.$stripefailuremessage.' stripefailuredeclinecode='.$stripefailuredeclinecode, LOG_WARNING);
 
 												// Save a stripe payment was in error
 												$this->stripechargeerror++;
@@ -1612,8 +1612,8 @@ 
 														$errauthenticationmessage = $langs->trans("ErrSCAAuthentication");
 														$errmsg = $errauthenticationmessage;
 													} elseif (in_array($stripefailuredeclinecode, ['insufficient_funds', 'generic_decline'])) {
-														$errmsg .= ': ' . $charge->failure_code;
-														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' ' . $charge->failure_message;
+														$errmsg .= ': '.$charge->failure_code;
+														$errmsg .= ($charge->failure_message ? ' - ' : '').' '.$charge->failure_message;
 														if (empty($stripefailurecode)) {
 															$stripefailurecode = $charge->failure_code;
 														}
@@ -1621,8 +1621,8 @@ 
 															$stripefailuremessage = $charge->failure_message;
 														}
 													} else {
-														$errmsg .= ': failure_code=' . $charge->failure_code;
-														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' failure_message=' . $charge->failure_message;
+														$errmsg .= ': failure_code='.$charge->failure_code;
+														$errmsg .= ($charge->failure_message ? ' - ' : '').' failure_message='.$charge->failure_message;
 														if (empty($stripefailurecode)) {
 															$stripefailurecode = $charge->failure_code;
 														}
@@ -1631,26 +1631,26 @@ 
 														}
 													}
 												} else {
-													$errmsg .= ': ' . $stripefailurecode . ' - ' . $stripefailuremessage;
-													$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');
+													$errmsg .= ': '.$stripefailurecode.' - '.$stripefailuremessage;
+													$errmsg .= ($stripefailuredeclinecode ? ' - '.$stripefailuredeclinecode : '');
 												}
 
-												$description = 'Stripe payment ERROR from makeStripeSepaRequest: ' . $FULLTAG;
-												$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
+												$description = 'Stripe payment ERROR from makeStripeSepaRequest: '.$FULLTAG;
+												$postactionmessages[] = $errmsg.' ('.$stripearrayofkeys['publishable_key'].')';
 
 												$this->error = $errmsg;
 												$this->errors[] = $this->error;
 											} else {
 												dol_syslog('Successfuly request '.$type.' '.$stripecard->id);
 
-												$postactionmessages[] = 'Success to request '.$type.' (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+												$postactionmessages[] = 'Success to request '.$type.' ('.$charge->id.' with '.$stripearrayofkeys['publishable_key'].')';
 
 												// Save a stripe payment was done in real life so later we will be able to force a commit on recorded payments
 												// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
 												$this->stripechargedone++;
 
 												// Default description used for label of event. Will be overwrite by another value later.
-												$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
+												$description = 'Stripe payment request OK ('.$charge->id.') from makeStripeSepaRequest: '.$FULLTAG;
 											}
 
 											$object = $this;
@@ -1659,8 +1659,8 @@ 
 											if (empty($charge) || $charge->status == 'failed') {
 												$actioncode = 'PAYMENT_STRIPE_KO';
 												$extraparams = $stripefailurecode;
-												$extraparams .= (($extraparams && $stripefailuremessage) ? ' - ' : '') . $stripefailuremessage;
-												$extraparams .= (($extraparams && $stripefailuredeclinecode) ? ' - ' : '') . $stripefailuredeclinecode;
+												$extraparams .= (($extraparams && $stripefailuremessage) ? ' - ' : '').$stripefailuremessage;
+												$extraparams .= (($extraparams && $stripefailuredeclinecode) ? ' - ' : '').$stripefailuredeclinecode;
 											} else {
 												$actioncode = 'PAYMENT_STRIPE_OK';
 												$extraparams = array();
@@ -1668,15 +1668,15 @@ 
 										} else {
 											$error++;
 											$errorforinvoice++;
-											dol_syslog("No ban payment method found for this stripe customer " . $customer->id, LOG_WARNING);
+											dol_syslog("No ban payment method found for this stripe customer ".$customer->id, LOG_WARNING);
 
-											$this->error = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
+											$this->error = 'Failed to get direct debit payment method for stripe customer = '.$customer->id;
 											$this->errors[] = $this->error;
 
 											$description = 'Failed to find or use the payment mode - no ban defined for the thirdparty account';
 											$stripefailurecode = 'BADPAYMENTMODE';
 											$stripefailuremessage = 'Failed to find or use the payment mode - no ban defined for the thirdparty account';
-											$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';
+											$postactionmessages[] = $description.' ('.$stripearrayofkeys['publishable_key'].')';
 
 											$object = $this;
 
@@ -1696,12 +1696,12 @@ 
 									}
 								} else {	// Else of the   if ($resultthirdparty > 0 && ! empty($customer)) {
 									if ($resultthirdparty <= 0) {
-										dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = ' . $thirdparty->id, LOG_WARNING);
-										$this->error = 'Failed to load Stripe account for thirdparty_id = ' . $thirdparty->id;
+										dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = '.$thirdparty->id, LOG_WARNING);
+										$this->error = 'Failed to load Stripe account for thirdparty_id = '.$thirdparty->id;
 										$this->errors[] = $this->error;
 									} else { // $customer stripe not found
-										dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);
-										$this->error = 'Failed to get Stripe account id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+										dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = '.$thirdparty->id." in mode ".$servicestatus." in Stripe env ".$stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);
+										$this->error = 'Failed to get Stripe account id for thirdparty_id = '.$thirdparty->id." in mode ".$servicestatus." in Stripe env ".$stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
 										$this->errors[] = $this->error;
 									}
 									$error++;
@@ -1719,24 +1719,24 @@ 
 								}
 
 								if ($description) {
-									dol_syslog("* Record event for credit transfer or direct debit request result - " . $description);
+									dol_syslog("* Record event for credit transfer or direct debit request result - ".$description);
 									require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 									// Insert record of payment (success or error)
 									$actioncomm = new ActionComm($this->db);
 
-									$actioncomm->type_code = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-									$actioncomm->code = 'AC_' . $actioncode;
+									$actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+									$actioncomm->code = 'AC_'.$actioncode;
 									$actioncomm->label = $description;
 									$actioncomm->note_private = implode(",\n", $postactionmessages);
 									$actioncomm->fk_project = $this->fk_project;
 									$actioncomm->datep = $now;
 									$actioncomm->datef = $now;
-									$actioncomm->percentage = -1;   // Not applicable
+									$actioncomm->percentage = -1; // Not applicable
 									$actioncomm->socid = $thirdparty->id;
 									$actioncomm->contactid = 0;
-									$actioncomm->authorid = $user->id;   // User saving action
-									$actioncomm->userownerid = $user->id;	// Owner of action
+									$actioncomm->authorid = $user->id; // User saving action
+									$actioncomm->userownerid = $user->id; // Owner of action
 									// Fields when action is a real email (content is already into note)
 									/*$actioncomm->email_msgid = $object->email_msgid;
 									 $actioncomm->email_from  = $object->email_from;
@@ -1749,7 +1749,7 @@ 
 									$actioncomm->fk_element = $this->id;
 									$actioncomm->elementid = $this->id;
 									$actioncomm->elementtype = $this->element;
-									$actioncomm->extraparams = $extraparams;		// Can be null, empty string or array()
+									$actioncomm->extraparams = $extraparams; // Can be null, empty string or array()
 
 									$actioncomm->create($user);
 								}
@@ -1759,15 +1759,15 @@ 
 							} catch (Exception $e) {
 								$error++;
 								$errorforinvoice++;
-								dol_syslog('Error ' . $e->getMessage(), LOG_ERR);
-								$this->error = 'Error ' . $e->getMessage();
+								dol_syslog('Error '.$e->getMessage(), LOG_ERR);
+								$this->error = 'Error '.$e->getMessage();
 								$this->errors[] = $this->error;
 							}
 						} else {	// If remain to pay is null
 							$error++;
 							$errorforinvoice++;
-							dol_syslog("Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?", LOG_WARNING);
-							$this->error = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
+							dol_syslog("Remain to pay is null for the invoice ".$this->id." ".$this->ref.". Why is the invoice not classified 'Paid' ?", LOG_WARNING);
+							$this->error = "Remain to pay is null for the invoice ".$this->id." ".$this->ref.". Why is the invoice not classified 'Paid' ?";
 							$this->errors[] = $this->error;
 						}
 					}
@@ -1876,10 +1876,10 @@ 
 
 		// Add the standard elements to the QR code
 		$lines = [
-			'BCD',  // Service Tag (optional)
-			'002',  // Version (optional)
-			'1',	// Character set (optional)
-			'SCT',  // Identification (optional)
+			'BCD', // Service Tag (optional)
+			'002', // Version (optional)
+			'1', // Character set (optional)
+			'SCT', // Identification (optional)
 		];
 
 		// Add the bank account information
@@ -1901,7 +1901,7 @@ 
 		}
 
 		// Add the amount and reference
-		$lines[] = 'EUR' . $totalTTCString; // Amount (optional)
+		$lines[] = 'EUR'.$totalTTCString; // Amount (optional)
 		$lines[] = ''; // Purpose (optional)
 		$lines[] = ''; // Payment reference (optional)
 		$lines[] = $this->ref; // Remittance Information (optional)
@@ -1959,10 +1959,10 @@ 
 		$s .= pack('C1', 3).pack('C1', strlen($datestring)).$datestring;
 		$s .= pack('C1', 4).pack('C1', strlen($pricewithtaxstring)).$pricewithtaxstring;
 		$s .= pack('C1', 5).pack('C1', strlen($pricetaxstring)).$pricetaxstring;
-		$s .= '';					// Hash of xml invoice
-		$s .= '';					// ecda signature
-		$s .= '';					// ecda public key
-		$s .= '';					// ecda signature of public key stamp
+		$s .= ''; // Hash of xml invoice
+		$s .= ''; // ecda signature
+		$s .= ''; // ecda public key
+		$s .= ''; // ecda signature of public key stamp
 
 		$s = base64_encode($s);
 
@@ -2030,8 +2030,8 @@ 
 			$s .= "S\n";
 			$s .= dol_trunc($bankaccount->owner_name, 70, 'right', 'UTF-8', 1)."\n";
 			$addresslinearray = explode("\n", $bankaccount->owner_address);
-			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
-			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
+			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n"; // address line 1
+			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n"; // address line 2
 			/*$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";
 			$s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";
 			$s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";*/
@@ -2039,8 +2039,8 @@ 
 			$s .= "S\n";
 			$s .= dol_trunc((string) $mysoc->name, 70, 'right', 'UTF-8', 1)."\n";
 			$addresslinearray = explode("\n", $mysoc->address);
-			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
-			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
+			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n"; // address line 1
+			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n"; // address line 2
 			$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";
 			$s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";
 			$s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";
@@ -2060,14 +2060,14 @@ 
 		$s .= "S\n";
 		$s .= dol_trunc((string) $this->thirdparty->name, 70, 'right', 'UTF-8', 1)."\n";
 		$addresslinearray = explode("\n", $this->thirdparty->address);
-		$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
-		$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
+		$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n"; // address line 1
+		$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n"; // address line 2
 		$s .= dol_trunc($this->thirdparty->zip, 16, 'right', 'UTF-8', 1)."\n";
 		$s .= dol_trunc($this->thirdparty->town, 35, 'right', 'UTF-8', 1)."\n";
 		$s .= dol_trunc($this->thirdparty->country_code, 2, 'right', 'UTF-8', 1)."\n";
 		// ID of payment
-		$s .= "NON\n";			// NON or QRR
-		$s .= "\n";				// QR Code reference if previous field is QRR
+		$s .= "NON\n"; // NON or QRR
+		$s .= "\n"; // QR Code reference if previous field is QRR
 		// Free text
 		if ($complementaryinfo) {
 			$s .= $complementaryinfo."\n";

htdocs/webhook/triggerhistory_card.php

Spacing +3 added lines, -3 removed lines

@@ -102,14 +102,14 @@
 // Get parameters
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$lineid   = GETPOSTINT('lineid');
+$lineid = GETPOSTINT('lineid');
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
+$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 

htdocs/webhook/triggerhistory_list.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The display mode ('list', 'kanban', 'hierarchy', 'calendar', 'gantt', ...)
-$groupby = GETPOST('groupby', 'aZ09');	// Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
+$groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
 
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
@@ -99,7 +99,7 @@ 
 $object = new TriggerHistory($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -109,7 +109,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -437,7 +437,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-webhook page-list bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for a horizontal scroll in the table instead of page
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-webhook page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for a horizontal scroll in the table instead of page
 
 if ($mode == 'modulesetup') {
 	require_once DOL_DOCUMENT_ROOT.'/webhook/lib/webhook.lib.php';
@@ -588,7 +588,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup
 $selectedfields = (($mode != 'kanban' && $mode != 'kanbangroupby') ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -639,7 +639,7 @@ 
 			$formadmin = new FormAdmin($db);
 			print $formadmin->select_language((isset($search[$key]) ? $search[$key] : ''), 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} elseif ($val['type'] === 'boolean') {
-			print $form->selectyesno('search_' . $key, $search[$key] ?? '', 1, false, 1);
+			print $form->selectyesno('search_'.$key, $search[$key] ?? '', 1, false, 1);
 		} else {
 			print '<input type="text" class="flat maxwidth'.(in_array($val['type'], array('integer', 'price')) ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -687,7 +687,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;