injitools / cms-Inji

system/modules/Sliders/widgets/slider.php

Indentation +10 added lines, -10 removed lines

@@ -14,9 +14,9 @@ 
     <!-- Indicators -->
     <ol class="carousel-indicators">
       <?php
-      $i = 0;
-      for ($i = 0; $i < count($slides); $i++) {
-          ?>
+        $i = 0;
+        for ($i = 0; $i < count($slides); $i++) {
+            ?>
             <li data-target="#sliderWidget-<?= $slider->id; ?>" data-slide-to="<?= $i; ?>" <?= !$i ? 'class="active"' : ''; ?>></li>
             <?php
         }
@@ -27,15 +27,15 @@ 
     <!-- Wrapper for slides -->
     <div class="carousel-inner" role="listbox">
       <?php
-      $i = 0;
-      foreach ($slides as $item) {
-          ?>
+        $i = 0;
+        foreach ($slides as $item) {
+            ?>
             <div class="item <?= !$i ? 'active' : ''; ?>">
               <?php
-              if ($item->link) {
-                  echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
-              }
-              ?>
+                if ($item->link) {
+                    echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
+                }
+                ?>
                 <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
                 <div class="carousel-caption">
                   <?= $item->description; ?>

system/modules/View/appAdminControllers/content/Template/chooseFile.php

Braces +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= $template->config['file']; ?>'>Основной файл темы</a>

 <hr/>

 <?php

-foreach ($template->config['css'] as $file) {

-    if (file_exists($template->path . '/css/' . $file)) {

+foreach ($template->config['css'] as $file) {
+    if (file_exists($template->path . '/css/' . $file)) {
         ?>

         <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>

         <?php

system/modules/View/appAdminControllers/content/index.php

Braces +2 added lines, -1 removed lines

@@ -11,12 +11,13 @@
     '',
     ''
 ]);
-if (!empty($templates['app']['installed']))
+if (!empty($templates['app']['installed'])) {
     foreach ($templates['app']['installed'] as $template => $name) {
         $table->addRow([
             $name,
             (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию',
             '<a href = "/admin/view/template/editFile/' . $template . '">Файлы</a> <a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>'
         ]);
+}
     }
 $table->draw();

system/modules/StaticLoader/StaticLoader.php

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 
             $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension'];
             if (App::$cur->db->connect) {
-                $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
+                $fileObj = Files\File::get(['path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
                 if ($fileObj) {
                     $fileName = $fileObj->original_name;
                 }

Braces +28 added lines, -17 removed lines

@@ -37,10 +37,12 @@ 
                 $scriptApp->installed = true;
                 $scriptApp->params = [];
                 $scriptApp->config = Config::app($scriptApp);
-            } else {
+            }
+            else {
                 $scriptApp = \App::$cur;
             }
-        } else {
+        }
+        else {
             $scriptApp = \App::$cur->system ? \App::$primary : \App::$cur;
         }
 
@@ -107,30 +109,38 @@ 
 
                 $sizes = explode('x', $_GET['resize']);
                 $sizes[0] = intval($sizes[0]);
-                if (isset($sizes[1]))
-                    $sizes[1] = intval($sizes[1]);
-                else
-                    $sizes[1] = 0;
+                if (isset($sizes[1])) {
+                                    $sizes[1] = intval($sizes[1]);
+                }
+                else {
+                                    $sizes[1] = 0;
+                }
 
                 if (!$sizes[0] || !$sizes[1]) {
                     header('HTTP/1.1 404 Not Found');
                     exit();
-                } elseif ($sizes[0] > 2000 || $sizes[1] > 2000) {
+                }
+                elseif ($sizes[0] > 2000 || $sizes[1] > 2000) {
                     header('HTTP/1.1 404 Not Found');
                     exit();
-                } else {
+                }
+                else {
                     $dir = App::$primary->path;
 
                     if (!empty($_GET['resize_crop'])) {
-                        if (in_array($_GET['resize_crop'], array('q', 'c')))
-                            $crop = $_GET['resize_crop'];
-                        else
-                            $crop = 'c';
+                        if (in_array($_GET['resize_crop'], array('q', 'c'))) {
+                                                    $crop = $_GET['resize_crop'];
+                        }
+                        else {
+                                                    $crop = 'c';
+                        }
+                    }
+                    elseif (!empty($_GET['resize_quadro'])) {
+                                            $crop = 'q';
+                    }
+                    else {
+                                            $crop = '';
                     }
-                    elseif (!empty($_GET['resize_quadro']))
-                        $crop = 'q';
-                    else
-                        $crop = '';
                     $pos = 'center';
                     if (!empty($_GET['resize_pos']) && in_array($_GET['resize_pos'], array('top', 'center'))) {
                         $pos = $_GET['resize_pos'];
@@ -155,7 +165,8 @@ 
 
             // Преобразуем запрос клиента If-Modified-Since в таймштамп
             $modifiedSince = strtotime($modifiedSince[0]);
-        } else {
+        }
+        else {
             // Устанавливаем время модификации в ноль
             $modifiedSince = 0;
         }

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

Braces +6 added lines, -3 removed lines

@@ -18,7 +18,8 @@ 
     public function getArray($keyCol = '') {
         if (!$keyCol) {
             return $this->pdoResult->fetchAll(\PDO::FETCH_ASSOC);
-        } else {
+        }
+        else {
             $array = [];
             while ($row = $this->pdoResult->fetch(\PDO::FETCH_ASSOC)) {
                 $array[$row[$keyCol]] = $row;
@@ -33,7 +34,8 @@ 
         while ($object = $this->pdoResult->fetchObject($class)) {
             if ($keyCol) {
                 $array[$object->$keyCol] = $object;
-            } else {
+            }
+            else {
                 $array[] = $object;
             }
         }
@@ -44,7 +46,8 @@ 
     public function fetch($className = '') {
         if ($className) {
             return $this->pdoResult->fetchObject($className);
-        } else {
+        }
+        else {
             return $this->pdoResult->fetch(\PDO::FETCH_ASSOC);
         }
     }

system/modules/Db/Db.php

Braces +5 added lines, -3 removed lines

@@ -15,11 +15,13 @@
             $param = isset($this->config['default']) ? $this->config['default'] : 'local';
         }
         if (!is_array($param)) {
-            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true])))
-                return false;
+            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) {
+                            return false;
+            }
 
             $db = $dbOption;
-        } else {
+        }
+        else {
             $db = $param;
         }
         $className = 'Db\\' . $db['driver'];

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

Braces +18 added lines, -16 removed lines

@@ -16,34 +16,35 @@ 
             '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 +60,34 @@ 
         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/rewardTriggerHandler/ecommerceCartReward.php

Braces +4 added lines, -2 removed lines

@@ -8,7 +8,8 @@ 
 
         if (!$rewardItemExist) {
             $allowTypes = explode(',', $trigger->params['item_type_id']->value);
-        } else {
+        }
+        else {
             $allowTypes = [];
         }
         foreach ($cart->cartItems as $cartItem) {
@@ -19,7 +20,8 @@ 
             $currency_id = $cartItem->price->currency ? $cartItem->price->currency->id : \App::$cur->ecommerce->config['defaultCurrency'];
             if (empty($sums[$currency_id])) {
                 $sums[$currency_id] = $cartItem->final_price * $cartItem->count;
-            } else {
+            }
+            else {
                 $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
             }
         }

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;