bugfix: mailq ids longer than 10 digits are allowd now

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

diff --git a/gosa-si/client/events/mailqueue.pm b/gosa-si/client/events/mailqueue.pm
index 5d755f123d3e320c9356a98ad33a80e280ff5546..5268b7b5696ec6b15dd3a725fa8131c2e12f32b3 100644 (file)
--- a/gosa-si/client/events/mailqueue.pm
+++ b/gosa-si/client/events/mailqueue.pm
@@ -125,7 +125,7 @@ sub mailqueue_query {
 
        &main::daemon_log("DEBUG: run /usr/bin/mailq\n", 7); 
     my $result = qx("/usr/bin/mailq");
-    my @result_l = split(/([0-9A-Z]{10})/, $result);
+    my @result_l = split(/([0-9A-Z]{10,12})/, $result);
 
     if (length($result) == 0) {
         $error = 1;

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 47a077b7e158248cba816ab88881f364734943b9..25061bb90736b9201431d58a65848a8cdeca1e52 100644 (file)
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -238,7 +238,7 @@ sub db_res2xml {
             if( $column_name eq "xmlmessage" ) {
                 $xml_content = &encode_base64($column_value);
             } else {
-                $xml_content = $column_value;
+                $xml_content = defined $column_value ? $column_value : "";
             }
             $xml .= $xml_content;
             $xml .= "</$column_name>"; 

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index d4dc8edd8367b7f1f3a7df4b28f673660dbb225a..74ffac7d5ad9d6cab23cec2f988e80b89000ee98 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -194,7 +194,7 @@ for($count = 1; $count <= $zahl; $count++)
     #$data = "<xml> <header>gosa_mailqueue_del</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <msg_id>CEAFDBEF45</msg_id> </xml>";
 
     # Only one xml tag msg_id is allowed
-    #$data = "<xml> <header>gosa_mailqueue_header</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <msg_id>99E92BEF2B</msg_id> </xml>";
+    #$data = "<xml> <header>gosa_mailqueue_header</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <msg_id>A9CBFBEF45</msg_id> </xml>";
      
     ########################
     # DAK Debian Archive Kit