injitools / cms-Inji

system/Inji/Tools.php

Doc Comments +1 added lines

@@ -218,6 +218,7 @@
    * @param  $number Integer Число на основе которого нужно сформировать окончание
    * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
    *         например array('яблоко', 'яблока', 'яблок')
+   * @param string[] $endingArray
    * @return String
    */
   public static function getNumEnding($number, $endingArray) {

Indentation +227 added lines, -227 removed lines

@@ -12,84 +12,84 @@ 
  */
 class Tools extends Model {
 
-  /**
-   * Return random string
-   * 
-   * @param int $length
-   * @param string $characters
-   * @return string
-   */
-  public static function randomString($length = 20, $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') {
+    /**
+     * Return random string
+     * 
+     * @param int $length
+     * @param string $characters
+     * @return string
+     */
+    public static function randomString($length = 20, $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') {
     $charactersLength = strlen($characters);
     $randomString = '';
     for ($i = 0; $i < $length; $i++) {
-      $randomString .= $characters[rand(0, $charactersLength - 1)];
+        $randomString .= $characters[rand(0, $charactersLength - 1)];
     }
     return $randomString;
-  }
+    }
 
-  /**
-   * Clean and return user query params
-   * 
-   * @param string $uri
-   * @return array
-   */
-  public static function uriParse($uri) {
+    /**
+     * Clean and return user query params
+     * 
+     * @param string $uri
+     * @return array
+     */
+    public static function uriParse($uri) {
     $answerPos = strpos($uri, '?');
     $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
 
     foreach ($params as $key => $param) {
-      if ($param != '') {
+        if ($param != '') {
         $params[$key] = urldecode($param);
-      } else {
+        } else {
         unset($params[$key]);
-      }
+        }
     }
     return $params;
-  }
+    }
 
-  /**
-   * Recursive create dir
-   * 
-   * @param string $path
-   * @return boolean
-   */
-  public static function createDir($path) {
+    /**
+     * Recursive create dir
+     * 
+     * @param string $path
+     * @return boolean
+     */
+    public static function createDir($path) {
     if (file_exists($path))
-      return true;
+        return true;
 
     $path = explode('/', $path);
     $cur = '';
     foreach ($path as $item) {
-      $cur .= $item . '/';
-      if (!file_exists($cur)) {
+        $cur .= $item . '/';
+        if (!file_exists($cur)) {
         mkdir($cur);
-      }
+        }
     }
     return true;
-  }
+    }
 
-  /**
-   * Resize image in path
-   * 
-   * @param string $img_path
-   * @param int $max_width
-   * @param int $max_height
-   * @param string|false $crop
-   * @param string $pos
-   * @return string
-   */
-  public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') {
+    /**
+     * Resize image in path
+     * 
+     * @param string $img_path
+     * @param int $max_width
+     * @param int $max_height
+     * @param string|false $crop
+     * @param string $pos
+     * @return string
+     */
+    public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') {
     ini_set("gd.jpeg_ignore_warning", 1);
     list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
     switch ($img_type) {
-      case 1:
+        case 1:
         $img_type = 'gif';
         break;
-      case 3:
+        case 3:
         $img_type = 'png';
         break;
-      case 2:
+        case 2:
       default:
         $img_type = 'jpeg';
         break;
@@ -97,55 +97,55 @@ 
     $imagecreatefromX = "imagecreatefrom{$img_type}";
     $src_res = $imagecreatefromX($img_path);
     if (!$src_res) {
-      return false;
+        return false;
     }
 
     if ($img_width / $max_width > $img_height / $max_height)
-      $separator = $img_width / $max_width;
+        $separator = $img_width / $max_width;
     else
-      $separator = $img_height / $max_height;
+        $separator = $img_height / $max_height;
 
     if ($crop === true || $crop == 'q') {
-      if ($img_width > $img_height) {
+        if ($img_width > $img_height) {
         $imgX = floor(( $img_width - $img_height ) / 2);
         $imgY = 0;
         $img_width = $img_height;
         $new_width = $max_width;
         $new_height = $max_height;
-      } else {
+        } else {
         $imgX = 0;
         $imgY = floor(( $img_height - $img_width ) / 2);
         $img_height = $img_width;
         $new_width = $max_width;
         $new_height = $max_height;
-      }
-      if ($pos == 'top') {
+        }
+        if ($pos == 'top') {
         $imgY = 0;
-      }
+        }
     } elseif ($crop == 'c') {
 //Вычисляем некий коэффициент масштабирования
-      $k1 = $img_width / $max_width;
-      $k2 = $img_height / $max_height;
-      $k = $k1 > $k2 ? $k2 : $k1;
-      $ow = $img_width;
-      $oh = $img_height;
+        $k1 = $img_width / $max_width;
+        $k2 = $img_height / $max_height;
+        $k = $k1 > $k2 ? $k2 : $k1;
+        $ow = $img_width;
+        $oh = $img_height;
 //Вычисляем размеры области для нового изображения
-      $img_width = intval($max_width * $k);
-      $img_height = intval($max_height * $k);
-      $new_width = $max_width;
-      $new_height = $max_height;
+        $img_width = intval($max_width * $k);
+        $img_height = intval($max_height * $k);
+        $new_width = $max_width;
+        $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-      $imgX = (int) (($ow / 2) - ($img_width / 2) );
-      if ($pos == 'center') {
+        $imgX = (int) (($ow / 2) - ($img_width / 2) );
+        if ($pos == 'center') {
         $imgY = (int) (($oh / 2) - ($img_height / 2));
-      } else {
+        } else {
         $imgY = 0;
-      }
+        }
     } else {
-      $imgX = 0;
-      $imgY = 0;
-      $new_width = floor($img_width / $separator);
-      $new_height = floor($img_height / $separator);
+        $imgX = 0;
+        $imgY = 0;
+        $new_width = floor($img_width / $separator);
+        $new_height = floor($img_height / $separator);
     }
 
     $new_res = imagecreatetruecolor($new_width, $new_height);
@@ -154,128 +154,128 @@ 
     imagecopyresampled($new_res, $src_res, 0, 0, $imgX, $imgY, $new_width, $new_height, $img_width, $img_height);
 
     if ($img_type == 'jpeg') {
-      imageinterlace($new_res, 1); // чересстрочное формирование изображение
-      imagejpeg($new_res, $img_path, 85);
+        imageinterlace($new_res, 1); // чересстрочное формирование изображение
+        imagejpeg($new_res, $img_path, 85);
     } else {
-      $imageX = "image{$img_type}";
-      $imageX($new_res, $img_path);
+        $imageX = "image{$img_type}";
+        $imageX($new_res, $img_path);
     }
 
     imagedestroy($new_res);
     imagedestroy($src_res);
     return $img_type;
-  }
+    }
 
-  /**
-   * Send mail
-   * 
-   * @param string $from
-   * @param string $to
-   * @param string $subject
-   * @param string $text
-   * @param string $charset
-   * @param string $ctype
-   * @return boolean
-   */
-  public static function sendMail($from, $to, $subject, $text, $charset = 'utf-8', $ctype = 'text/html') {
+    /**
+     * Send mail
+     * 
+     * @param string $from
+     * @param string $to
+     * @param string $subject
+     * @param string $text
+     * @param string $charset
+     * @param string $ctype
+     * @return boolean
+     */
+    public static function sendMail($from, $to, $subject, $text, $charset = 'utf-8', $ctype = 'text/html') {
     $msg = compact('from', 'to', 'subject', 'text', 'charset', 'ctype');
     $msg = Inji::$inst->event('sendMail', $msg);
     if (is_array($msg)) {
-      $headers = "From: {$msg['from']}\r\n";
-      $headers .= "Content-type: {$msg['ctype']}; charset={$msg['charset']}\r\n";
-      $headers .= "Mime-Version: 1.0\r\n";
-      return mail($msg['to'], $msg['subject'], $msg['text'], $headers);
+        $headers = "From: {$msg['from']}\r\n";
+        $headers .= "Content-type: {$msg['ctype']}; charset={$msg['charset']}\r\n";
+        $headers .= "Mime-Version: 1.0\r\n";
+        return mail($msg['to'], $msg['subject'], $msg['text'], $headers);
     }
     return $msg;
-  }
+    }
 
-  /**
-   * Redirect user from any place of code
-   * 
-   * Also add message to message query for view
-   * 
-   * @param string $href
-   * @param string $text
-   * @param string $status
-   */
-  public static function redirect($href = null, $text = false, $status = 'info') {
+    /**
+     * Redirect user from any place of code
+     * 
+     * Also add message to message query for view
+     * 
+     * @param string $href
+     * @param string $text
+     * @param string $status
+     */
+    public static function redirect($href = null, $text = false, $status = 'info') {
     if ($href === null) {
-      $href = $_SERVER['REQUEST_URI'];
+        $href = $_SERVER['REQUEST_URI'];
     }
     if ($text !== false) {
-      Msg::add($text, $status);
+        Msg::add($text, $status);
     }
     if (!headers_sent()) {
-      header("Location: {$href}");
+        header("Location: {$href}");
     } else {
-      echo '\'"><script>window.location="' . $href . '";</script>';
+        echo '\'"><script>window.location="' . $href . '";</script>';
     }
     exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
-  }
+    }
 
-  /**
-   * Функция возвращает окончание для множественного числа слова на основании числа и массива окончаний
-   * @param  $number Integer Число на основе которого нужно сформировать окончание
-   * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
-   *         например array('яблоко', 'яблока', 'яблок')
-   * @return String
-   */
-  public static function getNumEnding($number, $endingArray) {
+    /**
+     * Функция возвращает окончание для множественного числа слова на основании числа и массива окончаний
+     * @param  $number Integer Число на основе которого нужно сформировать окончание
+     * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
+     *         например array('яблоко', 'яблока', 'яблок')
+     * @return String
+     */
+    public static function getNumEnding($number, $endingArray) {
     $number = $number % 100;
     if ($number >= 11 && $number <= 19) {
-      $ending = $endingArray[2];
+        $ending = $endingArray[2];
     } else {
-      $i = $number % 10;
-      switch ($i) {
+        $i = $number % 10;
+        switch ($i) {
         case (1): $ending = $endingArray[0];
-          break;
+            break;
         case (2):
         case (3):
         case (4): $ending = $endingArray[1];
-          break;
+            break;
         default: $ending = $endingArray[2];
-      }
+        }
     }
     return $ending;
-  }
+    }
 
-  /**
-   * Clean request path
-   * 
-   * @param string $path
-   * @return string
-   */
-  public static function parsePath($path) {
+    /**
+     * Clean request path
+     * 
+     * @param string $path
+     * @return string
+     */
+    public static function parsePath($path) {
     $path = str_replace('\\', '/', $path);
     $pathArray = explode('/', $path);
     $cleanPathArray = [];
     do {
-      $changes = 0;
-      foreach ($pathArray as $pathItem) {
+        $changes = 0;
+        foreach ($pathArray as $pathItem) {
         if (trim($pathItem) === '' || $pathItem == '.') {
-          $changes++;
-          continue;
+            $changes++;
+            continue;
         }
         if ($pathItem == '..') {
-          array_pop($cleanPathArray);
-          $changes++;
-          continue;
+            array_pop($cleanPathArray);
+            $changes++;
+            continue;
         }
         $cleanPathArray[] = $pathItem;
-      }
-      $pathArray = $cleanPathArray;
-      $cleanPathArray = [];
+        }
+        $pathArray = $cleanPathArray;
+        $cleanPathArray = [];
     } while ($changes);
     return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
-  }
+    }
 
-  /**
-   * Show date in rus
-   * 
-   * @param string $date
-   * @return string
-   */
-  public static function toRusDate($date) {
+    /**
+     * Show date in rus
+     * 
+     * @param string $date
+     * @return string
+     */
+    public static function toRusDate($date) {
     $yy = (int) substr($date, 0, 4);
     $mm = (int) substr($date, 5, 2);
     $dd = (int) substr($date, 8, 2);
@@ -284,114 +284,114 @@ 
 
     $month = array('января', 'февраля', 'марта', 'апреля', 'мая', 'июня', 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря');
     if (empty($month[$mm - 1])) {
-      return 'Не указано';
+        return 'Не указано';
     }
     return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
-  }
+    }
 
-  /**
-   * Set header
-   * 
-   * @param string $code
-   * @param boolean $exit
-   */
-  public static function header($code, $exit = false) {
+    /**
+     * Set header
+     * 
+     * @param string $code
+     * @param boolean $exit
+     */
+    public static function header($code, $exit = false) {
     if (!headers_sent()) {
-      switch ($code) {
+        switch ($code) {
         case '404':
           header('HTTP/1.1 404 Not Found');
-          break;
+            break;
         default :
           header($code);
-      }
+        }
     }
     if ($exit) {
-      exit;
+        exit;
+    }
     }
-  }
 
-  /**
-   * Return exist path from array
-   * 
-   * If no exist path in array - return default
-   * 
-   * @param array $paths
-   * @param string|false $default
-   * @return string|false
-   */
-  public static function pathsResolve($paths = [], $default = false) {
+    /**
+     * Return exist path from array
+     * 
+     * If no exist path in array - return default
+     * 
+     * @param array $paths
+     * @param string|false $default
+     * @return string|false
+     */
+    public static function pathsResolve($paths = [], $default = false) {
     foreach ($paths as $path) {
-      if (file_exists($path)) {
+        if (file_exists($path)) {
         return $path;
-      }
+        }
     }
     return $default;
-  }
+    }
 
-  /**
-   * Convert acronyms to bites
-   * 
-   * @param string $val
-   * @return int
-   */
-  public static function toBytes($val) {
+    /**
+     * Convert acronyms to bites
+     * 
+     * @param string $val
+     * @return int
+     */
+    public static function toBytes($val) {
     $val = trim($val);
     $last = strtolower($val[strlen($val) - 1]);
     switch ($last) {
-      case 'g':
+        case 'g':
         $val *= 1024;
-      case 'm':
+        case 'm':
         $val *= 1024;
-      case 'k':
+        case 'k':
         $val *= 1024;
     }
 
     return $val;
-  }
+    }
 
-  /**
-   * Recursive copy directories and files
-   * 
-   * @param string $from
-   * @param string $to
-   */
-  public static function copyFiles($from, $to) {
+    /**
+     * Recursive copy directories and files
+     * 
+     * @param string $from
+     * @param string $to
+     */
+    public static function copyFiles($from, $to) {
     $from = rtrim($from, '/');
     $to = rtrim($to, '/');
     self::createDir($to);
     $files = scandir($from);
     foreach ($files as $file) {
-      if (in_array($file, ['.', '..'])) {
+        if (in_array($file, ['.', '..'])) {
         continue;
-      }
-      if (is_dir($from . '/' . $file)) {
+        }
+        if (is_dir($from . '/' . $file)) {
         self::copyFiles($from . '/' . $file, $to . '/' . $file);
-      } else {
+        } else {
         copy($from . '/' . $file, $to . '/' . $file);
-      }
+        }
+    }
     }
-  }
 
-  /**
-   * Translit function
-   * 
-   * @param string $str
-   * @return string
-   */
-  public static function translit($str) {
+    /**
+     * Translit function
+     * 
+     * @param string $str
+     * @return string
+     */
+    public static function translit($str) {
     $rus = array('А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я', 'а', 'б', 'в', 'г', 'д', 'е', 'ё', 'ж', 'з', 'и', 'й', 'к', 'л', 'м', 'н', 'о', 'п', 'р', 'с', 'т', 'у', 'ф', 'х', 'ц', 'ч', 'ш', 'щ', 'ъ', 'ы', 'ь', 'э', 'ю', 'я');
     $lat = array('A', 'B', 'V', 'G', 'D', 'E', 'E', 'Gh', 'Z', 'I', 'Y', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'T', 'U', 'F', 'H', 'C', 'Ch', 'Sh', 'Sch', 'Y', 'Y', 'Y', 'E', 'Yu', 'Ya', 'a', 'b', 'v', 'g', 'd', 'e', 'e', 'gh', 'z', 'i', 'y', 'k', 'l', 'm', 'n', 'o', 'p', 'r', 's', 't', 'u', 'f', 'h', 'c', 'ch', 'sh', 'sch', 'y', 'y', 'y', 'e', 'yu', 'ya');
     return str_replace($rus, $lat, $str);
-  }
+    }
 
-  /**
-   * get youtube video ID from URL
-   *
-   * @author http://stackoverflow.com/a/6556662
-   * @param string $url
-   * @return string Youtube video id or FALSE if none found. 
-   */
-  public static function youtubeIdFromUrl($url) {
+    /**
+     * get youtube video ID from URL
+     *
+     * @author http://stackoverflow.com/a/6556662
+     * @param string $url
+     * @return string Youtube video id or FALSE if none found. 
+     */
+    public static function youtubeIdFromUrl($url) {
     $pattern = '%^# Match any youtube URL
         (?:https?://)?  # Optional scheme. Either http or https
         (?:www\.)?      # Optional www subdomain
@@ -409,20 +409,20 @@ 
     ;
     $result = preg_match($pattern, $url, $matches);
     if (false !== $result) {
-      return $matches[1];
+        return $matches[1];
     }
     return false;
-  }
+    }
 
-  /**
-   * check array is associative
-   *
-   * @author http://stackoverflow.com/a/173479
-   * @param array $arr
-   * @return boolean
-   */
-  public static function isAssoc(&$arr) {
+    /**
+     * check array is associative
+     *
+     * @author http://stackoverflow.com/a/173479
+     * @param array $arr
+     * @return boolean
+     */
+    public static function isAssoc(&$arr) {
     return array_keys($arr) !== range(0, count($arr) - 1);
-  }
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
    */
   public static function uriParse($uri) {
     $answerPos = strpos($uri, '?');
-    $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+    $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
     foreach ($params as $key => $param) {
       if ($param != '') {
@@ -61,7 +61,7 @@ 
     $path = explode('/', $path);
     $cur = '';
     foreach ($path as $item) {
-      $cur .= $item . '/';
+      $cur .= $item.'/';
       if (!file_exists($cur)) {
         mkdir($cur);
       }
@@ -81,7 +81,7 @@ 
    */
   public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') {
     ini_set("gd.jpeg_ignore_warning", 1);
-    list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
+    list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
     switch ($img_type) {
       case 1:
         $img_type = 'gif';
@@ -107,14 +107,14 @@ 
 
     if ($crop === true || $crop == 'q') {
       if ($img_width > $img_height) {
-        $imgX = floor(( $img_width - $img_height ) / 2);
+        $imgX = floor(($img_width - $img_height) / 2);
         $imgY = 0;
         $img_width = $img_height;
         $new_width = $max_width;
         $new_height = $max_height;
       } else {
         $imgX = 0;
-        $imgY = floor(( $img_height - $img_width ) / 2);
+        $imgY = floor(($img_height - $img_width) / 2);
         $img_height = $img_width;
         $new_width = $max_width;
         $new_height = $max_height;
@@ -135,7 +135,7 @@ 
       $new_width = $max_width;
       $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-      $imgX = (int) (($ow / 2) - ($img_width / 2) );
+      $imgX = (int) (($ow / 2) - ($img_width / 2));
       if ($pos == 'center') {
         $imgY = (int) (($oh / 2) - ($img_height / 2));
       } else {
@@ -208,7 +208,7 @@ 
     if (!headers_sent()) {
       header("Location: {$href}");
     } else {
-      echo '\'"><script>window.location="' . $href . '";</script>';
+      echo '\'"><script>window.location="'.$href.'";</script>';
     }
     exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
   }
@@ -266,7 +266,7 @@ 
       $pathArray = $cleanPathArray;
       $cleanPathArray = [];
     } while ($changes);
-    return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
+    return (strpos($path, '/') === 0 ? '/' : '').implode('/', $pathArray);
   }
 
   /**
@@ -286,7 +286,7 @@ 
     if (empty($month[$mm - 1])) {
       return 'Не указано';
     }
-    return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
+    return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy." ".$hours;
   }
 
   /**
@@ -364,10 +364,10 @@ 
       if (in_array($file, ['.', '..'])) {
         continue;
       }
-      if (is_dir($from . '/' . $file)) {
-        self::copyFiles($from . '/' . $file, $to . '/' . $file);
+      if (is_dir($from.'/'.$file)) {
+        self::copyFiles($from.'/'.$file, $to.'/'.$file);
       } else {
-        copy($from . '/' . $file, $to . '/' . $file);
+        copy($from.'/'.$file, $to.'/'.$file);
       }
     }
   }

Braces +8 added lines, -6 removed lines

@@ -55,8 +55,9 @@ 
    * @return boolean
    */
   public static function createDir($path) {
-    if (file_exists($path))
-      return true;
+    if (file_exists($path)) {
+          return true;
+    }
 
     $path = explode('/', $path);
     $cur = '';
@@ -100,10 +101,11 @@ 
       return false;
     }
 
-    if ($img_width / $max_width > $img_height / $max_height)
-      $separator = $img_width / $max_width;
-    else
-      $separator = $img_height / $max_height;
+    if ($img_width / $max_width > $img_height / $max_height) {
+          $separator = $img_width / $max_width;
+    } else {
+          $separator = $img_height / $max_height;
+    }
 
     if ($crop === true || $crop == 'q') {
       if ($img_width > $img_height) {

system/modules/Sliders/models/Slide.php

Indentation +46 added lines, -46 removed lines

@@ -13,52 +13,52 @@ 
 
 class Slide extends \Model {
 
-  public static $objectName = "Слайд";
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'link' => ['type' => 'text'],
-      'description' => ['type' => 'html'],
-      'image_file_id' => ['type' => 'image'],
-      'preview_image_file_id' => ['type' => 'image'],
-      'slider_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'slider'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
-  public static $labels = [
-      'name' => 'Имя',
-      'link' => 'Ссылка',
-      'description' => 'Описание',
-      'date_create' => 'Дата создания',
-      'slider_id' => 'Слайдер',
-      'user_id' => 'Создатель',
-      'weight' => 'Вес',
-      'image_file_id' => 'Изображение',
-      'preview_image_file_id' => 'Превью Изображения',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Слайды',
-          'cols' => [
-              'image_file_id', 'name', 'link', 'date_create'
-          ],
-          'filters' => [
-              'slider_id', 'name', 'link', 'description', 'date_create'
-          ],
-          'sortMode' => true
-      ],
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'link'],
-              ['preview_image_file_id', 'image_file_id'],
-              ['description'],
-          ],
-      ],
-  ];
+    public static $objectName = "Слайд";
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'link' => ['type' => 'text'],
+        'description' => ['type' => 'html'],
+        'image_file_id' => ['type' => 'image'],
+        'preview_image_file_id' => ['type' => 'image'],
+        'slider_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'slider'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
+    public static $labels = [
+        'name' => 'Имя',
+        'link' => 'Ссылка',
+        'description' => 'Описание',
+        'date_create' => 'Дата создания',
+        'slider_id' => 'Слайдер',
+        'user_id' => 'Создатель',
+        'weight' => 'Вес',
+        'image_file_id' => 'Изображение',
+        'preview_image_file_id' => 'Превью Изображения',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Слайды',
+            'cols' => [
+                'image_file_id', 'name', 'link', 'date_create'
+            ],
+            'filters' => [
+                'slider_id', 'name', 'link', 'description', 'date_create'
+            ],
+            'sortMode' => true
+        ],
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'link'],
+                ['preview_image_file_id', 'image_file_id'],
+                ['description'],
+            ],
+        ],
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'slider' => [
             'model' => 'Sliders\Slider',
@@ -77,6 +77,6 @@ 
             'col' => 'user_id'
         ]
     ];
-  }
+    }
 
 }

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/install_script.php

Indentation +33 added lines, -33 removed lines

@@ -1,39 +1,39 @@
 <?php
 
 return function($step = NULL, $params = []) {
-  $options = ['max_height' => 1200, 'max_width' => 1200];
-  $types = [
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'png',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpeg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'gif',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-  ];
-  foreach ($types as $type) {
+    $options = ['max_height' => 1200, 'max_width' => 1200];
+    $types = [
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'png',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpeg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'gif',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+    ];
+    foreach ($types as $type) {
     $typeObject = new \Files\Type($type);
     $typeObject->save();
-  }
+    }
 };

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;
-  }
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -46,21 +46,21 @@ 
       }
     }
     $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);
+    $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);
 
-    Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+    Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
-    if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+    if (!move_uploaded_file($file['tmp_name'], $sitePath.$fileObject->path)) {
       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);
+      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']);
+        Tools::resizeImage($sitePath.$fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
       }
     }
 
@@ -104,25 +104,25 @@ 
       }
     }
     $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);
+    $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);
 
-    Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+    Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
     $file = @file_get_contents($url);
     if ($file === false) {
       return 0;
     }
-    if (!file_put_contents($sitePath . $fileObject->path, $file)) {
+    if (!file_put_contents($sitePath.$fileObject->path, $file)) {
       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);
+      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']);
+        Tools::resizeImage($sitePath.$fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
       }
     }
 

Braces +21 added lines, -14 removed lines

@@ -22,16 +22,19 @@ 
 
     $sitePath = App::$primary->path;
 
-    if (!is_uploaded_file($file['tmp_name']))
-      return 0;
+    if (!is_uploaded_file($file['tmp_name'])) {
+          return 0;
+    }
 
     $fileinfo = pathinfo($file['name']);
-    if (empty($fileinfo['extension']))
-      return 0;
+    if (empty($fileinfo['extension'])) {
+          return 0;
+    }
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
-    if (!$type)
-      return 0;
+    if (!$type) {
+          return 0;
+    }
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
       return 0;
@@ -47,8 +50,9 @@ 
     }
     $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);
+    if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+          unlink($sitePath . $fileObject->path);
+    }
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
@@ -84,12 +88,14 @@ 
     $sitePath = App::$primary->path;
 
     $fileinfo = pathinfo($url);
-    if (empty($fileinfo['extension']))
-      return 0;
+    if (empty($fileinfo['extension'])) {
+          return 0;
+    }
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
-    if (!$type)
-      return 0;
+    if (!$type) {
+          return 0;
+    }
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
       return 0;
@@ -105,8 +111,9 @@ 
     }
     $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);
+    if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+          unlink($sitePath . $fileObject->path);
+    }
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 

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

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (!$dataManager->checkAccess()) {
-    echo 'you not have access to "' . $dataManager->modelName . '" manager with name: "' . $dataManager->managerName . '"';
+    echo 'you not have access to "'.$dataManager->modelName.'" manager with name: "'.$dataManager->managerName.'"';
     return false;
 }
 ?>
@@ -45,7 +45,7 @@ 
             }
             continue;
         }
-        if(++$i && !($i%2)){
+        if (++$i && !($i % 2)) {
           echo '</div><div class="row">';
         }
         echo '<div class="col-md-6">';
@@ -73,7 +73,7 @@ 
                             $options = [
                                 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
                             ];
-                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
+                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix().'name'])) {
                                 $options['order'] = 'name';
                             }
                             $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);

system/modules/Ui/objects/DataManager.php

Indentation +301 added lines, -301 removed lines

@@ -12,61 +12,61 @@ 
 
 class DataManager extends \Object {
 
-  public $modelName = '';
-  public $managerOptions = [];
-  public $managerName = 'customManager';
-  public $name = 'Менеджер данных';
-  public $limit = 30;
-  public $page = 1;
-  public $table = null;
-  public $joins = [];
-  public $predraw = false;
-  public $cols = [];
-  public $managerId = '';
-
-  /**
-   * Construct new data manager
-   * 
-   * @param string|array $modelNameOrOptions
-   * @param string $managerName
-   * @throws Exception
-   */
-  public function __construct($modelNameOrOptions, $managerName = 'manager') {
+    public $modelName = '';
+    public $managerOptions = [];
+    public $managerName = 'customManager';
+    public $name = 'Менеджер данных';
+    public $limit = 30;
+    public $page = 1;
+    public $table = null;
+    public $joins = [];
+    public $predraw = false;
+    public $cols = [];
+    public $managerId = '';
+
+    /**
+     * Construct new data manager
+     * 
+     * @param string|array $modelNameOrOptions
+     * @param string $managerName
+     * @throws Exception
+     */
+    public function __construct($modelNameOrOptions, $managerName = 'manager') {
     $this->managerName = $managerName;
 
     if (!is_array($modelNameOrOptions)) {
-      if (!class_exists($modelNameOrOptions)) {
+        if (!class_exists($modelNameOrOptions)) {
         throw new \Exception("model {$modelNameOrOptions} not exists");
-      }
-      $this->modelName = $modelNameOrOptions;
-      $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
-      if (isset($modelNameOrOptions::$objectName)) {
+        }
+        $this->modelName = $modelNameOrOptions;
+        $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
+        if (isset($modelNameOrOptions::$objectName)) {
         $this->name = $modelNameOrOptions::$objectName;
-      } else {
+        } else {
         $this->name = $modelNameOrOptions;
-      }
+        }
     } else {
-      $this->managerOptions = $modelNameOrOptions;
+        $this->managerOptions = $modelNameOrOptions;
     }
 
     if (!$this->managerOptions || !is_array($this->managerOptions)) {
-      throw new \Exception('empty DataManager');
+        throw new \Exception('empty DataManager');
     }
 
     if (!empty($this->managerOptions['name'])) {
-      $this->name = $this->managerOptions['name'];
+        $this->name = $this->managerOptions['name'];
     }
 
     $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
-  }
-
-  /**
-   * Get buttons for manager
-   * 
-   * @param string $params
-   * @param object $model
-   */
-  public function getButtons($params = [], $model = null) {
+    }
+
+    /**
+     * Get buttons for manager
+     * 
+     * @param string $params
+     * @param object $model
+     */
+    public function getButtons($params = [], $model = null) {
     $modelName = $this->modelName;
 
 
@@ -76,96 +76,96 @@ 
         'formName' => !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager'
     ];
     if ($model) {
-      $formModelName = get_class($model);
-      $relations = $formModelName::relations();
-      $type = !empty($relations[$params['relation']]['type']) ? $relations[$params['relation']]['type'] : 'to';
-      switch ($type) {
+        $formModelName = get_class($model);
+        $relations = $formModelName::relations();
+        $type = !empty($relations[$params['relation']]['type']) ? $relations[$params['relation']]['type'] : 'to';
+        switch ($type) {
         case 'relModel':
           $formParams['preset'] = [
-              $formModelName::index() => $model->pk()
-          ];
-          break;
+                $formModelName::index() => $model->pk()
+            ];
+            break;
         default:
           $formParams['preset'] = [
-              $relations[$params['relation']]['col'] => $model->pk()
-          ];
-      }
+                $relations[$params['relation']]['col'] => $model->pk()
+            ];
+        }
     }
 
     $buttons = [];
     if (!empty($this->managerOptions['sortMode'])) {
-      $buttons[] = [
-          'class' => 'modeBtn',
-          'data-mode' => 'sort',
-          'text' => 'Сортировать',
-      ];
+        $buttons[] = [
+            'class' => 'modeBtn',
+            'data-mode' => 'sort',
+            'text' => 'Сортировать',
+        ];
     }
     if (!empty($this->managerOptions['filters'])) {
-      $buttons[] = [
-          'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+        $buttons[] = [
+            'text' => 'Фильтры',
+            'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
                 modal.modal("show");',
-      ];
+        ];
     }
     if (!empty($modelName::$forms['simpleItem'])) {
-      $formParams['formName'] = 'simpleItem';
-      $buttons[] = [
-          'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
-      ];
+        $formParams['formName'] = 'simpleItem';
+        $buttons[] = [
+            'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+        ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
     $name = 'Элемент';
     if ($modelName::$objectName) {
-      $name = $modelName::$objectName;
+        $name = $modelName::$objectName;
     }
     if (!empty($modelName::$forms[$formParams['formName']])) {
-      $buttons[] = [
-          'text' => 'Создать ' . $name,
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
-      ];
+        $buttons[] = [
+            'text' => 'Создать ' . $name,
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+        ];
     }
 
     return $buttons;
-  }
+    }
 
-  function getActions($onlyGroupActions = false) {
+    function getActions($onlyGroupActions = false) {
     $actions = [
         'Open' => ['className' => 'Open'], 'Edit' => ['className' => 'Edit'], 'Delete' => ['className' => 'Delete']
     ];
     if (isset($this->managerOptions['actions'])) {
-      $actions = array_merge($actions, $this->managerOptions['actions']);
+        $actions = array_merge($actions, $this->managerOptions['actions']);
     }
     $return = [];
     foreach ($actions as $key => $action) {
-      if ($action === false) {
+        if ($action === false) {
         continue;
-      }
-      if (is_array($action)) {
+        }
+        if (is_array($action)) {
         if (!empty($action['access']['groups']) && !in_array(\Users\User::$cur->group_id, $action['access']['groups'])) {
-          continue;
+            continue;
         }
         $return[$key] = $action;
-      } else {
+        } else {
         $key = $action;
         $return[$key] = [
             'className' => $action
         ];
-      }
-      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
-      if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
+        }
+        $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+        if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
-      }
+        }
     }
     return $return;
-  }
-
-  /**
-   * Get cols for manager
-   * 
-   * @return string
-   */
-  public function getCols() {
+    }
+
+    /**
+     * Get cols for manager
+     * 
+     * @return string
+     */
+    public function getCols() {
     $actions = $this->getActions();
     ob_start();
     ?>
@@ -181,12 +181,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) {
+            foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+            }
             }
-          }
-          ?>
+            ?>
       </ul>
     </div>
     <?php
@@ -199,299 +199,299 @@ 
 
     $modelName = $this->modelName;
     foreach ($this->managerOptions['cols'] as $key => $col) {
-      if (is_array($col)) {
+        if (is_array($col)) {
         $colName = $key;
         $colOptions = $col;
-      } else {
+        } else {
         $colName = $col;
         $colOptions = [];
-      }
-      $colInfo = [];
-      if ($modelName) {
+        }
+        $colInfo = [];
+        if ($modelName) {
         $colInfo = $modelName::getColInfo($colName);
-      }
-      if (empty($colOptions['label']) && !empty($colInfo['label'])) {
+        }
+        if (empty($colOptions['label']) && !empty($colInfo['label'])) {
         $colOptions['label'] = $colInfo['label'];
-      } elseif (empty($colOptions['label'])) {
+        } elseif (empty($colOptions['label'])) {
         $colOptions['label'] = $colName;
-      }
-      $cols[$colName] = $colOptions;
+        }
+        $cols[$colName] = $colOptions;
     }
     return $cols;
-  }
-
-  /**
-   * Get rows for manager
-   * 
-   * @param array $params
-   * @param object $model
-   * @return type
-   */
-  public function getRows($params = [], $model = null) {
+    }
+
+    /**
+     * Get rows for manager
+     * 
+     * @param array $params
+     * @param object $model
+     * @return type
+     */
+    public function getRows($params = [], $model = null) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return [];
+        return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     $modelName = $this->modelName;
     $queryParams = [];
     if (empty($params['all'])) {
-      if (!empty($params['limit'])) {
+        if (!empty($params['limit'])) {
         $this->limit = (int) $params['limit'];
-      }
-      if (!empty($params['page'])) {
+        }
+        if (!empty($params['page'])) {
         $this->page = (int) $params['page'];
-      }
-      $queryParams['limit'] = $this->limit;
-      $queryParams['start'] = $this->page * $this->limit - $this->limit;
+        }
+        $queryParams['limit'] = $this->limit;
+        $queryParams['start'] = $this->page * $this->limit - $this->limit;
     }
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+        $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
     }
     if (!empty($params['appType'])) {
-      $queryParams['appType'] = $params['appType'];
+        $queryParams['appType'] = $params['appType'];
     }
     if ($this->joins) {
-      $queryParams['joins'] = $this->joins;
+        $queryParams['joins'] = $this->joins;
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
-      foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
+        foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
         if (!empty($colOptions['userCol'])) {
-          if (strpos($colOptions['userCol'], ':')) {
+            if (strpos($colOptions['userCol'], ':')) {
             $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
             $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
             $queryParams['where'][] = [$colName, \Users\User::$cur->$rel->$param];
-          }
+            }
         } elseif (isset($colOptions['value'])) {
-          $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+            $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+        }
         }
-      }
     }
     if (!empty($this->managerOptions['filters'])) {
-      foreach ($this->managerOptions['filters'] as $col) {
+        foreach ($this->managerOptions['filters'] as $col) {
         $colInfo = $modelName::getColInfo($col);
         switch ($colInfo['colParams']['type']) {
-          case 'select':
+            case 'select':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             if (is_array($params['filters'][$col]['value'])) {
-              foreach ($params['filters'][$col]['value'] as $key => $value) {
+                foreach ($params['filters'][$col]['value'] as $key => $value) {
                 if ($value === '') {
-                  unset($params['filters'][$col]['value'][$key]);
+                    unset($params['filters'][$col]['value'][$key]);
+                }
                 }
-              }
             }
             if (!$params['filters'][$col]['value']) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value'], is_array($params['filters'][$col]['value']) ? 'IN' : '='];
             break;
-          case 'bool':
+            case 'bool':
 
             if (!isset($params['filters'][$col]['value']) || $params['filters'][$col]['value'] === '') {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
             break;
-          case 'dateTime':
+            case 'dateTime':
           case 'date':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
+                if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-              } else {
+                } else {
                 $date = $params['filters'][$col]['max'];
-              }
-              $queryParams['where'][] = [$col, $date, '<='];
+                }
+                $queryParams['where'][] = [$col, $date, '<='];
             }
             break;
-          case 'number':
+            case 'number':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
             }
             break;
-          case 'email':
+            case 'email':
           case 'text':
           case 'textarea':
           case 'html':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             switch ($params['filters'][$col]['compareType']) {
-              case 'contains':
+                case 'contains':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'equals':
+                case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
-              case 'starts_with':
+                case 'starts_with':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'ends_with':
+                case 'ends_with':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
         }
-      }
+        }
     }
     if (!empty($params['mode']) && $params['mode'] == 'sort') {
-      $queryParams['order'] = ['weight', 'asc'];
+        $queryParams['order'] = ['weight', 'asc'];
     } elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
-      foreach ($params['sortered'] as $key => $sortType) {
+        foreach ($params['sortered'] as $key => $sortType) {
         $keys = array_keys($this->managerOptions['cols']);
         $colName = '';
         if (isset($keys[$key])) {
-          if (is_array($this->managerOptions['cols'][$keys[$key]])) {
+            if (is_array($this->managerOptions['cols'][$keys[$key]])) {
             $colName = $keys[$key];
-          } else {
+            } else {
             $colName = $this->managerOptions['cols'][$keys[$key]];
-          }
+            }
         }
         if ($colName && in_array($colName, $this->managerOptions['sortable'])) {
-          $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
-          $queryParams['order'][] = [$colName, $sortType];
+            $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
+            $queryParams['order'][] = [$colName, $sortType];
+        }
         }
-      }
     }
     if ($model && !empty($params['relation'])) {
-      $relation = $model::getRelation($params['relation']);
-      $items = $model->$params['relation']($queryParams);
+        $relation = $model::getRelation($params['relation']);
+        $items = $model->$params['relation']($queryParams);
     } else {
-      $relation = false;
-      $items = $modelName::getList($queryParams);
+        $relation = false;
+        $items = $modelName::getList($queryParams);
     }
     $rows = [];
     foreach ($items as $item) {
-      if ($relation && !empty($relation['relModel'])) {
+        if ($relation && !empty($relation['relModel'])) {
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
-      }
-      $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
-      $row[] = $item->pk();
-      foreach ($this->managerOptions['cols'] as $key => $colName) {
+        }
+        $row = [];
+        $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+        $row[] = $item->pk();
+        foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
-          $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
+            $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
         } else {
-          $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
+            $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
+        }
         }
-      }
-      $row[] = $this->rowButtons($item, $params);
-      $rows[] = $row;
+        $row[] = $this->rowButtons($item, $params);
+        $rows[] = $row;
     }
     return $rows;
-  }
+    }
 
-  public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
+    public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
     $modelName = get_class($item);
     if (!class_exists($modelName)) {
-      return false;
+        return false;
     }
 
     if (!$originalCol) {
-      $originalCol = $colName;
+        $originalCol = $colName;
     }
     if (!$originalItem) {
-      $originalItem = $item;
+        $originalItem = $item;
     }
 
     $relations = $modelName::relations();
     if (strpos($colName, ':') !== false && !empty($relations[substr($colName, 0, strpos($colName, ':'))])) {
-      $rel = substr($colName, 0, strpos($colName, ':'));
-      $col = substr($colName, strpos($colName, ':') + 1);
-      if ($item->$rel) {
+        $rel = substr($colName, 0, strpos($colName, ':'));
+        $col = substr($colName, strpos($colName, ':') + 1);
+        if ($item->$rel) {
         return DataManager::drawCol($item->$rel, $col, $params, $dataManager, $originalCol, $originalItem);
-      } else {
+        } else {
         return 'Не указано';
-      }
+        }
     }
     if (!empty($modelName::$cols[$colName]['relation'])) {
-      $type = !empty($relations[$modelName::$cols[$colName]['relation']]['type']) ? $relations[$modelName::$cols[$colName]['relation']]['type'] : 'to';
-      switch ($type) {
+        $type = !empty($relations[$modelName::$cols[$colName]['relation']]['type']) ? $relations[$modelName::$cols[$colName]['relation']]['type'] : 'to';
+        switch ($type) {
         case 'relModel':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
-          $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-          $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+            $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
+            $count = $count ? $count : 'Нет';
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
         case 'many':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
-          $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-          $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+            $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
+            $count = $count ? $count : 'Нет';
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
         default :
           if ($item->{$modelName::$cols[$colName]['relation']}) {
             if (\App::$cur->name == 'admin') {
-              $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
-              if (!empty($modelName::$cols[$colName]['showCol'])) {
+                $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+                if (!empty($modelName::$cols[$colName]['showCol'])) {
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
-              } else {
+                } else {
 
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->name();
-              }
-              $href .= '</a>';
-              return $href;
+                }
+                $href .= '</a>';
+                return $href;
             } else {
-              return $item->{$modelName::$cols[$colName]['relation']}->name();
+                return $item->{$modelName::$cols[$colName]['relation']}->name();
             }
-          } else {
+            } else {
             return $item->$colName;
-          }
-      }
+            }
+        }
     } else {
-      if (!empty($modelName::$cols[$colName]['view']['type'])) {
+        if (!empty($modelName::$cols[$colName]['view']['type'])) {
         switch ($modelName::$cols[$colName]['view']['type']) {
-          case 'widget':
+            case 'widget':
             ob_start();
             \App::$cur->view->widget($modelName::$cols[$colName]['view']['widget'], ['item' => $item, 'colName' => $colName, 'colParams' => $modelName::$cols[$colName]]);
             $content = ob_get_contents();
             ob_end_clean();
             return $content;
-          case 'moduleMethod':
+            case 'moduleMethod':
             return \App::$cur->{$modelName::$cols[$colName]['view']['module']}->{$modelName::$cols[$colName]['view']['method']}($item, $colName, $modelName::$cols[$colName]);
-          case 'many':
+            case 'many':
             $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
             $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
             return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
-          default:
+            default:
             return $item->$colName;
         }
-      } elseif (!empty($modelName::$cols[$colName]['type'])) {
+        } elseif (!empty($modelName::$cols[$colName]['type'])) {
         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>";
+            $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>";
         } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-          return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+            $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
+            return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } else {
-          return \Model::resloveTypeValue($item, $colName);
+            return \Model::resloveTypeValue($item, $colName);
         }
-      } else {
+        } else {
         return $item->$colName;
-      }
+        }
+    }
     }
-  }
 
-  public function rowButtons($item, $params) {
+    public function rowButtons($item, $params) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return false;
+        return false;
     }
     ob_start();
     $widgetName = !empty($this->managerOptions['rowButtonsWidget']) ? $this->managerOptions['rowButtonsWidget'] : 'Ui\DataManager/rowButtons';
@@ -503,129 +503,129 @@ 
     $buttons = ob_get_contents();
     ob_end_clean();
     return $buttons;
-  }
+    }
 
-  public function getPages($params = [], $model = null) {
+    public function getPages($params = [], $model = null) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return [];
+        return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     if (!empty($params['limit'])) {
-      $this->limit = (int) $params['limit'];
+        $this->limit = (int) $params['limit'];
     }
     if (!empty($params['page'])) {
-      $this->page = (int) $params['page'];
+        $this->page = (int) $params['page'];
     }
     $queryParams = [
         'count' => true
     ];
     $modelName = $this->modelName;
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+        $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
-      foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
+        foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
         if (!empty($colOptions['userCol'])) {
-          if (strpos($colOptions['userCol'], ':')) {
+            if (strpos($colOptions['userCol'], ':')) {
             $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
             $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
             $queryParams['where'][] = [$colName, \Users\User::$cur->$rel->$param];
-          }
+            }
         } elseif (isset($colOptions['value'])) {
-          $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+            $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+        }
         }
-      }
     }
     $modelName = $this->modelName;
     if (!empty($this->managerOptions['filters'])) {
-      foreach ($this->managerOptions['filters'] as $col) {
+        foreach ($this->managerOptions['filters'] as $col) {
         $colInfo = $modelName::getColInfo($col);
         switch ($colInfo['colParams']['type']) {
-          case 'select':
+            case 'select':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             if (is_array($params['filters'][$col]['value'])) {
-              foreach ($params['filters'][$col]['value'] as $key => $value) {
+                foreach ($params['filters'][$col]['value'] as $key => $value) {
                 if ($value === '') {
-                  unset($params['filters'][$col]['value'][$key]);
+                    unset($params['filters'][$col]['value'][$key]);
+                }
                 }
-              }
             }
             if (!$params['filters'][$col]['value']) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value'], is_array($params['filters'][$col]['value']) ? 'IN' : '='];
             break;
-          case 'bool':
+            case 'bool':
 
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, '1'];
             break;
-          case 'dateTime':
+            case 'dateTime':
           case 'date':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
+                if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-              } else {
+                } else {
                 $date = $params['filters'][$col]['max'];
-              }
-              $queryParams['where'][] = [$col, $date, '<='];
+                }
+                $queryParams['where'][] = [$col, $date, '<='];
             }
             break;
-          case 'number':
+            case 'number':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
             }
             break;
-          case 'email':
+            case 'email':
           case 'text':
           case 'textarea':
           case 'html':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             switch ($params['filters'][$col]['compareType']) {
-              case 'contains':
+                case 'contains':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'equals':
+                case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
-              case 'starts_with':
+                case 'starts_with':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'ends_with':
+                case 'ends_with':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
         }
-      }
+        }
     }
     if ($model && !empty($params['relation'])) {
-      $count = $model->$params['relation']($queryParams);
+        $count = $model->$params['relation']($queryParams);
     } else {
-      $count = $modelName::getCount($queryParams);
+        $count = $modelName::getCount($queryParams);
     }
     $pages = new Pages([
         'limit' => $this->limit,
@@ -635,9 +635,9 @@ 
         'dataManager' => $this
     ]);
     return $pages;
-  }
+    }
 
-  public function preDraw($params = [], $model = null) {
+    public function preDraw($params = [], $model = null) {
     $this->predraw = true;
 
     $cols = $this->getCols();
@@ -645,16 +645,16 @@ 
     $this->table = new Table();
     $tableCols = [];
     foreach ($cols as $colName => $colOptions) {
-      $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
+        $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
     }
     $tableCols[] = '';
     $this->table->class .=' datamanagertable';
     $this->table->setCols($tableCols);
-  }
+    }
 
-  public function draw($params = [], $model = null) {
+    public function draw($params = [], $model = null) {
     if (!$this->predraw) {
-      $this->preDraw($params, $model);
+        $this->preDraw($params, $model);
     }
     \App::$cur->view->widget('Ui\DataManager/DataManager', [
         'dataManager' => $this,
@@ -662,58 +662,58 @@ 
         'table' => $this->table,
         'params' => $params
     ]);
-  }
+    }
 
-  public function drawCategorys() {
+    public function drawCategorys() {
     if (!class_exists($this->modelName)) {
-      return false;
+        return false;
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     $tree = new Tree();
     $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
-      $cleanClassName = str_replace('\\', '\\\\', get_class($category));
-      return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
+        $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+        $cleanClassName = str_replace('\\', '\\\\', get_class($category));
+        return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
                 
                     <a href = '#' class ='glyphicon glyphicon-edit'   onclick = 'inji.Ui.forms.popUp(\"{$cleanClassName}:{$category->pk()}\")'></a>&nbsp;
                     <a href = '#' class ='glyphicon glyphicon-remove' onclick = 'inji.Ui.dataManagers.get(this).delCategory({$category->pk()});return false;'></a>";
     });
     ?>
     <?php
-  }
-
-  /**
-   * Draw error message
-   * 
-   * @param string $errorText
-   */
-  public function drawError($errorText) {
+    }
+
+    /**
+     * Draw error message
+     * 
+     * @param string $errorText
+     */
+    public function drawError($errorText) {
     echo $errorText;
-  }
-
-  /**
-   * Check access cur user to manager with name in param
-   * 
-   * @return boolean
-   */
-  public function checkAccess() {
+    }
+
+    /**
+     * Check access cur user to manager with name in param
+     * 
+     * @return boolean
+     */
+    public function checkAccess() {
     if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {
-      return false;
+        return false;
     }
 
     if (!empty($this->managerOptions['options']['access']['apps']) && !in_array(\App::$cur->name, $this->managerOptions['options']['access']['apps'])) {
-      return false;
+        return false;
     }
     if (!empty($this->managerOptions['options']['access']['groups']) && in_array(\Users\User::$cur->group_id, $this->managerOptions['options']['access']['groups'])) {
-      return true;
+        return true;
     }
     if ($this->managerName == 'manager' && !\Users\User::$cur->isAdmin()) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -57,7 +57,7 @@ 
       $this->name = $this->managerOptions['name'];
     }
 
-    $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+    $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
   }
 
   /**
@@ -103,7 +103,7 @@ 
     if (!empty($this->managerOptions['filters'])) {
       $buttons[] = [
           'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+          'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
       ];
     }
@@ -111,7 +111,7 @@ 
       $formParams['formName'] = 'simpleItem';
       $buttons[] = [
           'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
       ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
@@ -121,8 +121,8 @@ 
     }
     if (!empty($modelName::$forms[$formParams['formName']])) {
       $buttons[] = [
-          'text' => 'Создать ' . $name,
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+          'text' => 'Создать '.$name,
+          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
       ];
     }
 
@@ -152,7 +152,7 @@ 
             'className' => $action
         ];
       }
-      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $return[$key]['className'];
       if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
       }
@@ -183,7 +183,7 @@ 
           <?php
           foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
             }
           }
           ?>
@@ -233,7 +233,7 @@ 
       return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     $modelName = $this->modelName;
@@ -249,7 +249,7 @@ 
       $queryParams['start'] = $this->page * $this->limit - $this->limit;
     }
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+      $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
     }
     if (!empty($params['appType'])) {
       $queryParams['appType'] = $params['appType'];
@@ -308,7 +308,7 @@ 
             if (!empty($params['filters'][$col]['max'])) {
               if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                $date = $params['filters'][$col]['max'].' 23:59:59';
               } else {
                 $date = $params['filters'][$col]['max'];
               }
@@ -335,16 +335,16 @@ 
             }
             switch ($params['filters'][$col]['compareType']) {
               case 'contains':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
               case 'starts_with':
-                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'ends_with':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
@@ -383,7 +383,7 @@ 
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
       }
       $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+      $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
       $row[] = $item->pk();
       foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
@@ -428,16 +428,16 @@ 
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
           $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
           $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
         case 'many':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
           $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
           $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
         default :
           if ($item->{$modelName::$cols[$colName]['relation']}) {
             if (\App::$cur->name == 'admin') {
-              $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+              $href = "<a href ='/admin/".str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model'])."/".$item->{$modelName::$cols[$colName]['relation']}->pk()."'>";
               if (!empty($modelName::$cols[$colName]['showCol'])) {
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
               } else {
@@ -467,18 +467,18 @@ 
           case 'many':
             $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
             $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count} ".\Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов'])."</a>";
           default:
             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>";
+          $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>";
         } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-          return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+          return "<a href ='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } else {
           return \Model::resloveTypeValue($item, $colName);
         }
@@ -511,7 +511,7 @@ 
       return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     if (!empty($params['limit'])) {
@@ -525,7 +525,7 @@ 
     ];
     $modelName = $this->modelName;
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+      $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
       foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
@@ -579,7 +579,7 @@ 
             if (!empty($params['filters'][$col]['max'])) {
               if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                $date = $params['filters'][$col]['max'].' 23:59:59';
               } else {
                 $date = $params['filters'][$col]['max'];
               }
@@ -606,16 +606,16 @@ 
             }
             switch ($params['filters'][$col]['compareType']) {
               case 'contains':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
               case 'starts_with':
-                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'ends_with':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
@@ -648,7 +648,7 @@ 
       $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
     }
     $tableCols[] = '';
-    $this->table->class .=' datamanagertable';
+    $this->table->class .= ' datamanagertable';
     $this->table->setCols($tableCols);
   }
 
@@ -669,12 +669,12 @@ 
       return false;
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     $tree = new Tree();
     $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+      $path = $category->tree_path.($category->pk() ? $category->pk()."/" : '');
       $cleanClassName = str_replace('\\', '\\\\', get_class($category));
       return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a>