evolution-cms / evolution

manager/media/browser/mcpuk/lib/class_fastImage.php

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
 					{
 						$state = 'skipframe';
 					}
-					elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
+					elseif (in_array($b, array_merge(range(0xC0, 0xC3), range(0xC5, 0xC7), range(0xC9, 0xCB), range(0xCD, 0xCF))))
 					{
 						$state = 'readsize';
 					}
@@ -188,7 +188,7 @@ 
 		$response = null;
 
 		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
+		if ($this->strpos + $n - 1 >= strlen($this->str))
 		{
 			$end = ($this->strpos + $n);
 

manager/media/browser/mcpuk/lib/helper_httpCache.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class httpCache {
+class httpCache{
     const DEFAULT_TYPE = "text/html";
     const DEFAULT_EXPIRE = 604800; // in seconds
 
@@ -25,7 +25,7 @@ 
     * @param integer $expire
     * @param array $headers */
 
-    static function file($file, $type=null, $expire=null, array $headers=null) {
+    static function file($file, $type = null, $expire = null, array $headers = null){
         $mtime = @filemtime($file);
         if ($mtime !== false) self::checkMTime($mtime);
 
@@ -47,12 +47,12 @@ 
     * @param array $headers
     * @param bool $checkMTime */
 
-    static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true) {
+    static function content($content, $mtime, $type = null, $expire = null, array $headers = null, $checkMTime = true){
         if ($checkMTime) self::checkMTime($mtime);
         if ($type === null) $type = self::DEFAULT_TYPE;
         if ($expire === null) $expire = self::DEFAULT_EXPIRE;
         $size = strlen($content);
-        $expires = gmdate("D, d M Y H:i:s", time() + $expire) . " GMT";
+        $expires = gmdate("D, d M Y H:i:s", time() + $expire)." GMT";
         header("Content-Type: $type");
         header("Expires: $expires");
         header("Cache-Control: max-age=$expire");
@@ -68,8 +68,8 @@ 
     * the PHP to be configured as Apache module.
     * @param integer $mtime */
 
-    static function checkMTime($mtime, $sendHeaders=null) {
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");
+    static function checkMTime($mtime, $sendHeaders = null){
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mtime)." GMT");
 
         $headers = function_exists("getallheaders")
             ? getallheaders()

manager/media/browser/mcpuk/lib/class_image_gd.php

Spacing +26 added lines, -26 removed lines

@@ -12,12 +12,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gd extends image {
+class image_gd extends image{
 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {
+    public function resize($width, $height){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         return (
@@ -29,7 +29,7 @@ 
         );
     }
 
-    public function resizeFit($width, $height, $background=false) {
+    public function resizeFit($width, $height, $background = false){
         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
             return true;
         if (!$width || (($height / $width) < ($this->height / $this->width))) {
@@ -67,7 +67,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
@@ -117,7 +117,7 @@ 
         return $return;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         $angle = -$angle;
         $img = @imagerotate($this->image, $angle, $this->gdColor($background));
         if ($img === false)
@@ -128,7 +128,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
@@ -139,7 +139,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
@@ -150,7 +150,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         $info = getimagesize($file);
         list($w, $h, $t) = $info;
         if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF)))
@@ -187,7 +187,7 @@ 
         return true;
     }
 
-    public function output($type='jpeg', array $options=array()) {
+    public function output($type = 'jpeg', array $options = array()){
         $method = "output_$type";
         if (!method_exists($this, $method))
             return false;
@@ -197,7 +197,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         $img = @imagecreatetruecolor($width, $height);
 //        imagealphablending($img, false);
 //        imagesavealpha($img, true);
@@ -207,7 +207,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);
@@ -218,11 +218,11 @@ 
             (false !== (list($width, $height, $t) = @getimagesize($image)))
         ) {
             $image =
-                ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($image)  : (
+                ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
                 ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
                 ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
-                ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($image)  : (
-                ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($image)  : false
+                ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
+                ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
             ))));
 
             return $image;
@@ -234,22 +234,22 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return function_exists("imagecreatefromjpeg");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         if (!is_string($file) ||
             ((false === (list($width, $height, $t) = @getimagesize($file))))
         )
             return false;
 
         $img =
-            ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($file)  : (
+            ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($file) : (
             ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($file) : (
             ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($file) : (
-            ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($file)  : (
-            ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($file)  : false
+            ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($file) : (
+            ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($file) : false
         ))));
 
         return ($img !== false);
@@ -258,7 +258,7 @@ 
 
     // OWN METHODS
 
-    protected function output_png(array $options=array()) {
+    protected function output_png(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality']) ? $options['quality'] : null;
         $filters = isset($options['filters']) ? $options['filters'] : null;
@@ -268,7 +268,7 @@ 
         return imagepng($this->image, $file, $quality, $filters);
     }
 
-    protected function output_jpeg(array $options=array()) {
+    protected function output_jpeg(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality'])
             ? $options['quality']
@@ -278,14 +278,14 @@ 
         return imagejpeg($this->image, $file, $quality);
     }
 
-    protected function output_gif(array $options=array()) {
+    protected function output_gif(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         if (isset($options['file']) && !headers_sent())
             header("Content-Type: image/gif");
         return imagegif($this->image, $file);
     }
 
-    protected function gdColor() {
+    protected function gdColor(){
         $args = func_get_args();
 
         $exprRGB = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';
@@ -327,15 +327,15 @@ 
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
-    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color) {
+    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color){
         $color = $this->gdColor($color);
         if ($color === false) return false;
         return imageFilledRectangle($this->image, $x1, $y1, $x2, $y2, $color);
     }
 
     protected function imageCopyResampled(
-        $src, $dstX=0, $dstY=0, $srcX=0, $srcY=0, $dstW=null, $dstH=null, $srcW=null, $srcH=null
-    ) {
+        $src, $dstX = 0, $dstY = 0, $srcX = 0, $srcY = 0, $dstW = null, $dstH = null, $srcW = null, $srcH = null
+    ){
         $imageDetails = $this->buildImage($src);
 
         if ($imageDetails === false)

manager/media/browser/mcpuk/lib/helper_text.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class text {
+class text{
 
   /** Replace repeated white spaces to single space
     * @param string $string
     * @return string */
 
-    static function clearWhitespaces($string) {
+    static function clearWhitespaces($string){
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
@@ -26,7 +26,7 @@ 
     * @param string $string
     * @return string */
 
-    static function htmlValue($string) {
+    static function htmlValue($string){
         return
             str_replace('"', """,
             str_replace("'", ''',
@@ -39,7 +39,7 @@ 
     * @param string $string
     * @return string */
 
-    static function jsValue($string) {
+    static function jsValue($string){
         return
             preg_replace('/\r?\n/', "\\n",
             str_replace('"', "\\\"",
@@ -52,7 +52,7 @@ 
     * @param string $string
     * @param bool $cdata */
 
-    static function xmlData($string, $cdata=false) {
+    static function xmlData($string, $cdata = false){
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
         if (!$cdata)
             $string = "<![CDATA[$string]]>";
@@ -63,7 +63,7 @@ 
     * @param string $code
     * @return string */
 
-    static function compressCSS($code) {
+    static function compressCSS($code){
         $code = self::clearWhitespaces($code);
         $code = preg_replace('/ ?\{ ?/', "{", $code);
         $code = preg_replace('/ ?\} ?/', "}", $code);

manager/media/browser/mcpuk/lib/class_image_gmagick.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -69,7 +69,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -119,7 +119,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +132,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +141,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +150,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -185,7 +185,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +195,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -232,11 +232,11 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         try {
             $img = new Gmagic($file);
         } catch (Exception $e) {
@@ -248,7 +248,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type = "jpeg", array $options = array()){
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -267,7 +267,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -287,7 +287,7 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options = array()){
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);

manager/media/browser/mcpuk/lib/class_zipFolder.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class zipFolder {
+class zipFolder{
     protected $zip;
     protected $root;
     protected $ignored;
 
-    function __construct($file, $folder, $ignored=null) {
+    function __construct($file, $folder, $ignored = null){
         $this->zip = new ZipArchive();
 
         $this->ignored = is_array($ignored)
@@ -39,7 +39,7 @@ 
         $this->zip->close();
     }
 
-    function zip($folder, $parent=null) {
+    function zip($folder, $parent = null){
         $full_path = "{$this->root}$parent$folder";
         $zip_path = "$parent$folder";
         $this->zip->addEmptyDir($zip_path);

manager/media/browser/mcpuk/config.php

Spacing +12 added lines, -12 removed lines

@@ -26,12 +26,12 @@ 
 	
     'theme' => "evo",
 
-    'uploadURL' => rtrim($modx->config['rb_base_url'],'/'),
-    'uploadDir' => rtrim($modx->config['rb_base_dir'],'/'),
+    'uploadURL' => rtrim($modx->config['rb_base_url'], '/'),
+    'uploadDir' => rtrim($modx->config['rb_base_dir'], '/'),
     'siteURL' => $modx->config['site_url'],
-    'assetsURL' => rtrim($modx->config['rb_base_url'],'/'),
-    'dirPerms' => intval($modx->config['new_folder_permissions'],8),
-    'filePerms' => intval($modx->config['new_file_permissions'],8),
+    'assetsURL' => rtrim($modx->config['rb_base_url'], '/'),
+    'dirPerms' => intval($modx->config['new_folder_permissions'], 8),
+    'filePerms' => intval($modx->config['new_file_permissions'], 8),
     'maxfilesize' => $settings['upload_maxsize'],
     'denyUpdateCheck' => true,
 
@@ -58,14 +58,14 @@ 
     'types' => array(
 
         // CKEditor & FCKEditor types
-        'files'   =>  str_replace(',',' ',$modx->config['upload_files']),
-        'flash'   =>  str_replace(',',' ',$modx->config['upload_flash']),
-        'images'  =>  str_replace(',',' ',$modx->config['upload_images']),
+        'files'   =>  str_replace(',', ' ', $modx->config['upload_files']),
+        'flash'   =>  str_replace(',', ' ', $modx->config['upload_flash']),
+        'images'  =>  str_replace(',', ' ', $modx->config['upload_images']),
 
         // TinyMCE types
-        'file'    =>  str_replace(',',' ',$modx->config['upload_files']),
-        'media'   =>  str_replace(',',' ',$modx->config['upload_media']),
-        'image'   =>  str_replace(',',' ',$modx->config['upload_images']),
+        'file'    =>  str_replace(',', ' ', $modx->config['upload_files']),
+        'media'   =>  str_replace(',', ' ', $modx->config['upload_media']),
+        'image'   =>  str_replace(',', ' ', $modx->config['upload_images']),
     ),
     'dirnameChangeChars' => array(
         ' ' => "_",
@@ -89,7 +89,7 @@ 
 
     // THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION CONFIGURATION
     '_check4htaccess' => false,
-    '_tinyMCEPath' => MODX_BASE_URL . "assets/plugins/tinymce/tiny_mce",
+    '_tinyMCEPath' => MODX_BASE_URL."assets/plugins/tinymce/tiny_mce",
 
     '_sessionVar' => &$_SESSION['KCFINDER'],
     //'_sessionLifetime' => 30,

manager/media/browser/mcpuk/browse.php

Spacing +3 added lines, -3 removed lines

@@ -14,14 +14,14 @@
 
 require "core/autoload.php"; // Init MODX
 
-function returnNoPermissionsMessage($role) {
+function returnNoPermissionsMessage($role){
 	global $_lang;
 	echo sprintf($_lang['files_management_no_permission'], $role);
 	exit;
 }
 
-if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
-if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
+if ($_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
+if ($_GET['type'] == 'files' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
 
 $browser = new browser($modx);
 $browser->action();

manager/media/script/air-datepicker/datepicker.inc.php

Spacing +9 added lines, -9 removed lines

@@ -1,24 +1,24 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
+    function getDP(){
         global $modx;
         
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
-    function getLangCode() {
+    function getLangCode(){
         global $modx, $modx_lang_attribute;
         
-        if(!$modx_lang_attribute) return 'en';
+        if (!$modx_lang_attribute) return 'en';
         
         $lc = $modx_lang_attribute;
-        if($lc=='uk') return 'ru';
-        $dp_path = str_replace('\\','/',dirname(__FILE__));
-        if(is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) return $modx_lang_attribute;
+        if ($lc == 'uk') return 'ru';
+        $dp_path = str_replace('\\', '/', dirname(__FILE__));
+        if (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) return $modx_lang_attribute;
         else                                               return 'en';
     }
 }