From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 10 May 2010 13:33:10 +0000 (+0000)
Subject: Updated get_ou it receives values from the config registry now.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96c99e3a2b40d6e4189474dd4051b65fa9e8fcd8;p=gosa.git

Updated get_ou it receives values from the config registry now.

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

diff --git a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc
index d2f9487b7..1f2c76ff9 100644
--- a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc
+++ b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc
@@ -73,7 +73,7 @@ class roleGeneric extends plugin {
       $ui = get_userinfo();
       $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
     } else {
-      $this->base= preg_replace("/^[^,]+,".preg_quote(get_ou("roleRDN"), '/i')."/","",$this->dn);
+      $this->base= preg_replace("/^[^,]+,".preg_quote(get_ou("roleGeneric", "roleRDN") , '/i')."/","",$this->dn);
     }
 
     // Keep track of naming attribute modifications
diff --git a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc
index 38d45e7aa..7aa0defd2 100644
--- a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc
+++ b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc
@@ -38,7 +38,7 @@ class roleManagement extends management
     $this->config = $config;
     $this->ui = $ui;
    
-    $this->storagePoints = array(get_ou("roleRDN"));
+    $this->storagePoints = array(get_ou("roleGeneric", "roleRDN") );
  
     // Build filter
     if (session::global_is_set(get_class($this)."_filter")){
diff --git a/gosa-plugins/rolemanagement/admin/roleManagement/tabs_roles.inc b/gosa-plugins/rolemanagement/admin/roleManagement/tabs_roles.inc
index 5ab586cf6..24b95e744 100644
--- a/gosa-plugins/rolemanagement/admin/roleManagement/tabs_roles.inc
+++ b/gosa-plugins/rolemanagement/admin/roleManagement/tabs_roles.inc
@@ -55,7 +55,7 @@ class roletabs extends tabs
 
 		/* Check for new 'dn', in order to propagate the
 		   'dn' to all plugins */
-		$new_dn= 'cn='.$baseobject->cn.','.get_ou("roleRDN").$baseobject->base;
+		$new_dn= 'cn='.$baseobject->cn.','.get_ou("roleGeneric", "roleRDN") .$baseobject->base;
 
 		/* Move role? */
 		if ($this->dn != $new_dn){