X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fpaging.c;h=2717d174799e4cb9a7b2d523424ebb0cf600b75c;hb=f6f51307f975c67d86448d5b456f9650dc36d773;hp=92b7351807d060fae7968b6e8a3d4cf4d9751b41;hpb=e739ac98b3d4ec499ac0221bb990b077947e9dd5;p=citadel.git

diff --git a/webcit/paging.c b/webcit/paging.c
index 92b735180..2717d1747 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Functions which implement the chat and paging facilities.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -32,10 +36,20 @@ void display_page(void)
 
 	strcpy(recp, bstr("recp"));
 
-	output_headers(3);
-
-	svprintf("BOXTITLE", WCS_STRING, "Page: %s", recp);
-	do_template("beginbox");
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Send instant message</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
+        wprintf("<div style=\"margin-right:1px\">"
+		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+
+	wprintf("Send an instant message to: ");
+	escputs(recp);
+	wprintf("<br>\n");
 
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/page_user\">\n");
 
@@ -49,18 +63,18 @@ void display_page(void)
 	escputs(bstr("closewin"));
 	wprintf("\">\n");
 
-	wprintf("Enter message text:<BR>");
+	wprintf("Enter message text:<br />");
 
 	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
 		"WIDTH=40></TEXTAREA>\n");
 
-	wprintf("</TD></TR></TABLE><BR>\n");
+	wprintf("</TD></TR></TABLE><br />\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send message\">");
-	wprintf("<BR><A HREF=\"javascript:window.close();\"Cancel</A>\n");
+	wprintf("<br /><A HREF=\"javascript:window.close();\"Cancel</A>\n");
 
 	wprintf("</FORM></CENTER>\n");
-	do_template("endbox");
+	wprintf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
@@ -74,14 +88,20 @@ void page_user(void)
 	char buf[SIZ];
 	char closewin[SIZ];
 
-	output_headers(3);
-
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Add or edit an event</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
 	strcpy(recp, bstr("recp"));
 	strcpy(sc, bstr("sc"));
 	strcpy(closewin, bstr("closewin"));
 
 	if (strcmp(sc, "Send message")) {
-		wprintf("<EM>Message was not sent.</EM><BR>\n");
+		wprintf("<EM>Message was not sent.</EM><br />\n");
 	} else {
 		serv_printf("SEXP %s|-", recp);
 		serv_gets(buf);
@@ -91,10 +111,10 @@ void page_user(void)
 			serv_puts("000");
 			wprintf("<EM>Message has been sent to ");
 			escputs(recp);
-			wprintf(".</EM><BR>\n");
+			wprintf(".</EM><br />\n");
 		}
 		else {
-			wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+			wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		}
 	}
 	
@@ -113,26 +133,29 @@ void page_user(void)
  */
 void do_chat(void)
 {
+	char buf[SIZ];
 
-	output_headers(1);
-
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">Real-time chat</SPAN>\n"
-		"</TD></TR></TABLE>\n"
-		"<IFRAME WIDTH=100%% HEIGHT=200 SRC=\"/chat_recv\" "
-		"NAME=\"chat_recv\">\n"
-		"<!-- Alternate content for non-supporting browsers -->\n"
-		"If you are seeing this message, your browser does not contain\n"
-		"the IFRAME support required for the chat window.  Please upgrade\n"
-		"to a supported browser, such as\n"
-		"<A HREF=\"http://www.mozilla.org\">Mozilla</A>.\n"
-		"</IFRAME>\n"
-		"<HR width=100%%>\n"
-		"<IFRAME WIDTH=100%% HEIGHT=50 SRC=\"/chat_send\" "
-		"NAME=\"chat_send\">\n"
-		"</IFRAME>\n"
-	);
-	wDumpContent(1);
+	/* First, check to make sure we're still allowed in this room. */
+	serv_printf("GOTO %s", WC->wc_roomname);
+	serv_gets(buf);
+	if (buf[0] != '2') {
+		smart_goto("_BASEROOM_");
+		return;
+	}
+
+	/* If the chat socket is still open from a previous chat,
+	 * close it -- because it might be stale or in the wrong room.
+	 */
+	if (WC->chat_sock < 0) {
+		close(WC->chat_sock);
+		WC->chat_sock = (-1);
+	}
+
+	/* WebCit Chat works by having transmit, receive, and refresh
+	 * frames.  Load the frameset.
+	 */
+	do_template("chatframeset");
+	return;
 }
 
 
@@ -144,32 +167,24 @@ void page_popup(void)
 	char buf[SIZ];
 	char pagefrom[SIZ];
 
-	/* suppress express message check, do headers but no frames */
-	output_headers(0x08 | 0x03);
-
 	while (serv_puts("GEXP"), serv_gets(buf), buf[0]=='1') {
 
 		extract(pagefrom, &buf[4], 3);
 
-		wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
-		wprintf("<SPAN CLASS=\"titlebar\">Instant message from ");
+		wprintf("<table border=1 bgcolor=\"#880000\"><tr><td>");
+		wprintf("<span class=\"titlebar\">Instant message from ");
 		escputs(pagefrom);
-		wprintf("</SPAN></TD></TR></TABLE>\n");
-		
+		wprintf("</span></td></tr><tr><td><font color=\"#FFFFFF\">");
 		fmout(NULL, "LEFT");
+		wprintf("</font></td></tr>"
+			"<tr><td><div align=center><font color=\"#FFFFFF\">"
+			"<a href=\"javascript:hide_page_popup()\">[ close window ]</a>"
+			"</font></div>"
+			"</td></tr>"
+			"</table>\n");
 	}
 
-	wprintf("<CENTER>");
-	wprintf("<A HREF=\"/display_page&closewin=yes&recp=");
-	urlescputs(pagefrom);
-        wprintf("\">[ reply ]</A>&nbsp;&nbsp;&nbsp;\n");
-
-	wprintf("<A HREF=\"javascript:window.close();\">"
-		"[ close window ]</A></B>\n"
-		"</CENTER>");
-
-	wDumpContent(1);
-	WC->HaveExpressMessages = 0;
+	WC->HaveInstantMessages = 0;
 }
 
 
@@ -185,10 +200,6 @@ int setup_chat_socket(void) {
 
 	if (WC->chat_sock < 0) {
 
-		for (i=0; i<CHATLINES; ++i) {
-			strcpy(WC->chatlines[i], "");
-		}
-
 		if (!strcasecmp(ctdlhost, "uds")) {
 			/* unix domain socket */
 			sprintf(buf, "%s/citadel.socket", ctdlport);
@@ -243,25 +254,30 @@ int setup_chat_socket(void) {
 
 
 /*
- * receiving side of the chat window
+ * Receiving side of the chat window.  This is implemented in a
+ * tiny hidden IFRAME that just does JavaScript writes to
+ * other frames whenever it refreshes and finds new data.
  */
 void chat_recv(void) {
 	int i;
-	char name[SIZ];
-	char text[SIZ];
 	struct pollfd pf;
 	int got_data = 0;
 	int end_chat_now = 0;
+	char buf[SIZ];
+	char cl_user[SIZ];
+	char cl_text[SIZ];
+	char *output_data = NULL;
 
-	output_headers(0);
+	output_headers(0, 0, 0, 0, 0, 0, 0);
 
 	wprintf("Content-type: text/html\n");
 	wprintf("\n");
-	wprintf("<HTML>\n"
-		"<HEAD>\n"
-		"<META HTTP-EQUIV=\"refresh\" CONTENT=\"3\">\n"
-		"</HEAD>\n"
-		"<BODY>"
+	wprintf("<html>\n"
+		"<head>\n"
+		"<meta http-equiv=\"refresh\" content=\"3\" />\n"
+		"</head>\n"
+
+		"<body bgcolor=\"#FFFFFF\">\n"
 	);
 
 	if (setup_chat_socket() != 0) {
@@ -273,6 +289,7 @@ void chat_recv(void) {
 	/*
 	 * See if there is any chat data waiting.
 	 */
+	output_data = strdup("");
 	do {
 		got_data = 0;
 		pf.fd = WC->chat_sock;
@@ -281,57 +298,109 @@ void chat_recv(void) {
 		if (poll(&pf, 1, 1) > 0) if (pf.revents & POLLIN) {
 			++got_data;
 
-			for (i=0; i<CHATLINES-1; ++i) {
-				strcpy(WC->chatlines[i], WC->chatlines[i+1]);
-			}
-	
 			/* Temporarily swap the serv and chat sockets during chat talk */
 			i = WC->serv_sock;
 			WC->serv_sock = WC->chat_sock;
 			WC->chat_sock = i;
 	
-			serv_gets(WC->chatlines[CHATLINES-1]);
-			if (!strcmp(WC->chatlines[CHATLINES-1], "000")) {
+			serv_gets(buf);
+
+			if (!strcmp(buf, "000")) {
+				strcpy(buf, ":|exiting chat mode");
 				end_chat_now = 1;
-				strcpy(WC->chatlines[CHATLINES-1], ":|exiting chat mode");
 			}
 			
 			/* Unswap the sockets. */
 			i = WC->serv_sock;
 			WC->serv_sock = WC->chat_sock;
 			WC->chat_sock = i;
-		}
-	} while ( (got_data) && (!end_chat_now) );
 
-	/*
-	 * Display appropriately.
-	 */
-	for (i=0; i<CHATLINES; ++i) {
-		if (strlen(WC->chatlines[i]) > 0) {
-			extract(name, WC->chatlines[i], 0);
-			extract(text, WC->chatlines[i], 1);
-			if (!strcasecmp(name, WC->wc_username)) {
-				wprintf("<FONT COLOR=\"#00FF00\">");
-			}
-			else if (!strcmp(name, ":")) {
-				wprintf("<FONT COLOR=\"#FF0000\">");
-			}
-			else {
-				wprintf("<FONT COLOR=\"#0000FF\">");
-			}
-			escputs(name);
-			wprintf(": </FONT>");
-			escputs(text);
-			wprintf("<BR>\n");
+			/* Append our output data */
+			output_data = realloc(output_data, strlen(output_data) + strlen(buf) + 4);
+			strcat(output_data, buf);
+			strcat(output_data, "\n");
 		}
-	}
+
+	} while ( (got_data) && (!end_chat_now) );
 
 	if (end_chat_now) {
 		close(WC->chat_sock);
 		WC->chat_sock = (-1);
-		wprintf("<IMG SRC=\"/static/blank.gif\" onLoad=\"top.location.replace('/do_welcome');\">\n");
+		wprintf("<IMG SRC=\"/static/blank.gif\" onLoad=\"parent.window.close();\">\n");
+	}
+
+	if (strlen(output_data) > 0) {
+
+		if (output_data[strlen(output_data)-1] == '\n') {
+			output_data[strlen(output_data)-1] = 0;
+		}
+
+		/* Output our fun to the other frame. */
+		wprintf("<IMG SRC=\"/static/blank.gif\" WIDTH=1 HEIGHT=1\n"
+			"onLoad=\" \n"
+		);
+
+		for (i=0; i<num_tokens(output_data, '\n'); ++i) {
+			extract_token(buf, output_data, i, '\n');
+			extract_token(cl_user, buf, 0, '|');
+			extract_token(cl_text, buf, 1, '|');
+
+			if (strcasecmp(cl_text, "NOOP")) {
+
+				wprintf("parent.chat_transcript.document.write('");
+	
+				if (strcasecmp(cl_user, WC->last_chat_user)) {
+					wprintf("<TABLE border=0 WIDTH=100%% "
+						"CELLSPACING=1 CELLPADDING=0 "
+						"BGCOLOR=&quot;#FFFFFF&quot;>"
+						"<TR><TD></TR></TD></TABLE>"
+					);
+	
+				}
+
+				wprintf("<TABLE border=0 WIDTH=100%% "
+					"CELLSPACING=0 CELLPADDING=0 "
+					"BGCOLOR=&quot;#EEEEEE&quot;>");
+	
+				wprintf("<TR><TD>");
+	
+				if (!strcasecmp(cl_user, ":")) {
+					wprintf("<I>");
+				}
+
+				if (strcasecmp(cl_user, WC->last_chat_user)) {
+					wprintf("<B>");
+	
+					if (!strcasecmp(cl_user, WC->wc_username)) {
+						wprintf("<FONT COLOR=&quot;#FF0000&quot;>");
+					}
+					else {
+						wprintf("<FONT COLOR=&quot;#0000FF&quot;>");
+					}
+					jsescputs(cl_user);
+	
+					wprintf("</FONT>: </B>");
+				}
+				else {
+					wprintf("&nbsp;&nbsp;&nbsp;");
+				}
+				jsescputs(cl_text);
+				if (!strcasecmp(cl_user, ":")) {
+					wprintf("</I>");
+				}
+
+				wprintf("</TD></TR></TABLE>");
+				wprintf("'); \n");
+
+				strcpy(WC->last_chat_user, cl_user);
+			}
+		}
+
+		wprintf("parent.chat_transcript.scrollTo(999999,999999);\">\n");
 	}
 
+	free(output_data);
+
 	wprintf("</BODY></HTML>\n");
 	wDumpContent(0);
 }
@@ -343,8 +412,9 @@ void chat_recv(void) {
 void chat_send(void) {
 	int i;
 	char send_this[SIZ];
+	char buf[SIZ];
 
-	output_headers(0);
+	output_headers(0, 0, 0, 0, 0, 0, 0);
 	wprintf("Content-type: text/html\n");
 	wprintf("\n");
 	wprintf("<HTML>"
@@ -360,6 +430,14 @@ void chat_send(void) {
 
 	if (bstr("sendbutton") != NULL) {
 
+		if (!strcasecmp(bstr("sendbutton"), "Help")) {
+			strcpy(send_this, "/help");
+		}
+
+		if (!strcasecmp(bstr("sendbutton"), "List Users")) {
+			strcpy(send_this, "/who");
+		}
+
 		if (!strcasecmp(bstr("sendbutton"), "Exit")) {
 			strcpy(send_this, "/quit");
 		}
@@ -375,7 +453,21 @@ void chat_send(void) {
 		WC->serv_sock = WC->chat_sock;
 		WC->chat_sock = i;
 
-		serv_puts(send_this);
+		while (strlen(send_this) > 0) {
+			if (strlen(send_this) < 67) {
+				serv_puts(send_this);
+				strcpy(send_this, "");
+			}
+			else {
+				for (i=55; i<67; ++i) {
+					if (send_this[i] == ' ') break;
+				}
+				strncpy(buf, send_this, i);
+				buf[i] = 0;
+				strcpy(send_this, &send_this[i]);
+				serv_puts(buf);
+			}
+		}
 
 		/* Unswap the sockets. */
 		i = WC->serv_sock;
@@ -384,10 +476,13 @@ void chat_send(void) {
 
 	}
 
-	wprintf("Send: ");
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/chat_send\" NAME=\"chatsendform\">\n");
-	wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"80\" NAME=\"send_this\">\n");
+	wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
+		"NAME=\"send_this\">\n", SIZ-10);
+	wprintf("<br />");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Send\">\n");
+	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Help\">\n");
+	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"List Users\">\n");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Exit\">\n");
 	wprintf("</FORM>\n");