From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 16 Apr 2008 07:59:25 +0000 (+0000)
Subject: Updated mime management
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=00a582f6d68ab3d0dbb2018910779ae0d9217408;p=gosa.git

Updated mime management


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10491 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 71121377c..c5d52cf27 100644
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
@@ -37,9 +37,6 @@ class mimetype extends plugin
   var $DivApps							            = NULL;
   var $DivEApps							            = NULL;
 
-  /* Mime type release mode */
-  var $isReleaseMimeType 					      = false;
-
   /* These vars will be copied too, if you use copy&paste mode */
   var $CopyPasteVars        = array("use_gotoMimeFilePattern","use_gotoMimeApplication","use_gotoMimeEmbeddedApplication","iconData",
                                     "gotoMimeLeftClickAction_I","gotoMimeLeftClickAction_E","gotoMimeLeftClickAction_Q","use_gotoMimeIcon");
@@ -120,12 +117,6 @@ class mimetype extends plugin
       }
     }
 
-    /* Check if release Management is enabled */
-    $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
-    if(!empty($tmp)) {
-      $this->isReleaseMimeType= true;
-    }
-
     /* Set base */	
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
@@ -350,7 +341,7 @@ class mimetype extends plugin
     }			
     $smarty->assign("bases", 						$this->get_allowed_bases());		
     $smarty->assign("base_select", 					$this->base);		
-    $smarty->assign("isReleaseMimeType",			$this->isReleaseMimeType);
+    $smarty->assign("isReleaseMimeType",			$this->is_release());
     $smarty->assign("gotoMimeFilePatterns",			$DivPatterns->DrawList());
     $smarty->assign("gotoMimeApplications",			$DivApps->DrawList());
     $smarty->assign("gotoMimeEmbeddedApplications",	$DivEApps->DrawList());
@@ -386,7 +377,7 @@ class mimetype extends plugin
       $this->base = $base_tmp;
   
       /* Only save base if we are not in release mode */
-      if(!$this->isReleaseMimeType){
+      if(!$this->is_release()){
 
         /* Set new base if allowed */
         $tmp = $this->get_allowed_bases();
@@ -543,7 +534,7 @@ class mimetype extends plugin
     if($this->is_release()){
       $base = $this->parent->parent->mime_release;
     }else{
-      $base = $this->base;
+      $base = get_ou("mimetypeou").$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 54a04b55b..94b041569 100644
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
@@ -331,7 +331,7 @@ class mimetypeManagement extends plugin
         }
 
         /* Lock the current entry, so nobody will edit it during deletion */
-        $smarty->assign("info", msgPool::deleteInfo($dns_names,_("Mime type")));
+        $smarty->assign("intro", msgPool::deleteInfo($dns_names,_("Mime type")));
         $smarty->assign("multiple", true);
         return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
       }