Split mailview renderers from mailview tokens

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 13451c169c1fd43c50b98e47eec70fb3826b999f..d04959865188d830015890c6bfa9f9c1b66cefed 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -1374,182 +1374,12 @@ readloop_struct rlid[] = {
 };
 
 
-int ParseMessageListHeaders_Detail(StrBuf *Line, 
-                                  const char **pos, 
-                                  message_summary *Msg, 
-                                  StrBuf *ConversionBuffer)
-{
-       wcsession *WCC = WC;
-       long len;
-       long totallen;
-
-       CheckConvertBufs(WCC);
-
-       totallen = StrLength(Line);
-       Msg->from = NewStrBufPlain(NULL, totallen);
-       len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
-       if (len > 0) {
-               /* Handle senders with RFC2047 encoding */
-               StrBuf_RFC822_2_Utf8(Msg->from, 
-                                    ConversionBuffer, 
-                                    WCC->DefaultCharset, 
-                                    NULL, 
-                                    WCC->ConvertBuf1,
-                                    WCC->ConvertBuf2);
-       }
-                       
-       /* node name */
-       len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
-       if ((len > 0 ) &&
-           ( ((WCC->CurRoom.QRFlags & QR_NETWORK)
-              || ((strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_nodename))
-                   && (strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_fqdn))))))))
-       {
-               StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
-               StrBufAppendBuf(Msg->from, ConversionBuffer, 0);
-       }
-
-       /* Internet address (not used)
-        *      StrBufExtract_token(Msg->inetaddr, Line, 4, '|');
-        */
-       StrBufSkip_NTokenS(Line, pos, '|', 1);
-       Msg->subj = NewStrBufPlain(NULL, totallen);
-
-       FlushStrBuf(ConversionBuffer);
-       /* we assume the subject is the last parameter inside of the list; 
-        * thus we don't use the tokenizer to fetch it, since it will hick up 
-        * on tokenizer chars inside of the subjects
-       StrBufExtract_NextToken(ConversionBuffer,  Line, pos, '|');
-       */
-       len = 0;
-       if (*pos != StrBufNOTNULL) {
-               len = totallen - (*pos - ChrPtr(Line));
-               StrBufPlain(ConversionBuffer, *pos, len);
-               *pos = StrBufNOTNULL;
-               if ((len > 0) &&
-                   (*(ChrPtr(ConversionBuffer) + len - 1) == '|'))
-                       StrBufCutRight(ConversionBuffer, 1);
-       }
-
-       if (len == 0)
-               StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
-       else {
-               StrBuf_RFC822_2_Utf8(Msg->subj, 
-                                    ConversionBuffer, 
-                                    WCC->DefaultCharset, 
-                                    NULL,
-                                    WCC->ConvertBuf1,
-                                    WCC->ConvertBuf2);
-       }
-
-       return 1;
-}
-
-
-int mailview_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-                                   void **ViewSpecific, 
-                                   long oper, 
-                                   char *cmd, 
-                                   long len,
-                                   char *filter,
-                                   long flen)
-{
-       DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-
-       return 200;
-}
-
-int mailview_Cleanup(void **ViewSpecific)
-{
-       /* Note: wDumpContent() will output one additional </div> tag. */
-       /* We ought to move this out into template */
-       wDumpContent(1);
-
-       return 0;
-}
-
-
-int json_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-                               void **ViewSpecific, 
-                               long oper, 
-                               char *cmd, 
-                               long len,
-                               char *filter,
-                               long flen)
-{
-       Stat->defaultsortorder = 2;
-       Stat->sortit = 1;
-       Stat->load_seen = 1;
-       /* Generally using maxmsgs|startmsg is not required
-          in mailbox view, but we have a 'safemode' for clients
-          (*cough* Exploder) that simply can't handle too many */
-       if (havebstr("maxmsgs"))  Stat->maxmsgs  = ibstr("maxmsgs");
-       else                      Stat->maxmsgs  = 9999999;
-       if (havebstr("startmsg")) Stat->startmsg = lbstr("startmsg");
-       snprintf(cmd, len, "MSGS %s|%s||1",
-                (oper == do_search) ? "SEARCH" : "ALL",
-                (oper == do_search) ? bstr("query") : ""
-               );
-
-       return 200;
-}
-int json_MessageListHdr(SharedMessageStatus *Stat, void **ViewSpecific) 
-{
-       /* TODO: make a generic function */
-       hprintf("HTTP/1.1 200 OK\r\n");
-       hprintf("Content-type: application/json; charset=utf-8\r\n");
-       hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
-       hprintf("Connection: close\r\n");
-       hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-       begin_burst();
-       return 0;
-}
-
-int json_RenderView_or_Tail(SharedMessageStatus *Stat, 
-                           void **ViewSpecific, 
-                           long oper)
-{
-       DoTemplate(HKEY("mailsummary_json"),NULL, NULL);
-       
-       return 0;
-}
-
-int json_Cleanup(void **ViewSpecific)
-{
-       /* Note: wDumpContent() will output one additional </div> tag. */
-       /* We ought to move this out into template */
-       end_burst();
-
-       return 0;
-}
-
-
-
 void 
 InitModule_MSGRENDERERS
 (void)
 {
        RegisterCTX(CTX_MAILSUM);
        RegisterCTX(CTX_MIME_ATACH);
-       RegisterReadLoopHandlerset(
-               VIEW_MAILBOX,
-               mailview_GetParamsGetServerCall,
-               NULL, /* TODO: is this right? */
-               NULL,
-               ParseMessageListHeaders_Detail,
-               NULL,
-               NULL,
-               mailview_Cleanup);
-
-       RegisterReadLoopHandlerset(
-               VIEW_JSON_LIST,
-               json_GetParamsGetServerCall,
-               json_MessageListHdr,
-               NULL, /* TODO: is this right? */
-               ParseMessageListHeaders_Detail,
-               NULL,
-               json_RenderView_or_Tail,
-               json_Cleanup);
 
        RegisterSortFunc(HKEY("date"), 
                         NULL, 0,