Passed
Push — GENERAL_BUG_REVIEW_240911 ( 776d89...c757bd )
by Rafael
50:33
created
public/htdocs/public/project/new.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
         } else {
224 224
             // Create the prospect
225 225
             if (GETPOST('societe')) {
226
-                $thirdparty->name =  GETPOST('societe');
226
+                $thirdparty->name = GETPOST('societe');
227 227
                 $thirdparty->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
228 228
             } else {
229 229
                 $thirdparty->name = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
         $proj->title       = $langs->trans("LeadFromPublicForm");
309 309
         $proj->description = GETPOST("description", "alphanohtml");
310 310
         $proj->opp_status  = $defaultoppstatus;
311
-        $proj->fk_opp_status  = $defaultoppstatus;
311
+        $proj->fk_opp_status = $defaultoppstatus;
312 312
 
313 313
         $proj->ip = getUserRemoteIP();
314 314
         $nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 200);
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 }
552 552
 
553 553
 // Other attributes
554
-$parameters['tpl_context'] = 'public';  // define template context to public
554
+$parameters['tpl_context'] = 'public'; // define template context to public
555 555
 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
556 556
 // Comments
557 557
 print '<tr>';
Please login to merge, or discard this patch.
public/htdocs/public/project/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -312,7 +312,7 @@
 block discarded – undo
312 312
     print '<input type="submit" value="' . $langs->trans("ViewAndVote") . '" id="viewandvote" name="viewandvote" class="button minwidth250">';
313 313
 }
314 314
 
315
-if (! $foundaction) {
315
+if (!$foundaction) {
316 316
     print '<span class="opacitymedium">' . $langs->trans("NoPublicActionsAllowedForThisEvent") . '</span>';
317 317
 }
318 318
 
Please login to merge, or discard this patch.
public/htdocs/public/payment/newpayment.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -585,7 +585,7 @@
 block discarded – undo
585 585
                             'metadata' => $metadata,
586 586
                             'customer' => $customer->id,
587 587
                             'source' => $card,
588
-                          'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
588
+                            'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
589 589
                         ), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
590 590
                         // Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
591 591
                         if (empty($charge)) {
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
         $tokenisok = ($conf->global->PAYMENT_SECURITY_TOKEN == $SECUREKEY);
320 320
     }
321 321
 
322
-    if (! $tokenisok) {
322
+    if (!$tokenisok) {
323 323
         if (!getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) {
324 324
             $valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
325 325
         } else {
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 if (!empty($conf->global->$paramcreditorlong)) {
351 351
     $creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
352 352
 } elseif (!empty($conf->global->$paramcreditor)) {
353
-    $creditor = getDolGlobalString($paramcreditor);     // use label short of the seller to show
353
+    $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
354 354
 }
355 355
 
356 356
 $mesg = '';
@@ -798,8 +798,8 @@  discard block
 block discarded – undo
798 798
     $remoteip = getUserRemoteIP();
799 799
 
800 800
     $_SESSION["onlinetoken"] = $stripeToken;
801
-    $_SESSION["FinalPaymentAmt"] = $amount;         // amount really paid (coming from Stripe). Will be used for check in paymentok.php.
802
-    $_SESSION["currencyCodeType"] = $currency;      // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
801
+    $_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php.
802
+    $_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
803 803
     $_SESSION["paymentType"] = '';
804 804
     $_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
805 805
     $_SESSION['payerID'] = is_object($customer) ? $customer->id : '';
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 print $text;
982 982
 
983 983
 // Output payment summary form
984
-print '<tr><td align="center">';    // class=center does not have the payment button centered so we keep align here.
984
+print '<tr><td align="center">'; // class=center does not have the payment button centered so we keep align here.
985 985
 print '<table class="centpercent left" id="tablepublicpayment">';
986 986
 print '<tr class="hideonsmartphone"><td colspan="2" align="left" class="opacitymedium">' . $langs->trans("ThisIsInformationOnPayment") . ' :</td></tr>' . "\n";
987 987
 
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
         // Currency
1022 1022
         print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
1023 1023
     } else {
1024
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
1024
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1025 1025
         print '<input type="hidden" name="amount" value="' . $amount . '">';
1026 1026
         print '<input type="hidden" name="newamount" value="' . $amount . '">';
1027 1027
     }
@@ -1122,7 +1122,7 @@  discard block
 block discarded – undo
1122 1122
         // Currency
1123 1123
         print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
1124 1124
     } else {
1125
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
1125
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1126 1126
         print '<input type="hidden" name="amount" value="' . $amount . '">';
1127 1127
         print '<input type="hidden" name="newamount" value="' . $amount . '">';
1128 1128
     }
@@ -1254,12 +1254,12 @@  discard block
 block discarded – undo
1254 1254
             print '<input class="flat maxwidth75" type="text" name="newamount" value="' . price2num(GETPOST("newamount", "alpha"), 'MT') . '">';
1255 1255
             print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
1256 1256
         } else {
1257
-            print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
1257
+            print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1258 1258
             print '<input type="hidden" name="amount" value="' . $amount . '">';
1259 1259
             print '<input type="hidden" name="newamount" value="' . $amount . '">';
1260 1260
         }
1261 1261
     } else {
1262
-        print '<b class="amount">' . price($object->total_ttc, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
1262
+        print '<b class="amount">' . price($object->total_ttc, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1263 1263
     }
1264 1264
     print '<input type="hidden" name="currency" value="' . $currency . '">';
1265 1265
     print '</td></tr>' . "\n";
@@ -1463,7 +1463,7 @@  discard block
 block discarded – undo
1463 1463
         // Currency
1464 1464
         print ' <b>' . $langs->trans("Currency" . $currency) . '</b>';
1465 1465
     } else {
1466
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
1466
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1467 1467
         print '<input type="hidden" name="amount" value="' . $amount . '">';
1468 1468
         print '<input type="hidden" name="newamount" value="' . $amount . '">';
1469 1469
     }
@@ -1681,7 +1681,7 @@  discard block
 block discarded – undo
1681 1681
             print '<input type="text" class="width75" name="newamount" value="' . price($amount, 1, $langs, 1, -1, -1) . '">';
1682 1682
         }
1683 1683
     } else {
1684
-        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>';  // Price with currency
1684
+        print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1685 1685
         if ($minimumamount > $amount) {
1686 1686
             print ' &nbsp; <span class="opacitymedium small">' . $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)) . '</span>';
1687 1687
         }
@@ -1842,7 +1842,7 @@  discard block
 block discarded – undo
1842 1842
             $valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow);
1843 1843
             $amount = $valtoshow;
1844 1844
         }
1845
-        print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
1845
+        print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1846 1846
         print '<input type="hidden" name="amount" value="' . $valtoshow . '">';
1847 1847
         print '<input type="hidden" name="newamount" value="' . $valtoshow . '">';
1848 1848
     }
@@ -1918,7 +1918,7 @@  discard block
 block discarded – undo
1918 1918
     print '</b>';
1919 1919
     print '</td></tr>' . "\n";
1920 1920
 
1921
-    if (! is_object($attendee->project)) {
1921
+    if (!is_object($attendee->project)) {
1922 1922
         $text = 'ErrorProjectNotFound';
1923 1923
     } else {
1924 1924
         $text = $langs->trans("PaymentEvent") . ' - ' . $attendee->project->title;
@@ -1935,7 +1935,7 @@  discard block
 block discarded – undo
1935 1935
     print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Amount");
1936 1936
     print '</td><td class="CTableRow2">';
1937 1937
     $valtoshow = $amount;
1938
-    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
1938
+    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
1939 1939
     print '<input type="hidden" name="amount" value="' . $valtoshow . '">';
1940 1940
     print '<input type="hidden" name="newamount" value="' . $valtoshow . '">';
1941 1941
     print '<input type="hidden" name="currency" value="' . $currency . '">';
@@ -2019,7 +2019,7 @@  discard block
 block discarded – undo
2019 2019
     print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Amount");
2020 2020
     print '</td><td class="CTableRow2">';
2021 2021
     $valtoshow = $amount;
2022
-    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>';   // Price with currency
2022
+    print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency
2023 2023
     print '<input type="hidden" name="amount" value="' . $valtoshow . '">';
2024 2024
     print '<input type="hidden" name="newamount" value="' . $valtoshow . '">';
2025 2025
     print '<input type="hidden" name="currency" value="' . $currency . '">';
Please login to merge, or discard this patch.
public/htdocs/public/payment/paymentok.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 if (getDolGlobalString($paramcreditorlong)) {
151 151
     $creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
152 152
 } elseif (getDolGlobalString($paramcreditor)) {
153
-    $creditor = getDolGlobalString($paramcreditor);     // use label short of the seller to show
153
+    $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
154 154
 }
155 155
 
156 156
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
             // Set by newpayment.php
280 280
             $currencyCodeType   = $_SESSION['currencyCodeType'];
281 281
             $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
282
-            $paymentType        = $_SESSION['PaymentType'];         // Value can be 'Mark', 'Sole', 'Sale' for example
282
+            $paymentType        = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example
283 283
             // From env
284 284
             $ipaddress          = $_SESSION['ipaddress'];
285 285
 
@@ -382,10 +382,10 @@  discard block
 block discarded – undo
382 382
     $ipaddress = $_SESSION['ipaddress'];
383 383
 }
384 384
 if (empty($TRANSACTIONID)) {
385
-    $TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID'];    // pi_... or ch_...
385
+    $TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_...
386 386
     if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
387 387
         // For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
388
-        $TRANSACTIONID   = GETPOST('payment_intent', 'alphanohtml');
388
+        $TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
389 389
     }
390 390
 }
391 391
 if (empty($FinalPaymentAmt)) {
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 
491 491
                         // Set amount for the subscription:
492 492
                         // - First check the amount of the member type.
493
-                        $amountbytype = $adht->amountByType(1);     // Load the array of amount per type
493
+                        $amountbytype = $adht->amountByType(1); // Load the array of amount per type
494 494
                         $amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid];
495 495
                         // - If not found, take the default amount
496 496
                         if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
                     dol_syslog("Failed to validate member (bad currency check): " . $errmsg, LOG_ERR, 0, '_payment');
528 528
                 }
529 529
 
530
-                if (! $error) {
530
+                if (!$error) {
531 531
                     // We validate the member (no effect if it is already validated)
532 532
                     $result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
533 533
                     if ($result < 0 || empty($object->datevalid)) {
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
                         $thirdparty = new Societe($db);
691 691
                         $thirdparty->fetch($thirdparty_id);
692 692
 
693
-                        include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';    // This also set $stripearrayofkeysbyenv
693
+                        include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv
694 694
                         $stripe = new Stripe($db);
695 695
                         //$stripeacc = $stripe->getStripeAccount($service);     Already defined previously
696 696
 
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 
706 706
                                 if (preg_match('/^pi_/', $TRANSACTIONID)) {
707 707
                                     // This may throw an error if not found.
708
-                                    $chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID);    // payment_intent (pi_...)
708
+                                    $chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...)
709 709
                                 } else {
710 710
                                     // This throw an error if not found
711 711
                                     $chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...)
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
908 908
                 $paiement->paiementid   = $paymentTypeId;
909 909
                 $paiement->num_payment = '';
910 910
                 $paiement->note_public  = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
911
-                $paiement->ext_payment_id = $TRANSACTIONID;     // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
911
+                $paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
912 912
                 //$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 ?
913 913
                 $paiement->ext_payment_site = $service;
914 914
 
@@ -1037,8 +1037,8 @@  discard block
 block discarded – undo
1037 1037
                         $paiement->paiementid = $paymentTypeId;
1038 1038
                         $paiement->num_payment = '';
1039 1039
                         $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
1040
-                        $paiement->ext_payment_id = $TRANSACTIONID;     // pi_... for Stripe, ...
1041
-                        $paiement->ext_payment_site = $service;         // 'StripeLive' or 'Stripe', or ...
1040
+                        $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
1041
+                        $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
1042 1042
 
1043 1043
                         if (!$error) {
1044 1044
                             $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
                 $paiement->datep = $now;
1170 1170
                 $paiement->paymenttype = $paymentTypeId;
1171 1171
                 $paiement->num_payment = '';
1172
-                $paiement->note_public  = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
1172
+                $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
1173 1173
                 $paiement->ext_payment_id = $TRANSACTIONID;
1174 1174
                 $paiement->ext_payment_site = $service;
1175 1175
 
@@ -1386,7 +1386,7 @@  discard block
 block discarded – undo
1386 1386
                         $db->rollback();
1387 1387
                     }
1388 1388
 
1389
-                    if (! $error) {
1389
+                    if (!$error) {
1390 1390
                         // Sending mail
1391 1391
                         $thirdparty = new Societe($db);
1392 1392
                         $resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
@@ -1749,8 +1749,8 @@  discard block
 block discarded – undo
1749 1749
                         $paiement->paiementid = $paymentTypeId;
1750 1750
                         $paiement->num_payment = '';
1751 1751
                         $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
1752
-                        $paiement->ext_payment_id = $TRANSACTIONID;     // pi_... for Stripe, ...
1753
-                        $paiement->ext_payment_site = $service;         // 'StripeLive' or 'Stripe', or ...
1752
+                        $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
1753
+                        $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
1754 1754
 
1755 1755
                         if (!$error) {
1756 1756
                             $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
@@ -1847,7 +1847,7 @@  discard block
 block discarded – undo
1847 1847
     // Set by newpayment.php
1848 1848
     $currencyCodeType   = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType'];
1849 1849
     $FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"];
1850
-    $paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType'];  // Seems used by paypal only
1850
+    $paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only
1851 1851
 
1852 1852
     if (is_object($object) && method_exists($object, 'call_trigger')) {
1853 1853
         // Call trigger
Please login to merge, or discard this patch.
public/htdocs/public/onlinesign/newonlinesign.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
         if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) {
407 407
             // It seems document has never been generated, or was generated and then deleted.
408 408
             // So we try to regenerate it with its default template.
409
-            $defaulttemplate = '';      // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
409
+            $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
410 410
             $object->generateDocument($defaulttemplate, $langs);
411 411
         }
412 412
 
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
     if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) {
478 478
         // It seems document has never been generated, or was generated and then deleted.
479 479
         // So we try to regenerate it with its default template.
480
-        $defaulttemplate = '';      // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
480
+        $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
481 481
         $object->generateDocument($defaulttemplate, $langs);
482 482
     }
483 483
 
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
     if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) {
529 529
         // It seems document has never been generated, or was generated and then deleted.
530 530
         // So we try to regenerate it with its default template.
531
-        $defaulttemplate = '';      // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
531
+        $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
532 532
         $object->generateDocument($defaulttemplate, $langs);
533 533
     }
534 534
 
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
     if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) {
635 635
         // It seems document has never been generated, or was generated and then deleted.
636 636
         // So we try to regenerate it with its default template.
637
-        $defaulttemplate = '';      // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
637
+        $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
638 638
         $object->generateDocument($defaulttemplate, $langs);
639 639
     }
640 640
     $directdownloadlink = $object->getLastMainDocLink('', 0, 0);
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
     if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) {
684 684
         // It seems document has never been generated, or was generated and then deleted.
685 685
         // So we try to regenerate it with its default template.
686
-        $defaulttemplate = '';      // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
686
+        $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
687 687
         $object->generateDocument($defaulttemplate, $langs);
688 688
     }
689 689
 
Please login to merge, or discard this patch.
public/htdocs/public/partnership/new.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -685,7 +685,7 @@
 block discarded – undo
685 685
 //print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
686 686
 // Other attributes
687 687
 $parameters['tdclass'] = 'titlefieldauto';
688
-$parameters['tpl_context'] = 'public';  // define template context to public
688
+$parameters['tpl_context'] = 'public'; // define template context to public
689 689
 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
690 690
 // Comments
691 691
 print '<tr>';
Please login to merge, or discard this patch.
public/htdocs/public/emailing/mailing-unsubscribe.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,11 +45,11 @@  discard block
 block discarded – undo
45 45
 if (!defined("NOSESSION")) {
46 46
     define("NOSESSION", '1');
47 47
 }
48
-if (! defined('NOREQUIREHTML')) {
49
-    define('NOREQUIREHTML', '1');               // If we don't need to load the html.form.class.php
48
+if (!defined('NOREQUIREHTML')) {
49
+    define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
50 50
 }
51
-if (! defined('NOREQUIREAJAX')) {
52
-    define('NOREQUIREAJAX', '1');               // Do not load ajax.lib.php library
51
+if (!defined('NOREQUIREAJAX')) {
52
+    define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library
53 53
 }
54 54
 
55 55
 
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 $mtid = GETPOST('mtid');
65 65
 $email = GETPOST('email');
66
-$tag = GETPOST('tag');  // To retrieve the emailing, and recipient
66
+$tag = GETPOST('tag'); // To retrieve the emailing, and recipient
67 67
 $unsuscrib = GETPOST('unsuscrib');
68 68
 $securitykey = GETPOST('securitykey');
69 69
 
Please login to merge, or discard this patch.
public/htdocs/product/admin/product.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 
50 50
 $action = GETPOST('action', 'aZ09');
51 51
 $value = GETPOST('value', 'alpha');
52
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
52
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
53 53
 
54 54
 $label = GETPOST('label', 'alpha');
55 55
 $scandir = GETPOST('scan_dir', 'alpha');
Please login to merge, or discard this patch.
public/htdocs/product/ajax/products.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 // type can be empty string or 0 or 1
51 51
 $type = GETPOST('type', 'int');
52 52
 $mode = GETPOSTINT('mode');
53
-$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1);   // status buy when mode = customer , status purchase when mode = supplier
54
-$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1);    // status purchase when mode = customer
53
+$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier
54
+$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer
55 55
 $outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0);
56 56
 $price_level = GETPOSTINT('price_level');
57 57
 $action = GETPOST('action', 'aZ09');
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         // Multiprice (1 price per level)
165 165
         if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6)
166 166
             $sql = "SELECT price, price_ttc, price_base_type,";
167
-            $sql .= " tva_tx, default_vat_code";    // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on.
167
+            $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on.
168 168
             $sql .= " FROM " . MAIN_DB_PREFIX . "product_price ";
169 169
             $sql .= " WHERE fk_product = " . ((int) $id);
170 170
             $sql .= " AND entity IN (" . getEntity('productprice') . ")";
@@ -177,12 +177,12 @@  discard block
 block discarded – undo
177 177
                 $objp = $db->fetch_object($result);
178 178
                 if ($objp) {
179 179
                     $found = true;
180
-                    $outprice_ht = price($objp->price);         // formatted for language user because is inserted into input field
181
-                    $outprice_ttc = price($objp->price_ttc);    // formatted for language user because is inserted into input field
180
+                    $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field
181
+                    $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field
182 182
                     $outpricebasetype = $objp->price_base_type;
183 183
                     if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
184 184
                         $outtva_tx_formated = price($objp->tva_tx); // formatted for language user because is inserted into input field
185
-                        $outtva_tx = price2num($objp->tva_tx);      // international numeric
185
+                        $outtva_tx = price2num($objp->tva_tx); // international numeric
186 186
                         $outdefault_vat_code = $objp->default_vat_code;
187 187
                     } else {
188 188
                         // The common and default behaviour.
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
         }
227 227
 
228 228
         // VAT to use and default VAT for product are set to same value by default
229
-        $product_outtva_tx_formated =  $outtva_tx_formated;
230
-        $product_outtva_tx =  $outtva_tx;
229
+        $product_outtva_tx_formated = $outtva_tx_formated;
230
+        $product_outtva_tx = $outtva_tx;
231 231
         $product_outdefault_vat_code = $outdefault_vat_code;
232 232
 
233 233
         // If we ask the price according to buyer, we change it.
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
     $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET));
296 296
     sort($match);
297 297
 
298
-    $idprod = (empty($match[0]) ? '' : $match[0]);      // Take first key found into GET array with matching $htmlname123
298
+    $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123
299 299
 
300 300
     if (GETPOST($htmlname, 'alpha') == '' && (!$idprod || !GETPOST($idprod, 'alpha'))) {
301 301
         print json_encode(array());
Please login to merge, or discard this patch.