evolution-cms / evolution

manager/media/browser/mcpuk/core/uploader.php

Indentation +74 added lines, -74 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Uploader class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Uploader class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class uploader {
 
@@ -18,92 +18,92 @@ 
     const VERSION = "2.54";
 
 /** Config session-overrided settings
-  * @var array */
+ * @var array */
     protected $config = array();
 
 /** Default image driver
-  * @var string */
+ * @var string */
     protected $imageDriver = "gd";
 
 /** Opener applocation properties
-  *   $opener['name']                 Got from $_GET['opener'];
-  *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
-  *   $opener['TinyMCE']              Boolean
-  * @var array */
+ *   $opener['name']                 Got from $_GET['opener'];
+ *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
+ *   $opener['TinyMCE']              Boolean
+ * @var array */
     protected $opener = array();
 
 /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
-  * @var string */
+ * @var string */
     protected $type;
 
 /** Helper property. Local filesystem path to the Type Directory
-  * Equivalent: $config['uploadDir'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadDir'] . "/" . $type
+ * @var string */
     protected $typeDir;
 
 /** Helper property. Web URL to the Type Directory
-  * Equivalent: $config['uploadURL'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadURL'] . "/" . $type
+ * @var string */
     protected $typeURL;
 
 /** Linked to $config['types']
-  * @var array */
+ * @var array */
     protected $types = array();
 
 /** Settings which can override default settings if exists as keys in $config['types'][$type] array
-  * @var array */
+ * @var array */
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
 
 /** Got from language file
-  * @var string */
+ * @var string */
     protected $charset;
 
 /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
-  * @var string */
+ * @var string */
     protected $lang = 'en';
 
 /** Possible language $_GET keys
-  * @var array */
+ * @var array */
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
 
 /** Uploaded file(s) info. Linked to first $_FILES element
-  * @var array */
+ * @var array */
     protected $file;
 
 /** Next three properties are got from the current language file
-  * @var string */
+ * @var string */
     protected $dateTimeFull;   // Currently not used
     protected $dateTimeMid;    // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
-  * @var array */
+ * @var array */
     protected $labels = array();
 
 /** Contain unprocessed $_GET array. Please use this instead of $_GET
-  * @var array */
+ * @var array */
     protected $get;
 
 /** Contain unprocessed $_POST array. Please use this instead of $_POST
-  * @var array */
+ * @var array */
     protected $post;
 
 /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
-  * @var array */
+ * @var array */
     protected $cookie;
 
 /** Session array. Please use this property instead of $_SESSION
-  * @var array */
+ * @var array */
     protected $session;
 
 /** CMS integration attribute (got from $_GET['cms'])
-  * @var string */
+ * @var string */
     protected $cms = "";
 
     protected $modx = null;
 /** Magic method which allows read-only access to protected or private class properties
-  * @param string $property
-  * @return mixed */
+     * @param string $property
+     * @return mixed */
     public function __get($property) {
         return property_exists($this, $property) ? $this->$property : null;
     }
@@ -132,7 +132,7 @@ 
         )
             $this->cms = $this->get['cms'];
 
-		// LINKING UPLOADED FILE
+        // LINKING UPLOADED FILE
         if (count($_FILES))
             $this->file = &$_FILES[key($_FILES)];
 
@@ -228,8 +228,8 @@ 
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
-         $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
-         $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
+            $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
+            $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
 
         // SITE ROOT
         } elseif ($this->config['uploadURL'] == "/") {
@@ -365,36 +365,36 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
-		$modx = evolutionCMS();
-
-		// Cleaning uploaded filename?
-		$setting = $modx->getDatabase()->select('count(*)', $modx->getDatabase()->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->getDatabase()->getValue($setting)>0) {
-			// Transalias plugin active?
-			$res = $modx->getDatabase()->select('properties', $modx->getDatabase()->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
-			if ($properties = $modx->getDatabase()->getValue($res)) {
-				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
-			} else {
-				$properties = NULL;
-			}
-		} else {
-			$properties = NULL;
-		}
-		return $properties;
-	}
-
-
-	protected function normalizeFilename($filename) {
-		if ($this->getTransaliasSettings()) {
-        		$format = strrchr($filename, ".");
-        		$filename = str_replace($format, "", $filename);
-            		$filename = $this->modx->stripAlias($filename).$format;
-        	}
-        	return $filename;
-	}
-
-	protected function normalizeDirname($dirname) {
+    protected function getTransaliasSettings() {
+        $modx = evolutionCMS();
+
+        // Cleaning uploaded filename?
+        $setting = $modx->getDatabase()->select('count(*)', $modx->getDatabase()->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
+        if ($modx->getDatabase()->getValue($setting)>0) {
+            // Transalias plugin active?
+            $res = $modx->getDatabase()->select('properties', $modx->getDatabase()->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
+            if ($properties = $modx->getDatabase()->getValue($res)) {
+                $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
+            } else {
+                $properties = NULL;
+            }
+        } else {
+            $properties = NULL;
+        }
+        return $properties;
+    }
+
+
+    protected function normalizeFilename($filename) {
+        if ($this->getTransaliasSettings()) {
+                $format = strrchr($filename, ".");
+                $filename = str_replace($format, "", $filename);
+                    $filename = $this->modx->stripAlias($filename).$format;
+            }
+            return $filename;
+    }
+
+    protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
 
@@ -472,10 +472,10 @@ 
             return $this->label("The image is too big and/or cannot be resized.");
 
 
-	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+    // CHECK FOR MODX MAX FILE SIZE
+    $actualfilesize=filesize($file['tmp_name']);
+    if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
+        return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
@@ -627,7 +627,7 @@ 
             $top = isset($this->config['watermark']['top'])
                 ? $this->config['watermark']['top'] : false;
             $img->watermark($this->config['watermark']['file'], $left, $top);
-		}
+        }
 
         $options = array( 'file' => $file );