injitools / cms-Inji

system/modules/StaticLoader/StaticLoader.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
         $type = substr($path, 0, strpos($path, '/'));
         switch ($type) {
             case 'libs':
-                return App::$cur->Libs->getPath(array_slice(explode('/', $path),2));
+                return App::$cur->Libs->getPath(array_slice(explode('/', $path), 2));
                 break;
             case 'templates':
                 $path = substr($path, strpos($path, '/') + 1);
@@ -188,7 +188,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 +14 added lines, -12 removed lines

@@ -112,10 +112,11 @@ 
 
                 $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');
@@ -127,15 +128,16 @@ 
                     $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'];

system/modules/TextBlocks/TextBlocks.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Text blocks module
- *
- * @author Alexey Krupskiy <admin@inji.ru>
- * @link http://inji.ru/
- * @copyright 2015 Alexey Krupskiy
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
- */
+     * Text blocks module
+     *
+     * @author Alexey Krupskiy <admin@inji.ru>
+     * @link http://inji.ru/
+     * @copyright 2015 Alexey Krupskiy
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
+     */
 class TextBlocks extends Module
 {
     function init()

system/modules/Ui/appAdminControllers/content/dataManager/view.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     ]]);
     ?>)</h3>
   <?php
-  foreach (\Dashboard\Comment::getList([ 'where' => [
+  foreach (\Dashboard\Comment::getList(['where' => [
           ['item_id', $item->id],
           ['model', $modelName],
       ], 'order' => ['date', 'desc']]) as $comment) {

Indentation +12 added lines, -12 removed lines

@@ -58,11 +58,11 @@ 
     ]]);
     ?>)</h3>
   <?php
-  foreach (\Dashboard\Comment::getList([ 'where' => [
-          ['item_id', $item->id],
-          ['model', $modelName],
-      ], 'order' => ['date_create', 'desc']]) as $comment) {
-      ?>
+    foreach (\Dashboard\Comment::getList([ 'where' => [
+            ['item_id', $item->id],
+            ['model', $modelName],
+        ], 'order' => ['date_create', 'desc']]) as $comment) {
+        ?>
       <div class="row">
         <div class="col-sm-3" style="max-width: 300px;">
           <a href='/admin/Users/view/User/<?= $comment->user->pk(); ?>'><?= $comment->user->name(); ?></a><br />
@@ -73,14 +73,14 @@ 
         </div>
       </div>
       <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 <div>
   <?php
-  $form = new \Ui\Form();
-  $form->begin();
-  $form->input('textarea', 'comment', 'Комментарий');
-  $form->end();
-  ?>
+    $form = new \Ui\Form();
+    $form->begin();
+    $form->input('textarea', 'comment', 'Комментарий');
+    $form->end();
+    ?>
 </div>

system/modules/Ui/objects/ActiveForm.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
                             $this->model->_params[$modelName::index()] = 0;
                         }
                         $relOptions['model']::fixPrefix($relOptions['col']);
-                        $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+                        $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
                 } elseif (!empty($modelName::$cols[$col])) {

system/modules/Ui/objects/DataManager.php

Indentation +12 added lines, -12 removed lines

@@ -608,22 +608,22 @@
         ?>
         <ul class="nav nav-list-categorys" data-col='tree_path'>
           <?php
-          $categoryModel = $this->managerOptions['categorys']['model'];
-          $order = [];
-          if (!empty($this->managerOptions['sortMode'])) {
-              $order[] = ['weight', 'asc'];
-          }
-          $categorys = $categoryModel::getList(['order' => $order]);
-          echo "<li>
+            $categoryModel = $this->managerOptions['categorys']['model'];
+            $order = [];
+            if (!empty($this->managerOptions['sortMode'])) {
+                $order[] = ['weight', 'asc'];
+            }
+            $categorys = $categoryModel::getList(['order' => $order]);
+            echo "<li>
                         <label class='nav-header'>
                             <a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-path ='/'>/</a> 
                         </label>
                     </li>";
-          foreach ($categorys as $category) {
-              if ($category->parent_id == 0)
-                  $this->showCategory($categorys, $category);
-          }
-          ?>
+            foreach ($categorys as $category) {
+                if ($category->parent_id == 0)
+                    $this->showCategory($categorys, $category);
+            }
+            ?>
         </ul>
         <?php
     }

Spacing +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
                         return $item->$colName;
                 }
             } elseif (!empty($modelName::$cols[$colName]['type'])) {
-                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";

Braces +3 added lines, -2 removed lines

@@ -620,8 +620,9 @@
                         </label>
                     </li>";
           foreach ($categorys as $category) {
-              if ($category->parent_id == 0)
-                  $this->showCategory($categorys, $category);
+              if ($category->parent_id == 0) {
+                                $this->showCategory($categorys, $category);
+              }
           }
           ?>
         </ul>

Doc Comments +4 added lines, -1 removed lines

@@ -28,7 +28,7 @@ 
      * Construct new data manager
      * 
      * @param string $modelName
-     * @param string|array $dataManager
+     * @param string $dataManager
      * @throws Exception
      */
     public function __construct($modelName, $dataManager = 'manager')
@@ -330,6 +330,9 @@ 
         return $rows;
     }
 
+    /**
+     * @param DataManager $dataManager
+     */
     public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null)
     {
         $modelName = get_class($item);

system/modules/Ui/objects/Pages.php

Braces +5 added lines, -4 removed lines

@@ -34,10 +34,11 @@
             $this->params['page'] = 1;
             if (!empty($this->data['page'])) {
                 $this->params['page'] = (int) $this->data['page'];
-                if ($this->params['page'] <= 0)
-                    $this->params['page'] = 1;
-                elseif ($this->params['page'] > ceil($this->options['count'] / $this->params['limit']))
-                    $this->params['page'] = ceil($this->options['count'] / $this->params['limit']);
+                if ($this->params['page'] <= 0) {
+                                    $this->params['page'] = 1;
+                } elseif ($this->params['page'] > ceil($this->options['count'] / $this->params['limit'])) {
+                                    $this->params['page'] = ceil($this->options['count'] / $this->params['limit']);
+                }
             }
 
             $this->params['start'] = $this->params['page'] * $this->params['limit'] - $this->params['limit'];

system/modules/Ui/objects/Tree.php

Indentation +7 added lines, -7 removed lines

@@ -23,13 +23,13 @@
         ?>
         <ul class="nav nav-list-categorys" data-col='tree_path'>
           <?php
-          $class = get_class($objectRoot);
-          $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
-          $count += count($items);
-          foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
-          }
-          ?>
+            $class = get_class($objectRoot);
+            $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
+            $count += count($items);
+            foreach ($items as $objectChild) {
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+            }
+            ?>
         </ul>
         <?php
         return $count;

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
           $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
           $count += count($items);
           foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
           }
           ?>
         </ul>
@@ -55,7 +55,7 @@ 
                       <ul class='nav nav-list nav-left-ml'>
                         <?php
                     }
-                    $count+=static::showLi($objectChild, $deep + 1, $maxDeep,$hrefFunc);
+                    $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
                 }
             }
             if ($isset) {

system/modules/Ui/widgets/ActiveForm/ActiveForm.php

Indentation +32 added lines, -32 removed lines

@@ -3,38 +3,38 @@
 ?>
 <div id ='<?= $id; ?>' class="uiActiveForm" data-modelname="<?= $activeForm->modelName; ?>" data-formname="<?= $activeForm->formName; ?>" data-inputs='<?= json_encode($activeForm->inputs); ?>'>
   <?php
-  if ($activeForm->parent === null) {
-      $form->action = $activeForm->action;
-      $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : '']);
-  } elseif ($activeForm->header) {
-      echo "<h3>{$activeForm->header}</h3>";
-  }
-  if (empty($activeForm->form['noMapCell'])) {
-      foreach ($activeForm->form['map'] as $row) {
-          $colSize = 12 / count($row);
-          echo "<div class ='row'>";
-          foreach ($row as $col) {
-              echo "<div class = 'col-sm-{$colSize}'>";
-              if ($col) {
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
-              }
-              echo '</div>';
-          }
-          echo '</div>';
-      }
-  } else {
-      foreach ($activeForm->form['map'] as $row) {
-          foreach ($row as $col) {
-              if ($col) {
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
-              }
-          }
-      }
-  }
-  if ($activeForm->parent === null) {
-      $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить');
-  }
-  ?>
+    if ($activeForm->parent === null) {
+        $form->action = $activeForm->action;
+        $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : '']);
+    } elseif ($activeForm->header) {
+        echo "<h3>{$activeForm->header}</h3>";
+    }
+    if (empty($activeForm->form['noMapCell'])) {
+        foreach ($activeForm->form['map'] as $row) {
+            $colSize = 12 / count($row);
+            echo "<div class ='row'>";
+            foreach ($row as $col) {
+                echo "<div class = 'col-sm-{$colSize}'>";
+                if ($col) {
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
+                }
+                echo '</div>';
+            }
+            echo '</div>';
+        }
+    } else {
+        foreach ($activeForm->form['map'] as $row) {
+            foreach ($row as $col) {
+                if ($col) {
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
+                }
+            }
+        }
+    }
+    if ($activeForm->parent === null) {
+        $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить');
+    }
+    ?>
 </div>
 <script>
     inji.onLoad(function () {

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

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-    $mainCol['style'].='margin-left:260px;';
+    $mainCol['style'] .= 'margin-left:260px;';
     echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
     $this->widget('Ui\DataManager/categorys', compact('dataManager'));
     echo '</div>';