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

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
index fc9f8809da04442666d84ba95fc6249f5be56e24..87605cc4e49c1362cf32eb69ba0124b7dc5df3d5 100644 (file)
--- 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 af074a93638c1701f22d204f350ee43859131b63..a44b1d6b219fdec82aaf93b0cc958b178e8688b8 100644 (file)
--- 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 f874015e40b23674dff177b529105e059e96bf49..7a4626e6c4bbd639143892846b55736c04da40bf 100644 (file)
--- 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){