Add buttons to refresh sendmail and postfix mail queues
authorJamie Cameron <jcameron@webmin.com>
Fri, 12 Aug 2011 22:07:03 +0000 (15:07 -0700)
committerJamie Cameron <jcameron@webmin.com>
Fri, 12 Aug 2011 22:07:03 +0000 (15:07 -0700)
postfix/lang/en
postfix/mailq.cgi
sendmail/lang/en
sendmail/list_mailq.cgi

index 6b51784..1a7e20a 100644 (file)
@@ -587,6 +587,8 @@ mailq_egone=The message is no longer in the queue
 mailq_status=Status
 mailq_flush=Flush Mail Queue
 mailq_flushdesc=Click this button to force the immediate delivery of all messages in the queue, and display the results.
+mailq_refresh=Refresh Mail Queue
+mailq_refreshdesc=Reload this page to show the current state of the mail queue.
 mailq_search=Find queued messages where
 mailq_move=Requeue Selected
 mailq_incoming=Incoming
index 4d8a883..f93be78 100755 (executable)
@@ -74,8 +74,12 @@ if (@qfiles) {
        # Show flush button, if the needed command is installed
        if (&has_command($config{'postfix_queue_command'})) {
                print &ui_hr();
+               print &ui_buttons_start();
                print &ui_buttons_row("flushq.cgi", $text{'mailq_flush'},
                                      $text{'mailq_flushdesc'});
+               print &ui_buttons_row("mailq.cgi?$in", $text{'mailq_refresh'},
+                                     $text{'mailq_refreshdesc'});
+               print &ui_buttons_end();
                }
        }
 else {
index 69affe9..adae25c 100644 (file)
@@ -433,6 +433,8 @@ mailq_flushquar=Flush Quarantined Queue
 mailq_flushquardesc=Click this button to force the delivery of only quarantined messages in the queue.
 mailq_search=Find queued messages where
 mailq_quar=Quarantined
+mailq_refresh=Refresh Mail Queue
+mailq_refreshdesc=Reload this page to show the current state of the mail queue.
 
 flushq_title=Flush Queue
 flushq_desc=Forcing the attempted delivery of all messages with the command $1 ..
index f9d05e7..2f2f282 100755 (executable)
@@ -101,12 +101,18 @@ if (@qfiles) {
        if ($access{'flushq'}) {
                print &ui_hr();
                print &ui_buttons_start();
-               print &ui_buttons_row("flushq.cgi", $text{'mailq_flush'}, $text{'mailq_flushdesc'});
+               print &ui_buttons_row("flushq.cgi",
+                                     $text{'mailq_flush'},
+                                     $text{'mailq_flushdesc'});
                if ($quarcount) {
-                       print &ui_buttons_row("flushq.cgi", $text{'mailq_flushquar'},
+                       print &ui_buttons_row("flushq.cgi",
+                                             $text{'mailq_flushquar'},
                                              $text{'mailq_flushquardesc'},
                                              &ui_hidden("quar", 1));
                        }
+               print &ui_buttons_row("list_mailq.cgi?$in",
+                                     $text{'mailq_refresh'},
+                                     $text{'mailq_refreshdesc'});
                print &ui_buttons_end();
                }
        }