injitools / cms-Inji

system/modules/Users/Users.php

Braces +13 added lines, -10 removed lines

@@ -236,17 +236,20 @@
      * @return boolean|\Users\User
      */
     public function get($idn, $ltype = 'id') {
-        if (!$idn)
-            return false;
+        if (!$idn) {
+                    return false;
+        }
 
-        if (is_numeric($idn) && $ltype != 'login')
-            $user = Users\User::get($idn, 'id');
-        elseif ($ltype == 'login')
-            $user = Users\User::get($idn, 'login');
-        else
-            $user = Users\User::get($idn, 'mail');
-        if (!$user)
-            return [];
+        if (is_numeric($idn) && $ltype != 'login') {
+                    $user = Users\User::get($idn, 'id');
+        } elseif ($ltype == 'login') {
+                    $user = Users\User::get($idn, 'login');
+        } else {
+                    $user = Users\User::get($idn, 'mail');
+        }
+        if (!$user) {
+                    return [];
+        }
 
         return $user;
     }

Doc Comments +4 added lines

@@ -258,6 +258,10 @@
         return $user;
     }
 
+    /**
+     * @param string $err
+     * @param boolean $msg
+     */
     private function msgOrErr($err, $msg) {
         if ($msg) {
             Msg::add($err, 'danger');

system/modules/Users/appControllers/UsersController.php

Spacing +4 added lines, -4 removed lines

@@ -112,8 +112,8 @@ 
     }
 
     public function activationAction($userId = 0, $hash = '') {
-        $user = \Users\User::get((int)$userId);
-        if (!$user || !$hash || $user->activation !== (string)$hash) {
+        $user = \Users\User::get((int) $userId);
+        if (!$user || !$hash || $user->activation !== (string) $hash) {
             Tools::redirect('/', 'Во время активации произошли ошибки', 'danger');
         }
         $user->activation = '';
@@ -156,7 +156,7 @@ 
     }
 
     public function resendActivationAction($userId = 0) {
-        $user = \Users\User::get((int)$userId);
+        $user = \Users\User::get((int) $userId);
         if (!$user) {
             Tools::redirect('/', 'Не указан пользователь', 'danger');
         }
@@ -172,7 +172,7 @@ 
     }
 
     public function getPartnerInfoAction($userId = 0) {
-        $userId = (int)$userId;
+        $userId = (int) $userId;
         $result = new \Server\Result();
         if (!$userId) {
             $result->success = false;

system/modules/Ecommerce/models/Item/Offer.php

Spacing +4 added lines, -4 removed lines

@@ -102,12 +102,12 @@ 
     public function changeWarehouse($count) {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count += (float)$count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count += (float)$count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }
@@ -134,7 +134,7 @@ 
         \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0) as `sum` ';
         \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
         if ($cart_id) {
-            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int)$cart_id, '!=');
+            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int) $cart_id, '!=');
         }
         $on = '
             ' . \Ecommerce\Cart::index() . ' = ' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
@@ -146,7 +146,7 @@ 
 
 
         $blocked = \App::$cur->db->select(\Ecommerce\Warehouse\Block::table())->fetch();
-        return (float)$warehouse['sum'] - (float)$blocked['sum'];
+        return (float) $warehouse['sum'] - (float) $blocked['sum'];
     }
 
     public function beforeDelete() {