SMTP queue display:

* Chop off local node name from sender if it's from our node
* Add a delete button for each message in the queue
* Add a Refresh button for the screen (wholesome AJAX goodness)

diff --git a/webcit/po/da.po b/webcit/po/da.po
index c4aea02e75e36dfd4b2ebbc4f07eeaa6439902cc..d031be4ba6c1e3defc595285042e23b370c0c019 100644 (file)
--- a/webcit/po/da.po
+++ b/webcit/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WebCit 6.82\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Flemming Veggerby <fveggerby@dbmail.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -1074,7 +1074,7 @@ msgstr "Domænenavne og Internet post konfiguration"
 msgid "Configure replication with other Citadel servers"
 msgstr "Konfigurér replikéring med andre Citadel servere"
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1258,7 +1258,7 @@ msgstr "Ingen gamle meddelelser."
 msgid "No messages here."
 msgstr "Ingen meddelelser her."
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr "Afsender"
 
@@ -2375,33 +2375,38 @@ msgstr "Samme politik som for offentlige rum"
 msgid "Your system configuration has been updated."
 msgstr "Din system konfiguration er blevet opdateret"
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 #, fuzzy
 msgid "Message ID"
 msgstr "Meddelelser"
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 #, fuzzy
 msgid "Date/time submitted"
 msgstr "Meddelelser sendt"
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 #, fuzzy
 msgid "The queue is empty."
 msgstr "Denne adressebog er tom."
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+#, fuzzy
+msgid "Refresh this page"
+msgstr "Editér denne side"
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr "FEJL: kunne ikke åbne skabelon"

diff --git a/webcit/po/de.po b/webcit/po/de.po
index 6dc1bf914b7bacd6bc49f5694a32a342ea97db94..b1e32f1336706796f29798d5771ba6701cd8abb5 100644 (file)
--- a/webcit/po/de.po
+++ b/webcit/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: 2006-09-01 09:15+0200\n"
 "Last-Translator: Wilfried Goesgens <dothebart@uncensored.citadel.org>\n"
 "Language-Team:  <en@li.org>\n"
@@ -1076,7 +1076,7 @@ msgstr "Domänenname und Internetmail Konfiguration"
 msgid "Configure replication with other Citadel servers"
 msgstr "Die Replikation mit anderen Citadellen Konfigurieren"
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1260,7 +1260,7 @@ msgstr "Keine alte Nachricht"
 msgid "No messages here."
 msgstr "Keine Beiträge hier"
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr "Absender"
 
@@ -2377,33 +2377,38 @@ msgstr "Die selben Werte wie in öffentlichen Räumen"
 msgid "Your system configuration has been updated."
 msgstr "Ihre Systemkonfiguration wurde Übernommen"
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 #, fuzzy
 msgid "Message ID"
 msgstr "Nachrichten"
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 #, fuzzy
 msgid "Date/time submitted"
 msgstr "Nachricht abgeschickt"
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 #, fuzzy
 msgid "The queue is empty."
 msgstr "Dieses Adressbuch ist leer."
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+#, fuzzy
+msgid "Refresh this page"
+msgstr "Diese Seite bearbeiten"
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr "FEHLER: konnte Template nicht öffnen"

diff --git a/webcit/po/en_GB.po b/webcit/po/en_GB.po
index 223d4de38eff37ba7a8c83a1959c54dc6353891e..90c420f3ccd3bc3e4b30ffc4d49038e7791c2dd8 100644 (file)
--- a/webcit/po/en_GB.po
+++ b/webcit/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WebCit 6.71\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: David Given <dg@cowlark.com>\n"
 "Language-Team: LANGUAGE <en_GB@li.org>\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "Configure replication with other Citadel servers"
 msgstr ""
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1211,7 +1211,7 @@ msgstr ""
 msgid "No messages here."
 msgstr ""
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr ""
 
@@ -2293,30 +2293,34 @@ msgstr ""
 msgid "Your system configuration has been updated."
 msgstr ""
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 msgid "Message ID"
 msgstr ""
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 msgid "Date/time submitted"
 msgstr ""
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 msgid "The queue is empty."
 msgstr ""
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+msgid "Refresh this page"
+msgstr ""
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr ""

diff --git a/webcit/po/es.po b/webcit/po/es.po
index 575949e96ec40e21b9af7f839639ad5d536516a3..315cc6715b8d07aea8f9eeef44c7c5731e262932 100644 (file)
--- a/webcit/po/es.po
+++ b/webcit/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WEBCIT 6.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: 2006-04-13 16:23-0500\n"
 "Last-Translator: Gabriel C. Huertas <gabrielhuertas@terra.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -1079,7 +1079,7 @@ msgstr "Dominios y configuración de correo de internet"
 msgid "Configure replication with other Citadel servers"
 msgstr "Configurar replicación con otros servidores Citadel"
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1263,7 +1263,7 @@ msgstr "No hay mensajes antiguos"
 msgid "No messages here."
 msgstr "No hay mensajes aquí"
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr "Remitente"
 
@@ -2387,33 +2387,38 @@ msgstr "Misma política que para salas públicas"
 msgid "Your system configuration has been updated."
 msgstr "Su confiración de sistema ha sido actualizada"
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 #, fuzzy
 msgid "Message ID"
 msgstr "Mensajes"
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 #, fuzzy
 msgid "Date/time submitted"
 msgstr "Mensajes enviados"
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 #, fuzzy
 msgid "The queue is empty."
 msgstr "Esta libreta de direcciones está vacía."
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+#, fuzzy
+msgid "Refresh this page"
+msgstr "Editar esta página"
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr "ERROR: no se pudo abrir la plantilla (template) "

diff --git a/webcit/po/fr.po b/webcit/po/fr.po
index 02ca9d36c9e3977e226d5be7a49f288a83a457a3..8d07c9c1f88d47d33b3d7564c267e2c0cc96db54 100644 (file)
--- a/webcit/po/fr.po
+++ b/webcit/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ~fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: 2006-10-14 09:03+0200\n"
 "Last-Translator: Thierry Pasquier - Jacques Lavignotte <thierry."
 "pasquier@pictascience.org>\n"
@@ -1079,7 +1079,7 @@ msgstr "Configuration des noms de domaine et du courrier électronique"
 msgid "Configure replication with other Citadel servers"
 msgstr "Configurer la réplication des autres serveurs Citadel"
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1263,7 +1263,7 @@ msgstr "Pas de messages anciens."
 msgid "No messages here."
 msgstr "Pas de messages ici."
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr "Expéditeur"
 
@@ -2385,33 +2385,38 @@ msgstr "Mêmes règles que dans les salons publics"
 msgid "Your system configuration has been updated."
 msgstr "La configuration de votre système a été mise à jour"
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 #, fuzzy
 msgid "Message ID"
 msgstr "Messages"
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 #, fuzzy
 msgid "Date/time submitted"
 msgstr "Messages soumis"
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 #, fuzzy
 msgid "The queue is empty."
 msgstr "Le carnet d'adresses est vide."
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+#, fuzzy
+msgid "Refresh this page"
+msgstr "Éditer cette page"
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr "ERREUR : impossible d'ouvrir le modèle"

diff --git a/webcit/po/it.po b/webcit/po/it.po
index a52378639d448dafca89ef30422443e1593a53e2..db75a1223fccde30861e26d49cc1b25a8b101651 100644 (file)
--- a/webcit/po/it.po
+++ b/webcit/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: 2006-02-27 10:07+0100\n"
 "Last-Translator: Gabriele Tassoni <tasso@fastwebnet.it>\n"
 "Language-Team: italian <it@li.org>\n"
@@ -1086,7 +1086,7 @@ msgstr "Configurazione dei nomi di dominio e della posta internet"
 msgid "Configure replication with other Citadel servers"
 msgstr "Configura la replicazione con altri server Citadel"
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1271,7 +1271,7 @@ msgstr "Nessun vecchio messaggio."
 msgid "No messages here."
 msgstr "Nessun messaggio."
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr "Mittente"
 
@@ -2398,33 +2398,38 @@ msgstr "Stessa politica delle stanze private"
 msgid "Your system configuration has been updated."
 msgstr "La configurazione del tuo sistema è stata aggiornata"
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 #, fuzzy
 msgid "Message ID"
 msgstr "Messaggi"
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 #, fuzzy
 msgid "Date/time submitted"
 msgstr "Numero di Messaggi"
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 #, fuzzy
 msgid "The queue is empty."
 msgstr "Questa lista contatti &egrave; vuota"
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+#, fuzzy
+msgid "Refresh this page"
+msgstr "Modifica questa pagina"
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr "ERRORE non riesco ad aprire il template"

diff --git a/webcit/po/webcit.pot b/webcit/po/webcit.pot
index 401efb5dd22093c6b415592d84d4d740b9b5300b..41df9bfe56c9abdcaa85923efdc42aad269ed776 100644 (file)
--- a/webcit/po/webcit.pot
+++ b/webcit/po/webcit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-27 14:20-0400\n"
+"POT-Creation-Date: 2006-10-28 00:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1031,7 +1031,7 @@ msgstr ""
 msgid "Configure replication with other Citadel servers"
 msgstr ""
 
-#: ../mainmenu.c:229 ../smtpqueue.c:144
+#: ../mainmenu.c:229 ../smtpqueue.c:210
 msgid "View the outbound SMTP queue"
 msgstr ""
 
@@ -1212,7 +1212,7 @@ msgstr ""
 msgid "No messages here."
 msgstr ""
 
-#: ../messages.c:2345 ../smtpqueue.c:173
+#: ../messages.c:2345 ../smtpqueue.c:166
 msgid "Sender"
 msgstr ""
 
@@ -2294,30 +2294,34 @@ msgstr ""
 msgid "Your system configuration has been updated."
 msgstr ""
 
-#: ../smtpqueue.c:167
+#: ../smtpqueue.c:160
 msgid "Message ID"
 msgstr ""
 
-#: ../smtpqueue.c:169
+#: ../smtpqueue.c:162
 msgid "Date/time submitted"
 msgstr ""
 
-#: ../smtpqueue.c:171
+#: ../smtpqueue.c:164
 msgid "Last attempt"
 msgstr ""
 
-#: ../smtpqueue.c:175
+#: ../smtpqueue.c:168
 msgid "Recipients"
 msgstr ""
 
-#: ../smtpqueue.c:187
+#: ../smtpqueue.c:180
 msgid "The queue is empty."
 msgstr ""
 
-#: ../smtpqueue.c:193
+#: ../smtpqueue.c:186
 msgid "You do not have permission to view this resource."
 msgstr ""
 
+#: ../smtpqueue.c:227
+msgid "Refresh this page"
+msgstr ""
+
 #: ../subst.c:216
 msgid "ERROR: could not open template "
 msgstr ""

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index f41e38fa88c32b0fa2fe9fffc78a1799474b7993..f3ac4a35d5aa30f47a3704f159dd09d6336b2bf8 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -25,6 +25,7 @@ void display_queue_msg(long msgnum)
        char recipients[65536];
        char thisrecp[256];
        char thisdsn[256];
+       long msgid = 0;
 
        strcpy(sender, "");
        strcpy(recipients, "");
@@ -61,6 +62,10 @@ void display_queue_msg(long msgnum)
                if ( (in_body) && (is_delivery_list) ) {
                        extract_token(keyword, buf, 0, '|', sizeof keyword);
 
+                       if (!strcasecmp(keyword, "msgid")) {
+                               msgid = extract_long(buf, 1);
+                       }
+
                        if (!strcasecmp(keyword, "submitted")) {
                                submitted = extract_long(buf, 1);
                        }
@@ -75,6 +80,17 @@ void display_queue_msg(long msgnum)
 
                        if (!strcasecmp(keyword, "bounceto")) {
                                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)) {
+                                               --atsign;
+                                               *atsign = 0;
+                                       }
+                               }
                        }
 
                        if (!strcasecmp(keyword, "remote")) {
@@ -100,6 +116,9 @@ void display_queue_msg(long msgnum)
 
        wprintf("<tr><td>");
        wprintf("%ld", msgnum);
+       wprintf(" <a href=\"javascript:DeleteQueueMsg(%ld,%ld);\">%s</a>", 
+               msgnum, msgid, _("(Delete)")
+       );
 
        wprintf("</td><td>");
        if (submitted > 0) {
@@ -129,28 +148,10 @@ void display_queue_msg(long msgnum)
 }
 
 
-/**
- * \brief display the outbound SMTP queue
- */
-void display_smtpqueue(void)
-{
+void display_smtpqueue_inner_div(void) {
        int i;
        int num_msgs;
 
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
-       wprintf(_("View the outbound SMTP queue"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
-
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
-               "<tr><td valign=top>\n");
-
-
        /* Check to see if we can go to the __CitadelSMTPspoolout__ room.
         * If not, we don't have access to the queue.
         */
@@ -194,7 +195,57 @@ void display_smtpqueue(void)
                wprintf("</div><br /><br />");
        }
 
-       wprintf("</td></tr></table></div>\n");
+}
+
+/**
+ * \brief 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("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf(_("View the outbound SMTP queue"));
+       wprintf("</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n<div id=\"content\">\n");
+
+       wprintf("<div class=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
+               "<tr><td valign=top>\n");
+
+       wprintf("<div id=\"smtpqueue_inner_div\">");
+
+       display_smtpqueue_inner_div();
+
+       wprintf("</div>"
+               "<div align=\"center\">"
+               "<a href=\"javascript:RefreshQueueDisplay();\">%s</a>"
+               "</div>"
+               "</td></tr></table></div>\n", _("Refresh this page")
+       );
        wDumpContent(1);
 
 }

diff --git a/webcit/webcit.c b/webcit/webcit.c
index b1201856e94ad02d616c0ade91acf2b80937fd1b..2cdbbd8aef7479f9962d840acb505e36f86cbe27 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1622,6 +1622,8 @@ void session_loop(struct httprequest *req)
                save_inetconf();
        } else if (!strcasecmp(action, "display_smtpqueue")) {
                display_smtpqueue();
+       } else if (!strcasecmp(action, "display_smtpqueue_inner_div")) {
+               display_smtpqueue_inner_div();
        } else if (!strcasecmp(action, "setup_wizard")) {
                do_setup_wizard();
        } else if (!strcasecmp(action, "display_preferences")) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index f96213b52df142af520d4ab926dff8b0cb66894e..72d3ac3b7ea10a536b714018862f9f71d282a41f 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -624,6 +624,7 @@ void set_room_policy(void);
 void display_inetconf(void);
 void save_inetconf(void);
 void display_smtpqueue(void);
+void display_smtpqueue_inner_div(void);
 void generate_uuid(char *);
 void CtdlMakeTempFileName(char *, int);
 void display_preferences(void);