keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12967 from nupplaphil/bug/path_logger

Browse source 
Adapt logging & temppath creation
This commit is contained in:
Hypolite Petovan 2023-04-01 18:12:02 -04:00 committed by GitHub
commit 5100f9a188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Core/System.php
View file

@ -523,19 +523,18 @@ class System
* Checks if a given directory is usable for the system * Checks if a given directory is usable for the system
* *
* @param $directory * @param $directory
* @param bool $check_writable
* *
* @return boolean the directory is usable * @return boolean the directory is usable
*/ */
private static function isDirectoryUsable($directory, $check_writable = true) private static function isDirectoryUsable(string $directory): bool
{ {
if ($directory == '') { if (empty($directory)) {
Logger::warning('Directory is empty. This shouldn\'t happen.'); Logger::warning('Directory is empty. This shouldn\'t happen.');
return false; return false;
} }
if (!file_exists($directory)) { if (!file_exists($directory)) {
Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]); Logger::info('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
return false; return false;
} }
@ -549,7 +548,7 @@ class System
return false; return false;
} }
if ($check_writable && !is_writable($directory)) { if (!is_writable($directory)) {
Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]); Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
return false; return false;
} }
@ -601,7 +600,7 @@ class System
$new_temppath = $temppath . "/" . DI::baseUrl()->getHost(); $new_temppath = $temppath . "/" . DI::baseUrl()->getHost();
if (!is_dir($new_temppath)) { if (!is_dir($new_temppath)) {
/// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method? /// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
mkdir($new_temppath); @mkdir($new_temppath);
} }
if (self::isDirectoryUsable($new_temppath)) { if (self::isDirectoryUsable($new_temppath)) {