0.2.0

commit e340380
Author: Stan Hutcheon <[email protected]>
Date:   Tue Nov 1 16:56:42 2016 +0000

    remove file output option

commit 174b720
Author: Thomas Pfister <[email protected]>
Date:   Tue Nov 1 15:41:13 2016 +0100

    * Fix temp filename-generation
    * Fix PHP Warnings

commit 7e19ffd
Author: Stan Hutcheon <[email protected]>
Date:   Tue Nov 1 16:14:43 2016 +0000

    update codebase

Merged #5

Author: stnvh

README.md

@@ -6,54 +6,49 @@ Based on [planetbeing/partial-zip](https://github.com/planetbeing/partial-zip).
 
 #### Usage:
 
-```composer require stnvh/php-partialzip ~0.1```
+```composer require stnvh/php-partialzip 0.2.x```
 
 ##### Method usage:
 
 ###### __construct($url, $file = false):
 Class init method
 ```php
-<?php
-$p = new Partial('http://some.site.com/cats.zip', 'cat.png');
-# or
 $p = new Partial('http://some.site.com/cats.zip');
 ```
 
 ###### index():
 Returns a list of all the files in the remote directory
 ```php
-<?php
 /*...*/
-$list = implode(' ', $p->index()); # = 'cat.png cat2.png cat3.png'
+
+$list = $p->index(); # = ('cat.png', 'cat2.png', 'cat3.png')
 ```
 
 ###### find($fileName = false):
 Returns a parsed file object for use when fetching the remote file
 ```php
-<?php
 /*...*/
-$file = $p->find(); # Returns the cat.png file object (as set on init)
-# or
-$file = $p->find('cat2.png'); # Search and return other file objects
-
-# You can call methods here to fetch ZIP header information too
-# The full list of file header properties can be found in CDFile.php
-$size = $file->size(); # size in bytes
-$fullName = $file->name(); # full file name in zip, including path
+
+# Search and return other file objects
+if($file = $p->find('cat2.png')) {
+	# You can call methods here to fetch ZIP header information too
+	# The full list of file header properties can be found in CDFile.php
+	$size = $file->size(); # size in bytes
+	$fullName = $file->name(); # full file name in zip, including path
+}
+
 ```
 
-###### get($file, $output = false):
+###### get($file):
 Returns, or outputs the file fetched from the remote ZIP.
 
-**Note**: You should ensure no content is outputted before running ```->get($file, true)``` as this will cause the file download to contain invalid data.
-*Hint*: put ```ob_start()``` at the start of your script, then run ```ob_clean()``` before calling get.
+**Note**: You should ensure no content is outputted before echo-ing ```->get()``` as this will cause the file download to contain invalid data.
+*Hint*: put ```ob_start()``` at the start of your script, then run ```ob_clean()``` before output.
 ```php
-<?php
 /*...*/
-if($file) {
-    $data = $p->get($file); # Return
-    # or
-    $p->get($file, true); # Output (download)
+
+if($file = $p->find('cat3.png')) {
+    $fileData = $p->get($file);
 }
 ```
 
@@ -68,13 +63,17 @@ use Stnvh\Partial\Zip as Partial;
 
 ob_start(); # will capture all output
 
-$p = new Partial('http://some.site.com/cats.zip', 'cat.png');
+$p = new Partial('http://some.site.com/cats.zip');
 
 # Get file object
-$file = $p->find();
-if($file) {
-    ob_clean(); # removes everything from current output to ensure file downloads correctly
-    # Output to browser:
-    $p->get($file, true);
+if($file = $p->find('cat.png')) {
+	# removes everything from current output to ensure file downloads correctly
+    ob_clean();
+
+    # Set appropriate headers and output to browser:
+	header(sprintf('Content-Disposition: attachment; filename="%s"', $file->filename));
+	header(sprintf('Content-Length: %d', $file->size));
+
+    echo $p->get($file);
 }
 ```

src/Stnvh/Partial/Data/EOCD.php

@@ -15,7 +15,7 @@ class EOCD extends PartialData {
 		'CDEntries' => array(2, 'v*'),
 		'CDSize' => array(4, 'V*'),
 		'CDOffset' => array(4, 'V*'),
-		'lenComment' => array(4,  'V*'),
+		'lenComment' => array(2,  'V*'),
 		'comment' => array('lenComment', false)
 	);
 }

src/Stnvh/Partial/Data/PartialData.php

@@ -22,7 +22,7 @@ class PartialData {
 	 * @return void
 	 */
 	public function __construct($raw = false, $map = false) {
-		$this->tempName = sys_get_temp_dir() . uniqid('CDFile~');
+		$this->tempName = tempnam(sys_get_temp_dir(), 'CDFile~');
 		if($raw) {
 			$this->format($raw, $map);
 		}
@@ -114,19 +114,19 @@ public function format($raw, $map = false) {
 			$sect = substr($raw, (isset($pos[2]) ? $pos[2] : $i), $pos[0]);
 			if($pos[1]) {
 				$sect = unpack($pos[1], $sect);
-				$sect = $sect[1];
+				$sect = isset($sect[1]) ? $sect[1] : null;
 			}
 			$this->$name = $sect;
 
 			$i += $pos[0];
 		}
 
-		if(!$this->lenHeader) {
+		if(!isset($this->lenHeader)) {
 			$this->lenHeader = $i;
 		}
 
 		# If size not populated, fetch from 'extra field'
-		if($this->method == 0x0008 && $this->extra && !$this->size) {
+		if(isset($this->method) && $this->method == 0x0008 && $this->extra && !$this->size) {
 			$_map = array(
 				'crc32' => $map['crc32'],
 				'compressedSize' => $map['compressedSize'],

src/Stnvh/Partial/Data/ZipInfo.php

@@ -7,8 +7,6 @@
  * @package Stnvh\Partial\Data
  */
 class ZipInfo {
-	public $centralDirectory = '';
-	public $centralDirectoryEnd = '';
-	public $localHeader = '';
+	public $centralDirectory = array();
 	public $length = 0;
 }