From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 7 Feb 2013 09:44:28 +0000 (+0100)
Subject: Merge branch 'master' into fixing-1354-master
X-Git-Tag: v5.0.0alpha1~62^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5788d36c8d1e9869d8a645293805e3b0265ea238;p=nextcloud-server.git

Merge branch 'master' into fixing-1354-master

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

5788d36c8d1e9869d8a645293805e3b0265ea238
diff --cc settings/admin.php
index e256c5fe357,7cca7165153..c7848803095
--- a/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 8c2b6148a66,9a9a691dcbf..fac8a689883
--- a/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">