* Moved to the new string tokenizer API

[citadel.git] / webcit / paging.c

diff --git a/webcit/paging.c b/webcit/paging.c
index 6a3625d33d5a88ad30457c3ec7678ca36bc7890c..25ccbf0fbb4af65e35383d4b9241df9757166262 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -36,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 id=\"fix_scrollbar_bug\">"
+               "<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");
 
@@ -53,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);
 }
 
@@ -78,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);
@@ -95,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]);
                }
        }
        
@@ -151,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);
+               extract_token(pagefrom, &buf[4], 3, '|', sizeof pagefrom);
 
-               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;
 }
 
 
@@ -260,16 +268,16 @@ void chat_recv(void) {
        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"
+       wprintf("<html>\n"
+               "<head>\n"
+               "<meta http-equiv=\"refresh\" content=\"3\" />\n"
+               "</head>\n"
 
-               "<BODY BGCOLOR=\"#FFFFFF\">\n"
+               "<body bgcolor=\"#FFFFFF\">\n"
        );
 
        if (setup_chat_socket() != 0) {
@@ -333,9 +341,9 @@ void chat_recv(void) {
                );
 
                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, '|');
+                       extract_token(buf, output_data, i, '\n', sizeof buf);
+                       extract_token(cl_user, buf, 0, '|', sizeof cl_user);
+                       extract_token(cl_text, buf, 1, '|', sizeof cl_text);
 
                        if (strcasecmp(cl_text, "NOOP")) {
 
@@ -406,7 +414,7 @@ void chat_send(void) {
        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>"
@@ -446,12 +454,12 @@ void chat_send(void) {
                WC->chat_sock = i;
 
                while (strlen(send_this) > 0) {
-                       if (strlen(send_this) < 72) {
+                       if (strlen(send_this) < 67) {
                                serv_puts(send_this);
                                strcpy(send_this, "");
                        }
                        else {
-                               for (i=60; i<72; ++i) {
+                               for (i=55; i<67; ++i) {
                                        if (send_this[i] == ' ') break;
                                }
                                strncpy(buf, send_this, i);
@@ -471,7 +479,7 @@ void chat_send(void) {
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/chat_send\" NAME=\"chatsendform\">\n");
        wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
                "NAME=\"send_this\">\n", SIZ-10);
-       wprintf("<BR>");
+       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");