Updated get_ou it receives values from the config registry now.

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

diff --git a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc
index b5ef3d31801498a66566a5e77f7fe914b293d298..05b8544103521f83fba1a4a570cdbacbd38340d4 100644 (file)
--- a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc
+++ b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc
@@ -64,7 +64,7 @@ class phoneGeneric extends plugin
       $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
       $this->cn= "";
     } else {
-      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("phoneRDN"), '/')."/i", "", $this->dn);
+      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("phoneGeneric", "phoneRDN") , '/')."/i", "", $this->dn);
     }
   
     if($this->goFonMSN != ""){
@@ -301,7 +301,7 @@ class phoneGeneric extends plugin
     $message= plugin::check();
     $message= array_merge($message, $this->netConfigDNS->check());
 
-    $this->dn= "cn=".$this->cn.",".get_ou('phoneRDN').$this->base;
+    $this->dn= "cn=".$this->cn.",".get_ou("phoneGeneric", "phoneRDN") .$this->base;
 
     /* To check for valid ip*/
     if($this->netConfigDNS->ipHostNumber == ""){

diff --git a/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc b/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc
index b8a85905814a36caa918fb90ac3754f0303f27bd..b43bec434c3c2f5691a9ed18b26dde1204901e90 100644 (file)
--- a/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc
+++ b/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc
@@ -25,7 +25,7 @@ class phonetabs extends tabs
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
     $baseobject= $this->by_object['phoneGeneric'];
-    $this->dn= "cn=$baseobject->cn,".get_ou('phoneRDN').$baseobject->base;
+    $this->dn= "cn=$baseobject->cn,".get_ou("phoneGeneric", "phoneRDN") .$baseobject->base;
     $baseobject->dn= $this->dn;
 
     foreach ($this->by_object as $key => $obj){