diff --git a/web/root/ecwebv3/ftelnet/ftelnet.xjs b/web/root/ecwebv3/ftelnet/ftelnet.xjs
index 14b3279585f42cc4d5fbc25afc91b5d2c8611982..69ea78b0120438344ebea39a0d00aea6a97de378 100644
--- a/web/root/ecwebv3/ftelnet/ftelnet.xjs
+++ b/web/root/ecwebv3/ftelnet/ftelnet.xjs
@@ -2,11 +2,15 @@
load('webInit.ssjs');
var f = new File(system.ctrl_dir + 'services.ini');
if(f.open("r")) {
- var servicesIni = f.iniGetObject('Socket-Policy');
+ var servicesIni = f.iniGetObject('FlashPolicy');
f.close();
- var fspPort = servicesIni.Port;
- } else {
+ }
+ if(servicesIni === undefined || servicesIni === null) {
+ var embed = false;
var fspPort = 843;
+ } else {
+ var embed = true;
+ var fspPort = servicesIni.Port;
}
f = new File(system.ctrl_dir + 'sbbs.ini');
if(f.open("r")) {
@@ -56,7 +60,7 @@ var ClientVars = {
VT : 0,
WebSocketHostName : "<?xjs write(system.inet_addr); ?>",
WebSocketPort : 1123
-}
+};
</script>
<script type="text/javascript" src="./ClientFuncs.js"></script>
<script type="text/javascript" src="./swfobject.js"></script>
@@ -71,32 +75,36 @@ var ClientVars = {
<div id="ClientContainer"></div>
</p>
<script type="text/javascript">
- swfobject.embedSWF(
- "fTelnet.swf",
- "ClientContainer",
- "100%",
- "100%",
- "10.2.0",
- "playerProductInstall.swf",
- ClientVars,
- {
- allowfullscreen: "true",
- allowscriptaccess: "sameDomain",
- bgcolor: "#ffffff", quality: "high"
- },
- {
- align: "middle",
- id: "fTelnet",
- name: "fTelnet",
- swliveconnect: "true"
- },
- function (callbackObj) {
- if (!callbackObj.success) {
- if (!HtmlTerm.Init("ClientContainer", ClientVars))
- alert("Sorry, I wasn't able to load either fTelnet or HtmlTerm\n\nTry again with Flash 10+ installed (for fTelnet), or with an HTML5 capable browser (for HtmlTerm)");
+ if(!<?xjs write(embed); ?>) {
+ document.getElementById('ClientContainer').innerHTML = "Socket policy server not enabled. fTelnet disabled.";
+ } else {
+ swfobject.embedSWF(
+ "fTelnet.swf",
+ "ClientContainer",
+ "100%",
+ "100%",
+ "10.2.0",
+ "playerProductInstall.swf",
+ ClientVars,
+ {
+ allowfullscreen: "true",
+ allowscriptaccess: "sameDomain",
+ bgcolor: "#ffffff", quality: "high"
+ },
+ {
+ align: "middle",
+ id: "fTelnet",
+ name: "fTelnet",
+ swliveconnect: "true"
+ },
+ function (callbackObj) {
+ if (!callbackObj.success) {
+ if (!HtmlTerm.Init("ClientContainer", ClientVars))
+ alert("Sorry, I wasn't able to load either fTelnet or HtmlTerm\n\nTry again with Flash 10+ installed (for fTelnet), or with an HTML5 capable browser (for HtmlTerm)");
+ }
}
- }
- );
+ );
+ }
</script>
</body>
diff --git a/web/root/ecwebv3/lightirc/lightirc.xjs b/web/root/ecwebv3/lightirc/lightirc.xjs
index 41a01d5ac8bdc19739debbeba6dfdfcacdbaf1d5..e807a52414cae0af977f57b78d99ce8704d09f2d 100644
--- a/web/root/ecwebv3/lightirc/lightirc.xjs
+++ b/web/root/ecwebv3/lightirc/lightirc.xjs
@@ -2,11 +2,14 @@
load('webInit.ssjs');
var f = new File(system.ctrl_dir + 'services.ini');
if(f.open("r")) {
- var servicesIni = f.iniGetObject('Socket-Policy');
+ var servicesIni = f.iniGetObject('FlashPolicy');
f.close();
- var fspPort = servicesIni.Port;
+ }
+ if(servicesIni === undefined || servicesIni === null) {
+ var embed = false;
} else {
- var fspPort = 843;
+ var embed = true;
+ var fspPort = servicesIni.Port;
}
?>
@@ -19,18 +22,19 @@
<body>
<div id="lightIRC">LightIRC would appear here if you had Flash Player installed and Javascript enabled.</div>
<script language="javascript" type="text/javascript">
-if(swfobject.getFlashPlayerVersion().major >= 9) {
- document.getElementById('lightIRC').innerHTML = "";
- var params = {
- host : '<?xjs write(system.inet_addr); ?>',
- policyPort : '<?xjs write(fspPort); ?>',
- language : 'en',
- nickselect : 'yes',
- nick : '<?xjs write(user.alias); ?>',
- autojoin : '#bbs'
- };
+document.getElementById('lightIRC').innerHTML = "";
+var params = {
+ host : '<?xjs write(system.inet_addr); ?>',
+ policyPort : '<?xjs write(fspPort); ?>',
+ language : 'en',
+ nickselect : 'yes',
+ nick : '<?xjs write(user.alias); ?>',
+ autojoin : '#bbs'
+};
+if(<?xjs write(embed); ?>)
swfobject.embedSWF('http://<?xjs write(system.inet_addr); ?>:<?xjs write(webIni.HTTPPort); ?>/lightirc/lightIRC.swf', 'lightIRC', '730', '420', '9.0.0', null, params, null);
-}
+else
+ document.getElementById('lightIRC').innerHTML = 'Socket policy server not enabled. LightIRC not loaded.';
</script>
</body>