injitools / cms-Inji

system/modules/Files/models/Type.php

Indentation +8 added lines, -8 removed lines

@@ -13,13 +13,13 @@
 
 class Type extends \Model {
 
-  public static $cols = [
-      'dir' => ['type' => 'text'],
-      'ext' => ['type' => 'text'],
-      'group' => ['type' => 'text'],
-      'allow_resize' => ['type' => 'bool'],
-      'options' => ['type' => 'textarea'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
+    public static $cols = [
+        'dir' => ['type' => 'text'],
+        'ext' => ['type' => 'text'],
+        'group' => ['type' => 'text'],
+        'allow_resize' => ['type' => 'bool'],
+        'options' => ['type' => 'textarea'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
 
 }

system/modules/Files/Files.php

Indentation +47 added lines, -47 removed lines

@@ -10,58 +10,58 @@ 
  */
 class Files extends Module {
 
-  /**
-   * Загрузка файлов
-   * 
-   * $file - масив из переменной $_FILES[{input name}]
-   * $options - массив из опций заливки 
-   * --	[file_code]: уникальный код для системы медиаданых
-   * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
-   */
-  public function upload($file, $options = []) {
+    /**
+     * Загрузка файлов
+     * 
+     * $file - масив из переменной $_FILES[{input name}]
+     * $options - массив из опций заливки 
+     * --	[file_code]: уникальный код для системы медиаданых
+     * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
+     */
+    public function upload($file, $options = []) {
 
     $sitePath = App::$primary->path;
 
     if (!is_uploaded_file($file['tmp_name']))
-      return 0;
+        return 0;
 
     $fileinfo = pathinfo($file['name']);
     if (empty($fileinfo['extension']))
-      return 0;
+        return 0;
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
     if (!$type)
-      return 0;
+        return 0;
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
-      return 0;
+        return 0;
     }
 
     $fileObject = new Files\File();
     if (!empty($options['file_code'])) {
-      $fileObject = Files\File::get($options['file_code'], 'code');
-      if (!$fileObject) {
+        $fileObject = Files\File::get($options['file_code'], 'code');
+        if (!$fileObject) {
         $fileObject = new Files\File();
         $fileObject->code = $options['file_code'];
-      }
+        }
     }
     $fileObject->name = $fileinfo['filename'];
     $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
     if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+        unlink($sitePath . $fileObject->path);
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
     if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
-      return false;
+        return false;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
-      $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
-      if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
+        $typeOptions = json_decode($type->options, true);
+        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+        if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
         Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
-      }
+        }
     }
 
     $fileObject->type_id = $type->pk();
@@ -70,60 +70,60 @@ 
     $fileObject->save();
 
     return $fileObject->id;
-  }
-
-  /**
-   * Загрузка файлов по урл
-   * 
-   * $url - адрес файла
-   * $options - массив из опций заливки 
-   * --	[file_code]: уникальный код для системы медиаданых
-   * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
-   */
-  public function uploadFromUrl($url, $options = []) {
+    }
+
+    /**
+     * Загрузка файлов по урл
+     * 
+     * $url - адрес файла
+     * $options - массив из опций заливки 
+     * --	[file_code]: уникальный код для системы медиаданых
+     * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
+     */
+    public function uploadFromUrl($url, $options = []) {
     $sitePath = App::$primary->path;
 
     $fileinfo = pathinfo($url);
     if (empty($fileinfo['extension']))
-      return 0;
+        return 0;
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
     if (!$type)
-      return 0;
+        return 0;
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
-      return 0;
+        return 0;
     }
 
     $fileObject = new Files\File();
     if (!empty($options['file_code'])) {
-      $fileObject = Files\File::get($options['file_code'], 'code');
-      if (!$fileObject) {
+        $fileObject = Files\File::get($options['file_code'], 'code');
+        if (!$fileObject) {
         $fileObject = new Files\File();
         $fileObject->code = $options['file_code'];
-      }
+        }
     }
     $fileObject->name = $fileinfo['filename'];
     $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
     if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+        unlink($sitePath . $fileObject->path);
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
     $file = @file_get_contents($url);
     if ($file === false) {
-      return 0;
+        return 0;
     }
     if (!file_put_contents($sitePath . $fileObject->path, $file)) {
-      return 0;
+        return 0;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
-      $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
-      if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
+        $typeOptions = json_decode($type->options, true);
+        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+        if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
         Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
-      }
+        }
     }
 
     $fileObject->type_id = $type->pk();
@@ -132,6 +132,6 @@ 
     $fileObject->save();
 
     return $fileObject->id;
-  }
+    }
 
 }

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

Indentation +40 added lines, -40 removed lines

@@ -13,30 +13,30 @@ 
 
 class Mysql extends \Object {
 
-  public $config = [];       // настройки подключения выбраной базы
-  public $connect = FALSE;        // ярлык соединения с MySQL
-  public $encoding = 'utf-8';        // установленная кодировка
-  public $db_name = 'test';         // выбраная в данный момент база
-  public $table_prefix = 'inji_';   // префикс названий таблиц
-  public $pdo = NULL;
-  public $lastQuery = '';
-  public $last_error = '';
-  public $noConnectAbort = false;
-  public $dbInstance = null;
+    public $config = [];       // настройки подключения выбраной базы
+    public $connect = FALSE;        // ярлык соединения с MySQL
+    public $encoding = 'utf-8';        // установленная кодировка
+    public $db_name = 'test';         // выбраная в данный момент база
+    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $pdo = NULL;
+    public $lastQuery = '';
+    public $last_error = '';
+    public $noConnectAbort = false;
+    public $dbInstance = null;
 
-  /**
-   * Подключение к MySQL
-   */
-  public function init($connect_options) {
+    /**
+     * Подключение к MySQL
+     */
+    public function init($connect_options) {
     extract($connect_options);
     if (isset($db_name))
-      $this->db_name = $db_name;
+        $this->db_name = $db_name;
     if (isset($encoding))
-      $this->encoding = $encoding;
+        $this->encoding = $encoding;
     if (isset($table_prefix))
-      $this->table_prefix = $table_prefix;
+        $this->table_prefix = $table_prefix;
     if (isset($noConnectAbort))
-      $this->noConnectAbort = $noConnectAbort;
+        $this->noConnectAbort = $noConnectAbort;
 
     $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
     $dt = new \DateTime();
@@ -50,21 +50,21 @@ 
     $this->pdo = new \PDO($dsn, $user, $pass, $opt);
     $error = $this->pdo->errorInfo();
     if ((int) $error[0]) {
-      if ($this->noConnectAbort) {
+        if ($this->noConnectAbort) {
         return false;
-      } else {
+        } else {
         INJI_SYSTEM_ERROR($error[2], true);
-      }
+        }
     } else {
-      $this->connect = true;
-      $query = new Mysql\Query($this);
-      $query->query("SET SQL_BIG_SELECTS=1");
-      $query->query("SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION'");
-      return true;
+        $this->connect = true;
+        $query = new Mysql\Query($this);
+        $query->query("SET SQL_BIG_SELECTS=1");
+        $query->query("SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION'");
+        return true;
+    }
     }
-  }
 
-  public function getTableCols($table_name) {
+    public function getTableCols($table_name) {
     $query = new Mysql\Query($this);
     $old_db = $this->db_name;
     $old_prefix = $this->table_prefix;
@@ -77,35 +77,35 @@ 
     $this->db_name = $old_db;
     $this->table_prefix = $old_prefix;
     return $result->getArray('COLUMN_NAME');
-  }
+    }
 
-  public function tableExist($tableName) {
+    public function tableExist($tableName) {
     $query = new Mysql\Query($this);
     return (bool) $query->query("SHOW TABLES FROM `{$this->db_name}` LIKE '{$this->table_prefix}{$tableName}'")->getArray();
-  }
+    }
 
-  public function addCol($table = false, $name = false, $param = 'TEXT NOT NULL') {
+    public function addCol($table = false, $name = false, $param = 'TEXT NOT NULL') {
     if (!$table || !$name) {
-      return false;
+        return false;
     }
     if ($param == 'pk') {
-      $param = "int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$name}`)";
+        $param = "int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$name}`)";
     }
     $query = new Mysql\Query($this);
     return $query->query("ALTER TABLE `{$this->db_name}`.`{$this->table_prefix}{$table}` ADD `{$name}` {$param}");
-  }
+    }
 
-  public function delCol($table = false, $name = false) {
+    public function delCol($table = false, $name = false) {
     if (!$table || !$name) {
-      return false;
+        return false;
     }
     $query = new Mysql\Query($this);
     return $query->query("ALTER TABLE `{$this->db_name}`.`{$this->table_prefix}{$table}` DROP `{$name}`");
-  }
+    }
 
-  public function getTables() {
+    public function getTables() {
     $query = new Mysql\Query($this);
     return $query->query("SHOW TABLES")->getArray();
-  }
+    }
 
 }

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

Indentation +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
         ], '', true);
 $buttons = $dataManager->getButtons($params, $model);
 if ($buttons) {
-  ?>
+    ?>
   <h3 class="dataManager-title"><?= $dataManager->name; ?> 
     <div class ='pull-right dataManager-managerButtons'>
       <div class="btn-group">
@@ -26,13 +26,13 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-  $mainCol['style'].='margin-left:260px;';
-  echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
-  $this->widget('Ui\DataManager/categorys', compact('dataManager'));
-  echo '</div>';
+    $mainCol['style'].='margin-left:260px;';
+    echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
+    $this->widget('Ui\DataManager/categorys', compact('dataManager'));
+    echo '</div>';
 }
 if (!empty($dataManager->managerOptions['filters'])) {
-  ?>
+    ?>
   <div class="modal fade" id = "<?= $dataManager->managerId; ?>_filters" >
     <div class="modal-dialog modal-lg">
       <div class="modal-content">

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

Indentation +32 added lines, -32 removed lines

@@ -46,7 +46,7 @@ 
             continue;
         }
         if(++$i && !($i%2)){
-          echo '</div><div class="row">';
+            echo '</div><div class="row">';
         }
         echo '<div class="col-md-6">';
         if (!empty($colInfo['colParams']['type'])) {
@@ -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/Materials/models/Material.php

Indentation +110 added lines, -110 removed lines

@@ -13,99 +13,99 @@ 
 
 class Material extends \Model {
 
-  public static $objectName = 'Материал';
-  public static $categoryModel = 'Materials\Category';
-  public static $labels = [
-      'name' => 'Заголовок',
-      'category_id' => 'Раздел',
-      'preview' => 'Краткое превью',
-      'text' => 'Текст страницы',
-      'alias' => 'Алиас страницы',
-      'template' => 'Шаблон сайта',
-      'viewer' => 'Тип страницы',
-      'image_file_id' => 'Фото материала',
-      'description' => 'Описание для поисковиков',
-      'keywords' => 'Ключевые слова',
-      'user_id' => 'Создатель',
-      'date_create' => 'Дата создания',
-      'tag_list' => 'Теги'
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'name',
-              'alias',
-              'category_id',
-              'date_create',
-              'tag_list'
-          ],
-          'sortable' => [
-              'name',
-              'alias',
-              'category_id',
-              'date_create'
-          ],
-          'filters' => [
-              'name',
-              'preview',
-              'text',
-              'alias',
-              'template',
-              'viewer',
-              'description',
-              'keywords',
-              'user_id',
-              'date_create'
-          ],
-          'categorys' => [
-              'model' => 'Materials\Category',
-          ],
-          'sortMode' => true
-      ]
-  ];
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'alias' => ['type' => 'text'],
-      'preview' => ['type' => 'html'],
-      'text' => ['type' => 'html'],
-      'keywords' => ['type' => 'text'],
-      'description' => ['type' => 'text'],
-      'category_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'category'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesList', 'module' => 'Materials'],
-      'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsList', 'module' => 'Materials'],
-      'default' => ['type' => 'bool'],
-      'hidden' => ['type' => 'bool'],
-      'image_file_id' => ['type' => 'image'],
-      'link' => ['type' => 'dataManager', 'relation' => 'links'],
-      'tree_path' => ['type' => 'text'],
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-      'tag_list' => ['type' => 'text'],
-  ];
-  public static $forms = [
-      'manager' => [
-          'options' => [
-              'access' => [
-                  'groups' => [
-                      3
-                  ]
-              ]
-          ],
-          'map' => [
-              ['name', 'category_id'],
-              ['alias', 'image_file_id'],
-              ['template', 'viewer'],
-              ['keywords', 'description'],
-              ['tag_list'],
-              ['preview'],
-              ['text'],
-              ['link'],
-          ]
-      ]
-  ];
+    public static $objectName = 'Материал';
+    public static $categoryModel = 'Materials\Category';
+    public static $labels = [
+        'name' => 'Заголовок',
+        'category_id' => 'Раздел',
+        'preview' => 'Краткое превью',
+        'text' => 'Текст страницы',
+        'alias' => 'Алиас страницы',
+        'template' => 'Шаблон сайта',
+        'viewer' => 'Тип страницы',
+        'image_file_id' => 'Фото материала',
+        'description' => 'Описание для поисковиков',
+        'keywords' => 'Ключевые слова',
+        'user_id' => 'Создатель',
+        'date_create' => 'Дата создания',
+        'tag_list' => 'Теги'
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'name',
+                'alias',
+                'category_id',
+                'date_create',
+                'tag_list'
+            ],
+            'sortable' => [
+                'name',
+                'alias',
+                'category_id',
+                'date_create'
+            ],
+            'filters' => [
+                'name',
+                'preview',
+                'text',
+                'alias',
+                'template',
+                'viewer',
+                'description',
+                'keywords',
+                'user_id',
+                'date_create'
+            ],
+            'categorys' => [
+                'model' => 'Materials\Category',
+            ],
+            'sortMode' => true
+        ]
+    ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'alias' => ['type' => 'text'],
+        'preview' => ['type' => 'html'],
+        'text' => ['type' => 'html'],
+        'keywords' => ['type' => 'text'],
+        'description' => ['type' => 'text'],
+        'category_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'category'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesList', 'module' => 'Materials'],
+        'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsList', 'module' => 'Materials'],
+        'default' => ['type' => 'bool'],
+        'hidden' => ['type' => 'bool'],
+        'image_file_id' => ['type' => 'image'],
+        'link' => ['type' => 'dataManager', 'relation' => 'links'],
+        'tree_path' => ['type' => 'text'],
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+        'tag_list' => ['type' => 'text'],
+    ];
+    public static $forms = [
+        'manager' => [
+            'options' => [
+                'access' => [
+                    'groups' => [
+                        3
+                    ]
+                ]
+            ],
+            'map' => [
+                ['name', 'category_id'],
+                ['alias', 'image_file_id'],
+                ['template', 'viewer'],
+                ['keywords', 'description'],
+                ['tag_list'],
+                ['preview'],
+                ['text'],
+                ['link'],
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'category' => [
             'model' => '\Materials\Category',
@@ -125,43 +125,43 @@ 
             'col' => 'material_id'
         ]
     ];
-  }
+    }
 
-  public function getHref() {
+    public function getHref() {
     $href = !empty(\App::$primary->config['defaultModule']) && \App::$primary->config['defaultModule'] == 'Materials' ? '' : '/materials';
     $treePath = array_filter(explode('/', $this->tree_path));
     if ($treePath) {
-      $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
-      foreach ($categorys as $category) {
+        $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
+        foreach ($categorys as $category) {
         if ($category->alias) {
-          $href .="/{$category->alias}";
+            $href .="/{$category->alias}";
+        }
         }
-      }
     }
     if ((!$href || $href == '/materials') && !$this->alias) {
-      return ($href ? $href : '/materials') . '/view/' . $this->pk();
+        return ($href ? $href : '/materials') . '/view/' . $this->pk();
     }
     return $href . "/" . ($this->alias ? $this->alias : $this->pk());
-  }
+    }
 
-  public function resolveTemplate() {
+    public function resolveTemplate() {
     if ($this->template !== 'inherit') {
-      return $this->template;
+        return $this->template;
     } elseif ($this->template == 'inherit' && $this->category) {
-      return $this->category->resolveTemplate(true);
+        return $this->category->resolveTemplate(true);
     } else {
-      return 'current';
+        return 'current';
+    }
     }
-  }
 
-  public function resolveViewer() {
+    public function resolveViewer() {
     if ($this->viewer !== 'inherit') {
-      return $this->viewer;
+        return $this->viewer;
     } elseif ($this->viewer == 'inherit' && $this->category) {
-      return $this->category->resolveViewer(true);
+        return $this->category->resolveViewer(true);
     } else {
-      return 'default';
+        return 'default';
+    }
     }
-  }
 
 }

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

Indentation +195 added lines, -195 removed lines

@@ -13,413 +13,413 @@ 
 
 class Query extends \Object {
 
-  public $curInstance = null;
-  public $where = [];
-  public $whereString = '';
-  public $having = [];
-  public $havingString = '';
-  public $cols = [];
-  public $order = NULL;
-  public $join = [];
-  public $group = [];
-  public $limit = '';
-  public $error = '';
-  public $query = '';
-  public $table = '';
-  public $operation = '';
-  public $indexes = [];
-  public $params = [];
-  public $distinct = false;
-
-  public function __construct($instance = null) {
+    public $curInstance = null;
+    public $where = [];
+    public $whereString = '';
+    public $having = [];
+    public $havingString = '';
+    public $cols = [];
+    public $order = NULL;
+    public $join = [];
+    public $group = [];
+    public $limit = '';
+    public $error = '';
+    public $query = '';
+    public $table = '';
+    public $operation = '';
+    public $indexes = [];
+    public $params = [];
+    public $distinct = false;
+
+    public function __construct($instance = null) {
     if (!$instance) {
-      $this->curInstance = \App::$cur->db->connection;
+        $this->curInstance = \App::$cur->db->connection;
     } else {
-      $this->curInstance = $instance;
+        $this->curInstance = $instance;
+    }
     }
-  }
 
-  public function insert($table, $data) {
+    public function insert($table, $data) {
     $this->operation = 'INSERT';
     $this->table = $table;
     $this->cols = $data;
     $this->query();
     return $this->curInstance->pdo->lastInsertId();
-  }
+    }
 
-  public function select($table) {
+    public function select($table) {
     $this->operation = 'SELECT';
     $this->table = $table;
     return $this->query();
-  }
+    }
 
-  public function update($table, $data) {
+    public function update($table, $data) {
     $this->operation = 'UPDATE';
     $this->table = $table;
     $this->cols = $data;
     $result = $this->query();
     return $result->pdoResult->rowCount();
-  }
+    }
 
-  public function delete($table) {
+    public function delete($table) {
     $this->operation = 'DELETE';
     $this->table = $table;
     $result = $this->query();
     return $result->pdoResult->rowCount();
-  }
+    }
 
-  public function createTable($table_name, $cols, $indexes = []) {
+    public function createTable($table_name, $cols, $indexes = []) {
     $this->operation = 'CREATE TABLE';
     $this->table = $table_name;
     $this->cols = $cols;
     $this->indexes = $indexes;
     return $this->query();
-  }
+    }
 
-  public function cols($cols) {
+    public function cols($cols) {
     if (is_array($cols)) {
-      $this->cols = array_merge($this->cols, array_values($cols));
+        $this->cols = array_merge($this->cols, array_values($cols));
     } else {
-      $this->cols[] = $cols;
+        $this->cols[] = $cols;
+    }
     }
-  }
 
-  public function join($table, $where = false, $type = 'LEFT', $alias = '') {
+    public function join($table, $where = false, $type = 'LEFT', $alias = '') {
     if (is_array($table)) {
-      foreach ($table as $item) {
+        foreach ($table as $item) {
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'join'), $table);
-          break;
+            call_user_func_array(array($this, 'join'), $table);
+            break;
         } else {
-          $this->join($item);
+            $this->join($item);
+        }
         }
-      }
     } else {
-      $this->join[] = [$table, $where, $type, $alias];
+        $this->join[] = [$table, $where, $type, $alias];
+    }
     }
-  }
 
-  public function where($where = '', $value = '', $operation = false, $concatenation = 'AND') {
+    public function where($where = '', $value = '', $operation = false, $concatenation = 'AND') {
     if (!is_array($where)) {
-      $this->where[] = [$where, $value, $operation, $concatenation];
+        $this->where[] = [$where, $value, $operation, $concatenation];
     } else {
-      $this->where[] = $where;
+        $this->where[] = $where;
+    }
     }
-  }
 
-  public function having($where = '', $value = '', $operation = false, $concatenation = 'AND') {
+    public function having($where = '', $value = '', $operation = false, $concatenation = 'AND') {
     if (!is_array($where)) {
-      $this->having[] = [$where, $value, $operation, $concatenation];
+        $this->having[] = [$where, $value, $operation, $concatenation];
     } else {
-      $this->having[] = $where;
+        $this->having[] = $where;
+    }
     }
-  }
 
-  public function group($colname) {
+    public function group($colname) {
     $this->group[] = $colname;
-  }
+    }
 
-  public function order($order, $type = 'ASC') {
+    public function order($order, $type = 'ASC') {
 
 
     if (!is_array($order)) {
-      $this->order[] = "{$order} {$type}";
+        $this->order[] = "{$order} {$type}";
     } else {
-      foreach ($order as $item)
+        foreach ($order as $item)
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'order'), $order);
-          break;
+            call_user_func_array(array($this, 'order'), $order);
+            break;
         } else
-          $this->order($item);
+            $this->order($item);
+    }
     }
-  }
 
-  public function limit($start = 0, $len = 0) {
+    public function limit($start = 0, $len = 0) {
     $start = intval($start);
     $len = intval($len);
     $this->limit = "LIMIT {$start}";
     if ($len !== 0)
-      $this->limit .= ",{$len}";
-  }
+        $this->limit .= ",{$len}";
+    }
 
-  public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
+    public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
     $join = '';
     if (is_array($table)) {
-      $joins = func_get_args();
-      foreach ($joins as $joinAr) {
+        $joins = func_get_args();
+        foreach ($joins as $joinAr) {
         $join .= call_user_func_array([$this, 'buildJoin'], $joinAr);
-      }
+        }
     } else {
-      $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-      if ($alias)
+        $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
+        if ($alias)
         $join .= " AS `{$alias}`";
-      if ($where)
+        if ($where)
         $join .= " ON {$where}";
     }
     return $join;
-  }
-
-  /**
-   * Build where string
-   * 
-   * @param string|array $where
-   * @param mixed $value
-   * @param string $operation
-   * @param string $concatenation
-   */
-  public function buildWhere($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
+    }
+
+    /**
+     * Build where string
+     * 
+     * @param string|array $where
+     * @param mixed $value
+     * @param string $operation
+     * @param string $concatenation
+     */
+    public function buildWhere($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
     if (!is_array($where)) {
-      if (empty($operation)) {
+        if (empty($operation)) {
         $operation = '=';
-      }
+        }
 
-      if ($concatenation === false)
+        if ($concatenation === false)
         $concatenation = 'AND';
-      elseif ($concatenation === true)
+        elseif ($concatenation === true)
         $concatenation = '';
 
-      if ($this->whereString == NULL)
+        if ($this->whereString == NULL)
         $this->whereString = ' WHERE ';
 
-      if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
+        if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
         if (is_array($value)) {
-          $newValue = '';
-          foreach ($value as $item) {
+            $newValue = '';
+            foreach ($value as $item) {
             if ($newValue) {
-              $newValue.=',';
+                $newValue.=',';
             }
             if (is_string($item)) {
-              $newValue .='"' . $item . '"';
+                $newValue .='"' . $item . '"';
             } else {
-              $newValue .=$item;
+                $newValue .=$item;
+            }
             }
-          }
-          $value = '(' . $newValue . ')';
+            $value = '(' . $newValue . ')';
         } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "({$value})";
+            $value = "({$value})";
         } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "\"{$value}\"";
+            $value = "\"{$value}\"";
         }
-      } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+        } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
         $this->params[] = $value;
         $value = "?";
-      }
+        }
 
-      if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
+        if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
         $this->whereString .= " {$where} {$operation} {$value} ";
-      else
+        else
         $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
     }
     else {
-      $i = -1;
-      while (isset($where[++$i])) {
+        $i = -1;
+        while (isset($where[++$i])) {
         $item = $where[$i];
         if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
-          if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
+            if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
             if (!isset($item[3])) {
-              $concatenation = 'AND';
+                $concatenation = 'AND';
             } else {
-              $concatenation = $item[3];
+                $concatenation = $item[3];
             }
 
             $this->whereString .= "{$concatenation} ";
-          }
+            }
 
-          if ($this->whereString != NULL)
+            if ($this->whereString != NULL)
             $this->whereString .= '(';
-          else
+            else
             $this->whereString = 'WHERE (';
         }
 
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'buildWhere'), $where);
-          break;
+            call_user_func_array(array($this, 'buildWhere'), $where);
+            break;
         } else {
-          $this->buildWhere($item);
+            $this->buildWhere($item);
         }
         if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
-          $this->whereString .= ') ';
+            $this->whereString .= ') ';
+        }
         }
-      }
-    }
-  }
-
-  /**
-   * Build having string
-   * 
-   * @param string|array $where
-   * @param mixed $value
-   * @param string $operation
-   * @param string $concatenation
-   */
-  public function buildHaving($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
+    }
+    }
+
+    /**
+     * Build having string
+     * 
+     * @param string|array $where
+     * @param mixed $value
+     * @param string $operation
+     * @param string $concatenation
+     */
+    public function buildHaving($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
     if (!is_array($where)) {
-      if (empty($operation)) {
+        if (empty($operation)) {
         $operation = '=';
-      }
-      if ($concatenation === false)
+        }
+        if ($concatenation === false)
         $concatenation = 'AND';
-      elseif ($concatenation === true)
+        elseif ($concatenation === true)
         $concatenation = '';
 
-      if ($this->havingString == NULL)
+        if ($this->havingString == NULL)
         $this->havingString = ' HAVING ';
 
-      if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
+        if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
         if (is_array($value)) {
-          $newValue = '';
-          foreach ($value as $item) {
+            $newValue = '';
+            foreach ($value as $item) {
             if ($newValue) {
-              $newValue.=',';
+                $newValue.=',';
             }
             if (is_string($item)) {
-              $newValue .='"' . $item . '"';
+                $newValue .='"' . $item . '"';
             } else {
-              $newValue .=$item;
+                $newValue .=$item;
+            }
             }
-          }
-          $value = '(' . $newValue . ')';
+            $value = '(' . $newValue . ')';
         } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "({$value})";
+            $value = "({$value})";
         } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "\"{$value}\"";
+            $value = "\"{$value}\"";
         }
-      } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+        } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
         $this->params[] = $value;
         $value = "?";
-      }
+        }
 
-      if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
+        if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
         $this->havingString .= " {$where} {$operation} {$value} ";
-      else
+        else
         $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
     }
     else {
-      $i = -1;
-      while (isset($where[++$i])) {
+        $i = -1;
+        while (isset($where[++$i])) {
         $item = $where[$i];
         if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
-          if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
+            if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
             if (!isset($item[3])) {
-              $concatenation = 'AND';
+                $concatenation = 'AND';
             } else {
-              $concatenation = $item[3];
+                $concatenation = $item[3];
             }
 
             $this->havingString .= "{$concatenation} ";
-          }
+            }
 
-          if ($this->havingString != NULL)
+            if ($this->havingString != NULL)
             $this->havingString .= '(';
-          else
+            else
             $this->havingString = 'HAVING (';
         }
 
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'buildHaving'), $where);
-          break;
+            call_user_func_array(array($this, 'buildHaving'), $where);
+            break;
         } else {
-          $this->buildHaving($item);
+            $this->buildHaving($item);
         }
         if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
-          $this->havingString .= ') ';
+            $this->havingString .= ') ';
         }
-      }
+        }
+    }
     }
-  }
 
-  public function buildQuery() {
+    public function buildQuery() {
     $query = $this->operation;
     $this->operation = strtoupper($this->operation);
 
     switch ($this->operation) {
-      case 'SELECT':
+        case 'SELECT':
         $query .= ' ' . ($this->distinct ? 'DISTINCT' : '');
         $query .= ' ' . (!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
-      case 'DELETE':
+        case 'DELETE':
         $query .= ' FROM';
         break;
-      case 'INSERT':
+        case 'INSERT':
         $query .= ' INTO';
         break;
     }
     $query .= " `{$this->curInstance->db_name}`.`{$this->curInstance->table_prefix}{$this->table}`";
     if ($this->join) {
-      $query .= $this->buildJoin($this->join);
+        $query .= $this->buildJoin($this->join);
     }
     switch ($this->operation) {
-      case 'INSERT':
+        case 'INSERT':
         $this->params = array_merge($this->params, array_values($this->cols));
         $colsStr = '';
         if ($this->cols) {
-          $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
+            $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
         }
         $query .= ' (' . $colsStr . ') VALUES (' . rtrim(str_repeat('?,', count($this->cols)), ',') . ')';
         break;
-      case 'CREATE TABLE':
+        case 'CREATE TABLE':
         $query .= " (";
         foreach ($this->cols as $col_name => $param) {
-          if ($param == 'pk') {
+            if ($param == 'pk') {
             $param = "int(11) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$col_name}`)";
-          }
-          $query .= " `{$col_name}` {$param},";
+            }
+            $query .= " `{$col_name}` {$param},";
         }
         $query = rtrim($query, ',');
         if ($this->indexes) {
-          $query .= ', ' . implode(',', $this->indexes);
+            $query .= ', ' . implode(',', $this->indexes);
         }
         $query .= ") ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci";
         break;
-      case 'UPDATE':
+        case 'UPDATE':
         $updates = [];
         foreach ($this->cols as $key => $item) {
-          if (!in_array($item, array('CURRENT_TIMESTAMP'))) {
+            if (!in_array($item, array('CURRENT_TIMESTAMP'))) {
             $this->params[] = $item;
             $updates[] = "`{$key}` = ?";
-          } else {
+            } else {
             $updates[] = "`{$key}` = {$item}";
-          }
+            }
         }
         $update = implode(',', $updates);
         $query .=" SET {$update}";
-      case 'SELECT':
+        case 'SELECT':
       case 'DELETE':
         $this->buildWhere($this->where);
         if ($this->whereString) {
-          $query .= ' ' . $this->whereString;
+            $query .= ' ' . $this->whereString;
         }
         break;
     }
     if ($this->group) {
-      $query .= ' GROUP BY ' . implode(',', $this->group);
+        $query .= ' GROUP BY ' . implode(',', $this->group);
     }
     $this->buildHaving($this->having);
     if ($this->havingString) {
-      $query .= ' ' . $this->havingString;
+        $query .= ' ' . $this->havingString;
     }
     if ($this->order) {
-      $query .= ' ORDER BY ' . implode(',', $this->order);
+        $query .= ' ORDER BY ' . implode(',', $this->order);
     }
     if ($this->limit) {
-      $query .= ' ' . $this->limit;
+        $query .= ' ' . $this->limit;
     }
     return ['query' => $query, 'params' => $this->params];
-  }
-
-  /**
-   * Execute query
-   * 
-   * @param string|array $query
-   * @return \Db\Mysql\Result
-   */
-  public function query($query = []) {
+    }
+
+    /**
+     * Execute query
+     * 
+     * @param string|array $query
+     * @return \Db\Mysql\Result
+     */
+    public function query($query = []) {
     if (!$query) {
-      $this->params = [];
-      $query = $this->buildQuery();
+        $this->params = [];
+        $query = $this->buildQuery();
     }
 
     if (is_string($query)) {
-      $query = ['query' => $query, 'params' => $this->params];
+        $query = ['query' => $query, 'params' => $this->params];
     }
 
     $prepare = $this->curInstance->pdo->prepare($query['query']);
@@ -429,10 +429,10 @@ 
     $result = new Result();
     $result->pdoResult = $prepare;
     if ($this->curInstance->dbInstance && $this->curInstance->dbInstance->curQuery && $this->curInstance->dbInstance->curQuery === $this) {
-      $this->curInstance->dbInstance->curQuery = null;
+        $this->curInstance->dbInstance->curQuery = null;
     }
 
     return $result;
-  }
+    }
 
 }

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

Indentation +4 added lines, -4 removed lines

@@ -9,16 +9,16 @@
     'value' => !empty($options['value']) ? addcslashes($options['value'], "'") : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : '')
 ];
 if (!empty($options['disabled'])) {
-  $attributes['disabled'] = 'disabled';
+    $attributes['disabled'] = 'disabled';
 }
 if (!empty($options['placeholder'])) {
-  $attributes['placeholder'] = $options['placeholder'];
+    $attributes['placeholder'] = $options['placeholder'];
 }
 if (!empty($options['checked'])) {
-  $attributes['checked'] = 'checked';
+    $attributes['checked'] = 'checked';
 }
 if (!empty($options['attributes'])) {
-  $attributes = array_merge($attributes, $options['attributes']);
+    $attributes = array_merge($attributes, $options['attributes']);
 }
 echo Html::el('input', $attributes, '', null);
 echo!empty($options['helpText']) ? "<div class='help-block'>{$options['helpText']}</div>" : '';

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

Indentation +31 added lines, -31 removed lines

@@ -6,10 +6,10 @@ 
     <?= $label; ?>
   </h3>
   <?php
-  if ($options['source'] == 'relation' && empty($options['modelPk'])) {
+    if ($options['source'] == 'relation' && empty($options['modelPk'])) {
     echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
     echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
-  } else {
+    } else {
     ?>
     <div class="table-responsive">
       <table class ='table table-striped'>
@@ -17,18 +17,18 @@ 
           <tr>
             <?php
             foreach ($options['cols'] as $colName => $col) {
-              if (!empty($col['hidden'])) {
+                if (!empty($col['hidden'])) {
                 continue;
-              }
-              echo "<th>";
-              echo $col['col']['label'];
-              if (!empty($col['col']['model'])) {
+                }
+                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>";
+                }
+                echo "</th>";
             }
             ?>
             <td>&nbsp;</td>
@@ -36,14 +36,14 @@ 
         </thead>
         <tbody class="listBody">
           <?php
-          $i = 0;
-          if (!empty($options['values'])) {
+            $i = 0;
+            if (!empty($options['values'])) {
             foreach ($options['values'] as $row) {
-              echo '<tr>';
-              foreach ($options['cols'] as $colName => $col) {
+                echo '<tr>';
+                foreach ($options['cols'] as $colName => $col) {
                 $input = clone $col['input'];
                 if (empty($col['hidden'])) {
-                  echo '<td>';
+                    echo '<td>';
                 }
                 $input->options['noContainer'] = true;
                 $input->colParams['label'] = false;
@@ -51,24 +51,24 @@ 
                 $input->colName .= '[' . $colName . '][' . ($i) . ']';
                 $input->draw();
                 if (empty($col['hidden'])) {
-                  echo '</td>';
+                    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++;
+                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'])) {
+                if (!empty($col['hidden'])) {
                 continue;
-              }
-              echo "<th>{$col['col']['label']}</th>";
+                }
+                echo "<th>{$col['col']['label']}</th>";
             }
             ?>
             <td>&nbsp;</td>
@@ -81,26 +81,26 @@ 
       <script>/*
        <tr>
   <?php
-  foreach ($options['cols'] as $colName => $col) {
+    foreach ($options['cols'] as $colName => $col) {
     if (empty($col['hidden'])) {
-      echo '<td>';
+        echo '<td>';
     }
     $col['input']->options['noContainer'] = true;
     $col['input']->colParams['label'] = false;
     $col['input']->colName.="[{$colName}][]";
     $col['input']->draw();
     if (empty($col['hidden'])) {
-      echo '</td>';
+        echo '</td>';
+    }
     }
-  }
-  ?>
+    ?>
        <td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>
        </tr>
        */</script>
     </div>
     <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 <?php
 //exit();