From 19634f98eccdfe40c4f2f11181eda49583459e10 Mon Sep 17 00:00:00 2001
From: echicken <>
Date: Wed, 29 Aug 2012 17:43:42 +0000
Subject: [PATCH] Better ftelnet-htmlterm failover with socket policy &
websocket service detection.
---
web/root/ecwebv3/ftelnet/ftelnet.xjs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/web/root/ecwebv3/ftelnet/ftelnet.xjs b/web/root/ecwebv3/ftelnet/ftelnet.xjs
index 0e7b0a71be..57d9e35260 100644
--- a/web/root/ecwebv3/ftelnet/ftelnet.xjs
+++ b/web/root/ecwebv3/ftelnet/ftelnet.xjs
@@ -84,9 +84,7 @@ var ClientVars = {
<script type="text/javascript">
var embed = <?xjs write(embed); ?>;
var htmlterm = <?xjs write(htmlterm); ?>;
- if(!embed) {
- document.getElementById('ClientContainer').innerHTML = "Socket policy server not enabled. fTelnet disabled.";
- } else {
+ if(embed) {
swfobject.embedSWF(
"fTelnet.swf",
"ClientContainer",
@@ -107,13 +105,13 @@ var ClientVars = {
swliveconnect: "true"
},
function (callbackObj) {
- if(!callbackObj.success) {
- if(!htmlterm || !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(!callbackObj.success)
+ embed = false;
}
);
}
+ if(!embed && !htmlterm || (htmlterm && !HtmlTerm.Init("ClientContainer", ClientVars)))
+ document.getElementById('ClientContainer').innerHTML = "Could not load fTelnet or HTMLTerm.";
</script>
</body>
--
GitLab