From e99139fdbadb00c380161cf8d93cce68a83a1e41 Mon Sep 17 00:00:00 2001
From: watanaby <>
Date: Fri, 20 Oct 2006 00:56:25 +0000
Subject: [PATCH] Ver.1.4.3: Move JavaScript code from html-file to external
 js-file.

---
 opengate/README                       |  1 +
 opengate/conf/opengatesrv.conf.sample | 13 ++++--
 opengate/doc/Changes.html             |  5 ++
 opengate/javahtml/en/httpkeep.html    | 83 ++++-----------------------------
 opengate/javahtml/httpkeep.js         | 66 ++++++++++++++++++++++++++
 opengate/javahtml/ja/httpkeep.html    | 87 +++++------------------------------
 opengate/opengatesrv/get-param.c      |  2 +-
 opengate/opengatesrv/watch-client.c   |  9 +++-
 8 files changed, 109 insertions(+), 157 deletions(-)
 create mode 100644 opengate/javahtml/httpkeep.js

diff --git a/opengate/README b/opengate/README
index 2aff8a0..ae2fb1b 100644
--- a/opengate/README
+++ b/opengate/README
@@ -52,6 +52,7 @@ javahtml/	Client Java Applet and HTML files
   Opengate.java		Java Applet source file
   OpengateClient.class	Java Applet sub executable file
   index.html.var	Document selector placed in DocumentRoot
+  httpkeep.js		JavaScript code for http keep-alive
 
   en/ & ja/		HTML files for each language
     accept-java.html	Accept message page for java mode
diff --git a/opengate/conf/opengatesrv.conf.sample b/opengate/conf/opengatesrv.conf.sample
index 8409530..916e996 100644
--- a/opengate/conf/opengatesrv.conf.sample
+++ b/opengate/conf/opengatesrv.conf.sample
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Opengate version="1.4">
+<Opengate version="1.4.3">
 
 <!-- ################################################# 
 #    ####### NEED TO MODIFY FOLLOWING PARAMETERS #####  -->
@@ -30,7 +30,7 @@
 	<Debug>0</Debug>
 
 	<!-- client usage watch mode in default('Java', 'Http', or 'Time') -->
-	<WatchMode>Java</WatchMode>
+	<WatchMode>Http</WatchMode>
 	
 	<!-- Syslog (local0, local1, .., local7)-->
 	<Syslog>
@@ -54,9 +54,9 @@
 		<NoPacketInterval>5400</NoPacketInterval>
 	</ActiveCheck>
 
-	<!-- HTTP 'HELLO' request interval(ms) to Keep-Alive -->
+	<!-- HTTP 'HELLO' request interval(sec) to Keep-Alive -->
 	<!--  this must be smaller than the keep-alive time of browsers -->
-	<HttpHelloInterval>50000</HttpHelloInterval>
+	<HttpHelloInterval>50</HttpHelloInterval>
 
 	<!-- IPFW rule number range used by opengate -->
 	<IpfwRule>
@@ -86,7 +86,7 @@
 	<CgiDir>/cgi-bin</CgiDir>
 	<OpengateDir>/opengate</OpengateDir>
 
-	<!-- HTML Documents -->
+	<!-- HTML Documents (in each language dir)-->
 	<DenyDoc>deny.html</DenyDoc>
 	<DenyDocSsl>deny-ssl.html</DenyDocSsl>
 	<AcceptDocHttp>accept-http.html</AcceptDocHttp>
@@ -104,6 +104,9 @@
 	<FwdCgi>opengatefwd.cgi</FwdCgi>
 	<MainCgi>opengatesrv.cgi</MainCgi>
 
+	<!-- Java Script (in opengate dir) -->
+	<HttpKeepJS>httpkeep.js</HttpKeepJS>
+
 	<!-- URL used to retry -->
 	<ExternalUrl>http://www.google.com/</ExternalUrl>
 
diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index cee202e..efb380a 100644
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -493,6 +493,11 @@ Ver.1.4.2 at 2006.10.19</DT>
 <DD>
 Ingore Http watch mode on HTTP/1.0 browser.
 </DD>
+<DT>
+Ver.1.4.3 at 2006.10.20</DT>
+<DD>
+Move JavaScript from html-file to external js-file. Modify some message.
+</DD>
 
 </DL>
 <b>Please see CVS in SourceForge.net to check the file difference between versions.</b>
diff --git a/opengate/javahtml/en/httpkeep.html b/opengate/javahtml/en/httpkeep.html
index 1d49fe8..d347ab8 100644
--- a/opengate/javahtml/en/httpkeep.html
+++ b/opengate/javahtml/en/httpkeep.html
@@ -3,78 +3,12 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>Http Keep-Alive</title>
 
-<script type="text/javascript">
-
-//<!--
-function createXMLHttpRequest() {
-  try { return new ActiveXObject("Msxml2.XMLHTTP");    } catch(e) {}
-  try { return new ActiveXObject("Microsoft.XMLHTTP"); } catch(e) {}
-  try { return new XMLHttpRequest();                   } catch(e) {}
-  alert("XMLHttpRequest not supported");
-  return null;
-}
-
-function onTimeout()
-{
-  if(httpObj.readyState!=4){
-    document.getElementById("dispmsg").innerHTML = 'ERROR-01';
-    connect=0;
-  }
-
-  if(connect==1){
-    sendHello();
-    setTimeout('onTimeout()', timeInterval);
-  }
-}
-
-function sendHello(){
-
-  // http communication object
-  httpObj=createXMLHttpRequest();
-  httpObj.onreadystatechange = displayResponse;
-
-  try{  
-    httpObj.open("GET","%%HTTPHELLOURL%%"+Math.random(),true);
-  }catch(e){
-    document.getElementById("dispmsg").innerHTML = 'ERROR-02';
-    connect=0;
-  }
-
-  httpObj.send(null);
-}
-
-function displayResponse()
-{
-  if(httpObj.readyState==4){
-    today=new Date; 
-    hh=today.getHours();  mm=today.getMinutes();
-    if(hh<10)hh='0'+hh;   if(mm<10)mm='0'+mm;
-    document.getElementById("dispmsg").innerHTML = hh+':'+mm;
-  }
-}
-
-function init()
-{
-  connect=1;
-  sendHello();
-
-  // http request after timeInterval(ms)
-  timeInterval =%%HTTPHELLOINTERVAL%%;
-
-  // get next text after some delay
-  setTimeout('onTimeout()', timeInterval);
-}
-//-->
-</script>
+<script type="text/JavaScript" src="http://opengate.og.saga-u.ac.jp/opengate/httpkeep.js"></script>
 
 </head>
 
 <body>
 
-<script language="JavaScript">
-<!--
-  init();
-//-->
 </script>
 <noscript>
 <p><b>JavaScript is disabled. Change it.</b></p>
@@ -100,16 +34,10 @@ You will be disconnected from the network automatically.</p>
 <hr />
 
 
-<p>If ERROR is shown at the rightside of above bar, 
+<p>Normally, the clock at the rightside of above bar is updated. If not, 
 click <a href="%%TERMINATEURL%%"><b>TERMINATE</b></a>, 
  close your browser, and try to select JAVA in authentication page.</p>
 
-<script language="JavaScript">
-!--
-  window.open("%%STARTURL%%","window1");
-//-->
-</script>
-
 <table bgcolor="lightyellow" border="1">
 <tr><td>
 Please leave this window as it is (or minimized), and work on another window. 
@@ -119,5 +47,12 @@ click <a href="%%STARTURL%%" target="_blank"><h3>[Start Page]</h3></a>
 </td></tr>
 </table>
 
+<script>
+//<!--
+  window.open("%%STARTURL%%","window1");
+ initHttpkeep(%%HTTPHELLOINTERVAL%%,"%%HTTPHELLOURL%%");
+//-->
+</script>
+
 </body>
 </html>
diff --git a/opengate/javahtml/httpkeep.js b/opengate/javahtml/httpkeep.js
new file mode 100644
index 0000000..b663fdc
--- /dev/null
+++ b/opengate/javahtml/httpkeep.js
@@ -0,0 +1,66 @@
+//<!--
+var connect;
+var timeInterval;
+var httpkeepUrl;
+var httpObj;
+
+function createXMLHttpRequest() {
+  try { return new ActiveXObject("Msxml2.XMLHTTP");    } catch(e) {}
+  try { return new ActiveXObject("Microsoft.XMLHTTP"); } catch(e) {}
+  try { return new XMLHttpRequest();                   } catch(e) {}
+  document.getElementById("dispmsg").innerHTML = 'ERROR-noAJAX';
+  return null;
+}
+
+function onTimeout()
+{
+  if(httpObj.readyState!=4){
+    document.getElementById("dispmsg").innerHTML = 'ERROR-noREPLY';
+    connect=0;
+  }
+
+  if(connect==1){
+    sendHello();
+    setTimeout('onTimeout()', timeInterval);
+  }
+}
+
+function sendHello(){
+
+  // http communication object
+  httpObj=createXMLHttpRequest();
+  httpObj.onreadystatechange = displayResponse;
+
+  try{  
+    httpObj.open("GET",httpkeepUrl+Math.random(),true);
+  }catch(e){
+    document.getElementById("dispmsg").innerHTML = "ERROR-noOPEN";
+    connect=0;
+  }
+
+  httpObj.send(null);
+}
+
+function displayResponse()
+{
+  if(httpObj.readyState==4){
+    today=new Date; 
+    hh=today.getHours();  mm=today.getMinutes();
+    if(hh<10)hh='0'+hh;   if(mm<10)mm='0'+mm;
+    document.getElementById("dispmsg").innerHTML = hh+':'+mm;
+  }
+}
+
+function initHttpkeep(interval, url)
+{
+  connect=1;
+  sendHello();
+
+  // http request after timeInterval(ms)
+  timeInterval = interval*1000;
+  httpkeepUrl=url;
+
+  // get next text after some delay
+  setTimeout('onTimeout()', timeInterval);
+}
+//-->
\ No newline at end of file
diff --git a/opengate/javahtml/ja/httpkeep.html b/opengate/javahtml/ja/httpkeep.html
index d65112f..acb43f8 100644
--- a/opengate/javahtml/ja/httpkeep.html
+++ b/opengate/javahtml/ja/httpkeep.html
@@ -3,83 +3,17 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-2022-jp">
 <title>Http Keep-Alive</title>
 
-<script type="text/javascript">
-
-//<!--
-function createXMLHttpRequest() {
-  try { return new ActiveXObject("Msxml2.XMLHTTP");    } catch(e) {}
-  try { return new ActiveXObject("Microsoft.XMLHTTP"); } catch(e) {}
-  try { return new XMLHttpRequest();                   } catch(e) {}
-  alert("XMLHttpRequest not supported");
-  return null;
-}
-
-function onTimeout()
-{
-  if(httpObj.readyState!=4){
-    document.getElementById("dispmsg").innerHTML = 'ERROR-01';
-    connect=0;
-  }
-
-  if(connect==1){
-    sendHello();
-    setTimeout('onTimeout()', timeInterval);
-  }
-}
-
-function sendHello(){
-
-  // http communication object
-  httpObj=createXMLHttpRequest();
-  httpObj.onreadystatechange = displayResponse;
-
-  try{  
-    httpObj.open("GET","%%HTTPHELLOURL%%"+Math.random(),true);
-  }catch(e){
-    document.getElementById("dispmsg").innerHTML = 'ERROR-02';
-    connect=0;
-  }
-
-  httpObj.send(null);
-}
-
-function displayResponse()
-{
-  if(httpObj.readyState==4){
-    today=new Date; 
-    hh=today.getHours();  mm=today.getMinutes();
-    if(hh<10)hh='0'+hh;   if(mm<10)mm='0'+mm;
-    document.getElementById("dispmsg").innerHTML = hh+':'+mm;
-  }
-}
-
-function init()
-{
-  connect=1;
-  sendHello();
-
-  // http request after timeInterval(ms)
-  timeInterval =%%HTTPHELLOINTERVAL%%;
-
-  // get next text after some delay
-  setTimeout('onTimeout()', timeInterval);
-}
-//-->
-</script>
+<script type="text/JavaScript" src="%%HTTPKEEPJSURL%%"></script>
 
 </head>
 
 <body>
 
-<script language="JavaScript">
-<!--
-  init();
-//-->
-</script>
 <noscript>
 <p><b>JavaScriptが無効に設定されています。確認下さい。</b></p>
 </noscript>
 
+
 <p>ネットワークを利用できます。</p>
 <p>利用が終ったら必ずWebブラウザを終了してください。ネットワーク利用許可も自動的に取り消されます。
 </p>
@@ -98,15 +32,10 @@ function init()
 </p>
 <hr />
 
-<p>上のバー右端にERRORが表示されるときは、
+<p>正常時には、上のバー右端の時計が更新されます。そうならない場合は、
 <a href="%%TERMINATEURL%%"><b>利用中断</b></a>をクリックして
 ブラウザを終了した後、認証ページにおいてJAVA方式を選択してください。
-
-<script language="JavaScript">
-!--
-  window.open("%%STARTURL%%","window1");
-//-->
-</script>
+</p>
 
 <table bgcolor="lightyellow" border="1">
 <tr><td>
@@ -114,10 +43,16 @@ function init()
 作業用ウィンドウが開かない場合には、
 <a href="%%STARTURL%%" target="_blank"><h3>[スタートページ]</h3></a>
 をクリックしてください。
-
 </td></tr>
 </table>
 
+<script>
+//<!--
+  window.open("%%STARTURL%%","window1");
+ initHttpkeep(%%HTTPHELLOINTERVAL%%,"%%HTTPHELLOURL%%");
+//-->
+</script>
+
 
 </body>
 </html>
diff --git a/opengate/opengatesrv/get-param.c b/opengate/opengatesrv/get-param.c
index 2d058b9..11cc9f2 100644
--- a/opengate/opengatesrv/get-param.c
+++ b/opengate/opengatesrv/get-param.c
@@ -28,7 +28,7 @@ Programmed by Yoshiaki WATANABE
 #include "opengatesrv.h"
 #include "../ezxml/ezxml.h"
 
-#define CONFFILE_VERSION "1.4"
+#define CONFFILE_VERSION "1.4.3"
 #define SEPARATOR "/"
 
 int debug=0;
diff --git a/opengate/opengatesrv/watch-client.c b/opengate/opengatesrv/watch-client.c
index 73e317e..8b87daf 100644
--- a/opengate/opengatesrv/watch-client.c
+++ b/opengate/opengatesrv/watch-client.c
@@ -672,6 +672,7 @@ void sendHttpKeepPage(char *userid, char *language, int port)
   char httpHelloUrl[BUFFMAXLN];
   char terminateUrl[BUFFMAXLN];
   char acceptDoc2Url[BUFFMAXLN];
+  char httpkeepJsUrl[BUFFMAXLN];
   char *startPageUrl=GetConfValue("StartPage/Url");
   int startPageType=atoi(GetConfValue("StartPage/Type"));
 
@@ -688,9 +689,14 @@ void sendHttpKeepPage(char *userid, char *language, int port)
   snprintf(httpHelloUrl, BUFFMAXLN, "http://%s:%d/hello-%s", 
 	  GetConfValue("OpengateServerName"), port, userid);
 
-  /* create httphello interval [50000] */
+  /* create httphello interval [50] */
   snprintf(httpHelloInterval, WORDMAXLN, "%s", GetConfValue("HttpHelloInterval"));
 
+  /* create httpkeep.js url[http://<serveraddr>/opengate/httpkeep.js] */
+  snprintf(httpkeepJsUrl, BUFFMAXLN, "http://%s%s/%s", 
+	   GetConfValue("OpengateServerName"),
+	   GetConfValue("OpengateDir"),GetConfValue("HttpKeepJS"));
+
   /* create path to httpkeep doc */
   snprintf(httpKeepDoc,BUFFMAXLN, "%s%s/%s/%s",GetConfValue("DocumentRoot"),
 	  GetConfValue("OpengateDir"),language,GetConfValue("HttpKeepDoc"));
@@ -717,6 +723,7 @@ void sendHttpKeepPage(char *userid, char *language, int port)
     htmlReplace(buff, "%%HTTPHELLOURL%%", httpHelloUrl);
     htmlReplace(buff, "%%USERID%%", userid);
     htmlReplace(buff, "%%TERMINATEURL%%", terminateUrl);
+    htmlReplace(buff, "%%HTTPKEEPJSURL%%", httpkeepJsUrl);
 
     /* replace start url mark */
     if( startPageType==1 ){
-- 
2.11.0