Allow zip archiving recursively

kimden · Dec 7, 2019 · 5dbdcfb · 5dbdcfb
1 parent b6583ec
commit 5dbdcfb
Showing 1 changed file with 28 additions and 13 deletions.
diff --git a/include/FileSystem.class.php b/include/FileSystem.class.php
@@ -548,6 +548,33 @@ public static function deleteOldSubdirectories($dir, $max_age)
         }
     }
 
+    /**
+    * Add files or sub-folders to zip file recursively
+    * @param ZipArchive $zip
+    * @param string $in input files
+    * @param string $out output location in zip file
+    */
+    private static function zipAdd($zip, $in, $out)
+    {
+        if (static::isDirectory($in))
+        {
+            $zip->addEmptyDir($out);
+            foreach (static::ls($in) as $file)
+            {
+                static::zipAdd($zip, $in . DS . $file, $out . DS . $file);
+            }
+            return;
+        }
+        if (!$zip->addFile($in, $out))
+        {
+            throw new FileSystemException("Can't add this file = '$out' to the archive");
+        }
+        if (!static::exists($in))
+        {
+            throw new FileSystemException("Can't add this file = '$out' as it doesn't exist");
+        }
+    }
+
     /**
      * Add a directory to a zip archive
      *
@@ -573,19 +600,7 @@ public static function compressToArchive($directory, $filename)
         // Find files to add to archive
         foreach (static::ls($directory) as $file)
         {
-            if (static::isDirectory($directory . $file))
-            {
-                continue;
-            }
-
-            if (!$zip->addFile($directory . $file, $file))
-            {
-                throw new FileSystemException("Can't add this file = '$file' to the archive");
-            }
-            if (!static::exists($directory . $file))
-            {
-                throw new FileSystemException("Can't add this file = '$file' as it doesn't exist");
-            }
+            static::zipAdd($zip, $directory . $file, $file);
         }
 
         if (!$zip->close())