clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3451 from annando/issue-basepath-writable 

Don't check if basepath is writeable / convert App.php to unix newlines
This commit is contained in:
Tobias Diekershoff 2017-05-08 08:29:51 +02:00 committed by GitHub
parent 1f58bcc114 52a4e09711
commit 077941a116
1 changed files with 980 additions and 980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.php
View File

@ -191,7 +191,7 @@ class App {
$this->hostname = $hostname; $this->hostname = $hostname;
} }
if (! static::directory_usable($basepath)) { if (! static::directory_usable($basepath, false)) {
throw new \Exception('Basepath ' . $basepath . ' isn\'t usable.'); throw new \Exception('Basepath ' . $basepath . ' isn\'t usable.');
} }
@ -953,7 +953,7 @@ class App {
* *
* @return boolean the directory is usable * @return boolean the directory is usable
*/ */
static function directory_usable($directory) { static function directory_usable($directory, $check_writable = true) {
if ($directory == '') { if ($directory == '') {
logger('Directory is empty. This shouldn\'t happen.', LOGGER_DEBUG); logger('Directory is empty. This shouldn\'t happen.', LOGGER_DEBUG);
return false; return false;
@ -971,7 +971,7 @@ class App {
logger('Path "' . $directory . '" is not a directory for user ' . self::systemuser(), LOGGER_DEBUG); logger('Path "' . $directory . '" is not a directory for user ' . self::systemuser(), LOGGER_DEBUG);
return false; return false;
} }
if (!is_writable($directory)) { if ($check_writable AND !is_writable($directory)) {
logger('Path "' . $directory . '" is not writable for user ' . self::systemuser(), LOGGER_DEBUG); logger('Path "' . $directory . '" is not writable for user ' . self::systemuser(), LOGGER_DEBUG);
return false; return false;
} }