few mpd style tweaks, new archive lib and a new print_tags

1 files changed, 250 insertions, 359 deletions

diff --git a/modules/archive/archive.lib.php b/modules/archive/archive.lib.php
index 1a605f10..2f67af19 100644
--- a/modules/archive/archive.lib.php
+++ b/modules/archive/archive.lib.php
@@ -1,8 +1,8 @@
 <?php

 /*--------------------------------------------------

- | TAR/GZIP/BZIP2/ZIP ARCHIVE CLASSES 2.0

+ | TAR/GZIP/BZIP2/ZIP ARCHIVE CLASSES 2.1

  | By Devin Doucette

- | Copyright (c) 2004 Devin Doucette

+ | Copyright (c) 2005 Devin Doucette

  | Email: darksnoopy@shaw.ca

  +--------------------------------------------------

  | Email bugs/suggestions to darksnoopy@shaw.ca

@@ -16,49 +16,48 @@ class archive
 {

 	function archive($name)

 	{

-		$this->options = array(

-			'basedir'=>".",

-			'name'=>$name,

-			'prepend'=>"",

-			'inmemory'=>0,

-			'overwrite'=>0,

-			'recurse'=>1,

-			'storepaths'=>1,

-			'level'=>3,

-			'method'=>1,

-			'sfx'=>"",

-			'type'=>"",

-			'comment'=>""

+		$this->options = array (

+			'basedir' => ".",

+			'name' => $name,

+			'prepend' => "",

+			'inmemory' => 0,

+			'overwrite' => 0,

+			'recurse' => 1,

+			'storepaths' => 1,

+			'followlinks' => 0,

+			'level' => 3,

+			'method' => 1,

+			'sfx' => "",

+			'type' => "",

+			'comment' => ""

 		);

-		$this->files = array();

-		$this->exclude = array();

-		$this->storeonly = array();

-		$this->error = array();

+		$this->files = array ();

+		$this->exclude = array ();

+		$this->storeonly = array ();

+		$this->error = array ();

 	}

 

 	function set_options($options)

 	{

-		foreach($options as $key => $value)

-		{

+		foreach ($options as $key => $value)

 			$this->options[$key] = $value;

-		}

-		if(!empty($this->options['basedir']))

+		if (!empty ($this->options['basedir']))

 		{

-			$this->options['basedir'] = str_replace("\\","/",$this->options['basedir']);

-			$this->options['basedir'] = preg_replace("/\/+/","/",$this->options['basedir']);

-			$this->options['basedir'] = preg_replace("/\/$/","",$this->options['basedir']);

+			$this->options['basedir'] = str_replace("\\", "/", $this->options['basedir']);

+			$this->options['basedir'] = preg_replace("/\/+/", "/", $this->options['basedir']);

+			$this->options['basedir'] = preg_replace("/\/$/", "", $this->options['basedir']);

 		}

-		if(!empty($this->options['name']))

+		if (!empty ($this->options['name']))

 		{

-			$this->options['name'] = str_replace("\\","/",$this->options['name']);

-			$this->options['name'] = preg_replace("/\/+/","/",$this->options['name']);

+			$this->options['name'] = str_replace("\\", "/", $this->options['name']);

+			$this->options['name'] = preg_replace("/\/+/", "/", $this->options['name']);

 		}

-		if(!empty($this->options['prepend']))

+		if (!empty ($this->options['prepend']))

 		{

-			$this->options['prepend'] = str_replace("\\","/",$this->options['prepend']);

-			$this->options['prepend'] = preg_replace("/^(\.*\/+)+/","",$this->options['prepend']);

-			$this->options['prepend'] = preg_replace("/\/+/","/",$this->options['prepend']);

-			$this->options['prepend'] = preg_replace("/\/$/","",$this->options['prepend']) . "/";

+			$this->options['prepend'] = str_replace("\\", "/", $this->options['prepend']);

+			$this->options['prepend'] = preg_replace("/^(\.*\/+)+/", "", $this->options['prepend']);

+			$this->options['prepend'] = preg_replace("/\/+/", "/", $this->options['prepend']);

+			$this->options['prepend'] = preg_replace("/\/$/", "", $this->options['prepend']) . "/";

 		}

 	}

 

@@ -66,20 +65,18 @@ class archive
 	{

 		$this->make_list();

 

-		if($this->options['inmemory'] == 0)

+		if ($this->options['inmemory'] == 0)

 		{

 			$pwd = getcwd();

 			chdir($this->options['basedir']);

-			if($this->options['overwrite'] == 0 && file_exists($this->options['name'] . ($this->options['type'] == "gzip" || $this->options['type'] == "bzip"? ".tmp" : "")))

+			if ($this->options['overwrite'] == 0 && file_exists($this->options['name'] . ($this->options['type'] == "gzip" || $this->options['type'] == "bzip" ? ".tmp" : "")))

 			{

 				$this->error[] = "File {$this->options['name']} already exists.";

 				chdir($pwd);

 				return 0;

 			}

-			else if($this->archive = @fopen($this->options['name'] . ($this->options['type'] == "gzip" || $this->options['type'] == "bzip"? ".tmp" : ""),"wb+"))

-			{

+			else if ($this->archive = @fopen($this->options['name'] . ($this->options['type'] == "gzip" || $this->options['type'] == "bzip" ? ".tmp" : ""), "wb+"))

 				chdir($pwd);

-			}

 			else

 			{

 				$this->error[] = "Could not open {$this->options['name']} for writing.";

@@ -88,231 +85,184 @@ class archive
 			}

 		}

 		else

-		{

 			$this->archive = "";

-		}

 

-		switch($this->options['type'])

+		switch ($this->options['type'])

 		{

 		case "zip":

-			if(!$this->create_zip())

+			if (!$this->create_zip())

 			{

 				$this->error[] = "Could not create zip file.";

 				return 0;

 			}

 			break;

 		case "bzip":

-			if(!$this->create_tar())

+			if (!$this->create_tar())

 			{

 				$this->error[] = "Could not create tar file.";

 				return 0;

 			}

-			if(!$this->create_bzip())

+			if (!$this->create_bzip())

 			{

 				$this->error[] = "Could not create bzip2 file.";

 				return 0;

 			}

 			break;

 		case "gzip":

-			if(!$this->create_tar())

+			if (!$this->create_tar())

 			{

 				$this->error[] = "Could not create tar file.";

 				return 0;

 			}

-			if(!$this->create_gzip())

+			if (!$this->create_gzip())

 			{

 				$this->error[] = "Could not create gzip file.";

 				return 0;

 			}

 			break;

 		case "tar":

-			if(!$this->create_tar())

+			if (!$this->create_tar())

 			{

 				$this->error[] = "Could not create tar file.";

 				return 0;

 			}

 		}

 

-		if($this->options['inmemory'] == 0)

+		if ($this->options['inmemory'] == 0)

 		{

 			fclose($this->archive);

-			if($this->options['type'] == "gzip" || $this->options['type'] == "bzip")

-			{

+			if ($this->options['type'] == "gzip" || $this->options['type'] == "bzip")

 				unlink($this->options['basedir'] . "/" . $this->options['name'] . ".tmp");

-			}

 		}

 	}

 

 	function add_data($data)

 	{

-		if($this->options['inmemory'] == 0)

-		{

-			fwrite($this->archive,$data);

-		}

+		if ($this->options['inmemory'] == 0)

+			fwrite($this->archive, $data);

 		else

-		{

 			$this->archive .= $data;

-		}

 	}

 

 	function make_list()

 	{

-		if(!empty($this->exclude))

-		{

-			foreach($this->files as $key => $value)

-			{

-				foreach($this->exclude as $current)

-				{

-					if($value['name'] == $current['name'])

-					{

-						unset($this->files[$key]);

-					}

-				}

-			}

-		}

-		if(!empty($this->storeonly))

-		{

-			foreach($this->files as $key => $value)

-			{

-				foreach($this->storeonly as $current)

-				{

-					if($value['name'] == $current['name'])

-					{

+		if (!empty ($this->exclude))

+			foreach ($this->files as $key => $value)

+				foreach ($this->exclude as $current)

+					if ($value['name'] == $current['name'])

+						unset ($this->files[$key]);

+		if (!empty ($this->storeonly))

+			foreach ($this->files as $key => $value)

+				foreach ($this->storeonly as $current)

+					if ($value['name'] == $current['name'])

 						$this->files[$key]['method'] = 0;

-					}

-				}

-			}

-		}

-		unset($this->exclude,$this->storeonly);

+		unset ($this->exclude, $this->storeonly);

 	}

 

 	function add_files($list)

 	{

 		$temp = $this->list_files($list);

-		foreach($temp as $current)

-		{

+		foreach ($temp as $current)

 			$this->files[] = $current;

-		}

 	}

 

 	function exclude_files($list)

 	{

 		$temp = $this->list_files($list);

-		foreach($temp as $current)

-		{

+		foreach ($temp as $current)

 			$this->exclude[] = $current;

-		}

 	}

 

 	function store_files($list)

 	{

 		$temp = $this->list_files($list);

-		foreach($temp as $current)

-		{

+		foreach ($temp as $current)

 			$this->storeonly[] = $current;

-		}

 	}

 

 	function list_files($list)

 	{

-		if(!is_array($list))

+		if (!is_array ($list))

 		{

 			$temp = $list;

-			$list = array($temp);

-			unset($temp);

+			$list = array ($temp);

+			unset ($temp);

 		}

 

-		$files = array();

+		$files = array ();

 

 		$pwd = getcwd();

 		chdir($this->options['basedir']);

 

-		foreach($list as $current)

+		foreach ($list as $current)

 		{

-			$current = str_replace("\\","/",$current);

-			$current = preg_replace("/\/+/","/",$current);

-			$current = preg_replace("/\/$/","",$current);

-			if(strstr($current,"*"))

+			$current = str_replace("\\", "/", $current);

+			$current = preg_replace("/\/+/", "/", $current);

+			$current = preg_replace("/\/$/", "", $current);

+			if (strstr($current, "*"))

 			{

-				$regex = preg_replace("/([\\\^\$\.\[\]\|\(\)\?\+\{\}\/])/","\\\\\\1",$current);

-				$regex = str_replace("*",".*",$regex);

-				$dir = strstr($current,"/")? substr($current,0,strrpos($current,"/")) : ".";

+				$regex = preg_replace("/([\\\^\$\.\[\]\|\(\)\?\+\{\}\/])/", "\\\\\\1", $current);

+				$regex = str_replace("*", ".*", $regex);

+				$dir = strstr($current, "/") ? substr($current, 0, strrpos($current, "/")) : ".";

 				$temp = $this->parse_dir($dir);

-				foreach($temp as $current2)

-				{

-					if(preg_match("/^{$regex}$/i",$current2['name']))

-					{

+				foreach ($temp as $current2)

+					if (preg_match("/^{$regex}$/i", $current2['name']))

 						$files[] = $current2;

-					}

-				}

-				unset($regex,$dir,$temp,$current);

+				unset ($regex, $dir, $temp, $current);

 			}

-			else if(@is_dir($current))

+			else if (@is_dir($current))

 			{

 				$temp = $this->parse_dir($current);

-				foreach($temp as $file)

-				{

+				foreach ($temp as $file)

 					$files[] = $file;

-				}

-				unset($temp,$file);

-			}

-			else if(@file_exists($current))

-			{

-				$files[] = array('name'=>$current,'name2'=>$this->options['prepend'] .

-					preg_replace("/(\.+\/+)+/","",($this->options['storepaths'] == 0 && strstr($current,"/"))? 

-					substr($current,strrpos($current,"/") + 1) : $current),'type'=>0,

-					'ext'=>substr($current,strrpos($current,".")),'stat'=>stat($current));

+				unset ($temp, $file);

 			}

+			else if (@file_exists($current))

+				$files[] = array ('name' => $current, 'name2' => $this->options['prepend'] .

+					preg_replace("/(\.+\/+)+/", "", ($this->options['storepaths'] == 0 && strstr($current, "/")) ?

+					substr($current, strrpos($current, "/") + 1) : $current),

+					'type' => @is_link($current) && $this->options['followlinks'] == 0 ? 2 : 0,

+					'ext' => substr($current, strrpos($current, ".")), 'stat' => stat($current));

 		}

 

 		chdir($pwd);

 

-		unset($current,$pwd);

+		unset ($current, $pwd);

 

-		usort($files,array("archive","sort_files"));

+		usort($files, array ("archive", "sort_files"));

 

 		return $files;

 	}

 

 	function parse_dir($dirname)

 	{

-		if($this->options['storepaths'] == 1 && !preg_match("/^(\.+\/*)+$/",$dirname))

-		{

-			$files = array(array('name'=>$dirname,'name2'=>$this->options['prepend'] . 

-				preg_replace("/(\.+\/+)+/","",($this->options['storepaths'] == 0 && strstr($dirname,"/"))? 

-				substr($dirname,strrpos($dirname,"/") + 1) : $dirname),'type'=>5,'stat'=>stat($dirname)));

-		}

+		if ($this->options['storepaths'] == 1 && !preg_match("/^(\.+\/*)+$/", $dirname))

+			$files = array (array ('name' => $dirname, 'name2' => $this->options['prepend'] .

+				preg_replace("/(\.+\/+)+/", "", ($this->options['storepaths'] == 0 && strstr($dirname, "/")) ?

+				substr($dirname, strrpos($dirname, "/") + 1) : $dirname), 'type' => 5, 'stat' => stat($dirname)));

 		else

-		{

-			$files = array();

-		}

+			$files = array ();

 		$dir = @opendir($dirname);

 

-		while($file = @readdir($dir))

+		while ($file = @readdir($dir))

 		{

-			if($file == "." || $file == "..")

-			{

+			$fullname = $dirname . "/" . $file;

+			if ($file == "." || $file == "..")

 				continue;

-			}

-			else if(@is_dir($dirname."/".$file))

+			else if (@is_dir($fullname))

 			{

-				if(empty($this->options['recurse']))

-				{

+				if (empty ($this->options['recurse']))

 					continue;

-				}

-				$temp = $this->parse_dir($dirname."/".$file);

-				foreach($temp as $file2)

-				{

+				$temp = $this->parse_dir($fullname);

+				foreach ($temp as $file2)

 					$files[] = $file2;

-				}

-			}

-			else if(@file_exists($dirname."/".$file))

-			{

-				$files[] = array('name'=>$dirname."/".$file,'name2'=>$this->options['prepend'] . 

-					preg_replace("/(\.+\/+)+/","",($this->options['storepaths'] == 0 && strstr($dirname."/".$file,"/"))? 

-					substr($dirname."/".$file,strrpos($dirname."/".$file,"/") + 1) : $dirname."/".$file),'type'=>0,

-					'ext'=>substr($file,strrpos($file,".")),'stat'=>stat($dirname."/".$file));

 			}

+			else if (@file_exists($fullname))

+				$files[] = array ('name' => $fullname, 'name2' => $this->options['prepend'] .

+					preg_replace("/(\.+\/+)+/", "", ($this->options['storepaths'] == 0 && strstr($fullname, "/")) ?

+					substr($fullname, strrpos($fullname, "/") + 1) : $fullname),

+					'type' => @is_link($fullname) && $this->options['followlinks'] == 0 ? 2 : 0,

+					'ext' => substr($file, strrpos($file, ".")), 'stat' => stat($fullname));

 		}

 

 		@closedir($dir);

@@ -320,63 +270,53 @@ class archive
 		return $files;

 	}

 

-	function sort_files($a,$b)

+	function sort_files($a, $b)

 	{

-		if($a['type'] != $b['type'])

-		{

-			return $a['type'] > $b['type']? -1 : 1;

-		}

-		else if($a['type'] == 5)

-		{

-			return strcmp(strtolower($a['name']),strtolower($b['name']));

-		}

+		if ($a['type'] != $b['type'])

+			if ($a['type'] == 5 || $b['type'] == 2)

+				return -1;

+			else if ($a['type'] == 2 || $b['type'] == 5)

+				return 1;

+		else if ($a['type'] == 5)

+			return strcmp(strtolower($a['name']), strtolower($b['name']));

+		else if ($a['ext'] != $b['ext'])

+			return strcmp($a['ext'], $b['ext']);

+		else if ($a['stat'][7] != $b['stat'][7])

+			return $a['stat'][7] > $b['stat'][7] ? -1 : 1;

 		else

-		{

-			if($a['ext'] != $b['ext'])

-			{

-				return strcmp($a['ext'],$b['ext']);

-			}

-			else if($a['stat'][7] != $b['stat'][7])

-			{

-				return $a['stat'][7] > $b['stat'][7]? -1 : 1;

-			}

-			else

-			{

-				return strcmp(strtolower($a['name']),strtolower($b['name']));

-			}

-		}

+			return strcmp(strtolower($a['name']), strtolower($b['name']));

 		return 0;

 	}

 

 	function download_file()

 	{

-		if($this->options['inmemory'] == 0)

+		if ($this->options['inmemory'] == 0)

 		{

 			$this->error[] = "Can only use download_file() if archive is in memory. Redirect to file otherwise, it is faster.";

 			return;

 		}

-		switch($this->options['type'])

+		switch ($this->options['type'])

 		{

 		case "zip":

-			header("Content-type:application/zip");

+			header("Content-Type: application/zip");

 			break;

 		case "bzip":

-			header("Content-type:application/x-compressed");

+			header("Content-Type: application/x-bzip2");

 			break;

 		case "gzip":

-			header("Content-type:application/x-compressed");

+			header("Content-Type: application/x-gzip");

 			break;

 		case "tar":

-			header("Content-type:application/x-tar");

+			header("Content-Type: application/x-tar");

 		}

-		$header = "Content-disposition: attachment; filename=\"";

-		$header .= strstr($this->options['name'],"/")? substr($this->options['name'],strrpos($this->options['name'],"/") + 1) : $this->options['name'];

+		$header = "Content-Disposition: attachment; filename=\"";

+		$header .= strstr($this->options['name'], "/") ? substr($this->options['name'], strrpos($this->options['name'], "/") + 1) : $this->options['name'];

 		$header .= "\"";

 		header($header);

-		header("Content-length: " . strlen($this->archive));

-		header("Content-transfer-encoding: binary");

-		header("Pragma: no-cache");

-		header("Expires: 0");

+		header("Content-Length: " . strlen($this->archive));

+		header("Content-Transfer-Encoding: binary");

+		header("Cache-Control: no-cache, must-revalidate, max-age=60");

+		header("Expires: Sat, 01 Jan 2000 12:00:00 GMT");

 		print($this->archive);

 	}

 }

@@ -394,64 +334,53 @@ class tar_file extends archive
 		$pwd = getcwd();

 		chdir($this->options['basedir']);

 

-		foreach($this->files as $current)

+		foreach ($this->files as $current)

 		{

-			if($current['name'] == $this->options['name'])

-			{

+			if ($current['name'] == $this->options['name'])

 				continue;

-			}

-			if(strlen($current['name2']) > 99)

+			if (strlen($current['name2']) > 99)

 			{

-				$path = substr($current['name2'],0,strpos($current['name2'],"/",strlen($current['name2']) - 100) + 1);

-				$current['name2'] = substr($current['name2'],strlen($path));

-				if(strlen($path) > 154 || strlen($current['name2']) > 99)

+				$path = substr($current['name2'], 0, strpos($current['name2'], "/", strlen($current['name2']) - 100) + 1);

+				$current['name2'] = substr($current['name2'], strlen($path));

+				if (strlen($path) > 154 || strlen($current['name2']) > 99)

 				{

 					$this->error[] = "Could not add {$path}{$current['name2']} to archive because the filename is too long.";

 					continue;

 				}

 			}

-			$block = pack("a100a8a8a8a12a12a8a1a100a6a2a32a32a8a8a155a12",$current['name2'],decoct($current['stat'][2]),

-				sprintf("%6s ",decoct($current['stat'][4])),sprintf("%6s ",decoct($current['stat'][5])),

-				sprintf("%11s ",decoct($current['stat'][7])),sprintf("%11s ",decoct($current['stat'][9])),

-				"        ",$current['type'],"","ustar","00","Unknown","Unknown","","",!empty($path)? $path : "","");

+			$block = pack("a100a8a8a8a12a12a8a1a100a6a2a32a32a8a8a155a12", $current['name2'], sprintf("%07o", 

+				$current['stat'][2]), sprintf("%07o", $current['stat'][4]), sprintf("%07o", $current['stat'][5]), 

+				sprintf("%011o", $current['type'] == 2 ? 0 : $current['stat'][7]), sprintf("%011o", $current['stat'][9]), 

+				"        ", $current['type'], $current['type'] == 2 ? @readlink($current['name']) : "", "ustar ", " ", 

+				"Unknown", "Unknown", "", "", !empty ($path) ? $path : "", "");

 

 			$checksum = 0;

-			for($i = 0; $i < 512; $i++)

-			{

-				$checksum += ord(substr($block,$i,1));

-			}

-			$checksum = pack("a8",sprintf("%6s ",decoct($checksum)));

-			$block = substr_replace($block,$checksum,148,8);

+			for ($i = 0; $i < 512; $i++)

+				$checksum += ord(substr($block, $i, 1));

+			$checksum = pack("a8", sprintf("%07o", $checksum));

+			$block = substr_replace($block, $checksum, 148, 8);

 

-			if($current['stat'][7] == 0)

-			{

+			if ($current['type'] == 2 || $current['stat'][7] == 0)

 				$this->add_data($block);

-			}

-			else if($fp = @fopen($current['name'],"rb"))

+			else if ($fp = @fopen($current['name'], "rb"))

 			{

 				$this->add_data($block);

-				while($temp = fread($fp,1048576))

-				{

+				while ($temp = fread($fp, 1048576))

 					$this->add_data($temp);

-				}

-				if($current['stat'][7] % 512 > 0)

+				if ($current['stat'][7] % 512 > 0)

 				{

 					$temp = "";

-					for($i = 0; $i < 512 - $current['stat'][7] % 512; $i++)

-					{

+					for ($i = 0; $i < 512 - $current['stat'][7] % 512; $i++)

 						$temp .= "\0";

-					}

 					$this->add_data($temp);

 				}

 				fclose($fp);

 			}

 			else

-			{

 				$this->error[] = "Could not open file {$current['name']} for reading. It was not added.";

-			}

 		}

 

-		$this->add_data(pack("a512",""));

+		$this->add_data(pack("a1024", ""));

 

 		chdir($pwd);

 

@@ -463,99 +392,90 @@ class tar_file extends archive
 		$pwd = getcwd();

 		chdir($this->options['basedir']);

 

-		if($fp = $this->open_archive())

+		if ($fp = $this->open_archive())

 		{

-			if($this->options['inmemory'] == 1)

-			{

-				$this->files = array();

-			}

+			if ($this->options['inmemory'] == 1)

+				$this->files = array ();

 

-			while($block = fread($fp,512))

+			while ($block = fread($fp, 512))

 			{

-				$temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100temp/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp",$block);

-				$file = array(

-					'name'=>$temp['prefix'] . $temp['name'],

-					'stat'=>array(

-						2=>$temp['mode'],

-						4=>octdec($temp['uid']),

-						5=>octdec($temp['gid']),

-						7=>octdec($temp['size']),

-						9=>octdec($temp['mtime']),

+				$temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp", $block);

+				$file = array (

+					'name' => $temp['prefix'] . $temp['name'],

+					'stat' => array (

+						2 => $temp['mode'],

+						4 => octdec($temp['uid']),

+						5 => octdec($temp['gid']),

+						7 => octdec($temp['size']),

+						9 => octdec($temp['mtime']),

 					),

-					'checksum'=>octdec($temp['checksum']),

-					'type'=>$temp['type'],

-					'magic'=>$temp['magic'],

+					'checksum' => octdec($temp['checksum']),

+					'type' => $temp['type'],

+					'magic' => $temp['magic'],

 				);

-				if($file['checksum'] == 0x00000000)

-				{

+				if ($file['checksum'] == 0x00000000)

 					break;

-				}

-				else if($file['magic'] != "ustar")

+				else if (substr($file['magic'], 0, 5) != "ustar")

 				{

 					$this->error[] = "This script does not support extracting this type of tar file.";

 					break;

 				}

-				$block = substr_replace($block,"        ",148,8);

+				$block = substr_replace($block, "        ", 148, 8);

 				$checksum = 0;

-				for($i = 0; $i < 512; $i++)

+				for ($i = 0; $i < 512; $i++)

+					$checksum += ord(substr($block, $i, 1));

+				if ($file['checksum'] != $checksum)

+					$this->error[] = "Could not extract from {$this->options['name']}, it is corrupt.";

+

+				if ($this->options['inmemory'] == 1)

 				{

-					$checksum += ord(substr($block,$i,1));

+					$file['data'] = fread($fp, $file['stat'][7]);

+					fread($fp, (512 - $file['stat'][7] % 512) == 512 ? 0 : (512 - $file['stat'][7] % 512));

+					unset ($file['checksum'], $file['magic']);

+					$this->files[] = $file;

 				}

-				if($file['checksum'] != $checksum)

+				else if ($file['type'] == 5)

 				{

-					$this->error[] = "Could not extract from {$this->options['name']}, it is corrupt.";

+					if (!is_dir($file['name']))

+						mkdir($file['name'], $file['stat'][2]);

 				}

-

-				if($this->options['inmemory'] == 1)

+				else if ($this->options['overwrite'] == 0 && file_exists($file['name']))

 				{

-					$file['data'] = fread($fp,$file['stat'][7]);

-					fread($fp,(512 - $file['stat'][7] % 512) == 512? 0 : (512 - $file['stat'][7] % 512));

-					unset($file['checksum'],$file['magic']);

-					$this->files[] = $file;

+					$this->error[] = "{$file['name']} already exists.";

+					continue;

+				}

+				else if ($file['type'] == 2)

+				{

+					symlink($temp['symlink'], $file['name']);

+					chmod($file['name'], $file['stat'][2]);

+				}

+				else if ($new = @fopen($file['name'], "wb"))

+				{

+					fwrite($new, fread($fp, $file['stat'][7]));

+					fread($fp, (512 - $file['stat'][7] % 512) == 512 ? 0 : (512 - $file['stat'][7] % 512));

+					fclose($new);

+					chmod($file['name'], $file['stat'][2]);

 				}

 				else

 				{

-					if($file['type'] == 5)

-					{

-						if(!is_dir($file['name']))

-						{

-							mkdir($file['name'],$file['stat'][2]);

-							chown($file['name'],$file['stat'][4]);

-							chgrp($file['name'],$file['stat'][5]);

-						}

-					}

-					else if($this->options['overwrite'] == 0 && file_exists($file['name']))

-					{

-						$this->error[] = "{$file['name']} already exists.";

-					}

-					else if($new = @fopen($file['name'],"wb"))

-					{

-						fwrite($new,fread($fp,$file['stat'][7]));

-						fread($fp,(512 - $file['stat'][7] % 512) == 512? 0 : (512 - $file['stat'][7] % 512));

-						fclose($new);

-						chmod($file['name'],$file['stat'][2]);

-						chown($file['name'],$file['stat'][4]);

-						chgrp($file['name'],$file['stat'][5]);

-					}

-					else

-					{

-						$this->error[] = "Could not open {$file['name']} for writing.";

-					}

+					$this->error[] = "Could not open {$file['name']} for writing.";

+					continue;

 				}

-				unset($file);

+				chown($file['name'], $file['stat'][4]);

+				chgrp($file['name'], $file['stat'][5]);

+				touch($file['name'], $file['stat'][9]);

+				unset ($file);

 			}

 		}

 		else

-		{

 			$this->error[] = "Could not open file {$this->options['name']}";

-		}

 

 		chdir($pwd);

 	}

 

 	function open_archive()

 	{

-		return @fopen($this->options['name'],"rb");

+		return @fopen($this->options['name'], "rb");

 	}

 }

 

@@ -569,17 +489,15 @@ class gzip_file extends tar_file
 

 	function create_gzip()

 	{

-		if($this->options['inmemory'] == 0)

+		if ($this->options['inmemory'] == 0)

 		{

 			$pwd = getcwd();

 			chdir($this->options['basedir']);

-			if($fp = gzopen($this->options['name'],"wb{$this->options['level']}"))

+			if ($fp = gzopen($this->options['name'], "wb{$this->options['level']}"))

 			{

-				fseek($this->archive,0);

-				while($temp = fread($this->archive,1048576))

-				{

-					gzwrite($fp,$temp);

-				}

+				fseek($this->archive, 0);

+				while ($temp = fread($this->archive, 1048576))

+					gzwrite($fp, $temp);

 				gzclose($fp);

 				chdir($pwd);

 			}

@@ -591,16 +509,14 @@ class gzip_file extends tar_file
 			}

 		}

 		else

-		{

-			$this->archive = gzencode($this->archive,$this->options['level']);

-		}

+			$this->archive = gzencode($this->archive, $this->options['level']);

 

 		return 1;

 	}

 

 	function open_archive()

 	{

-		return @gzopen($this->options['name'],"rb");

+		return @gzopen($this->options['name'], "rb");

 	}

 }

 

@@ -614,17 +530,15 @@ class bzip_file extends tar_file
 

 	function create_bzip()

 	{

-		if($this->options['inmemory'] == 0)

+		if ($this->options['inmemory'] == 0)

 		{

 			$pwd = getcwd();

 			chdir($this->options['basedir']);

-			if($fp = bzopen($this->options['name'],"wb"))

+			if ($fp = bzopen($this->options['name'], "wb"))

 			{

-				fseek($this->archive,0);

-				while($temp = fread($this->archive,1048576))

-				{

-					bzwrite($fp,$temp);

-				}

+				fseek($this->archive, 0);

+				while ($temp = fread($this->archive, 1048576))

+					bzwrite($fp, $temp);

 				bzclose($fp);

 				chdir($pwd);

 			}

@@ -636,16 +550,14 @@ class bzip_file extends tar_file
 			}

 		}

 		else

-		{

-			$this->archive = bzcompress($this->archive,$this->options['level']);

-		}

+			$this->archive = bzcompress($this->archive, $this->options['level']);

 

 		return 1;

 	}

 

 	function open_archive()

 	{

-		return @bzopen($this->options['name'],"rb");

+		return @bzopen($this->options['name'], "rb");

 	}

 }

 

@@ -663,113 +575,92 @@ class zip_file extends archive
 		$offset = 0;

 		$central = "";

 

-		if(!empty($this->options['sfx']))

-		{

-			if($fp = @fopen($this->options['sfx'],"rb"))

+		if (!empty ($this->options['sfx']))

+			if ($fp = @fopen($this->options['sfx'], "rb"))

 			{

-				$temp = fread($fp,filesize($this->options['sfx']));

+				$temp = fread($fp, filesize($this->options['sfx']));

 				fclose($fp);

 				$this->add_data($temp);

 				$offset += strlen($temp);

-				unset($temp);

+				unset ($temp);

 			}

 			else

-			{

 				$this->error[] = "Could not open sfx module from {$this->options['sfx']}.";

-			}

-		}

 

 		$pwd = getcwd();

 		chdir($this->options['basedir']);

 

-		foreach($this->files as $current)

+		foreach ($this->files as $current)

 		{

-			if($current['name'] == $this->options['name'])

-			{

+			if ($current['name'] == $this->options['name'])

 				continue;

-			}

 

-			$translate =  array('Ç'=>pack("C",128),'ü'=>pack("C",129),'é'=>pack("C",130),'â'=>pack("C",131),'ä'=>pack("C",132),

-								'à'=>pack("C",133),'å'=>pack("C",134),'ç'=>pack("C",135),'ê'=>pack("C",136),'ë'=>pack("C",137),

-								'è'=>pack("C",138),'ï'=>pack("C",139),'î'=>pack("C",140),'ì'=>pack("C",141),'Ä'=>pack("C",142),

-								'Å'=>pack("C",143),'É'=>pack("C",144),'æ'=>pack("C",145),'Æ'=>pack("C",146),'ô'=>pack("C",147),

-								'ö'=>pack("C",148),'ò'=>pack("C",149),'û'=>pack("C",150),'ù'=>pack("C",151),'Ö'=>pack("C",153),

-								'Ü'=>pack("C",154),'£'=>pack("C",156),'¥'=>pack("C",157),'ƒ'=>pack("C",159),'á'=>pack("C",160),

-								'í'=>pack("C",161),'ó'=>pack("C",162),'ú'=>pack("C",163),'ñ'=>pack("C",164),'Ñ'=>pack("C",165));

-			$current['name2'] = strtr($current['name2'],$translate);

-

-			$timedate = explode(" ",date("Y n j G i s",$current['stat'][9]));

-			$timedate = ($timedate[0] - 1980 << 25) | ($timedate[1] << 21) | ($timedate[2] << 16) | 

+			$timedate = explode(" ", date("Y n j G i s", $current['stat'][9]));

+			$timedate = ($timedate[0] - 1980 << 25) | ($timedate[1] << 21) | ($timedate[2] << 16) |

 				($timedate[3] << 11) | ($timedate[4] << 5) | ($timedate[5]);

 

-			$block = pack("VvvvV",0x04034b50,0x000A,0x0000,(isset($current['method']) || $this->options['method'] == 0)? 0x0000 : 0x0008,$timedate);

+			$block = pack("VvvvV", 0x04034b50, 0x000A, 0x0000, (isset($current['method']) || $this->options['method'] == 0) ? 0x0000 : 0x0008, $timedate);

 

-			if($current['stat'][7] == 0 && $current['type'] == 5)

+			if ($current['stat'][7] == 0 && $current['type'] == 5)

 			{

-				$block .= pack("VVVvv",0x00000000,0x00000000,0x00000000,strlen($current['name2']) + 1,0x0000);

+				$block .= pack("VVVvv", 0x00000000, 0x00000000, 0x00000000, strlen($current['name2']) + 1, 0x0000);

 				$block .= $current['name2'] . "/";

 				$this->add_data($block);

-				$central .= pack("VvvvvVVVVvvvvvVV",0x02014b50,0x0014,$this->options['method'] == 0? 0x0000 : 0x000A,0x0000,

-					(isset($current['method']) || $this->options['method'] == 0)? 0x0000 : 0x0008,$timedate,

-					0x00000000,0x00000000,0x00000000,strlen($current['name2']) + 1,0x0000,0x0000,0x0000,0x0000,$current['type'] == 5? 0x00000010 : 0x00000000,$offset);

+				$central .= pack("VvvvvVVVVvvvvvVV", 0x02014b50, 0x0014, $this->options['method'] == 0 ? 0x0000 : 0x000A, 0x0000,

+					(isset($current['method']) || $this->options['method'] == 0) ? 0x0000 : 0x0008, $timedate,

+					0x00000000, 0x00000000, 0x00000000, strlen($current['name2']) + 1, 0x0000, 0x0000, 0x0000, 0x0000, $current['type'] == 5 ? 0x00000010 : 0x00000000, $offset);

 				$central .= $current['name2'] . "/";

 				$files++;

 				$offset += (31 + strlen($current['name2']));

 			}

-			else if($current['stat'][7] == 0)

+			else if ($current['stat'][7] == 0)

 			{

-				$block .= pack("VVVvv",0x00000000,0x00000000,0x00000000,strlen($current['name2']),0x0000);

+				$block .= pack("VVVvv", 0x00000000, 0x00000000, 0x00000000, strlen($current['name2']), 0x0000);

 				$block .= $current['name2'];

 				$this->add_data($block);

-				$central .= pack("VvvvvVVVVvvvvvVV",0x02014b50,0x0014,$this->options['method'] == 0? 0x0000 : 0x000A,0x0000,

-					(isset($current['method']) || $this->options['method'] == 0)? 0x0000 : 0x0008,$timedate,

-					0x00000000,0x00000000,0x00000000,strlen($current['name2']),0x0000,0x0000,0x0000,0x0000,$current['type'] == 5? 0x00000010 : 0x00000000,$offset);

+				$central .= pack("VvvvvVVVVvvvvvVV", 0x02014b50, 0x0014, $this->options['method'] == 0 ? 0x0000 : 0x000A, 0x0000,

+					(isset($current['method']) || $this->options['method'] == 0) ? 0x0000 : 0x0008, $timedate,

+					0x00000000, 0x00000000, 0x00000000, strlen($current['name2']), 0x0000, 0x0000, 0x0000, 0x0000, $current['type'] == 5 ? 0x00000010 : 0x00000000, $offset);

 				$central .= $current['name2'];

 				$files++;

 				$offset += (30 + strlen($current['name2']));

 			}

-			else if($fp = @fopen($current['name'],"rb"))

+			else if ($fp = @fopen($current['name'], "rb"))

 			{

-				$temp = fread($fp,$current['stat'][7]);

+				$temp = fread($fp, $current['stat'][7]);

 				fclose($fp);

 				$crc32 = crc32($temp);

-				if(!isset($current['method']) && $this->options['method'] == 1)

+				if (!isset($current['method']) && $this->options['method'] == 1)

 				{

-					$temp = gzcompress($temp,$this->options['level']);

+					$temp = gzcompress($temp, $this->options['level']);

 					$size = strlen($temp) - 6;

-					$temp = substr($temp,2,$size);

+					$temp = substr($temp, 2, $size);

 				}

 				else

-				{

 					$size = strlen($temp);

-				}

-				$block .= pack("VVVvv",$crc32,$size,$current['stat'][7],strlen($current['name2']),0x0000);

+				$block .= pack("VVVvv", $crc32, $size, $current['stat'][7], strlen($current['name2']), 0x0000);

 				$block .= $current['name2'];

 				$this->add_data($block);

 				$this->add_data($temp);

-				unset($temp);

-				$central .= pack("VvvvvVVVVvvvvvVV",0x02014b50,0x0014,$this->options['method'] == 0? 0x0000 : 0x000A,0x0000,

-					(isset($current['method']) || $this->options['method'] == 0)? 0x0000 : 0x0008,$timedate,

-					$crc32,$size,$current['stat'][7],strlen($current['name2']),0x0000,0x0000,0x0000,0x0000,0x00000000,$offset);

+				unset ($temp);

+				$central .= pack("VvvvvVVVVvvvvvVV", 0x02014b50, 0x0014, $this->options['method'] == 0 ? 0x0000 : 0x000A, 0x0000,

+					(isset($current['method']) || $this->options['method'] == 0) ? 0x0000 : 0x0008, $timedate,

+					$crc32, $size, $current['stat'][7], strlen($current['name2']), 0x0000, 0x0000, 0x0000, 0x0000, 0x00000000, $offset);

 				$central .= $current['name2'];

 				$files++;

 				$offset += (30 + strlen($current['name2']) + $size);

 			}

 			else

-			{

 				$this->error[] = "Could not open file {$current['name']} for reading. It was not added.";

-			}

 		}

 

 		$this->add_data($central);

 

-		$this->add_data(pack("VvvvvVVv",0x06054b50,0x0000,0x0000,$files,$files,strlen($central),$offset,

-			!empty($this->options['comment'])? strlen($this->options['comment']) : 0x0000));

+		$this->add_data(pack("VvvvvVVv", 0x06054b50, 0x0000, 0x0000, $files, $files, strlen($central), $offset,

+			!empty ($this->options['comment']) ? strlen($this->options['comment']) : 0x0000));

 

-		if(!empty($this->options['comment']))

-		{

+		if (!empty ($this->options['comment']))

 			$this->add_data($this->options['comment']);

-		}

 

 		chdir($pwd);