From 3c58cac687b97e3b73cff19341d3c7af95f64932 Mon Sep 17 00:00:00 2001 From: cajus Date: Sat, 30 Jan 2010 11:43:22 +0000 Subject: [PATCH] Updated mime-types git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15494 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/mimetypes/class_mimetypeGeneric.inc | 32 ------------------- .../admin/mimetypes/mimetype-list-release.tpl | 2 +- .../goto/admin/mimetypes/mimetype-list.tpl | 9 ++---- 3 files changed, 4 insertions(+), 39 deletions(-) diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc index 8a4aab7e4..bd8f4cae6 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc @@ -162,38 +162,6 @@ class mimetype extends plugin } $smarty->assign("IconReadable", preg_match("/r/",$this->getacl("gotoMimeIcon",preg_match("/freeze/i",$this->FAIstate)))); - /* Base select dialog */ - $once = true; - foreach($_POST as $name => $value){ - if(preg_match("/^chooseBase/",$name) && $once && !preg_match("/freeze/i",$this->FAIstate)){ - $once = false; - $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases()); - $this->dialog->setCurrentBase($this->base); - } - } - - /* Dialog handling */ - if(is_object($this->dialog)){ - - /* Must be called before save_object */ - $this->dialog->save_object(); - - if($this->dialog->isClosed()){ - $this->dialog = false; - }elseif($this->dialog->isSelected()){ - - /* A new base was selected, check if it is a valid one */ - $tmp = $this->get_allowed_bases(); - if(isset($tmp[$this->dialog->isSelected()])){ - $this->base = $this->dialog->isSelected(); - } - - $this->dialog= false; - }else{ - return($this->dialog->execute()); - } - } - /* Check Posts */ $posts = array( "/^Pattern_SortUp_/" => array("Action" => "Pattern_SortUp", "Func" => "ArrayUp", "Attr" => "use_gotoMimeFilePattern"), diff --git a/gosa-plugins/goto/admin/mimetypes/mimetype-list-release.tpl b/gosa-plugins/goto/admin/mimetypes/mimetype-list-release.tpl index 54599c7be..46bd2da9a 100644 --- a/gosa-plugins/goto/admin/mimetypes/mimetype-list-release.tpl +++ b/gosa-plugins/goto/admin/mimetypes/mimetype-list-release.tpl @@ -8,7 +8,7 @@
-
+
diff --git a/gosa-plugins/goto/admin/mimetypes/mimetype-list.tpl b/gosa-plugins/goto/admin/mimetypes/mimetype-list.tpl index f3bba3f7a..c9d511416 100644 --- a/gosa-plugins/goto/admin/mimetypes/mimetype-list.tpl +++ b/gosa-plugins/goto/admin/mimetypes/mimetype-list.tpl @@ -1,8 +1,8 @@ -
{$RELOAD} {$SEPARATOR} 
+
- - -- 2.30.2
+

 {$HEADLINE} {$SIZELIMIT}

@@ -17,12 +17,9 @@
- - - {$LIST}
+ {$FILTER}