alxarafe / alixar

public/htdocs/public/ticket/create_ticket.php

Spacing +5 added lines, -5 removed lines

@@ -41,16 +41,16 @@ 
 if (!defined('NOREQUIREUSER')) {
     define('NOREQUIREUSER', '1');
 }*/
-Functions::defineIfNotDefined('NOREQUIREMENU', 1);  // If there is no need to load and show top and left menu
+Functions::defineIfNotDefined('NOREQUIREMENU', 1); // If there is no need to load and show top and left menu
 Functions::defineIfNotDefined('NOREQUIREHTML', 1); // If we don't need to load the html.form.class.php
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // Because 2 entities can have the same ref.
-$entity = (!empty($_GET['entity']) ? (int)$_GET['entity'] : (!empty($_POST['entity']) ? (int)$_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }
@@ -164,7 +164,7 @@ 
             // Ensure that contact is active and select first active contact
             $cid = -1;
             foreach ($contacts as $key => $contact) {
-                if ((int)$contact->statut == 1) {
+                if ((int) $contact->statut == 1) {
                     $cid = $key;
                     break;
                 }

public/htdocs/public/payment/paymentok.php

Spacing +27 added lines, -27 removed lines

@@ -51,15 +51,15 @@ 
  *                  This token and session can be used to get more information.
  */
 
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // Because 2 entities can have the same ref.
-$entity = (!empty($_GET['e']) ? (int)$_GET['e'] : (!empty($_POST['e']) ? (int)$_POST['e'] : 1));
+$entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }
@@ -162,7 +162,7 @@ 
 if (getDolGlobalString($paramcreditorlong)) {
     $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
 }
 
 
@@ -295,7 +295,7 @@ 
             // Set by newpayment.php
             $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
             // From env
             $ipaddress = $_SESSION['ipaddress'];
 
@@ -398,7 +398,7 @@ 
     $ipaddress = $_SESSION['ipaddress'];
 }
 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');
@@ -457,7 +457,7 @@ 
         $adht = new AdherentType($db);
         $object = new Adherent($db);
 
-        $result1 = $object->fetch((int)$tmptag['MEM']);
+        $result1 = $object->fetch((int) $tmptag['MEM']);
         $result2 = $adht->fetch($object->typeid);
 
         $defaultdelay = !empty($adht->duration_value) ? $adht->duration_value : 1;
@@ -503,7 +503,7 @@ 
 
                         // Set amount for the subscription:
                         // - First check the amount of the member type.
-                        $amountbytype = $adht->amountByType(1);     // Load the array of amount per type
+                        $amountbytype = $adht->amountByType(1); // Load the array of amount per type
                         $amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid];
                         // - If not found, take the default amount
                         if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
@@ -558,7 +558,7 @@ 
                 if ($object->datefin > 0) {
                     $datesubscription = dol_time_plus_duree($object->datefin, 1, 'd');
                 } elseif (getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER')) {
-                    $datesubscription = dol_time_plus_duree($now, (int)substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), 0, -1), substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), -1));
+                    $datesubscription = dol_time_plus_duree($now, (int) substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), 0, -1), substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), -1));
                 }
 
                 if (getDolGlobalString('MEMBER_SUBSCRIPTION_START_FIRST_DAY_OF') === "m") {
@@ -703,7 +703,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
 
@@ -718,7 +718,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_...)
@@ -737,7 +737,7 @@ 
                                         }
                                     } else {
                                         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc, login, key_account, site, site_account, status, entity, date_creation, fk_user_creat)";
-                                        $sql .= " VALUES (" . ((int)$object->fk_soc) . ", '', '" . $db->escape($stripecu) . "', 'stripe', '" . $db->escape($stripearrayofkeysbyenv[$servicestatus]['publishable_key']) . "', " . ((int)$servicestatus) . ", " . ((int)$conf->entity) . ", '" . $db->idate(dol_now()) . "', 0)";
+                                        $sql .= " VALUES (" . ((int) $object->fk_soc) . ", '', '" . $db->escape($stripecu) . "', 'stripe', '" . $db->escape($stripearrayofkeysbyenv[$servicestatus]['publishable_key']) . "', " . ((int) $servicestatus) . ", " . ((int) $conf->entity) . ", '" . $db->idate(dol_now()) . "', 0)";
                                         $resql = $db->query($sql);
                                         if (!$resql) {  // should not happen
                                             $error++;
@@ -867,7 +867,7 @@ 
     } elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0) {
         // Record payment
         $object = new Facture($db);
-        $result = $object->fetch((int)$tmptag['INV']);
+        $result = $object->fetch((int) $tmptag['INV']);
         if ($result) {
             $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -918,7 +918,7 @@ 
                 $paiement->paiementid = $paymentTypeId;
                 $paiement->num_payment = '';
                 $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-                $paiement->ext_payment_id = $TRANSACTIONID;     // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
+                $paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR 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'];  // TODO LDR It would be better if we could store this. Do we have customer->id and publishable_key ?
                 $paiement->ext_payment_site = $service;
 
@@ -991,7 +991,7 @@ 
         }
     } elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
         $object = new Commande($db);
-        $result = $object->fetch((int)$tmptag['ORD']);
+        $result = $object->fetch((int) $tmptag['ORD']);
         if ($result) {
             $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -1044,8 +1044,8 @@ 
                         $paiement->paiementid = $paymentTypeId;
                         $paiement->num_payment = '';
                         $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-                        $paiement->ext_payment_id = $TRANSACTIONID;     // pi_... for Stripe, ...
-                        $paiement->ext_payment_site = $service;         // 'StripeLive' or 'Stripe', or ...
+                        $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
+                        $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
                         if (!$error) {
                             $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
@@ -1124,7 +1124,7 @@ 
         }
     } elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
         $don = new Don($db);
-        $result = $don->fetch((int)$tmptag['DON']);
+        $result = $don->fetch((int) $tmptag['DON']);
         if ($result) {
             $paymentTypeId = 0;
             if ($paymentmethod == 'paybox') {
@@ -1366,7 +1366,7 @@ 
 
                     if (!$error) {
                         // Validating the attendee
-                        $resultattendee = $attendeetovalidate->fetch((int)$tmptag['ATT']);
+                        $resultattendee = $attendeetovalidate->fetch((int) $tmptag['ATT']);
                         if ($resultattendee < 0) {
                             $error++;
                             setEventMessages(null, $attendeetovalidate->errors, "errors");
@@ -1592,7 +1592,7 @@ 
                     if (!$error) {
                         // Putting the booth to "suggested" state
                         $booth = new ConferenceOrBooth($db);
-                        $resultbooth = $booth->fetch((int)$tmptag['BOO']);
+                        $resultbooth = $booth->fetch((int) $tmptag['BOO']);
                         if ($resultbooth < 0) {
                             $error++;
                             setEventMessages(null, $booth->errors, "errors");
@@ -1681,7 +1681,7 @@ 
         }
     } elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
         $object = new Contrat($db);
-        $result = $object->fetch((int)$tmptag['CON']);
+        $result = $object->fetch((int) $tmptag['CON']);
         if ($result) {
             $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -1718,7 +1718,7 @@ 
             if (isModEnabled('invoice')) {
                 if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
                     $invoice = new Facture($db);
-                    $result = $invoice->createFromContract($object, $user, array((int)$contract_lines));
+                    $result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
                     if ($result > 0) {
                         // $object->classifyBilled($user);
                         $invoice->validate($user);
@@ -1737,8 +1737,8 @@ 
                         $paiement->paiementid = $paymentTypeId;
                         $paiement->num_payment = '';
                         $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-                        $paiement->ext_payment_id = $TRANSACTIONID;     // pi_... for Stripe, ...
-                        $paiement->ext_payment_site = $service;         // 'StripeLive' or 'Stripe', or ...
+                        $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
+                        $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
                         if (!$error) {
                             $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
@@ -1835,7 +1835,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')) {
         // Call trigger
@@ -1911,12 +1911,12 @@ 
         $topic = '[' . $appli . '] ' . $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived");
         $content = "";
         if (array_key_exists('MEM', $tmptag)) {
-            $url = $urlwithroot . "/adherents/subscription.php?rowid=" . ((int)$tmptag['MEM']);
+            $url = $urlwithroot . "/adherents/subscription.php?rowid=" . ((int) $tmptag['MEM']);
             $content .= '<strong>' . $companylangs->trans("PaymentSubscription") . "</strong><br><br>\n";
             $content .= $companylangs->trans("MemberId") . ': <strong>' . $tmptag['MEM'] . "</strong><br>\n";
             $content .= $companylangs->trans("Link") . ': <a href="' . $url . '">' . $url . '</a>' . "<br>\n";
         } elseif (array_key_exists('INV', $tmptag)) {
-            $url = $urlwithroot . "/compta/facture/card.php?id=" . ((int)$tmptag['INV']);
+            $url = $urlwithroot . "/compta/facture/card.php?id=" . ((int) $tmptag['INV']);
             $content .= '<strong>' . $companylangs->trans("Payment") . "</strong><br><br>\n";
             $content .= $companylangs->trans("InvoiceId") . ': <strong>' . $tmptag['INV'] . "</strong><br>\n";
             //$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";

public/htdocs/public/payment/newpayment.php

Spacing +21 added lines, -21 removed lines

@@ -55,15 +55,15 @@ 
  *      \brief      File to offer a way to make a payment for a particular Dolibarr object
  */
 
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
 // Because 2 entities can have the same ref.
-$entity = (!empty($_GET['entity']) ? (int)$_GET['entity'] : (!empty($_POST['entity']) ? (int)$_POST['entity'] : (!empty($_GET['e']) ? (int)$_GET['e'] : (!empty($_POST['e']) ? (int)$_POST['e'] : 1))));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1))));
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }
@@ -142,7 +142,7 @@ 
             $attendeeid = $linkedAttendees[0];
         }*/
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "eventorganization_conferenceorboothattendee";
-        $sql .= " WHERE fk_invoice = " . ((int)$invoiceid);
+        $sql .= " WHERE fk_invoice = " . ((int) $invoiceid);
         $resql = $db->query($sql);
         if ($resql) {
             $obj = $db->fetch_object($resql);
@@ -250,8 +250,8 @@ 
     $urlko .= 'securekey=' . urlencode($SECUREKEY) . '&';
 }
 if (!empty($entity)) {
-    $urlok .= 'e=' . urlencode((string)($entity)) . '&';
-    $urlko .= 'e=' . urlencode((string)($entity)) . '&';
+    $urlok .= 'e=' . urlencode((string) ($entity)) . '&';
+    $urlko .= 'e=' . urlencode((string) ($entity)) . '&';
 }
 if (!empty($getpostlang)) {
     $urlok .= 'lang=' . urlencode($getpostlang) . '&';
@@ -354,7 +354,7 @@ 
 if (!empty($conf->global->$paramcreditorlong)) {
     $creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
 } elseif (!empty($conf->global->$paramcreditor)) {
-    $creditor = getDolGlobalString($paramcreditor);     // use label short of the seller to show
+    $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
 }
 
 $mesg = '';
@@ -802,8 +802,8 @@ 
     $remoteip = getUserRemoteIP();
 
     $_SESSION["onlinetoken"] = $stripeToken;
-    $_SESSION["FinalPaymentAmt"] = $amount;         // amount really paid (coming from Stripe). Will be used for check in paymentok.php.
-    $_SESSION["currencyCodeType"] = $currency;      // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
+    $_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php.
+    $_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
     $_SESSION["paymentType"] = '';
     $_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
     $_SESSION['payerID'] = is_object($customer) ? $customer->id : '';
@@ -986,7 +986,7 @@ 
 print $text;
 
 // Output payment summary form
-print '<tr><td align="center">';    // class=center does not have the payment button centered so we keep align here.
+print '<tr><td align="center">'; // class=center does not have the payment button centered so we keep align here.
 print '<table class="centpercent left" id="tablepublicpayment">';
 print '<tr class="hideonsmartphone"><td colspan="2" align="left" class="opacitymedium">' . $langs->trans("ThisIsInformationOnPayment") . ' :</td></tr>' . "\n";
 
@@ -1026,7 +1026,7 @@ 
         // Currency
         print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
     } else {
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
         print '<input type="hidden" name="amount" value="' . $amount . '">';
         print '<input type="hidden" name="newamount" value="' . $amount . '">';
     }
@@ -1125,7 +1125,7 @@ 
         // Currency
         print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
     } else {
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
         print '<input type="hidden" name="amount" value="' . $amount . '">';
         print '<input type="hidden" name="newamount" value="' . $amount . '">';
     }
@@ -1256,12 +1256,12 @@ 
             print '<input class="flat maxwidth75" type="text" name="newamount" value="' . price2num(GETPOST("newamount", "alpha"), 'MT') . '">';
             print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
         } else {
-            print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
+            print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
             print '<input type="hidden" name="amount" value="' . $amount . '">';
             print '<input type="hidden" name="newamount" value="' . $amount . '">';
         }
     } else {
-        print '<b class="amount">' . price($object->total_ttc, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
+        print '<b class="amount">' . price($object->total_ttc, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
     }
     print '<input type="hidden" name="currency" value="' . $currency . '">';
     print '</td></tr>' . "\n";
@@ -1464,7 +1464,7 @@ 
         // Currency
         print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
     } else {
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
         print '<input type="hidden" name="amount" value="' . $amount . '">';
         print '<input type="hidden" name="newamount" value="' . $amount . '">';
     }
@@ -1619,7 +1619,7 @@ 
 
     if ($member->type) {
         $oldtypeid = $member->typeid;
-        $newtypeid = (int)(GETPOSTISSET("typeid") ? GETPOSTINT("typeid") : $member->typeid);
+        $newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOSTINT("typeid") : $member->typeid);
 
         if (getDolGlobalString('MEMBER_ALLOW_CHANGE_OF_TYPE')) {
             $adht = new AdherentType($db);
@@ -1633,7 +1633,7 @@ 
 
             // Set the new member type
             $member->typeid = $newtypeid;
-            $member->type = (string)dol_getIdFromCode($db, $newtypeid, 'adherent_type', 'rowid', 'libelle');
+            $member->type = (string) dol_getIdFromCode($db, $newtypeid, 'adherent_type', 'rowid', 'libelle');
 
             // list member type
             if (!$action) {
@@ -1677,7 +1677,7 @@ 
             print '<input type="text" class="width75" name="newamount" value="' . price($amount, 1, $langs, 1, -1, -1) . '">';
         }
     } else {
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
         if ($minimumamount > $amount) {
             print ' &nbsp; <span class="opacitymedium small">' . $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)) . '</span>';
         }
@@ -1837,7 +1837,7 @@ 
             $valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow);
             $amount = $valtoshow;
         }
-        print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
+        print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
         print '<input type="hidden" name="amount" value="' . $valtoshow . '">';
         print '<input type="hidden" name="newamount" value="' . $valtoshow . '">';
     }
@@ -1930,7 +1930,7 @@ 
     print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Amount");
     print '</td><td class="CTableRow2">';
     $valtoshow = $amount;
-    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
+    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
     print '<input type="hidden" name="amount" value="' . $valtoshow . '">';
     print '<input type="hidden" name="newamount" value="' . $valtoshow . '">';
     print '<input type="hidden" name="currency" value="' . $currency . '">';
@@ -2014,7 +2014,7 @@ 
     print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Amount");
     print '</td><td class="CTableRow2">';
     $valtoshow = $amount;
-    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
+    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
     print '<input type="hidden" name="amount" value="' . $valtoshow . '">';
     print '<input type="hidden" name="newamount" value="' . $valtoshow . '">';
     print '<input type="hidden" name="currency" value="' . $currency . '">';

public/htdocs/public/payment/paymentko.php

Spacing +3 added lines, -3 removed lines

@@ -32,15 +32,15 @@
  *                  This token can be used to get more information.
  */
 
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and this test must be done before including main.inc.php
 // Because 2 entities can have the same ref.
-$entity = (!empty($_GET['e']) ? (int)$_GET['e'] : (!empty($_POST['e']) ? (int)$_POST['e'] : 1));
+$entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }

public/htdocs/public/partnership/new.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@ 
  */
 
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // Because 2 entities can have the same ref.
-$entity = (!empty($_GET['entity']) ? (int)$_GET['entity'] : (!empty($_POST['entity']) ? (int)$_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }
@@ -674,7 +674,7 @@ 
 //print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
 // Other attributes
 $parameters['tdclass'] = 'titlefieldauto';
-$parameters['tpl_context'] = 'public';  // define template context to public
+$parameters['tpl_context'] = 'public'; // define template context to public
 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';

public/htdocs/public/clicktodial/cidlookup.php

Spacing +3 added lines, -3 removed lines

@@ -30,11 +30,11 @@
  *              Change SECURITYKEY to the value defined into your setup of module ClickToDial
  */
 
-Functions::defineIfNotDefined('NOTOKENRENEWAL', 1);  // Disables token renewal
-Functions::defineIfNotDefined('NOREQUIREMENU', 1);  // If there is no need to load and show top and left menu
+Functions::defineIfNotDefined('NOTOKENRENEWAL', 1); // Disables token renewal
+Functions::defineIfNotDefined('NOREQUIREMENU', 1); // If there is no need to load and show top and left menu
 Functions::defineIfNotDefined('NOREQUIREHTML', 1); // If we don't need to load the html.form.class.php
 Functions::defineIfNotDefined('NOREQUIREAJAX', 1); // Do not load ajax.lib.php library
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // So log file will have a suffix

public/htdocs/public/users/view.php

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@ 
  *       \brief      Public file to user profile
  */
 
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 // Load Dolibarr environment
 require constant('DOL_DOCUMENT_ROOT') . '/main.inc.php';
@@ -277,7 +277,7 @@ 
 
     print '<br>';
     print '<div class="floatleft inline-block valignmiddle paddingleft paddingright">';
-    print '<img style="max-width: 100%" src="' . $dolibarr_main_url_root . '/viewimage.php?modulepart=barcode&entity=' . ((int)$conf->entity) . '&generator=tcpdfbarcode&encoding=QRCODE&code=' . urlencode($qrcodecontent) . '">';
+    print '<img style="max-width: 100%" src="' . $dolibarr_main_url_root . '/viewimage.php?modulepart=barcode&entity=' . ((int) $conf->entity) . '&generator=tcpdfbarcode&encoding=QRCODE&code=' . urlencode($qrcodecontent) . '">';
     print '</div>';
     print '<br>';
 }

public/htdocs/public/agenda/agendaexport.php

Spacing +4 added lines, -4 removed lines

@@ -35,11 +35,11 @@ 
  *              &id=..., &idfrom=..., &idto=...
  */
 
-Functions::defineIfNotDefined('NOTOKENRENEWAL', 1);  // Disables token renewal
-Functions::defineIfNotDefined('NOREQUIREMENU', 1);  // If there is no need to load and show top and left menu
+Functions::defineIfNotDefined('NOTOKENRENEWAL', 1); // Disables token renewal
+Functions::defineIfNotDefined('NOREQUIREMENU', 1); // If there is no need to load and show top and left menu
 Functions::defineIfNotDefined('NOREQUIREHTML', 1); // If we don't need to load the html.form.class.php
 Functions::defineIfNotDefined('NOREQUIREAJAX', 1); // Do not load ajax.lib.php library
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
@@ -69,7 +69,7 @@ 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // Because 2 entities can have the same ref
-$entity = (!empty($_GET['entity']) ? (int)$_GET['entity'] : (!empty($_POST['entity']) ? (int)$_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }

public/htdocs/public/notice.php

Spacing +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
  *              /public/notice.php?transphrase=sentence_to_show
  */
 
-Functions::defineIfNotDefined('NOLOGIN', 1);  // File must be accessed by logon page so without login
+Functions::defineIfNotDefined('NOLOGIN', 1); // File must be accessed by logon page so without login
 Functions::defineIfNotDefined('NOCSRFCHECK', 1); // We accept to go on this page from external web site.
 Functions::defineIfNotDefined('NOIPCHECK', 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-Functions::defineIfNotDefined('NOSESSION', 1);   // On CLI mode, no need to use web sessions
-Functions::defineIfNotDefined('NOBROWSERNOTIF', 1);  // Disable browser notification
+Functions::defineIfNotDefined('NOSESSION', 1); // On CLI mode, no need to use web sessions
+Functions::defineIfNotDefined('NOBROWSERNOTIF', 1); // Disable browser notification
 
 // Load Dolibarr environment
 require constant('DOL_DOCUMENT_ROOT') . '/main.inc.php';