evolution-cms / evolution

manager/processors/export_site.processor.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if(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('export_static')) {
+if (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('export_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,15 +10,15 @@ 
 $modx->loadExtension('EXPORT_SITE');
 
 
-if(is_dir(MODX_BASE_PATH . 'temp'))       $export_dir = MODX_BASE_PATH . 'temp/export';
-elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export';
+if (is_dir(MODX_BASE_PATH.'temp'))       $export_dir = MODX_BASE_PATH.'temp/export';
+elseif (is_dir(MODX_BASE_PATH.'assets')) $export_dir = MODX_BASE_PATH.'assets/export';
 $modx->export->targetDir = $export_dir;
 
-if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
+if (strpos($modx->config['base_path'], "{$export_dir}/") === 0 && 0 <= strlen(str_replace("{$export_dir}/", '', $modx->config['base_path'])))
 	return $_lang['export_site.static.php6'];
-elseif($modx->config['rb_base_dir'] === $export_dir . '/')
-	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
-elseif(!is_writable($export_dir))
+elseif ($modx->config['rb_base_dir'] === $export_dir.'/')
+	return $modx->parsePlaceholder($_lang['export_site.static.php7'], 'rb_base_url='.$modx->config['base_url'].$modx->config['rb_base_url']);
+elseif (!is_writable($export_dir))
 	return $_lang['export_site_target_unwritable'];
 
 $modx->export->generate_mode = $_POST['generate_mode'];
@@ -31,10 +31,10 @@ 
 $repl_after      = $_POST['repl_after'];
 $includenoncache = $_POST['includenoncache'];
 
-if($ignore_ids!==$_POST['ignore_ids']
- ||$includenoncache!==$_POST['includenoncache']
- ||$repl_before!==$_POST['repl_before']
- ||$repl_after !==$_POST['repl_after']) {
+if ($ignore_ids !== $_POST['ignore_ids']
+ ||$includenoncache !== $_POST['includenoncache']
+ ||$repl_before !== $_POST['repl_before']
+ ||$repl_after !== $_POST['repl_after']) {
 	$modx->clearCache('full');
 }
 
@@ -50,5 +50,5 @@ 
 
 $exportend = $modx->export->get_mtime();
 $totaltime = ($exportend - $modx->export->exportstart);
-$output .= sprintf ('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
+$output .= sprintf('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
 return $output;

manager/processors/send_message.processor.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if(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('messages')) {
+if (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('messages')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -8,13 +8,13 @@ 
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->db->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if ($subject == "") $subject = "(no subject)";
 $message = $modx->db->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if ($message == "") $message = "(no message)";
 $postdate = time();
 
-if($sendto=='u') {
-	if($userid==0) {
+if ($sendto == 'u') {
+	if ($userid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
 	}
 	$modx->db->insert(
@@ -29,12 +29,12 @@ 
 		), $modx->getFullTableName('user_messages'));
 }
 
-if($sendto=='g') {
-	if($groupid==0) {
+if ($sendto == 'g') {
+	if ($groupid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_group_selected"]);
 	}
 	$rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$modx->db->insert(
 			array(
 				'recipient' => $row['internalKey'],
@@ -49,9 +49,9 @@ 
 }
 
 
-if($sendto=='a') {
+if ($sendto == 'a') {
 	$rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$modx->db->insert(
 			array(
 				'recipient' => $row['id'],

manager/processors/login.processor.php

Spacing +60 added lines, -60 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit('error');
 }
-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
-include_once(__DIR__ . '/../../index.php');
+include_once(__DIR__.'/../../index.php');
 $modx->db->connect();
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 
-$core_path = MODX_MANAGER_PATH . 'includes/';
+$core_path = MODX_MANAGER_PATH.'includes/';
 // include_once the language file
 $_lang = array();
 include_once("{$core_path}lang/english.inc.php");
 
-if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
+if ($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
 	include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
@@ -25,7 +25,7 @@ 
 include_once("{$core_path}log.class.inc.php");
 
 // Initialize System Alert Message Queque
-if(!isset($_SESSION['SystemAlertMsgQueque'])) {
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
 	$_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
@@ -51,7 +51,7 @@ 
 $rs = $modx->db->select($fields, $from, $where);
 $limit = $modx->db->getRecordCount($rs);
 
-if($limit == 0 || $limit > 1) {
+if ($limit == 0 || $limit > 1) {
 	jsAlert($_lang['login_processor_unknown_user']);
 	return;
 }
@@ -73,32 +73,32 @@ 
 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 	extract($row);
 	${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
-if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
+	if ($cip = getenv("HTTP_CLIENT_IP")) {
 		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+	} elseif ($cip = getenv("HTTP_X_FORWARDED_FOR")) {
 		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
+	} elseif ($cip = getenv("REMOTE_ADDR")) {
 		$ip = $cip;
 	} else {
 		$ip = "UNKNOWN";
 	}
 	$log = new logHandler;
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: ".$ip);
 	jsAlert($_lang['login_processor_many_failed_logins']);
 	return;
 }
 
 // blocked due to number of login errors, but get to try again
-if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
 	$fields = array();
 	$fields['failedlogincount'] = '0';
 	$fields['blockeduntil'] = time() - 1;
@@ -106,7 +106,7 @@ 
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
-if($blocked == '1') {
+if ($blocked == '1') {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked1']);
@@ -114,7 +114,7 @@ 
 }
 
 // blockuntil: this user has a block until date
-if($blockeduntildate > time()) {
+if ($blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked2']);
@@ -122,7 +122,7 @@ 
 }
 
 // blockafter: this user has a block after date
-if($blockedafterdate > 0 && $blockedafterdate < time()) {
+if ($blockedafterdate > 0 && $blockedafterdate < time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked3']);
@@ -130,24 +130,24 @@ 
 }
 
 // allowed ip
-if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+if ($allowed_ip) {
+	if (($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+		if (gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
 			jsAlert($_lang['login_processor_remotehost_ip']);
 			return;
 		}
 	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+	if (!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
 		jsAlert($_lang['login_processor_remote_ip']);
 		return;
 	}
 }
 
 // allowed days
-if($allowed_days) {
+if ($allowed_days) {
 	$date = getdate();
 	$day = $date['wday'] + 1;
-	if(strpos($allowed_days, $day) === false) {
+	if (strpos($allowed_days, $day) === false) {
 		jsAlert($_lang['login_processor_date']);
 		return;
 	}
@@ -164,33 +164,33 @@ 
 
 // check if plugin authenticated the user
 $matchPassword = false;
-if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
+if (!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
 	// check user password - local authentication
 	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
+	if ($hashType == 'phpass') {
 		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
+	} elseif ($hashType == 'md5') {
 		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
+	} elseif ($hashType == 'v1') {
 		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
 	} else {
 		$matchPassword = false;
 	}
-} else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
+} else if ($rt === true || (is_array($rt) && in_array(true, $rt))) {
 	$matchPassword = true;
 }
 
-if(!$matchPassword) {
+if (!$matchPassword) {
 	jsAlert($_lang['login_processor_wrong_password']);
 	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 	return;
 }
 
-if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
+if ($modx->config['use_captcha'] == 1) {
+	if (!isset ($_SESSION['veriword'])) {
 		jsAlert($_lang['login_processor_captcha_config']);
 		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
+	} elseif ($_SESSION['veriword'] != $captcha_code) {
 		jsAlert($_lang['login_processor_bad_code']);
 		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 		return;
@@ -218,17 +218,17 @@ 
 $_SESSION['mgrPermissions'] = $modx->db->getRow($rs);
 
 // successful login so reset fail count and update key values
-$modx->db->update('failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+$modx->db->update('failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
 // get user's document groups
 $i = 0;
-$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups') . ' ug
-		INNER JOIN ' . $modx->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
+$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups').' ug
+		INNER JOIN ' . $modx->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
 $_SESSION['mgrDocgroups'] = $modx->db->getColumn('documentgroup', $rs);
 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
-if($rememberme == '1') {
+if ($rememberme == '1') {
 	$_SESSION['modx.mgr.session.cookie.lifetime'] = intval($modx->config['session.cookie.lifetime']);
 
 	// Set a cookie separate from the session cookie with the username in it. 
@@ -236,7 +236,7 @@ 
 	global $https_port;
 
 	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
+	if (version_compare(PHP_VERSION, '5.2', '<')) {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
 	} else {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
@@ -251,9 +251,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
-if(!$activeSession) {
+if (!$activeSession) {
 	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
+	if ($lastHit = $modx->db->getValue($rs)) {
 		$_SESSION['show_logout_reminder'] = array(
 			'type' => 'logout_reminder',
 			'lastHit' => $lastHit
@@ -275,16 +275,16 @@ 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
 $id = intval($modx->db->getValue($rs));
-if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
+if ($id > 0) {
+	$header = 'Location: '.$modx->makeUrl($id, '', '', 'full');
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
 	}
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
+	$header = 'Location: '.MODX_MANAGER_URL;
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
@@ -292,35 +292,35 @@ 
 }
 
 // show javascript alert
-function jsAlert($msg) {
+function jsAlert($msg){
 	global $modx;
-	if($_POST['ajax'] != 1) {
-		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+	if ($_POST['ajax'] != 1) {
+		echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
 	} else {
-		echo $msg . "\n";
+		echo $msg."\n";
 	}
 }
 
-function login($username, $givenPassword, $dbasePassword) {
+function login($username, $givenPassword, $dbasePassword){
 	global $modx;
 	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
 
-function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginV1($internalKey, $givenPassword, $dbasePassword, $username){
 	global $modx;
 
 	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
 
-	if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
+	if (!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
 		$modx->config['pwd_hash_algo'] = 'UNCRYPT';
 	}
 
-	if($user_algo !== $modx->config['pwd_hash_algo']) {
+	if ($user_algo !== $modx->config['pwd_hash_algo']) {
 		$bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
 		$modx->config['pwd_hash_algo'] = $user_algo;
 	}
 
-	if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
+	if ($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
 		return false;
 	}
 
@@ -329,17 +329,17 @@ 
 	return true;
 }
 
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username){
 	global $modx;
 
-	if($dbasePassword != md5($givenPassword)) {
+	if ($dbasePassword != md5($givenPassword)) {
 		return false;
 	}
 	updateNewHash($username, $givenPassword);
 	return true;
 }
 
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password){
 	global $modx;
 
 	$field = array();
@@ -347,23 +347,23 @@ 
 	$modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'");
 }
 
-function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
+function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes){
 	global $modx;
 
 	$failedlogins += 1;
 
 	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+	if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
 	{
 		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
 	}
 
 	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
-	if($failedlogins < $failed_allowed) {
+	if ($failedlogins < $failed_allowed) {
 		//sleep to help prevent brute force attacks
 		$sleep = (int) $failedlogins / 2;
-		if($sleep > 5) {
+		if ($sleep > 5) {
 			$sleep = 5;
 		}
 		sleep($sleep);

manager/frames/nodes.functions.inc.php

Spacing +107 added lines, -107 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(IN_MANAGER_MODE != 'true') {
+if (IN_MANAGER_MODE != 'true') {
 	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
@@ -10,7 +10,7 @@ 
  * @param $theme
  * @param string $hereid
  */
-function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
+function makeHTML($indent, $parent, $expandAll, $theme, $hereid = ''){
 	global $modx;
 	global $icons, $iconsPrivate, $_style;
 	global $_lang, $opened, $opened2, $closed2; //added global vars
@@ -21,35 +21,35 @@ 
 	// setup spacer
 	$level = 0;
 	$spacer = '<span class="indent">';
-	for($i = 2; $i <= $indent; $i++) {
+	for ($i = 2; $i <= $indent; $i++) {
 		$spacer .= '<i></i>';
 		$level++;
 	}
 	$spacer .= '</span>';
 
 	// manage order-by
-	if(!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) {
+	if (!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) {
 		// This is the first startup, set default sort order
 		$_SESSION['tree_sortby'] = 'menuindex';
 		$_SESSION['tree_sortdir'] = 'ASC';
 	}
 
-	switch($_SESSION['tree_sortby']) {
+	switch ($_SESSION['tree_sortby']) {
 		case 'createdon':
 		case 'editedon':
 		case 'publishedon':
 		case 'pub_date':
 		case 'unpub_date':
-			$sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+			$sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], 'sc.'.$_SESSION['tree_sortby']);
 			break;
 		default:
-			$sortby = 'sc.' . $_SESSION['tree_sortby'];
+			$sortby = 'sc.'.$_SESSION['tree_sortby'];
 	};
 
-	$orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+	$orderby = $modx->db->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
 	// Folder sorting gets special setup ;) Add menuindex and pagetitle
-	if($_SESSION['tree_sortby'] == 'isfolder') {
+	if ($_SESSION['tree_sortby'] == 'isfolder') {
 		$orderby .= ', menuindex ASC, pagetitle';
 	}
 
@@ -59,12 +59,12 @@ 
 	// get document groups for current user
 	$docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
 	$showProtected = false;
-	if(isset ($modx->config['tree_show_protected'])) {
+	if (isset ($modx->config['tree_show_protected'])) {
 		$showProtected = (boolean) $modx->config['tree_show_protected'];
 	}
 	$mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
-	if($showProtected == false) {
-		$access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+	if ($showProtected == false) {
+		$access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
 	} else {
 		$access = '';
 	}
@@ -74,13 +74,13 @@ 
 	$from = "{$tblsc} AS sc LEFT JOIN {$tbldg} dg on dg.document = sc.id LEFT JOIN {$tblst} st on st.id = sc.template";
 	$where = "(parent={$parent}) {$access} GROUP BY sc.id";
 	$result = $modx->db->select($field, $from, $where, $orderby);
-	if($modx->db->getRecordCount($result) == 0) {
+	if ($modx->db->getRecordCount($result) == 0) {
 		$output .= sprintf('<div><a class="empty">%s%s&nbsp;<span class="empty">%s</span></a></div>', $spacer, $_style['tree_deletedpage'], $_lang['empty_folder']);
 	}
 
 	$nodeNameSource = $_SESSION['tree_nodename'] == 'default' ? $modx->config['resource_tree_node_name'] : $_SESSION['tree_nodename'];
 
-	while($row = $modx->db->getRow($result)) {
+	while ($row = $modx->db->getRow($result)) {
 		$node = '';
 
 		$nodetitle = getNodeTitle($nodeNameSource, $row);
@@ -89,46 +89,46 @@ 
 		$treeNodeClass = 'node';
 		$treeNodeClass .= $row['hasAccess'] == 0 ? ' protected' : '';
 
-		if($row['deleted'] == 1) {
+		if ($row['deleted'] == 1) {
 			$treeNodeClass .= ' deleted';
 			//$nodetitleDisplay = sprintf('<span class="deletedNode">%s</span>', $nodetitle);
-		} elseif($row['published'] == 0) {
+		} elseif ($row['published'] == 0) {
 			$treeNodeClass .= ' unpublished';
 			//$nodetitleDisplay = sprintf('<span class="unpublishedNode">%s</span>', $nodetitle);
-		} elseif($row['hidemenu'] == 1) {
+		} elseif ($row['hidemenu'] == 1) {
 			$treeNodeClass .= ' hidemenu';
 			//$nodetitleDisplay = sprintf('<span class="notInMenuNode%s">%s</span>', $protectedClass, $nodetitle);
 		} else {
 			//$nodetitleDisplay = sprintf('<span class="publishedNode%s">%s</span>', $protectedClass, $nodetitle);
 		}
 
-		if($row['id'] == $hereid) {
+		if ($row['id'] == $hereid) {
 			$treeNodeClass .= ' current';
 		}
 
 		$weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
-		$pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+		$pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
 		// Prepare displaying user-locks
 		$lockedByUser = '';
 		$rowLock = $modx->elementIsLocked(7, $row['id'], true);
-		if($rowLock && $modx->hasPermission('display_locks')) {
-			if($rowLock['sid'] == $modx->sid) {
+		if ($rowLock && $modx->hasPermission('display_locks')) {
+			if ($rowLock['sid'] == $modx->sid) {
 				$title = $modx->parseText($_lang["lock_element_editing"], array(
 					'element_type' => $_lang["lock_element_type_7"],
 					'lasthit_df' => $rowLock['lasthit_df']
 				));
-				$lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+				$lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
 			} else {
 				$title = $modx->parseText($_lang["lock_element_locked_by"], array(
 					'element_type' => $_lang["lock_element_type_7"],
 					'username' => $rowLock['username'],
 					'lasthit_df' => $rowLock['lasthit_df']
 				));
-				if($modx->hasPermission('remove_locks')) {
-					$lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+				if ($modx->hasPermission('remove_locks')) {
+					$lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
 				} else {
-					$lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+					$lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
 				}
 			}
 		}
@@ -136,23 +136,23 @@ 
 		$url = $modx->makeUrl($row['id']);
 
 		$title = '';
-		if(isDateNode($nodeNameSource)) {
-			$title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+		if (isDateNode($nodeNameSource)) {
+			$title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
 		}
-		$title .= $_lang['id'] . ': ' . $row['id'];
-		$title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-		$title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-		$title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-		$title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-		$title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-		$title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-		$title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-		$title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-		$title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-		$title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-		$title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+		$title .= $_lang['id'].': '.$row['id'];
+		$title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+		$title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+		$title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+		$title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+		$title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+		$title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+		$title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+		$title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+		$title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+		$title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+		$title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
 		$title = $modx->htmlspecialchars($title);
-		$title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+		$title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
 		$data = array(
 			'id' => $row['id'],
@@ -201,9 +201,9 @@ 
 		$ph['expandAll'] = $expandAll;
 		$ph['isPrivate'] = ($row['privateweb'] || $row['privatemgr']) ? 1 : 0;
 
-		if(!$row['isfolder']) {
+		if (!$row['isfolder']) {
 			$tpl = getTplSingleNode();
-			switch($row['id']) {
+			switch ($row['id']) {
 				case $modx->config['site_start']            :
 					$icon = $_style['tree_page_home'];
 					break;
@@ -217,7 +217,7 @@ 
 					$icon = $_style['tree_page_info'];
 					break;
 				default:
-					if(isset($icons[$row['contentType']])) {
+					if (isset($icons[$row['contentType']])) {
 						$icon = $icons[$row['contentType']];
 					} else {
 						$icon = $_style['tree_page'];
@@ -227,20 +227,20 @@ 
 
 			// invoke OnManagerNodePrerender event
 			$prenode = $modx->invokeEvent("OnManagerNodePrerender", array('ph' => $ph));
-			if(is_array($prenode)) {
+			if (is_array($prenode)) {
 				$phnew = array();
-				foreach($prenode as $pnode) {
+				foreach ($prenode as $pnode) {
 					$phnew = array_merge($phnew, unserialize($pnode));
 				}
 				$ph = (count($phnew) > 0) ? $phnew : $ph;
 			}
 
-			if($ph['contextmenu']) {
-				$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+			if ($ph['contextmenu']) {
+				$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 			}
 
-			if($_SESSION['tree_show_only_folders']) {
-				if($row['parent'] == 0) {
+			if ($_SESSION['tree_show_only_folders']) {
+				if ($row['parent'] == 0) {
 					$node .= $modx->parseText($tpl, $ph);
 				} else {
 					$node .= '';
@@ -253,15 +253,15 @@ 
 			$ph['icon_folder_open'] = $_style['tree_folderopen_new'];
 			$ph['icon_folder_close'] = $_style['tree_folder_new'];
 
-			if($_SESSION['tree_show_only_folders']) {
+			if ($_SESSION['tree_show_only_folders']) {
 				$tpl = getTplFolderNodeNotChildren();
 				$checkFolders = checkIsFolder($row['id'], 1) ? 1 : 0; // folders
 				$checkDocs = checkIsFolder($row['id'], 0) ? 1 : 0; // no folders
 				$ph['tree_page_click'] = 3;
 
 				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
+				if ($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+					if ($expandAll == 1) {
 						$opened2[] = $row['id'];
 					}
 					$ph['icon'] = $ph['icon_folder_open'];
@@ -269,11 +269,11 @@ 
 					$ph['node_toggle'] = 1;
 					$ph['subMenuState'] = ' open';
 
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+					if (($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
 						$ph['showChildren'] = 1;
 						$ph['icon_node_toggle'] = '';
 						$ph['icon'] = $ph['icon_folder_close'];
-					} elseif(!$checkDocs && $checkFolders) {
+					} elseif (!$checkDocs && $checkFolders) {
 						$ph['showChildren'] = 0;
 						$ph['openFolder'] = 2;
 					} else {
@@ -285,20 +285,20 @@ 
 						'ph' => $ph,
 						'opened' => '1'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
-					if($checkFolders) {
+					if ($checkFolders) {
 						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
 					}
 					$node .= '</div></div>';
@@ -308,10 +308,10 @@ 
 					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
 					$ph['node_toggle'] = 0;
 
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+					if (($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
 						$ph['showChildren'] = 1;
 						$ph['icon_node_toggle'] = '';
-					} elseif(!$checkDocs && $checkFolders) {
+					} elseif (!$checkDocs && $checkFolders) {
 						$ph['showChildren'] = 0;
 						$ph['openFolder'] = 2;
 					} else {
@@ -323,16 +323,16 @@ 
 						'ph' => $ph,
 						'opened' => '0'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
@@ -341,8 +341,8 @@ 
 			} else {
 				$tpl = getTplFolderNode();
 				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
+				if ($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+					if ($expandAll == 1) {
 						$opened2[] = $row['id'];
 					}
 					$ph['icon'] = $ph['icon_folder_open'];
@@ -350,7 +350,7 @@ 
 					$ph['node_toggle'] = 1;
 					$ph['subMenuState'] = ' open';
 
-					if($ph['donthit'] == 1) {
+					if ($ph['donthit'] == 1) {
 						$ph['tree_page_click'] = 3;
 						$ph['icon_node_toggle'] = '';
 						$ph['icon'] = $ph['icon_folder_close'];
@@ -362,32 +362,32 @@ 
 						'ph' => $ph,
 						'opened' => '1'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
-						if($ph['showChildren'] == 0) {
+						if ($ph['showChildren'] == 0) {
 							unset($opened2[$row['id']]);
 							$ph['node_toggle'] = 0;
 							$ph['subMenuState'] = '';
 						}
 					}
 
-					if($ph['showChildren'] == 0) {
+					if ($ph['showChildren'] == 0) {
 						$ph['icon_node_toggle'] = '';
 						$ph['donthit'] = 1;
 						$ph['icon'] = $ph['icon_folder_close'];
 						$tpl = getTplFolderNodeNotChildren();
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
-					if($ph['donthit'] == 0) {
+					if ($ph['donthit'] == 0) {
 						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
 					}
 					$node .= '</div></div>';
@@ -397,7 +397,7 @@ 
 					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
 					$ph['node_toggle'] = 0;
 
-					if($ph['donthit'] == 1) {
+					if ($ph['donthit'] == 1) {
 						$ph['tree_page_click'] = 3;
 						$ph['icon_node_toggle'] = '';
 						$ph['icon'] = $ph['icon_folder_close'];
@@ -409,23 +409,23 @@ 
 						'ph' => $ph,
 						'opened' => '0'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
 					}
 
-					if($ph['showChildren'] == 0) {
+					if ($ph['showChildren'] == 0) {
 						$ph['icon_node_toggle'] = '';
 						$ph['donthit'] = 1;
 						$ph['icon'] = $ph['icon_folder_close'];
 						$tpl = getTplFolderNodeNotChildren();
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
@@ -437,10 +437,10 @@ 
 		// invoke OnManagerNodeRender event
 		$data['node'] = $node;
 		$evtOut = $modx->invokeEvent('OnManagerNodeRender', $data);
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			$evtOut = implode("\n", $evtOut);
 		}
-		if($evtOut != '') {
+		if ($evtOut != '') {
 			$node = trim($evtOut);
 		}
 
@@ -450,14 +450,14 @@ 
 	return $output;
 }
 
-function getIconInfo($_style) {
-	if(!isset($_style['tree_page_gif'])) {
+function getIconInfo($_style){
+	if (!isset($_style['tree_page_gif'])) {
 		$_style['tree_page_gif'] = $_style['tree_page'];
 	}
-	if(!isset($_style['tree_page_jpg'])) {
+	if (!isset($_style['tree_page_jpg'])) {
 		$_style['tree_page_jpg'] = $_style['tree_page'];
 	}
-	if(!isset($_style['tree_page_png'])) {
+	if (!isset($_style['tree_page_png'])) {
 		$_style['tree_page_png'] = $_style['tree_page'];
 	}
 	$icons = array(
@@ -477,14 +477,14 @@ 
 	return $icons;
 }
 
-function getPrivateIconInfo($_style) {
-	if(!isset($_style['tree_page_gif_secure'])) {
+function getPrivateIconInfo($_style){
+	if (!isset($_style['tree_page_gif_secure'])) {
 		$_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
 	}
-	if(!isset($_style['tree_page_jpg_secure'])) {
+	if (!isset($_style['tree_page_jpg_secure'])) {
 		$_style['tree_page_jpg_secure'] = $_style['tree_page_secure'];
 	}
-	if(!isset($_style['tree_page_png_secure'])) {
+	if (!isset($_style['tree_page_png_secure'])) {
 		$_style['tree_page_png_secure'] = $_style['tree_page_secure'];
 	}
 	$iconsPrivate = array(
@@ -504,21 +504,21 @@ 
 	return $iconsPrivate;
 }
 
-function getNodeTitle($nodeNameSource, $row) {
+function getNodeTitle($nodeNameSource, $row){
 	global $modx;
 
-	switch($nodeNameSource) {
+	switch ($nodeNameSource) {
 		case 'menutitle':
 			$nodetitle = $row['menutitle'] ? $row['menutitle'] : $row['pagetitle'];
 			break;
 		case 'alias':
 			$nodetitle = $row['alias'] ? $row['alias'] : $row['id'];
-			if(strpos($row['alias'], '.') === false) {
-				if($row['isfolder'] != 1 || $modx->config['make_folders'] != 1) {
+			if (strpos($row['alias'], '.') === false) {
+				if ($row['isfolder'] != 1 || $modx->config['make_folders'] != 1) {
 					$nodetitle .= $modx->config['friendly_url_suffix'];
 				}
 			}
-			$nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+			$nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
 			break;
 		case 'pagetitle':
 			$nodetitle = $row['pagetitle'];
@@ -533,7 +533,7 @@ 
 		case 'unpub_date':
 			$doc = $modx->getDocumentObject('id', $row['id']);
 			$date = $doc[$nodeNameSource];
-			if(!empty($date)) {
+			if (!empty($date)) {
 				$nodetitle = $modx->toDateFormat($date);
 			} else {
 				$nodetitle = '- - -';
@@ -550,8 +550,8 @@ 
 	return $nodetitle;
 }
 
-function isDateNode($nodeNameSource) {
-	switch($nodeNameSource) {
+function isDateNode($nodeNameSource){
+	switch ($nodeNameSource) {
 		case 'createdon':
 		case 'editedon':
 		case 'publishedon':
@@ -563,13 +563,13 @@ 
 	}
 }
 
-function checkIsFolder($parent = 0, $isfolder = 1) {
+function checkIsFolder($parent = 0, $isfolder = 1){
 	global $modx;
 
-	return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+	return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
 }
 
-function _htmlentities($array) {
+function _htmlentities($array){
 	global $modx;
 
 	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
@@ -578,7 +578,7 @@ 
 	return $array;
 }
 
-function getTplSingleNode() {
+function getTplSingleNode(){
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -602,7 +602,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a></div>';
 }
 
-function getTplFolderNode() {
+function getTplFolderNode(){
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -638,7 +638,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function getTplFolderNodeNotChildren() {
+function getTplFolderNodeNotChildren(){
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -670,11 +670,11 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function dbug($str, $flag = false) {
+function dbug($str, $flag = false){
 	print('<pre>');
 	print_r($str);
 	print('</pre>');
-	if($flag) {
+	if ($flag) {
 		exit;
 	}
 }

manager/frames/nodes.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $parent = intval($_REQUEST['parent']);
 $expandAll = intval($_REQUEST['expandAll']);
 $output = '';
-$theme = $manager_theme . "/";
+$theme = $manager_theme."/";
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 
 if (isset($_REQUEST['showonlyfolders'])) {

manager/frames/1.php

Spacing +38 added lines, -38 removed lines

@@ -47,7 +47,7 @@ 
 }

 

 if (isset($_COOKIE['MODX_themeColor'])) {

-    $body_class .= ' ' . $_COOKIE['MODX_themeColor'];

+    $body_class .= ' '.$_COOKIE['MODX_themeColor'];

 }

 

 if (isset($modx->pluginCache['ElementsInTree'])) {

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

 }

 

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

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

 

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

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

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

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

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

         $minifier = new Formatter\CSSMinify();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

         $css = $minifier->minify();

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

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

     }

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

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

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

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

     }

 }

 

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

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

 

 ?>

 <!DOCTYPE html>

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

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

 <head>

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

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

@@ -135,20 +135,20 @@ 
         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'] ?>',

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

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

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

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

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

 

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

@@ -366,7 +366,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 } ?>

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

                                 ?>

                                 <?php

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

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

                                 ?>

                             </ul>

                         </li>

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

@@ -550,12 +550,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) {

@@ -568,12 +568,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) {

@@ -627,7 +627,7 @@ 
 

 </div>

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

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

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

 } ?>

 </body>

 </html>

manager/frames/mainmenu.php

Spacing +69 added lines, -69 removed lines

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

 	'site',

 	'main',

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

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

 	'index.php?a=2',

 	$_lang['home'],

 	'',

@@ -32,11 +32,11 @@ 
 	'active'

 );

 

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

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

 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

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

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

 		'javascript:;',

 		$_lang['elements'],

 		' return false;',

@@ -48,11 +48,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

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

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

 		'javascript:;',

 		$_lang['modules'],

 		' return false;',

@@ -64,11 +64,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['users'] = array(

 		'users',

 		'main',

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

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

 		'javascript:;',

 		$_lang['users'],

 		' return false;',

@@ -80,11 +80,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

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

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

 		'javascript:;',

 		$_lang['tools'],

 		' return false;',

@@ -97,12 +97,12 @@ 
 }

 

 $tab = 0;

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

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

 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

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

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

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

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

 		$_lang['manage_templates'],

 		'',

 		'new_template,edit_template',

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

 	);

 }

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

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

 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

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

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

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

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

 		$_lang['tmplvars'],

 		'',

 		'new_template,edit_template',

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

 	);

 }

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

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

 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

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

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

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

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

 		$_lang['manage_htmlsnippets'],

 		'',

 		'new_chunk,edit_chunk',

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

 	);

 }

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

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

 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

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

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

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

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

 		$_lang['manage_snippets'],

 		'',

 		'new_snippet,edit_snippet',

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

 	);

 }

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

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

 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

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

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

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

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

 		$_lang['manage_plugins'],

 		'',

 		'new_plugin,edit_plugin',

@@ -174,11 +174,11 @@ 
 }

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

 

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

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

 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

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

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

 		'index.php?a=31',

 		$_lang['manage_files'],

 		'',

@@ -189,11 +189,11 @@ 
 		''

 	);

 }

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

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

 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

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

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

 		'index.php?a=120',

 		$_lang['manage_categories'],

 		'',

@@ -206,11 +206,11 @@ 
 }

 

 // Modules Menu Items

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

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

 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

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

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

 		'index.php?a=106',

 		$_lang['module_management'],

 		'',

@@ -222,24 +222,24 @@ 
 	);

 }

 

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

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

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

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

 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

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

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

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

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

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

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

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

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

                 ORDER BY sm.name');

 	} else {

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

 	}

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

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

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

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

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

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

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

                 'modules',

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

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

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

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

                 $row['name'],

                 '',

                 '',

@@ -254,11 +254,11 @@ 
 

 // security menu items (users)

 

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

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

 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

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

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

 		'index.php?a=75',

 		$_lang['user_management_title'],

 		'',

@@ -270,11 +270,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

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

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

 		'index.php?a=99',

 		$_lang['web_user_management_title'],

 		'',

@@ -286,11 +286,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

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

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

 		'index.php?a=86',

 		$_lang['role_management_title'],

 		'',

@@ -302,11 +302,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

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

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

 		'index.php?a=40',

 		$_lang['manager_permissions'],

 		'',

@@ -318,11 +318,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

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

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

 		'index.php?a=91',

 		$_lang['web_permissions'],

 		'',

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

     'refresh_site',

     'tools',

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

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

     'index.php?a=26',

     $_lang['refresh_site'],

     '',

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

             'javascript:;', // href

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

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

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

             $_lang['refresh_site'], // title

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

         )

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

 	'search',

 	'tools',

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

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

 	'index.php?a=71',

 	$_lang['search'],

 	'',

@@ -374,11 +374,11 @@ 
 	''

 );

 

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

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

 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

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

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

 		'index.php?a=93',

 		$_lang['bk_manager'],

 		'',

@@ -390,11 +390,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

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

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

 		'javascript:modx.removeLocks();',

 		$_lang['remove_locks'],

 		'',

@@ -406,11 +406,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

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

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

 		'index.php?a=95',

 		$_lang['import_site'],

 		'',

@@ -422,11 +422,11 @@ 
 	);

 }

 

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

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

 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

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

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

 		'index.php?a=83',

 		$_lang['export_site'],

 		'',

@@ -439,20 +439,20 @@ 
 }

 

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

-if(is_array($menu)) {

+if (is_array($menu)) {

 	$newmenu = array();

-	foreach($menu as $item){

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

+	foreach ($menu as $item) {

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

 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

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

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

 }

 

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

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

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

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

 } else {

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

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

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

manager/frames/tree.php

Spacing +13 added lines, -13 removed lines

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

-if(IN_MANAGER_MODE != "true") {

+if (IN_MANAGER_MODE != "true") {

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

+if (is_array($evtOut)) {

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

 }

 ?>

@@ -17,7 +17,7 @@ 
 

 		<a class="treeButton" id="treeMenu_collapsetree" onclick="modx.tree.collapseTree();" title="<?php echo $_lang['collapse_tree']; ?>"><?php echo $_style['collapse_tree']; ?></a>

 

-		<?php if($modx->hasPermission('new_document')) { ?>

+		<?php if ($modx->hasPermission('new_document')) { ?>

 			<a class="treeButton" id="treeMenu_addresource" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=4', title: '<?php echo $_lang['add_resource']; ?>'});" title="<?php echo $_lang['add_resource']; ?>"><?php echo $_style['add_doc_tree']; ?></a>

 			<a class="treeButton" id="treeMenu_addweblink" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=72', title: '<?php echo $_lang['add_weblink']; ?>'});" title="<?php echo $_lang['add_weblink']; ?>"><?php echo $_style['add_weblink_tree']; ?></a>

 		<?php } ?>

@@ -26,23 +26,23 @@ 
 

 		<a class="treeButton" id="treeMenu_sortingtree" onclick="modx.tree.showSorter(event);" title="<?php echo $_lang['sort_tree']; ?>"><?php echo $_style['sort_tree']; ?></a>

 

-		<?php if($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { ?>

+		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { ?>

 			<a class="treeButton" id="treeMenu_sortingindex" onclick="modx.tabs({url: '<?= MODX_MANAGER_URL ?>?a=56&id=0', title: '<?php echo $_lang['sort_menuindex']; ?>'});" title="<?php echo $_lang['sort_menuindex']; ?>"><?php echo $_style['sort_menuindex']; ?></a>

 		<?php } ?>

 

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

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

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

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

 		<?php } ?>

 

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

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

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

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

 		<?php } ?>

 

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

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

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

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

 		<?php } ?>

 

-		<?php if($modx->hasPermission('empty_trash')) { ?>

+		<?php if ($modx->hasPermission('empty_trash')) { ?>

 			<a class="treeButton treeButtonDisabled" id="treeMenu_emptytrash" title="<?php echo $_lang['empty_recycle_bin_empty']; ?>"><?php echo $_style['empty_recycle_bin_empty']; ?></a>

 		<?php } ?>

 

@@ -54,7 +54,7 @@ 
 		<?php

 		// invoke OnManagerTreePrerender event

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

-		if(is_array($evtOut)) {

+		if (is_array($evtOut)) {

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

 		}

 		?>

@@ -66,7 +66,7 @@ 
 		<?php

 		// invoke OnManagerTreeRender event

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

-		if(is_array($evtOut)) {

+		if (is_array($evtOut)) {

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

 		}

 		?>

manager/media/calendar/datepicker.inc.php

Spacing +4 added lines, -4 removed lines

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

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER{

+	function __construct(){

 	}

 

-	function getDP() {

+	function getDP(){

 		global $modx, $_lang;

 

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

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

 		return $modx->parseText($tpl, $_lang, '[%', '%]');

 	}

 }