From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 9 Sep 2008 13:28:30 +0000 (+0000)
Subject: bugfix: all functions of mailqueue.pm accepts message id longer than 10 digits
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a02398e5f33526e30a1ea500a7b3ca7b454fb1bb;p=gosa.git

bugfix: all functions of mailqueue.pm accepts message id longer than 10 digits


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

diff --git a/gosa-si/client/events/mailqueue.pm b/gosa-si/client/events/mailqueue.pm
index 5268b7b56..9f07f685e 100644
--- a/gosa-si/client/events/mailqueue.pm
+++ b/gosa-si/client/events/mailqueue.pm
@@ -235,9 +235,9 @@ sub mailqueue_hold {
             my $error = 0;   # clear error status
 
             # sanity check of each msg_id
-            if (not $msg_id =~ /^[0-9A-Z]{10}$/) {
+            if (not $msg_id =~ /^[0-9A-Z]{10,12}$/) {
                 $error = 1;
-                $error_string = "message ID is not valid ([0-9A-Z]{10}) : $msg_id";
+                $error_string = "message ID is not valid ([0-9A-Z]{10,12}) : $msg_id";
                 &main::daemon_log("ERROR: $error_string : $msg", 1);
             }
 
@@ -316,9 +316,9 @@ sub mailqueue_unhold {
             my $error = 0;   # clear error status
 
             # sanity check of each msg_id
-            if (not $msg_id =~ /^[0-9A-Z]{10}$/) {
+            if (not $msg_id =~ /^[0-9A-Z]{10,12}$/) {
                 $error = 1;
-                $error_string = "message ID is not valid ([0-9A-Z]{10}) : $msg_id";
+                $error_string = "message ID is not valid ([0-9A-Z]{10,12}) : $msg_id";
                 &main::daemon_log("ERROR: $error_string : $msg", 1);
             }
 
@@ -399,9 +399,9 @@ sub mailqueue_requeue {
             my $error = 0;   # clear error status
 
             # sanity check of each msg_id
-            if (not $msg_id =~ /^[0-9A-Z]{10}$/) {
+            if (not $msg_id =~ /^[0-9A-Z]{10,12}$/) {
                 $error = 1;
-                $error_string = "message ID is not valid ([0-9A-Z]{10}) : $msg_id";
+                $error_string = "message ID is not valid ([0-9A-Z]{10,12}) : $msg_id";
                 &main::daemon_log("ERROR: $error_string : $msg", 1);
             }
 
@@ -483,9 +483,9 @@ sub mailqueue_del {
             my $error = 0;   # clear error status
 
             # sanity check of each msg_id
-            if (not $msg_id =~ /^[0-9A-Z]{10}$/) {
+            if (not $msg_id =~ /^[0-9A-Z]{10,12}$/) {
                 $error = 1;
-                $error_string = "message ID is not valid ([0-9A-Z]{10}) : $msg_id";
+                $error_string = "message ID is not valid ([0-9A-Z]{10,12}) : $msg_id";
                 &main::daemon_log("ERROR: $error_string : $msg", 1);
             }
 
@@ -568,9 +568,9 @@ sub mailqueue_header {
     my $msg_id;
     if (not $error) {
         $msg_id = @{$msg_hash->{'msg_id'}}[0];
-        if (not $msg_id =~ /^[0-9A-Z]{10}$/) {
+        if (not $msg_id =~ /^[0-9A-Z]{10,12}$/) {
             $error = 1;
-            $error_string = "message ID is not valid ([0-9A-Z]{10}) : $msg_id";
+            $error_string = "message ID is not valid ([0-9A-Z]{10,12}) : $msg_id";
             &main::daemon_log("ERROR: $error_string : $msg", 1);
         }
     }