alxarafe / alixar

htdocs/api/class/api_setup.class.php

Indentation +2 added lines, -2 removed lines

@@ -722,7 +722,7 @@ 
         return $list;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -731,7 +731,7 @@ 
      */
     protected function _cleanObjectDatas($object)
     {
-		// phpcs:enable
+        // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
         unset($object->error);

Spacing +2 added lines, -2 removed lines

@@ -1170,7 +1170,7 @@ 
                     $list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
                     $list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
                     $list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-                    $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : '');    // This may be a string encoded with serialise() or json_encode()
+                    $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode()
                     $list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
                     $list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
                     $list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
@@ -2109,7 +2109,7 @@ 
                 throw new RestException(500, $langs->trans('XmlNotFound') . ': /install/' . $xmlshortfile);
             }
         } else {
-            $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);    // Accept http or https links on external remote server only. Same is used into filecheck.php.
+            $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php.
 
             // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
             if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {

htdocs/api/class/api.class.php

Indentation +11 added lines, -11 removed lines

@@ -70,7 +70,7 @@ 
         //$this->r->setSupportedFormats('jsonFormat');
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Check and convert a string depending on its type/name.
      *
@@ -83,7 +83,7 @@ 
      */
     protected function _checkValForAPI($field, $value, $object)
     {
-		// phpcs:enable
+        // phpcs:enable
         if (!is_array($value)) {
             // TODO Use type detected in $object->fields if $object known and we can
             if (in_array($field, array('note', 'note_private', 'note_public', 'desc', 'description'))) {
@@ -98,7 +98,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Filter properties that will be returned on object
      *
@@ -121,7 +121,7 @@ 
         return $object;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -130,7 +130,7 @@ 
      */
     protected function _cleanObjectDatas($object)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Remove $db object property for object
         unset($object->db);
         unset($object->isextrafieldmanaged);
@@ -288,7 +288,7 @@ 
         return $object;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Check access by user to a given resource
      *
@@ -302,7 +302,7 @@ 
      */
     protected static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
     {
-		// phpcs:enable
+        // phpcs:enable
         // Features/modules to check
         $featuresarray = array($resource);
         if (preg_match('/&/', $resource)) {
@@ -319,7 +319,7 @@ 
         return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray, $resource_id, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Return if a $sqlfilters parameter is valid
      * Function no more used. Kept for backward compatibility with old APIs of modules
@@ -330,13 +330,13 @@ 
      */
     protected function _checkFilters($sqlfilters, &$error = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $firstandlastparenthesis = 0;
         return dolCheckFilters($sqlfilters, $error, $firstandlastparenthesis);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Function to forge a SQL criteria from a Generic filter string.
      * Function no more used. Kept for backward compatibility with old APIs of modules

Spacing +5 added lines, -5 removed lines

@@ -158,11 +158,11 @@
         unset($object->barcode_type_code);
         unset($object->barcode_type_label);
 
-        unset($object->mode_reglement);     // We use mode_reglement_id now
-        unset($object->cond_reglement);     // We use cond_reglement_id now
-        unset($object->note);               // We use note_public or note_private now
-        unset($object->contact);            // We use contact_id now
-        unset($object->thirdparty);         // We use thirdparty_id or fk_soc or socid now
+        unset($object->mode_reglement); // We use mode_reglement_id now
+        unset($object->cond_reglement); // We use cond_reglement_id now
+        unset($object->note); // We use note_public or note_private now
+        unset($object->contact); // We use contact_id now
+        unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now
 
         unset($object->projet); // Should be fk_project
         unset($object->project); // Should be fk_project

htdocs/api/class/api_documents.class.php

Indentation +2 added lines, -2 removed lines

@@ -995,7 +995,7 @@ 
         throw new RestException(403);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
     /**
      * Validate fields before create or update object
      *
@@ -1005,7 +1005,7 @@ 
      */
     private function _validate_file($data)
     {
-		// phpcs:enable
+        // phpcs:enable
         $result = array();
         foreach (Documents::$DOCUMENT_FIELDS as $field) {
             if (!isset($data[$field])) {

Spacing +2 added lines, -2 removed lines

@@ -580,7 +580,7 @@ 
         }
 
         $objectType = $modulepart;
-        if (! empty($object->id) && ! empty($object->table_element)) {
+        if (!empty($object->id) && !empty($object->table_element)) {
             $objectType = $object->table_element;
         }
 
@@ -596,7 +596,7 @@ 
                     throw new RestException(503, 'Error when retrieve ecm list : ' . $this->db->lasterror());
                 } elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
                     $count = count($filearray);
-                    for ($i = 0 ; $i < $count ; $i++) {
+                    for ($i = 0; $i < $count; $i++) {
                         if ($filearray[$i]['name'] == $ecmfile->lines[$i]->filename) {
                             $filearray[$i] = array_merge($filearray[$i], (array) $ecmfile->lines[0]);
                         }

htdocs/public/payment/newpayment.php

Indentation +1 added lines, -1 removed lines

@@ -585,7 +585,7 @@
                             'metadata' => $metadata,
                             'customer' => $customer->id,
                             'source' => $card,
-                          'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+                            'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
                         ), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
                         // Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
                         if (empty($charge)) {

Spacing +14 added lines, -14 removed lines

@@ -312,7 +312,7 @@ 
         $tokenisok = ($conf->global->PAYMENT_SECURITY_TOKEN == $SECUREKEY);
     }
 
-    if (! $tokenisok) {
+    if (!$tokenisok) {
         if (!getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) {
             $valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
         } else {
@@ -343,7 +343,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 = '';
@@ -792,8 +792,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 : '';
@@ -1014,7 +1014,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 . '">';
     }
@@ -1115,7 +1115,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 . '">';
     }
@@ -1246,12 +1246,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";
@@ -1446,7 +1446,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 . '">';
     }
@@ -1664,7 +1664,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>';
         }
@@ -1825,7 +1825,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 . '">';
     }
@@ -1901,7 +1901,7 @@ 
     print '</b>';
     print '</td></tr>' . "\n";
 
-    if (! is_object($attendee->project)) {
+    if (!is_object($attendee->project)) {
         $text = 'ErrorProjectNotFound';
     } else {
         $text = $langs->trans("PaymentEvent") . ' - ' . $attendee->project->title;
@@ -1918,7 +1918,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 . '">';
@@ -2002,7 +2002,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 . '">';

htdocs/public/webportal/logout.php

Braces +3 added lines, -1 removed lines

@@ -49,7 +49,9 @@
 }
 
 // Not sure this is required
-if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']);
+if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) {
+    unset($_SESSION['webportal_logged_thirdparty_account_id']);
+}
 
 if (GETPOST('noredirect')) {
     return;

htdocs/public/ticket/view.php

Indentation +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
             $formticket->trackid = 'tic' . $object->dao->id;
 
             $formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1',
-                                       'returnurl' => DOL_URL_ROOT . '/public/ticket/view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : ''));
+                                        'returnurl' => DOL_URL_ROOT . '/public/ticket/view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : ''));
 
             $formticket->withfile = 2;
             $formticket->withcancel = 1;

htdocs/webportal/class/webportalorder.class.php

Indentation +2 added lines, -2 removed lines

@@ -320,7 +320,7 @@ 
         return $this->LibStatut($this->fk_statut, $this->billed, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return label of status
      *
@@ -332,7 +332,7 @@ 
      */
     public function LibStatut($status, $billed, $mode, $donotshowbilled = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->getOrderStatic()->LibStatut($status, $billed, $mode, $donotshowbilled);
     }
 }

htdocs/webportal/class/webportalmember.class.php

Indentation +2 added lines, -2 removed lines

@@ -390,7 +390,7 @@ 
         return $this->LibStatut($this->status, $this->need_subscription, $this->datefin, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 
     /**
      * Renvoi le libelle d'un statut donne
@@ -403,7 +403,7 @@ 
      */
     public function LibStatut($status, $need_subscription, $date_end_subscription, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->getMemberStatic()->LibStatut($status, $need_subscription, $date_end_subscription, $mode);
     }
 

htdocs/webportal/class/controller.class.php

Indentation +5 added lines, -5 removed lines

@@ -17,11 +17,11 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
- /**
- * \file       htdocs/webportal/class/controller.class.php
- * \ingroup    webportal
- * \brief      File of controller class for WebPortal
- */
+    /**
+     * \file       htdocs/webportal/class/controller.class.php
+     * \ingroup    webportal
+     * \brief      File of controller class for WebPortal
+     */
 
 /**
  *  Class to manage pages

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
         /* Use $context singleton to modify menu, */
         $parameters['controller'] = $context->controller;
 
-        $reshook = $hookmanager->executeHooks('doActions', $parameters, $context, $context->action);    // Note that $action and $object may have been modified by hook
+        $reshook = $hookmanager->executeHooks('doActions', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook
         if ($reshook < 0) {
             $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
         }
@@ -177,7 +177,7 @@ 
         /* Use $context singleton to modify menu, */
         $parameters['controller'] = $context->controller;
 
-        $reshook = $hookmanager->executeHooks('PrintPageView', $parameters, $context, $context->action);    // Note that $action and $object may have been modified by hook
+        $reshook = $hookmanager->executeHooks('PrintPageView', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook
         if ($reshook < 0) {
             $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
         }