Request 2043 (accepted)

Overview

Request 2043 (accepted)

No description set

Created by vanmeeuwen almost 7 years ago
In state accepted
Open review for Admin

Submit kolab-webadmin

Submit package Kolab:Winterfell / kolab-webadmin to package Kolab:16 / kolab-webadmin

kolab-webadmin.spec Changed

debian.changelog Changed

debian.control Changed

kolab-webadmin-3.2.11.tar.gz/bin/purge-deleted-domains Changed

@@ -34,6 +34,7 @@
 $username = $CONF->get('ldap', 'bind_dn');
 $password = $CONF->get('ldap', 'bind_pw');
 $domain   = $CONF->get('kolab', 'primary_domain');
+$dry_run  = in_array('--dry-run', $argv);
 
 // see https://cgit.kolab.org/webadmin/tree/lib/kolab_api_controller.php#n292
 session_start();
@@ -49,7 +50,7 @@
 
 // delete domains
 foreach ($domains as $dn => $domain) {
-    delete_domain($dn, $domain);
+    delete_domain($dn, $domain, $dry_run);
 }
 
 
@@ -81,7 +82,7 @@
     return $result['list'];
 }
 
-function delete_domain($domain_dn, $domain)
+function delete_domain($domain_dn, $domain, $dry_run = false)
 {
     global $LDAP, $CONF;
 
@@ -106,27 +107,33 @@
         $inetdomainbasedn = "dc=" . implode(',dc=', explode('.', $domain_name));
     }
 
-    // only deletes associateddomain=domain.tld,cn=kolab,cn=config
-    if (!$LDAP->delete_entry($domain_dn)) {
-        echo "Error: Failed to delete $domain_dn.\n";
-        return;
-    }
-
     $entries   = array();
     $entries[] = $inetdomainbasedn;
 
-    $cn        = str_replace('.', '_', $domain_name);
+    $cn = str_replace('.', '_', $domain_name);
     if ($LDAP->get_entry_attribute("cn={$cn},cn=ldbm database,cn=plugins,cn=config", 'nsuniqueid')) {
         $entries[] = "cn={$cn},cn=ldbm database,cn=plugins,cn=config";
     }
 
-    $cn        = str_replace(array(',', '='), array('\2C', '\3D'), $inetdomainbasedn);
+    $cn = str_replace(array(',', '='), array('\2C', '\3D'), $inetdomainbasedn);
     if ($LDAP->get_entry_attribute("cn={$cn},cn=mapping tree,cn=config", 'nsuniqueid')) {
         $entries[] = "cn={$cn},cn=mapping tree,cn=config";
     }
 
+    if ($dry_run) {
+        echo "Deleting $domain_dn\n";
+    }
+    // only deletes associateddomain=domain.tld,cn=kolab,cn=config
+    else if (!$LDAP->delete_entry($domain_dn)) {
+        echo "Error: Failed to delete $domain_dn.\n";
+        return;
+    }
+
     foreach ($entries as $dn) {
-        if (!$LDAP->delete_entry_recursive($dn)) {
+        if ($dry_run) {
+            echo "Deleting $dn\n";
+        }
+        else if (!$LDAP->delete_entry_recursive($dn)) {
             echo "Error: Failed to delete $dn.\n";
             return;
         }

kolab-webadmin-3.2.11.tar.gz/lib/client/kolab_client_task_settings.php 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-3.2.11.tar.gz/lib/kolab_client_task.php Changed

kolab-webadmin-3.2.11.tar.gz/public_html/js/kolab_admin.js Changed

kolab-webadmin.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2043 0

Request History

vanmeeuwen created request almost 7 years ago

vanmeeuwen accepted review almost 7 years ago

vanmeeuwen accepted request almost 7 years ago

Please add a comment