Fixed filter and added check for existing dn

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

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index b32c91fcf419d4b4e1d8ef96ae65542912b19c0c..3b7751fc7fe420296b99b1d888344967c9a9a654 100644 (file)
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -524,6 +524,16 @@ class ogroup extends plugin
       $new_dn= $this->dn;
     }
 
+
+    $ldap = $this->config->get_ldap_link();
+    if($this->dn != $new_dn){
+      $ldap->cat ($new_dn);
+    }
+    
+    if($ldap->count() !=0){
+      $message[]= _("There is already an object with this cn.");
+    } 
+
     $ui= get_userinfo();
     $acl= get_permissions ($new_dn, $ui->subtreeACL);
     $acl= get_module_permission($acl, "group", $new_dn);

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 09210ac1e3f2b33e72f04c1ec258137feb340a07..577bd17423ccc974d0c93470d68ad443f497ce24 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -563,6 +563,7 @@ name='dep_root' alt='"._("Root")."'> ".
     if ($ogroupfilter['fongroups'] == "checked"){
       $filter.= "(gosaGroupObjects=*F*)";
     }
+    $filter.= "(gosaGroupObjects=[])";
 
     if ($filter != ""){
       $filter= "(&(cn=$regex)(objectClass=gosaGroupOfNames)(|$filter))";