injitools / cms-Inji

system/Inji/Tools.php

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

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

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

Indentation +40 added lines, -40 removed lines

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

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

Indentation +6 added lines, -6 removed lines

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

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

Indentation +32 added lines, -32 removed lines

@@ -46,7 +46,7 @@ 
             continue;
         }
         if(++$i && !($i%2)){
-          echo '</div><div class="row">';
+            echo '</div><div class="row">';
         }
         echo '<div class="col-md-6">';
         if (!empty($colInfo['colParams']['type'])) {
@@ -139,40 +139,40 @@ 
                     ?>
                     <div class="filter_form_field filter_select">
                       <?php
-                      if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
-                          $value = 1;
-                      } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
-                          $value = 0;
-                      } else {
-                          $value = '';
-                      }
-                      $inputOptions = ['value' => $value, 'values' => [
-                              '' => 'Не важно',
-                              '1' => $colInfo['label'],
-                              '0' => 'Нет'
-                          ]
-                      ];
-                      if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
+                        if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
+                            $value = 1;
+                        } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
+                            $value = 0;
+                        } else {
+                            $value = '';
+                        }
+                        $inputOptions = ['value' => $value, 'values' => [
+                                '' => 'Не важно',
+                                '1' => $colInfo['label'],
+                                '0' => 'Нет'
+                            ]
+                        ];
+                        if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
 
-                          $inputOptions['disabled'] = true;
-                          $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
-                          if (!empty($colOptions['userCol'])) {
-                              if (strpos($colOptions['userCol'], ':')) {
-                                  $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
-                                  $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
+                            $inputOptions['disabled'] = true;
+                            $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
+                            if (!empty($colOptions['userCol'])) {
+                                if (strpos($colOptions['userCol'], ':')) {
+                                    $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
+                                    $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
-                                  $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                              } else {
-                                  $this->model->$col = \Users\User::$cur->{$preset['userCol']};
-                              }
-                          } elseif (!empty($colOptions['value'])) {
+                                    $inputOptions['value'] = \Users\User::$cur->$rel->$param;
+                                } else {
+                                    $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                                }
+                            } elseif (!empty($colOptions['value'])) {
 
-                              $inputOptions['value'] = $colOptions['value'];
-                          }
-                      }
-                      $inputOptions['class'] = 'input-sm';
-                      $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
-                      ?>
+                                $inputOptions['value'] = $colOptions['value'];
+                            }
+                        }
+                        $inputOptions['class'] = 'input-sm';
+                        $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
+                        ?>
                     </div>
 
                     <?php

system/modules/Materials/models/Material.php

Indentation +110 added lines, -110 removed lines

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