From cab346b11f307ac45618fadc5762d41558a997a4 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 10 May 2010 13:32:48 +0000
Subject: [PATCH] Updated get_ou it receives values from the config registry
 now.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18267 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/goto/admin/devices/class_deviceGeneric.inc    | 2 +-
 gosa-plugins/goto/admin/devices/class_deviceManagement.inc | 2 +-
 gosa-plugins/goto/admin/devices/tabs_devices.inc           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc b/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
index 037963de6..81993e1a2 100644
--- a/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
@@ -56,7 +56,7 @@ class deviceGeneric extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base =preg_replace ("/^[^,]+,".preg_quote(get_ou('deviceRDN'), '/')."/i","",$this->dn);
+      $this->base =preg_replace ("/^[^,]+,".preg_quote(get_ou("deviceGeneric", "deviceRDN") , '/')."/i","",$this->dn);
     }
     $this->orig_base = $this->base;
     $this->orig_dn   = $this->dn;
diff --git a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
index 7ec0081b5..606f7b819 100644
--- a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
@@ -42,7 +42,7 @@ class deviceManagement extends management
 
     $filter_xml = "device-filter.xml";
     $list_xml = "device-list.xml";
-    $this->storagePoints= array(get_ou("deviceRDN"));
+    $this->storagePoints= array(get_ou("deviceGeneric", "deviceRDN") );
 
     // Build filter
     if (session::global_is_set(get_class($this)."_filter")){
diff --git a/gosa-plugins/goto/admin/devices/tabs_devices.inc b/gosa-plugins/goto/admin/devices/tabs_devices.inc
index e2b497993..12904f5a7 100644
--- a/gosa-plugins/goto/admin/devices/tabs_devices.inc
+++ b/gosa-plugins/goto/admin/devices/tabs_devices.inc
@@ -15,7 +15,7 @@ class devicetabs extends tabs
   function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['deviceGeneric'];
-    $new_dn= "cn=".$baseobject->cn.",".get_ou('deviceRDN').$baseobject->base;
+    $new_dn= "cn=".$baseobject->cn.",".get_ou("deviceGeneric", "deviceRDN") .$baseobject->base;
 
     /* Move group? */
     if ($this->dn != $new_dn){
-- 
2.30.2