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

Adapt logging & temppath creation

This commit is contained in:
Philipp 2023-04-01 20:12:02 +02:00
parent 5123e67f8d
commit 1d328f4c76
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
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
*
* @param $directory
* @param bool $check_writable
*
* @return boolean the directory is usable
*/
private static function isDirectoryUsable($directory, $check_writable = true)
private static function isDirectoryUsable($directory): bool
{
if ($directory == '') {
if (empty($directory)) {
Logger::warning('Directory is empty. This shouldn\'t happen.');
return false;
}
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;
}
@ -549,7 +548,7 @@ class System
return false;
}
if ($check_writable && !is_writable($directory)) {
if (!is_writable($directory)) {
Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
return false;
}
@ -601,7 +600,7 @@ class System
$new_temppath = $temppath . "/" . DI::baseUrl()->getHost();
if (!is_dir($new_temppath)) {
/// @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)) {