Browse Source

Added logging for folder deletion

Tobias Reich 10 years ago
parent
commit
0dc54c44e0
1 changed files with 3 additions and 1 deletions
  1. 3 1
      php/modules/Import.php

+ 3 - 1
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!';