Patch for #6056

[gosa.git] / trunk / gosa-core / plugins / admin / ogroups / class_ogroup.inc

diff --git a/trunk/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/trunk/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index e9456ef7aa137aeaa3e6e8c25d53cba67e111f4b..8e1d17061b1b010df278a2b9a9aae3e0902f1ee3 100644 (file)
--- a/trunk/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/trunk/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -162,7 +162,7 @@ class ogroup extends plugin
     $this->used_workstations = array();
     foreach($res as $og){
       if($og['dn'] == $this->dn) continue;
-      $test = array_intersect($ws_dns,$og['member']);
+      $test = array_intersect($ws_dns,LDAP::convert($og['member']));
       if(($og['gosaGroupObjects'][0] == "[W]" || $og['gosaGroupObjects'][0] == "[T]") && count($test)){
         $this->used_workstations = array_merge($this->used_workstations,$test);
       }
@@ -930,8 +930,8 @@ class ogroup extends plugin
       $message[]= msgPool::required(_("Name"));
     }
 
-    if (preg_match('/[=,+<>#;]/', $this->cn)) {
-      $message[] = msgPool::invalid(_("Name"), $this->cn, "/[^=+,<>#;]/");
+    if (preg_match('/[\\\\=\",+<>#;]/', $this->cn)) {
+      $message[] = msgPool::invalid(_("Name"), $this->cn, "/[^\\\\=\"+,<>#;]/");
     }
 
     /* To many different object types? */