Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -r1415 -r1425
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 1415)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 1425)
@@ -74,15 +74,50 @@
 function ReadCmsTree($st_id, $level = 0)
 {		
 	$conn = GetADODbConnection();
-	$query = "SELECT st.*, wb.eng_content AS page_title
+	
+	$query = "SELECT value FROM config WHERE name = 'cms_direct_mode'";
+	$rs = $conn->Execute($query);
+	if ($rs && !$rs->EOF)
+	{
+		$cms_mode = $rs->fields['value'];
+	}
+
+	$query = "SELECT value FROM config WHERE name = 'email_templates_folder_id'";
+	$rs = $conn->Execute($query);
+	if ($rs && !$rs->EOF)
+	{
+		$email_templates_folder_id = $rs->fields['value'];
+	}
+
+	if ( $email_templates_folder_id == "" ) $email_templates_folder_id = 0;	
+
+
+	if ( $cms_mode == 1 ) { 
+		$query = "
+		SELECT 
+			st.st_path AS page_title, 
+			st.*
+		FROM
+			structure_templates AS st
+		WHERE
+			st.st_parent_id = ".$st_id."
+		AND 
+			st_id != ".$email_templates_folder_id." 	 
+		AND 
+			st_path != '/cms'";
+	}
+	else {
+		$query = "SELECT st.*, wb.eng_content AS page_title
 				FROM
 				structure_templates AS st
 				LEFT JOIN
 				working_blocks AS wb 
 				ON
 				(st.st_id = wb.template_id) AND (wb.block_type = 3)
 				WHERE
-				st.st_parent_id = ".$st_id." AND st_id != '5' AND st_path != '/cms'";
+				st.st_parent_id = ".$st_id." AND st_id != ".$email_templates_folder_id." AND st_path != '/cms'";
+
+	}
 	//echo $query." <br>";
 	
 	$rs = $conn->Execute($query);
@@ -92,15 +127,15 @@
 		{	
 			$page_path = ltrim($rs->fields['st_path'], '/');				
 			//$page_path = SERVER_NAME.BASE_PATH.'/index.php?t='.$page_path;				
-			$page_path = $page_path;
+			//$page_path = $page_path;
 			$prefix='';					
 			for ($i = 0; $i < $level; $i++)
 				$prefix .= '--';
 			if ($level > 0)
 				$prefix=$prefix.'- ';
-			$page_title = htmlspecialchars($rs->fields['page_title']);
-			$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.$page_title.'" serverpath="'.BASE_PATH.'/index.php?t=" />';
-			$res .= ReadCmsTree($rs->fields['st_id'], $level+1);
+
+			$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.htmlspecialchars($rs->fields['page_title']).'" serverpath="'.BASE_PATH.'/index.php?t=" />';
+			//$res .= ReadCmsTree($rs->fields['st_id'], $level+1);
 			
 			$rs->MoveNext();
 		}