summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-12-06 15:34:53 +0100
committerLukas Reschke <lukas@owncloud.com>2014-12-06 15:34:53 +0100
commit2b762271808598f69927a3d279ad24402a34f54e (patch)
tree6b63003c5b6fab89199dd29e8571226d46e08d7b
parent94eb2e782fa164492dd2665e6651eaa7068039aa (diff)
downloadnextcloud-server-2b762271808598f69927a3d279ad24402a34f54e.tar.gz
nextcloud-server-2b762271808598f69927a3d279ad24402a34f54e.zip
Check for working .htaccess via AJAX
Fixes https://github.com/owncloud/core/issues/12650
-rw-r--r--core/js/setupchecks.js7
-rw-r--r--settings/admin.php2
-rw-r--r--settings/ajax/checksetup.php5
-rw-r--r--settings/templates/admin.php16
4 files changed, 10 insertions, 20 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index f351c1b451a..db5365c124d 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -49,11 +49,16 @@
var afterCall = function(data, statusText, xhr) {
var messages = [];
if (xhr.status === 200 && data) {
- if (!data.serverhasinternetconnection) {
+ if (!data.serverHasInternetConnection) {
messages.push(
t('core', 'This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donĀ“t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')
);
}
+ if(!data.dataDirectoryProtected) {
+ messages.push(
+ t('core', 'Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')
+ );
+ }
} else {
messages.push(t('core', 'Error occurred while checking server setup'));
}
diff --git a/settings/admin.php b/settings/admin.php
index a5f07037911..4b70848bd5b 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -9,7 +9,6 @@ OC_Util::checkAdminUser();
OC_App::setActiveNavigationEntry("admin");
$template = new OC_Template('settings', 'admin', 'user');
-$htAccessWorking = OC_Util::isHtaccessWorking();
$entries = OC_Log_Owncloud::getEntries(3);
$entriesRemaining = count(OC_Log_Owncloud::getEntries(4)) > 3;
@@ -32,7 +31,6 @@ $template->assign('mail_smtpname', $config->getSystemValue("mail_smtpname", ''))
$template->assign('mail_smtppassword', $config->getSystemValue("mail_smtppassword", ''));
$template->assign('entries', $entries);
$template->assign('entriesremain', $entriesRemaining);
-$template->assign('htaccessworking', $htAccessWorking);
$template->assign('readOnlyConfigEnabled', OC_Helper::isReadOnlyConfigEnabled());
$template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
$template->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
diff --git a/settings/ajax/checksetup.php b/settings/ajax/checksetup.php
index 6bf5bc5642e..64718933317 100644
--- a/settings/ajax/checksetup.php
+++ b/settings/ajax/checksetup.php
@@ -17,7 +17,8 @@ if (OC_Util::isInternetConnectionEnabled()) {
}
OCP\JSON::success(
- array(
- 'serverhasinternetconnection' => $hasInternet
+ array (
+ 'serverHasInternetConnection' => $hasInternet,
+ 'dataDirectoryProtected' => OC_Util::isHtaccessWorking()
)
);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 83dc92a060a..a2380a92650 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -83,20 +83,6 @@ if (!$_['isConnectedViaHTTPS']) {
<?php
}
-// is htaccess working ?
-if (!$_['htaccessworking']) {
- ?>
- <div class="section">
- <h2><?php p($l->t('Security Warning')); ?></h2>
-
- <span class="securitywarning">
- <?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?>
- </span>
-
- </div>
-<?php
-}
-
// is read only config enabled
if ($_['readOnlyConfigEnabled']) {
?>
@@ -206,7 +192,7 @@ if ($_['suggestedOverwriteWebroot']) {
}
?>
<div id="postsetupchecks" class="section">
- <h2><?php p($l->t('Connectivity Checks'));?></h2>
+ <h2><?php p($l->t('Configuration Checks'));?></h2>
<div class="loading"></div>
<div class="success hidden"><?php p($l->t('No problems found'));?></div>
<div class="errors hidden"></div>