Branch 'dev/kolab3' - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_storage_folder.php |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 9db0e9b3d58b783fc3f95876e4bcef993f802f9a
Author: Thomas B <roundcube at gmail.com>
Date:   Thu May 3 11:01:23 2012 +0200

    Log Kolab object parsing failures

diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index a0c12c4..c93881b 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -441,6 +441,19 @@ class kolab_storage_folder
 
             return $object;
         }
+        else {
+            // try to extract object UID from XML block
+            if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
+                $msgadd = " UID = " . trim(strip_tags($m[1]));
+
+            raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . $msgadd,
+            ), true);
+        }
 
         return false;
     }