evolution-cms / evolution

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

Spacing +41 added lines, -42 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader{
 
 /** Release version */
     const VERSION = "2.54";
@@ -72,8 +72,8 @@ 
 
 /** Next three properties are got from the current language file
   * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
@@ -104,7 +104,7 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -112,7 +112,7 @@ 
      * uploader constructor.
      * @param DocumentParser $modx
      */
-    public function __construct(DocumentParser $modx) {
+    public function __construct(DocumentParser $modx){
 
         //MODX
         try {
@@ -195,7 +195,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         )
@@ -213,7 +213,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -256,7 +256,7 @@ 
         foreach ($this->langInputNames as $key)
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -290,12 +290,12 @@ 
     /**
      * @return array|bool|int|null|string|void
      */
-    protected function getTransaliasSettings() {
+    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) {
+		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)) {
@@ -314,7 +314,7 @@ 
      * @param $filename
      * @return mixed|string
      */
-    protected function normalizeFilename($filename) {
+    protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -327,7 +327,7 @@ 
      * @param $dirname
      * @return string
      */
-    protected function normalizeDirname($dirname) {
+    protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
@@ -335,7 +335,7 @@ 
      * @param array|null $aFile
      * @return bool|mixed
      */
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -361,8 +361,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
 
         // HIDDEN FILENAMES CHECK
@@ -397,7 +396,7 @@ 
 
 
 	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
+	$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)");
 
@@ -410,7 +409,7 @@ 
      * @param bool $existing
      * @return bool|string
      */
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType = true, $existing = true){
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/")
             $dir = substr($dir, 1);
@@ -441,7 +440,7 @@ 
      * @param $type
      * @return bool
      */
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -470,7 +469,7 @@ 
      * @param $path
      * @return mixed
      */
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
@@ -479,7 +478,7 @@ 
      * @param $path
      * @return string
      */
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
@@ -489,7 +488,7 @@ 
      * @param null $file
      * @return bool
      */
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -577,19 +576,19 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
 		}
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
-        $type = exif_imagetype( $file );
+        $type = exif_imagetype($file);
 
-        switch ( $type ) {
+        switch ($type) {
             case IMAGETYPE_GIF:
-                return $img->output( 'gif', $options );
+                return $img->output('gif', $options);
 
             case IMAGETYPE_PNG:
-                return $img->output( 'png', $options );
+                return $img->output('png', $options);
 
             default:
-                return $img->output( 'jpeg', array_merge( $options, array( 'quality' => $this->config['jpegQuality'] ) ) );
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
 
     }
@@ -599,7 +598,7 @@ 
      * @param bool $overwrite
      * @return bool
      */
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -607,7 +606,7 @@ 
             return true;
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
@@ -630,15 +629,15 @@ 
         if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
             return false;
 
-        if ( $this->imageDriver == 'gd' ) {
-            $width  = imagesx( $img->image );
-            $height = imagesy( $img->image );
-            $back   = image::factory( $this->imageDriver, array( $width, $height ) );
-            $tile   = image::factory( $this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png' );
+        if ($this->imageDriver == 'gd') {
+            $width  = imagesx($img->image);
+            $height = imagesy($img->image);
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
-            imagesettile( $back->image, $tile->image );
-            imagefilledrectangle( $back->image, 0, 0, $width, $height, IMG_COLOR_TILED );
-            imagecopy( $back->image, $img->image, 0, 0, 0, 0, $width, $height );
+            imagesettile($back->image, $tile->image);
+            imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
+            imagecopy($back->image, $img->image, 0, 0, 0, 0, $width, $height);
 
             $img = $back;
         }
@@ -653,7 +652,7 @@ 
     /**
      * @param $langCode
      */
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -673,7 +672,7 @@ 
      * @param array|null $data
      * @return mixed
      */
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data = null){
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data))
             foreach ($data as $key => $val)
@@ -685,7 +684,7 @@ 
      * @param $message
      * @param array|null $data
      */
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data = null){
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
             @unlink($this->file['tmp_name']);
@@ -697,7 +696,7 @@ 
      * @param $url
      * @param string $message
      */
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message = ""){
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
@@ -741,7 +740,7 @@ 
     /**
      * @return string
      */
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>