From 8f49e4a99c2a35f71b763177b32c2cf1fef9a8c6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 04 Jul 2013 17:56:26 -0400
Subject: [PATCH] Check filetype detection in installer and update script (#1489193)

---
 installer/test.php |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/installer/test.php b/installer/test.php
index fb3e7e9..75dac47 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -225,6 +225,42 @@
 
 ?>
 
+<h3>Test filetype detection</h3>
+
+<p>
+<?php
+
+if ($errors = $RCI->check_mime_detection()) {
+  $RCI->fail('Fileinfo/mime_content_type configuration');
+  if (!empty($RCI->config['mime_magic'])) {
+    echo '<p class="hint">Try setting the <tt>mime_magic</tt> config option to <tt>null</tt>.</p>';
+  }
+  else {
+    echo '<p class="hint">Check the <a href="http://www.php.net/manual/en/function.finfo-open.php">Fileinfo functions</a> of your PHP installation.<br/>';
+    echo 'The path to the magic.mime file can be set using the <tt>mime_magic</tt> config option in Roundcube.</p>';
+  }
+}
+else {
+  $RCI->pass('Fileinfo/mime_content_type configuration');
+}
+
+?>
+</p>
+<p>
+<?php
+
+if ($errors = $RCI->check_mime_extensions()) {
+  $RCI->fail('Mimetype to file extension mapping');
+  echo '<p class="hint">Please set a valid path to your webserver\'s mime.types file to the <tt>mime_types</tt> config option.<br/>';
+  echo 'If you can\'t find such a file, download it from <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types">svn.apache.org</a>.</p>';
+}
+else {
+  $RCI->pass('Mimetype to file extension mapping');
+}
+
+?>
+
+
 <h3>Test SMTP config</h3>
 
 <p>

--
Gitblit v1.9.1