evolution-cms / evolution

manager/processors/delete_eventlog.processor.php

Indentation +7 added lines, -7 removed lines

@@ -1,17 +1,17 @@
 <?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('delete_eventlog')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 if (isset($_GET['cls']) && $_GET['cls']==1) {
-	$where = '';
+    $where = '';
 } else {
-	$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-	if($id==0) {
-		$modx->webAlertAndQuit($_lang["error_no_id"]);
-	}
-	$where = "id='{$id}'";
+    $id = isset($_GET['id'])? intval($_GET['id']) : 0;
+    if($id==0) {
+        $modx->webAlertAndQuit($_lang["error_no_id"]);
+    }
+    $where = "id='{$id}'";
 }
 
 // delete event log

manager/processors/export_site.processor.php

Indentation +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?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')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $maxtime = (is_numeric($_POST['maxtime'])) ? $_POST['maxtime'] : 30;
@@ -15,11 +15,11 @@ 
 $modx->export->targetDir = $export_dir;
 
 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'];
+    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']);
+    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'];
+    return $_lang['export_site_target_unwritable'];
 
 $modx->export->generate_mode = $_POST['generate_mode'];
 
@@ -35,7 +35,7 @@ 
  ||$includenoncache!==$_POST['includenoncache']
  ||$repl_before!==$_POST['repl_before']
  ||$repl_after !==$_POST['repl_after']) {
-	$modx->clearCache('full');
+    $modx->clearCache('full');
 }
 
 $total = $modx->export->getTotal($_POST['ignore_ids'], $modx->config['export_includenoncache']);

manager/processors/send_message.processor.php

Indentation +43 added lines, -43 removed lines

@@ -1,7 +1,7 @@ 
 <?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')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $sendto = $_REQUEST['sendto'];
@@ -14,55 +14,55 @@ 
 $postdate = time();
 
 if($sendto=='u') {
-	if($userid==0) {
-		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
-	}
-	$modx->db->insert(
-		array(
-			'recipient' => $userid,
-			'sender'    => $modx->getLoginUserID(),
-			'subject'   => $subject,
-			'message'   => $message,
-			'postdate'  => $postdate,
-			'type'      => 'Message',
-			'private'   => 1,
-		), $modx->getFullTableName('user_messages'));
+    if($userid==0) {
+        $modx->webAlertAndQuit($_lang["error_no_user_selected"]);
+    }
+    $modx->db->insert(
+        array(
+            'recipient' => $userid,
+            'sender'    => $modx->getLoginUserID(),
+            'subject'   => $subject,
+            'message'   => $message,
+            'postdate'  => $postdate,
+            'type'      => 'Message',
+            'private'   => 1,
+        ), $modx->getFullTableName('user_messages'));
 }
 
 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)) {
-		$modx->db->insert(
-			array(
-				'recipient' => $row['internalKey'],
-				'sender'    => $modx->getLoginUserID(),
-				'subject'   => $subject,
-				'message'   => $message,
-				'postdate'  => $postdate,
-				'type'      => 'Message',
-				'private'   => 0,
-			), $modx->getFullTableName('user_messages'));
-	}
+    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)) {
+        $modx->db->insert(
+            array(
+                'recipient' => $row['internalKey'],
+                'sender'    => $modx->getLoginUserID(),
+                'subject'   => $subject,
+                'message'   => $message,
+                'postdate'  => $postdate,
+                'type'      => 'Message',
+                'private'   => 0,
+            ), $modx->getFullTableName('user_messages'));
+    }
 }
 
 
 if($sendto=='a') {
-	$rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
-		$modx->db->insert(
-			array(
-				'recipient' => $row['id'],
-				'sender'    => $modx->getLoginUserID(),
-				'subject'   => $subject,
-				'message'   => $message,
-				'postdate'  => $postdate,
-				'type'      => 'Message',
-				'private'   => 0,
-			), $modx->getFullTableName('user_messages'));
-	}
+    $rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
+    while ($row=$modx->db->getRow($rs)) {
+        $modx->db->insert(
+            array(
+                'recipient' => $row['id'],
+                'sender'    => $modx->getLoginUserID(),
+                'subject'   => $subject,
+                'message'   => $message,
+                'postdate'  => $postdate,
+                'type'      => 'Message',
+                'private'   => 0,
+            ), $modx->getFullTableName('user_messages'));
+    }
 }
 
 $header = "Location: index.php?a=10";

manager/processors/login.processor.php

Indentation +182 added lines, -182 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit('error');
+    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('MODX_API_MODE', true);
@@ -18,7 +18,7 @@ 
 include_once("{$core_path}lang/english.inc.php");
 
 if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
-	include_once("{$core_path}lang/{$manager_language}.inc.php");
+    include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
 // include the logger
@@ -26,7 +26,7 @@ 
 
 // Initialize System Alert Message Queque
 if(!isset($_SESSION['SystemAlertMsgQueque'])) {
-	$_SESSION['SystemAlertMsgQueque'] = array();
+    $_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
@@ -41,10 +41,10 @@ 
 
 // invoke OnBeforeManagerLogin event
 $modx->invokeEvent('OnBeforeManagerLogin', array(
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 $fields = 'mu.*, ua.*';
 $from = '[+prefix+]manager_users AS mu, [+prefix+]user_attributes AS ua';
 $where = "BINARY mu.username='{$username}' and ua.internalKey=mu.id";
@@ -52,8 +52,8 @@ 
 $limit = $modx->db->getRecordCount($rs);
 
 if($limit == 0 || $limit > 1) {
-	jsAlert($_lang['login_processor_unknown_user']);
-	return;
+    jsAlert($_lang['login_processor_unknown_user']);
+    return;
 }
 
 $row = $modx->db->getRow($rs);
@@ -74,127 +74,127 @@ 
 // 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)) {
-	extract($row);
-	${$setting_name} = $setting_value;
+    extract($row);
+    ${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
 if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
-		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
-		$ip = $cip;
-	} 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);
-	jsAlert($_lang['login_processor_many_failed_logins']);
-	return;
+    @session_destroy();
+    session_unset();
+    if($cip = getenv("HTTP_CLIENT_IP")) {
+        $ip = $cip;
+    } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+        $ip = $cip;
+    } 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);
+    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()) {
-	$fields = array();
-	$fields['failedlogincount'] = '0';
-	$fields['blockeduntil'] = time() - 1;
-	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+    $fields = array();
+    $fields['failedlogincount'] = '0';
+    $fields['blockeduntil'] = time() - 1;
+    $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
 if($blocked == '1') {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked1']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked1']);
+    return;
 }
 
 // blockuntil: this user has a block until date
 if($blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked2']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked2']);
+    return;
 }
 
 // blockafter: this user has a block after date
 if($blockedafterdate > 0 && $blockedafterdate < time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked3']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked3']);
+    return;
 }
 
 // allowed ip
 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))))) {
-		jsAlert($_lang['login_processor_remote_ip']);
-		return;
-	}
+    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))))) {
+        jsAlert($_lang['login_processor_remote_ip']);
+        return;
+    }
 }
 
 // allowed days
 if($allowed_days) {
-	$date = getdate();
-	$day = $date['wday'] + 1;
-	if(strpos($allowed_days, $day) === false) {
-		jsAlert($_lang['login_processor_date']);
-		return;
-	}
+    $date = getdate();
+    $day = $date['wday'] + 1;
+    if(strpos($allowed_days, $day) === false) {
+        jsAlert($_lang['login_processor_date']);
+        return;
+    }
 }
 
 // invoke OnManagerAuthentication event
 $rt = $modx->invokeEvent('OnManagerAuthentication', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'savedpassword' => $dbasePassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'savedpassword' => $dbasePassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if plugin authenticated the user
 $matchPassword = false;
 if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
-	// check user password - local authentication
-	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
-		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
-		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
-		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} else {
-		$matchPassword = false;
-	}
+    // check user password - local authentication
+    $hashType = $modx->manager->getHashType($dbasePassword);
+    if($hashType == 'phpass') {
+        $matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
+    } elseif($hashType == 'md5') {
+        $matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } elseif($hashType == 'v1') {
+        $matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } else {
+        $matchPassword = false;
+    }
 } else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
-	$matchPassword = true;
+    $matchPassword = true;
 }
 
 if(!$matchPassword) {
-	jsAlert($_lang['login_processor_wrong_password']);
-	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-	return;
+    jsAlert($_lang['login_processor_wrong_password']);
+    incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+    return;
 }
 
 if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
-		jsAlert($_lang['login_processor_captcha_config']);
-		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
-		jsAlert($_lang['login_processor_bad_code']);
-		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-		return;
-	}
+    if(!isset ($_SESSION['veriword'])) {
+        jsAlert($_lang['login_processor_captcha_config']);
+        return;
+    } elseif($_SESSION['veriword'] != $captcha_code) {
+        jsAlert($_lang['login_processor_bad_code']);
+        incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+        return;
+    }
 }
 
 $modx->cleanupExpiredLocks();
@@ -229,36 +229,36 @@ 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
 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. 
-	// Are we using secure connection? If so, make sure the cookie is secure
-	global $https_port;
-
-	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	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);
-	}
+    $_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. 
+    // Are we using secure connection? If so, make sure the cookie is secure
+    global $https_port;
+
+    $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
+    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);
+    }
 } else {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
 
-	// Remove the Remember Me cookie
-	setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
+    // Remove the Remember Me cookie
+    setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
 }
 
 // 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) {
-	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
-		$_SESSION['show_logout_reminder'] = array(
-			'type' => 'logout_reminder',
-			'lastHit' => $lastHit
-		);
-	}
+    $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
+    if($lastHit = $modx->db->getValue($rs)) {
+        $_SESSION['show_logout_reminder'] = array(
+            'type' => 'logout_reminder',
+            'lastHit' => $lastHit
+        );
+    }
 }
 
 $log = new logHandler;
@@ -266,109 +266,109 @@ 
 
 // invoke OnManagerLogin event
 $modx->invokeEvent('OnManagerLogin', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 
 // 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) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $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) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . MODX_MANAGER_URL;
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 }
 
 // show javascript alert
 function jsAlert($msg) {
-	global $modx;
-	if($_POST['ajax'] != 1) {
-		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
-	} else {
-		echo $msg . "\n";
-	}
+    global $modx;
+    if($_POST['ajax'] != 1) {
+        echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+    } else {
+        echo $msg . "\n";
+    }
 }
 
 function login($username, $givenPassword, $dbasePassword) {
-	global $modx;
-	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
+    global $modx;
+    return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
 
 function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
-	global $modx;
+    global $modx;
 
-	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
+    $user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
 
-	if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
-		$modx->config['pwd_hash_algo'] = 'UNCRYPT';
-	}
+    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']) {
-		$bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
-		$modx->config['pwd_hash_algo'] = $user_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)) {
-		return false;
-	}
+    if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
+        return false;
+    }
 
-	updateNewHash($username, $givenPassword);
+    updateNewHash($username, $givenPassword);
 
-	return true;
+    return true;
 }
 
 function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
-	global $modx;
+    global $modx;
 
-	if($dbasePassword != md5($givenPassword)) {
-		return false;
-	}
-	updateNewHash($username, $givenPassword);
-	return true;
+    if($dbasePassword != md5($givenPassword)) {
+        return false;
+    }
+    updateNewHash($username, $givenPassword);
+    return true;
 }
 
 function updateNewHash($username, $password) {
-	global $modx;
+    global $modx;
 
-	$field = array();
-	$field['password'] = $modx->phpass->HashPassword($password);
-	$modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'");
+    $field = array();
+    $field['password'] = $modx->phpass->HashPassword($password);
+    $modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'");
 }
 
 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
-	{
-		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
-	}
-
-	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
-
-	if($failedlogins < $failed_allowed) {
-		//sleep to help prevent brute force attacks
-		$sleep = (int) $failedlogins / 2;
-		if($sleep > 5) {
-			$sleep = 5;
-		}
-		sleep($sleep);
-	}
-	@session_destroy();
-	session_unset();
-	return;
+    global $modx;
+
+    $failedlogins += 1;
+
+    $fields = array('failedlogincount' => $failedlogins);
+    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) {
+        //sleep to help prevent brute force attacks
+        $sleep = (int) $failedlogins / 2;
+        if($sleep > 5) {
+            $sleep = 5;
+        }
+        sleep($sleep);
+    }
+    @session_destroy();
+    session_unset();
+    return;
 }

manager/frames/nodes.functions.inc.php

Indentation +553 added lines, -553 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.');
+    die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 /**
@@ -11,575 +11,575 @@ 
  * @param string $hereid
  */
 function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
-	global $modx;
-	global $icons, $iconsPrivate, $_style;
-	global $_lang, $opened, $opened2, $closed2; //added global vars
-	global $modx_textdir;
-
-	$output = '';
-
-	// setup spacer
-	$level = 0;
-	$spacer = '<span class="indent">';
-	for($i = 2; $i <= $indent; $i++) {
-		$spacer .= '<i></i>';
-		$level++;
-	}
-	$spacer .= '</span>';
-
-	// manage order-by
-	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']) {
-		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']);
-			break;
-		default:
-			$sortby = 'sc.' . $_SESSION['tree_sortby'];
-	};
-
-	$orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
-
-	// Folder sorting gets special setup ;) Add menuindex and pagetitle
-	if($_SESSION['tree_sortby'] == 'isfolder') {
-		$orderby .= ', menuindex ASC, pagetitle';
-	}
-
-	$tblsc = $modx->getFullTableName('site_content');
-	$tbldg = $modx->getFullTableName('document_groups');
-	$tblst = $modx->getFullTableName('site_templates');
-	// 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'])) {
-		$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}))");
-	} else {
-		$access = '';
-	}
-	$docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
-	$field = "DISTINCT sc.id, pagetitle, longtitle, menutitle, parent, isfolder, published, pub_date, unpub_date, richtext, searchable, cacheable, deleted, type, template, templatename, menuindex, donthit, hidemenu, alias, contentType, privateweb, privatemgr,
+    global $modx;
+    global $icons, $iconsPrivate, $_style;
+    global $_lang, $opened, $opened2, $closed2; //added global vars
+    global $modx_textdir;
+
+    $output = '';
+
+    // setup spacer
+    $level = 0;
+    $spacer = '<span class="indent">';
+    for($i = 2; $i <= $indent; $i++) {
+        $spacer .= '<i></i>';
+        $level++;
+    }
+    $spacer .= '</span>';
+
+    // manage order-by
+    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']) {
+        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']);
+            break;
+        default:
+            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+    };
+
+    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+
+    // Folder sorting gets special setup ;) Add menuindex and pagetitle
+    if($_SESSION['tree_sortby'] == 'isfolder') {
+        $orderby .= ', menuindex ASC, pagetitle';
+    }
+
+    $tblsc = $modx->getFullTableName('site_content');
+    $tbldg = $modx->getFullTableName('document_groups');
+    $tblst = $modx->getFullTableName('site_templates');
+    // 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'])) {
+        $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}))");
+    } else {
+        $access = '';
+    }
+    $docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
+    $field = "DISTINCT sc.id, pagetitle, longtitle, menutitle, parent, isfolder, published, pub_date, unpub_date, richtext, searchable, cacheable, deleted, type, template, templatename, menuindex, donthit, hidemenu, alias, contentType, privateweb, privatemgr,
         MAX(IF(1={$mgrRole} OR sc.privatemgr=0 {$docgrp_cond}, 1, 0)) AS hasAccess, GROUP_CONCAT(document_group SEPARATOR ',') AS roles";
-	$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) {
-		$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)) {
-		$node = '';
-
-		$nodetitle = getNodeTitle($nodeNameSource, $row);
-		$nodetitleDisplay = $nodetitle;
-
-		$treeNodeClass = 'node';
-		$treeNodeClass .= $row['hasAccess'] == 0 ? ' protected' : '';
-
-		if($row['deleted'] == 1) {
-			$treeNodeClass .= ' deleted';
-			//$nodetitleDisplay = sprintf('<span class="deletedNode">%s</span>', $nodetitle);
-		} elseif($row['published'] == 0) {
-			$treeNodeClass .= ' unpublished';
-			//$nodetitleDisplay = sprintf('<span class="unpublishedNode">%s</span>', $nodetitle);
-		} 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) {
-			$treeNodeClass .= ' current';
-		}
-
-		$weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
-		$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) {
-				$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>';
-			} 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>';
-				} else {
-					$lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
-				}
-			}
-		}
-
-		$url = $modx->makeUrl($row['id']);
-
-		$title = '';
-		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 = $modx->htmlspecialchars($title);
-		$title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
-
-		$data = array(
-			'id' => $row['id'],
-			'pagetitle' => $row['pagetitle'],
-			'longtitle' => $row['longtitle'],
-			'menutitle' => $row['menutitle'],
-			'parent' => $parent,
-			'isfolder' => $row['isfolder'],
-			'published' => $row['published'],
-			'deleted' => $row['deleted'],
-			'type' => $row['type'],
-			'menuindex' => $row['menuindex'],
-			'donthit' => $row['donthit'],
-			'hidemenu' => $row['hidemenu'],
-			'alias' => $row['alias'],
-			'contenttype' => $row['contentType'],
-			'privateweb' => $row['privateweb'],
-			'privatemgr' => $row['privatemgr'],
-			'hasAccess' => $row['hasAccess'],
-			'template' => $row['template'],
-			'nodetitle' => $nodetitle,
-			'url' => $url,
-			'title' => $title,
-			'nodetitleDisplay' => $nodetitleDisplay,
-			'weblinkDisplay' => $weblinkDisplay,
-			'pageIdDisplay' => $pageIdDisplay,
-			'lockedByUser' => $lockedByUser,
-			'treeNodeClass' => $treeNodeClass,
-			'treeNodeSelected' => $row['id'] == $hereid ? ' treeNodeSelected' : '',
-			'tree_page_click' => $modx->config['tree_page_click'],
-			'showChildren' => 1,
-			'openFolder' => 1,
-			'contextmenu' => '',
-			'tree_minusnode' => $_style['tree_minusnode'],
-			'tree_plusnode' => $_style['tree_plusnode'],
-			'spacer' => $spacer,
-			'subMenuState' => '',
-			'level' => $level,
-			'isPrivate' => 0,
-			'roles' => ($row['roles'] ? $row['roles'] : '')
-		);
-
-		$ph = $data;
-		$ph['nodetitle_esc'] = addslashes($nodetitle);
-		$ph['indent'] = $indent + 1;
-		$ph['expandAll'] = $expandAll;
-		$ph['isPrivate'] = ($row['privateweb'] || $row['privatemgr']) ? 1 : 0;
-
-		if(!$row['isfolder']) {
-			$tpl = getTplSingleNode();
-			switch($row['id']) {
-				case $modx->config['site_start']            :
-					$icon = $_style['tree_page_home'];
-					break;
-				case $modx->config['error_page']            :
-					$icon = $_style['tree_page_404'];
-					break;
-				case $modx->config['site_unavailable_page'] :
-					$icon = $_style['tree_page_hourglass'];
-					break;
-				case $modx->config['unauthorized_page']     :
-					$icon = $_style['tree_page_info'];
-					break;
-				default:
-					if(isset($icons[$row['contentType']])) {
-						$icon = $icons[$row['contentType']];
-					} else {
-						$icon = $_style['tree_page'];
-					}
-			}
-			$ph['icon'] = $icon;
-
-			// invoke OnManagerNodePrerender event
-			$prenode = $modx->invokeEvent("OnManagerNodePrerender", array('ph' => $ph));
-			if(is_array($prenode)) {
-				$phnew = array();
-				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($_SESSION['tree_show_only_folders']) {
-				if($row['parent'] == 0) {
-					$node .= $modx->parseText($tpl, $ph);
-				} else {
-					$node .= '';
-				}
-			} else {
-				$node .= $modx->parseText($tpl, $ph);
-			}
-
-		} else {
-			$ph['icon_folder_open'] = $_style['tree_folderopen_new'];
-			$ph['icon_folder_close'] = $_style['tree_folder_new'];
-
-			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) {
-						$opened2[] = $row['id'];
-					}
-					$ph['icon'] = $ph['icon_folder_open'];
-					$ph['icon_node_toggle'] = $ph['tree_minusnode'];
-					$ph['node_toggle'] = 1;
-					$ph['subMenuState'] = ' open';
-
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
-						$ph['showChildren'] = 1;
-						$ph['icon_node_toggle'] = '';
-						$ph['icon'] = $ph['icon_folder_close'];
-					} elseif(!$checkDocs && $checkFolders) {
-						$ph['showChildren'] = 0;
-						$ph['openFolder'] = 2;
-					} else {
-						$ph['openFolder'] = 2;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '1'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						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']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					if($checkFolders) {
-						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
-					}
-					$node .= '</div></div>';
-				} else {
-					$closed2[] = $row['id'];
-					$ph['icon'] = $ph['icon_folder_close'];
-					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
-					$ph['node_toggle'] = 0;
-
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
-						$ph['showChildren'] = 1;
-						$ph['icon_node_toggle'] = '';
-					} elseif(!$checkDocs && $checkFolders) {
-						$ph['showChildren'] = 0;
-						$ph['openFolder'] = 2;
-					} else {
-						$ph['openFolder'] = 2;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '0'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						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']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					$node .= '</div></div>';
-				}
-			} else {
-				$tpl = getTplFolderNode();
-				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
-						$opened2[] = $row['id'];
-					}
-					$ph['icon'] = $ph['icon_folder_open'];
-					$ph['icon_node_toggle'] = $ph['tree_minusnode'];
-					$ph['node_toggle'] = 1;
-					$ph['subMenuState'] = ' open';
-
-					if($ph['donthit'] == 1) {
-						$ph['tree_page_click'] = 3;
-						$ph['icon_node_toggle'] = '';
-						$ph['icon'] = $ph['icon_folder_close'];
-						$ph['showChildren'] = 0;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '1'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						foreach($prenode as $pnode) {
-							$phnew = array_merge($phnew, unserialize($pnode));
-						}
-						$ph = (count($phnew) > 0) ? $phnew : $ph;
-						if($ph['showChildren'] == 0) {
-							unset($opened2[$row['id']]);
-							$ph['node_toggle'] = 0;
-							$ph['subMenuState'] = '';
-						}
-					}
-
-					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']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					if($ph['donthit'] == 0) {
-						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
-					}
-					$node .= '</div></div>';
-				} else {
-					$closed2[] = $row['id'];
-					$ph['icon'] = $ph['icon_folder_close'];
-					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
-					$ph['node_toggle'] = 0;
-
-					if($ph['donthit'] == 1) {
-						$ph['tree_page_click'] = 3;
-						$ph['icon_node_toggle'] = '';
-						$ph['icon'] = $ph['icon_folder_close'];
-						$ph['showChildren'] = 0;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '0'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						foreach($prenode as $pnode) {
-							$phnew = array_merge($phnew, unserialize($pnode));
-						}
-						$ph = (count($phnew) > 0) ? $phnew : $ph;
-					}
-
-					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']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					$node .= '</div></div>';
-				}
-			}
-		}
-
-		// invoke OnManagerNodeRender event
-		$data['node'] = $node;
-		$evtOut = $modx->invokeEvent('OnManagerNodeRender', $data);
-		if(is_array($evtOut)) {
-			$evtOut = implode("\n", $evtOut);
-		}
-		if($evtOut != '') {
-			$node = trim($evtOut);
-		}
-
-		$output .= $node;
-	}
-
-	return $output;
+    $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) {
+        $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)) {
+        $node = '';
+
+        $nodetitle = getNodeTitle($nodeNameSource, $row);
+        $nodetitleDisplay = $nodetitle;
+
+        $treeNodeClass = 'node';
+        $treeNodeClass .= $row['hasAccess'] == 0 ? ' protected' : '';
+
+        if($row['deleted'] == 1) {
+            $treeNodeClass .= ' deleted';
+            //$nodetitleDisplay = sprintf('<span class="deletedNode">%s</span>', $nodetitle);
+        } elseif($row['published'] == 0) {
+            $treeNodeClass .= ' unpublished';
+            //$nodetitleDisplay = sprintf('<span class="unpublishedNode">%s</span>', $nodetitle);
+        } 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) {
+            $treeNodeClass .= ' current';
+        }
+
+        $weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
+        $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) {
+                $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>';
+            } 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>';
+                } else {
+                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                }
+            }
+        }
+
+        $url = $modx->makeUrl($row['id']);
+
+        $title = '';
+        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 = $modx->htmlspecialchars($title);
+        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+
+        $data = array(
+            'id' => $row['id'],
+            'pagetitle' => $row['pagetitle'],
+            'longtitle' => $row['longtitle'],
+            'menutitle' => $row['menutitle'],
+            'parent' => $parent,
+            'isfolder' => $row['isfolder'],
+            'published' => $row['published'],
+            'deleted' => $row['deleted'],
+            'type' => $row['type'],
+            'menuindex' => $row['menuindex'],
+            'donthit' => $row['donthit'],
+            'hidemenu' => $row['hidemenu'],
+            'alias' => $row['alias'],
+            'contenttype' => $row['contentType'],
+            'privateweb' => $row['privateweb'],
+            'privatemgr' => $row['privatemgr'],
+            'hasAccess' => $row['hasAccess'],
+            'template' => $row['template'],
+            'nodetitle' => $nodetitle,
+            'url' => $url,
+            'title' => $title,
+            'nodetitleDisplay' => $nodetitleDisplay,
+            'weblinkDisplay' => $weblinkDisplay,
+            'pageIdDisplay' => $pageIdDisplay,
+            'lockedByUser' => $lockedByUser,
+            'treeNodeClass' => $treeNodeClass,
+            'treeNodeSelected' => $row['id'] == $hereid ? ' treeNodeSelected' : '',
+            'tree_page_click' => $modx->config['tree_page_click'],
+            'showChildren' => 1,
+            'openFolder' => 1,
+            'contextmenu' => '',
+            'tree_minusnode' => $_style['tree_minusnode'],
+            'tree_plusnode' => $_style['tree_plusnode'],
+            'spacer' => $spacer,
+            'subMenuState' => '',
+            'level' => $level,
+            'isPrivate' => 0,
+            'roles' => ($row['roles'] ? $row['roles'] : '')
+        );
+
+        $ph = $data;
+        $ph['nodetitle_esc'] = addslashes($nodetitle);
+        $ph['indent'] = $indent + 1;
+        $ph['expandAll'] = $expandAll;
+        $ph['isPrivate'] = ($row['privateweb'] || $row['privatemgr']) ? 1 : 0;
+
+        if(!$row['isfolder']) {
+            $tpl = getTplSingleNode();
+            switch($row['id']) {
+                case $modx->config['site_start']            :
+                    $icon = $_style['tree_page_home'];
+                    break;
+                case $modx->config['error_page']            :
+                    $icon = $_style['tree_page_404'];
+                    break;
+                case $modx->config['site_unavailable_page'] :
+                    $icon = $_style['tree_page_hourglass'];
+                    break;
+                case $modx->config['unauthorized_page']     :
+                    $icon = $_style['tree_page_info'];
+                    break;
+                default:
+                    if(isset($icons[$row['contentType']])) {
+                        $icon = $icons[$row['contentType']];
+                    } else {
+                        $icon = $_style['tree_page'];
+                    }
+            }
+            $ph['icon'] = $icon;
+
+            // invoke OnManagerNodePrerender event
+            $prenode = $modx->invokeEvent("OnManagerNodePrerender", array('ph' => $ph));
+            if(is_array($prenode)) {
+                $phnew = array();
+                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($_SESSION['tree_show_only_folders']) {
+                if($row['parent'] == 0) {
+                    $node .= $modx->parseText($tpl, $ph);
+                } else {
+                    $node .= '';
+                }
+            } else {
+                $node .= $modx->parseText($tpl, $ph);
+            }
+
+        } else {
+            $ph['icon_folder_open'] = $_style['tree_folderopen_new'];
+            $ph['icon_folder_close'] = $_style['tree_folder_new'];
+
+            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) {
+                        $opened2[] = $row['id'];
+                    }
+                    $ph['icon'] = $ph['icon_folder_open'];
+                    $ph['icon_node_toggle'] = $ph['tree_minusnode'];
+                    $ph['node_toggle'] = 1;
+                    $ph['subMenuState'] = ' open';
+
+                    if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+                        $ph['showChildren'] = 1;
+                        $ph['icon_node_toggle'] = '';
+                        $ph['icon'] = $ph['icon_folder_close'];
+                    } elseif(!$checkDocs && $checkFolders) {
+                        $ph['showChildren'] = 0;
+                        $ph['openFolder'] = 2;
+                    } else {
+                        $ph['openFolder'] = 2;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '1'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        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']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    if($checkFolders) {
+                        $node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
+                    }
+                    $node .= '</div></div>';
+                } else {
+                    $closed2[] = $row['id'];
+                    $ph['icon'] = $ph['icon_folder_close'];
+                    $ph['icon_node_toggle'] = $ph['tree_plusnode'];
+                    $ph['node_toggle'] = 0;
+
+                    if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+                        $ph['showChildren'] = 1;
+                        $ph['icon_node_toggle'] = '';
+                    } elseif(!$checkDocs && $checkFolders) {
+                        $ph['showChildren'] = 0;
+                        $ph['openFolder'] = 2;
+                    } else {
+                        $ph['openFolder'] = 2;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '0'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        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']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    $node .= '</div></div>';
+                }
+            } else {
+                $tpl = getTplFolderNode();
+                // expandAll: two type for partial expansion
+                if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+                    if($expandAll == 1) {
+                        $opened2[] = $row['id'];
+                    }
+                    $ph['icon'] = $ph['icon_folder_open'];
+                    $ph['icon_node_toggle'] = $ph['tree_minusnode'];
+                    $ph['node_toggle'] = 1;
+                    $ph['subMenuState'] = ' open';
+
+                    if($ph['donthit'] == 1) {
+                        $ph['tree_page_click'] = 3;
+                        $ph['icon_node_toggle'] = '';
+                        $ph['icon'] = $ph['icon_folder_close'];
+                        $ph['showChildren'] = 0;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '1'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        foreach($prenode as $pnode) {
+                            $phnew = array_merge($phnew, unserialize($pnode));
+                        }
+                        $ph = (count($phnew) > 0) ? $phnew : $ph;
+                        if($ph['showChildren'] == 0) {
+                            unset($opened2[$row['id']]);
+                            $ph['node_toggle'] = 0;
+                            $ph['subMenuState'] = '';
+                        }
+                    }
+
+                    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']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    if($ph['donthit'] == 0) {
+                        $node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
+                    }
+                    $node .= '</div></div>';
+                } else {
+                    $closed2[] = $row['id'];
+                    $ph['icon'] = $ph['icon_folder_close'];
+                    $ph['icon_node_toggle'] = $ph['tree_plusnode'];
+                    $ph['node_toggle'] = 0;
+
+                    if($ph['donthit'] == 1) {
+                        $ph['tree_page_click'] = 3;
+                        $ph['icon_node_toggle'] = '';
+                        $ph['icon'] = $ph['icon_folder_close'];
+                        $ph['showChildren'] = 0;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '0'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        foreach($prenode as $pnode) {
+                            $phnew = array_merge($phnew, unserialize($pnode));
+                        }
+                        $ph = (count($phnew) > 0) ? $phnew : $ph;
+                    }
+
+                    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']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    $node .= '</div></div>';
+                }
+            }
+        }
+
+        // invoke OnManagerNodeRender event
+        $data['node'] = $node;
+        $evtOut = $modx->invokeEvent('OnManagerNodeRender', $data);
+        if(is_array($evtOut)) {
+            $evtOut = implode("\n", $evtOut);
+        }
+        if($evtOut != '') {
+            $node = trim($evtOut);
+        }
+
+        $output .= $node;
+    }
+
+    return $output;
 }
 
 function getIconInfo($_style) {
-	if(!isset($_style['tree_page_gif'])) {
-		$_style['tree_page_gif'] = $_style['tree_page'];
-	}
-	if(!isset($_style['tree_page_jpg'])) {
-		$_style['tree_page_jpg'] = $_style['tree_page'];
-	}
-	if(!isset($_style['tree_page_png'])) {
-		$_style['tree_page_png'] = $_style['tree_page'];
-	}
-	$icons = array(
-		'text/html' => $_style['tree_page_html'],
-		'text/plain' => $_style['tree_page'],
-		'text/xml' => $_style['tree_page_xml'],
-		'text/css' => $_style['tree_page_css'],
-		'text/javascript' => $_style['tree_page_js'],
-		'application/rss+xml' => $_style['tree_page_rss'],
-		'application/pdf' => $_style['tree_page_pdf'],
-		'application/vnd.ms-word' => $_style['tree_page_word'],
-		'application/vnd.ms-excel' => $_style['tree_page_excel'],
-		'image/gif' => $_style['tree_page_gif'],
-		'image/jpg' => $_style['tree_page_jpg'],
-		'image/png' => $_style['tree_page_png']
-	);
-	return $icons;
+    if(!isset($_style['tree_page_gif'])) {
+        $_style['tree_page_gif'] = $_style['tree_page'];
+    }
+    if(!isset($_style['tree_page_jpg'])) {
+        $_style['tree_page_jpg'] = $_style['tree_page'];
+    }
+    if(!isset($_style['tree_page_png'])) {
+        $_style['tree_page_png'] = $_style['tree_page'];
+    }
+    $icons = array(
+        'text/html' => $_style['tree_page_html'],
+        'text/plain' => $_style['tree_page'],
+        'text/xml' => $_style['tree_page_xml'],
+        'text/css' => $_style['tree_page_css'],
+        'text/javascript' => $_style['tree_page_js'],
+        'application/rss+xml' => $_style['tree_page_rss'],
+        'application/pdf' => $_style['tree_page_pdf'],
+        'application/vnd.ms-word' => $_style['tree_page_word'],
+        'application/vnd.ms-excel' => $_style['tree_page_excel'],
+        'image/gif' => $_style['tree_page_gif'],
+        'image/jpg' => $_style['tree_page_jpg'],
+        'image/png' => $_style['tree_page_png']
+    );
+    return $icons;
 }
 
 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'])) {
-		$_style['tree_page_jpg_secure'] = $_style['tree_page_secure'];
-	}
-	if(!isset($_style['tree_page_png_secure'])) {
-		$_style['tree_page_png_secure'] = $_style['tree_page_secure'];
-	}
-	$iconsPrivate = array(
-		'text/html' => $_style['tree_page_html_secure'],
-		'text/plain' => $_style['tree_page_secure'],
-		'text/xml' => $_style['tree_page_xml_secure'],
-		'text/css' => $_style['tree_page_css_secure'],
-		'text/javascript' => $_style['tree_page_js_secure'],
-		'application/rss+xml' => $_style['tree_page_rss_secure'],
-		'application/pdf' => $_style['tree_page_pdf_secure'],
-		'application/vnd.ms-word' => $_style['tree_page_word_secure'],
-		'application/vnd.ms-excel' => $_style['tree_page_excel_secure'],
-		'image/gif' => $_style['tree_page_gif_secure'],
-		'image/jpg' => $_style['tree_page_jpg_secure'],
-		'image/png' => $_style['tree_page_png_secure']
-	);
-	return $iconsPrivate;
+    if(!isset($_style['tree_page_gif_secure'])) {
+        $_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
+    }
+    if(!isset($_style['tree_page_jpg_secure'])) {
+        $_style['tree_page_jpg_secure'] = $_style['tree_page_secure'];
+    }
+    if(!isset($_style['tree_page_png_secure'])) {
+        $_style['tree_page_png_secure'] = $_style['tree_page_secure'];
+    }
+    $iconsPrivate = array(
+        'text/html' => $_style['tree_page_html_secure'],
+        'text/plain' => $_style['tree_page_secure'],
+        'text/xml' => $_style['tree_page_xml_secure'],
+        'text/css' => $_style['tree_page_css_secure'],
+        'text/javascript' => $_style['tree_page_js_secure'],
+        'application/rss+xml' => $_style['tree_page_rss_secure'],
+        'application/pdf' => $_style['tree_page_pdf_secure'],
+        'application/vnd.ms-word' => $_style['tree_page_word_secure'],
+        'application/vnd.ms-excel' => $_style['tree_page_excel_secure'],
+        'image/gif' => $_style['tree_page_gif_secure'],
+        'image/jpg' => $_style['tree_page_jpg_secure'],
+        'image/png' => $_style['tree_page_png_secure']
+    );
+    return $iconsPrivate;
 }
 
 function getNodeTitle($nodeNameSource, $row) {
-	global $modx;
-
-	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) {
-					$nodetitle .= $modx->config['friendly_url_suffix'];
-				}
-			}
-			$nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
-			break;
-		case 'pagetitle':
-			$nodetitle = $row['pagetitle'];
-			break;
-		case 'longtitle':
-			$nodetitle = $row['longtitle'] ? $row['longtitle'] : $row['pagetitle'];
-			break;
-		case 'createdon':
-		case 'editedon':
-		case 'publishedon':
-		case 'pub_date':
-		case 'unpub_date':
-			$doc = $modx->getDocumentObject('id', $row['id']);
-			$date = $doc[$nodeNameSource];
-			if(!empty($date)) {
-				$nodetitle = $modx->toDateFormat($date);
-			} else {
-				$nodetitle = '- - -';
-			}
-			break;
-		default:
-			$nodetitle = $row['pagetitle'];
-	}
-	$nodetitle = $modx->htmlspecialchars(str_replace(array(
-		"\r\n",
-		"\n",
-		"\r"
-	), ' ', $nodetitle), ENT_COMPAT);
-	return $nodetitle;
+    global $modx;
+
+    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) {
+                    $nodetitle .= $modx->config['friendly_url_suffix'];
+                }
+            }
+            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            break;
+        case 'pagetitle':
+            $nodetitle = $row['pagetitle'];
+            break;
+        case 'longtitle':
+            $nodetitle = $row['longtitle'] ? $row['longtitle'] : $row['pagetitle'];
+            break;
+        case 'createdon':
+        case 'editedon':
+        case 'publishedon':
+        case 'pub_date':
+        case 'unpub_date':
+            $doc = $modx->getDocumentObject('id', $row['id']);
+            $date = $doc[$nodeNameSource];
+            if(!empty($date)) {
+                $nodetitle = $modx->toDateFormat($date);
+            } else {
+                $nodetitle = '- - -';
+            }
+            break;
+        default:
+            $nodetitle = $row['pagetitle'];
+    }
+    $nodetitle = $modx->htmlspecialchars(str_replace(array(
+        "\r\n",
+        "\n",
+        "\r"
+    ), ' ', $nodetitle), ENT_COMPAT);
+    return $nodetitle;
 }
 
 function isDateNode($nodeNameSource) {
-	switch($nodeNameSource) {
-		case 'createdon':
-		case 'editedon':
-		case 'publishedon':
-		case 'pub_date':
-		case 'unpub_date':
-			return true;
-		default:
-			return false;
-	}
+    switch($nodeNameSource) {
+        case 'createdon':
+        case 'editedon':
+        case 'publishedon':
+        case 'pub_date':
+        case 'unpub_date':
+            return true;
+        default:
+            return false;
+    }
 }
 
 function checkIsFolder($parent = 0, $isfolder = 1) {
-	global $modx;
+    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) {
-	global $modx;
+    global $modx;
 
-	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
-	$array = htmlentities($array, ENT_COMPAT, $modx->config['modx_charset']);
+    $array = json_encode($array, JSON_UNESCAPED_UNICODE);
+    $array = htmlentities($array, ENT_COMPAT, $modx->config['modx_charset']);
 
-	return $array;
+    return $array;
 }
 
 function getTplSingleNode() {
-	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
+    return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
         data-id="[+id+]"
@@ -603,7 +603,7 @@ 
 }
 
 function getTplFolderNode() {
-	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
+    return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
         data-id="[+id+]"
@@ -639,7 +639,7 @@ 
 }
 
 function getTplFolderNodeNotChildren() {
-	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
+    return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
         data-id="[+id+]"
@@ -671,10 +671,10 @@ 
 }
 
 function dbug($str, $flag = false) {
-	print('<pre>');
-	print_r($str);
-	print('</pre>');
-	if($flag) {
-		exit;
-	}
+    print('<pre>');
+    print_r($str);
+    print('</pre>');
+    if($flag) {
+        exit;
+    }
 }

manager/frames/1.php

Indentation +3 added lines, -3 removed lines

@@ -236,9 +236,9 @@
         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";

-      ?>

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

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

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

manager/frames/mainmenu.php

Indentation +325 added lines, -325 removed lines

@@ -4,237 +4,237 @@ 
 */

 

 $sitemenu['bars'] = array(

-	'bars',

-	'main',

-	'<i class="fa fa-bars"></i>',

-	'javascript:;',

-	$_lang['home'],

-	'modx.resizer.toggle(); return false;',

-	' return false;',

-	'',

-	0,

-	10,

-	''

+    'bars',

+    'main',

+    '<i class="fa fa-bars"></i>',

+    'javascript:;',

+    $_lang['home'],

+    'modx.resizer.toggle(); return false;',

+    ' return false;',

+    '',

+    0,

+    10,

+    ''

 );

 

 //mainMenu

 $sitemenu['site'] = array(

-	'site',

-	'main',

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

-	'index.php?a=2',

-	$_lang['home'],

-	'',

-	'',

-	'main',

-	0,

-	10,

-	'active'

+    'site',

+    'main',

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

+    'index.php?a=2',

+    $_lang['home'],

+    '',

+    '',

+    'main',

+    0,

+    10,

+    'active'

 );

 

 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'],

-		'javascript:;',

-		$_lang['elements'],

-		' return false;',

-		'',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['elements'] = array(

+        'elements',

+        'main',

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

+        'javascript:;',

+        $_lang['elements'],

+        ' return false;',

+        '',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

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

-	$sitemenu['modules'] = array(

-		'modules',

-		'main',

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

-		'javascript:;',

-		$_lang['modules'],

-		' return false;',

-		'',

-		'',

-		0,

-		30,

-		''

-	);

+    $sitemenu['modules'] = array(

+        'modules',

+        'main',

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

+        'javascript:;',

+        $_lang['modules'],

+        ' return false;',

+        '',

+        '',

+        0,

+        30,

+        ''

+    );

 }

 

 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'],

-		'javascript:;',

-		$_lang['users'],

-		' return false;',

-		'edit_user',

-		'',

-		0,

-		40,

-		''

-	);

+    $sitemenu['users'] = array(

+        'users',

+        'main',

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

+        'javascript:;',

+        $_lang['users'],

+        ' return false;',

+        'edit_user',

+        '',

+        0,

+        40,

+        ''

+    );

 }

 

 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'],

-		'javascript:;',

-		$_lang['tools'],

-		' return false;',

-		'',

-		'',

-		0,

-		50,

-		''

-	);

+    $sitemenu['tools'] = array(

+        'tools',

+        'main',

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

+        'javascript:;',

+        $_lang['tools'],

+        ' return false;',

+        '',

+        '',

+        0,

+        50,

+        ''

+    );

 }

 

 $tab = 0;

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

-		$_lang['manage_templates'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_templates'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

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

-		$_lang['tmplvars'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['tmplvars'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

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

-		$_lang['manage_htmlsnippets'],

-		'',

-		'new_chunk,edit_chunk',

-		'main',

-		0,

-		30,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_htmlsnippets'],

+        '',

+        'new_chunk,edit_chunk',

+        'main',

+        0,

+        30,

+        'dropdown-toggle'

+    );

 }

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

-		$_lang['manage_snippets'],

-		'',

-		'new_snippet,edit_snippet',

-		'main',

-		0,

-		40,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_snippets'],

+        '',

+        'new_snippet,edit_snippet',

+        'main',

+        0,

+        40,

+        'dropdown-toggle'

+    );

 }

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

-		$_lang['manage_plugins'],

-		'',

-		'new_plugin,edit_plugin',

-		'main',

-		0,

-		50,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_plugins'],

+        '',

+        'new_plugin,edit_plugin',

+        'main',

+        0,

+        50,

+        'dropdown-toggle'

+    );

 }

 //$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')) {

-	$sitemenu['manage_files'] = array(

-		'manage_files',

-		'elements',

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

-		'index.php?a=31',

-		$_lang['manage_files'],

-		'',

-		'file_manager',

-		'main',

-		0,

-		70,

-		''

-	);

+    $sitemenu['manage_files'] = array(

+        'manage_files',

+        'elements',

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

+        'index.php?a=31',

+        $_lang['manage_files'],

+        '',

+        'file_manager',

+        'main',

+        0,

+        70,

+        ''

+    );

 }

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

-	$sitemenu['manage_categories'] = array(

-		'manage_categories',

-		'elements',

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

-		'index.php?a=120',

-		$_lang['manage_categories'],

-		'',

-		'category_manager',

-		'main',

-		0,

-		80,

-		''

-	);

+    $sitemenu['manage_categories'] = array(

+        'manage_categories',

+        'elements',

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

+        'index.php?a=120',

+        $_lang['manage_categories'],

+        '',

+        'category_manager',

+        'main',

+        0,

+        80,

+        ''

+    );

 }

 

 // Modules Menu Items

 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'],

-		'index.php?a=106',

-		$_lang['module_management'],

-		'',

-		'new_module,edit_module',

-		'main',

-		1,

-		0,

-		''

-	);

+    $sitemenu['new_module'] = array(

+        'new_module',

+        'modules',

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

+        'index.php?a=106',

+        $_lang['module_management'],

+        '',

+        'new_module,edit_module',

+        'main',

+        1,

+        0,

+        ''

+    );

 }

 

 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

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

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

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

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

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

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

                 ORDER BY sm.name');

-	} else {

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

-	}

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

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

+    } else {

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

+    }

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

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

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

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

                 'modules',

@@ -255,83 +255,83 @@ 
 // security menu items (users)

 

 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>',

-		'index.php?a=75',

-		$_lang['user_management_title'],

-		'',

-		'edit_user',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $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>',

+        'index.php?a=75',

+        $_lang['user_management_title'],

+        '',

+        'edit_user',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 

 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>',

-		'index.php?a=99',

-		$_lang['web_user_management_title'],

-		'',

-		'edit_web_user',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $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>',

+        'index.php?a=99',

+        $_lang['web_user_management_title'],

+        '',

+        'edit_web_user',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

 

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

-	$sitemenu['role_management_title'] = array(

-		'role_management_title',

-		'users',

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

-		'index.php?a=86',

-		$_lang['role_management_title'],

-		'',

-		'new_role,edit_role,delete_role',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['role_management_title'] = array(

+        'role_management_title',

+        'users',

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

+        'index.php?a=86',

+        $_lang['role_management_title'],

+        '',

+        'new_role,edit_role,delete_role',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

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

-	$sitemenu['manager_permissions'] = array(

-		'manager_permissions',

-		'users',

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

-		'index.php?a=40',

-		$_lang['manager_permissions'],

-		'',

-		'access_permissions',

-		'main',

-		0,

-		40,

-		''

-	);

+    $sitemenu['manager_permissions'] = array(

+        'manager_permissions',

+        'users',

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

+        'index.php?a=40',

+        $_lang['manager_permissions'],

+        '',

+        'access_permissions',

+        'main',

+        0,

+        40,

+        ''

+    );

 }

 

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

-	$sitemenu['web_permissions'] = array(

-		'web_permissions',

-		'users',

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

-		'index.php?a=91',

-		$_lang['web_permissions'],

-		'',

-		'web_access_permissions',

-		'main',

-		0,

-		50,

-		''

-	);

+    $sitemenu['web_permissions'] = array(

+        'web_permissions',

+        'users',

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

+        'index.php?a=91',

+        $_lang['web_permissions'],

+        '',

+        'web_access_permissions',

+        'main',

+        0,

+        50,

+        ''

+    );

 }

 

 // Tools Menu

@@ -361,104 +361,104 @@ 
 );

 

 $sitemenu['search'] = array(

-	'search',

-	'tools',

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

-	'index.php?a=71',

-	$_lang['search'],

-	'',

-	'',

-	'main',

-	1,

-	9,

-	''

+    'search',

+    'tools',

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

+    'index.php?a=71',

+    $_lang['search'],

+    '',

+    '',

+    'main',

+    1,

+    9,

+    ''

 );

 

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

-	$sitemenu['bk_manager'] = array(

-		'bk_manager',

-		'tools',

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

-		'index.php?a=93',

-		$_lang['bk_manager'],

-		'',

-		'bk_manager',

-		'main',

-		0,

-		10,

-		''

-	);

+    $sitemenu['bk_manager'] = array(

+        'bk_manager',

+        'tools',

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

+        'index.php?a=93',

+        $_lang['bk_manager'],

+        '',

+        'bk_manager',

+        'main',

+        0,

+        10,

+        ''

+    );

 }

 

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

-	$sitemenu['remove_locks'] = array(

-		'remove_locks',

-		'tools',

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

-		'javascript:modx.removeLocks();',

-		$_lang['remove_locks'],

-		'',

-		'remove_locks',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['remove_locks'] = array(

+        'remove_locks',

+        'tools',

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

+        'javascript:modx.removeLocks();',

+        $_lang['remove_locks'],

+        '',

+        'remove_locks',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

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

-	$sitemenu['import_site'] = array(

-		'import_site',

-		'tools',

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

-		'index.php?a=95',

-		$_lang['import_site'],

-		'',

-		'import_static',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['import_site'] = array(

+        'import_site',

+        'tools',

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

+        'index.php?a=95',

+        $_lang['import_site'],

+        '',

+        'import_static',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

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

-	$sitemenu['export_site'] = array(

-		'export_site',

-		'tools',

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

-		'index.php?a=83',

-		$_lang['export_site'],

-		'',

-		'export_static',

-		'main',

-		1,

-		40,

-		''

-	);

+    $sitemenu['export_site'] = array(

+        'export_site',

+        'tools',

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

+        'index.php?a=83',

+        $_lang['export_site'],

+        '',

+        'export_static',

+        'main',

+        1,

+        40,

+        ''

+    );

 }

 

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

 if(is_array($menu)) {

-	$newmenu = array();

-	foreach($menu as $item){

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

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

-		}

-	}

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

+    $newmenu = array();

+    foreach($menu as $item){

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

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

+        }

+    }

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

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

-	'outerClass' => 'nav',

-	'innerClass' => 'dropdown-menu',

-	'parentClass' => 'dropdown',

+    'outerClass' => 'nav',

+    'innerClass' => 'dropdown-menu',

+    'parentClass' => 'dropdown',

     'parentLinkClass' => 'dropdown-toggle',

     'parentLinkAttr' => '',

     'parentLinkIn' => ''

manager/frames/tree.php

Indentation +15 added lines, -15 removed lines

@@ -1,12 +1,12 @@ 
 <?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.");

+    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->db->escape($_REQUEST));

-		if(is_array($evtOut)) {

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

-		}

-		?>

+        // invoke OnManagerTreePrerender event

+        $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->db->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 = htmlspecialchars($site_name, ENT_QUOTES, $modx->config['modx_charset']);

-			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->db->escape($_REQUEST));

-		if(is_array($evtOut)) {

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

-		}

-		?>

+        // invoke OnManagerTreeRender event

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

+        if(is_array($evtOut)) {

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

+        }

+        ?>

 	</div>

 </div>

manager/media/calendar/datepicker.inc.php

Indentation +7 added lines, -7 removed lines

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

 

 class DATEPICKER {

-	function __construct() {

-	}

+    function __construct() {

+    }

 

-	function getDP() {

-		global $modx, $_lang;

+    function getDP() {

+        global $modx, $_lang;

 

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

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

-	}

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

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

+    }

 }