Removed the unused second argument from the do_template() macro
[citadel.git] / webcit / summary.c
index ae2588da2651a541f7dd5523afe3757bc4c2a874..1e0d8e160865175109f668dfa862a9e272d84817 100644 (file)
@@ -1,10 +1,25 @@
 /*
- * $Id$
- *
  * Displays the "Summary Page"
+ *
+ * Copyright (c) 1996-2011 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
+#include "calendar.h"
 
 /*
  * Display today's date in a friendly format
@@ -18,23 +33,9 @@ void output_date(void) {
        localtime_r(&now, &tm);
 
        wc_strftime(buf, 32, "%A, %x", &tm);
-       wprintf("%s", buf);
+       wc_printf("%s", buf);
 }
 
-
-
-
-/*
- * Dummy section
- */
-void dummy_section(void) {
-       svput("BOXTITLE", WCS_STRING, "(dummy section)");
-       do_template("beginboxx", NULL);
-       wprintf(_("(nothing)"));
-       do_template("endbox", NULL);
-}
-
-
 /*
  * New messages section
  */
@@ -49,7 +50,7 @@ void new_messages_section(void) {
        number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
        if (number_of_rooms_to_check == 0) return;
 
-       wprintf("<table border=0 width=100%%>\n");
+       wc_printf("<table border=0 width=100%%>\n");
        for (i=0; i<number_of_rooms_to_check; ++i) {
                extract_token(room, rooms_to_check, i, '|', sizeof room);
 
@@ -57,17 +58,17 @@ void new_messages_section(void) {
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        extract_token(room, &buf[4], 0, '|', sizeof room);
-                       wprintf("<tr><td><a href=\"dotgoto?room=");
+                       wc_printf("<tr><td><a href=\"dotgoto?room=");
                        urlescputs(room);
-                       wprintf("\">");
+                       wc_printf("\">");
                        escputs(room);
-                       wprintf("</a></td><td>%d/%d</td></tr>\n",
+                       wc_printf("</a></td><td>%d/%d</td></tr>\n",
                                extract_int(&buf[4], 1),
                                extract_int(&buf[4], 2)
                        );
                }
        }
-       wprintf("</table>\n");
+       wc_printf("</table>\n");
 
 }
 
@@ -84,30 +85,37 @@ void tasks_section(void) {
        message_summary *Msg;
        wcsession *WCC = WC;
        StrBuf *Buf;
+       SharedMessageStatus Stat;
+
+       memset(&Stat, 0, sizeof(SharedMessageStatus));
+       Stat.maxload = 10000;
+       Stat.lowest_found = (-1);
+       Stat.highest_found = (-1);
 
        Buf = NewStrBufPlain(HKEY("_TASKS_"));
        gotoroom(Buf);
        FreeStrBuf(&Buf);
-       if (WCC->wc_view != VIEW_TASKS) {
+
+       if (WCC->CurRoom.view != VIEW_TASKS) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL", 0, NULL, NULL);
+               num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
        }
 
        if (num_msgs > 0) {
                at = GetNewHashPos(WCC->summ, 0);
                while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
                        Msg = (message_summary*) vMsg;          
-                       display_task(Msg, 0);
+                       tasks_LoadMsgFromServer(NULL, NULL, Msg, 0, 0);
                }
                DeleteHashPos(&at);
        }
 
        if (calendar_summary_view() < 1) {
-               wprintf("<i>");
-               wprintf(_("(None)"));
-               wprintf("</i><br />\n");
+               wc_printf("<i>");
+               wc_printf(_("(None)"));
+               wc_printf("</i><br>\n");
        }
 }
 
@@ -116,6 +124,7 @@ void tasks_section(void) {
  * Calendar section
  */
 void calendar_section(void) {
+       char cmd[SIZ];
        int num_msgs = 0;
        HashPos *at;
        const char *HashKey;
@@ -123,34 +132,44 @@ void calendar_section(void) {
        void *vMsg;
        message_summary *Msg;
        wcsession *WCC = WC;
-       struct calview c;
        StrBuf *Buf;
-
+       void *v = NULL;
+       SharedMessageStatus Stat;
+
+       memset(&Stat, 0, sizeof(SharedMessageStatus));
+       Stat.maxload = 10000;
+       Stat.lowest_found = (-1);
+       Stat.highest_found = (-1);
+       
        Buf = NewStrBufPlain(HKEY("_CALENDAR_"));
        gotoroom(Buf);
        FreeStrBuf(&Buf);
-       if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
+       if ( (WC->CurRoom.view != VIEW_CALENDAR) && (WC->CurRoom.view != VIEW_CALBRIEF) ) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL", 0, NULL, NULL);
+               num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
        }
-
-       parse_calendar_view_request(&c);
+       calendar_GetParamsGetServerCall(&Stat, 
+                                       &v,
+                                       readnew, 
+                                       cmd, 
+                                       sizeof(cmd));
 
        if (num_msgs > 0) {
                at = GetNewHashPos(WCC->summ, 0);
                while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
                        Msg = (message_summary*) vMsg;          
-                       load_calendar_item(Msg, 0, &c);
+                       calendar_LoadMsgFromServer(NULL, &v, Msg, 0, 0);
                }
                DeleteHashPos(&at);
        }
        if (calendar_summary_view() < 1) {
-               wprintf("<i>");
-               wprintf(_("(Nothing)"));
-               wprintf("</i><br />\n");
+               wc_printf("<i>");
+               wc_printf(_("(Nothing)"));
+               wc_printf("</i><br>\n");
        }
+       __calendar_Cleanup(&v);
 }
 
 /*
@@ -179,82 +198,82 @@ void server_info_section(void) {
  * not people I consider worthwhile, I still want them to use WebCit.
  */
 void summary_inner_div(void) {
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
-               "<tr valign=top>");
+
+       wc_printf("<table width=\"98%%\" cellspacing=\"3\" cellpadding=\"0\">");
+       wc_printf("<tr valign=top>");
 
        /*
         * Column One
         */
-       wprintf("<td width=33%%>");
-       wprintf("<div class=\"box\">"); 
-       wprintf("<div class=\"boxlabel\">");    
-       wprintf(_("Messages"));
-       wprintf("</div><div class=\"boxcontent\">");    
-       wprintf("<div id=\"msg_inner\">");      
+       wc_printf("<td width=33%%>");
+       wc_printf("<div class=\"box\">");       
+       wc_printf("<div class=\"boxlabel\">");  
+       wc_printf(_("Messages"));
+       wc_printf("</div><div class=\"boxcontent\">");  
+       wc_printf("<div id=\"msg_inner\">");    
        new_messages_section();
-       wprintf("</div></div></div>");
-       wprintf("</td>");
+       wc_printf("</div></div></div>");
+       wc_printf("</td>");
 
        /*
         * Column Two 
         */
-       wprintf("<td width=33%%>");
-       wprintf("<div class=\"box\">"); 
-       wprintf("<div class=\"boxlabel\">");    
-       wprintf(_("Tasks"));
-       wprintf("</div><div class=\"boxcontent\">");    
-       wprintf("<div id=\"tasks_inner\">");    
+       wc_printf("<td width=33%%>");
+       wc_printf("<div class=\"box\">");       
+       wc_printf("<div class=\"boxlabel\">");  
+       wc_printf(_("Tasks"));
+       wc_printf("</div><div class=\"boxcontent\">");  
+       wc_printf("<div id=\"tasks_inner\">");  
        tasks_section();
-       wprintf("</div></div></div>");
-       wprintf("</td>");
+       wc_printf("</div></div></div>");
+       wc_printf("</td>");
 
        /*
         * Column Three
         */
-       wprintf("<td width=33%%>");
-       wprintf("<div class=\"box\">"); 
-       wprintf("<div class=\"boxlabel\">");    
-       wprintf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
-       wprintf("</div><div class=\"boxcontent\">");    
-       wprintf("<div id=\"calendar_inner\">"); 
+       wc_printf("<td width=33%%>");
+       wc_printf("<div class=\"box\">");       
+       wc_printf("<div class=\"boxlabel\">");  
+       wc_printf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
+       wc_printf("</div><div class=\"boxcontent\">");  
+       wc_printf("<div id=\"calendar_inner\">");       
        calendar_section();
-       wprintf("</div></div></div>");
-       wprintf("</td>");
+       wc_printf("</div></div></div>");
+       wc_printf("</td>");
 
-       wprintf("</tr><tr valign=top>");
+       wc_printf("</tr><tr valign=top>");
 
        /*
         * Row Two - Column One
         */
-       wprintf("<td colspan=2>");
-       wprintf("<div class=\"box\">"); 
-       wprintf("<div class=\"boxlabel\">");    
-       wprintf(_("Who's&nbsp;online&nbsp;now"));
-       wprintf("</div><div class=\"boxcontent\">");    
-       wprintf("<div id=\"who_inner\">");      
-       do_template("wholistsummarysection", NULL);
-       wprintf("</div></div></div>");
-       wprintf("</td>");
+       wc_printf("<td colspan=2>");
+       wc_printf("<div class=\"box\">");       
+       wc_printf("<div class=\"boxlabel\">");  
+       wc_printf(_("Who's&nbsp;online&nbsp;now"));
+       wc_printf("</div><div class=\"boxcontent\">");  
+       wc_printf("<div id=\"who_inner\">");    
+       do_template("who_summary");
+       wc_printf("</div></div></div>");
+       wc_printf("</td>");
 
        /*
         * Row Two - Column Two
         */
-       wprintf("<td width=33%%>");
-       wprintf("<div class=\"box\">"); 
-       wprintf("<div class=\"boxlabel\">");    
-       wprintf(_("About&nbsp;this&nbsp;server"));
-       wprintf("</div><div class=\"boxcontent\">");    
-       wprintf("<div id=\"info_inner\">");     
+       wc_printf("<td width=33%%>");
+       wc_printf("<div class=\"box\">");       
+       wc_printf("<div class=\"boxlabel\">");  
+       wc_printf(_("About&nbsp;this&nbsp;server"));
+       wc_printf("</div><div class=\"boxcontent\">");  
+       wc_printf("<div id=\"info_inner\">");   
        server_info_section();
-       wprintf("</div></div></div>");
-       wprintf("</td>");
+       wc_printf("</div></div></div>");
+       wc_printf("</td>");
 
 
        /*
         * End of columns
         */
-       wprintf("</tr></table>");
+       wc_printf("</tr></table>");
 }
 
 
@@ -265,33 +284,35 @@ void summary(void) {
        char title[256];
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<div class=\"room_banner\">");
-        wprintf("<img src=\"static/summscreen_48x.gif\">");
-        wprintf("<h1>");
-        snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
+       wc_printf("<div id=\"banner\" class=\"banner\">\n");
+       wc_printf("<table border=0><tr>");
+        wc_printf("<td><img src=\"static/summscreen_48x.gif\"></td>");
+        wc_printf("<td><h1>");
+        snprintf(title, sizeof title, _("Summary page for %s"),
+               ( (WC->logged_in) ?  ChrPtr(WC->wc_fullname) : ChrPtr(WC->serv_info->serv_humannode))
+       );
         escputs(title);
-        wprintf("</h1><h2>");
+        wc_printf("</h1><h2>");
         output_date();
-        wprintf("</h2></div>");
-       wprintf("<div id=\"actiondiv\">");
-       wprintf("<ul class=\"room_actions\">\n");
-       wprintf("<li class=\"start_page\">");
+        wc_printf("</h2></td></tr></table>");
+       wc_printf("<div id=\"actiondiv\">");
+       wc_printf("<ul class=\"room_actions\">\n");
+       wc_printf("<li class=\"start_page\">");
        offer_start_page(NULL, &NoCtx);
-        wprintf("</li></ul>");
-        wprintf("</div>");
-        wprintf("</div>");
+        wc_printf("</li></ul>");
+        wc_printf("</div>");   /* actiondiv */
+        wc_printf("</div>");   /* banner */
 
        /*
         * You guessed it ... we're going to refresh using ajax.
         * In the future we might consider updating individual sections of the summary
         * instead of the whole thing.
         */
-       wprintf("<div id=\"content\" class=\"service\">\n");
+       wc_printf("<div id=\"content\" class=\"service\">\n");
        summary_inner_div();
-       wprintf("</div>\n");
+       wc_printf("</div>\n");
 
-       wprintf(
+       wc_printf(
                "<script type=\"text/javascript\">                                      "
                " new Ajax.PeriodicalUpdater('msg_inner', 'new_messages_html',          "
                "                            { method: 'get', frequency: 60 }  );       "
@@ -299,7 +320,7 @@ void summary(void) {
                "                            { method: 'get', frequency: 120 }  );      "
                " new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',           "
                "                            { method: 'get', frequency: 90 }  );       "
-               " new Ajax.PeriodicalUpdater('do_template', 'template=wholistsummarysection',   "
+               " new Ajax.PeriodicalUpdater('do_template', 'template=who_summary',     "
                "                            { method: 'get', frequency: 30 }  );       "
                "</script>                                                              \n"
        );
@@ -311,11 +332,11 @@ 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);
+       WebcitAddUrlHandler(HKEY("new_messages_html"), "", 0, new_messages_section, AJAX);
+       WebcitAddUrlHandler(HKEY("tasks_inner_html"), "", 0, tasks_section, AJAX);
+       WebcitAddUrlHandler(HKEY("calendar_inner_html"), "", 0, calendar_section, AJAX);
+       WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+       WebcitAddUrlHandler(HKEY("summary"), "", 0, summary, 0);
+       WebcitAddUrlHandler(HKEY("summary_inner_div"), "", 0, summary_inner_div, AJAX);
 }