Kolab Groupware OBS

kolab-webadmin.spec Changed

debian.changelog Changed

kolab-webadmin-3.2.11.tar.gz/lib/kolab_api_service.php Changed

@@ -118,7 +118,7 @@
         $type_score   = null;
         $type_id      = null;
 
-        Log::trace("kolab_api_service::object_type_id objectClasses: " . implode(", ", $object_class));
+        Log::trace("kolab_api_service::object_type_id objectclasses: " . implode(", ", $object_class));
 
         foreach ($object_types as $idx => $elem) {
             $ref_class = $elem['attributes']['fields']['objectclass'];
@@ -161,6 +161,11 @@
                     continue;
                 }
 
+                if (!array_key_exists($attr, $attributes)) {
+                    // There's no point in comparing NULL with anything.
+                    continue;
+                }
+
                 $v = $attributes[$attr];
 
                 if (is_array($value)) {
@@ -173,7 +178,7 @@
                     }
 
                     $value = implode('', $value);
-                } else {
+                } else if (is_string($value)) {
                     $value = $this->conf->expand($_value, $custom = Array('base_dn' => $this->base_dn()));
                 }
 
@@ -181,7 +186,11 @@
                     $v = implode('', $v);
                 }
 
-                $elem_values_score += intval($v == $value);
+                if ($v == $value) {
+                    $elem_values_score += 1;
+                } else {
+                    $elem_values_score -= 1;
+                }
             }
 
             // Position in tree score

kolab-webadmin.dsc Changed

Changes of Revision 4