* All OS-level includes are now included from webcit.h instead of from

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index f6e884aefe08a88805dcc502d3c071065e12bf9c..ed5bb61e81b7aacb3fe4f6a055c08a8cb59bb01f 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -4,26 +4,6 @@
  * Displays the "Summary Page"
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <time.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 /*
@@ -85,12 +65,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("\">");
@@ -117,9 +97,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");
        }
@@ -139,12 +119,12 @@ void tasks_section(void) {
        svprintf("BOXTITLE", WCS_STRING, "Tasks");
        do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       gotoroom("Tasks");
-       if (strcasecmp(WC->wc_roomname, "Tasks")) {
+       gotoroom("_TASKS_");
+       if (WC->wc_view != VIEW_TASKS) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL");
+               num_msgs = load_msg_ptrs("MSGS ALL", 0);
        }
 
        if (num_msgs < 1) {
@@ -177,12 +157,12 @@ void calendar_section(void) {
        svprintf("BOXTITLE", WCS_STRING, "Today&nbsp;on&nbsp;your&nbsp;calendar");
        do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       gotoroom("Calendar");
-       if (strcasecmp(WC->wc_roomname, "Calendar")) {
+       gotoroom("_CALENDAR_");
+       if (WC->wc_view != VIEW_CALENDAR) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL");
+               num_msgs = load_msg_ptrs("MSGS ALL", 0);
        }
 
        if (num_msgs < 1) {
@@ -212,6 +192,8 @@ void server_info_section(void) {
        escputs(serv_info.serv_humannode);
        wprintf(", running ");
        escputs(serv_info.serv_software);
+       wprintf(" with ");
+       escputs(SERVER);
        wprintf(", and located in ");
        escputs(serv_info.serv_bbs_city);
        wprintf(".<br />\nYour system administrator is ");
@@ -229,7 +211,7 @@ void summary(void) {
        output_headers(1, 1, 2, 0, 1, 0, 0);
        wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=#444455><TR>"
-               "<TD><IMG SRC=\"/static/summary.gif\"></TD><TD>"
+               "<TD><IMG SRC=\"/static/summscreen_48x.gif\"></TD><TD>"
                "<SPAN CLASS=\"titlebar\">"
                "Summary page for ");
        escputs(WC->wc_username);
@@ -249,7 +231,8 @@ void summary(void) {
         * not people I consider worthwhile, I still want them to use WebCit.
         */
 
-       wprintf("<table border=0><tr valign=top>");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%%><tr valign=top>");
 
        /*
         * Column One
@@ -276,7 +259,6 @@ void summary(void) {
        /*
         * End of columns
         */
-       wprintf("</td></tr></table>\n");
-
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }