lib/kolab_api_service.php

[Aleksander Machniak]

 lib/kolab_api_service.php |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit acddf93a9ff407eae3c5216d134e5f0a42ff05f9
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Apr 11 14:49:01 2013 +0200

    Slightly improve resource type detection

diff --git a/lib/kolab_api_service.php b/lib/kolab_api_service.php
index 4c99d81..206a2b9 100644
--- a/lib/kolab_api_service.php
+++ b/lib/kolab_api_service.php
@@ -182,7 +182,7 @@ abstract class kolab_api_service
 
             Log::trace("\$object_class not in \$ref_class (" . $elem['key'] . "): " . implode(", ", $_object_class));
             Log::trace("\$ref_class not in \$object_class (" . $elem['key'] . "): " . implode(", ", $_ref_class));
-            Log::trace("Score for $object_name type " . $elem['name'] . ": " . $elem_score . "(" . $commonalities . "/" . $differences . ") " . $elem_keys_score);
+            Log::trace("Score for $object_name type " . $elem['name'] . ": " . $elem_score . " (" . $commonalities . "/" . $differences . ") " . $elem_keys_score);
 
             // Compare last and current element score
             if ($elem_score > $type_score || ($elem_score == $type_score && $elem_keys_score > $keys_score)) {
@@ -196,8 +196,7 @@ abstract class kolab_api_service
             if ($object_name == 'resource') {
                 //console("From database", $elem);
                 //console("Element key is " . $elem['key'] . " and \$attributes['mail'] is " . $attributes['mail']);
-
-                if (strstr($attributes['mail'], "-" . $elem['key'] . "-")) {
+                if (strpos($attributes['mail'], 'resource-' . $elem['key'] . '-') === 0) {
                     $type_id = $idx;
                     $type_score = 10;
                 }