Updated get_ou it receives values from the config registry now.

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

diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
index 2b85b69d571e07259a05787bf6db7fbaa40639ec..fb6bc873378705ea6ff3ae3d065567f4fd9e1428 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
@@ -126,7 +126,7 @@ class mimetype extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base= preg_replace ("/^.*,".preg_quote(get_ou("mimetypeRDN"), '/')."/i", "", $this->dn);
+      $this->base= preg_replace ("/^.*,".preg_quote(get_ou("mimetype", "mimetypeRDN") , '/')."/i", "", $this->dn);
     }
 
     /* Get icon data */
@@ -524,7 +524,7 @@ class mimetype extends plugin
     if($this->is_release()){
       $base = $this->parent->parent->mime_release;
     }else{
-      $base = get_ou("mimetypeRDN").$this->base;
+      $base = get_ou("mimetype", "mimetypeRDN") .$this->base;
     }
 
     $ldap->ls("(&(objectClass=gotoMimeType)(cn=".$this->cn."))",$base,array("cn"));

diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
index 5c287006c39be6886bd64a9ee475872ee97f47be..4967916bde0c5badab7a807cc1cb63b3d0f764ca 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
@@ -42,8 +42,8 @@ class mimetypeManagement extends management
   {
     $this->config = $config;
     $this->ui = $ui;
-    $this->mime_base = get_ou('mimetypeRDN').$this->config->current['BASE'];
-    $this->mime_release = get_ou('mimetypeRDN').$this->config->current['BASE'];
+    $this->mime_base = get_ou("mimetype", "mimetypeRDN") .$this->config->current['BASE'];
+    $this->mime_release = get_ou("mimetype", "mimetypeRDN") .$this->config->current['BASE'];
 
     if($this->IsReleaseManagementActivated()){
       $filter_xml = "mimetype-filter-release.xml";
@@ -54,7 +54,7 @@ class mimetypeManagement extends management
     }else{
       $filter_xml = "mimetype-filter.xml";
       $list_xml = "mimetype-list.xml";
-      $this->storagePoints= array(get_ou("mimetypeRDN"));
+      $this->storagePoints= array(get_ou("mimetype", "mimetypeRDN") );
     }
 
     // Build filter

diff --git a/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc b/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc
index dacda448687497bbe79d4925737e05ab1c7a10cd..33094eb0d4d11daaccf940242d875b3a1700407a 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc
+++ b/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc
@@ -30,7 +30,7 @@ class mimetabs extends tabs
     if($this->parent->IsReleaseManagementActivated()){
       $new_dn= "cn=".$baseobject->cn.",".$this->parent->mime_release;
     }else{
-      $new_dn= "cn=".$baseobject->cn.",".get_ou('mimetypeRDN').$baseobject->base;
+      $new_dn= "cn=".$baseobject->cn.",".get_ou("mimetype", "mimetypeRDN") .$baseobject->base;
     }
 
     /* Move group? */