* Move SMTP queue view JavaScript to wclib.js

[citadel.git] / webcit / smtpqueue.c

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index 16a2491ffb417be18d54c9aeaada22f101b7c65c..b3c0983d140c266c8aeb014a46839c6928c99a8f 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -83,14 +83,14 @@ void display_queue_msg(long msgnum)
                        }
 
                        if (!strcasecmp(keyword, "bounceto")) {
+                               char *atsign;
                                extract_token(sender, buf, 1, '|', sizeof sender);
 
                                /* Strip off local hostname if it's our own */
-                               char *atsign;
                                atsign = strchr(sender, '@');
                                if (atsign != NULL) {
                                        ++atsign;
-                                       if (!strcasecmp(atsign, serv_info.serv_nodename)) {
+                                       if (!strcasecmp(atsign, ChrPtr(WC->serv_info->serv_nodename))) {
                                                --atsign;
                                                *atsign = 0;
                                        }
@@ -131,13 +131,13 @@ void display_queue_msg(long msgnum)
 
        wprintf("<tr><td>");
        wprintf("%ld<br />", msgnum);
-       wprintf(" <a href=\"javascript:DeleteQueueMsg(%ld,%ld);\">%s</a>", 
+       wprintf(" <a href=\"javascript:DeleteSMTPqueueMsg(%ld,%ld);\">%s</a>", 
                msgnum, msgid, _("(Delete)")
        );
 
        wprintf("</td><td>");
        if (submitted > 0) {
-               webcit_fmt_date(buf, submitted, 1);
+               webcit_fmt_date(buf, 1024, submitted, 1);
                wprintf("%s", buf);
        }
        else {
@@ -146,7 +146,7 @@ void display_queue_msg(long msgnum)
 
        wprintf("</td><td>");
        if (last_attempt > 0) {
-               webcit_fmt_date(buf, last_attempt, 1);
+               webcit_fmt_date(buf, 1024, last_attempt, 1);
                wprintf("%s", buf);
        }
        else {
@@ -164,16 +164,26 @@ void display_queue_msg(long msgnum)
 
 
 void display_smtpqueue_inner_div(void) {
+       message_summary *Msg = NULL;
+       wcsession *WCC = WC;
        int i;
        int num_msgs;
+       StrBuf *Buf;
+       SharedMessageStatus Stat;
 
+       memset(&Stat, 0, sizeof(SharedMessageStatus));
        /* Check to see if we can go to the __CitadelSMTPspoolout__ room.
         * If not, we don't have access to the queue.
         */
-       gotoroom("__CitadelSMTPspoolout__");
-       if (!strcasecmp(WC->wc_roomname, "__CitadelSMTPspoolout__")) {
-
-               num_msgs = load_msg_ptrs("MSGS ALL", 0);
+       Buf = NewStrBufPlain(HKEY("__CitadelSMTPspoolout__"));
+       gotoroom(Buf);
+       FreeStrBuf(&Buf);
+       if (!strcasecmp(ChrPtr(WCC->wc_roomname), "__CitadelSMTPspoolout__")) {
+
+               Stat.maxload = 10000;
+               Stat.lowest_found = (-1);
+               Stat.highest_found = (-1);
+               num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
                if (num_msgs > 0) {
                         wprintf("<table class=\"mailbox_summary\" rules=rows "
                                "cellpadding=2 style=\"width:100%%;\">"
@@ -192,7 +202,10 @@ void display_smtpqueue_inner_div(void) {
                        wprintf("</i></b></td></tr>\n");
 
                        for (i=0; i<num_msgs; ++i) {
-                               display_queue_msg(WC->msgarr[i]);
+                               Msg = GetMessagePtrAt(i, WCC->summ);
+                               if (Msg != NULL) {
+                                       display_queue_msg(Msg->msgnum);
+                               }
                        }
 
                        wprintf("</table>");
@@ -209,36 +222,17 @@ void display_smtpqueue_inner_div(void) {
                wprintf(_("You do not have permission to view this resource."));
                wprintf("</div><br /><br />");
        }
-
+       output_headers(0, 0, 0, 0, 0, 0);
+       end_burst();
 }
 
-/**
- * \brief display the outbound SMTP queue
+/*
+ * display the outbound SMTP queue
  */
 void display_smtpqueue(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
 
-       wprintf("<script type=\"text/javascript\">                              \n"
-               "function RefreshQueueDisplay() {                               \n"
-               "       new Ajax.Updater('smtpqueue_inner_div',                 \n"
-               "       'display_smtpqueue_inner_div', { method: 'get',         \n"
-               "               parameters: Math.random() } );                  \n"
-               "}                                                              \n"
-               "                                                               \n"
-               "function DeleteQueueMsg(msgnum1, msgnum2) {                                    \n"
-               "       new Ajax.Request(                                                       \n"
-               "               'ajax_servcmd', {                                               \n"
-               "                       method: 'post',                                         \n"
-               "                       parameters: 'g_cmd=DELE ' + msgnum1 + ',' + msgnum2,    \n"
-               "                       onComplete: RefreshQueueDisplay()                       \n"
-               "               }                                                               \n"
-               "       );                                                                      \n"
-               "}                                                                              \n"
-               "                                                               \n"
-               "</script>                                                      \n"
-       );
-
        wprintf("<div id=\"banner\">\n");
        wprintf("<h1>");
        wprintf(_("View the outbound SMTP queue"));
@@ -251,16 +245,17 @@ void display_smtpqueue(void)
                "<table class=\"smtpqueue_background\">"
                "<tr><td valign=top>\n");
 
-       wprintf("<div id=\"smtpqueue_inner_div\">");
-
-       display_smtpqueue_inner_div();
-
-       wprintf("</div>"
+       wprintf("<div id=\"smtpqueue_inner_div\">"
+               "<div align=\"center\"><img src=\"static/throbber.gif\"></div>"
+               "</div>"
                "<div align=\"center\">"
-               "<a href=\"javascript:RefreshQueueDisplay();\">%s</a>"
+               "<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"
                "</div>"
                "</td></tr></table></div>\n", _("Refresh this page")
        );
+
+       StrBufAppendPrintf(WC->trailing_javascript, "RefreshSMTPqueueDisplay();\n");
+
        wDumpContent(1);
 
 }
@@ -272,5 +267,3 @@ InitModule_SMTP_QUEUE
        WebcitAddUrlHandler(HKEY("display_smtpqueue"), display_smtpqueue, 0);
        WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), display_smtpqueue_inner_div, 0);
 }
-
-/*@}*/