evolution-cms / evolution

manager/frames/mainmenu.php

Braces +35 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
 	'active'

 );

 

-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

+if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

@@ -48,7 +48,7 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

+if($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

@@ -64,7 +64,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 	$sitemenu['users'] = array(

 		'users',

 		'main',

@@ -80,7 +80,7 @@ 
 	);

 }

 

-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

-if($modx->hasPermission('edit_template')) {

+if($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

@@ -112,7 +112,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

@@ -127,7 +127,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_chunk')) {

+if($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

@@ -142,7 +142,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_snippet')) {

+if($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

@@ -157,7 +157,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

@@ -174,7 +174,7 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

-if($modx->hasPermission('file_manager')) {

+if($modx->hasPermission('file_manager')) {
 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

@@ -189,7 +189,7 @@ 
 		''

 	);

 }

-if($modx->hasPermission('category_manager')) {

+if($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // Modules Menu Items

-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

@@ -222,19 +222,19 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if($modx->hasPermission('exec_module')) {
+	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-	} else {

+	} else {
 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

-	if($modx->db->getRecordCount($rs)) {

-	    while ($row = $modx->db->getRow($rs)) {

+	if($modx->db->getRecordCount($rs)) {
+	    while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

@@ -254,7 +254,7 @@ 
 

 // security menu items (users)

 

-if($modx->hasPermission('edit_user')) {

+if($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

@@ -270,7 +270,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_web_user')) {

+if($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

@@ -286,7 +286,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_role')) {

+if($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

@@ -302,7 +302,7 @@ 
 	);

 }

 

-if($modx->hasPermission('access_permissions')) {

+if($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

@@ -318,7 +318,7 @@ 
 	);

 }

 

-if($modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

@@ -374,7 +374,7 @@ 
 	''

 );

 

-if($modx->hasPermission('bk_manager')) {

+if($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

@@ -390,7 +390,7 @@ 
 	);

 }

 

-if($modx->hasPermission('remove_locks')) {

+if($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

@@ -406,7 +406,7 @@ 
 	);

 }

 

-if($modx->hasPermission('import_static')) {

+if($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

@@ -422,7 +422,7 @@ 
 	);

 }

 

-if($modx->hasPermission('export_static')) {

+if($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

@@ -439,19 +439,21 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if(is_array($menu)) {

+if(is_array($menu)) {
 	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

+	foreach($menu as $item) {
+		if(is_array(unserialize($item))) {
 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

-}

+	if(count($newmenu)> 0) {
+	    $sitemenu = $newmenu;
+	}
+	}

 

-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

+if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
 	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

-} else {

+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

manager/media/calendar/datepicker.inc.php

Braces +6 added lines, -3 removed lines

@@ -1,10 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER
+{
+	function __construct()
+	{
 	}

 

-	function getDP() {

+	function getDP()
+	{
 		global $modx, $_lang;

 

 		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

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

Braces +7 added lines, -4 removed lines

@@ -12,17 +12,20 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img
+{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config)
+    {
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";
 
         $img = image::factory($driver, $file);
 
-        if ($img->initError)
-            return "Unknown image format/encoding.";
+        if ($img->initError) {
+                    return "Unknown image format/encoding.";
+        }
 
         return true;
     }

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

Braces +13 added lines, -8 removed lines

@@ -12,20 +12,25 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_mime {
+class type_mime
+{
 
-    public function checkFile($file, array $config) {
-        if (!class_exists("finfo"))
-            return "Fileinfo PECL extension is missing.";
+    public function checkFile($file, array $config)
+    {
+        if (!class_exists("finfo")) {
+                    return "Fileinfo PECL extension is missing.";
+        }
 
-        if (!isset($config['params']))
-            return "Undefined MIME types.";
+        if (!isset($config['params'])) {
+                    return "Undefined MIME types.";
+        }
 
         $finfo = strlen($config['mime_magic'])
             ? new finfo(FILEINFO_MIME, $config['mime_magic'])
             : new finfo(FILEINFO_MIME);
-        if (!$finfo)
-            return "Opening fileinfo database failed.";
+        if (!$finfo) {
+                    return "Opening fileinfo database failed.";
+        }
 
         $type = $finfo->file($file);
         $type = substr($type, 0, strrpos($type, ";"));

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

Braces +25 added lines, -15 removed lines

@@ -41,17 +41,20 @@ 
 $_GET['langCode'] = $modx_lang_attribute;
 
 // PHP VERSION CHECK
-if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
+if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5) {
     die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+}
 
 
 // SAFE MODE CHECK
-if (ini_get("safe_mode"))
+if (ini_get("safe_mode")) {
     die("The \"safe_mode\" PHP ini setting is turned on! You cannot run KCFinder in safe mode.");
+}
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class)
+{
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -84,7 +87,8 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
+    function kcfinder_json_string_encode($string)
+    {
         return '"' .
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
@@ -95,37 +99,43 @@ 
         $string)))))) . '"';
     }
 
-    function json_encode($data) {
+    function json_encode($data)
+    {
 
         if (is_array($data)) {
             $ret = array();
 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
-                foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
+                foreach ($data as $key => $val) {
+                                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
+                }
                 return "{" . implode(",", $ret) . "}";
 
             // ARRAY
             } else {
-                foreach ($data as $val)
-                    $ret[] = json_encode($val);
+                foreach ($data as $val) {
+                                    $ret[] = json_encode($val);
+                }
                 return "[" . implode(",", $ret) . "]";
             }
 
         // BOOLEAN OR NULL
-        } elseif (is_bool($data) || ($data === null))
-            return ($data === null)
+        } elseif (is_bool($data) || ($data === null)) {
+                    return ($data === null)
                 ? "null"
                 : ($data ? "true" : "false");
+        }
 
         // FLOAT
-        elseif (is_float($data))
-            return rtrim(rtrim(number_format($data, 14, ".", ""), "0"), ".");
+        elseif (is_float($data)) {
+                    return rtrim(rtrim(number_format($data, 14, ".", ""), "0"), ".");
+        }
 
         // INTEGER
-        elseif (is_int($data))
-            return $data;
+        elseif (is_int($data)) {
+                    return $data;
+        }
 
         // STRING
         return kcfinder_json_string_encode($data);

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/core/uploader.php

Braces +238 added lines, -149 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader
+{
 
 /** Release version */
     const VERSION = "2.54";
@@ -104,17 +105,21 @@ 
 /** 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 {
             if ($modx instanceof DocumentParser) {
                 $this->modx = $modx;
-            } else throw new Exception('MODX should be instance of DocumentParser');
+            } else {
+                throw new Exception('MODX should be instance of DocumentParser');
+            }
         } catch (Exception $e) {
             die($e->getMessage());
         }
@@ -129,26 +134,34 @@ 
         // SET CMS INTEGRATION ATTRIBUTE
         if (isset($this->get['cms']) &&
             in_array($this->get['cms'], array("drupal"))
-        )
-            $this->cms = $this->get['cms'];
+        ) {
+                    $this->cms = $this->get['cms'];
+        }
 
 		// LINKING UPLOADED FILE
-        if (count($_FILES))
-            $this->file = &$_FILES[key($_FILES)];
+        if (count($_FILES)) {
+                    $this->file = &$_FILES[key($_FILES)];
+        }
 
         // LOAD DEFAULT CONFIGURATION
         require "config.php";
 
         // SETTING UP SESSION
-        if (isset($_CONFIG['_sessionLifetime']))
-            ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
-        if (isset($_CONFIG['_sessionDir']))
-            ini_set('session.save_path', $_CONFIG['_sessionDir']);
-        if (isset($_CONFIG['_sessionDomain']))
-            ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
+        if (isset($_CONFIG['_sessionLifetime'])) {
+                    ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
+        }
+        if (isset($_CONFIG['_sessionDir'])) {
+                    ini_set('session.save_path', $_CONFIG['_sessionDir']);
+        }
+        if (isset($_CONFIG['_sessionDomain'])) {
+                    ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
+        }
         switch ($this->cms) {
             case "drupal": break;
-            default: if (!session_id()) session_start(); break;
+            default: if (!session_id()) {
+                session_start();
+            }
+            break;
         }
 
         // RELOAD DEFAULT CONFIGURATION
@@ -159,31 +172,37 @@ 
         if (isset($_CONFIG['_sessionVar']) &&
             is_array($_CONFIG['_sessionVar'])
         ) {
-            foreach ($_CONFIG['_sessionVar'] as $key => $val)
-                if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
+            foreach ($_CONFIG['_sessionVar'] as $key => $val) {
+                            if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
                     $this->config[$key] = $val;
-            if (!isset($this->config['_sessionVar']['self']))
-                $this->config['_sessionVar']['self'] = array();
+            }
+            if (!isset($this->config['_sessionVar']['self'])) {
+                            $this->config['_sessionVar']['self'] = array();
+            }
             $this->session = &$this->config['_sessionVar']['self'];
-        } else
-            $this->session = &$_SESSION;
+        } else {
+                    $this->session = &$_SESSION;
+        }
 
         // IMAGE DRIVER INIT
         if (isset($this->config['imageDriversPriority'])) {
             $this->config['imageDriversPriority'] =
                 text::clearWhitespaces($this->config['imageDriversPriority']);
             $driver = image::getDriver(explode(' ', $this->config['imageDriversPriority']));
-            if ($driver !== false)
-                $this->imageDriver = $driver;
+            if ($driver !== false) {
+                            $this->imageDriver = $driver;
+            }
         }
         if ((!isset($driver) || ($driver === false)) &&
             (image::getDriver(array($this->imageDriver)) === false)
-        )
-            die("Cannot find any of the supported PHP image extensions!");
+        ) {
+                    die("Cannot find any of the supported PHP image extensions!");
+        }
 
         // WATERMARK INIT
-        if (isset($this->config['watermark']) && is_string($this->config['watermark']))
-            $this->config['watermark'] = array('file' => $this->config['watermark']);
+        if (isset($this->config['watermark']) && is_string($this->config['watermark'])) {
+                    $this->config['watermark'] = array('file' => $this->config['watermark']);
+        }
 
         // GET TYPE DIRECTORY
         $this->types = &$this->config['types'];
@@ -197,9 +216,10 @@ 
 
         // LOAD TYPE DIRECTORY SPECIFIC CONFIGURATION IF EXISTS
         if (is_array($this->types[$this->type])) {
-            foreach ($this->types[$this->type] as $key => $val)
-                if (in_array($key, $this->typeSettings))
+            foreach ($this->types[$this->type] as $key => $val) {
+                            if (in_array($key, $this->typeSettings))
                     $this->config[$key] = $val;
+            }
             $this->types[$this->type] = isset($this->types[$this->type]['type'])
                 ? $this->types[$this->type]['type'] : "";
         }
@@ -209,12 +229,14 @@ 
         $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
-        )
-            $this->config['cookieDomain'] = "";
-        elseif (!strlen($this->config['cookieDomain']))
-            $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
-        if (!strlen($this->config['cookiePath']))
-            $this->config['cookiePath'] = "/";
+        ) {
+                    $this->config['cookieDomain'] = "";
+        } elseif (!strlen($this->config['cookieDomain'])) {
+                    $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
+        }
+        if (!strlen($this->config['cookiePath'])) {
+                    $this->config['cookiePath'] = "/";
+        }
 
         // UPLOAD FOLDER INIT
 
@@ -250,26 +272,30 @@ 
             $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
             $this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
         }
-        if (!is_dir($this->config['uploadDir']))
-            @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        if (!is_dir($this->config['uploadDir'])) {
+                    @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        }
 
         // HOST APPLICATIONS INIT
-        if (isset($this->get['CKEditorFuncNum']))
-            $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        if (isset($this->get['CKEditorFuncNum'])) {
+                    $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        }
         if (isset($this->get['opener']) &&
             (strtolower($this->get['opener']) == "tinymce") &&
             isset($this->config['_tinyMCEPath']) &&
             strlen($this->config['_tinyMCEPath'])
-        )
-            $this->opener['TinyMCE'] = true;
+        ) {
+                    $this->opener['TinyMCE'] = true;
+        }
 
         // LOCALIZATION
-        foreach ($this->langInputNames as $key)
-            if (isset($this->get[$key]) &&
+        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")
             ) {
                 $this->lang = $this->get[$key];
+        }
                 break;
             }
         $this->localize($this->lang);
@@ -280,31 +306,39 @@ 
         ) {
             $htaccess = "{$this->config['uploadDir']}/.htaccess";
             if (!file_exists($htaccess)) {
-                if (!@file_put_contents($htaccess, $this->get_htaccess()))
-                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                if (!@file_put_contents($htaccess, $this->get_htaccess())) {
+                                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                }
             } else {
-                if (false === ($data = @file_get_contents($htaccess)))
-                    $this->backMsg("Cannot read .htaccess");
-                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data))
-                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                if (false === ($data = @file_get_contents($htaccess))) {
+                                    $this->backMsg("Cannot read .htaccess");
+                }
+                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data)) {
+                                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                }
             }
         }
 
         // CHECK & CREATE UPLOAD FOLDER
         if (!is_dir($this->typeDir)) {
-            if (!mkdir($this->typeDir, $this->config['dirPerms']))
-                $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
-        } elseif (!is_readable($this->typeDir))
-            $this->backMsg("Cannot read upload folder.");
+            if (!mkdir($this->typeDir, $this->config['dirPerms'])) {
+                            $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
+            }
+        } elseif (!is_readable($this->typeDir)) {
+                    $this->backMsg("Cannot read upload folder.");
+        }
     }
 
-    public function upload() {
+    public function upload()
+    {
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
 
         if ($config['disabled'] || !$config['access']['files']['upload']) {
-            if (isset($file['tmp_name'])) @unlink($file['tmp_name']);
+            if (isset($file['tmp_name'])) {
+                @unlink($file['tmp_name']);
+            }
             $message = $this->label("You don't have permissions to upload files.");
 
         } elseif (true === ($message = $this->checkUploadedFile())) {
@@ -315,9 +349,9 @@ 
                 (false !== ($gdir = $this->checkInputDir($this->get['dir'])))
             ) {
                 $udir = path::normalize("$dir$gdir");
-                if (substr($udir, 0, strlen($dir)) !== $dir)
-                    $message = $this->label("Unknown error.");
-                else {
+                if (substr($udir, 0, strlen($dir)) !== $dir) {
+                                    $message = $this->label("Unknown error.");
+                } else {
                     $l = strlen($dir);
                     $dir = "$udir/";
                     $udir = substr($udir, $l);
@@ -325,8 +359,9 @@ 
             }
 
             if (!strlen($message)) {
-                if (!is_dir(path::normalize($dir)))
-                    @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
+                if (!is_dir(path::normalize($dir))) {
+                                    @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
+                }
 
                 $filename = $this->normalizeFilename($file['name']);
                 $target = file::getInexistantFilename($dir . $filename);
@@ -334,21 +369,25 @@ 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
                     !@copy($file['tmp_name'], $target)
-                )
-                    $message = $this->label("Cannot move uploaded file to target folder.");
-                else {
-                    if (function_exists('chmod'))
-                        @chmod($target, $this->config['filePerms']);
+                ) {
+                                    $message = $this->label("Cannot move uploaded file to target folder.");
+                } else {
+                    if (function_exists('chmod')) {
+                                            @chmod($target, $this->config['filePerms']);
+                    }
                     $this->makeThumb($target);
                     $url = $this->typeURL;
-                    if (isset($udir)) $url .= "/$udir";
+                    if (isset($udir)) {
+                        $url .= "/$udir";
+                    }
                     $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);
-                    } else
-                        $url = path::urlPathEncode($url);
+                    } else {
+                                            $url = path::urlPathEncode($url);
+                    }
                 }
             }
         }
@@ -356,16 +395,19 @@ 
         if (strlen($message) &&
             isset($this->file['tmp_name']) &&
             file_exists($this->file['tmp_name'])
-        )
-            @unlink($this->file['tmp_name']);
+        ) {
+                    @unlink($this->file['tmp_name']);
+        }
 
-        if (strlen($message) && method_exists($this, 'errorMsg'))
-            $this->errorMsg($message);
+        if (strlen($message) && method_exists($this, 'errorMsg')) {
+                    $this->errorMsg($message);
+        }
         $this->callBack($url, $message);
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings()
+	{
 		global $modx;
 
 		// Cleaning uploaded filename?
@@ -385,7 +427,8 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename)
+	{
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,16 +437,19 @@ 
         	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;
 
-        if (!is_array($file) || !isset($file['name']))
-            return $this->label("Unknown error");
+        if (!is_array($file) || !isset($file['name'])) {
+                    return $this->label("Unknown error");
+        }
 
         if (is_array($file['name'])) {
             foreach ($file['name'] as $i => $name) {
@@ -412,8 +458,9 @@ 
                     'tmp_name' => $file['tmp_name'][$i],
                     'error' => $file['error'][$i]
                 ));
-                if ($return !== true)
-                    return "$name: $return";
+                if ($return !== true) {
+                                    return "$name: $return";
+                }
             }
             return true;
         }
@@ -422,8 +469,8 @@ 
         $typePatt = strtolower(text::clearWhitespaces($this->types[$this->type]));
 
         // CHECK FOR UPLOAD ERRORS
-        if ($file['error'])
-            return
+        if ($file['error']) {
+                    return
                 ($file['error'] == UPLOAD_ERR_INI_SIZE) ?
                     $this->label("The uploaded file exceeds {size} bytes.",
                         array('size' => ini_get('upload_max_filesize'))) : (
@@ -440,14 +487,17 @@ 
                     $this->label("Failed to write file.") :
                     $this->label("Unknown error.")
             )))));
+        }
 
         // HIDDEN FILENAMES CHECK
-        elseif (substr($file['name'], 0, 1) == ".")
-            return $this->label("File name shouldn't begins with '.'");
+        elseif (substr($file['name'], 0, 1) == ".") {
+                    return $this->label("File name shouldn't begins with '.'");
+        }
 
         // EXTENSION CHECK
-        elseif (!$this->validateExtension($extension, $this->type))
-            return $this->label("Denied file extension.");
+        elseif (!$this->validateExtension($extension, $this->type)) {
+                    return $this->label("Denied file extension.");
+        }
 
         // SPECIAL DIRECTORY TYPES CHECK (e.g. *img)
         elseif (preg_match('/^\*([^ ]+)(.*)?$/s', $typePatt, $patt)) {
@@ -457,70 +507,84 @@ 
                 $type = new $class();
                 $cfg = $config;
                 $cfg['filename'] = $file['name'];
-                if (strlen($params))
-                    $cfg['params'] = trim($params);
+                if (strlen($params)) {
+                                    $cfg['params'] = trim($params);
+                }
                 $response = $type->checkFile($file['tmp_name'], $cfg);
-                if ($response !== true)
-                    return $this->label($response);
-            } else
-                return $this->label("Non-existing directory type.");
+                if ($response !== true) {
+                                    return $this->label($response);
+                }
+            } else {
+                            return $this->label("Non-existing directory type.");
+            }
         }
 
         // IMAGE RESIZE
         $img = image::factory($this->imageDriver, $file['tmp_name']);
-        if (!$img->initError && !$this->imageResize($img, $file['tmp_name']))
-            return $this->label("The image is too big and/or cannot be resized.");
+        if (!$img->initError && !$this->imageResize($img, $file['tmp_name'])) {
+                    return $this->label("The image is too big and/or cannot be resized.");
+        }
 
 
 	// CHECK FOR MODX MAX FILE SIZE                
 	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	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);
+        if (substr($dir, 0, 1) == "/") {
+                    $dir = substr($dir, 1);
+        }
 
-        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == "."))
-            return false;
+        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == ".")) {
+                    return false;
+        }
 
         if ($inclType) {
             $first = explode("/", $dir);
             $first = $first[0];
-            if ($first != $this->type)
-                return false;
+            if ($first != $this->type) {
+                            return false;
+            }
             $return = $this->removeTypeFromPath($dir);
         } else {
             $return = $dir;
             $dir = "{$this->type}/$dir";
         }
 
-        if (!$existing)
-            return $return;
+        if (!$existing) {
+                    return $return;
+        }
 
         $path = "{$this->config['uploadDir']}/$dir";
         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;
+        if (!isset($this->types[$type])) {
+                    return false;
+        }
 
         $exts = strtolower(text::clearWhitespaces($this->config['deniedExts']));
         if (strlen($exts)) {
             $exts = explode(" ", $exts);
-            if (in_array($ext, $exts))
-                return false;
+            if (in_array($ext, $exts)) {
+                            return false;
+            }
         }
 
         $exts = trim($this->types[$type]);
-        if (!strlen($exts) || substr($exts, 0, 1) == "*")
-            return true;
+        if (!strlen($exts) || substr($exts, 0, 1) == "*") {
+                    return true;
+        }
 
         if (substr($exts, 0, 1) == "!") {
             $exts = explode(" ", trim(strtolower(substr($exts, 1))));
@@ -531,26 +595,32 @@ 
         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);
-            if ($img->initError) return false;
+            if ($img->initError) {
+                return false;
+            }
             $file = $image;
-        } elseif ($file === null)
-            return false;
-        else
-            $img = $image;
+        } elseif ($file === null) {
+                    return false;
+        } else {
+                    $img = $image;
+        }
 
         $orientation = 1;
         if (function_exists("exif_read_data")) {
@@ -572,8 +642,9 @@ 
             )
             ) &&
             ($orientation == 1)
-        )
-            return true;
+        ) {
+                    return true;
+        }
 
 
         // PROPORTIONAL RESIZE
@@ -593,15 +664,17 @@ 
                 $width = $img->getPropWidth($height);
             }
 
-            if (isset($width) && isset($height) && !$img->resize($width, $height))
-                return false;
+            if (isset($width) && isset($height) && !$img->resize($width, $height)) {
+                            return false;
+            }
 
         // RESIZE TO FIT
         } elseif (
             $this->config['maxImageWidth'] && $this->config['maxImageHeight'] &&
             !$img->resizeFit($this->config['maxImageWidth'], $this->config['maxImageHeight'])
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         // AUTO FLIP AND ROTATE FROM EXIF
         if ((($orientation == 2) && !$img->flipHorizontal()) ||
@@ -611,11 +684,13 @@ 
             (($orientation == 6) && !$img->rotate(90)) ||
             (($orientation == 7) && (!$img->flipHorizontal() || !$img->rotate(90))) ||
             (($orientation == 8) && !$img->rotate(270))
-        )
-            return false;
-        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick"))
-            try {
+        ) {
+                    return false;
+        }
+        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick")) {
+                    try {
                 $img->image->setImageProperty('exif:Orientation', "1");
+        }
             } catch (Exception $e) {}
         
         // WATERMARK
@@ -646,22 +721,26 @@ 
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite=true)
+    {
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
-        if ($img->initError)
-            return true;
+        if ($img->initError) {
+                    return true;
+        }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
         $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))
-            return false;
+        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
+                    return false;
+        }
 
-        if (!$overwrite && is_file($thumb))
-            return true;
+        if (!$overwrite && is_file($thumb)) {
+                    return true;
+        }
 
         // Images with smaller resolutions than thumbnails
         /*if (($img->width <= $this->config['thumbWidth']) &&
@@ -674,8 +753,9 @@ 
 
         // Resize image
         } else */
-        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
-            return false;
+        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight'])) {
+                    return false;
+        }
 
         if ( $this->imageDriver == 'gd' ) {
             $width  = imagesx( $img->image );
@@ -697,7 +777,8 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode)
+    {
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,27 +793,34 @@ 
         $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)
+        if (is_array($data)) {
+                    foreach ($data as $key => $val)
                 $return = str_replace("{{$key}}", $val, $return);
+        }
         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']);
+        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
+                    @unlink($this->file['tmp_name']);
+        }
         $this->callBack("", $message);
         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;
-        if (!$CKfuncNum) $CKfuncNum = 0;
+        if (!$CKfuncNum) {
+            $CKfuncNum = 0;
+        }
         header("Content-Type: text/html; charset={$this->charset}");
 
 ?><html>
@@ -769,7 +857,8 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess()
+    {
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

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}";