X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fpaging.c;h=d44c816cb2327d4101acc869afb87b93c8583985;hb=a5a4785d48a744be30ce261bea0c59ef9718585f;hp=1bc28e4883a65e2de830516dd0661dd1d2cdc892;hpb=26a4a07bdacdaa7013bf45cc235df207708acfde;p=citadel.git

diff --git a/webcit/paging.c b/webcit/paging.c
index 1bc28e488..d44c816cb 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -1,15 +1,11 @@
 /*
  * $Id$
  */
-/**
- * \defgroup PageFunc Functions which implement the chat and paging facilities.
- * \ingroup ClientPower
- */
-/*@{*/
+
 #include "webcit.h"
 
-/**
- * \brief display the form for paging (x-messaging) another user
+/*
+ * display the form for paging (x-messaging) another user
  */
 void display_page(void)
 {
@@ -18,23 +14,24 @@ void display_page(void)
 	strcpy(recp, bstr("recp"));
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n"
-                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-                "<SPAN CLASS=\"titlebar\">");
+        wprintf("<div id=\"banner\">\n");
+        wprintf("<h1>");
 	wprintf(_("Send instant message"));
-	wprintf("</SPAN>"
-                "</TD></TR></TABLE>\n"
-                "</div>\n<div id=\"content\">\n"
-        );
-                                                                                                                             
+	wprintf("</h1>");
+        wprintf("</div>\n");
+
+	wprintf("<div id=\"content\" class=\"service\">\n");
+
         wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+		"<table class=\"paging_background\"><tr><td>\n");
 
 	wprintf(_("Send an instant message to: "));
 	escputs(recp);
 	wprintf("<br>\n");
 
 	wprintf("<FORM METHOD=\"POST\" action=\"page_user\">\n");
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wprintf("<input type=\"hidden\" name=\"template\" value=\"who\">\n");
 
 	wprintf("<TABLE border=0 width=100%%><TR><TD>\n");
 
@@ -68,7 +65,7 @@ void page_user(void)
 
 	safestrncpy(recp, bstr("recp"), sizeof recp);
 
-	if (strlen(bstr("send_button")) == 0) {
+	if (!havebstr("send_button")) {
 		safestrncpy(WC->ImportantMessage,
 			_("Message was not sent."),
 			sizeof WC->ImportantMessage
@@ -80,7 +77,7 @@ void page_user(void)
 		if (buf[0] == '4') {
 			text_to_server(bstr("msgtext"));
 			serv_puts("000");
-			stresc(buf, recp, 0, 0);
+			stresc(buf, 256, recp, 0, 0);
 			snprintf(WC->ImportantMessage,
 				sizeof WC->ImportantMessage,
 				"%s%s.",
@@ -93,7 +90,7 @@ void page_user(void)
 		}
 	}
 
-	who();
+	url_do_template();
 }
 
 
@@ -106,10 +103,13 @@ void do_chat(void)
 	char buf[SIZ];
 
 	/** First, check to make sure we're still allowed in this room. */
-	serv_printf("GOTO %s", WC->wc_roomname);
+	serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '2') {
-		smart_goto("_BASEROOM_");
+		StrBuf *Buf;
+		Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+		smart_goto(Buf);
+		FreeStrBuf(&Buf);
 		return;
 	}
 
@@ -128,7 +128,7 @@ void do_chat(void)
 	 * output by begin_ajax_response() happen to be the ones we need.)
 	 */
 	begin_ajax_response();
-	do_template("chatframeset");
+	do_template("chatframeset", NULL);
 	end_ajax_response();
 	return;
 }
@@ -141,6 +141,7 @@ void do_chat(void)
  */
 void page_popup(void)
 {
+	int len;
 	char buf[SIZ];
 
 	/** JavaScript function to alert the user that popups are probably blocked */
@@ -157,8 +158,8 @@ void page_popup(void)
 
 	/** First, do the check as part of our page load. */
 	serv_puts("NOOP");
-	serv_getln(buf, sizeof buf);
-	if (buf[3] == '*') {
+	len = serv_getln(buf, sizeof buf);
+	if ((len >= 3) && (buf[3] == '*')) {
 		if ((time(NULL) - WC->last_pager_check) > 60) {
 			wprintf("<script type=\"text/javascript\">"
 				" var oWin = window.open('static/instant_messenger.html', "
@@ -184,7 +185,7 @@ void page_popup(void)
 		"  }	"
 		" }	"
 		" function CheckPager() {	"
-		"  new Ajax.Request('sslg', { method: 'get', parameters: Math.random(),	"
+		"  new Ajax.Request('sslg', { method: 'get', parameters: CtdlRandomString(),	"
 		"   onSuccess: HandleSslp } );	"
 		" }	"
 		" new PeriodicalExecuter(CheckPager, 30);	"
@@ -227,13 +228,13 @@ int setup_chat_socket(void) {
 
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
-			serv_printf("USER %s", WC->wc_username);
+			serv_printf("USER %s", ChrPtr(WC->wc_username));
 			serv_getln(buf, sizeof buf);
 			if (buf[0] == '3') {
-				serv_printf("PASS %s", WC->wc_password);
+				serv_printf("PASS %s", ChrPtr(WC->wc_password));
 				serv_getln(buf, sizeof buf);
 				if (buf[0] == '2') {
-					serv_printf("GOTO %s", WC->wc_roomname);
+					serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
 					serv_getln(buf, sizeof buf);
 					if (buf[0] == '2') {
 						serv_puts("CHAT");
@@ -277,8 +278,7 @@ void chat_recv(void) {
 
 	output_headers(0, 0, 0, 0, 0, 0);
 
-	wprintf("Content-type: text/html; charset=utf-8\n");
-	wprintf("\n");
+	hprintf("Content-type: text/html; charset=utf-8\r\n");
 	wprintf("<html>\n"
 		"<head>\n"
 		"<meta http-equiv=\"refresh\" content=\"3\" />\n"
@@ -303,7 +303,7 @@ void chat_recv(void) {
 		pf.fd = WC->chat_sock;
 		pf.events = POLLIN;
 		pf.revents = 0;
-		if (poll(&pf, 1, 1) > 0) if (pf.revents & POLLIN) {
+		if ((poll(&pf, 1, 1) > 0) && (pf.revents & POLLIN)) {
 			++got_data;
 
 			/** Temporarily swap the serv and chat sockets during chat talk */
@@ -338,10 +338,11 @@ void chat_recv(void) {
 		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;
+	if (!IsEmptyStr(output_data)) {
+		int len;
+		len = strlen(output_data);
+		if (output_data[len-1] == '\n') {
+			output_data[len-1] = 0;
 		}
 
 		/** Output our fun to the other frame. */
@@ -380,7 +381,7 @@ void chat_recv(void) {
 				if (strcasecmp(cl_user, WC->last_chat_user)) {
 					wprintf("<B>");
 	
-					if (!strcasecmp(cl_user, WC->wc_fullname)) {
+					if (!strcasecmp(cl_user, ChrPtr(WC->wc_fullname))) {
 						wprintf("<FONT COLOR=&quot;#FF0000&quot;>");
 					}
 					else {
@@ -424,28 +425,27 @@ void chat_send(void) {
 	char buf[SIZ];
 
 	output_headers(0, 0, 0, 0, 0, 0);
-	wprintf("Content-type: text/html; charset=utf-8\n");
-	wprintf("\n");
+	hprintf("Content-type: text/html; charset=utf-8\r\n");
 	wprintf("<HTML>"
 		"<BODY onLoad=\"document.chatsendform.send_this.focus();\" >"
 	);
 
-	if (bstr("send_this") != NULL) {
+	if (havebstr("send_this")) {
 		strcpy(send_this, bstr("send_this"));
 	}
 	else {
 		strcpy(send_this, "");
 	}
 
-	if (strlen(bstr("help_button")) > 0) {
+	if (havebstr("help_button")) {
 		strcpy(send_this, "/help");
 	}
 
-	if (strlen(bstr("list_button")) > 0) {
+	if (havebstr("list_button")) {
 		strcpy(send_this, "/who");
 	}
 
-	if (strlen(bstr("exit_button")) > 0) {
+	if (havebstr("exit_button")) {
 		strcpy(send_this, "/quit");
 	}
 
@@ -461,7 +461,7 @@ void chat_send(void) {
 	WC->serv_sock = WC->chat_sock;
 	WC->chat_sock = i;
 
-	while (strlen(send_this) > 0) {
+	while (!IsEmptyStr(send_this)) {
 		if (strlen(send_this) < 67) {
 			serv_puts(send_this);
 			strcpy(send_this, "");
@@ -483,6 +483,7 @@ void chat_send(void) {
 	WC->chat_sock = i;
 
 	wprintf("<FORM METHOD=\"POST\" action=\"chat_send\" NAME=\"chatsendform\">\n");
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 	wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
 		"NAME=\"send_this\">\n", SIZ-10);
 	wprintf("<br />");
@@ -496,4 +497,42 @@ void chat_send(void) {
 	wDumpContent(0);
 }
 
-/*@}*/
+
+void ajax_send_instant_message(void) {
+	char recp[256];
+	char buf[256];
+
+	safestrncpy(recp, bstr("recp"), sizeof recp);
+
+	serv_printf("SEXP %s|-", recp);
+	serv_getln(buf, sizeof buf);
+
+	if (buf[0] == '4') {
+		text_to_server(bstr("msg"));
+		serv_puts("000");
+	}
+
+	escputs(buf);	/* doesn't really matter what we return - the client ignores it */
+}
+
+
+void 
+InitModule_PAGING
+(void)
+{
+	WebcitAddUrlHandler(HKEY("display_page"), display_page, 0);
+	WebcitAddUrlHandler(HKEY("page_user"), page_user, 0);
+	WebcitAddUrlHandler(HKEY("chat"), do_chat, 0);
+	WebcitAddUrlHandler(HKEY("chat_recv"), chat_recv, 0);
+	WebcitAddUrlHandler(HKEY("chat_send"), chat_send, 0);
+	WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), ajax_send_instant_message, AJAX);
+}
+
+
+void 
+SessionDestroyModule_CHAT
+(wcsession *sess)
+{
+	if (sess->chat_sock > 0)
+		close(sess->chat_sock);
+}