From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Apr 2010 11:34:28 +0000 (+0000)
Subject: Updated mailqueue
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0675f62b9ca018b3d2126d19df325683ce31c1c5;p=gosa.git

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 df82668f3..3be4b7e2b 100644
--- 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 8fbbfdb4d..4711e0993 100644
--- 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>