Readloop remove special cases

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 1c37a0f15c775b5ab75dc380c00f552e4d5f8d0e..172a15486703d700279a37f4ee2abac124a1dee8 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -21,6 +21,8 @@
 #include "webcit.h"
 #include "calendar.h"
 
+extern int calendar_summary_view(void);
+
 /*
  * Display today's date in a friendly format
  */
@@ -54,7 +56,7 @@ void tmplput_output_date(StrBuf *Target, WCTemplputParams *TP)
 /*
  * New messages section
  */
-void new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
+void new_messages_section(void) {
        char buf[SIZ];
        char room[SIZ];
        int i;
@@ -91,7 +93,7 @@ void new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
 /*
  * Task list section
  */
-void tasks_section(StrBuf *Target, WCTemplputParams *TP) {
+void tasks_section(void) {
        int num_msgs = 0;
        HashPos *at;
        const char *HashKey;
@@ -115,7 +117,7 @@ void tasks_section(StrBuf *Target, WCTemplputParams *TP) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+               num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
        }
 
        if (num_msgs > 0) {
@@ -138,8 +140,9 @@ void tasks_section(StrBuf *Target, WCTemplputParams *TP) {
 /*
  * Calendar section
  */
-void calendar_section(StrBuf *Target, WCTemplputParams *TP) {
+void calendar_section(void) {
        char cmd[SIZ];
+       char filter[SIZ];
        int num_msgs = 0;
        HashPos *at;
        const char *HashKey;
@@ -163,13 +166,16 @@ void calendar_section(StrBuf *Target, WCTemplputParams *TP) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+               num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
        }
        calendar_GetParamsGetServerCall(&Stat, 
                                        &v,
                                        readnew, 
                                        cmd, 
-                                       sizeof(cmd));
+                                       sizeof(cmd),
+                                       filter,
+                                       sizeof(filter));
+
 
        if (num_msgs > 0) {
                at = GetNewHashPos(WCC->summ, 0);
@@ -187,13 +193,28 @@ void calendar_section(StrBuf *Target, WCTemplputParams *TP) {
        __calendar_Cleanup(&v);
 }
 
+void tmplput_new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
+       new_messages_section();
+}
+void tmplput_tasks_section(StrBuf *Target, WCTemplputParams *TP) {
+       tasks_section();
+}
+void tmplput_calendar_section(StrBuf *Target, WCTemplputParams *TP) {
+       calendar_section();
+}
+
 void 
 InitModule_SUMMARY
 (void)
 {
        RegisterNamespace("TIME:NOW", 0, 0, tmplput_output_date, NULL, CTX_NONE);
-       RegisterNamespace("SUMMARY:NEWMESSAGES_SELECTION", 0, 0, new_messages_section, NULL, CTX_NONE);
-       RegisterNamespace("SUMMARY:TASKSSECTION", 0, 0, tasks_section, NULL, CTX_NONE);
-       RegisterNamespace("SUMMARY:CALENDAR_SECTION", 0, 0, calendar_section, NULL, CTX_NONE);
+       RegisterNamespace("SUMMARY:NEWMESSAGES_SELECTION", 0, 0, tmplput_new_messages_section, NULL, CTX_NONE);
+       RegisterNamespace("SUMMARY:TASKSSECTION", 0, 0, tmplput_tasks_section, NULL, CTX_NONE);
+       RegisterNamespace("SUMMARY:CALENDAR_SECTION", 0, 0, tmplput_calendar_section, NULL, CTX_NONE);
+
+       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);
+
 }