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

Merge pull request #1375 from nextcloud/display-that-updating-failed-for-htaccess 

Display an error when updating .htaccess failed
This commit is contained in:
Lukas Reschke 2016-09-14 14:26:41 +02:00 committed by GitHub
parent afddb138d9 4b26d7d86a
commit c5189a93db
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/Command/Maintenance/UpdateHtaccess.php
View File

@ -38,8 +38,12 @@ class UpdateHtaccess extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
\OC\Setup::updateHtaccess();
$output->writeln('.htaccess has been updated');
return 0;
if (\OC\Setup::updateHtaccess()) {
$output->writeln('.htaccess has been updated');
return 0;
} else {
$output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>');
return 1;
}
}
}

6
lib/private/Setup.php
View File

@ -410,6 +410,7 @@ class Setup {
/**
* Append the correct ErrorDocument path for Apache hosts
* @return bool True when success, False otherwise
*/
public static function updateHtaccess() {
$config = \OC::$server->getConfig();
@ -418,7 +419,7 @@ class Setup {
if(\OC::$CLI) {
$webRoot = $config->getSystemValue('overwrite.cli.url', '');
if($webRoot === '') {
return;
return false;
}
$webRoot = parse_url($webRoot, PHP_URL_PATH);
$webRoot = rtrim($webRoot, '/');
@ -472,9 +473,10 @@ class Setup {
if ($content !== '') {
//suppress errors in case we don't have permissions for it
@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n");
return (bool) @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n");
}
return false;
}
public static function protectDataDirectory() {