injitools / cms-Inji

system/modules/Users/snippets/cabinetSection/usersTree.php

Braces +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php

 

-if (App::$cur->users->config['invites']) {

+if (App::$cur->users->config['invites']) {
     return [

         'name' => 'Мои партнеры',

         'fullWidget' => 'Users\cabinet/usersTree'

system/modules/Money/snippets/rewardType/currency.php

Braces +16 added lines, -16 removed lines

@@ -16,34 +16,34 @@ 
             'type' => 'decimal'

         ]

     ],

-    'viewer' => function ($level) {

+    'viewer' => function ($level) {
         $levelTypes = [

             'procent' => 'Процент',

             'amount' => 'Сумма',

         ];

         return $levelTypes[$level->params['type']->value] . ': ' . $level->params['amount']->value . ' ' . ($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : ''));

     },

-    'rewarder' => function ($reward, $sums, $user, $rootUser, $level, $rewardGet) {

+    'rewarder' => function ($reward, $sums, $user, $rootUser, $level, $rewardGet) {
         $wallets = \App::$cur->money->getUserWallets($user->id);

         $amount = 0;

-        if (!empty($wallets[$level->params['currency_id']->value])) {

-            switch ($level->params['type']->value) {

+        if (!empty($wallets[$level->params['currency_id']->value])) {
+            switch ($level->params['type']->value) {
                 case 'procent':

                     $finalSum = 0;

-                    foreach ($sums as $currency_id => $sum) {

-                        if ($currency_id != $level->params['currency_id']->value) {

+                    foreach ($sums as $currency_id => $sum) {
+                        if ($currency_id != $level->params['currency_id']->value) {
                             $rate = \Money\Currency\ExchangeRate::get([

                                 ['currency_id', $currency_id],

                                 ['target_currency_id', $level->params['currency_id']->value],

                             ]);

-                            if ($rate) {

+                            if ($rate) {
                                 $finalSum += $sum * $rate->rate;

                             }

-                        } else {

+                        } else {
                             $finalSum += $sum;

                         }

                     }

-                    switch ($reward->round_type) {

+                    switch ($reward->round_type) {
                         case 'round':

                             $finalSum = round($finalSum, $reward->round_precision);

                             $amount = $finalSum / 100 * (float)$level->params['amount']->value;

@@ -59,33 +59,33 @@ 
                 case 'amount':

                     $amount = (float)$level->params['amount']->value;

             }

-            if (!$amount) {

+            if (!$amount) {
                 return 0;

             }

 

             $text = 'Вознаграждение по программе "' . $reward->name . '"';

-            if ($rootUser->id != $user->id) {

+            if ($rootUser->id != $user->id) {
                 $text .= ' от ' . $rootUser->name();

             }

 

-            if (!$rewardGet && $reward->block) {

+            if (!$rewardGet && $reward->block) {
                 $block = new \Money\Wallet\Block();

                 $block->wallet_id = $wallets[$level->params['currency_id']->value]->id;

                 $block->amount = $amount;

                 $block->comment = $text;

                 $block->data = 'reward:' . $reward->id;

                 $dateGenerators = \App::$cur->money->getSnippets('expiredDateGenerator');

-                if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {

+                if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {
                     $date = $dateGenerators[$reward->block_date_expired]($reward, $user);

-                    if (!empty($date['date'])) {

+                    if (!empty($date['date'])) {
                         $block->date_expired = $date['date'];

                     }

-                    if (!empty($date['type'])) {

+                    if (!empty($date['type'])) {
                         $block->expired_type = $date['type'];

                     }

                 }

                 $block->save();

-            } else {

+            } else {
                 $wallets[$level->params['currency_id']->value]->diff($amount, $text);

             }

             \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount . ' ' . $wallets[$level->params['currency_id']->value]->currency->acronym());

system/modules/Money/snippets/userActivity/lastPurchase.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 

 return [

     'name' => 'Последняя покупка не позднее 90 дней',

-    'checker' => function ($user) {

+    'checker' => function ($user) {
         $query = 'SELECT * FROM inji_ecommerce_cart iec WHERE iec.cart_cart_status_id >= 5 AND iec.cart_date_create >= NOW() - INTERVAL 90 DAY AND cart_user_id = ?';

         $result = \App::$cur->db->query(['query' => $query, 'params' => [$user->id]]);

         return (bool)$result ? $result->fetch() : false;

system/modules/Money/widgets/cabinet/walletsWidget.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 <?php

 $blocked = App::$cur->money->getUserBlocks();

 $wallets = App::$cur->money->getUserWallets();

-foreach ($wallets as $wallet) {

+foreach ($wallets as $wallet) {
     ?>

     <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br/>

     <?php

system/Inji/Msg.php

Braces +3 added lines, -2 removed lines

@@ -49,8 +49,9 @@
      * @return array
      */
     public static function get($clean = false) {
-        if (empty($_SESSION['_INJI_MSG']))
-            return [];
+        if (empty($_SESSION['_INJI_MSG'])) {
+                    return [];
+        }
         $msgs = $_SESSION['_INJI_MSG'];
         if ($clean) {
             $_SESSION['_INJI_MSG'] = [];

system/modules/Modules/appAdminControllers/content/install.php

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
   $modules = array_flip(Module::getInstalled(App::$cur));
   if (file_exists(App::$primary->path . '/modules')) {
       $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2);
-  }
-  else {
+  } else {
       $appModules=[];
   }
   $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules);

system/modules/Money/appControllers/MerchantsController.php

Braces +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
                 $where[] = ['data', $_GET['data']];
             }
             $pays = Money\Pay::getList(['where' => $where, 'order' => ['date_create', 'DESC']]);
-            if(count($pays)===1){
+            if(count($pays)===1) {
                 Tools::redirect('/money/merchants/pay/'.current($pays)->id);
             }
             $this->view->page(['content' => 'pays', 'data' => compact('bread', 'pays')]);

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;
     }

system/modules/Sliders/widgets/slider.php

Braces +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 if (!empty($alias)) {
     $slider = Sliders\Slider::get($alias, 'alias');
 }
-if(empty($slider)){
+if(empty($slider)) {
     echo 'Slider not found';
     return;
 }