From 9bdb9174fd5639059cdec828da1941a0b3ed4538 Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Thu, 6 Nov 2014 22:25:27 +0100 Subject: [PATCH] Better permission errors #258 --- php/modules/Photo.php | 7 ++++--- plugins/check/index.php | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/php/modules/Photo.php b/php/modules/Photo.php index a7985b0..0052575 100755 --- a/php/modules/Photo.php +++ b/php/modules/Photo.php @@ -43,11 +43,12 @@ class Photo extends Module { self::dependencies(isset($this->database)); # Check permissions - if (hasPermissions(LYCHEE_UPLOADS_BIG)===false|| + if (hasPermissions(LYCHEE_UPLOADS)===false|| + hasPermissions(LYCHEE_UPLOADS_BIG)===false|| hasPermissions(LYCHEE_UPLOADS_THUMB)===false|| hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) { - Log::error($this->database, __METHOD__, __LINE__, 'Wrong permissions in uploads/'); - exit('Error: Wrong permissions in uploads-folder!'); + Log::error($this->database, __METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable'); + exit('Error: An upload-folder is missing or not readable and writable!'); } # Call plugins diff --git a/plugins/check/index.php b/plugins/check/index.php index fe6fa39..d278fc7 100644 --- a/plugins/check/index.php +++ b/plugins/check/index.php @@ -68,12 +68,12 @@ if (!isset($settings['imagick'])||$settings['imagick']=='') $error .= ('Error if (!isset($settings['checkForUpdates'])||($settings['checkForUpdates']!='0'&&$settings['checkForUpdates']!='1')) $error .= ('Error 410: No or wrong property for checkForUpdates in database' . PHP_EOL); # Permissions -if (hasPermissions(LYCHEE_UPLOADS_BIG)===false) $error .= ('Error 500: Wrong permissions for \'uploads/big\' (777 required)' . PHP_EOL); -if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) $error .= ('Error 500: Wrong permissions for \'uploads/medium\' (777 required)' . PHP_EOL); -if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false) $error .= ('Error 501: Wrong permissions for \'uploads/thumb\' (777 required)' . PHP_EOL); -if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false) $error .= ('Error 502: Wrong permissions for \'uploads/import\' (777 required)' . PHP_EOL); -if (hasPermissions(LYCHEE_UPLOADS)===false) $error .= ('Error 503: Wrong permissions for \'uploads/\' (777 required)' . PHP_EOL); -if (hasPermissions(LYCHEE_DATA)===false) $error .= ('Error 504: Wrong permissions for \'data/\' (777 required)' . PHP_EOL); +if (hasPermissions(LYCHEE_UPLOADS_BIG)===false) $error .= ('Error 500: \'uploads/big\' missing or not readable and writable (777 required)' . PHP_EOL); +if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) $error .= ('Error 500: \'uploads/medium\' missing or not readable and writable (777 required)' . PHP_EOL); +if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false) $error .= ('Error 501: \'uploads/thumb\' missing or not readable and writable (777 required)' . PHP_EOL); +if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false) $error .= ('Error 502: \'uploads/import\' missing or not readable and writable (777 required)' . PHP_EOL); +if (hasPermissions(LYCHEE_UPLOADS)===false) $error .= ('Error 503: \'uploads/\' missing or not readable and writable (777 required)' . PHP_EOL); +if (hasPermissions(LYCHEE_DATA)===false) $error .= ('Error 504: \'data/\' missing or not readable and writable (777 required)' . PHP_EOL); # Check dropboxKey if (!$settings['dropboxKey']) echo('Warning: Dropbox import not working. No property for dropboxKey.' . PHP_EOL);