evolution-cms / evolution

manager/includes/functions/helper.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('createGUID')) {
+if (!function_exists('createGUID')) {
     /**
      * create globally unique identifiers (guid)
      *
@@ -8,22 +8,22 @@ 
      */
     function createGUID()
     {
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         $r = rand();
-        $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
+        $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
         $m = md5($u);
 
         return $m;
     }
 }
 
-if(!function_exists('generate_password')) {
+if (!function_exists('generate_password')) {
 // Generate password
     function generate_password($length = 10)
     {
         $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $ps_len = strlen($allowable_characters);
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         $pass = "";
         for ($i = 0; $i < $length; $i++) {
             $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
@@ -33,7 +33,7 @@ 
     }
 }
 
-if (! function_exists('entities')) {
+if (!function_exists('entities')) {
     /**
      * @param  string $string
      * @param  string $charset
@@ -45,7 +45,7 @@ 
     }
 }
 
-if (! function_exists('get_by_key')) {
+if (!function_exists('get_by_key')) {
     /**
      * @param mixed $data
      * @param string|int $key
@@ -59,7 +59,7 @@ 
         if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {
             $out = $data[$key];
         }
-        if (! empty($validate) && is_callable($validate)) {
+        if (!empty($validate) && is_callable($validate)) {
             $out = (($validate($out) === true) ? $out : $default);
         }
         return $out;

manager/includes/src/Database.php

Spacing +32 added lines, -32 removed lines

@@ -33,7 +33,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -73,7 +73,7 @@ 
                         $ua = $modx->getPhpCompat()->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
                         $referer = $modx->getPhpCompat()->htmlspecialchars($_SERVER['HTTP_REFERER']);
                         $modx->sendmail(array(
-                            'subject' => 'Missing to create the database connection! from ' . $modx->getPhpCompat()->entities($modx->config['site_name']),
+                            'subject' => 'Missing to create the database connection! from '.$modx->getPhpCompat()->entities($modx->config['site_name']),
                             'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                             'type'    => 'text'
                         ));
@@ -88,8 +88,8 @@ 
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             $this->conn->set_charset($this->config['charset']);
             $this->isConnected = true;
@@ -122,7 +122,7 @@ 
         if (1000 < $safeCount) {
             exit("Too many loops '{$safeCount}'");
         }
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         if (is_array($s)) {
@@ -148,7 +148,7 @@ 
     public function query($sql, $watchError = true)
     {
         $modx = evolutionCMS();
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         $tStart = $modx->getMicroTime();
@@ -168,7 +168,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -182,24 +182,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totalTime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totalTime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries++;
@@ -306,9 +306,9 @@ 
                     if ($value === null || strtolower($value) === 'null') {
                         $f = 'NULL';
                     } else {
-                        $f = "'" . $value . "'";
+                        $f = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $f;
+                    $fields[$key] = "`{$key}` = ".$f;
                 }
                 $fields = implode(',', $fields);
             }
@@ -343,12 +343,12 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     $fromtable = $this->replaceFullTableName($fromtable);
-                    $fields = "(" . implode(",", array_keys($fields)) . ")";
+                    $fields = "(".implode(",", array_keys($fields)).")";
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -442,8 +442,8 @@ 
      */
     public function getInsertId($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -455,8 +455,8 @@ 
      */
     public function getAffectedRows($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -468,8 +468,8 @@ 
      */
     public function getLastError($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -493,7 +493,7 @@ 
     {
         $out = false;
         if ($ds instanceof mysqli_result) {
-            switch($mode){
+            switch ($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;
@@ -523,7 +523,7 @@ 
     public function getColumn($name, $dsq)
     {
         $col = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -542,7 +542,7 @@ 
     public function getColumnNames($dsq)
     {
         $names = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -562,7 +562,7 @@ 
     public function getValue($dsq)
     {
         $out = false;
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -660,7 +660,7 @@ 
         $tableName = trim($tableName);
         $dbase = trim($this->config['dbase'], '`');
         $prefix = $this->config['table_prefix'];
-        if ((bool)$force === true) {
+        if ((bool) $force === true) {
             $result = "`{$dbase}`.`{$prefix}{$tableName}`";
         } elseif (strpos($tableName, '[+prefix+]') !== false) {
             $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $tableName);

manager/includes/src/Support/MysqlDumper.php

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
 
         // Set line feed
         $lf = "\n";
-        $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php';
+        $tempfile_path = $modx->config['base_path'].'assets/backup/temp.php';
 
         $result = $modx->getDatabase()->query('SHOW TABLES');
         $tables = $this->result2Array(0, $result);
@@ -86,15 +86,15 @@ 
 
         // Set header
         $output = "#{$lf}";
-        $output .= "# " . addslashes($modx->getPhpCompat()->entities($modx->config['site_name'])) . " Database Dump{$lf}";
+        $output .= "# ".addslashes($modx->getPhpCompat()->entities($modx->config['site_name']))." Database Dump{$lf}";
         $output .= "# MODX Version:{$version['version']}{$lf}";
         $output .= "# {$lf}";
         $output .= "# Host: {$this->database_server}{$lf}";
-        $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf;
-        $output .= "# Server version: " . $modx->getDatabase()->getVersion() . $lf;
-        $output .= "# PHP Version: " . phpversion() . $lf;
+        $output .= "# Generation Time: ".$modx->toDateFormat(time()).$lf;
+        $output .= "# Server version: ".$modx->getDatabase()->getVersion().$lf;
+        $output .= "# PHP Version: ".phpversion().$lf;
         $output .= "# Database: `{$this->dbname}`{$lf}";
-        $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}";
+        $output .= "# Description: ".trim($_REQUEST['backup_title'])."{$lf}";
         $output .= "#";
         file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
         $output = '';
@@ -113,7 +113,7 @@ 
                 }
             }
             if ($callBack === 'snapshot') {
-                if (!preg_match('@^' . $modx->getDatabase()->config['table_prefix'] . '@', $tblval)) {
+                if (!preg_match('@^'.$modx->getDatabase()->config['table_prefix'].'@', $tblval)) {
                     continue;
                 }
             }
@@ -150,9 +150,9 @@ 
                         ), '\\n', $value);
                         $value = "'{$value}'";
                     }
-                    $insertdump .= $value . ',';
+                    $insertdump .= $value.',';
                 }
-                $output .= rtrim($insertdump, ',') . ");\n";
+                $output .= rtrim($insertdump, ',').");\n";
                 if (1048576 < strlen($output)) {
                     file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
                     $output = '';

manager/includes/manager.lockout.inc.php

Spacing +32 added lines, -32 removed lines

@@ -1,75 +1,75 @@
 <?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.");
 }
 
-if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if ($modx->getManagerApi()->action != '8' && isset($_SESSION['mgrValidated'])) {
 
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
 
-    $modx->setPlaceholder('modx_charset',$modx_manager_charset);
-    $modx->setPlaceholder('theme',$manager_theme);
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
 
-    $modx->setPlaceholder('site_name',$modx->getPhpCompat()->entities($site_name));
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
+    $modx->setPlaceholder('site_name', $modx->getPhpCompat()->entities($site_name));
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
 
-    $modx->setPlaceholder('home',$_lang["home"]);
-    $modx->setPlaceholder('homeurl',$homeurl);
-    $modx->setPlaceholder('logout',$_lang["logout"]);
-    $modx->setPlaceholder('logouturl',$logouturl);
-    $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
-    $modx->setPlaceholder('year',date('Y'));
+    $modx->setPlaceholder('home', $_lang["home"]);
+    $modx->setPlaceholder('homeurl', $homeurl);
+    $modx->setPlaceholder('logout', $_lang["logout"]);
+    $modx->setPlaceholder('logouturl', $logouturl);
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
+    $modx->setPlaceholder('year', date('Y'));
 
     // load template
-    if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
+    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
     $target = $modx->mergeSettingsContent($target);
 
-    if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
+    if (substr($target, 0, 1) === '@') {
+    	if (substr($target, 0, 6) === '@CHUNK') {
+    		$target = trim(substr($target, 7));
     		$lockout_tpl = $modx->getChunk($target);
     	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
+    	elseif (substr($target, 0, 5) === '@FILE') {
+    		$target = trim(substr($target, 6));
     		$lockout_tpl = file_get_contents($target);
     	}
 	} else {
     	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
+    	if ($chunk !== false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
     	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
+    	elseif (is_file(MODX_BASE_PATH.$target)) {
+    		$target = MODX_BASE_PATH.$target;
     		$lockout_tpl = file_get_contents($target);
     	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
+		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
 	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
     	}
     	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    		$target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
 	}
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
-    $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
 
     echo $lockout_tpl;

manager/actions/mutate_content.dynamic.php

Indentation +371 added lines, -371 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 /********************/
@@ -12,29 +12,29 @@ 
 
 // check permissions
 switch($modx->getManagerApi()->action) {
-	case 27:
-		if(!$modx->hasPermission('edit_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 85:
-	case 72:
-	case 4:
-		if(!$modx->hasPermission('new_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
-			// check user has permissions for parent
-			$udperms = new EvolutionCMS\Legacy\Permissions();
-			$udperms->user = $modx->getLoginUserID();
-			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
-			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
-				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-			}
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 27:
+        if(!$modx->hasPermission('edit_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 85:
+    case 72:
+    case 4:
+        if(!$modx->hasPermission('new_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+            // check user has permissions for parent
+            $udperms = new EvolutionCMS\Legacy\Permissions();
+            $udperms->user = $modx->getLoginUserID();
+            $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
+            $udperms->role = $_SESSION['mgrRole'];
+            if(!$udperms->checkPermissions()) {
+                $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+            }
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -53,21 +53,21 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
 if($modx->getManagerApi()->action == 27) {
-	//editing an existing document
-	// check permissions on the document
-	$udperms = new EvolutionCMS\Legacy\Permissions();
-	$udperms->user = $modx->getLoginUserID();
-	$udperms->document = $id;
-	$udperms->role = $_SESSION['mgrRole'];
-
-	if(!$udperms->checkPermissions()) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
+    //editing an existing document
+    // check permissions on the document
+    $udperms = new EvolutionCMS\Legacy\Permissions();
+    $udperms->user = $modx->getLoginUserID();
+    $udperms->document = $id;
+    $udperms->role = $_SESSION['mgrRole'];
+
+    if(!$udperms->checkPermissions()) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
 }
 
 // check to see if resource isn't locked
 if($lockedEl = $modx->elementIsLocked(7, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
 
@@ -76,74 +76,74 @@ 
 
 // get document groups for current user
 if($_SESSION['mgrDocgroups']) {
-	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
+    $docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
 if(!empty ($id)) {
-	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
-		$access .= " OR dg.document_group IN ({$docgrp})";
-	}
-	$rs = $modx->getDatabase()->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
-	$content = array();
-	$content = $modx->getDatabase()->getRow($rs);
-	$modx->documentObject = &$content;
-	if(!$content) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
-	$_SESSION['itemname'] = $content['pagetitle'];
+    $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
+    if($docgrp) {
+        $access .= " OR dg.document_group IN ({$docgrp})";
+    }
+    $rs = $modx->getDatabase()->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
+    $content = array();
+    $content = $modx->getDatabase()->getRow($rs);
+    $modx->documentObject = &$content;
+    if(!$content) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
+    $_SESSION['itemname'] = $content['pagetitle'];
 } else {
-	$content = array();
+    $content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
-		$content['template'] = $_REQUEST['newtemplate'];
-	} else {
-		$content['template'] = getDefaultTemplate();
-	}
+    if(isset($_REQUEST['newtemplate'])) {
+        $content['template'] = $_REQUEST['newtemplate'];
+    } else {
+        $content['template'] = getDefaultTemplate();
+    }
 
-	$_SESSION['itemname'] = $_lang["new_resource"];
+    $_SESSION['itemname'] = $_lang["new_resource"];
 }
 
 // restore saved form
 $formRestored = $modx->getManagerApi()->loadFormValues();
 if(isset($_REQUEST['newtemplate'])) {
-	$formRestored = true;
+    $formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
 if($formRestored == true) {
-	$content = array_merge($content, $_POST);
-	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
-		unset ($content['pub_date']);
-	} else {
-		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
-	}
-	if(empty ($content['unpub_date'])) {
-		unset ($content['unpub_date']);
-	} else {
-		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
-	}
+    $content = array_merge($content, $_POST);
+    $content['content'] = $_POST['ta'];
+    if(empty ($content['pub_date'])) {
+        unset ($content['pub_date']);
+    } else {
+        $content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
+    }
+    if(empty ($content['unpub_date'])) {
+        unset ($content['unpub_date']);
+    } else {
+        $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
+    }
 }
 
 // increase menu index if this is a new document
 if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
-		$modx->config['auto_menuindex'] = 1;
-	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
-		$rs = $modx->getDatabase()->select('count(*)', $tbl_site_content, "parent='{$pid}'");
-		$content['menuindex'] = $modx->getDatabase()->getValue($rs);
-	} else {
-		$content['menuindex'] = 0;
-	}
+    if(!isset ($modx->config['auto_menuindex'])) {
+        $modx->config['auto_menuindex'] = 1;
+    }
+    if($modx->config['auto_menuindex']) {
+        $pid = (int)$_REQUEST['pid'];
+        $rs = $modx->getDatabase()->select('count(*)', $tbl_site_content, "parent='{$pid}'");
+        $content['menuindex'] = $modx->getDatabase()->getValue($rs);
+    } else {
+        $content['menuindex'] = 0;
+    }
 }
 
 if(isset ($_POST['which_editor'])) {
-	$modx->config['which_editor'] = $_POST['which_editor'];
+    $modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
@@ -543,23 +543,23 @@ 
 
 	<form name="mutate" id="mutate" class="content" method="post" enctype="multipart/form-data" action="index.php" onsubmit="documentDirty=false;">
 		<?php
-		// invoke OnDocFormPrerender event
-		$evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
-			'id' => $id,
-			'template' => $content['template']
-		));
-
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-
-		/*************************/
-		$dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
-		$sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
-		$page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
-		/*************************/
-
-		?>
+        // invoke OnDocFormPrerender event
+        $evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
+            'id' => $id,
+            'template' => $content['template']
+        ));
+
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+
+        /*************************/
+        $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
+        $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
+        $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
+        /*************************/
+
+        ?>
 		<input type="hidden" name="a" value="5" />
 		<input type="hidden" name="id" value="<?= $content['id'] ?>" />
 		<input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>" />
@@ -574,54 +574,54 @@ 
 
 			<h1>
 				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
-				} else {
-				    if ($modx->getManagerApi()->action == '4') {
+                    echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+                } else {
+                    if ($modx->getManagerApi()->action == '4') {
                         echo $_lang['add_resource'];
                     } else if ($modx->getManagerApi()->action == '72') {
                         echo $_lang['add_weblink'];
                     } else {
                         echo $_lang['create_resource_title'];
                     }
-				} ?>
+                } ?>
 			</h1>
 
 			<?= $_style['actionbuttons']['dynamic']['document'] ?>
 
 			<?php
-			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
-				$temp = array();
-				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
-
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
-					$bID = (int) $_REQUEST['id'];
-					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
-					$bID = (int) $_REQUEST['pid'];
-					$temp = $modx->getParentIds($bID);
-					array_unshift($temp, $bID);
-				}
-
-				if($temp) {
-					$parents = implode(',', $temp);
-
-					if(!empty($parents)) {
-						$where = "FIND_IN_SET(id,'{$parents}') DESC";
-						$rs = $modx->getDatabase()->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->getDatabase()->getRow($rs)) {
-							$out .= '<li class="breadcrumbs__li">
+            // breadcrumbs
+            if($modx->config['use_breadcrumbs']) {
+                $temp = array();
+                $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
+
+                if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+                    $bID = (int) $_REQUEST['id'];
+                    $temp = $modx->getParentIds($bID);
+                } else if(isset($_REQUEST['pid'])) {
+                    $bID = (int) $_REQUEST['pid'];
+                    $temp = $modx->getParentIds($bID);
+                    array_unshift($temp, $bID);
+                }
+
+                if($temp) {
+                    $parents = implode(',', $temp);
+
+                    if(!empty($parents)) {
+                        $where = "FIND_IN_SET(id,'{$parents}') DESC";
+                        $rs = $modx->getDatabase()->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
+                        while($row = $modx->getDatabase()->getRow($rs)) {
+                            $out .= '<li class="breadcrumbs__li">
                                 <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
-			}
-			?>
+                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
+                echo '<ul class="breadcrumbs">' . $out . '</ul>';
+            }
+            ?>
 
 			<!-- start main wrapper -->
 			<div class="sectionBody">
@@ -633,13 +633,13 @@ 
 
 					<!-- General -->
 					<?php
-					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
-						'id' => $id
-					));
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					} else {
-						?>
+                    $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
+                        'id' => $id
+                    ));
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    } else {
+                        ?>
 						<div class="tab-page" id="tabGeneral">
 							<h2 class="tab"><?= $_lang['settings_general'] ?></h2>
 							<script type="text/javascript">tpSettings.addTabPage(document.getElementById("tabGeneral"));</script>
@@ -724,36 +724,36 @@ 
 										<select id="template" name="template" class="inputBox" onchange="templateWarning();">
 											<option value="0">(blank)</option>
 											<?php
-											$field = "t.templatename, t.selectable, t.id, c.category";
-											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
-											$rs = $modx->getDatabase()->select($field, $from, '', 'c.category, t.templatename ASC');
-											$currentCategory = '';
-											while($row = $modx->getDatabase()->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
-													continue;
-												};
-												// Skip if not selectable but show if selected!
-												$thisCategory = $row['category'];
-												if($thisCategory == null) {
-													$thisCategory = $_lang["no_category"];
-												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
-														echo "\t\t\t\t\t</optgroup>\n";
-													}
-													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
-													$closeOptGroup = true;
-												}
+                                            $field = "t.templatename, t.selectable, t.id, c.category";
+                                            $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
+                                            $rs = $modx->getDatabase()->select($field, $from, '', 'c.category, t.templatename ASC');
+                                            $currentCategory = '';
+                                            while($row = $modx->getDatabase()->getRow($rs)) {
+                                                if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+                                                    continue;
+                                                };
+                                                // Skip if not selectable but show if selected!
+                                                $thisCategory = $row['category'];
+                                                if($thisCategory == null) {
+                                                    $thisCategory = $_lang["no_category"];
+                                                }
+                                                if($thisCategory != $currentCategory) {
+                                                    if($closeOptGroup) {
+                                                        echo "\t\t\t\t\t</optgroup>\n";
+                                                    }
+                                                    echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
+                                                    $closeOptGroup = true;
+                                                }
 
-												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
+                                                $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
-												$currentCategory = $thisCategory;
-											}
-											if($thisCategory != '') {
-												echo "\t\t\t\t\t</optgroup>\n";
-											}
-											?>
+                                                echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+                                                $currentCategory = $thisCategory;
+                                            }
+                                            if($thisCategory != '') {
+                                                echo "\t\t\t\t\t</optgroup>\n";
+                                            }
+                                            ?>
 										</select>
 									</td>
 								</tr>
@@ -793,37 +793,37 @@ 
 									</td>
 									<td valign="top">
 										<?php
-										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $content['parent'];
-											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_REQUEST['pid'];
-											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_POST['parent'];
-											}
-										} else {
-											$parentname = $site_name;
-											$content['parent'] = 0;
-										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
-											$rs = $modx->getDatabase()->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
-											$parentname = $modx->getDatabase()->getValue($rs);
-											if(!$parentname) {
-												$modx->webAlertAndQuit($_lang["error_no_parent"]);
-											}
-										}
-										?>
+                                        $parentlookup = false;
+                                        if(isset ($_REQUEST['id'])) {
+                                            if($content['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $content['parent'];
+                                            }
+                                        } elseif(isset ($_REQUEST['pid'])) {
+                                            if($_REQUEST['pid'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_REQUEST['pid'];
+                                            }
+                                        } elseif(isset($_POST['parent'])) {
+                                            if($_POST['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_POST['parent'];
+                                            }
+                                        } else {
+                                            $parentname = $site_name;
+                                            $content['parent'] = 0;
+                                        }
+                                        if($parentlookup !== false && is_numeric($parentlookup)) {
+                                            $rs = $modx->getDatabase()->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
+                                            $parentname = $modx->getDatabase()->getValue($rs);
+                                            if(!$parentname) {
+                                                $modx->webAlertAndQuit($_lang["error_no_parent"]);
+                                            }
+                                        }
+                                        ?>
 										<i id="plock" class="<?= $_style["actions_folder"] ?>" onclick="enableParentSelection(!allowParentSelection);"></i>
 										<b><span id="parentName"><?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?> (<?= $modx->getPhpCompat()->entities($parentname) ?>)</span></b>
 										<input type="hidden" name="parent" value="<?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?>" onchange="documentDirty=true;" />
@@ -831,7 +831,7 @@ 
 								</tr>
 								<tr></tr>
 								<?php
-								/*
+                                /*
 								if($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') {
 									?>
 									<tr>
@@ -859,7 +859,7 @@ 
 									</tr>
 									<?php
 								}*/
-								?>
+                                ?>
 
 								<?php if($content['type'] == 'document' || $modx->getManagerApi()->action == '4') { ?>
 									<tr>
@@ -872,36 +872,36 @@ 
 													<select id="which_editor" class="form-control form-control-sm" size="1" name="which_editor" onchange="changeRTE();">
 													<option value="none"><?= $_lang['none'] ?></option>
 														<?php
-														// invoke OnRichTextEditorRegister event
-														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
-																$editor = $evtOut[$i];
-																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
-															}
-														}
-														?>
+                                                        // invoke OnRichTextEditorRegister event
+                                                        $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                                        if(is_array($evtOut)) {
+                                                            for($i = 0; $i < count($evtOut); $i++) {
+                                                                $editor = $evtOut[$i];
+                                                                echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
+                                                            }
+                                                        }
+                                                        ?>
 													</select>
 												</label>
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
-													$htmlContent = $content['content'];
-													?>
+                                                if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
+                                                    $htmlContent = $content['content'];
+                                                    ?>
 													<div class="section-editor clearfix">
 														<textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->getPhpCompat()->htmlspecialchars($htmlContent) ?></textarea>
 													</div>
 													<?php
-													// Richtext-[*content*]
-													$richtexteditorIds = array();
-													$richtexteditorOptions = array();
-													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
-													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
-												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
-												}
-												?>
+                                                    // Richtext-[*content*]
+                                                    $richtexteditorIds = array();
+                                                    $richtexteditorOptions = array();
+                                                    $richtexteditorIds[$modx->config['which_editor']][] = 'ta';
+                                                    $richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
+                                                } else {
+                                                    echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                }
+                                                ?>
 											</div>
 										</td>
 									</tr>
@@ -1208,8 +1208,8 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
-									?>
+                                if($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+                                    ?>
 									<tr>
 										<td>
 											<span class="warning"><?= $_lang['resource_type'] ?></span>
@@ -1231,15 +1231,15 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
-													$content['contentType'] = 'text/html';
-												}
-												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
-												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
-												}
-												?>
+                                                if(!$content['contentType']) {
+                                                    $content['contentType'] = 'text/html';
+                                                }
+                                                $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
+                                                $ct = explode(",", $custom_contenttype);
+                                                for($i = 0; $i < count($ct); $i++) {
+                                                    echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+                                                }
+                                                ?>
 											</select>
 										</td>
 									</tr>
@@ -1262,23 +1262,23 @@ 
 										</td>
 									</tr>
 									<?php
-								} else {
-									if($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
-										// non-admin managers creating or editing a document resource
-										?>
+                                } else {
+                                    if($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
+                                        // non-admin managers creating or editing a document resource
+                                        ?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
 										<input type="hidden" name="type" value="document" />
 										<input type="hidden" name="content_dispo" value="<?= (isset($content['content_dispo']) ? $content['content_dispo'] : '0') ?>" />
 										<?php
-									} else {
-										// non-admin managers creating or editing a reference (weblink) resource
-										?>
+                                    } else {
+                                        // non-admin managers creating or editing a reference (weblink) resource
+                                        ?>
 										<input type="hidden" name="type" value="reference" />
 										<input type="hidden" name="contentType" value="text/html" />
 										<?php
-									}
-								}//if mgrRole
-								?>
+                                    }
+                                }//if mgrRole
+                                ?>
 
 								<tr>
 									<td>
@@ -1361,112 +1361,112 @@ 
                     ?>
 
 						<?php
-					/*******************************
+                    /*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
-						$groupsarray = array();
-						$sql = '';
-
-						$documentId = ($modx->getManagerApi()->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
-							// Load up, the permissions from the parent (if new document) or existing document
-							$rs = $modx->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
-
-							// Load up the current permissions and names
-							$vs = array(
-								$tbl_document_group_names,
-								$tbl_document_groups,
-								$documentId
-							);
-							$from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
-							$rs = $modx->getDatabase()->select('dgn.*, groups.id AS link_id', $from, '', 'name');
-						} else {
-							// Just load up the names, we're starting clean
-							$rs = $modx->getDatabase()->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
-						}
-
-						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
-							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
-						}
+                    if($use_udperms == 1) {
+                        $groupsarray = array();
+                        $sql = '';
+
+                        $documentId = ($modx->getManagerApi()->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
+                        if($documentId > 0) {
+                            // Load up, the permissions from the parent (if new document) or existing document
+                            $rs = $modx->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
+                            while($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+
+                            // Load up the current permissions and names
+                            $vs = array(
+                                $tbl_document_group_names,
+                                $tbl_document_groups,
+                                $documentId
+                            );
+                            $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
+                            $rs = $modx->getDatabase()->select('dgn.*, groups.id AS link_id', $from, '', 'name');
+                        } else {
+                            // Just load up the names, we're starting clean
+                            $rs = $modx->getDatabase()->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
+                        }
+
+                        // retain selected doc groups between post
+                        if(isset($_POST['docgroups'])) {
+                            $groupsarray = array_merge($groupsarray, $_POST['docgroups']);
+                        }
+
+                        $isManager = $modx->hasPermission('access_permissions');
+                        $isWeb = $modx->hasPermission('web_access_permissions');
+
+                        // Setup Basic attributes for each Input box
+                        $inputAttributes = array(
+                            'type' => 'checkbox',
+                            'class' => 'checkbox',
+                            'name' => 'docgroups[]',
+                            'onclick' => 'makePublic(false);',
+                        );
+                        $permissions = array(); // New Permissions array list (this contains the HTML)
+                        $permissions_yes = 0; // count permissions the current mgr user has
+                        $permissions_no = 0; // count permissions the current mgr user doesn't have
+
+                        // Loop through the permissions list
+                        while($row = $modx->getDatabase()->getRow($rs)) {
+
+                            // Create an inputValue pair (group ID and group link (if it exists))
+                            $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
+                            $inputId = 'group-' . $row['id'];
+
+                            $checked = in_array($inputValue, $groupsarray);
+                            if($checked) {
+                                $notPublic = true;
+                            } // Mark as private access (either web or manager)
+
+                            // Skip the access permission if the user doesn't have access...
+                            if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+                                continue;
+                            }
 
-						$isManager = $modx->hasPermission('access_permissions');
-						$isWeb = $modx->hasPermission('web_access_permissions');
-
-						// Setup Basic attributes for each Input box
-						$inputAttributes = array(
-							'type' => 'checkbox',
-							'class' => 'checkbox',
-							'name' => 'docgroups[]',
-							'onclick' => 'makePublic(false);',
-						);
-						$permissions = array(); // New Permissions array list (this contains the HTML)
-						$permissions_yes = 0; // count permissions the current mgr user has
-						$permissions_no = 0; // count permissions the current mgr user doesn't have
-
-						// Loop through the permissions list
-						while($row = $modx->getDatabase()->getRow($rs)) {
-
-							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
-
-							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
-								$notPublic = true;
-							} // Mark as private access (either web or manager)
-
-							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
-								continue;
-							}
-
-							// Setup attributes for this Input box
-							$inputAttributes['id'] = $inputId;
-							$inputAttributes['value'] = $inputValue;
-							if($checked) {
-								$inputAttributes['checked'] = 'checked';
-							} else {
-								unset($inputAttributes['checked']);
-							}
-
-							// Create attribute string list
-							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
-
-							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
-
-							// does user have this permission?
-							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
-							$vs = array(
-								$row['id'],
-								$_SESSION['mgrInternalKey']
-							);
-							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
-							$rsp = $modx->getDatabase()->select('COUNT(mg.id)', $from, $where);
-							$count = $modx->getDatabase()->getValue($rsp);
-							if($count > 0) {
-								++$permissions_yes;
-							} else {
-								++$permissions_no;
-							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
-						}
-						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
-							$permissions = array();
-						}
+                            // Setup attributes for this Input box
+                            $inputAttributes['id'] = $inputId;
+                            $inputAttributes['value'] = $inputValue;
+                            if($checked) {
+                                $inputAttributes['checked'] = 'checked';
+                            } else {
+                                unset($inputAttributes['checked']);
+                            }
 
-						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
-							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
-							}
-							// Output the permissions list...
-							?>
+                            // Create attribute string list
+                            $inputString = array();
+                            foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+
+                            // Make the <input> HTML
+                            $inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+
+                            // does user have this permission?
+                            $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
+                            $vs = array(
+                                $row['id'],
+                                $_SESSION['mgrInternalKey']
+                            );
+                            $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
+                            $rsp = $modx->getDatabase()->select('COUNT(mg.id)', $from, $where);
+                            $count = $modx->getDatabase()->getValue($rsp);
+                            if($count > 0) {
+                                ++$permissions_yes;
+                            } else {
+                                ++$permissions_no;
+                            }
+                            $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+                        }
+                        // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
+                        if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+                            $permissions = array();
+                        }
+
+                        // See if the Access Permissions section is worth displaying...
+                        if(!empty($permissions)) {
+                            // Add the "All Document Groups" item if we have rights in both contexts
+                            if($isManager && $isWeb) {
+                                array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+                            }
+                            // Output the permissions list...
+                            ?>
 							<!-- Access Permissions -->
 							<div class="tab-page" id="tabAccess">
 								<h2 class="tab" id="tab_access_header"><?= $_lang['access_permissions'] ?></h2>
@@ -1500,31 +1500,31 @@ 
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
-						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
-							?>
+                        } // !empty($permissions)
+                        elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+                            ?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
 
-						}
-					}
-					/* End Document Access Permissions *
+                        }
+                    }
+                    /* End Document Access Permissions *
 					 ***********************************/
-					?>
+                    ?>
 
 					<input type="submit" name="save" style="display:none" />
 					<?php
 
-					// invoke OnDocFormRender event
-					$evtOut = $modx->invokeEvent('OnDocFormRender', array(
-						'id' => $id,
-						'template' => $content['template']
-					));
+                    // invoke OnDocFormRender event
+                    $evtOut = $modx->invokeEvent('OnDocFormRender', array(
+                        'id' => $id,
+                        'template' => $content['template']
+                    ));
 
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					}
-					?>
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    }
+                    ?>
 				</div><!--div class="tab-pane" id="documentPane"-->
 			</div><!--div class="sectionBody"-->
 		</fieldset>
@@ -1535,17 +1535,17 @@ 
 	</script>
 <?php
 if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4' || $modx->getManagerApi()->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
-			// invoke OnRichTextEditorInit event
-			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
-				'editor' => $editor,
-				'elements' => $elements,
-				'options' => $richtexteditorOptions[$editor]
-			));
-			if(is_array($evtOut)) {
-				echo implode('', $evtOut);
-			}
-		}
-	}
+    if(is_array($richtexteditorIds)) {
+        foreach($richtexteditorIds as $editor => $elements) {
+            // invoke OnRichTextEditorInit event
+            $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
+                'editor' => $editor,
+                'elements' => $elements,
+                'options' => $richtexteditorOptions[$editor]
+            ));
+            if(is_array($evtOut)) {
+                echo implode('', $evtOut);
+            }
+        }
+    }
 }

manager/actions/mutate_menuindex_sort.dynamic.php

Spacing +11 added lines, -11 removed lines

@@ -1,12 +1,12 @@ 
 <?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.");
 }
 if (!$modx->hasPermission('edit_document') || !$modx->hasPermission('save_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : null;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : null;
 $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0;
 $items = isset($_POST['list']) ? $_POST['list'] : '';
 $ressourcelist = '';
@@ -23,7 +23,7 @@ 
 }
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<div class="text-success" id="updated">' . $_lang['sort_updated'] . '</div>';
+    $updateMsg .= '<div class="text-success" id="updated">'.$_lang['sort_updated'].'</div>';
     if (strlen($items) > 0) {
         $items = explode(';', $items);
         foreach ($items as $key => $value) {
@@ -43,15 +43,15 @@ 
     $tblsc = $modx->getFullTableName('site_content');
     $tbldg = $modx->getFullTableName('document_groups');
 
-    $rs = $modx->getDatabase()->select('pagetitle', $tblsc, 'id=' . $id . '');
+    $rs = $modx->getDatabase()->select('pagetitle', $tblsc, 'id='.$id.'');
     $pagetitle = $modx->getDatabase()->getValue($rs);
 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
-    $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
-    $access = " AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+    $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $access = " AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
 
-    $rs = $modx->getDatabase()->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc . 'AS sc LEFT JOIN ' . $tbldg . ' dg ON dg.document=sc.id', 'sc.parent=' . $id . $access . ' GROUP BY sc.id', 'menuindex ASC');
+    $rs = $modx->getDatabase()->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc.'AS sc LEFT JOIN '.$tbldg.' dg ON dg.document=sc.id', 'sc.parent='.$id.$access.' GROUP BY sc.id', 'menuindex ASC');
 
     if ($modx->getDatabase()->getRecordCount($rs)) {
         $ressourcelist .= '<div class="clearfix"><ul id="sortlist" class="sortableList">';
@@ -60,12 +60,12 @@ 
             $classes .= ($row['hidemenu']) ? ' notInMenuNode ' : ' inMenuNode';
             $classes .= ($row['published']) ? ' publishedNode ' : ' unpublishedNode ';
             $classes = ($row['deleted']) ? ' deletedNode ' : $classes;
-            $icon = $row['isfolder'] ? '<i class="' . $_style['files_folder'] . '"></i> ' : ' <i class="' . $_style['files_page_html'] . '"></i> ';
-            $ressourcelist .= '<li id="item_' . $row['id'] . '" class="' . $classes . '">' . $icon . $row['pagetitle'] . ' <small>(' . $row['id'] . ')</small></li>';
+            $icon = $row['isfolder'] ? '<i class="'.$_style['files_folder'].'"></i> ' : ' <i class="'.$_style['files_page_html'].'"></i> ';
+            $ressourcelist .= '<li id="item_'.$row['id'].'" class="'.$classes.'">'.$icon.$row['pagetitle'].' <small>('.$row['id'].')</small></li>';
         }
         $ressourcelist .= '</ul></div>';
     } else {
-        $updateMsg = '<p class="text-danger">' . $_lang['sort_nochildren'] . '</p>';
+        $updateMsg = '<p class="text-danger">'.$_lang['sort_nochildren'].'</p>';
     }
 }
 
@@ -148,7 +148,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $modx->getPhpCompat()->entities($pagetitle) . '<small>(' . $id . ')</small>' : $_lang['sort_menuindex']) ?>
+    <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $modx->getPhpCompat()->entities($pagetitle).'<small>('.$id.')</small>' : $_lang['sort_menuindex']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/processors/save_settings.processor.php

Indentation +106 added lines, -106 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 $data = $_POST;
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
@@ -11,41 +11,41 @@ 
 
 if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
 {
-	$htaccess        = $modx->config['base_path'] . '.htaccess';
-	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
-	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
-	{
-		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
-		{
-			$warnings[] = $_lang["settings_friendlyurls_alert2"];
-		}
-		elseif(is_writable($htaccess))
-		{
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
-				$warnings[] = $_lang["settings_friendlyurls_alert2"];
-			}
-		}
-	}
-	elseif(is_file($sample_htaccess))
-	{
-		if(!@rename($sample_htaccess,$htaccess))
+    $htaccess        = $modx->config['base_path'] . '.htaccess';
+    $sample_htaccess = $modx->config['base_path'] . 'ht.access';
+    $dir = '/' . trim($modx->config['base_url'],'/');
+    if(is_file($htaccess))
+    {
+        $_ = file_get_contents($htaccess);
+        if(strpos($_,'RewriteBase')===false)
         {
-        	$warnings[] = $_lang["settings_friendlyurls_alert"];
-		}
-		elseif($modx->config['base_url']!=='/')
-		{
-			$_ = file_get_contents($htaccess);
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
-				$warnings[] = $_lang["settings_friendlyurls_alert2"];
-			}
-		}
-	}
+            $warnings[] = $_lang["settings_friendlyurls_alert2"];
+        }
+        elseif(is_writable($htaccess))
+        {
+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+            if(!@file_put_contents($htaccess,$_))
+            {
+                $warnings[] = $_lang["settings_friendlyurls_alert2"];
+            }
+        }
+    }
+    elseif(is_file($sample_htaccess))
+    {
+        if(!@rename($sample_htaccess,$htaccess))
+        {
+            $warnings[] = $_lang["settings_friendlyurls_alert"];
+        }
+        elseif($modx->config['base_url']!=='/')
+        {
+            $_ = file_get_contents($htaccess);
+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+            if(!@file_put_contents($htaccess,$_))
+            {
+                $warnings[] = $_lang["settings_friendlyurls_alert2"];
+            }
+        }
+    }
 }
 
 if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
@@ -56,19 +56,19 @@ 
 $data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);
 
 if (isset($data) && count($data) > 0) {
-	if(isset($data['manager_language'])) {
-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
-		if(is_file($lang_path)) {
-			include($lang_path);
+    if(isset($data['manager_language'])) {
+        $lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
+        if(is_file($lang_path)) {
+            include($lang_path);
             global $modx_lang_attribute;
             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
-		}
-	}
-	$savethese = array();
-	$data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);
-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
-	foreach ($data as $k => $v) {
-		switch ($k) {
+        }
+    }
+    $savethese = array();
+    $data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);
+    $data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
+    foreach ($data as $k => $v) {
+        switch ($k) {
             case 'settings_version':{
                 if($modx->getVersionData('version')!=$data['settings_version']){
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
@@ -76,24 +76,24 @@ 
                 }
                 break;
             }
-			case 'error_page':
-			case 'unauthorized_page':
-			if (trim($v) == '' || !is_numeric($v)) {
-				$v = $data['site_start'];
-			}
-			break;
+            case 'error_page':
+            case 'unauthorized_page':
+            if (trim($v) == '' || !is_numeric($v)) {
+                $v = $data['site_start'];
+            }
+            break;
 
-			case 'lst_custom_contenttype':
-			case 'txt_custom_contenttype':
-				// Skip these
-				$k = '';
-				break;
-			case 'rb_base_dir':
-			case 'rb_base_url':
-			case 'filemanager_path':
-				$v = trim($v);
-				$v = rtrim($v,'/') . '/';
-				break;
+            case 'lst_custom_contenttype':
+            case 'txt_custom_contenttype':
+                // Skip these
+                $k = '';
+                break;
+            case 'rb_base_dir':
+            case 'rb_base_url':
+            case 'filemanager_path':
+                $v = trim($v);
+                $v = rtrim($v,'/') . '/';
+                break;
             case 'manager_language':
                 $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');
                 $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');
@@ -101,56 +101,56 @@ 
                 if($langDir !== $langFileDir || !file_exists($langFile)) {
                     $v = 'english';
                 }
-				break;
-			case 'smtppw':
-				if ($v !== '********************' && $v !== '') {
-					$v = trim($v);
-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
-					$v = str_replace('=','%',$v);
-				} elseif ($v === '********************') {
-					$k = '';
-				}
-				break;
+                break;
+            case 'smtppw':
+                if ($v !== '********************' && $v !== '') {
+                    $v = trim($v);
+                    $v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
+                    $v = str_replace('=','%',$v);
+                } elseif ($v === '********************') {
+                    $k = '';
+                }
+                break;
             case 'valid_hostnames':
-				$v = str_replace(array(' ,', ', '), ',', $v);
-				if ($v !== ',') {
-					$v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
-					$configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
-					@file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
-				}
-				$k = '';
-				break;
-			case 'session_timeout':
-				$mail_check_timeperiod = $data['mail_check_timeperiod'];
-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
-				break;
-			default:
-			break;
-		}
-		$v = is_array($v) ? implode(",", $v) : $v;
+                $v = str_replace(array(' ,', ', '), ',', $v);
+                if ($v !== ',') {
+                    $v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
+                    $configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
+                    @file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
+                }
+                $k = '';
+                break;
+            case 'session_timeout':
+                $mail_check_timeperiod = $data['mail_check_timeperiod'];
+                $v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
+                break;
+            default:
+            break;
+        }
+        $v = is_array($v) ? implode(",", $v) : $v;
 
-		$modx->config[$k] = $v;
+        $modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
-	}
+        if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
+    }
 
-	// Run a single query to save all the values
-	$sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value)
+    // Run a single query to save all the values
+    $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value)
 		VALUES ".implode(', ', $savethese);
-	$modx->getDatabase()->query($sql);
+    $modx->getDatabase()->query($sql);
 
-	// Reset Template Pages
-	if (isset($data['reset_template'])) {
-		$newtemplate = (int)$data['default_template'];
-		$oldtemplate = (int)$data['old_template'];
-		$tbl = $modx->getFullTableName('site_content');
-		$reset = $data['reset_template'];
-		if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
-	}
+    // Reset Template Pages
+    if (isset($data['reset_template'])) {
+        $newtemplate = (int)$data['default_template'];
+        $oldtemplate = (int)$data['old_template'];
+        $tbl = $modx->getFullTableName('site_content');
+        $reset = $data['reset_template'];
+        if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
+        else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+    }
 
-	// empty cache
-	$modx->clearCache('full');
+    // empty cache
+    $modx->clearCache('full');
 }
 $header="Location: index.php?a=7&r=10";
 header($header);

Spacing +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('settings')) {
+if (!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 $data = $_POST;
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
 unset($_POST);
 
-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
+if ($data['friendly_urls'] === '1' && strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') === false)
 {
-	$htaccess        = $modx->config['base_path'] . '.htaccess';
-	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
-	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
+	$htaccess        = $modx->config['base_path'].'.htaccess';
+	$sample_htaccess = $modx->config['base_path'].'ht.access';
+	$dir = '/'.trim($modx->config['base_url'], '/');
+	if (is_file($htaccess))
 	{
 		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
+		if (strpos($_, 'RewriteBase') === false)
 		{
 			$warnings[] = $_lang["settings_friendlyurls_alert2"];
 		}
-		elseif(is_writable($htaccess))
+		elseif (is_writable($htaccess))
 		{
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
+			$_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_);
+			if (!@file_put_contents($htaccess, $_))
 			{
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
 	}
-	elseif(is_file($sample_htaccess))
+	elseif (is_file($sample_htaccess))
 	{
-		if(!@rename($sample_htaccess,$htaccess))
+		if (!@rename($sample_htaccess, $htaccess))
         {
         	$warnings[] = $_lang["settings_friendlyurls_alert"];
 		}
-		elseif($modx->config['base_url']!=='/')
+		elseif ($modx->config['base_url'] !== '/')
 		{
 			$_ = file_get_contents($htaccess);
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
+			$_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_);
+			if (!@file_put_contents($htaccess, $_))
 			{
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
@@ -48,17 +48,17 @@ 
 	}
 }
 
-if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
-    unlink(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css');
+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
+    unlink(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css');
 }
 
-$data['filemanager_path'] = str_replace('[(base_path)]',MODX_BASE_PATH,$data['filemanager_path']);
-$data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);
+$data['filemanager_path'] = str_replace('[(base_path)]', MODX_BASE_PATH, $data['filemanager_path']);
+$data['rb_base_dir']      = str_replace('[(base_path)]', MODX_BASE_PATH, $data['rb_base_dir']);
 
 if (isset($data) && count($data) > 0) {
-	if(isset($data['manager_language'])) {
-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
-		if(is_file($lang_path)) {
+	if (isset($data['manager_language'])) {
+		$lang_path = MODX_MANAGER_PATH.'includes/lang/'.$data['manager_language'].'.inc.php';
+		if (is_file($lang_path)) {
 			include($lang_path);
             global $modx_lang_attribute;
             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
@@ -66,12 +66,12 @@ 
 	}
 	$savethese = array();
 	$data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);
-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
+	$data['mail_check_timeperiod'] = (int) $data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
 	foreach ($data as $k => $v) {
 		switch ($k) {
             case 'settings_version':{
-                if($modx->getVersionData('version')!=$data['settings_version']){
-                    $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
+                if ($modx->getVersionData('version') != $data['settings_version']) {
+                    $modx->logEvent(17, 2, '<pre>'.var_export($data['settings_version'], true).'</pre>', 'fake settings_version');
                     $v = $modx->getVersionData('version');
                 }
                 break;
@@ -92,21 +92,21 @@ 
 			case 'rb_base_url':
 			case 'filemanager_path':
 				$v = trim($v);
-				$v = rtrim($v,'/') . '/';
+				$v = rtrim($v, '/').'/';
 				break;
             case 'manager_language':
-                $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');
-                $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');
+                $langDir = realpath(MODX_MANAGER_PATH.'includes/lang');
+                $langFile = realpath(MODX_MANAGER_PATH.'includes/lang/'.$v.'.inc.php');
                 $langFileDir = dirname($langFile);
-                if($langDir !== $langFileDir || !file_exists($langFile)) {
+                if ($langDir !== $langFileDir || !file_exists($langFile)) {
                     $v = 'english';
                 }
 				break;
 			case 'smtppw':
 				if ($v !== '********************' && $v !== '') {
 					$v = trim($v);
-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
-					$v = str_replace('=','%',$v);
+					$v = base64_encode($v).substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
+					$v = str_replace('=', '%', $v);
 				} elseif ($v === '********************') {
 					$k = '';
 				}
@@ -115,14 +115,14 @@ 
 				$v = str_replace(array(' ,', ', '), ',', $v);
 				if ($v !== ',') {
 					$v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
-					$configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
-					@file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
+					$configString = '<?php'."\n".'define(\'MODX_SITE_HOSTNAMES\', \''.$v.'\');'."\n";
+					@file_put_contents(MODX_BASE_PATH.'assets/cache/siteHostnames.php', $configString);
 				}
 				$k = '';
 				break;
 			case 'session_timeout':
 				$mail_check_timeperiod = $data['mail_check_timeperiod'];
-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
+				$v = (int) $v < ($data['mail_check_timeperiod'] / 60 + 1) ? ($data['mail_check_timeperiod'] / 60 + 1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
 				break;
 			default:
 			break;
@@ -131,7 +131,7 @@ 
 
 		$modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
+		if (!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
 	}
 
 	// Run a single query to save all the values
@@ -141,16 +141,16 @@ 
 
 	// Reset Template Pages
 	if (isset($data['reset_template'])) {
-		$newtemplate = (int)$data['default_template'];
-		$oldtemplate = (int)$data['old_template'];
+		$newtemplate = (int) $data['default_template'];
+		$oldtemplate = (int) $data['old_template'];
 		$tbl = $modx->getFullTableName('site_content');
 		$reset = $data['reset_template'];
-		if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		if ($reset == 1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
+		else if ($reset == 2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
 	}
 
 	// empty cache
 	$modx->clearCache('full');
 }
-$header="Location: index.php?a=7&r=10";
+$header = "Location: index.php?a=7&r=10";
 header($header);

manager/frames/tree.php

Indentation +15 added lines, -15 removed lines

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

 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.");

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

 }

 

 // invoke OnManagerTreeInit event

 $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

 if(is_array($evtOut)) {

-	echo implode("\n", $evtOut);

+    echo implode("\n", $evtOut);

 }

 ?>

 

@@ -52,23 +52,23 @@ 
 

 	<div id="treeHolder">

 		<?php

-		// invoke OnManagerTreePrerender event

-		$evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));

-		if(is_array($evtOut)) {

-			echo implode("\n", $evtOut);

-		}

-		?>

+        // invoke OnManagerTreePrerender event

+        $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));

+        if(is_array($evtOut)) {

+            echo implode("\n", $evtOut);

+        }

+        ?>

 		<div id="node0" class="rootNode"><a class="node" onclick="modx.tree.treeAction(event, 0)" data-id="0" data-title-esc="<?php $site_name = $modx->getPhpCompat()->entities($site_name);

-			echo $site_name; ?>"><span class="icon"><?php echo $_style['tree_showtree']; ?></span><span class="title"><?php echo $site_name; ?></span></a>

+            echo $site_name; ?>"><span class="icon"><?php echo $_style['tree_showtree']; ?></span><span class="title"><?php echo $site_name; ?></span></a>

 			<div id="treeloader"><i class="fa fa-cog fa-spin fa-3x fa-fw"></i></div>

 		</div>

 		<div id="treeRoot"></div>

 		<?php

-		// invoke OnManagerTreeRender event

-		$evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));

-		if(is_array($evtOut)) {

-			echo implode("\n", $evtOut);

-		}

-		?>

+        // invoke OnManagerTreeRender event

+        $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));

+        if(is_array($evtOut)) {

+            echo implode("\n", $evtOut);

+        }

+        ?>

 	</div>

 </div>

manager/frames/1.php

Spacing +42 added lines, -42 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><?= $modx->getPhpCompat()->entities($site_name) ?>- (EVO CMS Manager)</title>

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

@@ -142,21 +142,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'] ?>

 

@@ -241,11 +241,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>

@@ -327,7 +327,7 @@ 
                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">

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

                                     <span class="icon"><?= $_style['menu_user'] ?></span>

                                 <?php } ?>

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

                                 ?>

                                 <?php

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

                                 ?>

                             </ul>

                         </li>

@@ -506,7 +506,7 @@ 
     </div>

 

     <?php

-    if(!function_exists('constructLink')) {

+    if (!function_exists('constructLink')) {

         /**

          * @param string $action

          * @param string $img

@@ -515,7 +515,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);

@@ -556,7 +556,7 @@ 
     <script type="text/javascript">

 

       if (document.getElementById('treeMenu')) {

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

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

 

         document.getElementById('treeMenu_openelements').onclick = function(e) {

           e.preventDefault();

@@ -574,12 +574,12 @@ 
           }

         };

           <?php } ?>

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

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

 

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

@@ -592,12 +592,12 @@ 
           }

         };

           <?php } ?>

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

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

 

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

@@ -651,7 +651,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>