From 0dc54c44e0a6607b74e17727b13eef11ad456bd8 Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Fri, 16 May 2014 23:22:20 +0200 Subject: [PATCH] Added logging for folder deletion --- php/modules/Import.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/php/modules/Import.php b/php/modules/Import.php index 8851635..0b9fe2a 100644 --- a/php/modules/Import.php +++ b/php/modules/Import.php @@ -169,7 +169,9 @@ class Import extends Module { } # Delete tmpdir if import was successful - if ($error===false&&$useTemp===true&&isset($tmpdirname)) rmdir(LYCHEE_DATA . $tmpdirname); + if ($error===false&&$useTemp===true&&file_exists(LYCHEE_DATA . $tmpdirname)) { + if (@rmdir(LYCHEE_DATA . $tmpdirname)===false) Log::error($database, __METHOD__, __LINE__, 'Could not delete temp-folder (' . LYCHEE_DATA . $tmpdirname . ') after successful import'); + } if ($contains['photos']===false&&$contains['albums']===false) return 'Warning: Folder empty or no readable files to process!'; if ($contains['photos']===false&&$contains['albums']===true) return 'Notice: Import only contains albums!';