From 69dadbfdb141e3cfae2e303ba2858becc9ef5b7f Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 12 May 2015 07:20:51 +0000
Subject: [PATCH] Fix .ini filename/path construction bugs. See
http://wiki.synchro.net/config:ini_files#filenaming for details.
---
web/root/ecwebv3/ftelnet/ftelnet.xjs | 4 ++--
web/root/ecwebv3/lightirc/lightirc.xjs | 2 +-
web/root/error/404.ssjs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/root/ecwebv3/ftelnet/ftelnet.xjs b/web/root/ecwebv3/ftelnet/ftelnet.xjs
index 7dcd0466fe..86bffc8861 100644
--- a/web/root/ecwebv3/ftelnet/ftelnet.xjs
+++ b/web/root/ecwebv3/ftelnet/ftelnet.xjs
@@ -1,6 +1,6 @@
<?xjs
load('webInit.ssjs');
- var f = new File(system.ctrl_dir + 'services.ini');
+ var f = new File(file_cfgname(system.ctrl_dir, 'services.ini'));
if(f.open("r")) {
var fspIni = f.iniGetObject('FlashPolicy');
var wssIni = f.iniGetObject('WebSocket');
@@ -19,7 +19,7 @@
var htmlterm = true;
var wssPort = wssIni.Port;
}
- f = new File(system.ctrl_dir + 'sbbs.ini');
+ f = new File(file_cfgname(system.ctrl_dir, 'sbbs.ini'));
if(f.open("r")) {
var sbbsIni = f.iniGetObject("BBS");
f.close();
diff --git a/web/root/ecwebv3/lightirc/lightirc.xjs b/web/root/ecwebv3/lightirc/lightirc.xjs
index a90e31e945..4ba030e645 100644
--- a/web/root/ecwebv3/lightirc/lightirc.xjs
+++ b/web/root/ecwebv3/lightirc/lightirc.xjs
@@ -1,6 +1,6 @@
<?xjs
load('webInit.ssjs');
- var f = new File(system.ctrl_dir + 'services.ini');
+ var f = new File(file_cfgname(system.ctrl_dir, 'services.ini'));
if(f.open("r")) {
var servicesIni = f.iniGetObject('FlashPolicy');
f.close();
diff --git a/web/root/error/404.ssjs b/web/root/error/404.ssjs
index 2d3f25aae8..cd069102ac 100644
--- a/web/root/error/404.ssjs
+++ b/web/root/error/404.ssjs
@@ -1,7 +1,7 @@
load("file_size.js");
// Load the icons definitions...
-icons=new File(system.ctrl_dir+"webicons.ini");
+icons=new File(file_cfgname(system.ctrl_dir,"webicons.ini"));
if(icons.exists) {
icons.open("r",true);
allicons=icons.iniGetObject();
--
GitLab