From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Thu, 20 Oct 2011 12:18:42 -0500
Subject: adding new license file (OSL 3.0) and updating readme to ReST

added notice of license to all source files.
OSL to all except the few files we ship inside of the application folder, those are AFL.
Updated license in user guide.

incrementing next dev version to 3.0 due to licensing change
---
 system/libraries/Zip.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 666327d5c..9101eecb4 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -4,10 +4,22 @@
  *
  * An open source application development framework for PHP 5.1.6 or newer
  *
+ * NOTICE OF LICENSE
+ * 
+ * Licensed under the Open Software License version 3.0
+ * 
+ * This source file is subject to the Open Software License (OSL 3.0) that is
+ * bundled with this package in the files license.txt / license.rst.  It is
+ * also available through the world wide web at this URL:
+ * http://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to obtain it
+ * through the world wide web, please send an email to
+ * licensing@ellislab.com so we can send you a copy immediately.
+ *
  * @package		CodeIgniter
- * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc.
- * @license		http://codeigniter.com/user_guide/license.html
+ * @author		EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
@@ -27,7 +39,7 @@
  * @package		CodeIgniter
  * @subpackage	Libraries
  * @category	Encryption
- * @author		ExpressionEngine Dev Team
+ * @author		EllisLab Dev Team
  * @link		http://codeigniter.com/user_guide/libraries/zip.html
  */
 class CI_Zip  {
-- 
cgit v1.2.3-24-g4f1b


From 29130086c3b8df146c8c599f5ba47038efa10faf Mon Sep 17 00:00:00 2001
From: Thomas Traub <thomastraub2000@yahoo.de>
Date: Fri, 4 Nov 2011 14:16:43 +0100
Subject: Add file exists check to prevent stat failed error warnings in the
 log These occur when creating .zips by passing data and creating an
 artificial fs structure inside the .zip

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 9101eecb4..8e4357051 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -100,7 +100,7 @@ class CI_Zip  {
 	function _get_mod_time($dir)
 	{
 		// filemtime() will return false, but it does raise an error.
-		$date = (@filemtime($dir)) ? filemtime($dir) : getdate($this->now);
+		$date = (file_exists($dir) && @filemtime($dir)) ? filemtime($dir) : getdate($this->now);
 
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
-- 
cgit v1.2.3-24-g4f1b


From 98f85b177d6ebf6dbc3a2ec8313ef738eca2fbf2 Mon Sep 17 00:00:00 2001
From: Thomas Traub <thomastraub2000@yahoo.de>
Date: Mon, 5 Dec 2011 14:58:29 +0100
Subject: Took out the now unnecessary error suppression

---
 system/libraries/Zip.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 8e4357051..ef6c3e530 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -99,8 +99,8 @@ class CI_Zip  {
 	 */
 	function _get_mod_time($dir)
 	{
-		// filemtime() will return false, but it does raise an error.
-		$date = (file_exists($dir) && @filemtime($dir)) ? filemtime($dir) : getdate($this->now);
+		// filemtime() may return false, but raises an error for non-existing files
+		$date = (file_exists($dir) && filemtime($dir)) ? filemtime($dir) : getdate($this->now);
 
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
-- 
cgit v1.2.3-24-g4f1b


From 7fcfbda4cd72d4198c9b45ac13bcbd47bf067b81 Mon Sep 17 00:00:00 2001
From: Thomas Traub <thomastraub2000@yahoo.de>
Date: Mon, 5 Dec 2011 17:08:50 +0100
Subject: Update system/libraries/Zip.php

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index ef6c3e530..2fc30e469 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -100,7 +100,7 @@ class CI_Zip  {
 	function _get_mod_time($dir)
 	{
 		// filemtime() may return false, but raises an error for non-existing files
-		$date = (file_exists($dir) && filemtime($dir)) ? filemtime($dir) : getdate($this->now);
+		$date = (file_exists($dir) && $filemtime = filemtime($dir)) ? $filemtime : getdate($this->now);
 
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
-- 
cgit v1.2.3-24-g4f1b


From dba657efda6e057dc0c741dc449937c8ba5a029a Mon Sep 17 00:00:00 2001
From: Thomas Traub <thomastraub2000@yahoo.de>
Date: Tue, 6 Dec 2011 06:30:37 +0100
Subject: Update system/libraries/Zip.php

---
 system/libraries/Zip.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 2fc30e469..52f1bc3d0 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -100,8 +100,8 @@ class CI_Zip  {
 	function _get_mod_time($dir)
 	{
 		// filemtime() may return false, but raises an error for non-existing files
-		$date = (file_exists($dir) && $filemtime = filemtime($dir)) ? $filemtime : getdate($this->now);
-
+		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
+		
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
 
-- 
cgit v1.2.3-24-g4f1b


From 0ea392937fd9e0a135e16cc7a645e4068f456f5d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 25 Dec 2011 18:48:46 +0200
Subject: Improve the Zip library

---
 system/libraries/Zip.php | 70 +++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 52f1bc3d0..3c66c6b3a 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
  * An open source application development framework for PHP 5.1.6 or newer
  *
  * NOTICE OF LICENSE
- * 
+ *
  * Licensed under the Open Software License version 3.0
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -44,12 +44,12 @@
  */
 class CI_Zip  {
 
-	var $zipdata	= '';
-	var $directory	= '';
-	var $entries	= 0;
-	var $file_num	= 0;
-	var $offset		= 0;
-	var $now;
+	public $zipdata		= '';
+	public $directory	= '';
+	public $entries		= 0;
+	public $file_num	= 0;
+	public $offset		= 0;
+	public $now;
 
 	/**
 	 * Constructor
@@ -72,7 +72,7 @@ class CI_Zip  {
 	 * @param	mixed	the directory name. Can be string or array
 	 * @return	void
 	 */
-	function add_dir($directory)
+	public function add_dir($directory)
 	{
 		foreach ((array)$directory as $dir)
 		{
@@ -97,13 +97,15 @@ class CI_Zip  {
 	 *	@param string	path to file
 	 *	@return array	filemtime/filemdate
 	 */
-	function _get_mod_time($dir)
+	private function _get_mod_time($dir)
 	{
 		// filemtime() may return false, but raises an error for non-existing files
 		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
-		
-		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
-		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
+
+		$time = array(
+				'file_mtime' => ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2,
+				'file_mdate' => (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday']
+			);
 
 		return $time;
 	}
@@ -117,7 +119,7 @@ class CI_Zip  {
 	 * @param	string	the directory name
 	 * @return	void
 	 */
-	function _add_dir($dir, $file_mtime, $file_mdate)
+	private function _add_dir($dir, $file_mtime, $file_mdate)
 	{
 		$dir = str_replace("\\", "/", $dir);
 
@@ -170,21 +172,19 @@ class CI_Zip  {
 	 * @param	string
 	 * @return	void
 	 */
-	function add_data($filepath, $data = NULL)
+	public function add_data($filepath, $data = NULL)
 	{
 		if (is_array($filepath))
 		{
 			foreach ($filepath as $path => $data)
 			{
 				$file_data = $this->_get_mod_time($path);
-
 				$this->_add_data($path, $data, $file_data['file_mtime'], $file_data['file_mdate']);
 			}
 		}
 		else
 		{
 			$file_data = $this->_get_mod_time($filepath);
-
 			$this->_add_data($filepath, $data, $file_data['file_mtime'], $file_data['file_mdate']);
 		}
 	}
@@ -199,7 +199,7 @@ class CI_Zip  {
 	 * @param	string	the data to be encoded
 	 * @return	void
 	 */
-	function _add_data($filepath, $data, $file_mtime, $file_mdate)
+	private function _add_data($filepath, $data, $file_mtime, $file_mdate)
 	{
 		$filepath = str_replace("\\", "/", $filepath);
 
@@ -251,7 +251,7 @@ class CI_Zip  {
 	 * @access	public
 	 * @return	bool
 	 */
-	function read_file($path, $preserve_filepath = FALSE)
+	public function read_file($path, $preserve_filepath = FALSE)
 	{
 		if ( ! file_exists($path))
 		{
@@ -286,7 +286,7 @@ class CI_Zip  {
 	 * @param	string	path to source
 	 * @return	bool
 	 */
-	function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
+	public function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
 	{
 		if ( ! $fp = @opendir($path))
 		{
@@ -301,7 +301,7 @@ class CI_Zip  {
 
 		while (FALSE !== ($file = readdir($fp)))
 		{
-			if (substr($file, 0, 1) == '.')
+			if ($file[0] === '.')
 			{
 				continue;
 			}
@@ -337,7 +337,7 @@ class CI_Zip  {
 	 * @access	public
 	 * @return	binary string
 	 */
-	function get_zip()
+	public function get_zip()
 	{
 		// Is there any data to return?
 		if ($this->entries == 0)
@@ -345,15 +345,13 @@ class CI_Zip  {
 			return FALSE;
 		}
 
-		$zip_data = $this->zipdata;
-		$zip_data .= $this->directory."\x50\x4b\x05\x06\x00\x00\x00\x00";
-		$zip_data .= pack('v', $this->entries); // total # of entries "on this disk"
-		$zip_data .= pack('v', $this->entries); // total # of entries overall
-		$zip_data .= pack('V', strlen($this->directory)); // size of central dir
-		$zip_data .= pack('V', strlen($this->zipdata)); // offset to start of central dir
-		$zip_data .= "\x00\x00"; // .zip file comment length
-
-		return $zip_data;
+		return $this->zipdata
+			. $this->directory."\x50\x4b\x05\x06\x00\x00\x00\x00"
+			. pack('v', $this->entries) // total # of entries "on this disk"
+			. pack('v', $this->entries) // total # of entries overall
+			. pack('V', strlen($this->directory)) // size of central dir
+			. pack('V', strlen($this->zipdata)) // offset to start of central dir
+			. "\x00\x00"; // .zip file comment length
 	}
 
 	// --------------------------------------------------------------------
@@ -367,7 +365,7 @@ class CI_Zip  {
 	 * @param	string	the file name
 	 * @return	bool
 	 */
-	function archive($filepath)
+	public function archive($filepath)
 	{
 		if ( ! ($fp = @fopen($filepath, FOPEN_WRITE_CREATE_DESTRUCTIVE)))
 		{
@@ -392,7 +390,7 @@ class CI_Zip  {
 	 * @param	string	the data to be encoded
 	 * @return	bool
 	 */
-	function download($filename = 'backup.zip')
+	public function download($filename = 'backup.zip')
 	{
 		if ( ! preg_match("|.+?\.zip$|", $filename))
 		{
@@ -420,7 +418,7 @@ class CI_Zip  {
 	 * @access	public
 	 * @return	void
 	 */
-	function clear_data()
+	public function clear_data()
 	{
 		$this->zipdata		= '';
 		$this->directory	= '';
@@ -432,4 +430,4 @@ class CI_Zip  {
 }
 
 /* End of file Zip.php */
-/* Location: ./system/libraries/Zip.php */
\ No newline at end of file
+/* Location: ./system/libraries/Zip.php */
-- 
cgit v1.2.3-24-g4f1b


From b9535c80cc389952912f456f2c68665398b71494 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 26 Dec 2011 16:21:17 +0200
Subject: Update with suggestions from gaker & dixy

---
 system/libraries/Zip.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 3c66c6b3a..7a97914c0 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -97,7 +97,7 @@ class CI_Zip  {
 	 *	@param string	path to file
 	 *	@return array	filemtime/filemdate
 	 */
-	private function _get_mod_time($dir)
+	protected function _get_mod_time($dir)
 	{
 		// filemtime() may return false, but raises an error for non-existing files
 		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
@@ -115,11 +115,11 @@ class CI_Zip  {
 	/**
 	 * Add Directory
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	the directory name
 	 * @return	void
 	 */
-	private function _add_dir($dir, $file_mtime, $file_mdate)
+	protected function _add_dir($dir, $file_mtime, $file_mdate)
 	{
 		$dir = str_replace("\\", "/", $dir);
 
@@ -194,12 +194,12 @@ class CI_Zip  {
 	/**
 	 * Add Data to Zip
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	the file name/path
 	 * @param	string	the data to be encoded
 	 * @return	void
 	 */
-	private function _add_data($filepath, $data, $file_mtime, $file_mdate)
+	protected function _add_data($filepath, $data, $file_mtime, $file_mdate)
 	{
 		$filepath = str_replace("\\", "/", $filepath);
 
@@ -288,6 +288,8 @@ class CI_Zip  {
 	 */
 	public function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
 	{
+		$path = rtrim($path, '/\\').DIRECTORY_SEPARATOR;
+
 		if ( ! $fp = @opendir($path))
 		{
 			return FALSE;
@@ -425,6 +427,7 @@ class CI_Zip  {
 		$this->entries		= 0;
 		$this->file_num		= 0;
 		$this->offset		= 0;
+		return $this;
 	}
 
 }
-- 
cgit v1.2.3-24-g4f1b


From b1f3f57c65083904fe899753043419a25b073898 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 27 Dec 2011 02:38:39 +0200
Subject: Remove access lines from method descriptions

---
 system/libraries/Zip.php | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 7a97914c0..d60b99462 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -68,7 +68,6 @@ class CI_Zip  {
 	 *
 	 * Lets you add a virtual directory into which you can place files.
 	 *
-	 * @access	public
 	 * @param	mixed	the directory name. Can be string or array
 	 * @return	void
 	 */
@@ -115,7 +114,6 @@ class CI_Zip  {
 	/**
 	 * Add Directory
 	 *
-	 * @access	protected
 	 * @param	string	the directory name
 	 * @return	void
 	 */
@@ -167,7 +165,6 @@ class CI_Zip  {
 	 * in the filename it will be placed within a directory.  Make
 	 * sure you use add_dir() first to create the folder.
 	 *
-	 * @access	public
 	 * @param	mixed
 	 * @param	string
 	 * @return	void
@@ -194,7 +191,6 @@ class CI_Zip  {
 	/**
 	 * Add Data to Zip
 	 *
-	 * @access	protected
 	 * @param	string	the file name/path
 	 * @param	string	the data to be encoded
 	 * @return	void
@@ -248,7 +244,6 @@ class CI_Zip  {
 	/**
 	 * Read the contents of a file and add it to the zip
 	 *
-	 * @access	public
 	 * @return	bool
 	 */
 	public function read_file($path, $preserve_filepath = FALSE)
@@ -282,7 +277,6 @@ class CI_Zip  {
 	 * sub-folders) and creates a zip based on it.  Whatever directory structure
 	 * is in the original file path will be recreated in the zip file.
 	 *
-	 * @access	public
 	 * @param	string	path to source
 	 * @return	bool
 	 */
@@ -336,7 +330,6 @@ class CI_Zip  {
 	/**
 	 * Get the Zip file
 	 *
-	 * @access	public
 	 * @return	binary string
 	 */
 	public function get_zip()
@@ -363,7 +356,6 @@ class CI_Zip  {
 	 *
 	 * Lets you write a file
 	 *
-	 * @access	public
 	 * @param	string	the file name
 	 * @return	bool
 	 */
@@ -387,7 +379,6 @@ class CI_Zip  {
 	/**
 	 * Download
 	 *
-	 * @access	public
 	 * @param	string	the file name
 	 * @param	string	the data to be encoded
 	 * @return	bool
@@ -417,7 +408,6 @@ class CI_Zip  {
 	 * Lets you clear current zip data.  Useful if you need to create
 	 * multiple zips with different data.
 	 *
-	 * @access	public
 	 * @return	void
 	 */
 	public function clear_data()
-- 
cgit v1.2.3-24-g4f1b


From 0defe5d33ee2633f377a109519ca818becc60f64 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sun, 1 Jan 2012 18:46:41 -0600
Subject: Updating copyright date to 2012

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 52f1bc3d0..50e84920e 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b


From cfbd15b6d052c1cb93fb5fa08e35fa7d3c6c7751 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 8 Jan 2012 06:41:41 +0200
Subject: Some more misc. stuff

---
 system/libraries/Zip.php | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index d60b99462..2ed79f0e3 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -51,13 +51,9 @@ class CI_Zip  {
 	public $offset		= 0;
 	public $now;
 
-	/**
-	 * Constructor
-	 */
 	public function __construct()
 	{
-		log_message('debug', "Zip Compression Class Initialized");
-
+		log_message('debug', 'Zip Compression Class Initialized');
 		$this->now = time();
 	}
 
@@ -75,13 +71,12 @@ class CI_Zip  {
 	{
 		foreach ((array)$directory as $dir)
 		{
-			if ( ! preg_match("|.+/$|", $dir))
+			if ( ! preg_match('|.+/$|', $dir))
 			{
 				$dir .= '/';
 			}
 
 			$dir_time = $this->_get_mod_time($dir);
-
 			$this->_add_dir($dir, $dir_time['file_mtime'], $dir_time['file_mdate']);
 		}
 	}
@@ -101,12 +96,10 @@ class CI_Zip  {
 		// filemtime() may return false, but raises an error for non-existing files
 		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
 
-		$time = array(
+		return array(
 				'file_mtime' => ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2,
 				'file_mdate' => (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday']
 			);
-
-		return $time;
 	}
 
 	// --------------------------------------------------------------------
@@ -197,13 +190,11 @@ class CI_Zip  {
 	 */
 	protected function _add_data($filepath, $data, $file_mtime, $file_mdate)
 	{
-		$filepath = str_replace("\\", "/", $filepath);
+		$filepath = str_replace('\\', '/', $filepath);
 
 		$uncompressed_size = strlen($data);
 		$crc32  = crc32($data);
-
-		$gzdata = gzcompress($data);
-		$gzdata = substr($gzdata, 2, -4);
+		$gzdata = substr(gzcompress($data), 2, -4);
 		$compressed_size = strlen($gzdata);
 
 		$this->zipdata .=
@@ -255,16 +246,16 @@ class CI_Zip  {
 
 		if (FALSE !== ($data = file_get_contents($path)))
 		{
-			$name = str_replace("\\", "/", $path);
-
+			$name = str_replace('\\', '/', $path);
 			if ($preserve_filepath === FALSE)
 			{
-				$name = preg_replace("|.*/(.+)|", "\\1", $name);
+				$name = preg_replace('|.*/(.+)|', '\\1', $name);
 			}
 
 			$this->add_data($name, $data);
 			return TRUE;
 		}
+
 		return FALSE;
 	}
 
@@ -282,7 +273,7 @@ class CI_Zip  {
 	 */
 	public function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
 	{
-		$path = rtrim($path, '/\\').DIRECTORY_SEPARATOR;
+		$path = rtrim($path, '/\\').'/';
 
 		if ( ! $fp = @opendir($path))
 		{
@@ -304,14 +295,13 @@ class CI_Zip  {
 
 			if (@is_dir($path.$file))
 			{
-				$this->read_dir($path.$file."/", $preserve_filepath, $root_path);
+				$this->read_dir($path.$file.'/', $preserve_filepath, $root_path);
 			}
 			else
 			{
 				if (FALSE !== ($data = file_get_contents($path.$file)))
 				{
-					$name = str_replace("\\", "/", $path);
-
+					$name = str_replace('\\', '/', $path);
 					if ($preserve_filepath === FALSE)
 					{
 						$name = str_replace($root_path, '', $name);
@@ -335,7 +325,7 @@ class CI_Zip  {
 	public function get_zip()
 	{
 		// Is there any data to return?
-		if ($this->entries == 0)
+		if ($this->entries === 0)
 		{
 			return FALSE;
 		}
@@ -392,9 +382,7 @@ class CI_Zip  {
 
 		$CI =& get_instance();
 		$CI->load->helper('download');
-
 		$get_zip = $this->get_zip();
-
 		$zip_content =& $get_zip;
 
 		force_download($filename, $zip_content);
-- 
cgit v1.2.3-24-g4f1b


From e34f1a75ca78825bcf96c4344e01de412f6113bf Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 10 Jan 2012 22:41:52 +0200
Subject: Some quotes

---
 system/libraries/Zip.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 2ed79f0e3..dbcdb2d97 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -112,7 +112,7 @@ class CI_Zip  {
 	 */
 	protected function _add_dir($dir, $file_mtime, $file_mdate)
 	{
-		$dir = str_replace("\\", "/", $dir);
+		$dir = str_replace('\\', '/', $dir);
 
 		$this->zipdata .=
 			"\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00"
@@ -375,7 +375,7 @@ class CI_Zip  {
 	 */
 	public function download($filename = 'backup.zip')
 	{
-		if ( ! preg_match("|.+?\.zip$|", $filename))
+		if ( ! preg_match('|.+?\.zip$|', $filename))
 		{
 			$filename .= '.zip';
 		}
-- 
cgit v1.2.3-24-g4f1b


From 16d806605993305efe9c264b3ae8383ec92ae5ae Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 20 Jan 2012 13:26:49 +0200
Subject: Some more cleaning

---
 system/libraries/Zip.php | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index dbcdb2d97..85a0b5ce9 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -9,7 +9,7 @@
  * Licensed under the Open Software License version 3.0
  *
  * This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst.  It is
+ * bundled with this package in the files license.txt / license.rst. It is
  * also available through the world wide web at this URL:
  * http://opensource.org/licenses/OSL-3.0
  * If you did not receive a copy of the license and are unable to obtain it
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * Zip Compression Class
  *
@@ -265,7 +263,7 @@ class CI_Zip  {
 	 * Read a directory and add it to the zip.
 	 *
 	 * This function recursively reads a folder and everything it contains (including
-	 * sub-folders) and creates a zip based on it.  Whatever directory structure
+	 * sub-folders) and creates a zip based on it. Whatever directory structure
 	 * is in the original file path will be recreated in the zip file.
 	 *
 	 * @param	string	path to source
@@ -297,18 +295,14 @@ class CI_Zip  {
 			{
 				$this->read_dir($path.$file.'/', $preserve_filepath, $root_path);
 			}
-			else
+			elseif (FALSE !== ($data = file_get_contents($path.$file)))
 			{
-				if (FALSE !== ($data = file_get_contents($path.$file)))
+				$name = str_replace('\\', '/', $path);
+				if ($preserve_filepath === FALSE)
 				{
-					$name = str_replace('\\', '/', $path);
-					if ($preserve_filepath === FALSE)
-					{
-						$name = str_replace($root_path, '', $name);
-					}
-
-					$this->add_data($name.$file, $data);
+					$name = str_replace($root_path, '', $name);
 				}
+				$this->add_data($name.$file, $data);
 			}
 		}
 
@@ -320,7 +314,7 @@ class CI_Zip  {
 	/**
 	 * Get the Zip file
 	 *
-	 * @return	binary string
+	 * @return	string (binary encoded)
 	 */
 	public function get_zip()
 	{
@@ -393,10 +387,10 @@ class CI_Zip  {
 	/**
 	 * Initialize Data
 	 *
-	 * Lets you clear current zip data.  Useful if you need to create
+	 * Lets you clear current zip data. Useful if you need to create
 	 * multiple zips with different data.
 	 *
-	 * @return	void
+	 * @return	object
 	 */
 	public function clear_data()
 	{
-- 
cgit v1.2.3-24-g4f1b


From 1841e6b472820deb2dfe4d43c675211eeabbd057 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 24 Jan 2012 15:30:01 +0200
Subject: Revert a space in the license agreement :)

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 85a0b5ce9..e7c55de1b 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -9,7 +9,7 @@
  * Licensed under the Open Software License version 3.0
  *
  * This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
  * http://opensource.org/licenses/OSL-3.0
  * If you did not receive a copy of the license and are unable to obtain it
-- 
cgit v1.2.3-24-g4f1b


From 6c308b7482375baa4982cce26219cecd20bafdc0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 2 Feb 2012 22:03:53 +0200
Subject: Fix some comment blocks

---
 system/libraries/Zip.php | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e7c55de1b..174d18a67 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -67,7 +67,7 @@ class CI_Zip  {
 	 */
 	public function add_dir($directory)
 	{
-		foreach ((array)$directory as $dir)
+		foreach ( (array) $directory as $dir)
 		{
 			if ( ! preg_match('|.+/$|', $dir))
 			{
@@ -82,17 +82,17 @@ class CI_Zip  {
 	// --------------------------------------------------------------------
 
 	/**
-	 *	Get file/directory modification time
+	 * Get file/directory modification time
 	 *
-	 *	If this is a newly created file/dir, we will set the time to 'now'
+	 * If this is a newly created file/dir, we will set the time to 'now'
 	 *
-	 *	@param string	path to file
-	 *	@return array	filemtime/filemdate
+	 * @param	string	path to file
+	 * @return	array	filemtime/filemdate
 	 */
 	protected function _get_mod_time($dir)
 	{
 		// filemtime() may return false, but raises an error for non-existing files
-		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
+		$date = file_exists($dir) ? filemtime($dir) : getdate($this->now);
 
 		return array(
 				'file_mtime' => ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2,
@@ -106,6 +106,8 @@ class CI_Zip  {
 	 * Add Directory
 	 *
 	 * @param	string	the directory name
+	 * @param	int
+	 * @param	int
 	 * @return	void
 	 */
 	protected function _add_dir($dir, $file_mtime, $file_mdate)
@@ -184,6 +186,8 @@ class CI_Zip  {
 	 *
 	 * @param	string	the file name/path
 	 * @param	string	the data to be encoded
+	 * @param	int
+	 * @param	int
 	 * @return	void
 	 */
 	protected function _add_data($filepath, $data, $file_mtime, $file_mdate)
@@ -233,6 +237,8 @@ class CI_Zip  {
 	/**
 	 * Read the contents of a file and add it to the zip
 	 *
+	 * @param	string
+	 * @param	bool
 	 * @return	bool
 	 */
 	public function read_file($path, $preserve_filepath = FALSE)
@@ -267,12 +273,13 @@ class CI_Zip  {
 	 * is in the original file path will be recreated in the zip file.
 	 *
 	 * @param	string	path to source
+	 * @param	bool
+	 * @param	bool
 	 * @return	bool
 	 */
 	public function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
 	{
 		$path = rtrim($path, '/\\').'/';
-
 		if ( ! $fp = @opendir($path))
 		{
 			return FALSE;
@@ -306,6 +313,8 @@ class CI_Zip  {
 			}
 		}
 
+		closedir($fp);
+
 		return TRUE;
 	}
 
@@ -314,7 +323,7 @@ class CI_Zip  {
 	/**
 	 * Get the Zip file
 	 *
-	 * @return	string (binary encoded)
+	 * @return	string	(binary encoded)
 	 */
 	public function get_zip()
 	{
@@ -325,12 +334,12 @@ class CI_Zip  {
 		}
 
 		return $this->zipdata
-			. $this->directory."\x50\x4b\x05\x06\x00\x00\x00\x00"
-			. pack('v', $this->entries) // total # of entries "on this disk"
-			. pack('v', $this->entries) // total # of entries overall
-			. pack('V', strlen($this->directory)) // size of central dir
-			. pack('V', strlen($this->zipdata)) // offset to start of central dir
-			. "\x00\x00"; // .zip file comment length
+			.$this->directory."\x50\x4b\x05\x06\x00\x00\x00\x00"
+			.pack('v', $this->entries) // total # of entries "on this disk"
+			.pack('v', $this->entries) // total # of entries overall
+			.pack('V', strlen($this->directory)) // size of central dir
+			.pack('V', strlen($this->zipdata)) // offset to start of central dir
+			."\x00\x00"; // .zip file comment length
 	}
 
 	// --------------------------------------------------------------------
@@ -364,7 +373,6 @@ class CI_Zip  {
 	 * Download
 	 *
 	 * @param	string	the file name
-	 * @param	string	the data to be encoded
 	 * @return	bool
 	 */
 	public function download($filename = 'backup.zip')
-- 
cgit v1.2.3-24-g4f1b


From 0b5a4867af78838f3c7e2726e469f904e15976f1 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Wed, 29 Feb 2012 23:44:00 +0200
Subject: Minor clean-up

---
 system/libraries/Zip.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 174d18a67..f2f5f2e5d 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -155,7 +155,7 @@ class CI_Zip  {
 	 * Add Data to Zip
 	 *
 	 * Lets you add files to the archive. If the path is included
-	 * in the filename it will be placed within a directory.  Make
+	 * in the filename it will be placed within a directory. Make
 	 * sure you use add_dir() first to create the folder.
 	 *
 	 * @param	mixed
@@ -314,7 +314,6 @@ class CI_Zip  {
 		}
 
 		closedir($fp);
-
 		return TRUE;
 	}
 
@@ -373,7 +372,7 @@ class CI_Zip  {
 	 * Download
 	 *
 	 * @param	string	the file name
-	 * @return	bool
+	 * @return	void
 	 */
 	public function download($filename = 'backup.zip')
 	{
-- 
cgit v1.2.3-24-g4f1b


From 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Fri, 9 Mar 2012 17:03:37 +0000
Subject: Bumped CodeIgniter's PHP requirement to 5.2.4. Yes I know PHP 5.4
 just came out, and yes I know PHP 5.3 has lovely features, but there are
 plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not
 widely supported enough. CodeIgniter is great for distributed applications,
 and this is the highest we can reasonably go without breaking support. PHP
 5.3 will most likely happen in another year or so. Fingers crossed on that
 one anyway...

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 50e84920e..e33eb4e5a 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -2,7 +2,7 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
  *
  * NOTICE OF LICENSE
  * 
-- 
cgit v1.2.3-24-g4f1b


From 0336dc228c84695ec75fc8dccedac354d1556de9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 20 Mar 2012 15:34:28 +0200
Subject: Remove EOF newline

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index aa838eeca..c9810fab9 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -412,4 +412,4 @@ class CI_Zip  {
 }
 
 /* End of file Zip.php */
-/* Location: ./system/libraries/Zip.php */
+/* Location: ./system/libraries/Zip.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From e684bdac2d6282e3b9a5c57e1006d5ed1664f647 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 26 Mar 2012 13:47:29 +0300
Subject: Clear some spaces and fix some inconsistencies in the Zip library and
 system/helpers/ files

---
 system/libraries/Zip.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e33eb4e5a..12f3a5e59 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
  * An open source application development framework for PHP 5.2.4 or newer
  *
  * NOTICE OF LICENSE
- * 
+ *
  * Licensed under the Open Software License version 3.0
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -101,7 +101,7 @@ class CI_Zip  {
 	{
 		// filemtime() may return false, but raises an error for non-existing files
 		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
-		
+
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
 
-- 
cgit v1.2.3-24-g4f1b


From c8175be96157bb97374b1d9bb1be91c7b97bd640 Mon Sep 17 00:00:00 2001
From: tschechniker <tobias@tschech-online.de>
Date: Wed, 4 Apr 2012 14:47:30 +0300
Subject: Added Windows path compatibility to function read_dir

---
 system/libraries/Zip.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e91e2a2ff..2ec7befd3 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -279,7 +279,7 @@ class CI_Zip  {
 	 */
 	public function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
 	{
-		$path = rtrim($path, '/\\').'/';
+		$path = rtrim($path, '/\\').DIRECTORY_SEPARATOR;
 		if ( ! $fp = @opendir($path))
 		{
 			return FALSE;
@@ -288,7 +288,7 @@ class CI_Zip  {
 		// Set the original directory root for child dir's to use as relative
 		if ($root_path === NULL)
 		{
-			$root_path = dirname($path).'/';
+			$root_path = dirname($path).DIRECTORY_SEPARATOR;
 		}
 
 		while (FALSE !== ($file = readdir($fp)))
@@ -300,11 +300,12 @@ class CI_Zip  {
 
 			if (@is_dir($path.$file))
 			{
-				$this->read_dir($path.$file.'/', $preserve_filepath, $root_path);
+				$this->read_dir($path.$file.DIRECTORY_SEPARATOR, $preserve_filepath, $root_path);
 			}
 			elseif (FALSE !== ($data = file_get_contents($path.$file)))
 			{
-				$name = str_replace('\\', '/', $path);
+				$name = str_replace("\\", DIRECTORY_SEPARATOR, $path);
+				$name = str_replace("/", DIRECTORY_SEPARATOR, $path);
 				if ($preserve_filepath === FALSE)
 				{
 					$name = str_replace($root_path, '', $name);
-- 
cgit v1.2.3-24-g4f1b


From 9664cc9fbb9b7f10776e9ad76ba7b27de5c2cda4 Mon Sep 17 00:00:00 2001
From: Tobias Tschech <tobias@tschech-online.de>
Date: Wed, 4 Apr 2012 15:22:33 +0300
Subject: Update system/libraries/Zip.php

---
 system/libraries/Zip.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 2ec7befd3..80438546b 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -304,8 +304,7 @@ class CI_Zip  {
 			}
 			elseif (FALSE !== ($data = file_get_contents($path.$file)))
 			{
-				$name = str_replace("\\", DIRECTORY_SEPARATOR, $path);
-				$name = str_replace("/", DIRECTORY_SEPARATOR, $path);
+				$name = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $path);
 				if ($preserve_filepath === FALSE)
 				{
 					$name = str_replace($root_path, '', $name);
-- 
cgit v1.2.3-24-g4f1b


From 86611db279c17cf9b3d6ad8732a1c840cb833148 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 27 Apr 2012 10:06:25 -0400
Subject: Fixed Cart, Migration, Parser and Zip libraries

---
 system/libraries/Zip.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 80438546b..86d0787b2 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -42,13 +42,53 @@
  */
 class CI_Zip  {
 
+	/**
+	 * Zip data in string form
+	 *
+	 * @var string
+	 */
 	public $zipdata		= '';
+	
+	/**
+	 * Zip data for a directory in string form
+	 *
+	 * @var string
+	 */
 	public $directory	= '';
+	
+	/**
+	 * Number of files/folder in zip file
+	 *
+	 * @var int
+	 */
 	public $entries		= 0;
+	
+	/**
+	 * Number of files in zip
+	 *
+	 * @var int
+	 */
 	public $file_num	= 0;
+	
+	/**
+	 * relative offset of local header
+	 *
+	 * @var int
+	 */
 	public $offset		= 0;
+	
+	/**
+	 * Reference to time at init
+	 *
+	 * @var int
+	 */
 	public $now;
 
+	/**
+	 * Initialize zip compression class
+	 *
+	 * @return void
+	 */
 	public function __construct()
 	{
 		$this->now = time();
-- 
cgit v1.2.3-24-g4f1b


From 5645479c622eb36cf9869797896dc0921568c4a9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 17 May 2012 14:32:19 +0300
Subject: Clean up the libraries

---
 system/libraries/Zip.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 86d0787b2..e0dc637ad 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -48,35 +48,35 @@ class CI_Zip  {
 	 * @var string
 	 */
 	public $zipdata		= '';
-	
+
 	/**
 	 * Zip data for a directory in string form
 	 *
 	 * @var string
 	 */
 	public $directory	= '';
-	
+
 	/**
 	 * Number of files/folder in zip file
 	 *
 	 * @var int
 	 */
 	public $entries		= 0;
-	
+
 	/**
 	 * Number of files in zip
 	 *
 	 * @var int
 	 */
 	public $file_num	= 0;
-	
+
 	/**
 	 * relative offset of local header
 	 *
 	 * @var int
 	 */
 	public $offset		= 0;
-	
+
 	/**
 	 * Reference to time at init
 	 *
@@ -87,7 +87,7 @@ class CI_Zip  {
 	/**
 	 * Initialize zip compression class
 	 *
-	 * @return void
+	 * @return	void
 	 */
 	public function __construct()
 	{
-- 
cgit v1.2.3-24-g4f1b


From 95b2f4fa070f34084c78ccc68e67ecca51f40adf Mon Sep 17 00:00:00 2001
From: vkeranov <vkeranov@gmail.com>
Date: Sat, 16 Jun 2012 20:37:11 +0300
Subject: Really important space fix :)

---
 system/libraries/Zip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Zip.php')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e0dc637ad..5c4c257f8 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -40,7 +40,7 @@
  * @author		EllisLab Dev Team
  * @link		http://codeigniter.com/user_guide/libraries/zip.html
  */
-class CI_Zip  {
+class CI_Zip {
 
 	/**
 	 * Zip data in string form
-- 
cgit v1.2.3-24-g4f1b