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

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18285 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc           | 2 +-
 gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc | 2 +-
 gosa-plugins/gofon/gofon/macro/tabs_macros.inc                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
index fc9f8809d..87605cc4e 100644
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
@@ -64,7 +64,7 @@ class macro extends plugin
       }
     } else {
       $this->orig_cn=$this->cn;
-      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("phoneMacroRDN"), '/')."/i", "", $this->dn);
+      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("macro", "phoneMacroRDN") , '/')."/i", "", $this->dn);
     }
 
     /* Check server configurations
diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
index af074a936..a44b1d6b2 100644
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
@@ -39,7 +39,7 @@ class goFonMacro extends management
     $this->config = $config;
     $this->ui = $ui;
 
-    $this->storagePoints = array(get_ou("phoneMacroRDN"));
+    $this->storagePoints = array(get_ou("macro", "phoneMacroRDN") );
 
     // Build filter
     if (session::global_is_set(get_class($this)."_filter")){
diff --git a/gosa-plugins/gofon/gofon/macro/tabs_macros.inc b/gosa-plugins/gofon/gofon/macro/tabs_macros.inc
index f874015e4..7a4626e6c 100644
--- a/gosa-plugins/gofon/gofon/macro/tabs_macros.inc
+++ b/gosa-plugins/gofon/gofon/macro/tabs_macros.inc
@@ -17,7 +17,7 @@ class macrotabs extends tabs
 
 	/* Check for new 'dn', in order to propagate the
 	   'dn' to all plugins */
-	$new_dn= "cn=".$baseobject->cn.",".get_ou('phoneMacroRDN').$baseobject->base;
+	$new_dn= "cn=".$baseobject->cn.",".get_ou("macro", "phoneMacroRDN") .$baseobject->base;
 
         /* Move group? */
         if ($this->dn != $new_dn){
-- 
2.30.2