alxarafe / alixar

htdocs/install/upgrade2.php

Spacing +2 added lines, -2 removed lines

@@ -4207,7 +4207,7 @@ 
     }
 
     if (!is_object($user)) {
-        $user = new User($db);  // To avoid error during migration
+        $user = new User($db); // To avoid error during migration
     }
 
     dolibarr_install_syslog("upgrade2::migrate_reload_modules force=" . $force . ", listofmodule=" . implode(',', array_keys($listofmodule)));
@@ -5038,7 +5038,7 @@ 
                 $error++;
             }
 
-            $current_contract =  $obj->cid;
+            $current_contract = $obj->cid;
         }
     } else {
         $error++;

htdocs/index_dol.php

Spacing +11 added lines, -11 removed lines

@@ -206,7 +206,7 @@ 
     }
 
     // Number of supplier proposals open (expired)
-    if (isModEnabled('supplier_proposal')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
+    if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
         $langs->load("supplier_proposal");
         $board = new SupplierProposal($db);
         $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
@@ -215,7 +215,7 @@ 
     }
 
     // Number of sales orders
-    if (isModEnabled('order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
+    if (isModEnabled('order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
         $board = new Commande($db);
         // Number of customer orders to be shipped (validated and in progress)
         $dashboardlines[$board->element . '_toship'] = $board->load_board($user, 'toship');
@@ -228,14 +228,14 @@ 
     }
 
     // Number of suppliers orders
-    if (isModEnabled('supplier_order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
+    if (isModEnabled('supplier_order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
         $board = new CommandeFournisseur($db);
         $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
         $dashboardlines[$board->element . '_awaiting'] = $board->load_board($user, 'awaiting');
     }
 
     // Number of contract / services enabled (delayed)
-    if (isModEnabled('contract')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
+    if (isModEnabled('contract') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
         $board = new Contrat($db);
         $dashboardlines[$board->element . '_inactive'] = $board->load_board($user, "inactive");
         // Number of active services (expired)
@@ -243,7 +243,7 @@ 
     }
 
     // Number of tickets open
-    if (isModEnabled('ticket')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
+    if (isModEnabled('ticket') && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
         $board = new Ticket($db);
         $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
         // Number of active services (expired)
@@ -263,7 +263,7 @@ 
     }
 
     // Number of transactions to conciliate
-    if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+    if (isModEnabled('bank') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
         $board = new Account($db);
         $nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
         if ($nb > 0) {
@@ -273,7 +273,7 @@ 
 
 
     // Number of cheque to send
-    if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+    if (isModEnabled('bank') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
         if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT')) {
             include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
             $board = new RemiseCheque($db);
@@ -292,26 +292,26 @@ 
     }
 
     // Number of foundation members
-    if (isModEnabled('member')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
+    if (isModEnabled('member') && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
         $board = new Adherent($db);
         $dashboardlines[$board->element . '_shift'] = $board->load_board($user, 'shift');
         $dashboardlines[$board->element . '_expired'] = $board->load_board($user, 'expired');
     }
 
     // Number of expense reports to approve
-    if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
+    if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
         $board = new ExpenseReport($db);
         $dashboardlines[$board->element . '_toapprove'] = $board->load_board($user, 'toapprove');
     }
 
     // Number of expense reports to pay
-    if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
+    if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
         $board = new ExpenseReport($db);
         $dashboardlines[$board->element . '_topay'] = $board->load_board($user, 'topay');
     }
 
     // Number of holidays to approve
-    if (isModEnabled('holiday')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
+    if (isModEnabled('holiday') && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
         $board = new Holiday($db);
         $dashboardlines[$board->element] = $board->load_board($user);
     }

htdocs/core/modules/DolibarrModules.class.php

Spacing +3 added lines, -3 removed lines

@@ -1477,7 +1477,7 @@ 
 
                 $sql = "DELETE FROM " . MAIN_DB_PREFIX . "boxes_def";
                 $sql .= " WHERE file = '" . $this->db->escape($file) . "'";
-                $sql .= " AND entity = " . $conf->entity;     // Do not use getEntity here, we want to delete only in current company
+                $sql .= " AND entity = " . $conf->entity; // Do not use getEntity here, we want to delete only in current company
 
                 dol_syslog(get_class($this) . "::delete_boxes", LOG_DEBUG);
                 $resql = $this->db->query($sql);
@@ -1895,7 +1895,7 @@ 
             if ($obj !== null && !empty($obj->value) && !empty($this->rights)) {
                 // If the module is active
                 foreach ($this->rights as $key => $value) {
-                    $r_id = $this->rights[$key][0];   // permission id in llx_rights_def (not unique because primary key is couple id-entity)
+                    $r_id = $this->rights[$key][0]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
                     $r_desc = $this->rights[$key][1];
                     $r_type = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
                     $r_def = empty($this->rights[$key][3]) ? 0 : $this->rights[$key][3];
@@ -2585,7 +2585,7 @@ 
     {
         require_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php';
         if (!empty($this->url_last_version)) {
-            $lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, [], ['http', 'https'], 0);    // Accept http or https links on external remote server only
+            $lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, [], ['http', 'https'], 0); // Accept http or https links on external remote server only
             if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
                 // Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
                 $this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);

Core/Tools/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -53,6 +53,6 @@
         if ($controller === null) {
             return false;
         }
-        return $controller->index();;
+        return $controller->index(); ;
     }
 }