Dolibarr / dolibarr

htdocs/public/stripe/ipn.php

Spacing +34 added lines, -34 removed lines

@@ -204,12 +204,12 @@ 
 		if (!empty($user->email)) {
 			$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
 		} else {
-			$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '" <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+			$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'" <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 		}
 		$replyto = $sendto;
 		$sendtocc = '';
 		if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
-			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
+			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'" <'.getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 		}
 
 		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
@@ -270,7 +270,7 @@ 
 			$typefrom = 'PRE';
 			$typeto = 'VIR';
 
-			$numChqOrOpe = '';	// TODO Store the po ref from $event->data
+			$numChqOrOpe = ''; // TODO Store the po ref from $event->data
 
 			$db->begin();
 
@@ -364,19 +364,19 @@ 
 	dol_syslog("object = ".var_export($event->data, true));
 	dol_syslog("object = ".var_export($event->data, true), LOG_DEBUG, 0, '_payment');
 
-	include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 	global $stripearrayofkeysbyenv;
 	$error = 0;
 	$object = $event->data->object;
-	$TRANSACTIONID = $object->id;	// Example 'pi_123456789...'
+	$TRANSACTIONID = $object->id; // Example 'pi_123456789...'
 	$ipaddress = $object->metadata->ipaddress;
 	$now = dol_now();
 	$currencyCodeType = strtoupper($object->currency);
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 	$invoice_id = "";
-	$paymentTypeCode = "";				// payment type according to Stripe
-	$paymentTypeCodeInDolibarr = "";	// payment type according to Dolibarr
+	$paymentTypeCode = ""; // payment type according to Stripe
+	$paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr
 	$payment_amount = 0;
 	$payment_amountInDolibarr = 0;
 
@@ -449,7 +449,7 @@ 
 		$s = new \Stripe\StripeClient($stripeacc);
 
 		$paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid);
-		$paymentTypeCode =  $paymentmethodstripe->type;
+		$paymentTypeCode = $paymentmethodstripe->type;
 		if ($paymentTypeCode == "ban" || $paymentTypeCode == "sepa_debit") {
 			$paymentTypeCode = "PRE";
 		} elseif ($paymentTypeCode == "card") {
@@ -479,9 +479,9 @@ 
 			$paiement->datepaye = $now;
 			$paiement->date = $now;
 			if ($currencyCodeType == $conf->currency) {
-				$paiement->amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching with invoice id
+				$paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id
 			} else {
-				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching
+				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching
 
 				$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 				$ispostactionok = -1;
@@ -504,9 +504,9 @@ 
 
 			$paiement->num_payment = '';
 			$paiement->note_public = '';
-			$paiement->note_private = 'Stripe Sepa payment received by IPN service listening webhooks - ' . dol_print_date($now, 'standard') . ' (TZ server) using servicestatus=' . $servicestatus . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
+			$paiement->note_private = 'Stripe Sepa payment received by IPN service listening webhooks - '.dol_print_date($now, 'standard').' (TZ server) using servicestatus='.$servicestatus.($ipaddress ? ' from ip '.$ipaddress : '').' - Transaction ID = '.$TRANSACTIONID;
 
-			$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer_id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key'];		// May be we should store py_... instead of pi_... but we started with pi_... so we continue.
+			$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer_id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue.
 			$paiement->ext_payment_site = $service;
 
 			$ispaymentdone = 0;
@@ -525,23 +525,23 @@ 
 			$db->begin();
 
 			if (!$error && !$ispaymentdone) {
-				dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.');
-				dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.', LOG_DEBUG, 0, '_payment');
+				dol_syslog('* Record payment type PRE for invoice id '.$invoice_id.'. It includes closing of invoice and regenerating document.');
+				dol_syslog('* Record payment type PRE for invoice id '.$invoice_id.'. It includes closing of invoice and regenerating document.', LOG_DEBUG, 0, '_payment');
 
 				// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
 				$paiement_id = $paiement->create($user, 1);
 				if ($paiement_id < 0) {
-					$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . implode("<br>\n", $paiement->errors);
+					$postactionmessages[] = $paiement->error.($paiement->error ? ' ' : '').implode("<br>\n", $paiement->errors);
 					$ispostactionok = -1;
 					$error++;
 
-					dol_syslog("Failed to create the payment for invoice id " . $invoice_id);
-					dol_syslog("Failed to create the payment for invoice id " . $invoice_id, LOG_DEBUG, 0, '_payment');
+					dol_syslog("Failed to create the payment for invoice id ".$invoice_id);
+					dol_syslog("Failed to create the payment for invoice id ".$invoice_id, LOG_DEBUG, 0, '_payment');
 				} else {
 					$postactionmessages[] = 'Payment created';
 
-					dol_syslog("The payment has been created for invoice id " . $invoice_id);
-					dol_syslog("The payment has been created for invoice id " . $invoice_id, LOG_DEBUG, 0, '_payment');
+					dol_syslog("The payment has been created for invoice id ".$invoice_id);
+					dol_syslog("The payment has been created for invoice id ".$invoice_id, LOG_DEBUG, 0, '_payment');
 				}
 			}
 
@@ -573,14 +573,14 @@ 
 						$label = '(CustomerInvoicePayment)';
 						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $customer_id, '');
 						if ($result < 0) {
-							$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . implode("<br>\n", $paiement->errors);
+							$postactionmessages[] = $paiement->error.($paiement->error ? ' ' : '').implode("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
 						} else {
 							$postactionmessages[] = 'Bank transaction of payment created (by ipn.php file)';
 						}
 					} else {
-						$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
 					}
@@ -752,7 +752,7 @@ 
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -786,7 +786,7 @@ 
 		$companypaymentmode->card_type       = $event->data->object->card->branding;
 
 		$companypaymentmode->owner_name      = $event->data->object->billing_details->name;
-		$companypaymentmode->proprio         = $companypaymentmode->owner_name;			// We may still need this for modulebuilder code because name of field is "proprio"
+		$companypaymentmode->proprio         = $companypaymentmode->owner_name; // We may still need this for modulebuilder code because name of field is "proprio"
 
 		$companypaymentmode->exp_date_month  = (int) $event->data->object->card->exp_month;
 		$companypaymentmode->exp_date_year   = (int) $event->data->object->card->exp_year;
@@ -828,7 +828,7 @@ 
 		$companypaymentmode->label           = '';
 		$companypaymentmode->number          = $db->escape($event->data->object->id);
 		$companypaymentmode->last_four       = $db->escape($event->data->object->card->last4);
-		$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name);	// deprecated but still needed
+		$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name); // deprecated but still needed
 		$companypaymentmode->owner_name      = $db->escape($event->data->object->billing_details->name);
 		$companypaymentmode->exp_date_month  = (int) $event->data->object->card->exp_month;
 		$companypaymentmode->exp_date_year   = (int) $event->data->object->card->exp_year;
@@ -884,8 +884,8 @@ 
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 	$reason = $object->reason;
-	$amountdisputestripe = $object->amount;			// In stripe format
-	$amountdispute = $stripe->convertAmount($amountdisputestripe, $currencyCodeType, 1);			// In real currency format
+	$amountdisputestripe = $object->amount; // In stripe format
+	$amountdispute = $stripe->convertAmount($amountdisputestripe, $currencyCodeType, 1); // In real currency format
 	$statusdispute = $object->status;
 
 	$pkey = '';
@@ -900,15 +900,15 @@ 
 	if (!empty($balance_transactions_array) && is_array($balance_transactions_array)) {
 		foreach ($balance_transactions_array as $tmpval) {
 			if (isset($tmpval['fee'])) {
-				$feesstripe += (int) $tmpval['fee'];		// In stripe format
+				$feesstripe += (int) $tmpval['fee']; // In stripe format
 			}
 		}
 	}
-	$fees = $stripe->convertAmount($feesstripe, $currencyCodeType, 1);			// In real currency format
+	$fees = $stripe->convertAmount($feesstripe, $currencyCodeType, 1); // In real currency format
 
 	$invoice_id = 0;
-	$paymentTypeCode = "";			// payment type according to Stripe
-	$paymentTypeCodeInDolibarr = "";	// payment type according to Dolibarr
+	$paymentTypeCode = ""; // payment type according to Stripe
+	$paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr
 	$payment_amount = 0;
 	$payment_amountInDolibarr = 0;
 
@@ -988,7 +988,7 @@ 
 		// If invoice was closed, we reopen it
 		if ($tmpinvoice->status == Facture::STATUS_CLOSED) {
 			// Switch back the invoice to status validated
-			$result = $tmpinvoice->setStatut(Facture::STATUS_VALIDATED, null, '', 'none');	// Trigger will be run later
+			$result = $tmpinvoice->setStatut(Facture::STATUS_VALIDATED, null, '', 'none'); // Trigger will be run later
 			if ($result < 0) {
 				$errormsg = $tmpinvoice->error.implode(', ', $tmpinvoice->errors);
 				$error++;
@@ -1060,7 +1060,7 @@ 
 		$paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching
 		*/
 		$paiement->paiementid   = dol_getIdFromCode($db, 'PRE', 'c_paiement', 'code', 'id', 1);
-		$paiement->num_payment  = $object->id;	// A string like 'du_...'
+		$paiement->num_payment  = $object->id; // A string like 'du_...'
 		$paiement->note_public = 'Fund withdrawn by bank. Reason: '.$reason;
 		$paiement->note_private = '';
 		$paiement->fk_account   = $accountfrom->id;
@@ -1076,7 +1076,7 @@ 
 			$error++;
 		}
 
-		if (! $error && $tmpinvoice->status == Facture::STATUS_CLOSED) {
+		if (!$error && $tmpinvoice->status == Facture::STATUS_CLOSED) {
 			// Switch back the invoice to status validated
 			$result = $tmpinvoice->setStatut(Facture::STATUS_VALIDATED, null, '', 'none');
 			if ($result < 0) {
@@ -1091,7 +1091,7 @@ 
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$paiement_id = $paiement->create($user, 0, $tmpinvoice->thirdparty); // This include regenerating documents
 			if ($paiement_id < 0) {
 				$errormsg = $paiement->error.implode(', ', $paiement->errors);

htdocs/public/payment/paymentok.php

Spacing +59 added lines, -59 removed lines

@@ -151,9 +151,9 @@ 
 $paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
 $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
 if (getDolGlobalString($paramcreditorlong)) {
-	$creditor = getDolGlobalString($paramcreditorlong);	// use label long of the seller to show
+	$creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
 } elseif (getDolGlobalString($paramcreditor)) {
-	$creditor = getDolGlobalString($paramcreditor);		// use label short of the seller to show
+	$creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
 }
 
 
@@ -220,7 +220,7 @@ 
 
 $head = '';
 if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -280,7 +280,7 @@ 
 	}
 	if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
 		print '<div class="backimagepublicpayment">';
-		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="' . getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
+		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
 		print '</div>';
 	}
 
@@ -290,7 +290,7 @@ 
 
 
 // Add steps to validate payment is complete when we enter this page
-$service = $paymentmethod;	// to have a default value. We may change it later for 'StripeLive' or 'StripeTest'...
+$service = $paymentmethod; // to have a default value. We may change it later for 'StripeLive' or 'StripeTest'...
 
 // For Paypal: validate the payment (Paypal need another step after the callback return to validate the payment).
 if (isModEnabled('paypal') && $paymentmethod === 'paypal') {	// We call this page only if payment is ok on payment system
@@ -299,12 +299,12 @@ 
 		// Get on url call
 		$onlinetoken        = $PAYPALTOKEN;
 		$fulltag            = $FULLTAG;
-		$payerID 			= !empty($PAYPALPAYERID) ? $PAYPALPAYERID : '';
+		$payerID = !empty($PAYPALPAYERID) ? $PAYPALPAYERID : '';
 		// Set by newpayment.php
 		$ipaddress          = $_SESSION['ipaddress'];
 		$currencyCodeType   = $_SESSION['currencyCodeType'];
 		$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-		$paymentType        = $_SESSION['PaymentType'];			// Value can be 'Mark', 'Sole', 'Sale' for example
+		$paymentType        = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example
 
 		dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
 
@@ -381,7 +381,7 @@ 
 if (isModEnabled('stripe') && $paymentmethod === 'stripe') {
 	// TODO: Move this block to the top to ensure all session variables (e.g., TRANSACTIONID, FinalPaymentAmt, currencyCodeType, etc.) are loaded before executing checks for any payment module.
 	if (empty($TRANSACTIONID)) {
-		$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID'];	// pi_... or ch_...
+		$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_...
 		if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
 			// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
 			$TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
@@ -429,12 +429,12 @@ 
 
 				if ((int) $paymentIntent->amount !== $expectedAmount || strtolower($paymentIntent->currency) !== $expectedCurrency) {
 					$error++;
-					$errmsg = 'Stripe payment information mismatch: expected amount ' . $expectedAmount . ' and currency ' . $expectedCurrency . ', got amount ' . $paymentIntent->amount . ' and currency ' . $paymentIntent->currency;
+					$errmsg = 'Stripe payment information mismatch: expected amount '.$expectedAmount.' and currency '.$expectedCurrency.', got amount '.$paymentIntent->amount.' and currency '.$paymentIntent->currency;
 					dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 				}
 				if ($paymentIntent->status !== 'succeeded') {
 					$error++;
-					$errmsg = 'Stripe payment not succeeded. Status: ' . $paymentIntent->status;
+					$errmsg = 'Stripe payment not succeeded. Status: '.$paymentIntent->status;
 					dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 				}
 			} catch (\Stripe\Exception\ApiErrorException $e) {
@@ -450,7 +450,7 @@ 
 			}
 		} catch (Exception $e) {
 			$error++;
-			$errmsg = 'Stripe API error: ' . $e->getMessage();
+			$errmsg = 'Stripe API error: '.$e->getMessage();
 			dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 		}
 	} else {
@@ -499,7 +499,7 @@ 
 }
 
 if (empty($TRANSACTIONID)) {
-	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID'];	// pi_... or ch_...
+	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_...
 	if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
 		// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
 		$TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
@@ -594,7 +594,7 @@ 
 				if (empty($adht->caneditamount)) {	// If we didn't allow members to choose their membership amount (if the amount is allowed in edit mode, no need to check)
 					if ($object->status == $object::STATUS_DRAFT) {		// If the member is not yet validated, we check that the amount is the same as expected.
 						$typeid = $object->typeid;
-						$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
+						$amountbytype = $adht->amountByType(1); // Load the array of amount per type
 
 						// Set amount for the subscription:
 						// - First check the amount of the member type.
@@ -624,7 +624,7 @@ 
 				if (getDolGlobalInt('MEMBER_MIN_AMOUNT')) {
 					if ($FinalPaymentAmt < getDolGlobalInt('MEMBER_MIN_AMOUNT')) {
 						$error++;
-						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed (' . getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
+						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed ('.getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
 						dol_syslog("Failed to validate member (amount propagated from payment page is lower than allowed minimum): ".$errmsg, LOG_ERR, 0, '_payment');
@@ -640,7 +640,7 @@ 
 					dol_syslog("Failed to validate member (bad currency check): ".$errmsg, LOG_ERR, 0, '_payment');
 				}
 
-				if (! $error) {
+				if (!$error) {
 					// We validate the member (no effect if it is already validated)
 					$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 					if ($result < 0 || empty($object->datevalid)) {
@@ -810,7 +810,7 @@ 
 						$thirdparty = new Societe($db);
 						$thirdparty->fetch($thirdparty_id);
 
-						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';	// This also set $stripearrayofkeysbyenv
+						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv
 						$stripe = new Stripe($db);
 						//$stripeacc = $stripe->getStripeAccount($service);		Already defined previously
 
@@ -825,7 +825,7 @@ 
 
 								if (preg_match('/^pi_/', $TRANSACTIONID)) {
 									// This may throw an error if not found.
-									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID);	// payment_intent (pi_...)
+									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...)
 								} else {
 									// This throw an error if not found
 									$chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...)
@@ -884,7 +884,7 @@ 
 				// Create external user
 				if (getDolGlobalString('ADHERENT_CREATE_EXTERNAL_USER_LOGIN')) {
 					$nuser = new User($db);
-					$tmpuser = dol_clone($object, 0);		// $object is type Adherent
+					$tmpuser = dol_clone($object, 0); // $object is type Adherent
 
 					// Check if a user login already exists for this member or not
 					$found = 0;
@@ -1136,7 +1136,7 @@ 
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
-		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$object = new Commande($db);
 		$result = $object->fetch((int) $tmptag['ORD']);
 		if ($result) {
@@ -1177,7 +1177,7 @@ 
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 					$db->begin();
 
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromOrder($object, $user);
 					if ($result > 0) {
@@ -1189,12 +1189,12 @@ 
 							// TODO Send a warning email.
 						}
 
-						$object->classifyBilled($user);		// The invoice has been create from the order so total is the same, so we can classify order to billed (even if payment may be partial).
+						$object->classifyBilled($user); // The invoice has been create from the order so total is the same, so we can classify order to billed (even if payment may be partial).
 
-						$invoice->validate($user);			// This may re-classify all linked orders to billed (done previously) if amount of invoice is ok by triggers, depending on the workflow module setup.
+						$invoice->validate($user); // This may re-classify all linked orders to billed (done previously) if amount of invoice is ok by triggers, depending on the workflow module setup.
 
 						// Creation of payment line (warning: if amount has been modified on page, the payment may be partial)
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 						$paiement = new Paiement($db);
 						$paiement->datepaye = $now;
 						if ($currencyCodeType == $conf->currency) {
@@ -1208,7 +1208,7 @@ 
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
 
 						// Get $customerid and $pkey
 						$customerid = '';
@@ -1226,12 +1226,12 @@ 
 						} else {
 							$paiement->ext_payment_id = $TRANSACTIONID;
 						}
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 						if (!$error) {
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
 							if ($paiement_id < 0) {
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
@@ -1268,7 +1268,7 @@ 
 								}
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 								if ($result < 0) {
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 									$ispostactionok = -1;
 									$error++;
 								} else {
@@ -1276,13 +1276,13 @@ 
 									$ispostactionok = 1;
 								}
 							} else {
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 								$ispostactionok = -1;
 								$error++;
 							}
 						}
 					} else {
-						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+						$postactionmessages[] = 'Failed to create invoice form order '.$tmptag['ORD'].'.';
 						$ispostactionok = -1;
 						$error++;
 					}
@@ -1293,7 +1293,7 @@ 
 						$db->rollback();
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of order '.$tmptag['ORD'].'. May be payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -1301,7 +1301,7 @@ 
 				$ispostactionok = -1;
 			}
 		} else {
-			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
+			$postactionmessages[] = 'Order paid '.$tmptag['ORD'].' was not found';
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
@@ -1358,7 +1358,7 @@ 
 				$paiement->datep = $now;
 				$paiement->paymenttype = $paymentTypeId;
 				$paiement->num_payment = '';
-				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+				$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
 
 				// Get $customerid and $pkey
 				$customerid = '';
@@ -1376,7 +1376,7 @@ 
 				} else {
 					$paiement->ext_payment_id = $TRANSACTIONID;
 				}
-				$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+				$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 				if (!$error) {
 					$paiement_id = $paiement->create($user, 1);
@@ -1456,7 +1456,7 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch((int) $ref);  // @phan-suppress-curren-line PhanPluginSuspiciousParamPosition
+		$result = $object->fetch((int) $ref); // @phan-suppress-curren-line PhanPluginSuspiciousParamPosition
 		if ($result) {
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
@@ -1527,7 +1527,7 @@ 
 					} else {
 						$paiement->ext_payment_id = $TRANSACTIONID;
 					}
-					$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+					$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 					if (!$error) {
 						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
@@ -1608,7 +1608,7 @@ 
 						$db->rollback();
 					}
 
-					if (! $error) {
+					if (!$error) {
 						// Sending mail
 						$thirdparty = new Societe($db);
 						$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
@@ -1626,7 +1626,7 @@ 
 							// Get email content from template
 							$arraydefaultmessage = null;
 
-							$idoftemplatetouse = getDolGlobalInt('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT');	// Email to send for Event organization registration
+							$idoftemplatetouse = getDolGlobalInt('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'); // Email to send for Event organization registration
 
 							if (!empty($idoftemplatetouse)) {
 								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1703,7 +1703,7 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch((int) $ref);  // @phan-suppress-current-line PhanPluginSuspiciousParamPosition
+		$result = $object->fetch((int) $ref); // @phan-suppress-current-line PhanPluginSuspiciousParamPosition
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -1776,7 +1776,7 @@ 
 					} else {
 						$paiement->ext_payment_id = $TRANSACTIONID;
 					}
-					$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+					$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 					if (!$error) {
 						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
@@ -1847,7 +1847,7 @@ 
 							if ($resultboothupdate < 0) {
 								// Finding the third party by getting the invoice
 								$invoice = new Facture($db);
-								$resultinvoice = $invoice->fetch((int) $ref);  // @phan-suppress-current-line PhanPluginSuspiciousParamPosition
+								$resultinvoice = $invoice->fetch((int) $ref); // @phan-suppress-current-line PhanPluginSuspiciousParamPosition
 								if ($resultinvoice < 0) {
 									$postactionmessages[] = 'Could not find the associated invoice.';
 									$ispostactionok = -1;
@@ -1873,7 +1873,7 @@ 
 										// Get email content from template
 										$arraydefaultmessage = null;
 
-										$idoftemplatetouse = getDolGlobalInt('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH');	// Email sent after registration for a Booth
+										$idoftemplatetouse = getDolGlobalInt('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'); // Email sent after registration for a Booth
 
 										if (!empty($idoftemplatetouse)) {
 											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1929,7 +1929,7 @@ 
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
-		include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 		$object = new Contrat($db);
 		$result = $object->fetch((int) $tmptag['CON']);
 		if ($result) {
@@ -1969,14 +1969,14 @@ 
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 					$db->begin();
 
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
 					if ($result > 0) {
 						// $object->classifyBilled($user);
 						$invoice->validate($user);
 						// Creation of payment line
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 						$paiement = new Paiement($db);
 						$paiement->datepaye = $now;
 						if ($currencyCodeType == $conf->currency) {
@@ -1990,7 +1990,7 @@ 
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
 
 						// Get $customerid and $pkey
 						$customerid = '';
@@ -2008,12 +2008,12 @@ 
 						} else {
 							$paiement->ext_payment_id = $TRANSACTIONID;
 						}
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 						if (!$error) {
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
 							if ($paiement_id < 0) {
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
@@ -2050,7 +2050,7 @@ 
 								}
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 								if ($result < 0) {
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 									$ispostactionok = -1;
 									$error++;
 								} else {
@@ -2058,15 +2058,15 @@ 
 									$ispostactionok = 1;
 								}
 							} else {
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 								$ispostactionok = -1;
 								$error++;
 							}
 						}
 					} else {
-						$msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
+						$msg = 'Failed to create invoice form contract '.$tmptag['CON'];
 						if (!empty($tmptag['COL'])) {
-							$msg .= ' and col '. $tmptag['COL'] .'.';
+							$msg .= ' and col '.$tmptag['COL'].'.';
 						}
 						$postactionmessages[] = $msg;
 						$ispostactionok = -1;
@@ -2079,7 +2079,7 @@ 
 						$db->rollback();
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of contract '.$tmptag['CON'].'. Maybe payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -2087,9 +2087,9 @@ 
 				$ispostactionok = -1;
 			}
 		} else {
-			$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
+			$msg = 'Contract paid '.$tmptag['CON'].' was not found';
 			if (!empty($tmptag['COL'])) {
-				$msg .= ' for col '.$tmptag['COL'] .'.';
+				$msg .= ' for col '.$tmptag['COL'].'.';
 			}
 			$postactionmessages[] = $msg;
 			$ispostactionok = -1;
@@ -2108,7 +2108,7 @@ 
 	// Set by newpayment.php
 	$currencyCodeType   = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType'];
 	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"];
-	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType'];	// Seems used by paypal only
+	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only
 
 	if (is_object($object) && method_exists($object, 'call_trigger')) {
 		'@phan-var-force CommonObject $object';
@@ -2358,11 +2358,11 @@ 
 	if ($ispaymentok) {
 		// Redirect to a success page
 		$randomseckey = getRandomPassword(true, null, 20);
-		$_SESSION['paymentoksessioncode'] = $randomseckey;		// key between paymentok.php to another page like a paymentok of the website.
+		$_SESSION['paymentoksessioncode'] = $randomseckey; // key between paymentok.php to another page like a paymentok of the website.
 
 		// Paymentok page must be created for the specific website
 		if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
-			$ext_urlok = $ws_virtuelhost . '/paymentok.php?paymentoksessioncode='.urlencode($randomseckey).'&fulltag='.$FULLTAG;
+			$ext_urlok = $ws_virtuelhost.'/paymentok.php?paymentoksessioncode='.urlencode($randomseckey).'&fulltag='.$FULLTAG;
 		} else {
 			$ext_urlok = DOL_URL_ROOT.'/public/website/index.php?paymentoksessioncode='.urlencode($randomseckey).'&website='.urlencode($ws).'&pageref=paymentok&fulltag='.$FULLTAG;
 		}
@@ -2373,11 +2373,11 @@ 
 	} else {
 		// Redirect to an error page
 		$randomseckey = getRandomPassword(true, null, 20);
-		$_SESSION['paymentkosessioncode'] = $randomseckey;		// key between paymentok.php to another page like a paymentko of the website.
+		$_SESSION['paymentkosessioncode'] = $randomseckey; // key between paymentok.php to another page like a paymentko of the website.
 
 		// Paymentko page must be created for the specific website
 		if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
-			$ext_urlko = $ws_virtuelhost . '/paymentko.php?paymentkosessioncode='.urlencode($randomseckey).'&fulltag='.$FULLTAG;
+			$ext_urlko = $ws_virtuelhost.'/paymentko.php?paymentkosessioncode='.urlencode($randomseckey).'&fulltag='.$FULLTAG;
 		} else {
 			$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?paymentkosessioncode='.urlencode($randomseckey).'&website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
 		}

htdocs/admin/system/database-tables.php

Spacing +7 added lines, -7 removed lines

@@ -26,8 +26,8 @@ 
  *	\brief      Page with information on database tables. Add also some maintenance action to convert tables.
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
 // Load Dolibarr environment
@@ -71,14 +71,14 @@ 
 	if (preg_match('/general/', $defaultcollation)) {
 		$collation = 'utf8_general_ci';
 	}
-	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8 COLLATE ".$db->sanitize($collation);	// Set the default value on table
+	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8 COLLATE ".$db->sanitize($collation); // Set the default value on table
 	$sqllog .= $sql.'<br>';
 	$resql1 = $db->query($sql);
 	if (!$resql1) {
 		setEventMessages($db->lasterror(), null, 'warnings');
 		$resultsql = $resql1;
 	} else {
-		$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8 COLLATE ".$db->sanitize($collation);	// Switch fields (may fails due to foreign key)
+		$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8 COLLATE ".$db->sanitize($collation); // Switch fields (may fails due to foreign key)
 		$sqllog .= $sql.'<br>';
 		$resql2 = $db->query($sql);
 		if (!$resql2) {
@@ -93,14 +93,14 @@ 
 	if (preg_match('/general/', $defaultcollation)) {
 		$collation = 'utf8mb4_general_ci';
 	}
-	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8mb4 COLLATE ".$db->sanitize($collation);	// Set the default value on table
+	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8mb4 COLLATE ".$db->sanitize($collation); // Set the default value on table
 	$sqllog .= $sql.'<br>';
 	$resql1 = $db->query($sql);
 	if (!$resql1) {
 		setEventMessages($db->lasterror(), null, 'warnings');
 		$resultsql = $resql1;
 	} else {
-		$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8mb4 COLLATE ".$db->sanitize($collation);	// Switch fields (may fails due to foreign key)
+		$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8mb4 COLLATE ".$db->sanitize($collation); // Switch fields (may fails due to foreign key)
 		$sqllog .= $sql.'<br>';
 		$resql2 = $db->query($sql);
 		if (!$resql2) {
@@ -176,7 +176,7 @@ 
 			//print $shortsqlfilename.' ';
 			$shortsqlfilename = preg_replace('/\-[a-z]+\./', '.', $value['name']);
 			$arrayoffiles[$value['name']] = $shortsqlfilename;
-			if ($value['name'] == $shortsqlfilename && ! preg_match('/\.key\.sql$/', $value['name'])) {
+			if ($value['name'] == $shortsqlfilename && !preg_match('/\.key\.sql$/', $value['name'])) {
 				// This is a sql file automatically created
 				$arrayoftablesautocreated[$value['name']] = $shortsqlfilename;
 			}

htdocs/admin/system/dbtable.php

Spacing +4 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
 		while ($i < $num) {
 			$row = $db->fetch_row($resql);
 			if ($row[0] == $field) {
-				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8";		// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8"; // We must not sanitize the $row[1]
 				$sqllog .= $sql.'<br>';
 
 				$db->query($sql);
@@ -78,7 +78,7 @@ 
 					$collation = 'utf8_general_ci';
 				}
 
-				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE ".$db->sanitize($collation);	// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE ".$db->sanitize($collation); // We must not sanitize the $row[1]
 				$sqllog .= $sql.'<br>';
 
 				$resql2 = $db->query($sql);
@@ -102,7 +102,7 @@ 
 		while ($i < $num) {
 			$row = $db->fetch_row($resql);
 			if ($row[0] == $field) {
-				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8mb4";		// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8mb4"; // We must not sanitize the $row[1]
 				$sqllog .= $sql.'<br>';
 
 				$db->query($sql);
@@ -113,7 +113,7 @@ 
 					$collation = 'utf8mb4_general_ci';
 				}
 
-				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE ".$db->sanitize($collation);	// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE ".$db->sanitize($collation); // We must not sanitize the $row[1]
 				$sqllog .= $sql.'<br>';
 
 				$resql2 = $db->query($sql);

htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 $langs->load("tasks");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-'@phan-var-force CommonObject[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force CommonObject[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Task[] $linkedObjectBlock */
 
 $total = 0;

htdocs/stripe/class/stripe.class.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 	/**
 	 * @var string Stripe ID (Note: Conflict with CommonObject)
 	 */
-	public $id;  // @phpstan-ignore-line
+	public $id; // @phpstan-ignore-line
 
 	/**
 	 * @var string
@@ -520,7 +520,7 @@ 
 				"confirmation_method" => $stripemode,
 				"amount" => $stripeamount,
 				"currency" => $currency_code,
-				"payment_method_types" => $paymentmethodtypes,	// When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
+				"payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
 				/*
 				'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php',
 				'automatic_payment_methods' => array(
@@ -535,7 +535,7 @@ 
 			);
 			if ($descriptor) {
 				$dataforintent["statement_descriptor_suffix"] = $descriptor; // For card payment, 22 chars that appears on bank receipt (prefix into stripe setup + this suffix)
-				$dataforintent["statement_descriptor"] = $descriptor; 	// For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix
+				$dataforintent["statement_descriptor"] = $descriptor; // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix
 			}
 			if (!is_null($customer)) {
 				$dataforintent["customer"] = $customer;
@@ -615,7 +615,7 @@ 
 
 							$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
 							$sql .= " ext_payment_site = '".$this->db->escape($service)."',";
-							$sql .= " ext_payment_id = '".$this->db->escape($paymentintent->id)."'";	// TODO Save the long transaction id
+							$sql .= " ext_payment_id = '".$this->db->escape($paymentintent->id)."'"; // TODO Save the long transaction id
 							$sql .= " WHERE rowid = ".((int) $did);
 
 							$resql = $this->db->query($sql);
@@ -766,7 +766,7 @@ 
 
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediately during creation of intent
-				"payment_method_types" => $paymentmethodtypes,	// When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
+				"payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
 				/*
 				 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php',
 				 'automatic_payment_methods' => array(
@@ -1163,7 +1163,7 @@ 
 								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
 								$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."',";
 								$sql .= " card_type = 'sepa_debit',";
-								$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "',";
+								$sql .= " stripe_account= '".$this->db->escape($cu->id."@".$stripeacc)."',";
 								$sql .= " ext_payment_site = '".$this->db->escape($service)."'";
 								if (!empty($cs->mandate)) {
 									$mandateservice = new \Stripe\Mandate($stripeacc);
@@ -1187,7 +1187,7 @@ 
 					} catch (Exception $e) {
 						$sepa = null;
 						$this->error = 'Stripe error: '.$e->getMessage().'. Check the BAN information.';
-						dol_syslog($this->error, LOG_WARNING);	// Error from Stripe, so a warning on Dolibarr
+						dol_syslog($this->error, LOG_WARNING); // Error from Stripe, so a warning on Dolibarr
 					}
 				}
 			}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -592,7 +592,7 @@
 
 				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, $arrayofoptions);
 
-				if ($paymentintent instanceOf \Stripe\PaymentIntent) {
+				if ($paymentintent instanceof \Stripe\PaymentIntent) {
 					dol_syslog(get_class($this)."::getPaymentIntent paymentintent is a defined object");
 
 					// Store the payment intent

htdocs/asset/class/asset.class.php

Spacing +75 added lines, -75 removed lines

@@ -70,9 +70,9 @@ 
 	);
 
 
-	const STATUS_DRAFT = 0; 	// Draft
-	const STATUS_VALIDATED = 1; 	// In progress
-	const STATUS_DISPOSED = 9;	// Disposed
+	const STATUS_DRAFT = 0; // Draft
+	const STATUS_VALIDATED = 1; // In progress
+	const STATUS_DISPOSED = 9; // Disposed
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -629,11 +629,11 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if (empty($this->fk_asset_model)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -644,7 +644,7 @@ 
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options_model = new AssetDepreciationOptions($this->db);
 		$result = $options_model->fetchDeprecationOptions(0, $this->fk_asset_model);
 		if ($result < 0) {
@@ -679,7 +679,7 @@ 
 		// Get accountancy codes
 		//---------------------------
 		if (!$error) {
-			require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 			$accountancy_codes_model = new AssetAccountancyCodes($this->db);
 			$result = $accountancy_codes_model->fetchAccountancyCodes(0, $this->fk_asset_model);
 			if ($result < 0) {
@@ -738,7 +738,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -761,15 +761,15 @@ 
 		*/
 
 		$sql = "SELECT ad.rowid, ad.depreciation_mode, ad.ref, ad.depreciation_date, ad.depreciation_ht, ad.cumulative_depreciation_ht";
-		$sql .= ", " . $this->db->ifsql('iab.fk_docdet IS NOT NULL', '1', '0') . " AS bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= ", ".$this->db->ifsql('iab.fk_docdet IS NOT NULL', '1', '0')." AS bookkeeping";
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " ORDER BY ad.depreciation_date ASC";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -806,7 +806,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -828,14 +828,14 @@ 
 		*/
 
 		$sql = "SELECT COUNT(*) AS has_bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " AND iab.fk_docdet IS NOT NULL";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -873,28 +873,28 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
 			return -1;
 		}
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
 		$sql .= " VALUES ( ";
-		$sql .= " " . (int) $this->id;
-		$sql .= ", '" . $this->db->escape($mode) . "'";
-		$sql .= ", '" . $this->db->escape($ref) . "'";
-		$sql .= ", '" . $this->db->idate($depreciation_date) . "'";
-		$sql .= ", " . (float) $depreciation_ht;
-		$sql .= ", " . (float) $cumulative_depreciation_ht;
-		$sql .= ", '" . $this->db->escape($accountancy_code_debit) . "'";
-		$sql .= ", '" . $this->db->escape($accountancy_code_credit) . "'";
+		$sql .= " ".(int) $this->id;
+		$sql .= ", '".$this->db->escape($mode)."'";
+		$sql .= ", '".$this->db->escape($ref)."'";
+		$sql .= ", '".$this->db->idate($depreciation_date)."'";
+		$sql .= ", ".(float) $depreciation_ht;
+		$sql .= ", ".(float) $cumulative_depreciation_ht;
+		$sql .= ", '".$this->db->escape($accountancy_code_debit)."'";
+		$sql .= ", '".$this->db->escape($accountancy_code_credit)."'";
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -917,20 +917,20 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
 			return -1;
 		}
 
-		if (! empty($this->not_depreciated)) {
+		if (!empty($this->not_depreciated)) {
 			return 1;
 		}
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 		$result = $options->fetchDeprecationOptions($this->id);
 		if ($result < 0) {
@@ -941,7 +941,7 @@ 
 
 		// Get accountancy codes
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 		$accountancy_codes = new AssetAccountancyCodes($this->db);
 		$result = $accountancy_codes->fetchAccountancyCodes($this->id);
 		if ($result < 0) {
@@ -957,20 +957,20 @@ 
 		foreach ($options->deprecation_options as $mode_key => $fields) {
 			$modes[$mode_key] = $this->db->escape($mode_key);
 		}
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE fk_asset = " . (int) $this->id;
-		$sql .= " AND depreciation_mode NOT IN ('" . $this->db->sanitize(implode("', '", $modes)) . "')";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE fk_asset = ".(int) $this->id;
+		$sql .= " AND depreciation_mode NOT IN ('".$this->db->sanitize(implode("', '", $modes))."')";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error) {
 			// Get fiscal period
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 			// @FIXME getCurrentPeriodOfFiscalYear return the first period found. What if there is several ? And what if not closed ? And what if end date not yet defined.
 			$dates = getCurrentPeriodOfFiscalYear($this->db, $conf, $this->date_start > $this->date_acquisition ? $this->date_start : $this->date_acquisition);
@@ -1007,17 +1007,17 @@ 
 				*/
 
 				$sql = "SELECT ad.depreciation_date, ad.cumulative_depreciation_ht";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-				$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
-				$sql .= " AND ad.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+				$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
+				$sql .= " AND ad.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND iab.fk_docdet IS NOT NULL";
 				$sql .= " ORDER BY ad.depreciation_date DESC";
 				$sql .= " LIMIT 1";
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key) . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key).': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -1029,28 +1029,28 @@ 
 				}
 
 				// Set last cumulative depreciation
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-				$sql .= " SET total_amount_last_depreciation_ht = " . (empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
-				$sql .= " WHERE fk_asset = " . (int) $this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+				$sql .= " SET total_amount_last_depreciation_ht = ".(empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
+				$sql .= " WHERE fk_asset = ".(int) $this->id;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
 
 				// Delete old lines
-				$sql = "DELETE " . MAIN_DB_PREFIX . "asset_depreciation FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = " . MAIN_DB_PREFIX . "asset_depreciation.rowid";
-				$sql .= " WHERE " . MAIN_DB_PREFIX . "asset_depreciation.fk_asset = " . (int) $this->id;
-				$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql = "DELETE ".MAIN_DB_PREFIX."asset_depreciation FROM ".MAIN_DB_PREFIX."asset_depreciation";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = ".MAIN_DB_PREFIX."asset_depreciation.rowid";
+				$sql .= " WHERE ".MAIN_DB_PREFIX."asset_depreciation.fk_asset = ".(int) $this->id;
+				$sql .= " AND ".MAIN_DB_PREFIX."asset_depreciation.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND ab.fk_docdet IS NULL";
 				if ($last_depreciation_date !== "") {
-					$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+					$sql .= " AND ".MAIN_DB_PREFIX."asset_depreciation.ref != ''";
 				}
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -1119,7 +1119,7 @@ 
 				//$first_period_date = isset($begin_period) && $begin_period > $fiscal_period_start ? $begin_period : $fiscal_period_start;
 				$first_period_date = $fiscal_period_start;
 
-				$ref_date_format = "%Y" . ($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '') . ($fields['duration_type'] == 2 ? '-%d' : '');
+				$ref_date_format = "%Y".($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '').($fields['duration_type'] == 2 ? '-%d' : '');
 
 				// Loop security
 				$idx_loop = 0;
@@ -1141,9 +1141,9 @@ 
 
 						$period_begin = dol_print_date($fiscal_period_start, $ref_date_format);
 						$period_end = dol_print_date($fiscal_period_end, $ref_date_format);
-						$ref = $period_begin . ($period_begin != $period_end ? ' - ' . $period_end : '');
+						$ref = $period_begin.($period_begin != $period_end ? ' - '.$period_end : '');
 						if ($fiscal_period_start <= $disposal_date && $disposal_date <= $fiscal_period_end) {
-							$ref .= ' - ' . $langs->transnoentitiesnoconv('AssetDisposal');
+							$ref .= ' - '.$langs->transnoentitiesnoconv('AssetDisposal');
 						}
 
 						$begin_date = $fiscal_period_start < $start_date && $start_date <= $fiscal_period_end ? $start_date : $fiscal_period_start;
@@ -1233,7 +1233,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($asset_depreciation_id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -1242,28 +1242,28 @@ 
 
 		$this->db->begin();
 
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 
 		// Get last depreciation lines save in bookkeeping
 		//-----------------------------------------------------
 		$sql = "SELECT fk_asset, depreciation_mode, cumulative_depreciation_ht";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE rowid = " . (int) $asset_depreciation_id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE rowid = ".(int) $asset_depreciation_id;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation').': '.$this->db->lasterror();
 			$error++;
 		} else {
 			if ($obj = $this->db->fetch_object($resql)) {
 				$mode_key = $obj->depreciation_mode;
 				if (!empty($options->deprecation_options_fields[$mode_key])) {
-					$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-					$sql .= " SET total_amount_last_depreciation_ht = " . $obj->cumulative_depreciation_ht;
-					$sql .= " WHERE fk_asset = " . (int) $obj->fk_asset;
+					$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+					$sql .= " SET total_amount_last_depreciation_ht = ".$obj->cumulative_depreciation_ht;
+					$sql .= " WHERE fk_asset = ".(int) $obj->fk_asset;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 						$error++;
 					}
 				}
@@ -1516,7 +1516,7 @@ 
 			if ($option == 'label') {
 				$name = $this->label;
 			} elseif ($option == 'with_label') {
-				$name .= ' - ' . $this->label;
+				$name .= ' - '.$this->label;
 			}
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
@@ -1525,7 +1525,7 @@ 
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -1610,12 +1610,12 @@ 
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
 
-				$this->user_creation_id		= $obj->fk_user_creat;
-				$this->user_modification_id	= $obj->fk_user_modif;
-				$this->user_validation_id	= $obj->fk_user_valid;
-				$this->date_creation		= $this->db->jdate($obj->datec);
-				$this->date_modification	= $this->db->jdate($obj->datem);
-				$this->date_validation		= $this->db->jdate($obj->datev);
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->user_validation_id = $obj->fk_user_valid;
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation = $this->db->jdate($obj->datev);
 			}
 
 			$this->db->free($result);
@@ -1656,7 +1656,7 @@ 
 		if (getDolGlobalString('ASSET_ASSET_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('ASSET_ASSET_ADDON') . ".php";
+			$file = getDolGlobalString('ASSET_ASSET_ADDON').".php";
 			$classname = getDolGlobalString('ASSET_ASSET_ADDON');
 
 			// Include file with class

htdocs/asset/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 $langs->load("assets");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-'@phan-var-force Asset[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Asset[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Asset[] $linkedObjectBlock */
 
 $total = 0;

htdocs/don/admin/donation.php

Spacing +6 added lines, -6 removed lines

@@ -129,10 +129,10 @@ 
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		$action = '';	// To avoid to execute next actions
+		$action = ''; // To avoid to execute next actions
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
-		$action = '';	// To avoid to execute next actions
+		$action = ''; // To avoid to execute next actions
 	}
 }
 
@@ -147,10 +147,10 @@ 
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		$action = '';	// To avoid to execute next actions
+		$action = ''; // To avoid to execute next actions
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
-		$action = '';	// To avoid to execute next actions
+		$action = ''; // To avoid to execute next actions
 	}
 }
 
@@ -358,7 +358,7 @@ 
 	/** @var FormAccounting $formaccounting */
 	print $formaccounting->select_account(getDolGlobalString('DONATION_ACCOUNTINGACCOUNT'), 'DONATION_ACCOUNTINGACCOUNT', 1, array(), 1, 1);
 } else {
-	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="' . getDolGlobalString('DONATION_ACCOUNTINGACCOUNT').'">';
+	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.getDolGlobalString('DONATION_ACCOUNTINGACCOUNT').'">';
 }
 print '</td><td class="center">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
@@ -371,7 +371,7 @@ 
 
 print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
-print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">' . getDolGlobalString('DONATION_MESSAGE').'</textarea>';
+print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.getDolGlobalString('DONATION_MESSAGE').'</textarea>';
 print '</td><td class="center">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";