Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso...

Conflicts:
	lib/helper.php

diff --cc lib/helper.php
index 1024a570e36bd7979e66587285be84f15033be9a,056c9a37fe53e34ad859e10b4494cf290df07d19..c7687d431e1d937208600c1f6d732105f8600605
--- 1/lib/helper.php
--- 2/lib/helper.php
+++ b/lib/helper.php
@@@ -591,9 -621,26 +591,26 @@@ class OC_Helper 
         * remove all files in PHP /oc-noclean temp dir
         */
        public static function cleanTmpNoClean() {
-               $tmpDirNoCleanFile = get_temp_dir() . '/oc-noclean/';
-               if (file_exists($tmpDirNoCleanFile)) {
-                       self::rmdirr($tmpDirNoCleanFile);
 -              $tmpDirNoCleanName=get_temp_dir().'/oc-noclean/';
++              $tmpDirNoCleanName=get_temp_dir() . '/oc-noclean/';
+               if(file_exists($tmpDirNoCleanName) && is_dir($tmpDirNoCleanName)) {
+                       $files=scandir($tmpDirNoCleanName);
+                       foreach($files as $file) {
+                               $fileName = $tmpDirNoCleanName . $file;
+                               if (!\OC\Files\Filesystem::isIgnoredDir($file) && filemtime($fileName) + 600 < time()) {
+                                       unlink($fileName);
+                               }
+                       }
+                       // if oc-noclean is empty delete it
+                       $isTmpDirNoCleanEmpty = true;
+                       $tmpDirNoClean = opendir($tmpDirNoCleanName);
+                       while (false !== ($file = readdir($tmpDirNoClean))) {
+                               if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+                                       $isTmpDirNoCleanEmpty = false;
+                               }
+                       }
+                       if ($isTmpDirNoCleanEmpty) {
+                               rmdir($tmpDirNoCleanName);
+                       }
                }
        }