injitools / cms-Inji

system/modules/Migrations/objects/Walker.php

Braces +8 added lines, -4 removed lines

@@ -27,7 +27,8 @@ 
         //walk know pathes
         foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) {
             if (isset($this->data[$path->item])) {
-                if ($path->type == 'container') { //create walker for container
+                if ($path->type == 'container') {
+//create walker for container
                     $walker = new Walker();
                     $walker->migration = $this->migration;
                     $walker->map = $this->map;
@@ -37,7 +38,8 @@ 
                     $walker->mapPathParent = $this->mapPath;
                     $walker->migtarionLog = $this->migtarionLog;
                     $walker->walk();
-                } elseif ($path->type == 'object') { //start parse path data
+                } elseif ($path->type == 'object') {
+//start parse path data
                     $this->startObjectParse($path->object_id, $this->data[$path->item]);
                 }
             }
@@ -54,9 +56,11 @@ 
                         ['code', $key],
                         ['migration_id', $this->migration->id]
             ]);
-            if ($object) { //parse as object
+            if ($object) {
+//parse as object
                 $this->startObjectParse($object, $data);
-            } else { //create new map path for configure unknown path
+            } else {
+//create new map path for configure unknown path
                 $this->mapPath = new Migration\Map\Path();
                 $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0;
                 $this->mapPath->path = $this->curPath;

system/modules/Ecommerce/appControllers/content/Cart/index.php

Braces +3 added lines, -3 removed lines

@@ -3,9 +3,9 @@
         <div class="cart-order_page">
             <h2>Быстрое оформление заказа</h2>
             <?php
-            if (!$cart || !$cart->cartItems)
-                echo "<h1>Ваша корзина пуста</h1>";
-            else {
+            if (!$cart || !$cart->cartItems) {
+                            echo "<h1>Ваша корзина пуста</h1>";
+            } else {
                 $form = new Ui\Form;
                 $form->action = "/ecommerce/cart";
                 $form->begin();

system/modules/Ecommerce/appControllers/content/view.php

Braces +6 added lines, -4 removed lines

@@ -18,11 +18,13 @@
                         <ul class="item-options">
                           <?php
                           foreach ($item->options as $param) {
-                              if (!$param->item_option_view || !$param->value)
-                                  continue;
+                              if (!$param->item_option_view || !$param->value) {
+                                                                continue;
+                              }
                               if ($param->item_option_type == 'select') {
-                                  if (empty($param->option->items[$param->value]))
-                                      continue;
+                                  if (empty($param->option->items[$param->value])) {
+                                                                        continue;
+                                  }
                                   $value = $param->option->items[$param->value]->value;
                               } else {
                                   $value = $param->value;

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/widgets/cabinet/walletBlocked.php

Braces +5 added lines, -5 removed lines

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

 $currency_id = !empty($_GET['currency_id']) ? (int) $_GET['currency_id'] : 0;

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

-if ($currency_id && empty($wallets[$currency_id])) {

+if ($currency_id && empty($wallets[$currency_id])) {
     Msg::add('У вас нет такого кошелька');

     Msg::show();

     return;

 }

 

-if ($currency_id) {

+if ($currency_id) {
     $ids = $wallets[$currency_id]->id;

-} else {

+} else {
     $ids = [];

-    foreach ($wallets as $wallet) {

+    foreach ($wallets as $wallet) {
         $ids[] = $wallet->id;

     }

     $ids = implode(',', $ids);

@@ -33,7 +33,7 @@ 
             'start' => $pages->params['start'],

             'limit' => $pages->params['limit'],

         ]);

-foreach ($histories as $history) {

+foreach ($histories as $history) {
     $amount = $history->amount;

     $table->addRow([

         $history->id,

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

Braces +5 added lines, -5 removed lines

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

 $currency_id = !empty($_GET['currency_id']) ? (int) $_GET['currency_id'] : 0;

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

-if ($currency_id && empty($wallets[$currency_id])) {

+if ($currency_id && empty($wallets[$currency_id])) {
     Msg::add('У вас нет такого кошелька');

     Msg::show();

     return;

 }

 

-if ($currency_id) {

+if ($currency_id) {
     $ids = $wallets[$currency_id]->id;

-} else {

+} else {
     $ids = [];

-    foreach ($wallets as $wallet) {

+    foreach ($wallets as $wallet) {
         $ids[] = $wallet->id;

     }

     $ids = implode(',', $ids);

@@ -33,7 +33,7 @@ 
             'start' => $pages->params['start'],

             'limit' => $pages->params['limit'],

         ]);

-foreach ($histories as $history) {

+foreach ($histories as $history) {
     $amount = $history->amount ? $history->amount : $history->new - $history->old;

     $table->addRow([

         $history->id,

system/modules/Db/objects/Mysql/Query.php

Braces +53 added lines, -42 removed lines

@@ -125,12 +125,14 @@ 
         if (!is_array($order)) {
             $this->order[] = "{$order} {$type}";
         } else {
-            foreach ($order as $item)
-                if (!is_array($item)) {
+            foreach ($order as $item) {
+                            if (!is_array($item)) {
                     call_user_func_array(array($this, 'order'), $order);
+            }
                     break;
-                } else
-                    $this->order($item);
+                } else {
+                                    $this->order($item);
+                }
         }
     }
 
@@ -138,8 +140,9 @@ 
         $start = intval($start);
         $len = intval($len);
         $this->limit = "LIMIT {$start}";
-        if ($len !== 0)
-            $this->limit .= ",{$len}";
+        if ($len !== 0) {
+                    $this->limit .= ",{$len}";
+        }
     }
 
     public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
@@ -151,10 +154,12 @@ 
             }
         } else {
             $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-            if ($alias)
-                $join .= " AS `{$alias}`";
-            if ($where)
-                $join .= " ON {$where}";
+            if ($alias) {
+                            $join .= " AS `{$alias}`";
+            }
+            if ($where) {
+                            $join .= " ON {$where}";
+            }
         }
         return $join;
     }
@@ -173,13 +178,15 @@ 
                 $operation = '=';
             }
 
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            } elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->whereString == NULL)
-                $this->whereString = ' WHERE ';
+            if ($this->whereString == NULL) {
+                            $this->whereString = ' WHERE ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -205,12 +212,12 @@ 
                 $value = "?";
             }
 
-            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
-                $this->whereString .= " {$where} {$operation} {$value} ";
-            else
-                $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
-        }
-        else {
+            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
+                            $this->whereString .= " {$where} {$operation} {$value} ";
+            } else {
+                            $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
+        } else {
             $i = -1;
             while (isset($where[++$i])) {
                 $item = $where[$i];
@@ -225,10 +232,11 @@ 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL)
-                        $this->whereString .= '(';
-                    else
-                        $this->whereString = 'WHERE (';
+                    if ($this->whereString != NULL) {
+                                            $this->whereString .= '(';
+                    } else {
+                                            $this->whereString = 'WHERE (';
+                    }
                 }
 
                 if (!is_array($item)) {
@@ -257,13 +265,15 @@ 
             if (empty($operation)) {
                 $operation = '=';
             }
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            } elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->havingString == NULL)
-                $this->havingString = ' HAVING ';
+            if ($this->havingString == NULL) {
+                            $this->havingString = ' HAVING ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -289,12 +299,12 @@ 
                 $value = "?";
             }
 
-            if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
-                $this->havingString .= " {$where} {$operation} {$value} ";
-            else
-                $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
-        }
-        else {
+            if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ') {
+                            $this->havingString .= " {$where} {$operation} {$value} ";
+            } else {
+                            $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
+        } else {
             $i = -1;
             while (isset($where[++$i])) {
                 $item = $where[$i];
@@ -309,10 +319,11 @@ 
                         $this->havingString .= "{$concatenation} ";
                     }
 
-                    if ($this->havingString != NULL)
-                        $this->havingString .= '(';
-                    else
-                        $this->havingString = 'HAVING (';
+                    if ($this->havingString != NULL) {
+                                            $this->havingString .= '(';
+                    } else {
+                                            $this->havingString = 'HAVING (';
+                    }
                 }
 
                 if (!is_array($item)) {