Nearly all <FORM> blocks now contain a hidden input

[citadel.git] / webcit / paging.c

diff --git a/webcit/paging.c b/webcit/paging.c
index bde07115e4eeb3e508ee9125aeb6bdbaf0eb9d06..0932db026f6fc84f756de5455980816cf7869b7b 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -19,7 +19,7 @@ void display_page(void)
 
         output_headers(1, 1, 2, 0, 0, 0);
         wprintf("<div id=\"banner\">\n"
-                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<TABLE class=\"paging_banner\"><TR><TD>"
                 "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Send instant message"));
        wprintf("</SPAN>"
@@ -28,13 +28,14 @@ void display_page(void)
         );
                                                                                                                              
         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=\"%ld\">\n", WC->nonce);
 
        wprintf("<TABLE border=0 width=100%%><TR><TD>\n");
 
@@ -42,10 +43,6 @@ void display_page(void)
        escputs(recp);
        wprintf("\">\n");
 
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"closewin\" VALUE=\"");
-       escputs(bstr("closewin"));
-       wprintf("\">\n");
-
        wprintf(_("Enter message text:"));
        wprintf("<br />");
 
@@ -67,27 +64,16 @@ void display_page(void)
  */
 void page_user(void)
 {
-       char recp[SIZ];
-       char buf[SIZ];
-       char closewin[SIZ];
+       char recp[256];
+       char buf[256];
 
-        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(_("Add or edit an event"));
-       wprintf("</SPAN>"
-                "</TD></TR></TABLE>\n"
-                "</div>\n<div id=\"content\">\n"
-        );
-                                                                                                                             
-       strcpy(recp, bstr("recp"));
-       strcpy(closewin, bstr("closewin"));
+       safestrncpy(recp, bstr("recp"), sizeof recp);
 
        if (strlen(bstr("send_button")) == 0) {
-               wprintf("<EM>");
-               wprintf(_("Message was not sent."));
-               wprintf("</EM><br />\n");
+               safestrncpy(WC->ImportantMessage,
+                       _("Message was not sent."),
+                       sizeof WC->ImportantMessage
+               );
        } else {
                serv_printf("SEXP %s|-", recp);
                serv_getln(buf, sizeof buf);
@@ -95,23 +81,20 @@ void page_user(void)
                if (buf[0] == '4') {
                        text_to_server(bstr("msgtext"));
                        serv_puts("000");
-                       wprintf("<EM>");
-                       wprintf(_("Message has been sent to "));
-                       escputs(recp);
-                       wprintf(".</EM><br />\n");
+                       stresc(buf, recp, 0, 0);
+                       snprintf(WC->ImportantMessage,
+                               sizeof WC->ImportantMessage,
+                               "%s%s.",
+                               _("Message has been sent to "),
+                               buf
+                       );
                }
                else {
-                       wprintf("<EM>%s</EM><br />\n", &buf[4]);
+                       safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
                }
        }
-       
-       if (!strcasecmp(closewin, "yes")) {
-               wprintf("<CENTER><a href=\"javascript:window.close();\">");
-               wprintf(_("[ close window ]"));
-               wprintf("</A></CENTER>\n");
-       }
 
-       wDumpContent(1);
+       who();
 }
 
 
@@ -202,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);       "
@@ -501,6 +484,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=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
                "NAME=\"send_this\">\n", SIZ-10);
        wprintf("<br />");