Changeset 950

Timestamp:

05/28/08 13:26:38 (6 months ago)

Author:

julieni

Message:

ticket #570: jZipCreator : empty dirs are not included in the archive

Files:

• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/utils/jZipCreator.class.php (modified) (4 diffs)
• branches/1.0.x/lib/jelix/utils/jZipCreator.class.php (modified) (4 diffs)
• branches/1.0.x/lib/jelix/utils/jZipCreator.class.php (modified) (4 diffs)
• branches/1.0.x/lib/jelix/utils/jZipCreator.class.php (modified) (4 diffs)

branches/1.0.x/lib/jelix/CREDITS

@@ -74 +74 @@
- - form plugin create always a form with method post (#592)
- - jDao : attribute groupby for method selectfirst (#447)
+ - jZipCreator : empty dirs are not included in the archive (#570)
-
-Bastien Jaillot (aka bastnic)

branches/1.0.x/lib/jelix/CREDITS

@@ -74 +74 @@
- - form plugin create always a form with method post (#592)
- - jDao : attribute groupby for method selectfirst (#447)
+ - jZipCreator : empty dirs are not included in the archive (#570)
-
-Bastien Jaillot (aka bastnic)

branches/1.0.x/lib/jelix/CREDITS

@@ -74 +74 @@
- - form plugin create always a form with method post (#592)
- - jDao : attribute groupby for method selectfirst (#447)
+ - jZipCreator : empty dirs are not included in the archive (#570)
-
-Bastien Jaillot (aka bastnic)

branches/1.0.x/lib/jelix/CREDITS

@@ -74 +74 @@
- - form plugin create always a form with method post (#592)
- - jDao : attribute groupby for method selectfirst (#447)
+ - jZipCreator : empty dirs are not included in the archive (#570)
-
-Bastien Jaillot (aka bastnic)

branches/1.0.x/lib/jelix/utils/jZipCreator.class.php

@@ -65 +65 @@
-
-            if ($handle = opendir($path)) {
+                $this->addEmptyDir($zipDirPath,filemtime($path));
-                while (($file = readdir($handle)) !== false) {
-
-
+
+
+
-                        $this->addFile($path.$file, $zipDirPath.$file);
-}elseif ($recursive){
+else if ($recursive)
-                        $this->addDir($path.$file,$zipDirPath.$file, true);
-                    }
-                }
-                closedir($handle);
@@ -89 +90 @@
-    public function addContentFile($zipFileName, $content, $filetime = 0){
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        /*
-        generation of the file record
@@ -127 +119 @@
-        $fileinfo .= pack('v', strlen($zipFileName))."\x00\x00";
-
-  = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
-$filerecord .= $fileinfo.
+= "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00".$fileinfo.
+    
-
-        $this->fileRecords[] = $filerecord;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -200 +188 @@
-            pack('V', strlen($centraldir)).pack('V', $this ->centralDirOffset)."\x00\x00";
-    }
+    
+    
+    
+    protected function _getDOSTimeFormat($timestamp){
+        // converts unix timestamp to dos binary format
+        if($timestamp == 0)
+            $timestamp = time();
+        elseif($timestamp < 315529200) // 01/01/1980
+            $timestamp = 315529200;
+
+        $dt = getdate($timestamp);
+
+        return pack('V',($dt['seconds'] >> 1) | ($dt['minutes'] << 5) | ($dt['hours'] << 11) |
+                ($dt['mday'] << 16) | ($dt['mon'] << 21) | (($dt['year'] - 1980) << 25));
+        
+    }
+    
+    protected function _addCentralDirEntry($name, $info, $isDir = false){        
+        /*
+         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 ; 16 : for empty folder support
+           - 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".$info;
+        $cdrecord .= "\x00\x00\x00\x00\x00\x00";
+        if($isDir)
+            $cdrecord .= pack('V', 16);
+        else
+            $cdrecord .= pack('V', 32);
+        $cdrecord .= pack('V', $this ->centralDirOffset );
+        $cdrecord .= $name;
+
+        $this->centralDirectory[] = $cdrecord;
+    }
-}
-

branches/1.0.x/lib/jelix/utils/jZipCreator.class.php

@@ -65 +65 @@
-
-            if ($handle = opendir($path)) {
+                $this->addEmptyDir($zipDirPath,filemtime($path));
-                while (($file = readdir($handle)) !== false) {
-
-
+
+
+
-                        $this->addFile($path.$file, $zipDirPath.$file);
-}elseif ($recursive){
+else if ($recursive)
-                        $this->addDir($path.$file,$zipDirPath.$file, true);
-                    }
-                }
-                closedir($handle);
@@ -89 +90 @@
-    public function addContentFile($zipFileName, $content, $filetime = 0){
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        /*
-        generation of the file record
@@ -127 +119 @@
-        $fileinfo .= pack('v', strlen($zipFileName))."\x00\x00";
-
-  = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
-$filerecord .= $fileinfo.
+= "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00".$fileinfo.
+    
-
-        $this->fileRecords[] = $filerecord;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -200 +188 @@
-            pack('V', strlen($centraldir)).pack('V', $this ->centralDirOffset)."\x00\x00";
-    }
+    
+    
+    
+    protected function _getDOSTimeFormat($timestamp){
+        // converts unix timestamp to dos binary format
+        if($timestamp == 0)
+            $timestamp = time();
+        elseif($timestamp < 315529200) // 01/01/1980
+            $timestamp = 315529200;
+
+        $dt = getdate($timestamp);
+
+        return pack('V',($dt['seconds'] >> 1) | ($dt['minutes'] << 5) | ($dt['hours'] << 11) |
+                ($dt['mday'] << 16) | ($dt['mon'] << 21) | (($dt['year'] - 1980) << 25));
+        
+    }
+    
+    protected function _addCentralDirEntry($name, $info, $isDir = false){        
+        /*
+         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 ; 16 : for empty folder support
+           - 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".$info;
+        $cdrecord .= "\x00\x00\x00\x00\x00\x00";
+        if($isDir)
+            $cdrecord .= pack('V', 16);
+        else
+            $cdrecord .= pack('V', 32);
+        $cdrecord .= pack('V', $this ->centralDirOffset );
+        $cdrecord .= $name;
+
+        $this->centralDirectory[] = $cdrecord;
+    }
-}
-

branches/1.0.x/lib/jelix/utils/jZipCreator.class.php

@@ -65 +65 @@
-
-            if ($handle = opendir($path)) {
+                $this->addEmptyDir($zipDirPath,filemtime($path));
-                while (($file = readdir($handle)) !== false) {
-
-
+
+
+
-                        $this->addFile($path.$file, $zipDirPath.$file);
-}elseif ($recursive){
+else if ($recursive)
-                        $this->addDir($path.$file,$zipDirPath.$file, true);
-                    }
-                }
-                closedir($handle);
@@ -89 +90 @@
-    public function addContentFile($zipFileName, $content, $filetime = 0){
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        /*
-        generation of the file record
@@ -127 +119 @@
-        $fileinfo .= pack('v', strlen($zipFileName))."\x00\x00";
-
-  = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
-$filerecord .= $fileinfo.
+= "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00".$fileinfo.
+    
-
-        $this->fileRecords[] = $filerecord;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -200 +188 @@
-            pack('V', strlen($centraldir)).pack('V', $this ->centralDirOffset)."\x00\x00";
-    }
+    
+    
+    
+    protected function _getDOSTimeFormat($timestamp){
+        // converts unix timestamp to dos binary format
+        if($timestamp == 0)
+            $timestamp = time();
+        elseif($timestamp < 315529200) // 01/01/1980
+            $timestamp = 315529200;
+
+        $dt = getdate($timestamp);
+
+        return pack('V',($dt['seconds'] >> 1) | ($dt['minutes'] << 5) | ($dt['hours'] << 11) |
+                ($dt['mday'] << 16) | ($dt['mon'] << 21) | (($dt['year'] - 1980) << 25));
+        
+    }
+    
+    protected function _addCentralDirEntry($name, $info, $isDir = false){        
+        /*
+         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 ; 16 : for empty folder support
+           - 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".$info;
+        $cdrecord .= "\x00\x00\x00\x00\x00\x00";
+        if($isDir)
+            $cdrecord .= pack('V', 16);
+        else
+            $cdrecord .= pack('V', 32);
+        $cdrecord .= pack('V', $this ->centralDirOffset );
+        $cdrecord .= $name;
+
+        $this->centralDirectory[] = $cdrecord;
+    }
-}
-

branches/1.0.x/lib/jelix/utils/jZipCreator.class.php

@@ -65 +65 @@
-
-            if ($handle = opendir($path)) {
+                $this->addEmptyDir($zipDirPath,filemtime($path));
-                while (($file = readdir($handle)) !== false) {
-
-
+
+
+
-                        $this->addFile($path.$file, $zipDirPath.$file);
-}elseif ($recursive){
+else if ($recursive)
-                        $this->addDir($path.$file,$zipDirPath.$file, true);
-                    }
-                }
-                closedir($handle);
@@ -89 +90 @@
-    public function addContentFile($zipFileName, $content, $filetime = 0){
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        /*
-        generation of the file record
@@ -127 +119 @@
-        $fileinfo .= pack('v', strlen($zipFileName))."\x00\x00";
-
-  = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
-$filerecord .= $fileinfo.
+= "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00".$fileinfo.
+    
-
-        $this->fileRecords[] = $filerecord;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -200 +188 @@
-            pack('V', strlen($centraldir)).pack('V', $this ->centralDirOffset)."\x00\x00";
-    }
+    
+    
+    
+    protected function _getDOSTimeFormat($timestamp){
+        // converts unix timestamp to dos binary format
+        if($timestamp == 0)
+            $timestamp = time();
+        elseif($timestamp < 315529200) // 01/01/1980
+            $timestamp = 315529200;
+
+        $dt = getdate($timestamp);
+
+        return pack('V',($dt['seconds'] >> 1) | ($dt['minutes'] << 5) | ($dt['hours'] << 11) |
+                ($dt['mday'] << 16) | ($dt['mon'] << 21) | (($dt['year'] - 1980) << 25));
+        
+    }
+    
+    protected function _addCentralDirEntry($name, $info, $isDir = false){        
+        /*
+         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 ; 16 : for empty folder support
+           - 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".$info;
+        $cdrecord .= "\x00\x00\x00\x00\x00\x00";
+        if($isDir)
+            $cdrecord .= pack('V', 16);
+        else
+            $cdrecord .= pack('V', 32);
+        $cdrecord .= pack('V', $this ->centralDirOffset );
+        $cdrecord .= $name;
+
+        $this->centralDirectory[] = $cdrecord;
+    }
-}
-