partkeepr

commit 08fe7e0cee37c345e02709c5c757430e9988e0a8
parent d628d93a164f262899d777ac07cbe40bc5e26ba8
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Thu, 11 Feb 2016 21:39:14 +0100

Merge pull request #588 from tamisoft/master

Exclude hidden directories from the requisite check
Diffstat:
M
app/PartKeeprRequirements.php
 | 
2
++
M
src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php
 | 
3
++-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/PartKeeprRequirements.php b/app/PartKeeprRequirements.php
@@ -149,6 +149,8 @@ class PartKeeprRequirements extends SymfonyRequirements
                     closedir($folder);
                     throw new \Exception($dir."/".$file." is not writable.");
                 } else {
+                    // Skip hidden directories
+                    if ((is_dir($dir."/".$file)) && ($file[0]=='.')) continue;
                     if (is_dir($dir."/".$file)) {
                         if (!$this->isWritableRecursive($dir."/".$file)) {
                             closedir($folder);
diff --git a/src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php b/src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php
@@ -57,7 +57,8 @@ class UploadedFileService extends ContainerAware
 
     public function replaceFromData(UploadedFile $file, $data, $filename)
     {
-        $tempName = tempnam("/tmp", "PARTKEEPR");
+        $tmpdir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
+        $tempName = tempnam($tmpdir, "PARTKEEPR");
 
         file_put_contents($tempName, $data);