Readloop remove special cases

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index 7ffd32c0c5fb19057422c5db0e059e96d0af6638..d9d0ebf65b4867dcf869f529bd618e241c2fc021 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -1,10 +1,6 @@
-/*
- * $Id$
- *
- */
 
 #include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
 #include "webserver.h"
 
 int pastel_palette[9][3] = {
@@ -34,7 +30,6 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
        char mime_filename[256];
        char mime_content_type[256];
        char mime_disposition[256];
-       int mime_length;
        char relevant_partnum[256];
        int phase = 0;                          /* 0 = citadel headers, 1 = mime headers, 2 = body */
        char msg4_content_type[256] = "";
@@ -68,7 +63,6 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
                                extract_token(mime_partnum, &bptr[5], 2, '|', sizeof mime_partnum);
                                extract_token(mime_disposition, &bptr[5], 3, '|', sizeof mime_disposition);
                                extract_token(mime_content_type, &bptr[5], 4, '|', sizeof mime_content_type);
-                               mime_length = extract_int(&bptr[5], 5);
 
                                if (!strcasecmp(mime_content_type, "text/vnote")) {
                                        strcpy(relevant_partnum, mime_partnum);
@@ -213,7 +207,7 @@ void ajax_update_note(void) {
 
         if (!havebstr("note_uid")) {
                begin_ajax_response();
-               wprintf("Received ajax_update_note() request without a note UID.");
+               wc_printf("Received ajax_update_note() request without a note UID.");
                end_ajax_response();
                return;
        }
@@ -222,7 +216,7 @@ void ajax_update_note(void) {
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                begin_ajax_response();
-               wprintf("Cannot find message containing vNote with the requested uid!");
+               wc_printf("Cannot find message containing vNote with the requested uid!");
                end_ajax_response();
                return;
        }
@@ -234,7 +228,7 @@ void ajax_update_note(void) {
                        serv_printf("DELE %d", msgnum);
                        serv_getln(buf, sizeof buf);
                        begin_ajax_response();
-                       wprintf("%s", buf);
+                       wc_printf("%s", buf);
                        end_ajax_response();
                        return;
                }
@@ -244,7 +238,7 @@ void ajax_update_note(void) {
        v = vnote_new_from_msg(msgnum, 0);
        if (!v) {
                begin_ajax_response();
-               wprintf("Cannot locate a vNote within message %d\n", msgnum);
+               wc_printf("Cannot locate a vNote within message %d\n", msgnum);
                end_ajax_response();
                return;
        }
@@ -296,7 +290,7 @@ void ajax_update_note(void) {
  *
  * msgnum = Message number on the local server of the note to be displayed
  */
-////TODO: falscher hook
+/*TODO: wrong hook */
 int notes_LoadMsgFromServer(SharedMessageStatus *Stat, 
                            void **ViewSpecific, 
                            message_summary* Msg, 
@@ -351,7 +345,7 @@ void add_new_note(void) {
                vnote_free(v);
        }
        
-       readloop(readfwd);
+       readloop(readfwd, eUseDefault);
 }
 
 
@@ -406,7 +400,7 @@ void tmpl_vcard_put_bgcolor(StrBuf *Target, WCTemplputParams *TP)
 void tmpl_vcard_put_message(StrBuf *Target, WCTemplputParams *TP)
 {
        struct vnote *v = (struct vnote *) CTX;
-       StrEscAppend(Target, NULL, v->body, 0, 0); ///TODO?
+       StrEscAppend(Target, NULL, v->body, 0, 0); /*TODO?*/
 }
 
 void tmpl_vcard_put_uid(StrBuf *Target, WCTemplputParams *TP)
@@ -422,11 +416,13 @@ int notes_GetParamsGetServerCall(SharedMessageStatus *Stat,
                                 void **ViewSpecific, 
                                 long oper, 
                                 char *cmd, 
-                                long len)
+                                long len,
+                                char *filter,
+                                long flen)
 {
        strcpy(cmd, "MSGS ALL");
        Stat->maxmsgs = 32767;
-       wprintf("<div id=\"new_notes_here\"></div>\n");
+       wc_printf("<div id=\"new_notes_here\"></div>\n");
        return 200;
 
 }
@@ -446,6 +442,8 @@ InitModule_NOTES
                VIEW_NOTES,
                notes_GetParamsGetServerCall,
                NULL,
+               NULL,
+               NULL,
                notes_LoadMsgFromServer,
                NULL,
                notes_Cleanup);