injitools / cms-Inji

system/modules/Ui/objects/ActiveForm/Input.php

Braces +4 added lines, -2 removed lines

@@ -45,7 +45,8 @@ 
         $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
         if (isset($request[$this->colName])) {
             $this->activeForm->model->{$colName} = $request[$this->colName];
-        } else {
+        }
+        else {
             $this->activeForm->model->{$colName} = 0;
             $this->activeForm->model->{$colName} = '';
         }
@@ -70,7 +71,8 @@ 
             $value = '';
             if (!empty($preset['value'])) {
                 $value = $preset['value'];
-            } elseif (!empty($preset['userCol'])) {
+            }
+            elseif (!empty($preset['userCol'])) {
                 if (strpos($preset['userCol'], ':')) {
                     $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
                     $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);

system/modules/Ui/objects/Tree.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
             }
             $count += count($items);
             foreach ($items as $objectChild) {
-                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
+                $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
             }
             ?>
         </ul>
@@ -61,7 +61,7 @@ 
                     echo \Html::el('li', $attributes, $item, true);
                     echo '<ul>';
                 }
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
             }
         }
         if ($isset) {

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
             <?php
             if (is_string($objectRoot)) {
                 $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
-            } else {
+            }
+            else {
                 $class = get_class($objectRoot);
                 $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()], 'order' => $order]);
             }
@@ -66,7 +67,8 @@ 
         }
         if ($isset) {
             echo '</ul></li>';
-        } else {
+        }
+        else {
             echo \Html::el('li', $attributes, $item);
         }
         return $count;

system/modules/Ui/objects/Pages.php

Braces +8 added lines, -5 removed lines

@@ -30,15 +30,18 @@
             $this->params['page'] = 0;
             $this->params['pages'] = 0;
             $this->params['start'] = 0;
-        } else {
+        }
+        else {
             $this->params['pages'] = ceil($this->options['count'] / $this->params['limit']);
             $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/Controllers/DataManagerController.php

Braces +10 added lines, -5 removed lines

@@ -23,7 +23,8 @@ 
             $raw = explode(':', $item);
             $return['modelName'] = $raw[0];
             $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
-        } else {
+        }
+        else {
             $return['modelName'] = $item;
             $return['model'] = null;
         }
@@ -32,7 +33,8 @@ 
             $relation = $return['modelName']::getRelation($return['params']['relation']);
             if (!empty($relation['type']) && $relation['type'] == 'relModel') {
                 $return['modelName'] = $relation['relModel'];
-            } else {
+            }
+            else {
                 $return['modelName'] = $relation['model'];
             }
         }
@@ -131,7 +133,8 @@ 
                 }
                 echo "\n";
                 $endRow = true;
-            } else {
+            }
+            else {
                 Ui\Table::drawRow($row);
             }
         }
@@ -220,7 +223,8 @@ 
                     $actionParams = $actions[$request['action']];
                     if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
                         $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
-                    } else {
+                    }
+                    else {
                         try {
                             $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
                             $result->success = true;
@@ -230,7 +234,8 @@ 
                     }
                 }
             }
-        } else {
+        }
+        else {
             $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
         }
         $result->send();

system/modules/Ui/widgets/Form/select.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,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>";
     }

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
         }
         $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
-    } else {
+    }
+    else {
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
     }
 }
@@ -47,7 +48,8 @@ 
     if ($key !== $showedInput) {
         $input['options']['disabled'] = true;
         $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
-    } else {
+    }
+    else {
         $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
     }
     if ($input['type'] == 'select') {

system/modules/Ui/widgets/Form/dynamicList.php

Indentation +46 added lines, -46 removed lines

@@ -16,61 +16,61 @@
                 <thead>
                     <tr>
                       <?php
-                      foreach ($options['cols'] as $colName => $col) {
-                          if (!empty($col['hidden'])) {
-                              continue;
-                          }
-                          echo "<th>";
-                          echo $col['col']['label'];
-                          if (!empty($col['col']['model'])) {
-                              $modelName = $col['col']['model'];
-                              $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
-                                      . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
-                              echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
-                          }
-                          echo "</th>";
-                      }
-                      ?>
+                        foreach ($options['cols'] as $colName => $col) {
+                            if (!empty($col['hidden'])) {
+                                continue;
+                            }
+                            echo "<th>";
+                            echo $col['col']['label'];
+                            if (!empty($col['col']['model'])) {
+                                $modelName = $col['col']['model'];
+                                $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+                                        . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
+                                echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
+                            }
+                            echo "</th>";
+                        }
+                        ?>
                         <td>&nbsp;</td>
                     </tr>
                 </thead>
                 <tbody class="listBody">
                   <?php
-                  $i = 0;
-                  if (!empty($options['values'])) {
-                      foreach ($options['values'] as $row) {
-                          echo '<tr>';
-                          foreach ($options['cols'] as $colName => $col) {
-                              $input = clone $col['input'];
-                              if (empty($col['hidden'])) {
-                                  echo '<td>';
-                              }
-                              $input->options['noContainer'] = true;
-                              $input->colParams['label'] = false;
-                              $input->colParams['value'] = $row[$colName];
-                              $input->colName .= '[' . $colName . '][' . ($i) . ']';
-                              $input->draw();
-                              if (empty($col['hidden'])) {
-                                  echo '</td>';
-                              }
-                          }
-                          $i++;
-                          echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
-                          echo '</tr>';
-                      }
-                  }
-                  ?>
+                    $i = 0;
+                    if (!empty($options['values'])) {
+                        foreach ($options['values'] as $row) {
+                            echo '<tr>';
+                            foreach ($options['cols'] as $colName => $col) {
+                                $input = clone $col['input'];
+                                if (empty($col['hidden'])) {
+                                    echo '<td>';
+                                }
+                                $input->options['noContainer'] = true;
+                                $input->colParams['label'] = false;
+                                $input->colParams['value'] = $row[$colName];
+                                $input->colName .= '[' . $colName . '][' . ($i) . ']';
+                                $input->draw();
+                                if (empty($col['hidden'])) {
+                                    echo '</td>';
+                                }
+                            }
+                            $i++;
+                            echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
+                            echo '</tr>';
+                        }
+                    }
+                    ?>
                 </tbody>
                 <tfoot>
                     <tr>
                       <?php
-                      foreach ($options['cols'] as $colName => $col) {
-                          if (!empty($col['hidden'])) {
-                              continue;
-                          }
-                          echo "<th>{$col['col']['label']}</th>";
-                      }
-                      ?>
+                        foreach ($options['cols'] as $colName => $col) {
+                            if (!empty($col['hidden'])) {
+                                continue;
+                            }
+                            echo "<th>{$col['col']['label']}</th>";
+                        }
+                        ?>
                         <td>&nbsp;</td>
                     </tr>
                 </tfoot>

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         }
         $col['input']->options['noContainer'] = true;
         $col['input']->colParams['label'] = false;
-        $col['input']->colName.="[{$colName}][]";
+        $col['input']->colName .= "[{$colName}][]";
         $col['input']->draw();
         if (empty($col['hidden'])) {
             echo '</td>';

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
 function INJI_SYSTEM_ERROR($msg, $fatal = false) {
     if ($fatal) {
         exit("<div style = 'text-align:center;font-size:20px;margin-top:25%;'>{$msg}</div>");
-    } else {
+    }
+    else {
         echo "<div style = 'text-align:center;font-size:20px;margin-top:25%;'>{$msg}</div>";
     }
 }

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

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <tfoot>
     <tr>
       <?php
-      foreach ($table->cols as $col) {
-          if (is_string($col)) {
-              echo "<th>{$col}</th>";
-          } else {
-              echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']);
-          }
-      }
-      ?>
+        foreach ($table->cols as $col) {
+            if (is_string($col)) {
+                echo "<th>{$col}</th>";
+            } else {
+                echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']);
+            }
+        }
+        ?>
     </tr>
 </tfoot>
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -4,7 +4,8 @@
       foreach ($table->cols as $col) {
           if (is_string($col)) {
               echo "<th>{$col}</th>";
-          } else {
+          }
+          else {
               echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']);
           }
       }

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

Indentation +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@
 <tr>
   <?php
-  foreach ($row as $html) {
-      if (is_array($html)) {
-          extract($html);
-      }
-      echo "<td " . (!empty($class) ? "class='{$class}'" : '') . ">{$html}</td>";
-  }
-  ?>
+    foreach ($row as $html) {
+        if (is_array($html)) {
+            extract($html);
+        }
+        echo "<td " . (!empty($class) ? "class='{$class}'" : '') . ">{$html}</td>";
+    }
+    ?>
 </tr>
\ No newline at end of file

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

Braces +24 added lines, -12 removed lines

@@ -15,7 +15,8 @@ 
           if ($dataManager->modelName) {
               $modelName = $dataManager->modelName;
               $colInfo = $modelName::getColInfo($col);
-          } else {
+          }
+          else {
               $colInfo = $dataManager->managerOptions['cols'][$col];
           }
           $values = [];
@@ -28,10 +29,12 @@ 
                       $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
                       $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                  } else {
+                  }
+                  else {
                       $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                   }
-              } elseif (!empty($colOptions['value'])) {
+              }
+              elseif (!empty($colOptions['value'])) {
                   $inputOptions['value'] = $colOptions['value'];
               }
               if (is_array($inputOptions['value'])) {
@@ -40,7 +43,8 @@ 
                       $inputOptions['value'] = $value;
                       $form->input('hidden', "datamanagerFilters[{$col}][value][{$key}]", '', $inputOptions);
                   }
-              } else {
+              }
+              else {
                   $form->input('hidden', "datamanagerFilters[{$col}][value]", '', $inputOptions);
               }
               continue;
@@ -59,7 +63,8 @@ 
                           case 'method':
                               if (!empty($colInfo['colParams']['params'])) {
                                   $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
-                              } else {
+                              }
+                              else {
                                   $values = ['' => 'Не важно'] + App::$cur->$colInfo['colParams']['module']->$colInfo['colParams']['method']();
                               }
                               break;
@@ -81,7 +86,8 @@ 
                               foreach ($items as $key => $item) {
                                   if (!empty($inputParams['showCol'])) {
                                       $values[$key] = $item->$inputParams['showCol'];
-                                  } else {
+                                  }
+                                  else {
                                       $values[$key] = $item->name();
                                   }
                               }
@@ -100,10 +106,12 @@ 
                                   $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
                                   $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                              } else {
+                              }
+                              else {
                                   $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                               }
-                          } elseif (!empty($colOptions['value'])) {
+                          }
+                          elseif (!empty($colOptions['value'])) {
 
                               $inputOptions['value'] = $colOptions['value'];
                           }
@@ -141,9 +149,11 @@ 
                           <?php
                           if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
                               $value = 1;
-                          } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
+                          }
+                          elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
                               $value = 0;
-                          } else {
+                          }
+                          else {
                               $value = '';
                           }
                           $inputOptions = ['value' => $value, 'values' => [
@@ -162,10 +172,12 @@ 
                                       $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
                                       $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                                  } else {
+                                  }
+                                  else {
                                       $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                                   }
-                              } elseif (!empty($colOptions['value'])) {
+                              }
+                              elseif (!empty($colOptions['value'])) {
 
                                   $inputOptions['value'] = $colOptions['value'];
                               }