Merge pull request #13654 from oparoz/tmpfile-with-extension

Keep the extension in temp files

2 files changed, 10 insertions, 3 deletions

diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index b97c29f50ba..54c0c26c079 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -45,12 +45,16 @@ abstract class Office extends Provider {
 		shell_exec($exec);
 
 		//create imagick object from pdf
+		$pdfPreview = null;
 		try{
-			$pdf = new \imagick($absPath . '.pdf' . '[0]');
+			list( $dirname, , , $filename ) = array_values( pathinfo($absPath) );
+			$pdfPreview = $dirname . '/' . $filename . '.pdf';
+
+			$pdf = new \imagick($pdfPreview . '[0]');
 			$pdf->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			unlink($absPath);
-			unlink($absPath . '.pdf');
+			unlink($pdfPreview);
 			\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
 			return false;
 		}
@@ -59,7 +63,7 @@ abstract class Office extends Provider {
 		$image->loadFromData($pdf);
 
 		unlink($absPath);
-		unlink($absPath . '.pdf');
+		unlink($pdfPreview);
 
 		return $image->valid() ? $image : false;
 	}
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index 33c3f1e9aef..197c0233142 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -55,6 +55,9 @@ class TempManager implements ITempManager {
 	}
 
 	protected function generatePath($postFix) {
+		if ($postFix) {
+			$postFix = '.' . ltrim($postFix, '.');
+		}
 		return $this->tmpBaseDir . '/oc_tmp_' . md5(time() . rand()) . $postFix;
 	}