summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xlib/util.php8
-rwxr-xr-xsettings/admin.php1
-rw-r--r--settings/templates/admin.php15
3 files changed, 23 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 91970ab2b96..4de34b9dfda 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -517,6 +517,14 @@ class OC_Util {
}
/**
+ * Check if the PHP module fileinfo is loaded.
+ * @return bool
+ */
+ public static function fileInfoLoaded() {
+ return function_exists('finfo_open');
+ }
+
+ /**
* Check if the ownCloud server can connect to the internet
*/
public static function isinternetconnectionworking() {
diff --git a/settings/admin.php b/settings/admin.php
index 4d9685ab920..7cca7165153 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -31,6 +31,7 @@ $tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
+$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0097489743f..9a9a691dcbf 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -22,7 +22,20 @@ if (!$_['htaccessworking']) {
<?php
}
-// is locale working ?
+// if module fileinfo available?
+if (!$_['has_fileinfo']) {
+ ?>
+<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Module \'fileinfo\' missing');?></strong></legend>
+
+ <span class="connectionwarning">
+ <?php echo $l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.'); ?>
+ </span>
+
+</fieldset>
+<?php
+}
+
if (!$_['islocaleworking']) {
?>
<fieldset class="personalblock">