* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...

[citadel.git] / webcit / paging.c

diff --git a/webcit/paging.c b/webcit/paging.c
index 1e6a9e394ce3f3068fce6d8fad6ba79cde9cc639..d3319f127f3bebaf891ed073eb5d92ef6a099e82 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -18,15 +18,14 @@ void display_page(void)
        strcpy(recp, bstr("recp"));
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n"
-                "<TABLE class=\"paging_banner\"><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 class=\"paging_background\"><tr><td>\n");
 
@@ -35,7 +34,8 @@ void display_page(void)
        wprintf("<br>\n");
 
        wprintf("<FORM METHOD=\"POST\" action=\"page_user\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       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");
 
@@ -69,7 +69,7 @@ void page_user(void)
 
        safestrncpy(recp, bstr("recp"), sizeof recp);
 
-       if (IsEmptyStr(bstr("send_button"))) {
+       if (!havebstr("send_button")) {
                safestrncpy(WC->ImportantMessage,
                        _("Message was not sent."),
                        sizeof WC->ImportantMessage
@@ -81,7 +81,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.",
@@ -94,7 +94,7 @@ void page_user(void)
                }
        }
 
-       who();
+       url_do_template();
 }
 
 
@@ -107,10 +107,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;
        }
 
@@ -129,7 +132,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;
 }
@@ -142,6 +145,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 */
@@ -158,8 +162,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', "
@@ -228,13 +232,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");
@@ -278,8 +282,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"
@@ -304,7 +307,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 */
@@ -382,7 +385,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 {
@@ -426,28 +429,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 (!IsEmptyStr(bstr("help_button"))) {
+       if (havebstr("help_button")) {
                strcpy(send_this, "/help");
        }
 
-       if (!IsEmptyStr(bstr("list_button"))) {
+       if (havebstr("list_button")) {
                strcpy(send_this, "/who");
        }
 
-       if (!IsEmptyStr(bstr("exit_button"))) {
+       if (havebstr("exit_button")) {
                strcpy(send_this, "/quit");
        }
 
@@ -485,7 +487,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=\"%ld\">\n", WC->nonce);
+       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 />");
@@ -499,4 +501,15 @@ void chat_send(void) {
        wDumpContent(0);
 }
 
+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);
+}
+
 /*@}*/