* Replaced serv_gets() with serv_getln() - which now requires the caller

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 7ed54af4ee68f67ac99977061f80542cf4dbca6d..fdec33d96fc0af4ec963d48ac40c747a2defa4c5 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Displays the "Summary Page"
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -81,12 +85,12 @@ void new_messages_section(void) {
 
        wprintf("<TABLE BORDER=0 WIDTH=100%%>\n");
        for (i=0; i<number_of_rooms_to_check; ++i) {
-               extract(room, rooms_to_check, i);
+               extract_token(room, rooms_to_check, i, '|', sizeof room);
 
                serv_printf("GOTO %s", room);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       extract(room, &buf[4], 0);
+                       extract_token(room, &buf[4], 0, '|', sizeof room);
                        wprintf("<TR><TD><A HREF=\"/dotgoto?room=");
                        urlescputs(room);
                        wprintf("\">");
@@ -113,9 +117,9 @@ void wholist_section(void) {
        svprintf("BOXTITLE", WCS_STRING, "Who's&nbsp;online&nbsp;now");
        do_template("beginbox");
        serv_puts("RWHO");
-       serv_gets(buf);
-       if (buf[0] == '1') while(serv_gets(buf), strcmp(buf, "000")) {
-               extract(user, buf, 1);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               extract_token(user, buf, 1, '|', sizeof user);
                escputs(user);
                wprintf("<br />\n");
        }
@@ -143,7 +147,6 @@ void tasks_section(void) {
                num_msgs = load_msg_ptrs("MSGS ALL");
        }
 
-       wprintf("FIXME start tasks<br>\n");
        if (num_msgs < 1) {
                wprintf("<i>(None)</i><br />\n");
        }
@@ -152,7 +155,8 @@ void tasks_section(void) {
                        display_task(WC->msgarr[i]);
                }
        }
-       wprintf("FIXME end tasks<br>\n");
+
+       calendar_summary_view();
 
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
        wprintf("<I>(This server does not support task lists)</I>\n");
@@ -180,7 +184,6 @@ void calendar_section(void) {
        else {
                num_msgs = load_msg_ptrs("MSGS ALL");
        }
-       wprintf("FIXME start calendar<br>\n");
 
        if (num_msgs < 1) {
                wprintf("<i>(Nothing)</i><br />\n");
@@ -191,7 +194,6 @@ void calendar_section(void) {
                }
                calendar_summary_view();
        }
-       wprintf("FIXME end calendar<br>\n");
 
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
        wprintf("<I>(This server does not support calendars)</I>\n");
@@ -247,18 +249,19 @@ void summary(void) {
         * not people I consider worthwhile, I still want them to use WebCit.
         */
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLPADDING=10><TR VALIGN=TOP>");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%%><tr valign=top>");
 
        /*
         * Column One
         */
-       wprintf("<TD WIDTH=33%%>");
+       wprintf("<td width=33%%>");
        wholist_section();
 
        /*
         * Column Two
         */
-       wprintf("</TD><TD WIDTH=33%%>");
+       wprintf("</td><td width=33%%>");
        server_info_section();
        wprintf("<br />");
        tasks_section();
@@ -266,7 +269,7 @@ void summary(void) {
        /*
         * Column Three
         */
-       wprintf("</TD><TD WIDTH=33%%>");
+       wprintf("</td><td width=33%%>");
        new_messages_section();
        wprintf("<br />");
        calendar_section();
@@ -274,7 +277,6 @@ void summary(void) {
        /*
         * End of columns
         */
-       wprintf("</TD></TR></TABLE>\n");
-
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }