From 30464b55fb2deafdf4ca5585d31e5b491ca1bd98 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 30 Sep 2013 04:53:46 +0000
Subject: [PATCH] Simply EXT parsing as with index.xjs
---
web/root/ecwebv3/sidebar/000-pages.ssjs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/web/root/ecwebv3/sidebar/000-pages.ssjs b/web/root/ecwebv3/sidebar/000-pages.ssjs
index 4e2e2e5818..9ef9ef00ed 100644
--- a/web/root/ecwebv3/sidebar/000-pages.ssjs
+++ b/web/root/ecwebv3/sidebar/000-pages.ssjs
@@ -3,20 +3,18 @@ for(var g in e) {
var fn = file_getname(e[g]);
if(!checkWebCtrl(webIni.RootDirectory + "/pages/", fn))
continue;
- var ext = e[g].toUpperCase().split(".").slice(1).join(".");
+ var ext = file_getext(e[g]).toUpperCase();
var h = new File(e[g]);
h.open("r");
var i = h.readAll();
h.close();
- if(file_isdir(e[g]) || ext == "XJS.SSJS")
- continue;
- if(ext == "JS" || ext == "SSJS") {
+ if(ext == ".JS" || (ext == ".SSJS" && e[g].search(/\.xjs\.ssjs$/i)==-1)) {
var title = i[0].replace(/\/\//g, "");
if(title == "HIDDEN")
continue;
print("<a class='link' href=./index.xjs?page=" + file_getname(e[g]) + ">" + title + "</a><br />");
}
- if(ext == "HTML" || ext == "XJS") {
+ if(ext == ".HTML" || ext == ".XJS") {
// Seek first comment line in an HTML document
for(j = 0; j < i.length; j++) {
var k = i[j].match(/^\<\!\-\-.*\-\-\>$/);
@@ -29,9 +27,9 @@ for(var g in e) {
break;
}
}
- if(ext == "TXT") {
+ if(ext == ".TXT") {
if(i[0] == "HIDDEN")
continue;
print("<a class='link' href=./index.xjs?page=" + file_getname(e[g]) + ">" + i[0] + "</a><br />");
}
-}
\ No newline at end of file
+}
--
GitLab