injitools / cms-Inji

system/modules/Ui/widgets/DataManager/filters.php

Indentation +125 added lines, -125 removed lines

@@ -8,110 +8,110 @@ 
       return false;">
     <div class="row">       
       <?php
-      $i = -1;
-      $form = new Ui\Form();
-      foreach ($dataManager->managerOptions['filters'] as $col) {
+        $i = -1;
+        $form = new Ui\Form();
+        foreach ($dataManager->managerOptions['filters'] as $col) {
 
-          if ($dataManager->modelName) {
-              $modelName = $dataManager->modelName;
-              $colInfo = $modelName::getColInfo($col);
-          } else {
-              $colInfo = $dataManager->managerOptions['cols'][$col];
-          }
-          $values = [];
-          $inputOptions = [];
-          if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
-              $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
-              if (!empty($colOptions['userCol'])) {
-                  if (strpos($colOptions['userCol'], ':')) {
-                      $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
-                      $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
+            if ($dataManager->modelName) {
+                $modelName = $dataManager->modelName;
+                $colInfo = $modelName::getColInfo($col);
+            } else {
+                $colInfo = $dataManager->managerOptions['cols'][$col];
+            }
+            $values = [];
+            $inputOptions = [];
+            if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
+                $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
+                if (!empty($colOptions['userCol'])) {
+                    if (strpos($colOptions['userCol'], ':')) {
+                        $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
+                        $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
-                      $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                  } else {
-                      $this->model->$col = \Users\User::$cur->{$preset['userCol']};
-                  }
-              } elseif (!empty($colOptions['value'])) {
-                  $inputOptions['value'] = $colOptions['value'];
-              }
-              if (is_array($inputOptions['value'])) {
-                  $values = $inputOptions['value'];
-                  foreach ($values as $key => $value) {
-                      $inputOptions['value'] = $value;
-                      $form->input('hidden', "datamanagerFilters[{$col}][value][{$key}]", '', $inputOptions);
-                  }
-              } else {
-                  $form->input('hidden', "datamanagerFilters[{$col}][value]", '', $inputOptions);
-              }
-              continue;
-          }
-          if (++$i && !($i % 2)) {
-              echo '</div><div class="row">';
-          }
-          echo '<div class="col-md-6">';
-          if (!empty($colInfo['colParams']['type'])) {
-              switch ($colInfo['colParams']['type']) {
-                  case'select':
+                        $inputOptions['value'] = \Users\User::$cur->$rel->$param;
+                    } else {
+                        $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                    }
+                } elseif (!empty($colOptions['value'])) {
+                    $inputOptions['value'] = $colOptions['value'];
+                }
+                if (is_array($inputOptions['value'])) {
+                    $values = $inputOptions['value'];
+                    foreach ($values as $key => $value) {
+                        $inputOptions['value'] = $value;
+                        $form->input('hidden', "datamanagerFilters[{$col}][value][{$key}]", '', $inputOptions);
+                    }
+                } else {
+                    $form->input('hidden', "datamanagerFilters[{$col}][value]", '', $inputOptions);
+                }
+                continue;
+            }
+            if (++$i && !($i % 2)) {
+                echo '</div><div class="row">';
+            }
+            echo '<div class="col-md-6">';
+            if (!empty($colInfo['colParams']['type'])) {
+                switch ($colInfo['colParams']['type']) {
+                    case'select':
                       switch ($colInfo['colParams']['source']) {
-                          case 'array':
+                            case 'array':
                               $values = ['' => 'Не важно'] + $colInfo['colParams']['sourceArray'];
-                              break;
-                          case 'method':
+                                break;
+                            case 'method':
                               if (!empty($colInfo['colParams']['params'])) {
-                                  $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
-                              } else {
-                                  $values = ['' => 'Не важно'] + App::$cur->$colInfo['colParams']['module']->$colInfo['colParams']['method']();
-                              }
-                              break;
-                          case 'model':
+                                    $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
+                                } else {
+                                    $values = ['' => 'Не важно'] + App::$cur->$colInfo['colParams']['module']->$colInfo['colParams']['method']();
+                                }
+                                break;
+                            case 'model':
                               $values = ['' => 'Не важно'] + $colInfo['colParams']['model']::getList(['forSelect' => true]);
-                              break;
-                          case 'relation':
+                                break;
+                            case 'relation':
                               $relations = $colInfo['modelName']::relations();
-                              $filters = $relations[$colInfo['colParams']['relation']]['model']::managerFilters();
-                              $cols = $relations[$colInfo['colParams']['relation']]['model']::cols();
-                              $options = [
-                                  'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
-                              ];
-                              if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
-                                  $options['order'] = 'name';
-                              }
-                              $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);
-                              $values = ['' => 'Не задано'];
-                              foreach ($items as $key => $item) {
-                                  if (!empty($inputParams['showCol'])) {
-                                      $values[$key] = $item->$inputParams['showCol'];
-                                  } else {
-                                      $values[$key] = $item->name();
-                                  }
-                              }
-                              $values;
-                              break;
-                      }
-                      $value = !empty($_GET['datamanagerFilters'][$col]['value']) ? $_GET['datamanagerFilters'][$col]['value'] : (!empty($params['filters'][$col]['value']) ? $params['filters'][$col]['value'] : '');
-                      $inputOptions = ['value' => $value, 'values' => $values, 'multiple' => true];
-                      if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
+                                $filters = $relations[$colInfo['colParams']['relation']]['model']::managerFilters();
+                                $cols = $relations[$colInfo['colParams']['relation']]['model']::cols();
+                                $options = [
+                                    'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
+                                ];
+                                if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
+                                    $options['order'] = 'name';
+                                }
+                                $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);
+                                $values = ['' => 'Не задано'];
+                                foreach ($items as $key => $item) {
+                                    if (!empty($inputParams['showCol'])) {
+                                        $values[$key] = $item->$inputParams['showCol'];
+                                    } else {
+                                        $values[$key] = $item->name();
+                                    }
+                                }
+                                $values;
+                                break;
+                        }
+                        $value = !empty($_GET['datamanagerFilters'][$col]['value']) ? $_GET['datamanagerFilters'][$col]['value'] : (!empty($params['filters'][$col]['value']) ? $params['filters'][$col]['value'] : '');
+                        $inputOptions = ['value' => $value, 'values' => $values, 'multiple' => true];
+                        if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
 
-                          $inputOptions['disabled'] = true;
-                          $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
-                          if (!empty($colOptions['userCol'])) {
-                              if (strpos($colOptions['userCol'], ':')) {
-                                  $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
-                                  $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
+                            $inputOptions['disabled'] = true;
+                            $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
+                            if (!empty($colOptions['userCol'])) {
+                                if (strpos($colOptions['userCol'], ':')) {
+                                    $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
+                                    $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
-                                  $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                              } else {
-                                  $this->model->$col = \Users\User::$cur->{$preset['userCol']};
-                              }
-                          } elseif (!empty($colOptions['value'])) {
+                                    $inputOptions['value'] = \Users\User::$cur->$rel->$param;
+                                } else {
+                                    $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                                }
+                            } elseif (!empty($colOptions['value'])) {
 
-                              $inputOptions['value'] = $colOptions['value'];
-                          }
-                      }
-                      $inputOptions['class'] = 'input-sm';
-                      $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
-                      break;
-                  case 'email':
+                                $inputOptions['value'] = $colOptions['value'];
+                            }
+                        }
+                        $inputOptions['class'] = 'input-sm';
+                        $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
+                        break;
+                    case 'email':
                   case 'text':
                   case 'textarea':
                   case 'html':
@@ -139,40 +139,40 @@ 
                         ?>
                         <div class="filter_form_field filter_select">
                           <?php
-                          if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
-                              $value = 1;
-                          } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
-                              $value = 0;
-                          } else {
-                              $value = '';
-                          }
-                          $inputOptions = ['value' => $value, 'values' => [
-                                  '' => 'Не важно',
-                                  '1' => $colInfo['label'],
-                                  '0' => 'Нет'
-                              ]
-                          ];
-                          if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
+                            if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
+                                $value = 1;
+                            } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
+                                $value = 0;
+                            } else {
+                                $value = '';
+                            }
+                            $inputOptions = ['value' => $value, 'values' => [
+                                    '' => 'Не важно',
+                                    '1' => $colInfo['label'],
+                                    '0' => 'Нет'
+                                ]
+                            ];
+                            if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
 
-                              $inputOptions['disabled'] = true;
-                              $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
-                              if (!empty($colOptions['userCol'])) {
-                                  if (strpos($colOptions['userCol'], ':')) {
-                                      $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
-                                      $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
+                                $inputOptions['disabled'] = true;
+                                $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
+                                if (!empty($colOptions['userCol'])) {
+                                    if (strpos($colOptions['userCol'], ':')) {
+                                        $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
+                                        $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
-                                      $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                                  } else {
-                                      $this->model->$col = \Users\User::$cur->{$preset['userCol']};
-                                  }
-                              } elseif (!empty($colOptions['value'])) {
+                                        $inputOptions['value'] = \Users\User::$cur->$rel->$param;
+                                    } else {
+                                        $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                                    }
+                                } elseif (!empty($colOptions['value'])) {
 
-                                  $inputOptions['value'] = $colOptions['value'];
-                              }
-                          }
-                          $inputOptions['class'] = 'input-sm';
-                          $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
-                          ?>
+                                    $inputOptions['value'] = $colOptions['value'];
+                                }
+                            }
+                            $inputOptions['class'] = 'input-sm';
+                            $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
+                            ?>
                         </div>
 
                         <?php

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/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/modules/UserForms/widgets/userForm.php

Braces +5 added lines, -5 removed lines

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

-if (!empty($params[0])) {

+if (!empty($params[0])) {
     $form_id = $params[0];

 }

-if (empty($form_id)) {

+if (empty($form_id)) {
     echo('form not found');

     return;

 }

 $userForm = \UserForms\Form::get((int) $form_id);

-if (!$userForm) {

+if (!$userForm) {
     echo('form not found');

     return;

 }

@@ -15,10 +15,10 @@ 
 $form->begin();

 ?>

 <?php

-if ($userForm->description) {

+if ($userForm->description) {
     echo "<p class = 'text-center'>{$userForm->description}</p>";

 }

-foreach ($userForm->inputs(['order' => ['weight']]) as $input) {

+foreach ($userForm->inputs(['order' => ['weight']]) as $input) {
     $form->input($input->type, 'UserForms[' . (int) $form_id . '][input' . $input->id . ']', $input->label, ['required' => $input->required]);

 }

 ?>

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/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/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,