evolution-cms / evolution

manager/frames/nodes.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  *  Build and return document tree view nodes
  *
  */
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
@@ -18,11 +18,11 @@ 
     exit('send some data');
 } //??
 
-$indent = (int)$_REQUEST['indent'];
-$parent = (int)$_REQUEST['parent'];
-$expandAll = (int)$_REQUEST['expandAll'];
+$indent = (int) $_REQUEST['indent'];
+$parent = (int) $_REQUEST['parent'];
+$expandAll = (int) $_REQUEST['expandAll'];
 $output = '';
-$theme = $manager_theme . "/";
+$theme = $manager_theme."/";
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 
 if (isset($_REQUEST['showonlyfolders'])) {

manager/frames/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.');
 }
 
 /**
@@ -12,443 +12,443 @@ 
  * @return string
  */
 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;
 }
 
 /**
@@ -456,30 +456,30 @@ 
  * @return array
  */
 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;
 }
 
 /**
@@ -487,30 +487,30 @@ 
  * @return array
  */
 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;
 }
 
 /**
@@ -519,49 +519,49 @@ 
  * @return string
  */
 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;
 }
 
 /**
@@ -569,16 +569,16 @@ 
  * @return bool
  */
 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;
+    }
 }
 
 /**
@@ -587,9 +587,9 @@ 
  * @return int
  */
 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 . ' '));
 }
 
 /**
@@ -597,19 +597,19 @@ 
  * @return string
  */
 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;
 }
 
 /**
  * @return string
  */
 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+]"
@@ -636,7 +636,7 @@ 
  * @return string
  */
 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+]"
@@ -675,7 +675,7 @@ 
  * @return string
  */
 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+]"
@@ -711,10 +711,10 @@ 
  * @param bool $flag
  */
 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;
+    }
 }

Spacing +107 added lines, -107 removed lines

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

Braces +22 added lines, -11 removed lines

@@ -11,7 +11,8 @@ 
  * @param string $hereid
  * @return string
  */
-function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
+function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '')
+{
 	global $modx;
 	global $icons, $iconsPrivate, $_style;
 	global $_lang, $opened, $opened2, $closed2; //added global vars
@@ -455,7 +456,8 @@ 
  * @param array $_style
  * @return array
  */
-function getIconInfo($_style) {
+function getIconInfo($_style)
+{
 	if(!isset($_style['tree_page_gif'])) {
 		$_style['tree_page_gif'] = $_style['tree_page'];
 	}
@@ -486,7 +488,8 @@ 
  * @param array $_style
  * @return array
  */
-function getPrivateIconInfo($_style) {
+function getPrivateIconInfo($_style)
+{
 	if(!isset($_style['tree_page_gif_secure'])) {
 		$_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
 	}
@@ -518,7 +521,8 @@ 
  * @param array $row
  * @return string
  */
-function getNodeTitle($nodeNameSource, $row) {
+function getNodeTitle($nodeNameSource, $row)
+{
 	global $modx;
 
 	switch($nodeNameSource) {
@@ -568,7 +572,8 @@ 
  * @param string $nodeNameSource
  * @return bool
  */
-function isDateNode($nodeNameSource) {
+function isDateNode($nodeNameSource)
+{
 	switch($nodeNameSource) {
 		case 'createdon':
 		case 'editedon':
@@ -586,7 +591,8 @@ 
  * @param int $isfolder
  * @return int
  */
-function checkIsFolder($parent = 0, $isfolder = 1) {
+function checkIsFolder($parent = 0, $isfolder = 1)
+{
 	global $modx;
 
 	return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
@@ -596,7 +602,8 @@ 
  * @param mixed $array
  * @return string
  */
-function _htmlentities($array) {
+function _htmlentities($array)
+{
 	global $modx;
 
 	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
@@ -608,7 +615,8 @@ 
 /**
  * @return string
  */
-function getTplSingleNode() {
+function getTplSingleNode()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -635,7 +643,8 @@ 
 /**
  * @return string
  */
-function getTplFolderNode() {
+function getTplFolderNode()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -674,7 +683,8 @@ 
 /**
  * @return string
  */
-function getTplFolderNodeNotChildren() {
+function getTplFolderNodeNotChildren()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -710,7 +720,8 @@ 
  * @param int|string|array $str
  * @param bool $flag
  */
-function dbug($str, $flag = false) {
+function dbug($str, $flag = false)
+{
 	print('<pre>');
 	print_r($str);
 	print('</pre>');