evolution-cms / evolution

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

Braces +413 added lines, -261 removed lines

@@ -12,23 +12,29 @@ 
   *      @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'])) {
             $dir = $this->checkInputDir($this->post['dir'], true, false);
-            if ($dir === false) unset($this->post['dir']);
+            if ($dir === false) {
+                unset($this->post['dir']);
+            }
             $this->post['dir'] = $dir;
         }
 
         if (isset($this->get['dir'])) {
             $dir = $this->checkInputDir($this->get['dir'], true, false);
-            if ($dir === false) unset($this->get['dir']);
+            if ($dir === false) {
+                unset($this->get['dir']);
+            }
             $this->get['dir'] = $dir;
         }
 
@@ -44,8 +50,9 @@ 
                 !is_dir("$thumbsDir/{$this->type}") &&
                 !@mkdir("$thumbsDir/{$this->type}", $this->config['dirPerms'])
             )
-        )
-            $this->errorMsg("Cannot access or create thumbnails folder.");
+        ) {
+                    $this->errorMsg("Cannot access or create thumbnails folder.");
+        }
 
         $this->thumbsDir = $thumbsDir;
         $this->thumbsTypeDir = "$thumbsDir/{$this->type}";
@@ -58,23 +65,29 @@ 
 
         if (is_array($files) && count($files)) {
             $time = time();
-            foreach ($files as $file)
-                if (is_file($file) && ($time - filemtime($file) > 3600))
+            foreach ($files as $file) {
+                            if (is_file($file) && ($time - filemtime($file) > 3600))
                     unlink($file);
+            }
         }
 
         if (isset($this->get['theme']) &&
             ($this->get['theme'] == basename($this->get['theme'])) &&
             is_dir("themes/{$this->get['theme']}")
-        )
-            $this->config['theme'] = $this->get['theme'];
+        ) {
+                    $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 (!method_exists($this, "act_$act"))
-            $act = "browser";
+        if(!preg_match('@^[0-9a-zA-Z_]+$@', $act)) {
+            $this->errorMsg("Unknown error.");
+        }
+        if (!method_exists($this, "act_$act")) {
+                    $act = "browser";
+        }
         $this->action = $act;
         $method = "act_$act";
 
@@ -82,21 +95,22 @@ 
             $message = $this->label("You don't have permissions to browse server.");
             if (in_array($act, array("browser", "upload")) ||
                 (substr($act, 0, 8) == "download")
-            )
-                $this->backMsg($message);
-            else {
+            ) {
+                            $this->backMsg($message);
+            } else {
                 header("Content-Type: text/plain; charset={$this->charset}");
                 die(json_encode(array('error' => $message)));
             }
         }
 
-        if (!isset($this->session['dir']))
-            $this->session['dir'] = $this->type;
-        else {
+        if (!isset($this->session['dir'])) {
+                    $this->session['dir'] = $this->type;
+        } else {
             $type = $this->getTypeFromPath($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;
+            if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
+                            $this->session['dir'] = $this->type;
+            }
         }
         $this->session['dir'] = path::normalize($this->session['dir']);
 
@@ -106,8 +120,9 @@ 
         } elseif (
             (substr($act, 0, 8) != "download") &&
             !in_array($act, array("thumb", "upload"))
-        )
-            header("Content-Type: text/plain; charset={$this->charset}");
+        ) {
+                    header("Content-Type: text/plain; charset={$this->charset}");
+        }
 
         $return = $this->$method();
         echo ($return === true)
@@ -115,21 +130,25 @@ 
             : $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']}")
-        )
-            $this->session['dir'] = path::normalize("{$this->type}/{$this->get['dir']}");
+        ) {
+                    $this->session['dir'] = path::normalize("{$this->type}/{$this->get['dir']}");
+        }
 
         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']))
-            unset($tree['dirs']);
+        if (!is_array($tree['dirs']) || !count($tree['dirs'])) {
+                    unset($tree['dirs']);
+        }
         $files = $this->getFiles($this->session['dir']);
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         $data = array(
@@ -140,21 +159,26 @@ 
         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();
+        if (!isset($this->get['file']) || !isset($this->get['dir'])) {
+                    $this->sendDefaultThumb();
+        }
         $file = $this->get['file'];
-        if (basename($file) != $file)
-            $this->sendDefaultThumb();
+        if (basename($file) != $file) {
+                    $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);
-            if (!is_file($file) || !is_readable($file))
-                $this->sendDefaultThumb($file);
+            if (!is_file($file) || !is_readable($file)) {
+                            $this->sendDefaultThumb($file);
+            }
             $image = image::factory($this->imageDriver, $file);
-            if ($image->initError)
-                $this->sendDefaultThumb($file);
+            if ($image->initError) {
+                            $this->sendDefaultThumb($file);
+            }
             list($tmp, $tmp, $type) = getimagesize($file);
             if (in_array($type, array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) &&
                 ($image->width <= $this->config['thumbWidth']) &&
@@ -165,17 +189,20 @@ 
                     ($type == IMAGETYPE_PNG) ? "png" : "jpeg");
                 $mime = "image/$mime";
                 httpCache::file($file, $mime);
-            } else
-                $this->sendDefaultThumb($file);
+            } else {
+                            $this->sendDefaultThumb($file);
+            }
         }
         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'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
@@ -185,81 +212,104 @@ 
         ));
     }
 
-    protected function act_newDir() {
+    protected function act_newDir()
+    {
         if (!$this->config['access']['dirs']['create'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newDir'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
         $newDir = $this->normalizeDirname(trim($this->post['newDir']));
-        if (!strlen($newDir))
-            $this->errorMsg("Please enter new folder name.");
-        if (preg_match('/[\/\\\\]/s', $newDir))
-            $this->errorMsg("Unallowable characters in folder name.");
-        if (substr($newDir, 0, 1) == ".")
-            $this->errorMsg("Folder name shouldn't begins with '.'");
-        if (file_exists("$dir/$newDir"))
-            $this->errorMsg("A file or folder with that name already exists.");
-        if (!@mkdir("$dir/$newDir", $this->config['dirPerms']))
-            $this->errorMsg("Cannot create {dir} folder.", array('dir' => $newDir));
+        if (!strlen($newDir)) {
+                    $this->errorMsg("Please enter new folder name.");
+        }
+        if (preg_match('/[\/\\\\]/s', $newDir)) {
+                    $this->errorMsg("Unallowable characters in folder name.");
+        }
+        if (substr($newDir, 0, 1) == ".") {
+                    $this->errorMsg("Folder name shouldn't begins with '.'");
+        }
+        if (file_exists("$dir/$newDir")) {
+                    $this->errorMsg("A file or folder with that name already exists.");
+        }
+        if (!@mkdir("$dir/$newDir", $this->config['dirPerms'])) {
+                    $this->errorMsg("Cannot create {dir} folder.", array('dir' => $newDir));
+        }
         return true;
     }
 
-    protected function act_renameDir() {
+    protected function act_renameDir()
+    {
         if (!$this->config['access']['dirs']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newName'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
         $newName = $this->normalizeDirname(trim($this->post['newName']));
-        if (!strlen($newName))
-            $this->errorMsg("Please enter new folder name.");
-        if (preg_match('/[\/\\\\]/s', $newName))
-            $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"))
-            $this->errorMsg("Cannot rename the folder.");
+        if (!strlen($newName)) {
+                    $this->errorMsg("Please enter new folder name.");
+        }
+        if (preg_match('/[\/\\\\]/s', $newName)) {
+                    $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")) {
+                    $this->errorMsg("Cannot rename the folder.");
+        }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
-        if (is_dir($thumbDir))
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+        if (is_dir($thumbDir)) {
+                    @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']))
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
 
-        if (!dir::isWritable($dir))
-            $this->errorMsg("Cannot delete the folder.");
+        if (!dir::isWritable($dir)) {
+                    $this->errorMsg("Cannot delete the folder.");
+        }
         $result = !dir::prune($dir, false);
-        if (is_array($result) && count($result))
-            $this->errorMsg("Failed to delete {count} files/folders.",
+        if (is_array($result) && count($result)) {
+                    $this->errorMsg("Failed to delete {count} files/folders.",
                 array('count' => count($result)));
+        }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
-        if (is_dir($thumbDir)) dir::prune($thumbDir);
+        if (is_dir($thumbDir)) {
+            dir::prune($thumbDir);
+        }
         return true;
     }
 
-    protected function act_upload() {
+    protected function act_upload()
+    {
         if (!$this->config['access']['files']['upload'] ||
             !isset($this->post['dir'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
 
-        if (!dir::isWritable($dir))
-            $this->errorMsg("Cannot access or write to upload folder.");
+        if (!dir::isWritable($dir)) {
+                    $this->errorMsg("Cannot access or write to upload folder.");
+        }
 
         if (is_array($this->file['name'])) {
             $return = array();
@@ -271,19 +321,22 @@ 
                 ), $dir);
             }
             return implode("\n", $return);
-        } else
-            return $this->moveUploadFile($this->file, $dir);
+        } else {
+                    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 ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         header("Pragma: public");
         header("Expires: 0");
@@ -297,7 +350,8 @@ 
         die;
     }
 
-    protected function act_rename() {
+    protected function act_rename()
+    {
         $dir = $this->postDir();
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
@@ -306,42 +360,52 @@ 
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         if (isset($this->config['denyExtensionRename']) &&
             $this->config['denyExtensionRename'] &&
             (file::getExtension($this->post['file'], true) !==
                 file::getExtension($this->post['newName'], true)
             )
-        )
-            $this->errorMsg("You cannot rename the extension of files!");
+        ) {
+                    $this->errorMsg("You cannot rename the extension of files!");
+        }
 
         $newName = $this->normalizeFilename(trim($this->post['newName']));
-        if (!strlen($newName))
-            $this->errorMsg("Please enter new file name.");
-        if (preg_match('/[\/\\\\]/s', $newName))
-            $this->errorMsg("Unallowable characters in file name.");
-        if (substr($newName, 0, 1) == ".")
-            $this->errorMsg("File name shouldn't begins with '.'");
+        if (!strlen($newName)) {
+                    $this->errorMsg("Please enter new file name.");
+        }
+        if (preg_match('/[\/\\\\]/s', $newName)) {
+                    $this->errorMsg("Unallowable characters in file name.");
+        }
+        if (substr($newName, 0, 1) == ".") {
+                    $this->errorMsg("File name shouldn't begins with '.'");
+        }
         $newName = "$dir/$newName";
-        if (file_exists($newName))
-            $this->errorMsg("A file or folder with that name already exists.");
+        if (file_exists($newName)) {
+                    $this->errorMsg("A file or folder with that name already exists.");
+        }
         $ext = file::getExtension($newName);
-        if (!$this->validateExtension($ext, $this->type))
-            $this->errorMsg("Denied file extension.");
-        if (!@rename($file, $newName))
-            $this->errorMsg("Unknown error.");
+        if (!$this->validateExtension($ext, $this->type)) {
+                    $this->errorMsg("Denied file extension.");
+        }
+        if (!@rename($file, $newName)) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $thumbDir = "{$this->thumbsTypeDir}/{$this->post['dir']}";
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
-        if (file_exists($thumbFile))
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+        if (file_exists($thumbFile)) {
+                    @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']) ||
@@ -350,152 +414,184 @@ 
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $thumb = "{$this->thumbsTypeDir}/{$this->post['dir']}/{$this->post['file']}";
-        if (file_exists($thumb)) @unlink($thumb);
+        if (file_exists($thumb)) {
+            @unlink($thumb);
+        }
         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']) ||
             !is_dir($dir) || !is_readable($dir) || !dir::isWritable($dir) ||
             !isset($this->post['files']) || !is_array($this->post['files']) ||
             !count($this->post['files'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $error = array();
         foreach($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if (substr($file, 0, 1) == ".") continue;
+            if (substr($file, 0, 1) == ".") {
+                continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type) continue;
+            if ($type != $this->type) {
+                continue;
+            }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
             $replace = array('file' => $base);
             $ext = file::getExtension($base);
-            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 '.'");
-            elseif (!$this->validateExtension($ext, $type))
-                $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.");
-            elseif (!is_readable($path) || !is_file($path))
-                $error[] = $this->label("Cannot read '{file}'.", $replace);
-            elseif (!@copy($path, "$dir/$base"))
-                $error[] = $this->label("Cannot copy '{file}'.", $replace);
-            else {
-                if (function_exists("chmod"))
-                    @chmod("$dir/$base", $this->config['filePerms']);
+            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 '.'");
+            } elseif (!$this->validateExtension($ext, $type)) {
+                            $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.");
+            } elseif (!is_readable($path) || !is_file($path)) {
+                            $error[] = $this->label("Cannot read '{file}'.", $replace);
+            } elseif (!@copy($path, "$dir/$base")) {
+                            $error[] = $this->label("Cannot copy '{file}'.", $replace);
+            } else {
+                if (function_exists("chmod")) {
+                                    @chmod("$dir/$base", $this->config['filePerms']);
+                }
                 $fromThumb = "{$this->thumbsDir}/$file";
                 if (is_file($fromThumb) && is_readable($fromThumb)) {
                     $toThumb = "{$this->thumbsTypeDir}/{$this->post['dir']}";
-                    if (!is_dir($toThumb))
-                        @mkdir($toThumb, $this->config['dirPerms'], true);
+                    if (!is_dir($toThumb)) {
+                                            @mkdir($toThumb, $this->config['dirPerms'], true);
+                    }
                     $toThumb .= "/$base";
                     @copy($fromThumb, $toThumb);
                 }
             }
         }
-        if (count($error))
-            return json_encode(array('error' => $error));
+        if (count($error)) {
+                    return json_encode(array('error' => $error));
+        }
         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']) ||
             !is_dir($dir) || !is_readable($dir) || !dir::isWritable($dir) ||
             !isset($this->post['files']) || !is_array($this->post['files']) ||
             !count($this->post['files'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $error = array();
         foreach($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if (substr($file, 0, 1) == ".") continue;
+            if (substr($file, 0, 1) == ".") {
+                continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type) continue;
+            if ($type != $this->type) {
+                continue;
+            }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
             $replace = array('file' => $base);
             $ext = file::getExtension($base);
-            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 '.'");
-            elseif (!$this->validateExtension($ext, $type))
-                $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.");
-            elseif (!is_readable($path) || !is_file($path))
-                $error[] = $this->label("Cannot read '{file}'.", $replace);
-            elseif (!file::isWritable($path) || !@rename($path, "$dir/$base"))
-                $error[] = $this->label("Cannot move '{file}'.", $replace);
-            else {
-                if (function_exists("chmod"))
-                    @chmod("$dir/$base", $this->config['filePerms']);
+            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 '.'");
+            } elseif (!$this->validateExtension($ext, $type)) {
+                            $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.");
+            } elseif (!is_readable($path) || !is_file($path)) {
+                            $error[] = $this->label("Cannot read '{file}'.", $replace);
+            } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
+                            $error[] = $this->label("Cannot move '{file}'.", $replace);
+            } else {
+                if (function_exists("chmod")) {
+                                    @chmod("$dir/$base", $this->config['filePerms']);
+                }
                 $fromThumb = "{$this->thumbsDir}/$file";
                 if (is_file($fromThumb) && is_readable($fromThumb)) {
                     $toThumb = "{$this->thumbsTypeDir}/{$this->post['dir']}";
-                    if (!is_dir($toThumb))
-                        @mkdir($toThumb, $this->config['dirPerms'], true);
+                    if (!is_dir($toThumb)) {
+                                            @mkdir($toThumb, $this->config['dirPerms'], true);
+                    }
                     $toThumb .= "/$base";
                     @rename($fromThumb, $toThumb);
                 }
             }
         }
-        if (count($error))
-            return json_encode(array('error' => $error));
+        if (count($error)) {
+                    return json_encode(array('error' => $error));
+        }
         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']) ||
             !count($this->post['files'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $error = array();
         foreach($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if (substr($file, 0, 1) == ".") continue;
+            if (substr($file, 0, 1) == ".") {
+                continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type) continue;
+            if ($type != $this->type) {
+                continue;
+            }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
             $replace = array('file' => $base);
-            if (!is_file($path))
-                $error[] = $this->label("The file '{file}' does not exist.", $replace);
-            elseif (!@unlink($path))
-                $error[] = $this->label("Cannot delete '{file}'.", $replace);
-            else {
+            if (!is_file($path)) {
+                            $error[] = $this->label("The file '{file}' does not exist.", $replace);
+            } elseif (!@unlink($path)) {
+                            $error[] = $this->label("Cannot delete '{file}'.", $replace);
+            } else {
                 $thumb = "{$this->thumbsDir}/$file";
-                if (is_file($thumb)) @unlink($thumb);
+                if (is_file($thumb)) {
+                    @unlink($thumb);
+                }
             }
         }
-        if (count($error))
-            return json_encode(array('error' => $error));
+        if (count($error)) {
+                    return json_encode(array('error' => $error));
+        }
         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.");
+        if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
+                    $this->errorMsg("Unknown error.");
+        }
         $filename = basename($dir) . ".zip";
         do {
             $file = md5(time() . session_id());
@@ -510,23 +606,27 @@ 
         die;
     }
 
-    protected function act_downloadSelected() {
+    protected function act_downloadSelected()
+    {
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             $this->config['denyZipDownload']
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $zipFiles = array();
         foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if ((substr($file, 0, 1) == ".") || (strpos($file, '/') !== false))
-                continue;
+            if ((substr($file, 0, 1) == ".") || (strpos($file, '/') !== false)) {
+                            continue;
+            }
             $file = "$dir/$file";
-            if (!is_file($file) || !is_readable($file))
-                continue;
+            if (!is_file($file) || !is_readable($file)) {
+                            continue;
+            }
             $zipFiles[] = $file;
         }
 
@@ -538,8 +638,9 @@ 
         $zip = new ZipArchive();
         $res = $zip->open($file, ZipArchive::CREATE);
         if ($res === TRUE) {
-            foreach ($zipFiles as $cfile)
-                $zip->addFile($cfile, basename($cfile));
+            foreach ($zipFiles as $cfile) {
+                            $zip->addFile($cfile, basename($cfile));
+            }
             $zip->close();
         }
         header("Content-Type: application/x-zip");
@@ -550,25 +651,30 @@ 
         die;
     }
 
-    protected function act_downloadClipboard() {
+    protected function act_downloadClipboard()
+    {
         if (!isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             $this->config['denyZipDownload']
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $zipFiles = array();
         foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if ((substr($file, 0, 1) == "."))
-                continue;
+            if ((substr($file, 0, 1) == ".")) {
+                            continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type)
-                continue;
+            if ($type != $this->type) {
+                            continue;
+            }
             $file = $this->config['uploadDir'] . "/$file";
-            if (!is_file($file) || !is_readable($file))
-                continue;
+            if (!is_file($file) || !is_readable($file)) {
+                            continue;
+            }
             $zipFiles[] = $file;
         }
 
@@ -580,8 +686,9 @@ 
         $zip = new ZipArchive();
         $res = $zip->open($file, ZipArchive::CREATE);
         if ($res === TRUE) {
-            foreach ($zipFiles as $cfile)
-                $zip->addFile($cfile, basename($cfile));
+            foreach ($zipFiles as $cfile) {
+                            $zip->addFile($cfile, basename($cfile));
+            }
             $zip->close();
         }
         header("Content-Type: application/x-zip");
@@ -592,16 +699,19 @@ 
         die;
     }
 
-    protected function act_check4Update() {
-        if ($this->config['denyUpdateCheck'])
-            return json_encode(array('version' => false));
+    protected function act_check4Update()
+    {
+        if ($this->config['denyUpdateCheck']) {
+                    return json_encode(array('version' => false));
+        }
 
         // Caching HTTP request for 6 hours
         if (isset($this->session['checkVersion']) &&
             isset($this->session['checkVersionTime']) &&
             ((time() - $this->session['checkVersionTime']) < 21600)
-        )
-            return json_encode(array('version' => $this->session['checkVersion']));
+        ) {
+                    return json_encode(array('version' => $this->session['checkVersion']));
+        }
 
         $protocol = "http";
         $host = "kcfinder.sunhater.com";
@@ -651,27 +761,32 @@ 
                 (false !==    @socket_write($socket, $cmd, strlen($cmd))                ) &&
                 (false !== (  $ver = @socket_read($socket, 2048)                       )) &&
                 preg_match($responsePattern, $ver, $match)
-            )
-                $ver = $match[2];
+            ) {
+                            $ver = $match[2];
+            }
 
-            if (isset($socket) && is_resource($socket))
-                @socket_close($socket);
+            if (isset($socket) && is_resource($socket)) {
+                            @socket_close($socket);
+            }
         }
 
         if (isset($ver) && preg_match($pattern, $ver)) {
             $this->session['checkVersion'] = $ver;
             $this->session['checkVersionTime'] = time();
             return json_encode(array('version' => $ver));
-        } else
-            return json_encode(array('version' => false));
+        } else {
+                    return json_encode(array('version' => false));
+        }
     }
 
-    protected function moveUploadFile($file, $dir) {
+    protected function moveUploadFile($file, $dir)
+    {
         $message = $this->checkUploadedFile($file);
 
         if ($message !== true) {
-            if (isset($file['tmp_name']))
-                @unlink($file['tmp_name']);
+            if (isset($file['tmp_name'])) {
+                            @unlink($file['tmp_name']);
+            }
             return "{$file['name']}: $message";
         }
 
@@ -684,8 +799,9 @@ 
         ) {
             @unlink($file['tmp_name']);
             return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
-        } elseif (function_exists('chmod'))
-            chmod($target, $this->config['filePerms']);
+        } elseif (function_exists('chmod')) {
+                    chmod($target, $this->config['filePerms']);
+        }
         
         $this->modx->invokeEvent('OnFileBrowserUpload',array(
             'filepath'=>realpath($dir),
@@ -697,25 +813,29 @@ 
         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";
         }
-        if (!isset($thumb) || !file_exists($thumb))
-            $thumb = "themes/{$this->config['theme']}/img/files/big/..png";
+        if (!isset($thumb) || !file_exists($thumb)) {
+                    $thumb = "themes/{$this->config['theme']}/img/files/big/..png";
+        }
         header("Content-Type: image/png");
         readfile($thumb);
         die;
     }
 
-	protected function getFiles($dir) {
+	protected function getFiles($dir)
+	{
 		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
 		$dir = "{$this->config['uploadDir']}/$dir";
 		$return = array();
 		$files = dir::content($dir, array('types' => "file"));
-		if ($files === false)
-			return $return;
+		if ($files === false) {
+					return $return;
+		}
 
 		foreach ($files as $file) {
 			$ext = file::getExtension($file);
@@ -724,8 +844,9 @@ 
 				$size = @getimagesize($file);
 				if (is_array($size) && count($size)) {
 					$thumb_file = "$thumbDir/" . basename($file);
-					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
-						$this->makeThumb($file);
+					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
+											$this->makeThumb($file);
+					}
 					$smallThumb =
 						($size[0] <= $this->config['thumbWidth']) &&
 						($size[1] <= $this->config['thumbHeight']) &&
@@ -733,12 +854,18 @@ 
 				}
 			}
 			$stat = stat($file);
-			if ($stat === false) continue;
+			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;
+			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,14 +885,17 @@ 
 		return $return;
 	}
 
-    protected function getTree($dir, $index=0) {
+    protected function getTree($dir, $index=0)
+    {
         $path = explode("/", $dir);
 
         $pdir = "";
-        for ($i = 0; ($i <= $index && $i < count($path)); $i++)
-            $pdir .= "/{$path[$i]}";
-        if (strlen($pdir))
-            $pdir = substr($pdir, 1);
+        for ($i = 0; ($i <= $index && $i < count($path)); $i++) {
+                    $pdir .= "/{$path[$i]}";
+        }
+        if (strlen($pdir)) {
+                    $pdir = substr($pdir, 1);
+        }
 
         $fdir = "{$this->config['uploadDir']}/$pdir";
 
@@ -787,38 +917,48 @@ 
                     }
                 }
             }
-        } else
-            return false;
+        } else {
+                    return false;
+        }
 
         return $dirs;
     }
 
-    protected function postDir($existent=true) {
+    protected function postDir($existent=true)
+    {
         $dir = $this->typeDir;
-        if (isset($this->post['dir']))
-            $dir .= "/" . $this->post['dir'];
-        if ($existent && (!is_dir($dir) || !is_readable($dir)))
-            $this->errorMsg("Inexistant or inaccessible folder.");
+        if (isset($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'];
-        if ($existent && (!is_dir($dir) || !is_readable($dir)))
-            $this->errorMsg("Inexistant or inaccessible folder.");
+        if (isset($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)) {
             $writable = dir::isWritable($dir);
             foreach ($dirs as $cdir) {
                 $info = $this->getDirInfo($cdir);
-                if ($info === false) continue;
+                if ($info === false) {
+                    continue;
+                }
                 $info['removable'] = $writable && $info['writable'];
                 $return[] = $info;
             }
@@ -826,17 +966,21 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false) {
-        if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir))
-            return 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"));
         if (is_array($dirs)) {
-            foreach ($dirs as $key => $cdir)
-                if (substr(basename($cdir), 0, 1) == ".")
+            foreach ($dirs as $key => $cdir) {
+                            if (substr(basename($cdir), 0, 1) == ".")
                     unset($dirs[$key]);
+            }
             $hasDirs = count($dirs) ? true : false;
-        } else
-            $hasDirs = false;
+        } else {
+                    $hasDirs = false;
+        }
 
         $writable = dir::isWritable($dir);
         $info = array(
@@ -847,24 +991,30 @@ 
             'hasDirs' => $hasDirs
         );
 
-        if ($dir == "{$this->config['uploadDir']}/{$this->session['dir']}")
-            $info['current'] = true;
+        if ($dir == "{$this->config['uploadDir']}/{$this->session['dir']}") {
+                    $info['current'] = true;
+        }
 
         return $info;
     }
 
-    protected function output($data=null, $template=null) {
-        if (!is_array($data)) $data = array();
-        if ($template === null)
-            $template = $this->action;
+    protected function output($data=null, $template=null)
+    {
+        if (!is_array($data)) {
+            $data = array();
+        }
+        if ($template === null) {
+                    $template = $this->action;
+        }
 
         if (file_exists("tpl/tpl_$template.php")) {
             ob_start();
             $eval = "unset(\$data);unset(\$template);unset(\$eval);";
             $_ = $data;
-            foreach (array_keys($data) as $key)
-                if (preg_match('/^[a-z\d_]+$/i', $key))
+            foreach (array_keys($data) as $key) {
+                            if (preg_match('/^[a-z\d_]+$/i', $key))
                     $eval .= "\$$key=\$_['$key'];";
+            }
             $eval .= "unset(\$_);require \"tpl/tpl_$template.php\";";
             eval($eval);
             return ob_get_clean();
@@ -873,12 +1023,14 @@ 
         return "";
     }
 
-    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"))
-            $this->backMsg($message, $data);
-        else {
+    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")) {
+                    $this->backMsg($message, $data);
+        } else {
             $message = $this->label($message, $data);
             die(json_encode(array('error' => $message)));
         }

manager/media/browser/mcpuk/css.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 require "core/autoload.php";
 $mtime = @filemtime(__FILE__);
-if ($mtime) httpCache::checkMTime($mtime);
+if ($mtime) {
+    httpCache::checkMTime($mtime);
+}
 $browser = new browser($modx);
 $config = $browser->config;
 ob_start();

manager/media/browser/mcpuk/browser.php

Braces +10 added lines, -4 removed lines

@@ -10,11 +10,17 @@
 			}

 		};

 <?php

-	if(isset($_GET['type']))     $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);

-	elseif(isset($_GET['Type'])) $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);

-    else                         $type = 'images';

+	if(isset($_GET['type'])) {
+	    $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);
+	} elseif(isset($_GET['Type'])) {
+	    $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);
+	} else {
+        $type = 'images';
+    }
     

-    if($type==='image') $type = 'images';

+    if($type==='image') {
+        $type = 'images';
+    }
     

 	$opener = (isset($_GET['editor'])) ? 'opener=' . htmlspecialchars(trim($_GET['editor']), ENT_QUOTES) : '';

 	$request_uri = "{$opener}&type={$type}";

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

Braces +63 added lines, -39 removed lines

@@ -12,23 +12,27 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class dir {
+class dir
+{
 
   /** Checks if the given directory is really writable. The standard PHP
     * function is_writable() does not work properly on Windows servers
     * @param string $dir
     * @return bool */
 
-    static function isWritable($dir) {
+    static function isWritable($dir)
+    {
         $dir = path::normalize($dir);
-        if (!is_dir($dir))
-            return false;
+        if (!is_dir($dir)) {
+                    return false;
+        }
         $i = 0;
         do {
             $file = "$dir/is_writable_" . md5($i++);
         } while (file_exists($file));
-        if (!@touch($file))
-            return false;
+        if (!@touch($file)) {
+                    return false;
+        }
         unlink($file);
         return true;
     }
@@ -44,12 +48,16 @@ 
     * @param array $failed
     * @return mixed */
 
-    static function prune($dir, $firstFailExit=true, array $failed=null) {
-        if ($failed === null) $failed = array();
+    static function prune($dir, $firstFailExit=true, array $failed=null)
+    {
+        if ($failed === null) {
+            $failed = array();
+        }
         $files = self::content($dir);
         if ($files === false) {
-            if ($firstFailExit)
-                return $dir;
+            if ($firstFailExit) {
+                            return $dir;
+            }
             $failed[] = $dir;
             return $failed;
         }
@@ -58,23 +66,27 @@ 
             if (is_dir($file)) {
                 $failed_in = self::prune($file, $firstFailExit, $failed);
                 if ($failed_in !== true) {
-                    if ($firstFailExit)
-                        return $failed_in;
-                    if (is_array($failed_in))
-                        $failed = array_merge($failed, $failed_in);
-                    else
-                        $failed[] = $failed_in;
+                    if ($firstFailExit) {
+                                            return $failed_in;
+                    }
+                    if (is_array($failed_in)) {
+                                            $failed = array_merge($failed, $failed_in);
+                    } else {
+                                            $failed[] = $failed_in;
+                    }
                 }
             } elseif (!@unlink($file)) {
-                if ($firstFailExit)
-                    return $file;
+                if ($firstFailExit) {
+                                    return $file;
+                }
                 $failed[] = $file;
             }
         }
 
         if (!@rmdir($dir)) {
-            if ($firstFailExit)
-                return $dir;
+            if ($firstFailExit) {
+                            return $dir;
+            }
             $failed[] = $dir;
         }
 
@@ -87,7 +99,8 @@ 
     * @param array $options
     * @return mixed */
 
-    static function content($dir, array $options=null) {
+    static function content($dir, array $options=null)
+    {
 
         $defaultOptions = array(
             'types' => "all",   // Allowed: "all" or possible return values
@@ -97,23 +110,28 @@ 
             'followLinks' => true
         );
 
-        if (!is_dir($dir) || !is_readable($dir))
-            return false;
+        if (!is_dir($dir) || !is_readable($dir)) {
+                    return false;
+        }
 
-        if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN")
-            $dir = str_replace("\\", "/", $dir);
+        if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
+                    $dir = str_replace("\\", "/", $dir);
+        }
         $dir = rtrim($dir, "/");
 
         $dh = @opendir($dir);
-        if ($dh === false)
-            return false;
+        if ($dh === false) {
+                    return false;
+        }
 
-        if ($options === null)
-            $options = $defaultOptions;
+        if ($options === null) {
+                    $options = $defaultOptions;
+        }
 
-        foreach ($defaultOptions as $key => $val)
-            if (!isset($options[$key]))
+        foreach ($defaultOptions as $key => $val) {
+                    if (!isset($options[$key]))
                 $options[$key] = $val;
+        }
 
         $files = array();
         while (($file = @readdir($dh)) !== false) {
@@ -124,28 +142,32 @@ 
                 do {
                     $ldir = dirname($lfile);
                     $lfile = @readlink($lfile);
-                    if (substr($lfile, 0, 1) != "/")
-                        $lfile = "$ldir/$lfile";
+                    if (substr($lfile, 0, 1) != "/") {
+                                            $lfile = "$ldir/$lfile";
+                    }
                     $type = filetype($lfile);
                 } while ($type == "link");
             }
 
             if ((($type === "dir") && (($file == ".") || ($file == ".."))) ||
                 !preg_match($options['pattern'], $file)
-            )
-                continue;
+            ) {
+                            continue;
+            }
 
             if (($options['types'] === "all") || ($type === $options['types']) ||
                 ((is_array($options['types'])) && in_array($type, $options['types']))
-            )
-                $files[] = $options['addPath'] ? "$dir/$file" : $file;
+            ) {
+                            $files[] = $options['addPath'] ? "$dir/$file" : $file;
+            }
         }
         closedir($dh);
         usort($files, array("dir", "fileSort"));
         return $files;
     }
 
-    static function fileSort($a, $b) {
+    static function fileSort($a, $b)
+    {
         if (function_exists("mb_strtolower")) {
             $a = mb_strtolower($a);
             $b = mb_strtolower($b);
@@ -153,7 +175,9 @@ 
             $a = strtolower($a);
             $b = strtolower($b);
         }
-        if ($a == $b) return 0;
+        if ($a == $b) {
+            return 0;
+        }
         return ($a < $b) ? -1 : 1;
     }
 }

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

Braces +6 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class input {
+class input
+{
 
   /** Filtered $_GET array
     * @var array */
@@ -26,7 +27,8 @@ 
     * @var array */
     public $cookie;
 
-    public function __construct() {
+    public function __construct()
+    {
         $this->get = &$_GET;
         $this->post = &$_POST;
         $this->cookie = &$_COOKIE;
@@ -36,7 +38,8 @@ 
     * @param string $property
     * @return mixed */
 
-    public function __get($property) {
+    public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 }

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

Braces +54 added lines, -29 removed lines

@@ -12,29 +12,36 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class path {
+class path
+{
 
   /** Get the absolute URL path of the given one. Returns FALSE if the URL
     * is not valid or the current directory cannot be resolved (getcwd())
     * @param string $path
     * @return string */
 
-    static function rel2abs_url($path) {
-        if (substr($path, 0, 1) == "/") return $path;
+    static function rel2abs_url($path)
+    {
+        if (substr($path, 0, 1) == "/") {
+            return $path;
+        }
         $dir = @getcwd();
 
-        if (!isset($_SERVER['DOCUMENT_ROOT']) || ($dir === false))
-            return false;
+        if (!isset($_SERVER['DOCUMENT_ROOT']) || ($dir === false)) {
+                    return false;
+        }
 
         $dir = self::normalize($dir);
         $doc_root = self::normalize($_SERVER['DOCUMENT_ROOT']);
 
-        if (substr($dir, 0, strlen($doc_root)) != $doc_root)
-            return false;
+        if (substr($dir, 0, strlen($doc_root)) != $doc_root) {
+                    return false;
+        }
 
         $return = self::normalize(substr($dir, strlen($doc_root)) . "/$path");
-        if (substr($return, 0, 1) !== "/")
-            $return = "/$return";
+        if (substr($return, 0, 1) !== "/") {
+                    $return = "/$return";
+        }
 
         return $return;
     }
@@ -44,7 +51,8 @@ 
     * @param string $url
     * @return string */
 
-    static function url2fullPath($url) {
+    static function url2fullPath($url)
+    {
         $url = self::normalize($url);
 
         $uri = isset($_SERVER['SCRIPT_NAME'])
@@ -55,7 +63,9 @@ 
         $uri = self::normalize($uri);
 
         if (substr($url, 0, 1) !== "/") {
-            if ($uri === false) return false;
+            if ($uri === false) {
+                return false;
+            }
             $url = dirname($uri) . "/$url";
         }
 
@@ -63,7 +73,9 @@ 
             return self::normalize($_SERVER['DOCUMENT_ROOT'] . "/$url");
 
         } else {
-            if ($uri === false) return false;
+            if ($uri === false) {
+                return false;
+            }
 
             if (isset($_SERVER['SCRIPT_FILENAME'])) {
                 $scr_filename = self::normalize($_SERVER['SCRIPT_FILENAME']);
@@ -71,13 +83,15 @@ 
             }
 
             $count = count(explode('/', $uri)) - 1;
-            for ($i = 0, $chdir = ""; $i < $count; $i++)
-                $chdir .= "../";
+            for ($i = 0, $chdir = ""; $i < $count; $i++) {
+                            $chdir .= "../";
+            }
             $chdir = self::normalize($chdir);
 
             $dir = getcwd();
-            if (($dir === false) || !@chdir($chdir))
-                return false;
+            if (($dir === false) || !@chdir($chdir)) {
+                            return false;
+            }
             $rdir = getcwd();
             chdir($dir);
             return ($rdir !== false) ? self::normalize($rdir . "/$url") : false;
@@ -92,22 +106,29 @@ 
     * @param string $path
     * @return string */
 
-    static function normalize($path) {
+    static function normalize($path)
+    {
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
             $path = preg_replace('/([^\\\])\\\([^\\\])/', "$1/$2", $path);
-            if (substr($path, -1) == "\\") $path = substr($path, 0, -1);
-            if (substr($path, 0, 1) == "\\") $path = "/" . substr($path, 1);
+            if (substr($path, -1) == "\\") {
+                $path = substr($path, 0, -1);
+            }
+            if (substr($path, 0, 1) == "\\") {
+                $path = "/" . substr($path, 1);
+            }
         }
 
         $path = preg_replace('/\/+/s', "/", $path);
 
         $path = "/$path";
-        if (substr($path, -1) != "/")
-            $path .= "/";
+        if (substr($path, -1) != "/") {
+                    $path .= "/";
+        }
 
         $expr = '/\/([^\/]{1}|[^\.\/]{2}|[^\/]{3,})\/\.\.\//s';
-        while (preg_match($expr, $path))
-            $path = preg_replace($expr, "/", $path);
+        while (preg_match($expr, $path)) {
+                    $path = preg_replace($expr, "/", $path);
+        }
 
         $path = substr($path, 0, -1);
         $path = substr($path, 1);
@@ -118,11 +139,13 @@ 
     * @param string $path
     * @return string */
 
-    static function urlPathEncode($path) {
+    static function urlPathEncode($path)
+    {
         $path = self::normalize($path);
         $encoded = "";
-        foreach (explode("/", $path) as $dir)
-            $encoded .= rawurlencode($dir) . "/";
+        foreach (explode("/", $path) as $dir) {
+                    $encoded .= rawurlencode($dir) . "/";
+        }
         $encoded = substr($encoded, 0, -1);
         return $encoded;
     }
@@ -131,11 +154,13 @@ 
     * @param string $path
     * @return string */
 
-    static function urlPathDecode($path) {
+    static function urlPathDecode($path)
+    {
         $path = self::normalize($path);
         $decoded = "";
-        foreach (explode("/", $path) as $dir)
-            $decoded .= rawurldecode($dir) . "/";
+        foreach (explode("/", $path) as $dir) {
+                    $decoded .= rawurldecode($dir) . "/";
+        }
         $decoded = substr($decoded, 0, -1);
         return $decoded;
     }

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

Braces +22 added lines, -13 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class file {
+class file
+{
 
     static $MIME = array(
         'ai'    => 'application/postscript',
@@ -105,10 +106,12 @@ 
     * @param string $dir
     * @return bool */
 
-    static function isWritable($filename) {
+    static function isWritable($filename)
+    {
         $filename = path::normalize($filename);
-        if (!is_file($filename) || (false === ($fp = @fopen($filename, 'a+'))))
-            return false;
+        if (!is_file($filename) || (false === ($fp = @fopen($filename, 'a+')))) {
+                    return false;
+        }
         fclose($fp);
         return true;
     }
@@ -118,7 +121,8 @@ 
     * @param bool $toLower
     * @return string */
 
-    static function getExtension($filename, $toLower=true) {
+    static function getExtension($filename, $toLower=true)
+    {
         return preg_match('/^.*\.([^\.]*)$/s', $filename, $patt)
             ? ($toLower ? strtolower($patt[1]) : $patt[1]) : "";
     }
@@ -134,7 +138,8 @@ 
     * @param string $magic
     * @return string */
 
-    static function getMimeType($filename, $magic=null) {
+    static function getMimeType($filename, $magic=null)
+    {
         if (class_exists("finfo")) {
             $finfo = ($magic === null)
                 ? new finfo(FILEINFO_MIME)
@@ -170,12 +175,15 @@ 
     * @param string $tpl
     * @return string */
 
-    static function getInexistantFilename($filename, $dir=null, $tpl=null) {
-        if ($tpl === null)  $tpl = "{name}({sufix}){ext}";
+    static function getInexistantFilename($filename, $dir=null, $tpl=null)
+    {
+        if ($tpl === null) {
+            $tpl = "{name}({sufix}){ext}";
+        }
         $fullPath = ($dir === null);
-        if ($fullPath)
-            $dir = path::normalize(dirname($filename));
-        else {
+        if ($fullPath) {
+                    $dir = path::normalize(dirname($filename));
+        } else {
             $fdir = dirname($filename);
             $dir = strlen($fdir)
                 ? path::normalize("$dir/$fdir")
@@ -187,8 +195,9 @@ 
         $tpl = str_replace('{name}', $name, $tpl);
         $tpl = str_replace('{ext}', (strlen($ext) ? ".$ext" : ""), $tpl);
         $i = 1; $file = "$dir/$filename";
-        while (file_exists($file))
-            $file = "$dir/" . str_replace('{sufix}', $i++, $tpl);
+        while (file_exists($file)) {
+                    $file = "$dir/" . str_replace('{sufix}', $i++, $tpl);
+        }
 
         return $fullPath
             ? $file

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

Braces +42 added lines, -21 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-abstract class image {
+abstract class image
+{
     const DEFAULT_JPEG_QUALITY = 75;
 
 /** Image resource or object
@@ -41,7 +42,8 @@ 
   * @param string $property
   * @return mixed */
 
-    final public function __get($property) {
+    final public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -57,14 +59,16 @@ 
   * @param mixed $image
   * @param array $options */
 
-    public function __construct($image, array $options=array()) {
+    public function __construct($image, array $options=array())
+    {
         $this->image = $this->width = $this->height = null;
         $imageDetails = $this->buildImage($image);
 
-        if ($imageDetails !== false)
-            list($this->image, $this->width, $this->height) = $imageDetails;
-        else
-            $this->initError = true;
+        if ($imageDetails !== false) {
+                    list($this->image, $this->width, $this->height) = $imageDetails;
+        } else {
+                    $this->initError = true;
+        }
         $this->options = $options;
     }
 
@@ -75,7 +79,8 @@ 
   * @param mixed $image
   * @return object */
 
-    final static function factory($driver, $image, array $options=array()) {
+    final static function factory($driver, $image, array $options=array())
+    {
         $class = "image_$driver";
         return new $class($image, $options);
     }
@@ -86,14 +91,18 @@ 
   * @param array $drivers
   * @return string */
 
-    final static function getDriver(array $drivers=array('gd')) {
+    final static function getDriver(array $drivers=array('gd'))
+    {
         foreach ($drivers as $driver) {
-            if (!preg_match('/^[a-z0-9\_]+$/i', $driver))
-                continue;
+            if (!preg_match('/^[a-z0-9\_]+$/i', $driver)) {
+                            continue;
+            }
             $class = "image_$driver";
             if (class_exists($class) && method_exists($class, "available")) {
                 eval("\$avail = $class::available();");
-                if ($avail) return $driver;
+                if ($avail) {
+                    return $driver;
+                }
             }
         }
         return false;
@@ -105,7 +114,8 @@ 
   * @param mixed $image
   * @return array */
 
-    final protected function buildImage($image) {
+    final protected function buildImage($image)
+    {
         $class = get_class($this);
 
         if ($image instanceof $class) {
@@ -118,8 +128,9 @@ 
             list($key, $height) = each($image);
             $img = $this->getBlankImage($width, $height);
 
-        } else
-            $img = $this->getImage($image, $width, $height);
+        } else {
+                    $img = $this->getImage($image, $width, $height);
+        }
 
         return ($img !== false)
             ? array($img, $width, $height)
@@ -131,9 +142,12 @@ 
   * @param integer $resizedHeight
   * @return integer */
 
-    final public function getPropWidth($resizedHeight) {
+    final public function getPropWidth($resizedHeight)
+    {
         $width = round(($this->width * $resizedHeight) / $this->height);
-        if (!$width) $width = 1;
+        if (!$width) {
+            $width = 1;
+        }
         return $width;
     }
 
@@ -142,9 +156,12 @@ 
   * @param integer $resizedWidth
   * @return integer */
 
-    final public function getPropHeight($resizedWidth) {
+    final public function getPropHeight($resizedWidth)
+    {
         $height = round(($this->height * $resizedWidth) / $this->width);
-        if (!$height) $height = 1;
+        if (!$height) {
+            $height = 1;
+        }
         return $height;
     }
 
@@ -153,13 +170,17 @@ 
   * static method should be implemented into driver classes like abstract
   * methods
   * @return bool */
-    static function available() { return false; }
+    static function available()
+    {
+return false; }
 
 /** Checks if file is an image. This static method should be implemented into
   * driver classes like abstract methods
   * @param string $file
   * @return bool */
-    static function checkImage($file) { return false; }
+    static function checkImage($file)
+    {
+return false; }
 
 /** Resize image. Should return TRUE on success or FALSE on failure
   * @param integer $width

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

Braces +31 added lines, -14 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class httpCache {
+class httpCache
+{
     const DEFAULT_TYPE = "text/html";
     const DEFAULT_EXPIRE = 604800; // in seconds
 
@@ -25,15 +26,20 @@ 
     * @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);
+        if ($mtime !== false) {
+            self::checkMTime($mtime);
+        }
 
         if ($type === null) {
             $magic = ((substr($type, 0, 1) == "/") || preg_match('/^[a-z]\:/i', $type))
                 ? $type : null;
             $type = file::getMimeType($file, $magic);
-            if (!$type) $type = null;
+            if (!$type) {
+                $type = null;
+            }
         }
 
         self::content(@file_get_contents($file), $mtime, $type, $expire, $headers, false);
@@ -47,10 +53,17 @@ 
     * @param array $headers
     * @param bool $checkMTime */
 
-    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;
+    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";
         header("Content-Type: $type");
@@ -58,7 +71,9 @@ 
         header("Cache-Control: max-age=$expire");
         header("Pragma: !invalid");
         header("Content-Length: $size");
-        if ($headers !== null) foreach ($headers as $header) header($header);
+        if ($headers !== null) {
+            foreach ($headers as $header) header($header);
+        }
         echo $content;
     }
 
@@ -68,7 +83,8 @@ 
     * the PHP to be configured as Apache module.
     * @param integer $mtime */
 
-    static function checkMTime($mtime, $sendHeaders=null) {
+    static function checkMTime($mtime, $sendHeaders=null)
+    {
         header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");
 
         $headers = function_exists("getallheaders")
@@ -82,11 +98,12 @@ 
             $client_mtime = @strtotime($client_mtime[0]);
             if ($client_mtime >= $mtime) {
                 header('HTTP/1.1 304 Not Modified');
-                if (is_array($sendHeaders) && count($sendHeaders))
-                    foreach ($sendHeaders as $header)
+                if (is_array($sendHeaders) && count($sendHeaders)) {
+                                    foreach ($sendHeaders as $header)
                         header($header);
-                elseif ($sendHeaders !== null)
-                    header($sendHeaders);
+                } elseif ($sendHeaders !== null) {
+                                    header($sendHeaders);
+                }
 
 
                 die;