evolution-cms / evolution

index.php

Spacing +11 added lines, -11 removed lines

@@ -45,7 +45,7 @@ 
  * -----------------------------
  */
 
-$autoloader = __DIR__ . '/vendor/autoload.php';
+$autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
     include_once($autoloader);
 }
@@ -54,15 +54,15 @@ 
     $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
 }
 
-$base_path = str_replace('\\', '/', dirname(__FILE__)) . '/';
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+$base_path = str_replace('\\', '/', dirname(__FILE__)).'/';
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
 if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
     define('MGR_DIR', 'manager');
 }
-if (is_file($base_path . 'assets/cache/siteHostnames.php')) {
-    include_once($base_path . 'assets/cache/siteHostnames.php');
+if (is_file($base_path.'assets/cache/siteHostnames.php')) {
+    include_once($base_path.'assets/cache/siteHostnames.php');
 }
 if (!defined('MODX_SITE_HOSTNAMES')) {
     define('MODX_SITE_HOSTNAMES', '');
@@ -72,7 +72,7 @@ 
 $mstart = memory_get_usage();
 
 // harden it
-require_once(dirname(__FILE__) . '/' . MGR_DIR . '/includes/protect.inc.php');
+require_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/protect.inc.php');
 
 // set some settings, and address some IE issues
 @ini_set('url_rewriter.tags', '');
@@ -89,7 +89,7 @@ 
  */
 
 define('IN_PARSER_MODE', true);
-if (! defined('IN_MANAGER_MODE')) {
+if (!defined('IN_MANAGER_MODE')) {
     define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
@@ -97,8 +97,8 @@ 
 }
 
 // get the required includes
-if (!isset($database_user) || $database_user=="") {
-    $rt = @include_once(dirname(__FILE__) . '/' . MGR_DIR . '/includes/config.inc.php');
+if (!isset($database_user) || $database_user == "") {
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
     // Be sure config.inc.php is there and that it contains some important values
     if (!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
         readfile('install/not_installed.tpl');
@@ -114,7 +114,7 @@ 
     $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-    include_once(MODX_MANAGER_PATH . 'includes/document.parser.class.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
     $modx = DocumentParser::getInstance();
 }
 

manager/index.php

Spacing +37 added lines, -37 removed lines

@@ -48,7 +48,7 @@ 
  *          content
  */
 
-$autoloader = realpath(__DIR__ . '/../vendor/autoload.php');
+$autoloader = realpath(__DIR__.'/../vendor/autoload.php');
 if (file_exists($autoloader) && is_readable($autoloader)) {
     include_once($autoloader);
 }
@@ -58,17 +58,17 @@ 
 $mstart = memory_get_usage();
 $self      = str_replace('\\', '/', __FILE__);
 $self_dir  = str_replace('/index.php', '', $self);
-$mgr_dir   = substr($self_dir, strrpos($self_dir, '/')+1);
-$base_path = str_replace($mgr_dir . '/index.php', '', $self);
-$site_mgr_path = $base_path . 'assets/cache/siteManager.php';
+$mgr_dir   = substr($self_dir, strrpos($self_dir, '/') + 1);
+$base_path = str_replace($mgr_dir.'/index.php', '', $self);
+$site_mgr_path = $base_path.'assets/cache/siteManager.php';
 if (is_file($site_mgr_path)) {
     include_once($site_mgr_path);
 }
-$site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
+$site_hostnames_path = $base_path.'assets/cache/siteHostnames.php';
 if (is_file($site_hostnames_path)) {
     include_once($site_hostnames_path);
 }
-if (!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
+if (!defined('MGR_DIR') || MGR_DIR !== $mgr_dir) {
     $src = "<?php\n";
     $src .= "define('MGR_DIR', '{$mgr_dir}');\n";
     $rs = file_put_contents($site_mgr_path, $src);
@@ -77,13 +77,13 @@ 
         exit;
     }
     sleep(1);
-    header('Location:' . $_SERVER['REQUEST_URI']);
+    header('Location:'.$_SERVER['REQUEST_URI']);
     exit;
 }
 
 // we use this to make sure files are accessed through
 // the manager instead of seperately.
-if (! defined('IN_MANAGER_MODE')) {
+if (!defined('IN_MANAGER_MODE')) {
     define('IN_MANAGER_MODE', true);
 }
 
@@ -92,7 +92,7 @@ 
 
 // send anti caching headers
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
@@ -104,7 +104,7 @@ 
 include_once "includes/lang/english.inc.php";
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
-$php_ver_comp =  version_compare(phpversion(), "5.0.0");
+$php_ver_comp = version_compare(phpversion(), "5.0.0");
         // -1 if left is less, 0 if equal, +1 if left is higher
 if ($php_ver_comp < 0) {
     echo sprintf($_lang['php_version_check'], phpversion());
@@ -118,8 +118,8 @@ 
 }
 
 // set some runtime options
-$incPath = str_replace("\\", "/", dirname(__FILE__) . "/includes/"); // Mod by Raymond
-set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
+$incPath = str_replace("\\", "/", dirname(__FILE__)."/includes/"); // Mod by Raymond
+set_include_path(get_include_path().PATH_SEPARATOR.$incPath);
 
 if (!defined('ENT_COMPAT')) {
     define('ENT_COMPAT', 2);
@@ -133,7 +133,7 @@ 
 
 // set the document_root :|
 if (!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) {
-    $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED'])) . "/";
+    $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/";
 }
 
 // include_once config file
@@ -152,7 +152,7 @@ 
     $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof DocumentParser)) {
-    include_once(MODX_MANAGER_PATH . 'includes/document.parser.class.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
     $modx = evolutionCMS();
 }
 
@@ -171,35 +171,35 @@ 
 // Now that session is given get user settings and merge into $modx->config
 $usersettings = $modx->getUserSettings();
 
-$settings =& $modx->config;
+$settings = & $modx->config;
 extract($modx->config, EXTR_OVERWRITE);
 
 // now include_once different language file as english
-if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH . "includes/lang/" . $manager_language . ".inc.php")) {
+if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer)
 
-if ($manager_language!="english" && file_exists(MODX_MANAGER_PATH . "includes/lang/" . $manager_language . ".inc.php")) {
-    include_once "lang/" . $manager_language . ".inc.php";
+if ($manager_language != "english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+    include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
-if (file_exists(MODX_MANAGER_PATH . "includes/lang/override/" . $manager_language . ".inc.php")) {
-    include_once "lang/override/" . $manager_language . ".inc.php";
+if (file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
+    include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
 foreach ($_lang as $k=>$v) {
-    if (strpos($v, '[+')!==false) {
+    if (strpos($v, '[+') !== false) {
         $_lang[$k] = str_replace($s, $r, $v);
     }
 }
 
 // send the charset header
-header('Content-Type: text/html; charset=' . $modx_manager_charset);
+header('Content-Type: text/html; charset='.$modx_manager_charset);
 
 /*
  * include_once "version.inc.php"; //include version info. Use $modx->getVersionData()
@@ -217,11 +217,11 @@ 
 // include_once the style variables file
 if (isset($manager_theme) && !isset($_style)) {
     $_style = array();
-    include_once "media/style/" . $manager_theme . "/style.php";
+    include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
-if (isset($allow_manager_access) && $allow_manager_access==0) {
+if (isset($allow_manager_access) && $allow_manager_access == 0) {
     include_once "manager.lockout.inc.php";
 }
 
@@ -234,8 +234,8 @@ 
 // first we check to see if this is a frameset request
 if (!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
     // this looks to be a top-level frameset request, so let's serve up a frameset
-    if (is_file(MODX_MANAGER_PATH . "media/style/" . $manager_theme . "/frames/1.php")) {
-        include_once "media/style/" . $manager_theme . "/frames/1.php";
+    if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+        include_once "media/style/".$manager_theme."/frames/1.php";
     } else {
         include_once "frames/1.php";
     }
@@ -243,7 +243,7 @@ 
 }
 
 // OK, let's retrieve the action directive from the request
-$option = array('min_range'=>1,'max_range'=>2000);
+$option = array('min_range'=>1, 'max_range'=>2000);
 if (isset($_GET['a']) && isset($_POST['a'])) {
     $modx->webAlertAndQuit($_lang['error_double_action']);
 } elseif (isset($_GET['a'])) {
@@ -262,12 +262,12 @@ 
 $modx->manager->action = $action;
 
 // attempt to foil some simple types of CSRF attacks
-if (isset($modx->config['validate_referer']) && (int)$modx->config['validate_referer']) {
+if (isset($modx->config['validate_referer']) && (int) $modx->config['validate_referer']) {
     if (isset($_SERVER['HTTP_REFERER'])) {
         $referer = $_SERVER['HTTP_REFERER'];
 
         if (!empty($referer)) {
-            if (!preg_match('/^' . preg_quote(MODX_SITE_URL, '/') . '/i', $referer)) {
+            if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
                 $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
             }
         } else {
@@ -285,8 +285,8 @@ 
 function includeFileProcessor($filepath, $manager_theme)
 {
     $element = "";
-    if (is_file(MODX_MANAGER_PATH . "media/style/" . $manager_theme . "/" . $filepath)) {
-        $element = MODX_MANAGER_PATH . "media/style/" . $manager_theme . "/" . $filepath;
+    if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+        $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
     } else {
         $element = $filepath;
     }
@@ -301,10 +301,10 @@ 
     case 1:
         // get the requested frame
         $frame = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['f']);
-        if ($frame>9) {
-            $enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+        if ($frame > 9) {
+            $enable_debug = false; // this is to stop the debug thingy being attached to the framesets
         }
-        include_once(includeFileProcessor("frames/" . $frame . ".php", $manager_theme));
+        include_once(includeFileProcessor("frames/".$frame.".php", $manager_theme));
     break;
 /********************************************************************/
 /* show the homepage                                                */
@@ -992,9 +992,9 @@ 
         // say that what was requested doesn't do anything yet
         include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
         echo "
-			<div class='sectionHeader'>" . $_lang['functionnotimpl'] . "</div>
+			<div class='sectionHeader'>" . $_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
-				<p>" . $_lang['functionnotimpl_message'] . "</p>
+				<p>" . $_lang['functionnotimpl_message']."</p>
 			</div>
 		";
         include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
@@ -1002,7 +1002,7 @@ 
 
 /********************************************************************/
 // log action, unless it's a frame request
-if ($action!=1 && $action!=7 && $action!=2) {
+if ($action != 1 && $action != 7 && $action != 2) {
     include_once "log.class.inc.php";
     $log = new logHandler;
     $log->initAndWriteLog();

manager/frames/nodes.functions.inc.php

Spacing +31 added lines, -31 removed lines

@@ -39,13 +39,13 @@ 
         case 'publishedon':
         case 'pub_date':
         case 'unpub_date':
-            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], 'sc.'.$_SESSION['tree_sortby']);
             break;
         default:
-            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+            $sortby = 'sc.'.$_SESSION['tree_sortby'];
     };
 
-    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+    $orderby = $modx->db->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
     // Folder sorting gets special setup ;) Add menuindex and pagetitle
     if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -59,11 +59,11 @@ 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $showProtected = false;
     if (isset($modx->config['tree_show_protected'])) {
-        $showProtected = (boolean)$modx->config['tree_show_protected'];
+        $showProtected = (boolean) $modx->config['tree_show_protected'];
     }
-    $mgrRole = (isset($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $mgrRole = (isset($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
     if ($showProtected == false) {
-        $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     } else {
         $access = '';
     }
@@ -99,7 +99,7 @@ 
         }
 
         $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : '';
-        $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+        $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
         // Prepare displaying user-locks
         $lockedByUser = '';
@@ -110,7 +110,7 @@ 
                     'element_type' => $_lang["lock_element_type_7"],
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
-                $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
             } else {
                 $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                     'element_type' => $_lang["lock_element_type_7"],
@@ -118,9 +118,9 @@ 
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
                 if ($modx->hasPermission('remove_locks')) {
-                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 } else {
-                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 }
             }
         }
@@ -129,22 +129,22 @@ 
 
         $title = '';
         if (isDateNode($nodeNameSource)) {
-            $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+            $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
         }
-        $title .= $_lang['id'] . ': ' . $row['id'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-        $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-        $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-        $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-        $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-        $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= $_lang['id'].': '.$row['id'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+        $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+        $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+        $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+        $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+        $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
         $title = $modx->htmlspecialchars($title);
-        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+        $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
         $data = array(
             'id' => $row['id'],
@@ -228,7 +228,7 @@ 
             }
 
             if ($ph['contextmenu']) {
-                $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
             }
 
             if ($_SESSION['tree_show_only_folders']) {
@@ -285,7 +285,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -323,7 +323,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -374,7 +374,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -416,7 +416,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -493,7 +493,7 @@ 
                     $nodetitle .= $modx->config['friendly_url_suffix'];
                 }
             }
-            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
             break;
         case 'pagetitle':
             $nodetitle = $row['pagetitle'];
@@ -553,7 +553,7 @@ 
 {
     $modx = evolutionCMS();
 
-    return (int)$modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+    return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
 }
 
 /**

manager/frames/tree.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

@@ -36,19 +36,19 @@ 
 

 		<?php if ($use_browser && $modx->hasPermission('assets_images')) {

         ?>

-			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

+			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

 		<?php

     } ?>

 

 		<?php if ($use_browser && $modx->hasPermission('assets_files')) {

         ?>

-			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

+			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

 		<?php

     } ?>

 

 		<?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) {

         ?>

-			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

+			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

 		<?php

     } ?>

 

manager/frames/mainmenu.php

Spacing +42 added lines, -42 removed lines

@@ -21,7 +21,7 @@ 
 $sitemenu['site'] = array(

     'site',

     'main',

-    '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

+    '<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>',

     'index.php?a=2',

     $_lang['home'],

     '',

@@ -36,7 +36,7 @@ 
     $sitemenu['elements'] = array(

         'elements',

         'main',

-        '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',

+        '<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>',

         'javascript:;',

         $_lang['elements'],

         ' return false;',

@@ -52,7 +52,7 @@ 
     $sitemenu['modules'] = array(

         'modules',

         'main',

-        '<i class="' . $_style['icons_modules'] . '"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

+        '<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>',

         'javascript:;',

         $_lang['modules'],

         ' return false;',

@@ -68,7 +68,7 @@ 
     $sitemenu['users'] = array(

         'users',

         'main',

-        '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',

+        '<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>',

         'javascript:;',

         $_lang['users'],

         ' return false;',

@@ -84,7 +84,7 @@ 
     $sitemenu['tools'] = array(

         'tools',

         'main',

-        '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',

+        '<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>',

         'javascript:;',

         $_lang['tools'],

         ' return false;',

@@ -101,8 +101,8 @@ 
     $sitemenu['element_templates'] = array(

         'element_templates',

         'elements',

-        '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_templates'],

         '',

         'new_template,edit_template',

@@ -116,8 +116,8 @@ 
     $sitemenu['element_tplvars'] = array(

         'element_tplvars',

         'elements',

-        '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['tmplvars'],

         '',

         'new_template,edit_template',

@@ -131,8 +131,8 @@ 
     $sitemenu['element_htmlsnippets'] = array(

         'element_htmlsnippets',

         'elements',

-        '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_htmlsnippets'],

         '',

         'new_chunk,edit_chunk',

@@ -146,8 +146,8 @@ 
     $sitemenu['element_snippets'] = array(

         'element_snippets',

         'elements',

-        '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_snippets'],

         '',

         'new_snippet,edit_snippet',

@@ -161,8 +161,8 @@ 
     $sitemenu['element_plugins'] = array(

         'element_plugins',

         'elements',

-        '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_plugins'],

         '',

         'new_plugin,edit_plugin',

@@ -178,7 +178,7 @@ 
     $sitemenu['manage_files'] = array(

         'manage_files',

         'elements',

-        '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+        '<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],

         'index.php?a=31',

         $_lang['manage_files'],

         '',

@@ -193,7 +193,7 @@ 
     $sitemenu['manage_categories'] = array(

         'manage_categories',

         'elements',

-        '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+        '<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],

         'index.php?a=120',

         $_lang['manage_categories'],

         '',

@@ -210,7 +210,7 @@ 
     $sitemenu['new_module'] = array(

         'new_module',

         'modules',

-        '<i class="' . $_style['icons_modules'] . '"></i>' . $_lang['module_management'],

+        '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],

         'index.php?a=106',

         $_lang['module_management'],

         '',

@@ -225,21 +225,21 @@ 
 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

+				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 {

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

     }

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

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

-            $sitemenu['module' . $row['id']] = array(

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

+            $sitemenu['module'.$row['id']] = array(

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

                 'modules',

-                ($row['icon'] != '' ? '<i class="' . $row['icon'] . '"></i>' : '<i class="' . $_style['icons_module'] . '"></i>') . $row['name'],

-                'index.php?a=112&id=' . $row['id'],

+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],

+                'index.php?a=112&id='.$row['id'],

                 $row['name'],

                 '',

                 '',

@@ -258,7 +258,7 @@ 
     $sitemenu['user_management_title'] = array(

         'user_management_title',

         'users',

-        '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        '<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

         'index.php?a=75',

         $_lang['user_management_title'],

         '',

@@ -274,7 +274,7 @@ 
     $sitemenu['web_user_management_title'] = array(

         'web_user_management_title',

         'users',

-        '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        '<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

         'index.php?a=99',

         $_lang['web_user_management_title'],

         '',

@@ -290,7 +290,7 @@ 
     $sitemenu['role_management_title'] = array(

         'role_management_title',

         'users',

-        '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+        '<i class="fa fa-legal"></i>'.$_lang['role_management_title'],

         'index.php?a=86',

         $_lang['role_management_title'],

         '',

@@ -306,7 +306,7 @@ 
     $sitemenu['manager_permissions'] = array(

         'manager_permissions',

         'users',

-        '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+        '<i class="fa fa-male"></i>'.$_lang['manager_permissions'],

         'index.php?a=40',

         $_lang['manager_permissions'],

         '',

@@ -322,7 +322,7 @@ 
     $sitemenu['web_permissions'] = array(

         'web_permissions',

         'users',

-        '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+        '<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],

         'index.php?a=91',

         $_lang['web_permissions'],

         '',

@@ -339,7 +339,7 @@ 
 $sitemenu['refresh_site'] = array(

     'refresh_site',

     'tools',

-    '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],

+    '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],

     'index.php?a=26',

     $_lang['refresh_site'],

     '',

@@ -353,7 +353,7 @@ 
             'a', // tag

             'javascript:;', // href

             'btn btn-secondary', // class or btn-success

-            'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

+            'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

             $_lang['refresh_site'], // title

             '<i class="fa fa-recycle"></i>' // innerHTML

         )

@@ -363,7 +363,7 @@ 
 $sitemenu['search'] = array(

     'search',

     'tools',

-    '<i class="fa fa-search"></i>' . $_lang['search'],

+    '<i class="fa fa-search"></i>'.$_lang['search'],

     'index.php?a=71',

     $_lang['search'],

     '',

@@ -378,7 +378,7 @@ 
     $sitemenu['bk_manager'] = array(

         'bk_manager',

         'tools',

-        '<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+        '<i class="fa fa-database"></i>'.$_lang['bk_manager'],

         'index.php?a=93',

         $_lang['bk_manager'],

         '',

@@ -394,7 +394,7 @@ 
     $sitemenu['remove_locks'] = array(

         'remove_locks',

         'tools',

-        '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+        '<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],

         'javascript:modx.removeLocks();',

         $_lang['remove_locks'],

         '',

@@ -410,7 +410,7 @@ 
     $sitemenu['import_site'] = array(

         'import_site',

         'tools',

-        '<i class="fa fa-upload"></i>' . $_lang['import_site'],

+        '<i class="fa fa-upload"></i>'.$_lang['import_site'],

         'index.php?a=95',

         $_lang['import_site'],

         '',

@@ -426,7 +426,7 @@ 
     $sitemenu['export_site'] = array(

         'export_site',

         'tools',

-        '<i class="fa fa-download"></i>' . $_lang['export_site'],

+        '<i class="fa fa-download"></i>'.$_lang['export_site'],

         'index.php?a=83',

         $_lang['export_site'],

         '',

@@ -446,15 +446,15 @@ 
             $newmenu = array_merge($newmenu, unserialize($item));

         }

     }

-    if (count($newmenu)> 0) {

+    if (count($newmenu) > 0) {

         $sitemenu = $newmenu;

     }

 }

 

-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');

+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 {

-    include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

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

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

manager/frames/1.php

Spacing +38 added lines, -38 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 header("X-XSS-Protection: 0");

@@ -47,9 +47,9 @@ 
 

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

 if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

-    $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

+    $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];

 } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $navbar_position = $modx->config['manager_menu_position'];

@@ -82,36 +82,36 @@ 
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

-$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;

+$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime;

 

 if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {

+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');

         $css = $minifier->minify();

-        file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);

+        file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css);

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {

+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;

     }

 }

 

-$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));

+$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));

 

 ?>

 <!DOCTYPE html>

-<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>>

+<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>>

 <head>

     <title><?= $site_name ?>- (EVO CMS Manager)</title>

     <meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" />

@@ -144,21 +144,21 @@ 
         MODX_SITE_URL: '<?= MODX_SITE_URL ?>',

         MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>',

         user: {

-          role: <?= (int)$user['role'] ?>,

+          role: <?= (int) $user['role'] ?>,

           username: '<?= $user['username'] ?>'

         },

         config: {

           mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>,

-          menu_height: <?= (int)$menu_height ?>,

-          tree_width: <?= (int)$tree_width ?>,

-          tree_min_width: <?= (int)$tree_min_width ?>,

-          session_timeout: <?= (int)$modx->config['session_timeout'] ?>,

-          site_start: <?= (int)$modx->config['site_start'] ?>,

-          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>,

+          menu_height: <?= (int) $menu_height ?>,

+          tree_width: <?= (int) $tree_width ?>,

+          tree_min_width: <?= (int) $tree_min_width ?>,

+          session_timeout: <?= (int) $modx->config['session_timeout'] ?>,

+          site_start: <?= (int) $modx->config['site_start'] ?>,

+          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>,

           theme: '<?= $modx->config['manager_theme'] ?>',

           theme_mode: '<?= $modx->config['manager_theme_mode'] ?>',

           which_browser: '<?= $user['which_browser'] ?>',

-          layout: <?= (int)$manager_layout ?>,

+          layout: <?= (int) $manager_layout ?>,

           textdir: '<?= $modx_textdir ?>',

           global_tabs: <?= $modx->config['global_tabs'] ?>

 

@@ -243,11 +243,11 @@ 
           delete a[b];

         },

         openedArray: [],

-        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>

+        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE)."\n" ?>

       };

       <?php

       $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

-      echo(empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";

+      echo(empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n		modx.openedArray[", $opened).'] = 1;')."\n";

       ?>

     </script>

     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>

@@ -342,7 +342,7 @@ 
                                 <span class="username"><?= $user['username'] ?></span>

                                 <?php if ($user['photo']) {

         ?>

-                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>

+                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span>

                                 <?php

     } else {

         ?>

@@ -374,7 +374,7 @@ 
                                 $version = 'Evolution';

                                 ?>

                                 <?php

-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);

+                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);

                                 ?>

                             </ul>

                         </li>

@@ -577,7 +577,7 @@ 
      */

     function constructLink($action, $img, $text, $allowed)

     {

-        if ((bool)$allowed) {

+        if ((bool) $allowed) {

             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, $action);

             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

         }

@@ -614,7 +614,7 @@ 
         document.getElementById('treeMenu_openimages').onclick = function(e) {

           e.preventDefault();

           if (modx.config.global_tabs && !e.shiftKey) {

-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});

+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});

           } else {

             var randomNum = '<?= $_lang["files_files"] ?>';

             if (e.shiftKey) {

@@ -634,7 +634,7 @@ 
         document.getElementById('treeMenu_openfiles').onclick = function(e) {

           e.preventDefault();

           if (modx.config.global_tabs && !e.shiftKey) {

-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});

+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});

           } else {

             var randomNum = '<?= $_lang["files_files"] ?>';

             if (e.shiftKey) {

@@ -691,7 +691,7 @@ 
 

 </div>

 <?php if ($modx->config['show_picker'] != "0") {

-        include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

+        include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');

     } ?>

 </body>

 </html>

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

Spacing +10 added lines, -10 removed lines

@@ -19,7 +19,7 @@ 
   *        here, they can be accessed in config.php via $GLOBALS array.
   *        It's recommended to use constants instead.
   */
-include_once(dirname(__FILE__) . "/../../../../../assets/cache/siteManager.php");
+include_once(dirname(__FILE__)."/../../../../../assets/cache/siteManager.php");
 require_once('../../../includes/protect.inc.php');
 include_once('../../../includes/config.inc.php');
 include_once('../../../includes/document.parser.class.inc.php');
@@ -34,15 +34,15 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if (!file_exists("../../../includes/lang/" . $manager_language . ".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
-include_once "../../../includes/lang/" . $manager_language . ".inc.php";
+include_once "../../../includes/lang/".$manager_language.".inc.php";
 $_GET['langCode'] = $modx_lang_attribute;
 
 // PHP VERSION CHECK
 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.");
+    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.");
 }
 
 
@@ -78,7 +78,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -88,14 +88,14 @@ 
 if (!function_exists("json_encode")) {
     function kcfinder_json_string_encode($string)
     {
-        return '"' .
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
     function json_encode($data)
@@ -106,16 +106,16 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val) {
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
                 }
-                return "{" . implode(",", $ret) . "}";
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val) {
                     $ret[] = json_encode($val);
                 }
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
             // BOOLEAN OR NULL

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

Spacing +26 added lines, -27 removed lines

@@ -73,8 +73,8 @@ 
 
     /** Next three properties are got from the current language file
       * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
     /** Contain Specified language labels
@@ -227,7 +227,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         ) {
@@ -247,7 +247,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -293,7 +293,7 @@ 
         foreach ($this->langInputNames as $key) {
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -364,7 +364,7 @@ 
                 }
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -380,11 +380,11 @@ 
                     if (isset($udir)) {
                         $url .= "/$udir";
                     }
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else {
                         $url = path::urlPathEncode($url);
                     }
@@ -412,7 +412,7 @@ 
 
         // Cleaning uploaded filename?
         $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-        if ($modx->db->getValue($setting)>0) {
+        if ($modx->db->getValue($setting) > 0) {
             // Transalias plugin active?
             $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
             if ($properties = $modx->db->getValue($res)) {
@@ -432,7 +432,7 @@ 
         if ($this->getTransaliasSettings()) {
             $format = strrchr($filename, ".");
             $filename = str_replace($format, "", $filename);
-            $filename = $this->modx->stripAlias($filename) . $format;
+            $filename = $this->modx->stripAlias($filename).$format;
         }
         return $filename;
     }
@@ -442,7 +442,7 @@ 
         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;
@@ -484,8 +484,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
         }
 
@@ -527,15 +526,15 @@ 
 
 
         // CHECK FOR MODX MAX FILE SIZE
-        $actualfilesize=filesize($file['tmp_name']);
+        $actualfilesize = filesize($file['tmp_name']);
         if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) {
-            return $this->label("File is too big: " . $actualfilesize . " Bytes. (max " . $this->config['maxfilesize'] . " Bytes)");
+            return $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) == "/") {
@@ -607,7 +606,7 @@ 
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null)
+    protected function imageResize($image, $file = null)
     {
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -702,7 +701,7 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
         }
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
         $type = exif_imagetype($file);
 
@@ -714,11 +713,11 @@ 
                 return $img->output('png', $options);
 
             default:
-                return $img->output('jpeg', array_merge($options, array( 'quality' => $this->config['jpegQuality'] )));
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
     }
 
-    protected function makeThumb($file, $overwrite=true)
+    protected function makeThumb($file, $overwrite = true)
     {
         $img = image::factory($this->imageDriver, $file);
 
@@ -728,7 +727,7 @@ 
         }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
@@ -757,8 +756,8 @@ 
         if ($this->imageDriver == 'gd') {
             $width  = imagesx($img->image);
             $height = imagesy($img->image);
-            $back   = image::factory($this->imageDriver, array( $width, $height ));
-            $tile   = image::factory($this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png');
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
             imagesettile($back->image, $tile->image);
             imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
@@ -790,7 +789,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null)
+    protected function label($string, array $data = null)
     {
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data)) {
@@ -801,7 +800,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null)
+    protected function backMsg($message, array $data = null)
     {
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
@@ -811,7 +810,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="")
+    protected function callBack($url, $message = "")
     {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])

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

Spacing +52 added lines, -52 removed lines

@@ -38,7 +38,7 @@ 
             $this->get['dir'] = $dir;
         }
 
-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];
+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];
         if ((
                 !is_dir($thumbsDir) &&
                 !@mkdir($thumbsDir, $this->config['dirPerms'])
@@ -108,7 +108,7 @@ 
             $this->session['dir'] = $this->type;
         } else {
             $type = $this->getTypeFromPath($this->session['dir']);
-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
+            $dir = $this->config['uploadDir']."/".$this->session['dir'];
             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
                 $this->session['dir'] = $this->type;
             }
@@ -172,7 +172,7 @@ 
         }
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);
             if (!is_file($file) || !is_readable($file)) {
                 $this->sendDefaultThumb($file);
             }
@@ -205,7 +205,7 @@ 
     protected function act_chDir()
     {
         $this->postDir(); // Just for existing check
-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];
+        $this->session['dir'] = $this->type."/".$this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         return json_encode(array(
             'files' => $this->getFiles($this->session['dir']),
@@ -262,12 +262,12 @@ 
         if (substr($newName, 0, 1) == ".") {
             $this->errorMsg("Folder name shouldn't begins with '.'");
         }
-        if (!@rename($dir, dirname($dir) . "/$newName")) {
+        if (!@rename($dir, dirname($dir)."/$newName")) {
             $this->errorMsg("Cannot rename the folder.");
         }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
         if (is_dir($thumbDir)) {
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+            @rename($thumbDir, dirname($thumbDir)."/$newName");
         }
         return json_encode(array('name' => $newName));
     }
@@ -332,7 +332,7 @@ 
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
         ) {
@@ -344,9 +344,9 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');
         header("Content-Transfer-Encoding:­ binary");
-        header("Content-Length: " . filesize($file));
+        header("Content-Length: ".filesize($file));
         readfile($file);
         die;
     }
@@ -357,7 +357,7 @@ 
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
@@ -400,7 +400,7 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
         if (file_exists($thumbFile)) {
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+            @rename($thumbFile, "$thumbDir/".basename($newName));
         }
         return true;
     }
@@ -411,7 +411,7 @@ 
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
@@ -456,11 +456,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!@copy($path, "$dir/$base")) {
@@ -516,11 +516,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
@@ -593,15 +593,15 @@ 
         if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
             $this->errorMsg("Unknown error.");
         }
-        $filename = basename($dir) . ".zip";
+        $filename = basename($dir).".zip";
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -632,7 +632,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -645,8 +645,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -672,7 +672,7 @@ 
             if ($type != $this->type) {
                 continue;
             }
-            $file = $this->config['uploadDir'] . "/$file";
+            $file = $this->config['uploadDir']."/$file";
             if (!is_file($file) || !is_readable($file)) {
                 continue;
             }
@@ -680,7 +680,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -693,8 +693,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -746,23 +746,23 @@ 
         } elseif (
             function_exists("curl_init") &&
             (false !== ($curl = @curl_init($url))) &&
-            (@ob_start()                 ||  (@curl_close($curl) && false)) &&
-            (@curl_exec($curl)           ||  (@curl_close($curl) && false)) &&
-            ((false !== ($ver = @ob_get_clean())) ||  (@curl_close($curl) && false)) &&
-            (@curl_close($curl)          ||  true) &&
+            (@ob_start() || (@curl_close($curl) && false)) &&
+            (@curl_exec($curl) || (@curl_close($curl) && false)) &&
+            ((false !== ($ver = @ob_get_clean())) || (@curl_close($curl) && false)) &&
+            (@curl_close($curl) || true) &&
             preg_match($pattern, $ver)
 
         // Socket extension
         ) {
         } elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
-                "Host: $host\r\n" .
+                "GET $path ".strtoupper($protocol)."/1.1\r\n".
+                "Host: $host\r\n".
                 "Connection: Close\r\n\r\n";
 
             if ((false !== ($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) &&
-                (false !==    @socket_connect($socket, $host, $port)) &&
-                (false !==    @socket_write($socket, $cmd, strlen($cmd))) &&
+                (false !== @socket_connect($socket, $host, $port)) &&
+                (false !== @socket_write($socket, $cmd, strlen($cmd))) &&
                 (false !== ($ver = @socket_read($socket, 2048))) &&
                 preg_match($responsePattern, $ver, $match)
             ) {
@@ -795,14 +795,14 @@ 
         }
 
         $filename = $this->normalizeFilename($file['name']);
-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);
+        $target = "$dir/".file::getInexistantFilename($filename, $dir);
 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&
             !@rename($file['tmp_name'], $target) &&
             !@copy($file['tmp_name'], $target)
         ) {
             @unlink($file['tmp_name']);
-            return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
+            return "{$file['name']}: ".$this->label("Cannot move uploaded file to target folder.");
         } elseif (function_exists('chmod')) {
             chmod($target, $this->config['filePerms']);
         }
@@ -814,10 +814,10 @@ 
 
         $this->makeThumb($target);
 
-        return "/" . basename($target);
+        return "/".basename($target);
     }
 
-    protected function sendDefaultThumb($file=null)
+    protected function sendDefaultThumb($file = null)
     {
         if ($file !== null) {
             $ext = file::getExtension($file);
@@ -844,10 +844,10 @@ 
         foreach ($files as $file) {
             $ext = file::getExtension($file);
             $smallThumb = false;
-            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' ))) {
+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {
                 $size = @getimagesize($file);
                 if (is_array($size) && count($size)) {
-                    $thumb_file = "$thumbDir/" . basename($file);
+                    $thumb_file = "$thumbDir/".basename($file);
                     if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
                         $this->makeThumb($file);
                     }
@@ -863,7 +863,7 @@ 
             }
             $name = basename($file);
             $types = $this->config['types'];
-            $types = explode(' ', $types['images'] . ' ' . $types['image']);
+            $types = explode(' ', $types['images'].' '.$types['image']);
             if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {
                 continue;
             }
@@ -889,7 +889,7 @@ 
         return $return;
     }
 
-    protected function getTree($dir, $index=0)
+    protected function getTree($dir, $index = 0)
     {
         $path = explode("/", $dir);
 
@@ -927,11 +927,11 @@ 
         return $dirs;
     }
 
-    protected function postDir($existent=true)
+    protected function postDir($existent = true)
     {
         $dir = $this->typeDir;
         if (isset($this->post['dir'])) {
-            $dir .= "/" . $this->post['dir'];
+            $dir .= "/".$this->post['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -939,11 +939,11 @@ 
         return $dir;
     }
 
-    protected function getDir($existent=true)
+    protected function getDir($existent = true)
     {
         $dir = $this->typeDir;
         if (isset($this->get['dir'])) {
-            $dir .= "/" . $this->get['dir'];
+            $dir .= "/".$this->get['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -969,7 +969,7 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false)
+    protected function getDirInfo($dir, $removable = false)
     {
         if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) {
             return false;
@@ -1002,7 +1002,7 @@ 
         return $info;
     }
 
-    protected function output($data=null, $template=null)
+    protected function output($data = null, $template = null)
     {
         if (!is_array($data)) {
             $data = array();
@@ -1028,7 +1028,7 @@ 
         return "";
     }
 
-    protected function errorMsg($message, array $data=null)
+    protected function errorMsg($message, array $data = null)
     {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {
             die($this->label($message, $data));