* Experimental move of wholist to a separate auto-refreshing window
authorArt Cancro <ajc@citadel.org>
Thu, 23 Mar 2000 04:45:18 +0000 (04:45 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 23 Mar 2000 04:45:18 +0000 (04:45 +0000)
webcit/ChangeLog
webcit/static/menubar.html
webcit/webcit.c
webcit/who.c

index a42cf9778569df26131896432e706514de705cad..bf6ebc72daf00df36e549de92ef9fd919c903b97 100644 (file)
@@ -1,4 +1,7 @@
 $Log$
+Revision 211.6  2000/03/23 04:45:15  ajc
+* Experimental move of wholist to a separate auto-refreshing window
+
 Revision 211.5  2000/03/19 22:49:03  ajc
 * Made the header-bar buttons more visible
 * Added a "reply" header-bar button
@@ -392,4 +395,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-
index 5c934edcdb51b653e4cd44db43781fc747b515a9..89bf5fdc3f53c8e0da5fbeca444702fdcda97964 100644 (file)
@@ -1,3 +1,11 @@
+<SCRIPT LANGUAGE="JavaScript">
+
+function LaunchWho() {
+       pwin = window.open('/whobbs', 'TheWholist', 'toolbar=no,location=no,copyhistory=no,status=yes,scrollbars=yes');
+
+}
+</SCRIPT>
+
 <CENTER>
 <IMG SRC="/image&name=hello"><BR><BR>
 
@@ -46,7 +54,9 @@
 </TR><TR>
        <TD BGCOLOR="#663399">
                <FONT SIZE=-1>
-               <A HREF="/whobbs"><FONT COLOR="#FFFFFF">Who&nbsp;is&nbsp;online?</FONT></A>
+               <A HREF="javascript:LaunchWho()">
+               <FONT COLOR="#FFFFFF">Who&nbsp;is&nbsp;online?</FONT>
+               </A>
                </FONT>
        </TD>
 </TR><TR>
index fa50cc04618bfa4cd7cad560b0d96d75e2cd1b3d..57d11dbc6050081d6214104819c89023decdd942 100644 (file)
@@ -268,17 +268,25 @@ void urlescputs(char *strbuf)
 /*
  * Output all that important stuff that the browser will want to see
  *
- * print_standard_html_head values:
+ * control codes:
+ * 
+ * Bits 0 and 1:
  * 0 = Nothing.  Do not display any leading HTTP or HTML.
  * 1 = HTTP headers plus the "fake frames" found in most windows.
  * 2 = HTTP headers required to terminate the session (unset cookies)
- * 3 = HTTP headers only.
+ * 3 = HTTP and HTML headers, but no 'fake frames'
+ *
+ * Bit 2: Set to 1 to auto-refresh page every 30 seconds
  */
-void output_headers(int print_standard_html_head)
+void output_headers(int controlcode)
 {
-
        static char *unset = "; expires=28-May-1971 18:10:00 GMT";
        char cookie[256];
+       int print_standard_html_head = 0;
+       int refresh30 = 0;
+
+       print_standard_html_head        =       controlcode & 0x03;
+       refresh30                       =       ((controlcode & 0x04) >> 2);
 
        wprintf("HTTP/1.0 200 OK\n");
 
@@ -303,8 +311,11 @@ void output_headers(int print_standard_html_head)
                wprintf("<HTML><HEAD><TITLE>");
                escputs(serv_info.serv_humannode);
                wprintf("</TITLE>\n"
-                       "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n"
-                       "</HEAD>\n");
+                       "<META HTTP-EQUIV=\"Expires\" CONTENT=\"0\">\n"
+                       "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n");
+               if (refresh30) wprintf(
+                       "<META HTTP-EQUIV=\"refresh\" CONTENT=\"30\">\n");
+               wprintf("</HEAD>\n");
                if (WC->ExpressMessages != NULL) {
                        wprintf("<SCRIPT language=\"javascript\">\n");
                        wprintf("function ExpressMessage() {\n");
index 67fe43c64c0d05cd9ba94cd6e5fa63d19dd699cb..2952df956bc9fe64f7f76ba9bcaec1e81ed893ba 100644 (file)
@@ -49,18 +49,27 @@ void whobbs(void)
        char buf[256], sess, user[256], room[256], host[256];
        int foundit;
 
-       output_headers(1);
+       output_headers(7);
+
+
+       wprintf("<SCRIPT LANGUAGE=\"JavaScript\">\n"
+               "function ConfirmKill() { \n"
+               "return confirm('Do you really want to kill this session?');\n"
+               "}\n"
+               "</SCRIPT>\n"
+       );
 
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Users currently on ");
        escputs(serv_info.serv_humannode);
        wprintf("</B></FONT></TD></TR></TABLE>\n");
 
-       wprintf("<CENTER>\n<TABLE BORDER=1>\n<TR>\n");
-       wprintf("<TH><FONT FACE=\"Arial,Helvetica,sans-serif\">Session ID</FONT></TH>\n");
-       wprintf("<TH><FONT FACE=\"Arial,Helvetica,sans-serif\">User Name</FONT></TH>\n");
-       wprintf("<TH><FONT FACE=\"Arial,Helvetica,sans-serif\">Room</FONT></TH>");
-       wprintf("<TH><FONT FACE=\"Arial,Helvetica,sans-serif\">From host</FONT></TH>\n</TR>\n");
+       wprintf("<FONT SIZE=-3>\n");
+       wprintf("<CENTER>\n<TABLE BORDER=1 WIDTH=100%>\n<TR>\n");
+       wprintf("<TH>Session ID</FONT></TH>\n");
+       wprintf("<TH>User Name</FONT></TH>\n");
+       wprintf("<TH>Room</FONT></TH>");
+       wprintf("<TH>From host</FONT></TH>\n</TR>\n");
        serv_puts("RWHO");
        serv_gets(buf);
        if (buf[0] == '1') {
@@ -105,42 +114,28 @@ void whobbs(void)
                }
 
                while (wlist != NULL) {
-                       wprintf("<TR>\n\t<TD ALIGN=center><FONT FACE=\"Arial,Helvetica,sans-serif\">%d", wlist->sessionnum);
+                       wprintf("<TR>\n\t<TD ALIGN=center>%d", wlist->sessionnum);
                        if ((WC->is_aide) &&
                            (wlist->sessionnum != serv_info.serv_pid)) {
                                wprintf(" <A HREF=\"/terminate_session&which_session=%d&session_owner=", wlist->sessionnum);
                                urlescputs(wlist->username);
-                               wprintf("\">(kill)</A>");
+                               wprintf("\" onClick=\"return ConfirmKill();\" "
+                               ">(kill)</A>");
                        }
                        if (wlist->sessionnum == serv_info.serv_pid) {
-                               wprintf(" <A HREF=\"/edit_me\">(edit)</A>");
+                               wprintf(" <A HREF=\"/edit_me\" "
+                                       "TARGET=\"_parent\">(edit)</A>");
                        }
                        /* username */
-                       wprintf("</FONT></TD>\n\t<TD><FONT FACE=\"Arial,Helvetica,sans-serif\"><A HREF=\"/showuser?who=");
-                       urlescputs(wlist->username);
-                       wprintf("\" onMouseOver=\"window.status='View profile for ");
+                       wprintf("</TD>\n\t<TD>");
                        escputs(wlist->username);
-                       wprintf("'; return true\">");
-                       escputs(wlist->username);
-                       wprintf("</A>");
                        /* room */
-                       wprintf("</FONT></TD>\n\t<TD><FONT FACE=\"Arial,Helvetica,sans-serif\">");
-                       /* handle chat */
-                       if (strstr(wlist->roomname, "chat") != NULL) {
-                               wprintf("<A HREF=\"/chat\" onMouseOver=\"window.status='Chat'; return true\">&lt;chat&gt;</A>");
-                       } else {
-                               wprintf("<A HREF=\"/dotgoto&room=");
-                               urlescputs(wlist->roomname);
-                               wprintf("\" onMouseOver=\"window.status='Go to room ");
-                               escputs(wlist->roomname);
-                               wprintf("'; return true\">");
-                               escputs(wlist->roomname);
-                               wprintf("</A>");
-                       }
-                       wprintf("</FONT></TD><TD><FONT FACE=\"Arial,Helvetica,sans-serif\">");
+                       wprintf("</TD>\n\t<TD>");
+                       escputs(wlist->roomname);
+                       wprintf("</TD>\n\t<TD>");
                        /* hostname */
                        escputs(wlist->hostname);
-                       wprintf("</FONT></TD>\n</TR>");
+                       wprintf("</TD>\n</TR>");
                        wptr = wlist->next;
                        free(wlist);
                        wlist = wptr;
@@ -148,8 +143,8 @@ void whobbs(void)
        }
        wprintf("</TABLE>\n<BR><BR>\n");
        wprintf("<TABLE BORDER=0 BGCOLOR=\"#003399\">\n<TR><TD ALIGN=center VALIGN=center CELLPADING=20>\n");
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" SIZE=+2><B><A HREF=\"/whobbs\"><FONT COLOR=\"#FF0000\">Refresh</FONT></A></B></FONT>\n");
-       wprintf("</TD></TR>\n</TABLE>\n</CENTER>");
+       wprintf("<B><A HREF=\"javascript:window.close();\">Close window</A></B>\n");
+       wprintf("</TD></TR>\n</TABLE></FONT>\n</CENTER>");
        wDumpContent(1);
 }
 
@@ -158,36 +153,9 @@ void terminate_session(void)
 {
        char buf[256];
 
-       if (!strcasecmp(bstr("confirm"), "Yes")) {
-               serv_printf("TERM %s", bstr("which_session"));
-               serv_gets(buf);
-               if (buf[0] == '2') {
-                       whobbs();
-               } else {
-                       display_error(&buf[4]);
-               }
-       } else {
-               output_headers(1);
-               wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
-               wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" SIZE=+1 COLOR=\"FFFFFF\"<B>Confirm session termination");
-               wprintf("</B></FONT></TD></TR></TABLE>\n");
-
-               wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">Are you sure you want to terminate session %s",
-                       bstr("which_session"));
-               if (strlen(bstr("session_owner")) > 0) {
-                       wprintf(" (");
-                       escputs(bstr("session_owner"));
-                       wprintf(")");
-               }
-               wprintf("?<BR><BR>\n");
-
-               wprintf("<A HREF=\"/terminate_session&which_session=%s&confirm=yes\">",
-                       bstr("which_session"));
-               wprintf("Yes</A>&nbsp;&nbsp;&nbsp;");
-               wprintf("<A HREF=\"/whobbs\">No</A></FONT>");
-               wDumpContent(1);
-       }
-
+       serv_printf("TERM %s", bstr("which_session"));
+       serv_gets(buf);
+       whobbs();
 }