evolution-cms / evolution

manager/processors/save_role.processor.php

Indentation +106 added lines, -106 removed lines

@@ -1,135 +1,135 @@
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_role')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 extract($_POST);
 
 if($name == '' || !isset ($name)) {
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
+    $modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
 }
 
 // setup fields
 $fields = array(
-	'name' => $name,
-	'description' => $description,
-	'frames' => $frames,
-	'home' => $home,
-	'view_document' => $view_document,
-	'new_document' => $new_document,
-	'save_document' => $save_document,
-	'publish_document' => $publish_document,
-	'delete_document' => $delete_document,
-	'empty_trash' => $empty_trash,
-	'action_ok' => $action_ok,
-	'logout' => $logout,
-	'help' => $help,
-	'messages' => $messages,
-	'new_user' => $new_user,
-	'edit_user' => $edit_user,
-	'logs' => $logs,
-	'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
-	'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
-	'edit_template' => $edit_template,
-	'settings' => $settings,
-	'credits' => $credits,
-	'new_template' => $new_template,
-	'save_template' => $save_template,
-	'delete_template' => $delete_template,
-	'edit_snippet' => $edit_snippet,
-	'new_snippet' => $new_snippet,
-	'save_snippet' => $save_snippet,
-	'delete_snippet' => $delete_snippet,
-	'edit_chunk' => $edit_chunk,
-	'new_chunk' => $new_chunk,
-	'save_chunk' => $save_chunk,
-	'delete_chunk' => $delete_chunk,
-	'empty_cache' => $empty_cache,
-	'edit_document' => $edit_document,
-	'change_password' => $change_password,
-	'error_dialog' => $error_dialog,
-	'about' => $about,
-	'file_manager' => $file_manager,
-	'assets_files' => $assets_files,
-	'assets_images' => $assets_images,
-	'save_user' => $save_user,
-	'delete_user' => $delete_user,
-	'save_password' => $save_password,
-	'edit_role' => $edit_role,
-	'save_role' => $save_role,
-	'delete_role' => $delete_role,
-	'new_role' => $new_role,
-	'access_permissions' => $access_permissions,
-	'bk_manager' => $bk_manager,
-	'new_plugin' => $new_plugin,
-	'edit_plugin' => $edit_plugin,
-	'save_plugin' => $save_plugin,
-	'delete_plugin' => $delete_plugin,
-	'new_module' => $new_module,
-	'edit_module' => $edit_module,
-	'save_module' => $save_module,
-	'delete_module' => $delete_module,
-	'exec_module' => $exec_module,
-	'view_eventlog' => $view_eventlog,
-	'delete_eventlog' => $delete_eventlog,
-	'new_web_user' => $new_web_user,
-	'edit_web_user' => $edit_web_user,
-	'save_web_user' => $save_web_user,
-	'delete_web_user' => $delete_web_user,
-	'web_access_permissions' => $web_access_permissions,
-	'view_unpublished' => $view_unpublished,
-	'import_static' => $import_static,
-	'export_static' => $export_static,
-	'remove_locks' => $remove_locks,
-	'display_locks' => $display_locks,
-	'change_resourcetype' => $change_resourcetype,
-	'category_manager' => $category_manager
+    'name' => $name,
+    'description' => $description,
+    'frames' => $frames,
+    'home' => $home,
+    'view_document' => $view_document,
+    'new_document' => $new_document,
+    'save_document' => $save_document,
+    'publish_document' => $publish_document,
+    'delete_document' => $delete_document,
+    'empty_trash' => $empty_trash,
+    'action_ok' => $action_ok,
+    'logout' => $logout,
+    'help' => $help,
+    'messages' => $messages,
+    'new_user' => $new_user,
+    'edit_user' => $edit_user,
+    'logs' => $logs,
+    'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
+    'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
+    'edit_template' => $edit_template,
+    'settings' => $settings,
+    'credits' => $credits,
+    'new_template' => $new_template,
+    'save_template' => $save_template,
+    'delete_template' => $delete_template,
+    'edit_snippet' => $edit_snippet,
+    'new_snippet' => $new_snippet,
+    'save_snippet' => $save_snippet,
+    'delete_snippet' => $delete_snippet,
+    'edit_chunk' => $edit_chunk,
+    'new_chunk' => $new_chunk,
+    'save_chunk' => $save_chunk,
+    'delete_chunk' => $delete_chunk,
+    'empty_cache' => $empty_cache,
+    'edit_document' => $edit_document,
+    'change_password' => $change_password,
+    'error_dialog' => $error_dialog,
+    'about' => $about,
+    'file_manager' => $file_manager,
+    'assets_files' => $assets_files,
+    'assets_images' => $assets_images,
+    'save_user' => $save_user,
+    'delete_user' => $delete_user,
+    'save_password' => $save_password,
+    'edit_role' => $edit_role,
+    'save_role' => $save_role,
+    'delete_role' => $delete_role,
+    'new_role' => $new_role,
+    'access_permissions' => $access_permissions,
+    'bk_manager' => $bk_manager,
+    'new_plugin' => $new_plugin,
+    'edit_plugin' => $edit_plugin,
+    'save_plugin' => $save_plugin,
+    'delete_plugin' => $delete_plugin,
+    'new_module' => $new_module,
+    'edit_module' => $edit_module,
+    'save_module' => $save_module,
+    'delete_module' => $delete_module,
+    'exec_module' => $exec_module,
+    'view_eventlog' => $view_eventlog,
+    'delete_eventlog' => $delete_eventlog,
+    'new_web_user' => $new_web_user,
+    'edit_web_user' => $edit_web_user,
+    'save_web_user' => $save_web_user,
+    'delete_web_user' => $delete_web_user,
+    'web_access_permissions' => $web_access_permissions,
+    'view_unpublished' => $view_unpublished,
+    'import_static' => $import_static,
+    'export_static' => $export_static,
+    'remove_locks' => $remove_locks,
+    'display_locks' => $display_locks,
+    'change_resourcetype' => $change_resourcetype,
+    'category_manager' => $category_manager
 );
 
 $fields = $modx->db->escape($fields);
 
 switch($_POST['mode']) {
-	case '38' :
-		$tbl = $modx->getFullTableName("user_roles");
+    case '38' :
+        $tbl = $modx->getFullTableName("user_roles");
 
-		// disallow duplicate names for role
-		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
-		if($modx->db->getValue($rs) > 0) {
-			$modx->manager->saveFormValues(38);
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
-		}
+        // disallow duplicate names for role
+        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
+        if($modx->db->getValue($rs) > 0) {
+            $modx->manager->saveFormValues(38);
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
+        }
 
-		$modx->db->insert($fields, $tbl);
+        $modx->db->insert($fields, $tbl);
 
-		// Set the item name for logger
-		$_SESSION['itemname'] = $_POST['name'];
+        // Set the item name for logger
+        $_SESSION['itemname'] = $_POST['name'];
 
-		$header = "Location: index.php?a=86&r=2";
-		header($header);
-		break;
-	case '35' :
-		$tbl = $modx->getFullTableName("user_roles");
+        $header = "Location: index.php?a=86&r=2";
+        header($header);
+        break;
+    case '35' :
+        $tbl = $modx->getFullTableName("user_roles");
 
-		// disallow duplicate names for role
-		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
-		if($modx->db->getValue($rs) > 0) {
-			$modx->manager->saveFormValues(35);
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
-		}
+        // disallow duplicate names for role
+        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
+        if($modx->db->getValue($rs) > 0) {
+            $modx->manager->saveFormValues(35);
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
+        }
 
-		$modx->db->update($fields, $tbl, "id='{$id}'");
+        $modx->db->update($fields, $tbl, "id='{$id}'");
 
-		// Set the item name for logger
-		$_SESSION['itemname'] = $_POST['name'];
+        // Set the item name for logger
+        $_SESSION['itemname'] = $_POST['name'];
 
-		$header = "Location: index.php?a=86&r=2";
-		header($header);
-		break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+        $header = "Location: index.php?a=86&r=2";
+        header($header);
+        break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 $modx->unlockElement(8, $id);

manager/processors/purge_plugin.processor.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 }
 
 if(!$modx->hasPermission('delete_plugin')) {
-	$e->setError(3);
-	$e->dumpError();
+    $e->setError(3);
+    $e->dumpError();
 }
 
 $tbl_site_plugins = $modx->getFullTablename('site_plugins');

manager/processors/remove_content.processor.php

Indentation +14 added lines, -14 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "deleted=1");
@@ -11,9 +11,9 @@ 
 
 // invoke OnBeforeEmptyTrash event
 $modx->invokeEvent("OnBeforeEmptyTrash",
-						array(
-							"ids"=>$ids
-						));
+                        array(
+                            "ids"=>$ids
+                        ));
 
 // remove the document groups link.
 $sql = "DELETE document_groups
@@ -32,15 +32,15 @@ 
 //'undelete' the document.
 $modx->db->delete($modx->getFullTableName('site_content'), "deleted=1");
 
-	// invoke OnEmptyTrash event
-	$modx->invokeEvent("OnEmptyTrash",
-						array(
-							"ids"=>$ids
-						));
+    // invoke OnEmptyTrash event
+    $modx->invokeEvent("OnEmptyTrash",
+                        array(
+                            "ids"=>$ids
+                        ));
 
-	// empty cache
-	$modx->clearCache('full');
+    // empty cache
+    $modx->clearCache('full');
 
-	// finished emptying cache - redirect
-	$header="Location: index.php?a=2&r=1";
-	header($header);
+    // finished emptying cache - redirect
+    $header="Location: index.php?a=2&r=1";
+    header($header);

manager/processors/save_password.processor.php

Indentation +14 added lines, -14 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_password')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = $_POST['id'];
@@ -11,26 +11,26 @@ 
 $pass2 = $_POST['pass2'];
 
 if($pass1!=$pass2){
-	$modx->webAlertAndQuit("Passwords don't match!");
+    $modx->webAlertAndQuit("Passwords don't match!");
 }
 
 if(strlen($pass1)<6){
-	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
+    $modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
     $pass1 = $modx->htmlspecialchars($pass1, ENT_NOQUOTES);
-	$tbl_manager_users = $modx->getFullTableName('manager_users');
-	$uid = $modx->getLoginUserID();
-	$modx->loadExtension('phpass');
-	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+    $tbl_manager_users = $modx->getFullTableName('manager_users');
+    $uid = $modx->getLoginUserID();
+    $modx->loadExtension('phpass');
+    $f['password'] = $modx->phpass->HashPassword($pass1);
+    $modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
 
-	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
-		'userid' => $uid,
-		'username' => $_SESSION['mgrShortname'],
-		'userpassword' => $pass1
-	));
+    // invoke OnManagerChangePassword event
+    $modx->invokeEvent('OnManagerChangePassword', array (
+        'userid' => $uid,
+        'username' => $_SESSION['mgrShortname'],
+        'userpassword' => $pass1
+    ));
 
 $header="Location: index.php?a=2";
 header($header);

manager/processors/empty_table.processor.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));

manager/processors/send_message.processor.php

Indentation +43 added lines, -43 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('messages')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $sendto = $_REQUEST['sendto'];
@@ -16,55 +16,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/frames/tree.php

Indentation +15 added lines, -15 removed lines

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

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

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

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

 }

 

 // invoke OnManagerTreeInit event

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

 if(is_array($evtOut)) {

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

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

 }

 ?>

 

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

 	<div id="treeHolder">

 		<?php

-		// invoke OnManagerTreePrerender event

-		$evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->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/frames/nodes.functions.inc.php

Indentation +553 added lines, -553 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
+    die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 /**
@@ -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;
+    }
 }

install/sqlParser.class.php

Indentation +122 added lines, -122 removed lines

@@ -4,141 +4,141 @@
 // SNUFFKIN/ Alex 2004
 
 class SqlParser {
-	public $host;
-	public $dbname;
-	public $prefix;
-	public $user;
-	public $password;
-	public $mysqlErrors;
-	public $conn;
-	public $installFailed;
-	public $sitename;
-	public $adminname;
-	public $adminemail;
-	public $adminpass;
-	public $managerlanguage;
-	public $mode;
-	public $fileManagerPath;
-	public $imgPath;
-	public $imgUrl;
-	public $dbMODx;
-	public $dbVersion;
+    public $host;
+    public $dbname;
+    public $prefix;
+    public $user;
+    public $password;
+    public $mysqlErrors;
+    public $conn;
+    public $installFailed;
+    public $sitename;
+    public $adminname;
+    public $adminemail;
+    public $adminpass;
+    public $managerlanguage;
+    public $mode;
+    public $fileManagerPath;
+    public $imgPath;
+    public $imgUrl;
+    public $dbMODx;
+    public $dbVersion;
     public $connection_charset;
     public $connection_method;
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
-		$this->host = $host;
-		$this->dbname = $db;
-		$this->prefix = $prefix;
-		$this->user = $user;
-		$this->password = $password;
-		$this->adminpass = $adminpass;
-		$this->adminname = $adminname;
-		$this->adminemail = $adminemail;
-		$this->connection_charset = $connection_charset;
-		$this->connection_method = $connection_method;
-		$this->ignoreDuplicateErrors = false;
-		$this->managerlanguage = $managerlanguage;
+    public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+        $this->host = $host;
+        $this->dbname = $db;
+        $this->prefix = $prefix;
+        $this->user = $user;
+        $this->password = $password;
+        $this->adminpass = $adminpass;
+        $this->adminname = $adminname;
+        $this->adminemail = $adminemail;
+        $this->connection_charset = $connection_charset;
+        $this->connection_method = $connection_method;
+        $this->ignoreDuplicateErrors = false;
+        $this->managerlanguage = $managerlanguage;
         $this->autoTemplateLogic = $auto_template_logic;
-	}
+    }
 
-	public function connect() {
-		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
-		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+    public function connect() {
+        $this->conn = mysqli_connect($this->host, $this->user, $this->password);
+        mysqli_select_db($this->conn, $this->dbname);
+        if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
 
-		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
-			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
-			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
-		}
+        $this->dbVersion = 3.23; // assume version 3.23
+        if(function_exists("mysqli_get_server_info")) {
+            $ver = mysqli_get_server_info($this->conn);
+            $this->dbMODx 	 = version_compare($ver,"4.0.2");
+            $this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
+        }
 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
-	}
+    }
 
     public function process($filename) {
-	    global $custom_placeholders;
-
-		// check to make sure file exists
-		if (!file_exists($filename)) {
-			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
-			return false;
-		}
-
-		$fh = fopen($filename, 'r');
-		$idata = '';
-
-		while (!feof($fh)) {
-			$idata .= fread($fh, 1024);
-		}
-
-		fclose($fh);
-		$idata = str_replace("\r", '', $idata);
-
-		// check if in upgrade mode
-		if ($this->mode === 'upd') {
-			// remove non-upgradeable parts
-			$s = strpos($idata,'non-upgrade-able[[');
-			$e = strpos($idata,']]non-upgrade-able') + 17;
-			if($s && $e) {
-			    $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
+        global $custom_placeholders;
+
+        // check to make sure file exists
+        if (!file_exists($filename)) {
+            $this->mysqlErrors[] = array("error" => "File '$filename' not found");
+            $this->installFailed = true ;
+            return false;
+        }
+
+        $fh = fopen($filename, 'r');
+        $idata = '';
+
+        while (!feof($fh)) {
+            $idata .= fread($fh, 1024);
+        }
+
+        fclose($fh);
+        $idata = str_replace("\r", '', $idata);
+
+        // check if in upgrade mode
+        if ($this->mode === 'upd') {
+            // remove non-upgradeable parts
+            $s = strpos($idata,'non-upgrade-able[[');
+            $e = strpos($idata,']]non-upgrade-able') + 17;
+            if($s && $e) {
+                $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
             }
-		}
-
-		// replace {} tags
-		$idata = str_replace('{PREFIX}', $this->prefix, $idata);
-		$idata = str_replace('{ADMIN}', $this->adminname, $idata);
-		$idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
-		$idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
-		$idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
-		$idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
-		$idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
-		$idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
-		$idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
-		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
-
-		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
-			if (strpos($idata, '{'.$key.'}') !== false) {
-				$idata = str_replace('{'.$key.'}', $val, $idata);
-			}
-		}
-
-		$sql_array = explode("\n\n", $idata);
-
-		$num = 0;
-		foreach($sql_array as $sql_entry) {
-			$sql_do = trim($sql_entry, "\r\n; ");
-
-			if (preg_match('/^\#/', $sql_do)) continue;
-
-			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
-				$sql_do = str_replace('\r', "", $sql_do);
-				$sql_do = str_replace('\n', "", $sql_do);
-			}
-
-
-			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
-				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
-				}
-				// End Ignore duplicate
-				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
-				$this->installFailed = true;
-			}
-		}
-	}
+        }
+
+        // replace {} tags
+        $idata = str_replace('{PREFIX}', $this->prefix, $idata);
+        $idata = str_replace('{ADMIN}', $this->adminname, $idata);
+        $idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
+        $idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
+        $idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
+        $idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
+        $idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
+        $idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
+        $idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
+        /*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
+
+        // Replace custom placeholders
+        foreach($custom_placeholders as $key=>$val) {
+            if (strpos($idata, '{'.$key.'}') !== false) {
+                $idata = str_replace('{'.$key.'}', $val, $idata);
+            }
+        }
+
+        $sql_array = explode("\n\n", $idata);
+
+        $num = 0;
+        foreach($sql_array as $sql_entry) {
+            $sql_do = trim($sql_entry, "\r\n; ");
+
+            if (preg_match('/^\#/', $sql_do)) continue;
+
+            // strip out comments and \n for mysql 3.x
+            if ($this->dbVersion <4.0) {
+                $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+                $sql_do = str_replace('\r', "", $sql_do);
+                $sql_do = str_replace('\n', "", $sql_do);
+            }
+
+
+            $num = $num + 1;
+            if ($sql_do) mysqli_query($this->conn, $sql_do);
+            if(mysqli_error($this->conn)) {
+                // Ignore duplicate and drop errors - Raymond
+                if ($this->ignoreDuplicateErrors){
+                    if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+                }
+                // End Ignore duplicate
+                $this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
+                $this->installFailed = true;
+            }
+        }
+    }
 
     public function close() {
-		mysqli_close($this->conn);
-	}
+        mysqli_close($this->conn);
+    }
 }