Updated mime copy & paste

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

diff --git a/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/plugins/admin/mimetypes/class_mimetypeGeneric.inc
index df8c0d839f35ac9e679658e3b905c57cad787197..e7585c90b44a1c5551795b8774f10673367c4637 100644 (file)
--- a/plugins/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/plugins/admin/mimetypes/class_mimetypeGeneric.inc
@@ -707,12 +707,20 @@ class mimetype extends plugin
 
     $source_o = new mimetype($this->config,$source['dn'],$this->parent);
 
-    foreach(array("gotoMimeEmbeddedApplication","gotoMimeApplication","gotoMimeFilePattern","use_gotoMimeFilePattern") as $name){
+    foreach(array("gotoMimeLeftClickAction_Q","gotoMimeEmbeddedApplication","gotoMimeApplication","gotoMimeFilePattern","gotoMimeIcon","iconData") as $name){
+      $use_attr     = "use_".$name;
+      if(isset($this->$use_attr)){
+        $this->$use_attr= $source_o->$use_attr;
+      }
       $this->$name = $source_o->$name;
     } 
     foreach($this->attributes as $name){
       $this->$name = $source_o->$name;
-    } 
+    }
+
+    if($this->iconData){
+      $this->use_gotoMimeIcon ="Not emtpy, causes icon to be written.";
+    }
   }
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index 793d7696155693870df2fd4d76fb20da8c7d3b6f..45f6334254260156d447cdb98c3beaa7e1928210 100755 (executable)
--- a/plugins/admin/mimetypes/class_mimetypeManagement.inc
+++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc
@@ -498,6 +498,8 @@ class mimetypeManagement extends plugin
     /* In case of subsearch, add the subsearch flag */
     if($SubSearch){
       $Flags    |= GL_SUBSEARCH;  
+    }else{
+      $use_base ="ou=mime,".$use_base;
     }
   
     /* Get results and create index */