Merge branch 'master' into fixing-1354-master

Conflicts:
	settings/admin.php
	settings/templates/admin.php

diff --cc lib/base.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc settings/admin.php
index e256c5fe357374500f5811a1cc78dc87d657df56,7cca716515390fc9cda2bccf151ed4329deca2e9..c7848803095e2e794a90a9e9c5822e9859996677
--- 1/settings/admin.php
--- 2/settings/admin.php
+++ b/settings/admin.php
@@@ -31,7 -31,7 +31,8 @@@ $tmpl->assign('entriesremain', $entries
  $tmpl->assign('htaccessworking', $htaccessworking);
  $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
  $tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
 +$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
+ $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 --cc settings/templates/admin.php
index 8c2b6148a66fdc789939f68ab34689fc45639774,9a9a691dcbfa5569f6331d21910054bbc81eac9b..fac8a6898833826e61e70964b31fbf82f9805b22
--- 1/settings/templates/admin.php
--- 2/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@@ -22,22 -22,20 +22,36 @@@ if (!$_['htaccessworking']) 
  <?php
  }
  
 +// is WebDAV working ?
 +if (!$_['isWebDavWorking']) {
 +      ?>
 +<fieldset class="personalblock">
 +      <legend><strong><?php echo $l->t('Setup Warning');?></strong></legend>
 +
 +      <span class="securitywarning">
 +              <?php echo $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.'); ?>
 +              <?php echo $l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html'); ?>
 +      </span>
 +
 +</fieldset>
 +<?php
 +}
 +
+ // 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
+ }
+ 
 +// is locale working ?
  if (!$_['islocaleworking']) {
        ?>
  <fieldset class="personalblock">