Updated mailqueue

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17687 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc b/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc
index df82668f3efb24618a57e8ab85b4240b1ac60637..3be4b7e2b84716d8f06018cc867a417cad991258 100644 (file)
--- a/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc
+++ b/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc
@@ -78,7 +78,7 @@ class mailqueue extends plugin
       foreach($types as $type){
         if(preg_match("/^".$type."__/",$name) && $this->acl_is_writeable($type)){
           $action = $type;
-          $server = preg_replace("/^".$type."__[^_]*__([^_]*)_.*/","\\1",$name); 
+          $server = preg_replace("/^".$type."__[^_]*__([^_]*)$/","\\1",$name); 
           $entry[$server][] = preg_replace("/^".$type."__([^_]*)__.*/","\\1",$name); 
           break;
         }

diff --git a/gosa-plugins/mail/addons/mailqueue/contents.tpl b/gosa-plugins/mail/addons/mailqueue/contents.tpl
index 8fbbfdb4dff96b5400e3a03c55bc69c0124b2a3a..4711e099339b0ae5695bda500064fbf9f99367e5 100644 (file)
--- a/gosa-plugins/mail/addons/mailqueue/contents.tpl
+++ b/gosa-plugins/mail/addons/mailqueue/contents.tpl
@@ -100,7 +100,7 @@
        </td>
        <td class="list0">{$entries[$key].ServerName}</td>
        <td class="list0">{$entries[$key].Size}</td>
-       <td class="list0">$entries[$key].Arrival|date_format:"%d.%m.%Y %H:%M:%S"}</td>
+       <td class="list0">{$entries[$key].Arrival|date_format:"%d.%m.%Y %H:%M:%S"}</td>
        <td class="list0">{$entries[$key].Sender}</td>
        <td class="list0">{$entries[$key].Recipient}</td>
        <td class="list0">{$entries[$key].Status}</td>