injitools / cms-Inji

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

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

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

Indentation +6 added lines, -6 removed lines

@@ -164,12 +164,12 @@
             <li><a href ='' onclick='inji.Ui.dataManagers.get(this).rowSelection("inverse");return false;'>Инвертировать</a></li>
             <li role="separator" class="divider"></li>
               <?php
-              foreach ($actions as $action => $actionParams) {
-                  if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-                      echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
-                  }
-              }
-              ?>
+                foreach ($actions as $action => $actionParams) {
+                    if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
+                        echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                    }
+                }
+                ?>
           </ul>
         </div>
         <?php

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/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>';

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

Indentation +31 added lines, -31 removed lines

@@ -127,40 +127,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/Ui/widgets/Form/select.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     }
     if (
             (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
-            (is_array($primaryValue) && (in_array($key,$primaryValue) || (isset($form->userDataTree[$name]) && in_array($key,$form->userDataTree[$name]))))
+            (is_array($primaryValue) && (in_array($key, $primaryValue) || (isset($form->userDataTree[$name]) && in_array($key, $form->userDataTree[$name]))))
             ) {
         $selected = ' selected="selected"';
     }
@@ -22,7 +22,7 @@ 
             $showedInput = count($aditionalInputs) - 1;
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
         }
-        $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
+        $optionsHtml .= "<option data-aditionalInput='" . (count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
     } else {
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
     }

system/modules/Ui/widgets/Pages/pages.php

Indentation +26 added lines, -26 removed lines

@@ -1,28 +1,28 @@
 <ul class="<?= $class; ?>"><?php
-  if ($pagesInstance->params['page'] > 1) {
-      $getArr['page'] = $pagesInstance->params['page'] - 1;
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
-  }
+    if ($pagesInstance->params['page'] > 1) {
+        $getArr['page'] = $pagesInstance->params['page'] - 1;
+        echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
+    }
 
-  for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
-      if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
-          echo '<li ';
-          if ($pagesInstance->params['page'] == $i)
-              echo 'class = "active"';
-          echo ">";
-          $getArr['page'] = $i;
-          echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
-      }
-      elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
-          $getArr['page'] = round($pagesInstance->params['page'] / 2);
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
-      } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
-          $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
-      }
-  }
-  if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
-      $getArr['page'] = $pagesInstance->params['page'] + 1;
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
-  }
-  ?></ul>
\ No newline at end of file
+    for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
+        if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
+            echo '<li ';
+            if ($pagesInstance->params['page'] == $i)
+                echo 'class = "active"';
+            echo ">";
+            $getArr['page'] = $i;
+            echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
+        }
+        elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
+            $getArr['page'] = round($pagesInstance->params['page'] / 2);
+            echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
+        } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
+            $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
+            echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
+        }
+    }
+    if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
+        $getArr['page'] = $pagesInstance->params['page'] + 1;
+        echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
+    }
+    ?></ul>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
   }
 
   for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
-      if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
+      if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
           echo '<li ';
           if ($pagesInstance->params['page'] == $i)
               echo 'class = "active"';

Braces +4 added lines, -4 removed lines

@@ -7,13 +7,13 @@
   for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
       if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
           echo '<li ';
-          if ($pagesInstance->params['page'] == $i)
-              echo 'class = "active"';
+          if ($pagesInstance->params['page'] == $i) {
+                        echo 'class = "active"';
+          }
           echo ">";
           $getArr['page'] = $i;
           echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
-      }
-      elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
+      } elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
           $getArr['page'] = round($pagesInstance->params['page'] / 2);
           echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
       } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {

system/modules/Ui/widgets/Table/body.php

Indentation +13 added lines, -13 removed lines

@@ -5,19 +5,19 @@
           <div class ='pull-right'>
             <div class="btn-group">
               <?php
-              $html = '';
-              foreach ($table->buttons as $button) {
-                  $html .= '<a class = "btn btn-primary btn-sm"';
-                  if (!empty($button['href'])) {
-                      $html .= " href = '{$button['href']}'";
-                  }
-                  if (!empty($button['onclick'])) {
-                      $html .= " onclick = '{$button['onclick']}'";
-                  }
-                  $html .= ">{$button['text']}</a> ";
-              }
-              echo $html;
-              ?>
+                $html = '';
+                foreach ($table->buttons as $button) {
+                    $html .= '<a class = "btn btn-primary btn-sm"';
+                    if (!empty($button['href'])) {
+                        $html .= " href = '{$button['href']}'";
+                    }
+                    if (!empty($button['onclick'])) {
+                        $html .= " onclick = '{$button['onclick']}'";
+                    }
+                    $html .= ">{$button['text']}</a> ";
+                }
+                echo $html;
+                ?>
             </div>
           </div>
       <?php } ?>