Updated get_ou it receives values from the config registry now.

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

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
index 05c41436d11097d15e6f6c4038acf838356ca9cc..9d1c44c8fa8db11eabe842bf615f2fa4c7420508 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
@@ -69,7 +69,7 @@ class blocklistGeneric extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("faxBlocklistRDN"), '/')."/i", "", $this->dn);
+      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("blocklistGeneric", "faxBlocklistRDN") , '/')."/i", "", $this->dn);
     }
     
     $this->orig_base = $this->base;
@@ -216,7 +216,7 @@ class blocklistGeneric extends plugin
       }
       if ($this->dn == 'new'){
         $ldap= $this->config->get_ldap_link();
-        $ldap->cd (get_ou('faxBlocklistRDN').$this->config->current["BASE"]);
+        $ldap->cd (get_ou("blocklistGeneric", "faxBlocklistRDN") .$this->config->current["BASE"]);
         $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))(cn=".$this->cn."))", array("cn"));
         if ($ldap->count() != 0){
           $message[]= msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index 4f59ce256a576cf81bfeb69b187bd262cc5b2c09..07bcaa5bb38bc3b8c812d3030fd8026c6d05880b 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -38,7 +38,7 @@ class blocklist extends management
     $this->config = $config;
     $this->ui = $ui;
 
-    $this->storagePoints = array(get_ou("faxBlocklistRDN"));
+    $this->storagePoints = array(get_ou("blocklistGeneric", "faxBlocklistRDN") );
 
     // Build filter
     if (session::global_is_set(get_class($this)."_filter")){

diff --git a/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc b/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc
index 54a378674caab0e73b02d45936497184023e5f37..d280acdc0db05747ee855d4c87825b2125e97f7c 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc
@@ -15,7 +15,7 @@ class faxblocktabs extends tabs
     $baseobject= $this->by_object['blocklistGeneric'];
 
     /* Check for new 'dn', in order to propagate the 'dn' to all plugins */
-    $new_dn= "cn=".$baseobject->cn.",".get_ou('faxBlocklistRDN').$baseobject->base;
+    $new_dn= "cn=".$baseobject->cn.",".get_ou("blocklistGeneric", "faxBlocklistRDN") .$baseobject->base;
 
     /* Move group? */
     if ($this->dn != $new_dn){