From 51f7ccb006071727cf2f2d097395781c08416b16 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 30 Sep 2013 04:39:35 +0000
Subject: [PATCH] More obvious way of skipping .xjs.ssjs files. Also, this
fixes an error if the path contains a dot.
---
web/root/ecwebv3/index.xjs | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/web/root/ecwebv3/index.xjs b/web/root/ecwebv3/index.xjs
index b95c480483..4065c3fd84 100644
--- a/web/root/ecwebv3/index.xjs
+++ b/web/root/ecwebv3/index.xjs
@@ -52,18 +52,16 @@
var fn = file_getname(d[f]);
if(!checkWebCtrl(webIni.RootDirectory + '/sidebar/', fn))
continue;
- var ext = d[f].toUpperCase().split(".").slice(1).join(".");
- if(ext == "XJS.SSJS")
- continue;
- if(ext == "SSJS") {
+ var ext = file_getext(fn).toUpperCase();
+ if(ext == ".SSJS" && fn.search(/\.xjs\.ssjs$/i)==-1) {
print('<div class="sidebarItem border box background">');
load(d[f]);
print('</div>')
- } else if(ext == "XJS") {
+ } else if(ext == ".XJS") {
print('<div class="sidebarItem border box background">');
load(xjs_compile(d[f]));
print('</div>');
- } else if(ext == "TXT" || ext == "HTML") {
+ } else if(ext == ".TXT" || ext == ".HTML") {
var handle = new File(d[f]);
handle.open("r");
var printme = handle.read();
@@ -94,7 +92,7 @@
var f = file_exists(webIni.RootDirectory + "/pages/" + page);
if(!f || !checkWebCtrl(webIni.RootDirectory + "/pages/", page)) {
print("Page not available.");
- } else if(ext == ".SSJS") {
+ } else if(ext == ".SSJS" && page.search(/\.xjs\.ssjs$/i)==-1) {
load(webIni.RootDirectory + "/pages/" + page);
} else if(f && ext == ".HTML") {
var f = new File(webIni.RootDirectory + "/pages/" + page);
@@ -127,4 +125,4 @@
</div>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
--
GitLab