mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12657 from owncloud/ajaxify-htaccess-check 

Check for working .htaccess via AJAX
This commit is contained in:
Morris Jobke 2014-12-08 10:37:06 +01:00
parent 2784d580bd 2b76227180
commit e6908f8b89
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/js/setupchecks.js
View File

@ -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'));
}

2
settings/admin.php
View File

@ -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());

3
settings/ajax/checksetup.php
View File

@ -18,6 +18,7 @@ if (OC_Util::isInternetConnectionEnabled()) {
OCP\JSON::success(
array (
'serverhasinternetconnection' => $hasInternet
'serverHasInternetConnection' => $hasInternet,
'dataDirectoryProtected' => OC_Util::isHtaccessWorking()
)
);

16
settings/templates/admin.php
View File

@ -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>