Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -r2868 -r3322
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 2868)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 3322)
@@ -1,20 +1,20 @@
-fields['page_title']."
";
$rs->MoveNext();
}
- $ret.= '';
+ $ret.= '';
echo $ret;
- }
+ }
}
*/
function GetCmsTree()
{
global $Config;
$ret = "";
-
+
if (isset($Config['K4Mode'])) {
$ret.= K4ReadCmsTree(0);
}
@@ -75,21 +75,21 @@
{
$application =& kApplication::Instance();
$application->Init();
-
- $query = 'SELECT Path, Title FROM '.TABLE_PREFIX.'Pages';
+
+ $query = 'SELECT Path, Title FROM '.TABLE_PREFIX.'Pages ORDER By Title';
$pages = $application->DB->Query($query);
-
+
$res = '';
foreach ($pages as $page) {
$page_path = $page['Path'].'.html';
$title = $page['Title'].' ('.$page_path.')';
- $res .= '';
+ $res .= '';
}
-
+
return $res;
}
function ReadCmsTree($st_id, $level = 0)
-{
+{
$conn = GetADODbConnection();
$query = "SELECT value FROM config WHERE name = 'default_lang_prefix'";
$rs = $conn->Execute($query);
@@ -116,56 +116,56 @@
{
$custom_cms = $rs->fields['value'];
}
-*/
- if ( $email_templates_folder_id == "" ) $email_templates_folder_id = 0;
- if ( $cms_mode == 1 ) {
+*/
+ if ( $email_templates_folder_id == "" ) $email_templates_folder_id = 0;
+ if ( $cms_mode == 1 ) {
$query = "
SELECT st.*,
IF(lb.".$default_lang_prefix."_content='' OR lb.".$default_lang_prefix."_content IS NULL,
st.st_path,
lb.".$default_lang_prefix."_content
- ) AS page_title
- FROM
+ ) AS page_title
+ FROM
structure_templates AS st
LEFT JOIN
- live_blocks AS lb
+ live_blocks AS lb
ON
(st.st_id = lb.template_id) AND (lb.block_type = 3)
- WHERE st.st_parent_id = ".$st_id."
- AND st_id != ".$email_templates_folder_id."
+ WHERE st.st_parent_id = ".$st_id."
+ AND st_id != ".$email_templates_folder_id."
AND st_path != '/cms'
ORDER BY st.st_order";
}
else {
$query = "
- SELECT st.*,
+ SELECT st.*,
IF(wb.".$default_lang_prefix."_content='' OR wb.".$default_lang_prefix."_content IS NULL,
st.st_path,
wb.".$default_lang_prefix."_content
- ) AS page_title
- FROM
+ ) AS page_title
+ FROM
structure_templates AS st
LEFT JOIN
- working_blocks AS wb
+ 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 != ".$email_templates_folder_id."
+ st.st_parent_id = ".$st_id."
+ AND st_id != ".$email_templates_folder_id."
AND st_path != '/cms%'
ORDER BY st.st_order";
}
//echo $query."
";
-
+
$rs = $conn->Execute($query);
if ($rs && !$rs->EOF)
{
- while ($rs && !$rs->EOF)
- {
- $page_path = ltrim($rs->fields['st_path'], '/');
- //$page_path = SERVER_NAME.BASE_PATH.'/index.php?t='.$page_path;
+ while ($rs && !$rs->EOF)
+ {
+ $page_path = ltrim($rs->fields['st_path'], '/');
+ //$page_path = SERVER_NAME.BASE_PATH.'/index.php?t='.$page_path;
//$page_path = $page_path;
- $prefix='';
+ $prefix='';
for ($i = 0; $i < $level; $i++)
$prefix .= '--';
if ($level > 0)
@@ -181,7 +181,7 @@
$page = ereg_replace("ã","a",$page);
$res .= '';
$res .= ReadCmsTree($rs->fields['st_id'], $level+1);
-
+
$rs->MoveNext();
}
return $res;