evolution-cms / evolution

manager/media/browser/mcpuk/core/types/type_mime.php

Spacing +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_mime {
+class type_mime{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config){
         if (!class_exists("finfo"))
             return "Fileinfo PECL extension is missing.";
 
@@ -33,12 +33,12 @@ 
         $mimes = $config['params'];
         if (substr($mimes, 0, 1) == "!") {
             $mimes = trim(substr($mimes, 1));
-            return in_array($type , explode(" ", $mimes))
+            return in_array($type, explode(" ", $mimes))
                 ? "You can't upload such files."
                 : true;
         }
 
-        return !in_array($type , explode(" ", $mimes))
+        return !in_array($type, explode(" ", $mimes))
             ? "You can't upload such files."
             : true;
     }

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

Spacing +88 added lines, -88 removed lines

@@ -12,12 +12,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class browser extends uploader {
+class browser extends uploader{
     protected $action;
     protected $thumbsDir;
     protected $thumbsTypeDir;
 
-    public function __construct($modx) {
+    public function __construct($modx){
         parent::__construct($modx);
 
         if (isset($this->post['dir'])) {
@@ -32,7 +32,7 @@ 
             $this->get['dir'] = $dir;
         }
 
-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];
+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];
         if ((
                 !is_dir($thumbsDir) &&
                 !@mkdir($thumbsDir, $this->config['dirPerms'])
@@ -70,9 +70,9 @@ 
             $this->config['theme'] = $this->get['theme'];
     }
 
-    public function action() {
+    public function action(){
         $act = isset($this->get['act']) ? $this->get['act'] : "browser";
-        if(!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error.");
+        if (!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error.");
         if (!method_exists($this, "act_$act"))
             $act = "browser";
         $this->action = $act;
@@ -94,7 +94,7 @@ 
             $this->session['dir'] = $this->type;
         else {
             $type = $this->getTypeFromPath($this->session['dir']);
-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
+            $dir = $this->config['uploadDir']."/".$this->session['dir'];
             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir))
                 $this->session['dir'] = $this->type;
         }
@@ -115,7 +115,7 @@ 
             : $return;
     }
 
-    protected function act_browser() {
+    protected function act_browser(){
         if (isset($this->get['dir']) &&
             is_dir("{$this->typeDir}/{$this->get['dir']}") &&
             is_readable("{$this->typeDir}/{$this->get['dir']}")
@@ -125,7 +125,7 @@ 
         return $this->output();
     }
 
-    protected function act_init() {
+    protected function act_init(){
         $tree = $this->getDirInfo($this->typeDir);
         $tree['dirs'] = $this->getTree($this->session['dir']);
         if (!is_array($tree['dirs']) || !count($tree['dirs']))
@@ -140,7 +140,7 @@ 
         return json_encode($data);
     }
 
-    protected function act_thumb() {
+    protected function act_thumb(){
         $this->getDir($this->get['dir'], true);
         if (!isset($this->get['file']) || !isset($this->get['dir']))
             $this->sendDefaultThumb();
@@ -149,7 +149,7 @@ 
             $this->sendDefaultThumb();
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);
             if (!is_file($file) || !is_readable($file))
                 $this->sendDefaultThumb($file);
             $image = image::factory($this->imageDriver, $file);
@@ -171,13 +171,13 @@ 
         httpCache::file($file, "image/jpeg");
     }
 
-    protected function act_expand() {
+    protected function act_expand(){
         return json_encode(array('dirs' => $this->getDirs($this->postDir())));
     }
 
-    protected function act_chDir() {
+    protected function act_chDir(){
         $this->postDir(); // Just for existing check
-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];
+        $this->session['dir'] = $this->type."/".$this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         return json_encode(array(
             'files' => $this->getFiles($this->session['dir']),
@@ -185,7 +185,7 @@ 
         ));
     }
 
-    protected function act_newDir() {
+    protected function act_newDir(){
         if (!$this->config['access']['dirs']['create'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newDir'])
@@ -207,7 +207,7 @@ 
         return true;
     }
 
-    protected function act_renameDir() {
+    protected function act_renameDir(){
         if (!$this->config['access']['dirs']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newName'])
@@ -222,15 +222,15 @@ 
             $this->errorMsg("Unallowable characters in folder name.");
         if (substr($newName, 0, 1) == ".")
             $this->errorMsg("Folder name shouldn't begins with '.'");
-        if (!@rename($dir, dirname($dir) . "/$newName"))
+        if (!@rename($dir, dirname($dir)."/$newName"))
             $this->errorMsg("Cannot rename the folder.");
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
         if (is_dir($thumbDir))
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+            @rename($thumbDir, dirname($thumbDir)."/$newName");
         return json_encode(array('name' => $newName));
     }
 
-    protected function act_deleteDir() {
+    protected function act_deleteDir(){
         if (!$this->config['access']['dirs']['delete'] ||
             !isset($this->post['dir']) ||
             !strlen(trim($this->post['dir']))
@@ -250,7 +250,7 @@ 
         return true;
     }
 
-    protected function act_upload() {
+    protected function act_upload(){
         if (!$this->config['access']['files']['upload'] ||
             !isset($this->post['dir'])
         )
@@ -275,11 +275,11 @@ 
             return $this->moveUploadFile($this->file, $dir);
     }
 
-    protected function act_download() {
+    protected function act_download(){
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'],'../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
         )
@@ -290,19 +290,19 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');
         header("Content-Transfer-Encoding:­ binary");
-        header("Content-Length: " . filesize($file));
+        header("Content-Length: ".filesize($file));
         readfile($file);
         die;
     }
 
-    protected function act_rename() {
+    protected function act_rename(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'],'../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
@@ -337,16 +337,16 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
         if (file_exists($thumbFile))
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+            @rename($thumbFile, "$thumbDir/".basename($newName));
         return true;
     }
 
-    protected function act_delete() {
+    protected function act_delete(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'],'../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
@@ -358,7 +358,7 @@ 
         return true;
     }
 
-    protected function act_cp_cbd() {
+    protected function act_cp_cbd(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['copy'] ||
             !isset($this->post['dir']) ||
@@ -369,7 +369,7 @@ 
             $this->errorMsg("Unknown error.");
 
         $error = array();
-        foreach($this->post['files'] as $file) {
+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
             if (substr($file, 0, 1) == ".") continue;
             $type = explode("/", $file);
@@ -382,11 +382,11 @@ 
             if (!file_exists($path))
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             elseif (substr($base, 0, 1) == ".")
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             elseif (!$this->validateExtension($ext, $type))
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             elseif (file_exists("$dir/$base"))
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             elseif (!is_readable($path) || !is_file($path))
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             elseif (!@copy($path, "$dir/$base"))
@@ -409,7 +409,7 @@ 
         return true;
     }
 
-    protected function act_mv_cbd() {
+    protected function act_mv_cbd(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['move'] ||
             !isset($this->post['dir']) ||
@@ -420,7 +420,7 @@ 
             $this->errorMsg("Unknown error.");
 
         $error = array();
-        foreach($this->post['files'] as $file) {
+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
             if (substr($file, 0, 1) == ".") continue;
             $type = explode("/", $file);
@@ -433,11 +433,11 @@ 
             if (!file_exists($path))
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             elseif (substr($base, 0, 1) == ".")
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             elseif (!$this->validateExtension($ext, $type))
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             elseif (file_exists("$dir/$base"))
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             elseif (!is_readable($path) || !is_file($path))
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             elseif (!file::isWritable($path) || !@rename($path, "$dir/$base"))
@@ -460,7 +460,7 @@ 
         return true;
     }
 
-    protected function act_rm_cbd() {
+    protected function act_rm_cbd(){
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['files']) ||
             !is_array($this->post['files']) ||
@@ -469,7 +469,7 @@ 
             $this->errorMsg("Unknown error.");
 
         $error = array();
-        foreach($this->post['files'] as $file) {
+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
             if (substr($file, 0, 1) == ".") continue;
             $type = explode("/", $file);
@@ -492,25 +492,25 @@ 
         return true;
     }
 
-    protected function act_downloadDir() {
+    protected function act_downloadDir(){
         $dir = $this->postDir();
         if (!isset($this->post['dir']) || $this->config['denyZipDownload'])
             $this->errorMsg("Unknown error.");
-        $filename = basename($dir) . ".zip";
+        $filename = basename($dir).".zip";
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
     }
 
-    protected function act_downloadSelected() {
+    protected function act_downloadSelected(){
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['files']) ||
@@ -531,7 +531,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -543,14 +543,14 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
     }
 
-    protected function act_downloadClipboard() {
+    protected function act_downloadClipboard(){
         if (!isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             $this->config['denyZipDownload']
@@ -566,14 +566,14 @@ 
             $type = $type[0];
             if ($type != $this->type)
                 continue;
-            $file = $this->config['uploadDir'] . "/$file";
+            $file = $this->config['uploadDir']."/$file";
             if (!is_file($file) || !is_readable($file))
                 continue;
             $zipFiles[] = $file;
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -585,14 +585,14 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
     }
 
-    protected function act_check4Update() {
+    protected function act_check4Update(){
         if ($this->config['denyUpdateCheck'])
             return json_encode(array('version' => false));
 
@@ -632,24 +632,24 @@ 
         // Curl extension
         ) {} elseif (
             function_exists("curl_init") &&
-            (false !== (   $curl = @curl_init($url)                                    )) &&
-            (              @ob_start()                 ||  (@curl_close($curl) && false)) &&
-            (              @curl_exec($curl)           ||  (@curl_close($curl) && false)) &&
-            ((false !== (  $ver = @ob_get_clean()   )) ||  (@curl_close($curl) && false)) &&
-            (              @curl_close($curl)          ||  true                         ) &&
+            (false !== ($curl = @curl_init($url))) &&
+            (@ob_start() || (@curl_close($curl) && false)) &&
+            (@curl_exec($curl) || (@curl_close($curl) && false)) &&
+            ((false !== ($ver = @ob_get_clean())) || (@curl_close($curl) && false)) &&
+            (@curl_close($curl) || true) &&
             preg_match($pattern, $ver)
 
         // Socket extension
         ) {} elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
-                "Host: $host\r\n" .
+                "GET $path ".strtoupper($protocol)."/1.1\r\n".
+                "Host: $host\r\n".
                 "Connection: Close\r\n\r\n";
 
-            if ((false !== (  $socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)  )) &&
-                (false !==    @socket_connect($socket, $host, $port)                    ) &&
-                (false !==    @socket_write($socket, $cmd, strlen($cmd))                ) &&
-                (false !== (  $ver = @socket_read($socket, 2048)                       )) &&
+            if ((false !== ($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) &&
+                (false !== @socket_connect($socket, $host, $port)) &&
+                (false !== @socket_write($socket, $cmd, strlen($cmd))) &&
+                (false !== ($ver = @socket_read($socket, 2048))) &&
                 preg_match($responsePattern, $ver, $match)
             )
                 $ver = $match[2];
@@ -666,7 +666,7 @@ 
             return json_encode(array('version' => false));
     }
 
-    protected function moveUploadFile($file, $dir) {
+    protected function moveUploadFile($file, $dir){
         $message = $this->checkUploadedFile($file);
 
         if ($message !== true) {
@@ -676,28 +676,28 @@ 
         }
 
         $filename = $this->normalizeFilename($file['name']);
-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);
+        $target = "$dir/".file::getInexistantFilename($filename, $dir);
 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&
             !@rename($file['tmp_name'], $target) &&
             !@copy($file['tmp_name'], $target)
         ) {
             @unlink($file['tmp_name']);
-            return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
+            return "{$file['name']}: ".$this->label("Cannot move uploaded file to target folder.");
         } elseif (function_exists('chmod'))
             chmod($target, $this->config['filePerms']);
         
-        $this->modx->invokeEvent('OnFileBrowserUpload',array(
+        $this->modx->invokeEvent('OnFileBrowserUpload', array(
             'filepath'=>realpath($dir),
-            'filename'=>str_replace("/","",str_replace($dir,"",realpath($target)))
+            'filename'=>str_replace("/", "", str_replace($dir, "", realpath($target)))
         ));
         
         $this->makeThumb($target);
         
-        return "/" . basename($target);
+        return "/".basename($target);
     }
 
-    protected function sendDefaultThumb($file=null) {
+    protected function sendDefaultThumb($file = null){
         if ($file !== null) {
             $ext = file::getExtension($file);
             $thumb = "themes/{$this->config['theme']}/img/files/big/$ext.png";
@@ -709,7 +709,7 @@ 
         die;
     }
 
-	protected function getFiles($dir) {
+	protected function getFiles($dir){
 		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
 		$dir = "{$this->config['uploadDir']}/$dir";
 		$return = array();
@@ -720,10 +720,10 @@ 
 		foreach ($files as $file) {
 			$ext = file::getExtension($file);
 			$smallThumb = false;
-			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
+			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {
 				$size = @getimagesize($file);
 				if (is_array($size) && count($size)) {
-					$thumb_file = "$thumbDir/" . basename($file);
+					$thumb_file = "$thumbDir/".basename($file);
 					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
 						$this->makeThumb($file);
 					$smallThumb =
@@ -736,9 +736,9 @@ 
 			if ($stat === false) continue;
 			$name = basename($file);
 			$types = $this->config['types'];
-			$types = explode(' ',$types['images'].' '.$types['image']);
-			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
-			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
+			$types = explode(' ', $types['images'].' '.$types['image']);
+			if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) continue;
+			if ($this->type == 'images' && !in_array(strtolower($ext), $types)) continue;
 			$bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
 			$smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
 			$thumb = file_exists("$thumbDir/$name");
@@ -758,7 +758,7 @@ 
 		return $return;
 	}
 
-    protected function getTree($dir, $index=0) {
+    protected function getTree($dir, $index = 0){
         $path = explode("/", $dir);
 
         $pdir = "";
@@ -793,25 +793,25 @@ 
         return $dirs;
     }
 
-    protected function postDir($existent=true) {
+    protected function postDir($existent = true){
         $dir = $this->typeDir;
         if (isset($this->post['dir']))
-            $dir .= "/" . $this->post['dir'];
+            $dir .= "/".$this->post['dir'];
         if ($existent && (!is_dir($dir) || !is_readable($dir)))
             $this->errorMsg("Inexistant or inaccessible folder.");
         return $dir;
     }
 
-    protected function getDir($existent=true) {
+    protected function getDir($existent = true){
         $dir = $this->typeDir;
         if (isset($this->get['dir']))
-            $dir .= "/" . $this->get['dir'];
+            $dir .= "/".$this->get['dir'];
         if ($existent && (!is_dir($dir) || !is_readable($dir)))
             $this->errorMsg("Inexistant or inaccessible folder.");
         return $dir;
     }
 
-    protected function getDirs($dir) {
+    protected function getDirs($dir){
         $dirs = dir::content($dir, array('types' => "dir"));
         $return = array();
         if (is_array($dirs)) {
@@ -826,7 +826,7 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false) {
+    protected function getDirInfo($dir, $removable = false){
         if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir))
             return false;
         $dirs = dir::content($dir, array('types' => "dir"));
@@ -853,7 +853,7 @@ 
         return $info;
     }
 
-    protected function output($data=null, $template=null) {
+    protected function output($data = null, $template = null){
         if (!is_array($data)) $data = array();
         if ($template === null)
             $template = $this->action;
@@ -873,7 +873,7 @@ 
         return "";
     }
 
-    protected function errorMsg($message, array $data=null) {
+    protected function errorMsg($message, array $data = null){
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir")))
             die($this->label($message, $data));
         if (($this->action === null) || ($this->action == "browser"))

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

Spacing +46 added lines, -47 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,11 +104,11 @@ 
 /** 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;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx){
 
         //MODX
         try {
@@ -206,7 +206,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'])
         )
@@ -224,7 +224,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");
@@ -267,7 +267,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;
@@ -298,7 +298,7 @@ 
             $this->backMsg("Cannot read upload folder.");
     }
 
-    public function upload() {
+    public function upload(){
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
@@ -329,7 +329,7 @@ 
                     @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -342,11 +342,11 @@ 
                     $this->makeThumb($target);
                     $url = $this->typeURL;
                     if (isset($udir)) $url .= "/$udir";
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else
                         $url = path::urlPathEncode($url);
                 }
@@ -365,12 +365,12 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings(){
 		global $modx;
 
 		// Cleaning uploaded filename?
 		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->db->getValue($setting)>0) {
+		if ($modx->db->getValue($setting) > 0) {
 			// Transalias plugin active?
 			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
 			if ($properties = $modx->db->getValue($res)) {
@@ -385,7 +385,7 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,11 +394,11 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -437,8 +437,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
@@ -473,14 +472,14 @@ 
 
 
 	// 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)");
 
         return true;
     }
 
-    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);
@@ -506,7 +505,7 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -531,17 +530,17 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -629,24 +628,24 @@ 
             $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'])));
         }
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -654,7 +653,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))
@@ -677,15 +676,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;
         }
@@ -697,7 +696,7 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,7 +711,7 @@ 
         $this->labels = $lang;
     }
 
-    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)
@@ -720,7 +719,7 @@ 
         return $return;
     }
 
-    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']);
@@ -728,7 +727,7 @@ 
         die;
     }
 
-    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;
@@ -769,7 +768,7 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

manager/media/browser/mcpuk/tpl/tpl_css.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
-<link href="css.php?type=<?php echo $this->type ?><?php echo ($this->cms ? "&amp;cms={$this->cms}" : "" ) ?>" rel="stylesheet" type="text/css" />
+<link href="css.php?type=<?php echo $this->type ?><?php echo ($this->cms ? "&amp;cms={$this->cms}" : "") ?>" rel="stylesheet" type="text/css" />
 <link href="themes/<?php echo $this->config['theme'] ?>/style.css" rel="stylesheet" type="text/css" />

manager/media/browser/mcpuk/lang/pt-br.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
 $lang = array(
 
-    '_locale' => "pt_BR.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "pt_BR.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A, %e %B, %Y %H:%M",

manager/media/browser/mcpuk/lang/de.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 
 $lang = array(
 
-    '_locale' => "de_DE.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "de_DE.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A, %e.%B.%Y %I:%M %p",

manager/media/browser/mcpuk/lang/uk.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 
 $lang = array(
 
-    '_locale' => "uk_UA.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "uk_UA.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A, %e %B, %Y %H:%M",

manager/media/browser/mcpuk/lang/ja.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 
 $lang = array(
 
-    '_locale' => "ja_JP.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "ja_JP.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%Y/%m/%d %H:%M",

manager/media/browser/mcpuk/lang/fr.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 
 $lang = array(
 
-    '_locale' => "fr_FR.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "fr_FR.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A %e %B %Y %H:%M",