From 0a83971d3e6bc5dae958e304bea4bb1e7a33db59 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 27 Nov 2012 15:55:42 +0100
Subject: Clarify mime_magic config option; add new function to map mimetypes
 and filename extensions

---
 config/main.inc.php.dist | 10 ++++++++--
 config/mimetypes.php     |  7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 3c7d8eda6..3e7630cd3 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -363,8 +363,14 @@ $rcmail_config['identities_level'] = 0;
 // either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf'
 $rcmail_config['client_mimetypes'] = null;  # null == default
 
-// mime magic database
-$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
+// Path to a local mime magic database file for PHPs finfo extension.
+// Set to null if the default path should be used.
+$rcmail_config['mime_magic'] = null;
+
+// Path to local mime.types mapping table.
+// This is used to derive mime-types from the filename extension or vice versa.
+// Such a file is usually part of the apache webserver.
+$rcmail_config['mime_types'] = null;
 
 // path to imagemagick identify binary
 $rcmail_config['im_identify_path'] = null;
diff --git a/config/mimetypes.php b/config/mimetypes.php
index f0c101304..7665df3e9 100644
--- a/config/mimetypes.php
+++ b/config/mimetypes.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Local mapping file to specify mime-types based on common file-name extensions
+ *
+ * Please note that this mapping takes precedence over the content-based mime-type detection
+ * and should only contain mappings which cannot be detected properly from the file contents.
+ */
+
 return array(
   'xls' => 'application/vnd.ms-excel',
   'xlm' => 'application/vnd.ms-excel',
-- 
cgit v1.2.3