Ticket #570: 570-jZipCreator-empty-dirs-support.diff

lib/jelix/utils/jZipCreator.class.php

@@ -64 +64 @@
-                $path.='/';
-
-            if ($handle = opendir($path)) {
+                $this->addEmptyDir($zipDirPath,filemtime($path));
-                while (($file = readdir($handle)) !== false) {
-                    if($file == "." || $file == "..") continue;
-                    if (!is_dir($path.$file)) {
@@ -164 +165 @@
-
-        $this->centralDirectory[] = $cdrecord;
-
- 
+
-
-    }
+    
+    /**
+     * adds an empty dir to the zip file
+     */
+    public function addEmptyDir($name, $time=0){
+        // converts unix timestamp to dos binary format
+        if($time == 0)
+            $time = time();
+        elseif($time < 315529200) // 01/01/1980
+            $time = 315529200;
-
+        $dt = getdate($time);
-
+        $time =  pack('V',($dt['seconds'] >> 1) | ($dt['minutes'] << 5) | ($dt['hours'] << 11) |
+                ($dt['mday'] << 16) | ($dt['mon'] << 21) | (($dt['year'] - 1980) << 25));
+
+        /*
+        generation of the file record
+
+        file record:
+         - local file header signature     4 bytes  (0x04034b50)
+         - version needed to extract       2 bytes  14
+         - general purpose bit flag        2 bytes  0
+         - compression method              2 bytes  0x8
+         - last mod file time              2 bytes (fileinfo)
+         - last mod file date              2 bytes (fileinfo)
+         - crc-32                          4 bytes (fileinfo)
+         - compressed size                 4 bytes (fileinfo)
+         - uncompressed size               4 bytes (fileinfo)
+         - file name length                2 bytes (fileinfo)
+         - extra field length              2 bytes (here 0) (fileinfo)
+         - file name (variable size)
+         - extra field (variable size)      (here nothing)
+         - compressed content
+        */
+        $name     = str_replace('\\', '/', $name);
+
+        $fileinfo  = $time.pack('V', crc32(''));
+        $fileinfo .= pack('V', 0). pack('V', 0);
+        $fileinfo .= pack('v', strlen($name))."\x00\x00";
+
+        $filerecord   = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
+        $filerecord .= $fileinfo.$name;
+
+        $this->fileRecords[] = $filerecord;
+
+
+        /*
+         register the file into the central directory record
+         it contains an header for each file
+           - central file header signature   4 bytes  (0x02014b50)
+           - version made by                 2 bytes  0=DOS
+           - version needed to extract       2 bytes  0x14
+           - general purpose bit flag        2 bytes  0
+           - compression method              2 bytes  0x8
+           - last mod file time              2 bytes (fileinfo)
+           - last mod file date              2 bytes (fileinfo)
+           - crc-32                          4 bytes (fileinfo)
+           - compressed size                 4 bytes (fileinfo)
+           - uncompressed size               4 bytes (fileinfo)
+           - file name length                2 bytes (fileinfo)
+           - extra field length              2 bytes   0 (fileinfo)
+           - file comment length             2 bytes   0
+           - disk number start               2 bytes   0
+           - internal file attributes        2 bytes   0
+           - external file attributes        4 bytes   32 : 'archive' bit set
+           - relative offset of local header 4 bytes
+           - file name (variable size)
+           - extra field (variable size)
+           - file comment (variable size)
+        */
+        $cdrecord = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00".$fileinfo;
+        $cdrecord .= "\x00\x00\x00\x00\x00\x00";
+        $cdrecord .= pack('V', 16);
+        $cdrecord .= pack('V', $this ->centralDirOffset );
+        $cdrecord .= $name;
+
+        $this->centralDirectory[] = $cdrecord;
+
+        $this->centralDirOffset += strlen($filerecord);
+    }
+
+
-    /**
-     * create the contenu of the zip file
-     * @return  string  the content of the zip file