* add contexttype, so the subst can precheck the context pointer for us, and bad...

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 4efedece524d38b368f209924c1de9aa01cadc40..2752cbd3a752a0e5cccc0fd8a384558a16f830dc 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,15 +1,13 @@
 /*
  * $Id$
+ *
+ * Displays the "Summary Page"
  */
-/**
- * \defgroup SymaryFuncs Displays the "Summary Page"
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
+
 #include "webcit.h"
 
-/**
- * \brief Display today's date in a friendly format
+/*
+ * Display today's date in a friendly format
  */
 void output_date(void) {
        struct tm tm;
@@ -30,10 +28,10 @@ void output_date(void) {
  * \brief Dummy section
  */
 void dummy_section(void) {
-       svprintf("BOXTITLE", WCS_STRING, "(dummy section)");
-       do_template("beginbox");
+       svput("BOXTITLE", WCS_STRING, "(dummy section)");
+       do_template("beginbox", NULL);
        wprintf(_("(nothing)"));
-       do_template("endbox");
+       do_template("endbox", NULL);
 }
 
 
@@ -74,48 +72,13 @@ void new_messages_section(void) {
 }
 
 
-/**
- * \brief Wholist section
- */
-void wholist_section(void) {
-       char buf[SIZ];
-       char user[SIZ];
-        time_t last_activity;
-        time_t now;
-
-       serv_puts("RWHO");
-       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);
-                last_activity = extract_long(buf, 5);
-               if (strcmp(user, NLI)) {
-                       wprintf("<li class=\"");
-                        if ((now - last_activity) > 900L) {
-                                wprintf("inactiveuser");
-                        }
-                        else {
-                                wprintf("activeuser");
-                        }
-                       wprintf("\"><a href=\"showuser?who=");
-                       urlescputs(user);
-                       wprintf("\">");
-                       escputs(user);
-                       wprintf("</a></li>");
-               }
-       }
-}
-
-
 /**
  * \brief Task list section
  */
 void tasks_section(void) {
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        int num_msgs = 0;
        int i;
-#endif
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        gotoroom("_TASKS_");
        if (WC->wc_view != VIEW_TASKS) {
                num_msgs = 0;
@@ -131,17 +94,11 @@ void tasks_section(void) {
        }
        else {
                for (i=0; i<num_msgs; ++i) {
-                       display_task(WC->msgarr[i]);
+                       display_task(WC->msgarr[i], 0);
                }
        }
 
        calendar_summary_view();
-
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
-       wprintf("<i>");
-       wprintf(_("(This server does not support task lists)"));
-       wprintf("</i>\n");
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 }
 
 
@@ -149,12 +106,9 @@ void tasks_section(void) {
  * \brief Calendar section
  */
 void calendar_section(void) {
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        int num_msgs = 0;
        int i;
-#endif
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        gotoroom("_CALENDAR_");
        if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
                num_msgs = 0;
@@ -170,16 +124,10 @@ void calendar_section(void) {
        }
        else {
                for (i=0; i<num_msgs; ++i) {
-                       display_calendar(WC->msgarr[i]);
+                       display_calendar(WC->msgarr[i], 0);
                }
                calendar_summary_view();
        }
-
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
-       wprintf("<i>");
-       wprintf(_("(This server does not support calendars)"));
-       wprintf("</i>\n");
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 }
 
 /**
@@ -189,10 +137,11 @@ void server_info_section(void) {
        char message[512];
 
        snprintf(message, sizeof message,
-               _("You are connected to %s, running %s with %s, and located in %s.  Your system administrator is %s."),
+               _("You are connected to %s, running %s with %s, server build %s and located in %s.  Your system administrator is %s."),
                serv_info.serv_humannode,
                serv_info.serv_software,
-               SERVER,
+               PACKAGE_STRING,
+               serv_info.serv_svn_revision,
                serv_info.serv_bbs_city,
                serv_info.serv_sysadm);
        escputs(message);
@@ -214,7 +163,8 @@ void summary_inner_div(void) {
         */
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%%><tr valign=top>");
+               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<tr valign=top>");
 
        /**
         * Column One
@@ -255,8 +205,6 @@ void summary_inner_div(void) {
        wprintf("</div></div></div>");
        wprintf("</td>");
 
-       wprintf("</tr><tr valign=top>");
-       wprintf("<td colspan=3><br/></td>");
        wprintf("</tr><tr valign=top>");
 
        /**
@@ -268,7 +216,7 @@ void summary_inner_div(void) {
        wprintf(_("Who's&nbsp;online&nbsp;now"));
        wprintf("</div><div class=\"boxcontent\">");    
        wprintf("<div id=\"who_inner\">");      
-       who_inner_div(); 
+       do_template("wholistsummarysection", NULL);
        wprintf("</div></div></div>");
        wprintf("</td>");
 
@@ -301,16 +249,17 @@ void summary(void) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-        wprintf("<div class=\"service_banner\">\n");
+       wprintf("<div class=\"room_banner\">");
         wprintf("<img src=\"static/summscreen_48x.gif\">");
         wprintf("<h1>");
         snprintf(title, sizeof title, _("Summary page for %s"), WC->wc_fullname);
         escputs(title);
-        wprintf("</h1><h2>\n");
+        wprintf("</h1><h2>");
         output_date();
         wprintf("</h2></div>");
-        wprintf("<ul><li class=\"start_page\">");
-        offer_start_page();
+       wprintf("<ul class=\"room_actions\">\n");
+       wprintf("<li class=\"start_page\">");
+       offer_start_page(NULL, 0, NULL, NULL, CTX_NONE);
         wprintf("</li></ul>");
         wprintf("</div>");
 
@@ -319,7 +268,7 @@ void summary(void) {
         * In the future we might consider updating individual sections of the summary
         * instead of the whole thing.
         */
-       wprintf("<div id=\"content\">\n");
+       wprintf("<div id=\"content\" class=\"service\">\n");
        summary_inner_div();
        wprintf("</div>\n");
 
@@ -331,7 +280,7 @@ void summary(void) {
                "                            { method: 'get', frequency: 120 }  );      "
                " new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',           "
                "                            { method: 'get', frequency: 90 }  );       "
-               " new Ajax.PeriodicalUpdater('who_inner', 'who_inner_html',             "
+               " new Ajax.PeriodicalUpdater('do_template', 'template=wholistsummarysection',   "
                "                            { method: 'get', frequency: 30 }  );       "
                "</script>                                                              \n"
        );
@@ -339,5 +288,16 @@ void summary(void) {
        wDumpContent(1);
 }
 
+void 
+InitModule_SUMMARY
+(void)
+{
+       WebcitAddUrlHandler(HKEY("new_messages_html"), new_messages_section, AJAX);
+       WebcitAddUrlHandler(HKEY("tasks_inner_html"), tasks_section, AJAX);
+       WebcitAddUrlHandler(HKEY("calendar_inner_html"), calendar_section, AJAX);
+       WebcitAddUrlHandler(HKEY("mini_calendar"), ajax_mini_calendar, AJAX);
+       WebcitAddUrlHandler(HKEY("summary"), summary, 0);
+       WebcitAddUrlHandler(HKEY("summary_inner_div"), summary_inner_div, AJAX);
+}
 
 /*@}*/