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

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18284 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../gofon/gofon/conference/class_phoneConferenceGeneric.inc   | 4 ++--
 .../gofon/gofon/conference/class_phoneConferenceManagment.inc | 2 +-
 gosa-plugins/gofon/gofon/conference/tabs_conference.inc       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
index eb56f14a8..f77df2ba2 100644
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
@@ -118,7 +118,7 @@ class conference extends plugin
     } else {
 
       /* Get base */ 
-      $this->base = preg_replace ("/^[^,]+,".preg_quote(get_ou('phoneConferenceRDN'), '/')."/i","",$this->dn);;
+      $this->base = preg_replace ("/^[^,]+,".preg_quote(get_ou("conference", "phoneConferenceRDN") , '/')."/i","",$this->dn);;
     }
 
     $this->goFonConferenceOwner=$this->ui->dn;
@@ -383,7 +383,7 @@ class conference extends plugin
 
     if($this->old_cn != $this->cn || $this->base != $this->old_base){
       $ldap = $this->config->get_ldap_link();
-      $ldap->cd(get_ou('phoneConferenceRDN').$this->base);
+      $ldap->cd(get_ou("conference", "phoneConferenceRDN") .$this->base);
       $ldap->search("(&(objectClass=goFonConference)(cn=".$this->cn."))",array("cn"));
       if($ldap->count()){
         $message[] = msgPool::duplicated(_("Name"));
diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index 113eb5075..d5b21635c 100644
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -38,7 +38,7 @@ class phoneConferenceManagment extends management
     $this->config = $config;
     $this->ui = $ui;
    
-    $this->storagePoints = array(get_ou("phoneConferenceRDN"));
+    $this->storagePoints = array(get_ou("conference", "phoneConferenceRDN") );
  
     // Build filter
     if (session::global_is_set(get_class($this)."_filter")){
diff --git a/gosa-plugins/gofon/gofon/conference/tabs_conference.inc b/gosa-plugins/gofon/gofon/conference/tabs_conference.inc
index 8d51b1f9b..5cf4dd4d8 100644
--- a/gosa-plugins/gofon/gofon/conference/tabs_conference.inc
+++ b/gosa-plugins/gofon/gofon/conference/tabs_conference.inc
@@ -22,7 +22,7 @@ class conferencetabs extends tabs
   function save($ignore_account= FALSE)
   {
   	$baseobject= $this->by_object['conference'];
-	$new_dn= 'cn='.$baseobject->cn.','.get_ou('phoneConferenceRDN').$baseobject->base;
+	$new_dn= 'cn='.$baseobject->cn.','.get_ou("conference", "phoneConferenceRDN") .$baseobject->base;
 
 	if(strtolower($this->dn)==strtolower($new_dn)){
 		$this->dn=$new_dn;
-- 
2.30.2