ntwb / wordpress

src/wp-admin/includes/class-ftp-sockets.php

Doc Comments +3 added lines

@@ -94,6 +94,9 @@
 		return $result;
 	}
 
+	/**
+	 * @param string $cmd
+	 */
 	function _exec($cmd, $fnction="_exec") {
 		if(!$this->_ready) {
 			$this->PushError($fnction,'Connect first');

Braces +47 added lines, -17 removed lines

@@ -59,7 +59,9 @@ 
 			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($sock)) return FALSE;
+		if(!$this->_settimeout($sock)) {
+			return FALSE;
+		}
 		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
 		if (!($res = @socket_connect($sock, $host, $port))) {
 			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
@@ -89,7 +91,9 @@ 
 				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
 			}
 		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		if($this->LocalEcho) {
+			echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		}
 		$this->_code=(int)$regs[1];
 		return $result;
 	}
@@ -99,19 +103,25 @@ 
 			$this->PushError($fnction,'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		if($this->LocalEcho) {
+			echo "PUT > ",$cmd,CRLF;
+		}
 		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
 		if($status===false) {
 			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
 			return FALSE;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		if(!$this->_readmsg($fnction)) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+		if(!$this->_settype($mode)) {
+			return FALSE;
+		}
 		$this->SendMSG("Creating data socket");
 		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($this->_ftp_data_sock < 0) {
@@ -139,8 +149,9 @@ 
 				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
+			} else {
+				$this->_ftp_temp_sock=$this->_ftp_data_sock;
 			}
-			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
 		} else {
 			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
 				$this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
@@ -176,8 +187,11 @@ 
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
 		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
@@ -189,18 +203,28 @@ 
 		}
 
 		while(($block=@socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ))!==false) {
-			if($block==="") break;
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+			if($block==="") {
+				break;
+			}
+			if($mode!=FTP_BINARY) {
+				$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			}
+			if(is_resource($fp)) {
+				$out+=fwrite($fp, $block, strlen($block));
+			} else {
+				$out.=$block;
+			}
 		}
 		return $out;
 	}
 
 	function _data_write($mode=FTP_ASCII, $fp=NULL) {
 		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
@@ -213,14 +237,20 @@ 
 		if(is_resource($fp)) {
 			while(!feof($fp)) {
 				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+				if(!$this->_data_write_block($mode, $block)) {
+					return false;
+				}
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif(!$this->_data_write_block($mode, $fp)) {
+			return false;
+		}
 		return true;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if($mode!=FTP_BINARY) {
+			$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		}
 		do {
 			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
 				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * PemFTP - A Ftp implementation in pure PHP
- *
- * @package PemFTP
- * @since 2.5.0
- *
- * @version 1.0
- * @copyright Alexey Dotsenko
- * @author Alexey Dotsenko
- * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
- */
+	 * PemFTP - A Ftp implementation in pure PHP
+	 *
+	 * @package PemFTP
+	 * @since 2.5.0
+	 *
+	 * @version 1.0
+	 * @copyright Alexey Dotsenko
+	 * @author Alexey Dotsenko
+	 * @link http://www.phpclasses.org/browse/package/1743.html Site
+	 * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
+	 */
 
 /**
  * Socket Based FTP implementation

Spacing +92 added lines, -92 removed lines

@@ -27,11 +27,11 @@ 
  */
 class ftp extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb = FALSE, $le = FALSE) {
 		parent::__construct(true, $verb, $le);
 	}
 
-	function ftp($verb=FALSE, $le=FALSE) {
+	function ftp($verb = FALSE, $le = FALSE) {
 		$this->__construct($verb, $le);
 	}
 
@@ -40,13 +40,13 @@ 
 // <!-- --------------------------------------------------------------------------------------- -->
 
 	function _settimeout($sock) {
-		if(!@socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
-			$this->PushError('_connect','socket set receive timeout',socket_strerror(socket_last_error($sock)));
+		if ( ! @socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect', 'socket set receive timeout', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
-		if(!@socket_set_option($sock, SOL_SOCKET , SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
-			$this->PushError('_connect','socket set send timeout',socket_strerror(socket_last_error($sock)));
+		if ( ! @socket_set_option($sock, SOL_SOCKET, SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect', 'socket set send timeout', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
@@ -55,118 +55,118 @@ 
 
 	function _connect($host, $port) {
 		$this->SendMSG("Creating socket");
-		if(!($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
-			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
+		if ( ! ($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
+			$this->PushError('_connect', 'socket create failed', socket_strerror(socket_last_error($sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($sock)) return FALSE;
+		if ( ! $this->_settimeout($sock)) return FALSE;
 		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
-		if (!($res = @socket_connect($sock, $host, $port))) {
-			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
+		if ( ! ($res = @socket_connect($sock, $host, $port))) {
+			$this->PushError('_connect', 'socket connect failed', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
-		$this->_connected=true;
+		$this->_connected = true;
 		return $sock;
 	}
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
-			$this->PushError($fnction,'Connect first');
+	function _readmsg($fnction = "_readmsg") {
+		if ( ! $this->_connected) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
+		$result = true;
+		$this->_message = "";
+		$this->_code = 0;
+		$go = true;
 		do {
-			$tmp=@socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			$tmp = @socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
+			if ($tmp === false) {
+				$go = $result = false;
+				$this->PushError($fnction, 'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
 			} else {
-				$this->_message.=$tmp;
-				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
+				$this->_message .= $tmp;
+				$go = ! preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
 			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
+		} while ($go);
+		if ($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		$this->_code = (int) $regs[1];
 		return $result;
 	}
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
+	function _exec($cmd, $fnction = "_exec") {
+		if ( ! $this->_ready) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
+		if ($this->LocalEcho) echo "PUT > ", $cmd, CRLF;
+		$status = @socket_write($this->_ftp_control_sock, $cmd.CRLF);
+		if ($status === false) {
+			$this->PushError($fnction, 'socket write failed', socket_strerror(socket_last_error($this->stream)));
 			return FALSE;
 		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		$this->_lastaction = time();
+		if ( ! $this->_readmsg($fnction)) return FALSE;
 		return TRUE;
 	}
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+	function _data_prepare($mode = FTP_ASCII) {
+		if ( ! $this->_settype($mode)) return FALSE;
 		$this->SendMSG("Creating data socket");
 		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($this->_ftp_data_sock < 0) {
-			$this->PushError('_data_prepare','socket create failed',socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			$this->PushError('_data_prepare', 'socket create failed', socket_strerror(socket_last_error($this->_ftp_data_sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($this->_ftp_data_sock)) {
+		if ( ! $this->_settimeout($this->_ftp_data_sock)) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
+		if ($this->_passive) {
+			if ( ! $this->_exec("PASV", "pasv")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if ( ! $this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-			$this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->_datahost = $ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+			$this->_dataport = (((int) $ip_port[4]) << 8) + ((int) $ip_port[5]);
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
-				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare", "socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
+			else $this->_ftp_temp_sock = $this->_ftp_data_sock;
 		} else {
-			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
-				$this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			if ( ! @socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
+				$this->PushError("_data_prepare", "can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_bind($this->_ftp_data_sock,$addr)){
-				$this->PushError("_data_prepare","can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_bind($this->_ftp_data_sock, $addr)) {
+				$this->PushError("_data_prepare", "can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_listen($this->_ftp_data_sock)) {
-				$this->PushError("_data_prepare","can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_listen($this->_ftp_data_sock)) {
+				$this->PushError("_data_prepare", "can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
-				$this->PushError("_data_prepare","can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare", "can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_exec('PORT '.str_replace('.',',',$this->_datahost.'.'.($this->_dataport>>8).'.'.($this->_dataport&0x00FF)), "_port")) {
+			if ( ! $this->_exec('PORT '.str_replace('.', ',', $this->_datahost.'.'.($this->_dataport >> 8).'.'.($this->_dataport & 0x00FF)), "_port")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if ( ! $this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
@@ -174,61 +174,61 @@ 
 		return TRUE;
 	}
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_read($mode = FTP_ASCII, $fp = NULL) {
+		$NewLine = $this->_eol_code[$this->OS_local];
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
-				$this->PushError("_data_read","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			$this->_ftp_temp_sock = socket_accept($this->_ftp_data_sock);
+			if ($this->_ftp_temp_sock === FALSE) {
+				$this->PushError("_data_read", "socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
 		}
 
-		while(($block=@socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ))!==false) {
-			if($block==="") break;
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+		while (($block = @socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ)) !== false) {
+			if ($block === "") break;
+			if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if (is_resource($fp)) $out += fwrite($fp, $block, strlen($block));
+			else $out .= $block;
 		}
 		return $out;
 	}
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_write($mode = FTP_ASCII, $fp = NULL) {
+		$NewLine = $this->_eol_code[$this->OS_local];
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
-				$this->PushError("_data_write","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			$this->_ftp_temp_sock = socket_accept($this->_ftp_data_sock);
+			if ($this->_ftp_temp_sock === FALSE) {
+				$this->PushError("_data_write", "socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return false;
 			}
 		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+		if (is_resource($fp)) {
+			while ( ! feof($fp)) {
+				$block = fread($fp, $this->_ftp_buff_size);
+				if ( ! $this->_data_write_block($mode, $block)) return false;
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif ( ! $this->_data_write_block($mode, $fp)) return false;
 		return true;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
-				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			if (($t = @socket_write($this->_ftp_temp_sock, $block)) === FALSE) {
+				$this->PushError("_data_write", "socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			$block=substr($block, $t);
-		} while(!empty($block));
+			$block = substr($block, $t);
+		} while ( ! empty($block));
 		return true;
 	}
 
@@ -240,9 +240,9 @@ 
 	}
 
 	function _quit() {
-		if($this->_connected) {
+		if ($this->_connected) {
 			@socket_close($this->_ftp_control_sock);
-			$this->_connected=false;
+			$this->_connected = false;
 			$this->SendMSG("Socket closed");
 		}
 	}

src/wp-admin/includes/class-ftp.php

Doc Comments +48 added lines

@@ -231,6 +231,9 @@ 
 		return TRUE;
 	}
 
+	/**
+	 * @param integer $mode
+	 */
 	function SetType($mode=FTP_AUTOASCII) {
 		if(!in_array($mode, $this->AuthorizedTransferMode)) {
 			$this->SendMSG("Wrong type");
@@ -256,6 +259,9 @@ 
 		return TRUE;
 	}
 
+	/**
+	 * @param boolean $pasv
+	 */
 	function Passive($pasv=NULL) {
 		if(is_null($pasv)) $this->_passive=!$this->_passive;
 		else $this->_passive=$pasv;
@@ -389,6 +395,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $pathname
+	 */
 	function chdir($pathname) {
 		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
 		if(!$this->_checkCode()) return FALSE;
@@ -407,6 +416,10 @@ 
 		return TRUE;
 	}
 
+	/**
+	 * @param string $from
+	 * @param string $to
+	 */
 	function rename($from, $to) {
 		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
 		if(!$this->_checkCode()) return FALSE;
@@ -417,6 +430,9 @@ 
 		return TRUE;
 	}
 
+	/**
+	 * @param string $pathname
+	 */
 	function filesize($pathname) {
 		if(!isset($this->_features["SIZE"])) {
 			$this->PushError("filesize", "not supported by server");
@@ -437,6 +453,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $pathname
+	 */
 	function mdtm($pathname) {
 		if(!isset($this->_features["MDTM"])) {
 			$this->PushError("mdtm", "not supported by server");
@@ -457,12 +476,18 @@ 
 		return array($DATA[1], $DATA[3]);
 	}
 
+	/**
+	 * @param string $pathname
+	 */
 	function delete($pathname) {
 		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
 		if(!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
+	/**
+	 * @param string $command
+	 */
 	function site($command, $fnction="site") {
 		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
 		if(!$this->_checkCode()) return FALSE;
@@ -524,6 +549,9 @@ 
 		return $exists;
 	}
 
+	/**
+	 * @param string $remotefile
+	 */
 	function fget($fp, $remotefile,$rest=0) {
 		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
 		$pi=pathinfo($remotefile);
@@ -548,6 +576,10 @@ 
 		return $out;
 	}
 
+	/**
+	 * @param string $remotefile
+	 * @param string $localfile
+	 */
 	function get($remotefile, $localfile=NULL, $rest=0) {
 		if(is_null($localfile)) $localfile=$remotefile;
 		if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten");
@@ -583,6 +615,9 @@ 
 		return $out;
 	}
 
+	/**
+	 * @param string $remotefile
+	 */
 	function fput($remotefile, $fp) {
 		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
 		$pi=pathinfo($remotefile);
@@ -607,6 +642,9 @@ 
 		return $ret;
 	}
 
+	/**
+	 * @param string $localfile
+	 */
 	function put($localfile, $remotefile=NULL, $rest=0) {
 		if(is_null($remotefile)) $remotefile=$localfile;
 		if (!file_exists($localfile)) {
@@ -718,6 +756,9 @@ 
 		return $ret;
 	}
 
+	/**
+	 * @param string $remote
+	 */
 	function mdel($remote, $continious=false) {
 		$list=$this->rawlist($remote, "-la");
 		if($list===false) {
@@ -823,6 +864,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $remote
+	 */
 	function dirlist($remote) {
 		$list=$this->rawlist($remote, "-la");
 		if($list===false) {
@@ -878,6 +922,10 @@ 
 // <!-- Partie : gestion des erreurs                                                            -->
 // <!-- --------------------------------------------------------------------------------------- -->
 // Gnre une erreur pour traitement externe  la classe
+	/**
+	 * @param string $fctname
+	 * @param string $msg
+	 */
 	function PushError($fctname,$msg,$desc=false){
 		$error=array();
 		$error['time']=time();

Indentation +14 added lines, -14 removed lines

@@ -146,7 +146,7 @@ 
 		$this->_login="anonymous";
 		$this->_password="anon@ftp.com";
 		$this->_features=array();
-	    $this->OS_local=FTP_OS_Unix;
+		$this->OS_local=FTP_OS_Unix;
 		$this->OS_remote=FTP_OS_Unix;
 		$this->features=array();
 		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows;
@@ -270,25 +270,25 @@ 
 
 	function SetServer($host, $port=21, $reconnect=true) {
 		if(!is_long($port)) {
-	        $this->verbose=true;
-    	    $this->SendMSG("Incorrect port syntax");
+			$this->verbose=true;
+			$this->SendMSG("Incorrect port syntax");
 			return FALSE;
 		} else {
 			$ip=@gethostbyname($host);
-	        $dns=@gethostbyaddr($host);
-	        if(!$ip) $ip=$host;
-	        if(!$dns) $dns=$host;
-	        // Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
-	        // -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
-	        $ipaslong = ip2long($ip);
+			$dns=@gethostbyaddr($host);
+			if(!$ip) $ip=$host;
+			if(!$dns) $dns=$host;
+			// Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
+			// -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
+			$ipaslong = ip2long($ip);
 			if ( ($ipaslong == false) || ($ipaslong === -1) ) {
 				$this->SendMSG("Wrong host name/address \"".$host."\"");
 				return FALSE;
 			}
-	        $this->_host=$ip;
-	        $this->_fullhost=$dns;
-	        $this->_port=$port;
-	        $this->_dataport=$port-1;
+			$this->_host=$ip;
+			$this->_fullhost=$dns;
+			$this->_port=$port;
+			$this->_dataport=$port-1;
 		}
 		$this->SendMSG("Host \"".$this->_fullhost."(".$this->_host."):".$this->_port."\"");
 		if($reconnect){
@@ -321,7 +321,7 @@ 
 			if(!$this->SetServer($server)) return false;
 		}
 		if($this->_ready) return true;
-	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
+		$this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
 		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
 			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
 			return FALSE;

Spacing +380 added lines, -381 removed lines

@@ -20,7 +20,7 @@ 
  * @since 2.5
  * @var string
  */
-if(!defined('CRLF')) define('CRLF',"\r\n");
+if ( ! defined('CRLF')) define('CRLF', "\r\n");
 
 /**
  * Sets whatever to autodetect ASCII mode.
@@ -30,7 +30,7 @@ 
  * @since 2.5
  * @var int
  */
-if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
+if ( ! defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
 
 /**
  *
@@ -38,7 +38,7 @@ 
  * @since 2.5
  * @var int
  */
-if(!defined("FTP_BINARY")) define("FTP_BINARY", 1);
+if ( ! defined("FTP_BINARY")) define("FTP_BINARY", 1);
 
 /**
  *
@@ -46,7 +46,7 @@ 
  * @since 2.5
  * @var int
  */
-if(!defined("FTP_ASCII")) define("FTP_ASCII", 0);
+if ( ! defined("FTP_ASCII")) define("FTP_ASCII", 0);
 
 /**
  * Whether to force FTP.
@@ -56,25 +56,25 @@ 
  * @since 2.5
  * @var bool
  */
-if(!defined('FTP_FORCE')) define('FTP_FORCE', true);
+if ( ! defined('FTP_FORCE')) define('FTP_FORCE', true);
 
 /**
  * @since 2.5
  * @var string
  */
-define('FTP_OS_Unix','u');
+define('FTP_OS_Unix', 'u');
 
 /**
  * @since 2.5
  * @var string
  */
-define('FTP_OS_Windows','w');
+define('FTP_OS_Windows', 'w');
 
 /**
  * @since 2.5
  * @var string
  */
-define('FTP_OS_Mac','m');
+define('FTP_OS_Mac', 'm');
 
 /**
  * PemFTP base class
@@ -121,39 +121,39 @@ 
 	var $AutoAsciiExt;
 
 	/* Constructor */
-	function __construct($port_mode=FALSE, $verb=FALSE, $le=FALSE) {
-		$this->LocalEcho=$le;
-		$this->Verbose=$verb;
-		$this->_lastaction=NULL;
-		$this->_error_array=array();
-		$this->_eol_code=array(FTP_OS_Unix=>"\n", FTP_OS_Mac=>"\r", FTP_OS_Windows=>"\r\n");
-		$this->AuthorizedTransferMode=array(FTP_AUTOASCII, FTP_ASCII, FTP_BINARY);
-		$this->OS_FullName=array(FTP_OS_Unix => 'UNIX', FTP_OS_Windows => 'WINDOWS', FTP_OS_Mac => 'MACOS');
-		$this->AutoAsciiExt=array("ASP","BAT","C","CPP","CSS","CSV","JS","H","HTM","HTML","SHTML","INI","LOG","PHP3","PHTML","PL","PERL","SH","SQL","TXT");
-		$this->_port_available=($port_mode==TRUE);
-		$this->SendMSG("Staring FTP client class".($this->_port_available?"":" without PORT mode support"));
-		$this->_connected=FALSE;
-		$this->_ready=FALSE;
-		$this->_can_restore=FALSE;
-		$this->_code=0;
-		$this->_message="";
-		$this->_ftp_buff_size=4096;
-		$this->_curtype=NULL;
+	function __construct($port_mode = FALSE, $verb = FALSE, $le = FALSE) {
+		$this->LocalEcho = $le;
+		$this->Verbose = $verb;
+		$this->_lastaction = NULL;
+		$this->_error_array = array();
+		$this->_eol_code = array(FTP_OS_Unix=>"\n", FTP_OS_Mac=>"\r", FTP_OS_Windows=>"\r\n");
+		$this->AuthorizedTransferMode = array(FTP_AUTOASCII, FTP_ASCII, FTP_BINARY);
+		$this->OS_FullName = array(FTP_OS_Unix => 'UNIX', FTP_OS_Windows => 'WINDOWS', FTP_OS_Mac => 'MACOS');
+		$this->AutoAsciiExt = array("ASP", "BAT", "C", "CPP", "CSS", "CSV", "JS", "H", "HTM", "HTML", "SHTML", "INI", "LOG", "PHP3", "PHTML", "PL", "PERL", "SH", "SQL", "TXT");
+		$this->_port_available = ($port_mode == TRUE);
+		$this->SendMSG("Staring FTP client class".($this->_port_available ? "" : " without PORT mode support"));
+		$this->_connected = FALSE;
+		$this->_ready = FALSE;
+		$this->_can_restore = FALSE;
+		$this->_code = 0;
+		$this->_message = "";
+		$this->_ftp_buff_size = 4096;
+		$this->_curtype = NULL;
 		$this->SetUmask(0022);
 		$this->SetType(FTP_AUTOASCII);
 		$this->SetTimeout(30);
-		$this->Passive(!$this->_port_available);
-		$this->_login="anonymous";
-		$this->_password="anon@ftp.com";
-		$this->_features=array();
-	    $this->OS_local=FTP_OS_Unix;
-		$this->OS_remote=FTP_OS_Unix;
-		$this->features=array();
-		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows;
-		elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac;
-	}
-
-	function ftp_base($port_mode=FALSE) {
+		$this->Passive( ! $this->_port_available);
+		$this->_login = "anonymous";
+		$this->_password = "anon@ftp.com";
+		$this->_features = array();
+	    $this->OS_local = FTP_OS_Unix;
+		$this->OS_remote = FTP_OS_Unix;
+		$this->features = array();
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local = FTP_OS_Windows;
+		elseif (strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local = FTP_OS_Mac;
+	}
+
+	function ftp_base($port_mode = FALSE) {
 		$this->__construct($port_mode);
 	}
 
@@ -163,11 +163,11 @@ 
 
 	function parselisting($line) {
 		$is_windows = ($this->OS_remote == FTP_OS_Windows);
-		if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/",$line,$lucifer)) {
+		if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer)) {
 			$b = array();
-			if ($lucifer[3]<70) { $lucifer[3]+=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
-			$b['isdir'] = ($lucifer[7]=="<DIR>");
-			if ( $b['isdir'] )
+			if ($lucifer[3] < 70) { $lucifer[3] += 2000; } else { $lucifer[3] += 1900; } // 4digit year fix
+			$b['isdir'] = ($lucifer[7] == "<DIR>");
+			if ($b['isdir'])
 				$b['type'] = 'd';
 			else
 				$b['type'] = 'f';
@@ -177,19 +177,19 @@ 
 			$b['year'] = $lucifer[3];
 			$b['hour'] = $lucifer[4];
 			$b['minute'] = $lucifer[5];
-			$b['time'] = @mktime($lucifer[4]+(strcasecmp($lucifer[6],"PM")==0?12:0),$lucifer[5],0,$lucifer[1],$lucifer[2],$lucifer[3]);
+			$b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
 			$b['am/pm'] = $lucifer[6];
 			$b['name'] = $lucifer[8];
-		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
+		} else if ( ! $is_windows && $lucifer = preg_split("/[ ]/", $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
-			$lcount=count($lucifer);
-			if ($lcount<8) return '';
+			$lcount = count($lucifer);
+			if ($lcount < 8) return '';
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === "d";
 			$b['islink'] = $lucifer[0]{0} === "l";
-			if ( $b['isdir'] )
+			if ($b['isdir'])
 				$b['type'] = 'd';
-			elseif ( $b['islink'] )
+			elseif ($b['islink'])
 				$b['type'] = 'l';
 			else
 				$b['type'] = 'f';
@@ -198,15 +198,15 @@ 
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
 			$b['size'] = $lucifer[4];
-			if ($lcount==8) {
-				sscanf($lucifer[5],"%d-%d-%d",$b['year'],$b['month'],$b['day']);
-				sscanf($lucifer[6],"%d:%d",$b['hour'],$b['minute']);
-				$b['time'] = @mktime($b['hour'],$b['minute'],0,$b['month'],$b['day'],$b['year']);
+			if ($lcount == 8) {
+				sscanf($lucifer[5], "%d-%d-%d", $b['year'], $b['month'], $b['day']);
+				sscanf($lucifer[6], "%d:%d", $b['hour'], $b['minute']);
+				$b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
 				$b['name'] = $lucifer[7];
 			} else {
 				$b['month'] = $lucifer[5];
 				$b['day'] = $lucifer[6];
-				if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
+				if (preg_match("/([0-9]{2}):([0-9]{2})/", $lucifer[7], $l2)) {
 					$b['year'] = date("Y");
 					$b['hour'] = $l2[1];
 					$b['minute'] = $l2[2];
@@ -215,7 +215,7 @@ 
 					$b['hour'] = 0;
 					$b['minute'] = 0;
 				}
-				$b['time'] = strtotime(sprintf("%d %s %d %02d:%02d",$b['day'],$b['month'],$b['year'],$b['hour'],$b['minute']));
+				$b['time'] = strtotime(sprintf("%d %s %d %02d:%02d", $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']));
 				$b['name'] = $lucifer[8];
 			}
 		}
@@ -223,227 +223,227 @@ 
 		return $b;
 	}
 
-	function SendMSG($message = "", $crlf=true) {
+	function SendMSG($message = "", $crlf = true) {
 		if ($this->Verbose) {
-			echo $message.($crlf?CRLF:"");
+			echo $message.($crlf ? CRLF : "");
 			flush();
 		}
 		return TRUE;
 	}
 
-	function SetType($mode=FTP_AUTOASCII) {
-		if(!in_array($mode, $this->AuthorizedTransferMode)) {
+	function SetType($mode = FTP_AUTOASCII) {
+		if ( ! in_array($mode, $this->AuthorizedTransferMode)) {
 			$this->SendMSG("Wrong type");
 			return FALSE;
 		}
-		$this->_type=$mode;
-		$this->SendMSG("Transfer type: ".($this->_type==FTP_BINARY?"binary":($this->_type==FTP_ASCII?"ASCII":"auto ASCII") ) );
+		$this->_type = $mode;
+		$this->SendMSG("Transfer type: ".($this->_type == FTP_BINARY ? "binary" : ($this->_type == FTP_ASCII ? "ASCII" : "auto ASCII")));
 		return TRUE;
 	}
 
-	function _settype($mode=FTP_ASCII) {
-		if($this->_ready) {
-			if($mode==FTP_BINARY) {
-				if($this->_curtype!=FTP_BINARY) {
-					if(!$this->_exec("TYPE I", "SetType")) return FALSE;
-					$this->_curtype=FTP_BINARY;
+	function _settype($mode = FTP_ASCII) {
+		if ($this->_ready) {
+			if ($mode == FTP_BINARY) {
+				if ($this->_curtype != FTP_BINARY) {
+					if ( ! $this->_exec("TYPE I", "SetType")) return FALSE;
+					$this->_curtype = FTP_BINARY;
 				}
-			} elseif($this->_curtype!=FTP_ASCII) {
-				if(!$this->_exec("TYPE A", "SetType")) return FALSE;
-				$this->_curtype=FTP_ASCII;
+			} elseif ($this->_curtype != FTP_ASCII) {
+				if ( ! $this->_exec("TYPE A", "SetType")) return FALSE;
+				$this->_curtype = FTP_ASCII;
 			}
 		} else return FALSE;
 		return TRUE;
 	}
 
-	function Passive($pasv=NULL) {
-		if(is_null($pasv)) $this->_passive=!$this->_passive;
-		else $this->_passive=$pasv;
-		if(!$this->_port_available and !$this->_passive) {
+	function Passive($pasv = NULL) {
+		if (is_null($pasv)) $this->_passive = ! $this->_passive;
+		else $this->_passive = $pasv;
+		if ( ! $this->_port_available and ! $this->_passive) {
 			$this->SendMSG("Only passive connections available!");
-			$this->_passive=TRUE;
+			$this->_passive = TRUE;
 			return FALSE;
 		}
-		$this->SendMSG("Passive mode ".($this->_passive?"on":"off"));
+		$this->SendMSG("Passive mode ".($this->_passive ? "on" : "off"));
 		return TRUE;
 	}
 
-	function SetServer($host, $port=21, $reconnect=true) {
-		if(!is_long($port)) {
-	        $this->verbose=true;
+	function SetServer($host, $port = 21, $reconnect = true) {
+		if ( ! is_long($port)) {
+	        $this->verbose = true;
     	    $this->SendMSG("Incorrect port syntax");
 			return FALSE;
 		} else {
-			$ip=@gethostbyname($host);
-	        $dns=@gethostbyaddr($host);
-	        if(!$ip) $ip=$host;
-	        if(!$dns) $dns=$host;
+			$ip = @gethostbyname($host);
+	        $dns = @gethostbyaddr($host);
+	        if ( ! $ip) $ip = $host;
+	        if ( ! $dns) $dns = $host;
 	        // Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
 	        // -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
 	        $ipaslong = ip2long($ip);
-			if ( ($ipaslong == false) || ($ipaslong === -1) ) {
+			if (($ipaslong == false) || ($ipaslong === -1)) {
 				$this->SendMSG("Wrong host name/address \"".$host."\"");
 				return FALSE;
 			}
-	        $this->_host=$ip;
-	        $this->_fullhost=$dns;
-	        $this->_port=$port;
-	        $this->_dataport=$port-1;
+	        $this->_host = $ip;
+	        $this->_fullhost = $dns;
+	        $this->_port = $port;
+	        $this->_dataport = $port - 1;
 		}
 		$this->SendMSG("Host \"".$this->_fullhost."(".$this->_host."):".$this->_port."\"");
-		if($reconnect){
-			if($this->_connected) {
+		if ($reconnect) {
+			if ($this->_connected) {
 				$this->SendMSG("Reconnecting");
-				if(!$this->quit(FTP_FORCE)) return FALSE;
-				if(!$this->connect()) return FALSE;
+				if ( ! $this->quit(FTP_FORCE)) return FALSE;
+				if ( ! $this->connect()) return FALSE;
 			}
 		}
 		return TRUE;
 	}
 
-	function SetUmask($umask=0022) {
-		$this->_umask=$umask;
+	function SetUmask($umask = 0022) {
+		$this->_umask = $umask;
 		umask($this->_umask);
 		$this->SendMSG("UMASK 0".decoct($this->_umask));
 		return TRUE;
 	}
 
-	function SetTimeout($timeout=30) {
-		$this->_timeout=$timeout;
+	function SetTimeout($timeout = 30) {
+		$this->_timeout = $timeout;
 		$this->SendMSG("Timeout ".$this->_timeout);
-		if($this->_connected)
-			if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+		if ($this->_connected)
+			if ( ! $this->_settimeout($this->_ftp_control_sock)) return FALSE;
 		return TRUE;
 	}
 
-	function connect($server=NULL) {
-		if(!empty($server)) {
-			if(!$this->SetServer($server)) return false;
+	function connect($server = NULL) {
+		if ( ! empty($server)) {
+			if ( ! $this->SetServer($server)) return false;
 		}
-		if($this->_ready) return true;
+		if ($this->_ready) return true;
 	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
-		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
+		if ( ! ($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
 			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
 			return FALSE;
 		}
 		$this->SendMSG("Connected to remote host \"".$this->_fullhost.":".$this->_port."\". Waiting for greeting.");
 		do {
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			$this->_lastaction=time();
-		} while($this->_code<200);
-		$this->_ready=true;
-		$syst=$this->systype();
-		if(!$syst) $this->SendMSG("Can't detect remote OS");
+			if ( ! $this->_readmsg()) return FALSE;
+			if ( ! $this->_checkCode()) return FALSE;
+			$this->_lastaction = time();
+		} while ($this->_code < 200);
+		$this->_ready = true;
+		$syst = $this->systype();
+		if ( ! $syst) $this->SendMSG("Can't detect remote OS");
 		else {
-			if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows;
-			elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac;
-			elseif(preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote=FTP_OS_Unix;
-			else $this->OS_remote=FTP_OS_Mac;
+			if (preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote = FTP_OS_Windows;
+			elseif (preg_match("/os/i", $syst[0])) $this->OS_remote = FTP_OS_Mac;
+			elseif (preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote = FTP_OS_Unix;
+			else $this->OS_remote = FTP_OS_Mac;
 			$this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]);
 		}
-		if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
+		if ( ! $this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
 		else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
 		return TRUE;
 	}
 
-	function quit($force=false) {
-		if($this->_ready) {
-			if(!$this->_exec("QUIT") and !$force) return FALSE;
-			if(!$this->_checkCode() and !$force) return FALSE;
-			$this->_ready=false;
+	function quit($force = false) {
+		if ($this->_ready) {
+			if ( ! $this->_exec("QUIT") and ! $force) return FALSE;
+			if ( ! $this->_checkCode() and ! $force) return FALSE;
+			$this->_ready = false;
 			$this->SendMSG("Session finished");
 		}
 		$this->_quit();
 		return TRUE;
 	}
 
-	function login($user=NULL, $pass=NULL) {
-		if(!is_null($user)) $this->_login=$user;
-		else $this->_login="anonymous";
-		if(!is_null($pass)) $this->_password=$pass;
-		else $this->_password="anon@anon.com";
-		if(!$this->_exec("USER ".$this->_login, "login")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		if($this->_code!=230) {
-			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+	function login($user = NULL, $pass = NULL) {
+		if ( ! is_null($user)) $this->_login = $user;
+		else $this->_login = "anonymous";
+		if ( ! is_null($pass)) $this->_password = $pass;
+		else $this->_password = "anon@anon.com";
+		if ( ! $this->_exec("USER ".$this->_login, "login")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
+		if ($this->_code != 230) {
+			if ( ! $this->_exec((($this->_code == 331) ? "PASS " : "ACCT ").$this->_password, "login")) return FALSE;
+			if ( ! $this->_checkCode()) return FALSE;
 		}
 		$this->SendMSG("Authentication succeeded");
-		if(empty($this->_features)) {
-			if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
+		if (empty($this->_features)) {
+			if ( ! $this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
 			else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
 		}
 		return TRUE;
 	}
 
 	function pwd() {
-		if(!$this->_exec("PWD", "pwd")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("PWD", "pwd")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message);
 	}
 
 	function cdup() {
-		if(!$this->_exec("CDUP", "cdup")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("CDUP", "cdup")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return true;
 	}
 
 	function chdir($pathname) {
-		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("CWD ".$pathname, "chdir")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function rmdir($pathname) {
-		if(!$this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function mkdir($pathname) {
-		if(!$this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function rename($from, $to) {
-		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		if($this->_code==350) {
-			if(!$this->_exec("RNTO ".$to, "rename")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("RNFR ".$from, "rename")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
+		if ($this->_code == 350) {
+			if ( ! $this->_exec("RNTO ".$to, "rename")) return FALSE;
+			if ( ! $this->_checkCode()) return FALSE;
 		} else return FALSE;
 		return TRUE;
 	}
 
 	function filesize($pathname) {
-		if(!isset($this->_features["SIZE"])) {
+		if ( ! isset($this->_features["SIZE"])) {
 			$this->PushError("filesize", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 	}
 
 	function abort() {
-		if(!$this->_exec("ABOR", "abort")) return FALSE;
-		if(!$this->_checkCode()) {
-			if($this->_code!=426) return FALSE;
-			if(!$this->_readmsg("abort")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("ABOR", "abort")) return FALSE;
+		if ( ! $this->_checkCode()) {
+			if ($this->_code != 426) return FALSE;
+			if ( ! $this->_readmsg("abort")) return FALSE;
+			if ( ! $this->_checkCode()) return FALSE;
 		}
 		return true;
 	}
 
 	function mdtm($pathname) {
-		if(!isset($this->_features["MDTM"])) {
+		if ( ! isset($this->_features["MDTM"])) {
 			$this->PushError("mdtm", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		$mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 		$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
 		$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
@@ -451,61 +451,61 @@ 
 	}
 
 	function systype() {
-		if(!$this->_exec("SYST", "systype")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("SYST", "systype")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		$DATA = explode(" ", $this->_message);
 		return array($DATA[1], $DATA[3]);
 	}
 
 	function delete($pathname) {
-		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("DELE ".$pathname, "delete")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
-	function site($command, $fnction="site") {
-		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+	function site($command, $fnction = "site") {
+		if ( ! $this->_exec("SITE ".$command, $fnction)) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function chmod($pathname, $mode) {
-		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
+		if ( ! $this->site(sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
 		return TRUE;
 	}
 
 	function restore($from) {
-		if(!isset($this->_features["REST"])) {
+		if ( ! isset($this->_features["REST"])) {
 			$this->PushError("restore", "not supported by server");
 			return FALSE;
 		}
-		if($this->_curtype!=FTP_BINARY) {
+		if ($this->_curtype != FTP_BINARY) {
 			$this->PushError("restore", "can't restore in ASCII mode");
 			return FALSE;
 		}
-		if(!$this->_exec("REST ".$from, "resore")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_exec("REST ".$from, "resore")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function features() {
-		if(!$this->_exec("FEAT", "features")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		$f=preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
-		$this->_features=array();
-		foreach($f as $k=>$v) {
-			$v=explode(" ", trim($v));
-			$this->_features[array_shift($v)]=$v;
+		if ( ! $this->_exec("FEAT", "features")) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
+		$f = preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
+		$this->_features = array();
+		foreach ($f as $k=>$v) {
+			$v = explode(" ", trim($v));
+			$this->_features[array_shift($v)] = $v;
 		}
 		return true;
 	}
 
-	function rawlist($pathname="", $arg="") {
-		return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist");
+	function rawlist($pathname = "", $arg = "") {
+		return $this->_list(($arg ? " ".$arg : "").($pathname ? " ".$pathname : ""), "LIST", "rawlist");
 	}
 
-	function nlist($pathname="", $arg="") {
-		return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist");
+	function nlist($pathname = "", $arg = "") {
+		return $this->_list(($arg ? " ".$arg : "").($pathname ? " ".$pathname : ""), "NLST", "nlist");
 	}
 
 	function is_exists($pathname) {
@@ -513,330 +513,329 @@ 
 	}
 
 	function file_exists($pathname) {
-		$exists=true;
-		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=FALSE;
+		$exists = true;
+		if ( ! $this->_exec("RNFR ".$pathname, "rename")) $exists = FALSE;
 		else {
-			if(!$this->_checkCode()) $exists=FALSE;
+			if ( ! $this->_checkCode()) $exists = FALSE;
 			$this->abort();
 		}
-		if($exists) $this->SendMSG("Remote file ".$pathname." exists");
+		if ($exists) $this->SendMSG("Remote file ".$pathname." exists");
 		else $this->SendMSG("Remote file ".$pathname." does not exist");
 		return $exists;
 	}
 
-	function fget($fp, $remotefile,$rest=0) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+	function fget($fp, $remotefile, $rest = 0) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($remotefile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if ( ! $this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("RETR ".$remotefile, "get")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if ( ! $this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if ( ! $this->_checkCode()) {
 			$this->_data_close();
 			return FALSE;
 		}
-		$out=$this->_data_read($mode, $fp);
+		$out = $this->_data_read($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_readmsg()) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return $out;
 	}
 
-	function get($remotefile, $localfile=NULL, $rest=0) {
-		if(is_null($localfile)) $localfile=$remotefile;
+	function get($remotefile, $localfile = NULL, $rest = 0) {
+		if (is_null($localfile)) $localfile = $remotefile;
 		if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten");
 		$fp = @fopen($localfile, "w");
-		if (!$fp) {
-			$this->PushError("get","can't open local file", "Cannot create \"".$localfile."\"");
+		if ( ! $fp) {
+			$this->PushError("get", "can't open local file", "Cannot create \"".$localfile."\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($remotefile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if ( ! $this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("RETR ".$remotefile, "get")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if ( ! $this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if ( ! $this->_checkCode()) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		$out=$this->_data_read($mode, $fp);
+		$out = $this->_data_read($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_readmsg()) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return $out;
 	}
 
 	function fput($remotefile, $fp) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($remotefile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if ( ! $this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("STOR ".$remotefile, "put")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if ( ! $this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if ( ! $this->_checkCode()) {
 			$this->_data_close();
 			return FALSE;
 		}
-		$ret=$this->_data_write($mode, $fp);
+		$ret = $this->_data_write($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_readmsg()) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return $ret;
 	}
 
-	function put($localfile, $remotefile=NULL, $rest=0) {
-		if(is_null($remotefile)) $remotefile=$localfile;
-		if (!file_exists($localfile)) {
-			$this->PushError("put","can't open local file", "No such file or directory \"".$localfile."\"");
+	function put($localfile, $remotefile = NULL, $rest = 0) {
+		if (is_null($remotefile)) $remotefile = $localfile;
+		if ( ! file_exists($localfile)) {
+			$this->PushError("put", "can't open local file", "No such file or directory \"".$localfile."\"");
 			return FALSE;
 		}
 		$fp = @fopen($localfile, "r");
 
-		if (!$fp) {
-			$this->PushError("put","can't open local file", "Cannot read file \"".$localfile."\"");
+		if ( ! $fp) {
+			$this->PushError("put", "can't open local file", "Cannot read file \"".$localfile."\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($localfile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($localfile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if ( ! $this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("STOR ".$remotefile, "put")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if ( ! $this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if ( ! $this->_checkCode()) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		$ret=$this->_data_write($mode, $fp);
+		$ret = $this->_data_write($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if ( ! $this->_readmsg()) return FALSE;
+		if ( ! $this->_checkCode()) return FALSE;
 		return $ret;
 	}
 
-	function mput($local=".", $remote=NULL, $continious=false) {
-		$local=realpath($local);
-		if(!@file_exists($local)) {
-			$this->PushError("mput","can't open local folder", "Cannot stat folder \"".$local."\"");
+	function mput($local = ".", $remote = NULL, $continious = false) {
+		$local = realpath($local);
+		if ( ! @file_exists($local)) {
+			$this->PushError("mput", "can't open local folder", "Cannot stat folder \"".$local."\"");
 			return FALSE;
 		}
-		if(!is_dir($local)) return $this->put($local, $remote);
-		if(empty($remote)) $remote=".";
-		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
-		if($handle = opendir($local)) {
-			$list=array();
+		if ( ! is_dir($local)) return $this->put($local, $remote);
+		if (empty($remote)) $remote = ".";
+		elseif ( ! $this->file_exists($remote) and ! $this->mkdir($remote)) return FALSE;
+		if ($handle = opendir($local)) {
+			$list = array();
 			while (false !== ($file = readdir($handle))) {
-				if ($file != "." && $file != "..") $list[]=$file;
+				if ($file != "." && $file != "..") $list[] = $file;
 			}
 			closedir($handle);
 		} else {
-			$this->PushError("mput","can't open local folder", "Cannot read folder \"".$local."\"");
+			$this->PushError("mput", "can't open local folder", "Cannot read folder \"".$local."\"");
 			return FALSE;
 		}
-		if(empty($list)) return TRUE;
-		$ret=true;
-		foreach($list as $el) {
-			if(is_dir($local."/".$el)) $t=$this->mput($local."/".$el, $remote."/".$el);
-			else $t=$this->put($local."/".$el, $remote."/".$el);
-			if(!$t) {
-				$ret=FALSE;
-				if(!$continious) break;
+		if (empty($list)) return TRUE;
+		$ret = true;
+		foreach ($list as $el) {
+			if (is_dir($local."/".$el)) $t = $this->mput($local."/".$el, $remote."/".$el);
+			else $t = $this->put($local."/".$el, $remote."/".$el);
+			if ( ! $t) {
+				$ret = FALSE;
+				if ( ! $continious) break;
 			}
 		}
 		return $ret;
 
 	}
 
-	function mget($remote, $local=".", $continious=false) {
-		$list=$this->rawlist($remote, "-lA");
-		if($list===false) {
-			$this->PushError("mget","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
+	function mget($remote, $local = ".", $continious = false) {
+		$list = $this->rawlist($remote, "-lA");
+		if ($list === false) {
+			$this->PushError("mget", "can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
 			return FALSE;
 		}
-		if(empty($list)) return true;
-		if(!@file_exists($local)) {
-			if(!@mkdir($local)) {
-				$this->PushError("mget","can't create local folder", "Cannot create folder \"".$local."\"");
+		if (empty($list)) return true;
+		if ( ! @file_exists($local)) {
+			if ( ! @mkdir($local)) {
+				$this->PushError("mget", "can't create local folder", "Cannot create folder \"".$local."\"");
 				return FALSE;
 			}
 		}
-		foreach($list as $k=>$v) {
-			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+		foreach ($list as $k=>$v) {
+			$list[$k] = $this->parselisting($v);
+			if ( ! $list[$k] or $list[$k]["name"] == "." or $list[$k]["name"] == "..") unset($list[$k]);
 		}
-		$ret=true;
-		foreach($list as $el) {
-			if($el["type"]=="d") {
-				if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) {
+		$ret = true;
+		foreach ($list as $el) {
+			if ($el["type"] == "d") {
+				if ( ! $this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) {
 					$this->PushError("mget", "can't copy folder", "Can't copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
-					$ret=false;
-					if(!$continious) break;
+					$ret = false;
+					if ( ! $continious) break;
 				}
 			} else {
-				if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) {
+				if ( ! $this->get($remote."/".$el["name"], $local."/".$el["name"])) {
 					$this->PushError("mget", "can't copy file", "Can't copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
-					$ret=false;
-					if(!$continious) break;
+					$ret = false;
+					if ( ! $continious) break;
 				}
 			}
 			@chmod($local."/".$el["name"], $el["perms"]);
-			$t=strtotime($el["date"]);
-			if($t!==-1 and $t!==false) @touch($local."/".$el["name"], $t);
+			$t = strtotime($el["date"]);
+			if ($t !== -1 and $t !== false) @touch($local."/".$el["name"], $t);
 		}
 		return $ret;
 	}
 
-	function mdel($remote, $continious=false) {
-		$list=$this->rawlist($remote, "-la");
-		if($list===false) {
-			$this->PushError("mdel","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
+	function mdel($remote, $continious = false) {
+		$list = $this->rawlist($remote, "-la");
+		if ($list === false) {
+			$this->PushError("mdel", "can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
 			return false;
 		}
 
-		foreach($list as $k=>$v) {
-			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+		foreach ($list as $k=>$v) {
+			$list[$k] = $this->parselisting($v);
+			if ( ! $list[$k] or $list[$k]["name"] == "." or $list[$k]["name"] == "..") unset($list[$k]);
 		}
-		$ret=true;
+		$ret = true;
 
-		foreach($list as $el) {
-			if ( empty($el) )
+		foreach ($list as $el) {
+			if (empty($el))
 				continue;
 
-			if($el["type"]=="d") {
-				if(!$this->mdel($remote."/".$el["name"], $continious)) {
-					$ret=false;
-					if(!$continious) break;
+			if ($el["type"] == "d") {
+				if ( ! $this->mdel($remote."/".$el["name"], $continious)) {
+					$ret = false;
+					if ( ! $continious) break;
 				}
 			} else {
-				if (!$this->delete($remote."/".$el["name"])) {
+				if ( ! $this->delete($remote."/".$el["name"])) {
 					$this->PushError("mdel", "can't delete file", "Can't delete remote file \"".$remote."/".$el["name"]."\"");
-					$ret=false;
-					if(!$continious) break;
+					$ret = false;
+					if ( ! $continious) break;
 				}
 			}
 		}
 
-		if(!$this->rmdir($remote)) {
+		if ( ! $this->rmdir($remote)) {
 			$this->PushError("mdel", "can't delete folder", "Can't delete remote folder \"".$remote."/".$el["name"]."\"");
-			$ret=false;
+			$ret = false;
 		}
 		return $ret;
 	}
 
 	function mmkdir($dir, $mode = 0777) {
-		if(empty($dir)) return FALSE;
-		if($this->is_exists($dir) or $dir == "/" ) return TRUE;
-		if(!$this->mmkdir(dirname($dir), $mode)) return false;
-		$r=$this->mkdir($dir, $mode);
-		$this->chmod($dir,$mode);
+		if (empty($dir)) return FALSE;
+		if ($this->is_exists($dir) or $dir == "/") return TRUE;
+		if ( ! $this->mmkdir(dirname($dir), $mode)) return false;
+		$r = $this->mkdir($dir, $mode);
+		$this->chmod($dir, $mode);
 		return $r;
 	}
 
-	function glob($pattern, $handle=NULL) {
-		$path=$output=null;
-		if(PHP_OS=='WIN32') $slash='\\';
-		else $slash='/';
-		$lastpos=strrpos($pattern,$slash);
-		if(!($lastpos===false)) {
-			$path=substr($pattern,0,-$lastpos-1);
-			$pattern=substr($pattern,$lastpos);
-		} else $path=getcwd();
-		if(is_array($handle) and !empty($handle)) {
-			while($dir=each($handle)) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+	function glob($pattern, $handle = NULL) {
+		$path = $output = null;
+		if (PHP_OS == 'WIN32') $slash = '\\';
+		else $slash = '/';
+		$lastpos = strrpos($pattern, $slash);
+		if ( ! ($lastpos === false)) {
+			$path = substr($pattern, 0, -$lastpos - 1);
+			$pattern = substr($pattern, $lastpos);
+		} else $path = getcwd();
+		if (is_array($handle) and ! empty($handle)) {
+			while ($dir = each($handle)) {
+				if ($this->glob_pattern_match($pattern, $dir))
+				$output[] = $dir;
 			}
 		} else {
-			$handle=@opendir($path);
-			if($handle===false) return false;
-			while($dir=readdir($handle)) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+			$handle = @opendir($path);
+			if ($handle === false) return false;
+			while ($dir = readdir($handle)) {
+				if ($this->glob_pattern_match($pattern, $dir))
+				$output[] = $dir;
 			}
 			closedir($handle);
 		}
-		if(is_array($output)) return $output;
+		if (is_array($output)) return $output;
 		return false;
 	}
 
-	function glob_pattern_match($pattern,$string) {
-		$out=null;
-		$chunks=explode(';',$pattern);
-		foreach($chunks as $pattern) {
-			$escape=array('$','^','.','{','}','(',')','[',']','|');
-			while(strpos($pattern,'**')!==false)
-				$pattern=str_replace('**','*',$pattern);
-			foreach($escape as $probe)
-				$pattern=str_replace($probe,"\\$probe",$pattern);
-			$pattern=str_replace('?*','*',
-				str_replace('*?','*',
-					str_replace('*',".*",
-						str_replace('?','.{1,1}',$pattern))));
-			$out[]=$pattern;
-		}
-		if(count($out)==1) return($this->glob_regexp("^$out[0]$",$string));
+	function glob_pattern_match($pattern, $string) {
+		$out = null;
+		$chunks = explode(';', $pattern);
+		foreach ($chunks as $pattern) {
+			$escape = array('$', '^', '.', '{', '}', '(', ')', '[', ']', '|');
+			while (strpos($pattern, '**') !== false)
+				$pattern = str_replace('**', '*', $pattern);
+			foreach ($escape as $probe)
+				$pattern = str_replace($probe, "\\$probe", $pattern);
+			$pattern = str_replace('?*', '*',
+				str_replace('*?', '*',
+					str_replace('*', ".*",
+						str_replace('?', '.{1,1}', $pattern))));
+			$out[] = $pattern;
+		}
+		if (count($out) == 1) return($this->glob_regexp("^$out[0]$", $string));
 		else {
-			foreach($out as $tester)
-				if($this->my_regexp("^$tester$",$string)) return true;
+			foreach ($out as $tester)
+				if ($this->my_regexp("^$tester$", $string)) return true;
 		}
 		return false;
 	}
 
-	function glob_regexp($pattern,$probe) {
-		$sensitive=(PHP_OS!='WIN32');
-		return ($sensitive?
-			preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) : 
-			preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
+	function glob_regexp($pattern, $probe) {
+		$sensitive = (PHP_OS != 'WIN32');
+		return ($sensitive ?
+			preg_match('/'.preg_quote($pattern, '/').'/', $probe) : preg_match('/'.preg_quote($pattern, '/').'/i', $probe)
 		);
 	}
 
 	function dirlist($remote) {
-		$list=$this->rawlist($remote, "-la");
-		if($list===false) {
-			$this->PushError("dirlist","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
+		$list = $this->rawlist($remote, "-la");
+		if ($list === false) {
+			$this->PushError("dirlist", "can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
 			return false;
 		}
 
 		$dirlist = array();
-		foreach($list as $k=>$v) {
-			$entry=$this->parselisting($v);
-			if ( empty($entry) )
+		foreach ($list as $k=>$v) {
+			$entry = $this->parselisting($v);
+			if (empty($entry))
 				continue;
 
-			if($entry["name"]=="." or $entry["name"]=="..")
+			if ($entry["name"] == "." or $entry["name"] == "..")
 				continue;
 
 			$dirlist[$entry['name']] = $entry;
@@ -848,27 +847,27 @@ 
 // <!--       Private functions                                                                 -->
 // <!-- --------------------------------------------------------------------------------------- -->
 	function _checkCode() {
-		return ($this->_code<400 and $this->_code>0);
+		return ($this->_code < 400 and $this->_code > 0);
 	}
 
-	function _list($arg="", $cmd="LIST", $fnction="_list") {
-		if(!$this->_data_prepare()) return false;
-		if(!$this->_exec($cmd.$arg, $fnction)) {
+	function _list($arg = "", $cmd = "LIST", $fnction = "_list") {
+		if ( ! $this->_data_prepare()) return false;
+		if ( ! $this->_exec($cmd.$arg, $fnction)) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if ( ! $this->_checkCode()) {
 			$this->_data_close();
 			return FALSE;
 		}
-		$out="";
-		if($this->_code<200) {
-			$out=$this->_data_read();
+		$out = "";
+		if ($this->_code < 200) {
+			$out = $this->_data_read();
 			$this->_data_close();
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			if($out === FALSE ) return FALSE;
-			$out=preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
+			if ( ! $this->_readmsg()) return FALSE;
+			if ( ! $this->_checkCode()) return FALSE;
+			if ($out === FALSE) return FALSE;
+			$out = preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
 //			$this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
 		}
 		return $out;
@@ -878,29 +877,29 @@ 
 // <!-- Partie : gestion des erreurs                                                            -->
 // <!-- --------------------------------------------------------------------------------------- -->
 // Gnre une erreur pour traitement externe  la classe
-	function PushError($fctname,$msg,$desc=false){
-		$error=array();
-		$error['time']=time();
-		$error['fctname']=$fctname;
-		$error['msg']=$msg;
-		$error['desc']=$desc;
-		if($desc) $tmp=' ('.$desc.')'; else $tmp='';
+	function PushError($fctname, $msg, $desc = false) {
+		$error = array();
+		$error['time'] = time();
+		$error['fctname'] = $fctname;
+		$error['msg'] = $msg;
+		$error['desc'] = $desc;
+		if ($desc) $tmp = ' ('.$desc.')'; else $tmp = '';
 		$this->SendMSG($fctname.': '.$msg.$tmp);
-		return(array_push($this->_error_array,$error));
+		return(array_push($this->_error_array, $error));
 	}
 
 // Rcupre une erreur externe
-	function PopError(){
-		if(count($this->_error_array)) return(array_pop($this->_error_array));
+	function PopError() {
+		if (count($this->_error_array)) return(array_pop($this->_error_array));
 			else return(false);
 	}
 }
 
-$mod_sockets = extension_loaded( 'sockets' );
-if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) {
-	$prefix = ( PHP_SHLIB_SUFFIX == 'dll' ) ? 'php_' : '';
-	@dl( $prefix . 'sockets.' . PHP_SHLIB_SUFFIX );
-	$mod_sockets = extension_loaded( 'sockets' );
+$mod_sockets = extension_loaded('sockets');
+if ( ! $mod_sockets && function_exists('dl') && is_callable('dl')) {
+	$prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : '';
+	@dl($prefix.'sockets.'.PHP_SHLIB_SUFFIX);
+	$mod_sockets = extension_loaded('sockets');
 }
 
-require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
+require_once dirname(__FILE__)."/class-ftp-".($mod_sockets ? "sockets" : "pure").".php";

Braces +434 added lines, -168 removed lines

@@ -20,7 +20,9 @@ 
  * @since 2.5
  * @var string
  */
-if(!defined('CRLF')) define('CRLF',"\r\n");
+if(!defined('CRLF')) {
+	define('CRLF',"\r\n");
+}
 
 /**
  * Sets whatever to autodetect ASCII mode.
@@ -30,7 +32,9 @@ 
  * @since 2.5
  * @var int
  */
-if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
+if(!defined("FTP_AUTOASCII")) {
+	define("FTP_AUTOASCII", -1);
+}
 
 /**
  *
@@ -38,7 +42,9 @@ 
  * @since 2.5
  * @var int
  */
-if(!defined("FTP_BINARY")) define("FTP_BINARY", 1);
+if(!defined("FTP_BINARY")) {
+	define("FTP_BINARY", 1);
+}
 
 /**
  *
@@ -46,7 +52,9 @@ 
  * @since 2.5
  * @var int
  */
-if(!defined("FTP_ASCII")) define("FTP_ASCII", 0);
+if(!defined("FTP_ASCII")) {
+	define("FTP_ASCII", 0);
+}
 
 /**
  * Whether to force FTP.
@@ -56,7 +64,9 @@ 
  * @since 2.5
  * @var bool
  */
-if(!defined('FTP_FORCE')) define('FTP_FORCE', true);
+if(!defined('FTP_FORCE')) {
+	define('FTP_FORCE', true);
+}
 
 /**
  * @since 2.5
@@ -149,8 +159,11 @@ 
 	    $this->OS_local=FTP_OS_Unix;
 		$this->OS_remote=FTP_OS_Unix;
 		$this->features=array();
-		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows;
-		elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac;
+		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$this->OS_local=FTP_OS_Windows;
+		} elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') {
+			$this->OS_local=FTP_OS_Mac;
+		}
 	}
 
 	function ftp_base($port_mode=FALSE) {
@@ -167,10 +180,11 @@ 
 			$b = array();
 			if ($lucifer[3]<70) { $lucifer[3]+=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
 			$b['isdir'] = ($lucifer[7]=="<DIR>");
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['size'] = $lucifer[7];
 			$b['month'] = $lucifer[1];
 			$b['day'] = $lucifer[2];
@@ -183,16 +197,19 @@ 
 		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount=count($lucifer);
-			if ($lcount<8) return '';
+			if ($lcount<8) {
+				return '';
+			}
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === "d";
 			$b['islink'] = $lucifer[0]{0} === "l";
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} elseif ( $b['islink'] ) {
+							$b['type'] = 'l';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['perms'] = $lucifer[0];
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
@@ -245,20 +262,29 @@ 
 		if($this->_ready) {
 			if($mode==FTP_BINARY) {
 				if($this->_curtype!=FTP_BINARY) {
-					if(!$this->_exec("TYPE I", "SetType")) return FALSE;
+					if(!$this->_exec("TYPE I", "SetType")) {
+						return FALSE;
+					}
 					$this->_curtype=FTP_BINARY;
 				}
 			} elseif($this->_curtype!=FTP_ASCII) {
-				if(!$this->_exec("TYPE A", "SetType")) return FALSE;
+				if(!$this->_exec("TYPE A", "SetType")) {
+					return FALSE;
+				}
 				$this->_curtype=FTP_ASCII;
 			}
-		} else return FALSE;
+		} else {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function Passive($pasv=NULL) {
-		if(is_null($pasv)) $this->_passive=!$this->_passive;
-		else $this->_passive=$pasv;
+		if(is_null($pasv)) {
+			$this->_passive=!$this->_passive;
+		} else {
+			$this->_passive=$pasv;
+		}
 		if(!$this->_port_available and !$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			$this->_passive=TRUE;
@@ -276,8 +302,12 @@ 
 		} else {
 			$ip=@gethostbyname($host);
 	        $dns=@gethostbyaddr($host);
-	        if(!$ip) $ip=$host;
-	        if(!$dns) $dns=$host;
+	        if(!$ip) {
+	        	$ip=$host;
+	        }
+	        if(!$dns) {
+	        	$dns=$host;
+	        }
 	        // Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
 	        // -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
 	        $ipaslong = ip2long($ip);
@@ -294,8 +324,12 @@ 
 		if($reconnect){
 			if($this->_connected) {
 				$this->SendMSG("Reconnecting");
-				if(!$this->quit(FTP_FORCE)) return FALSE;
-				if(!$this->connect()) return FALSE;
+				if(!$this->quit(FTP_FORCE)) {
+					return FALSE;
+				}
+				if(!$this->connect()) {
+					return FALSE;
+				}
 			}
 		}
 		return TRUE;
@@ -311,16 +345,21 @@ 
 	function SetTimeout($timeout=30) {
 		$this->_timeout=$timeout;
 		$this->SendMSG("Timeout ".$this->_timeout);
-		if($this->_connected)
-			if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+		if($this->_connected) {
+					if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+		}
 		return TRUE;
 	}
 
 	function connect($server=NULL) {
 		if(!empty($server)) {
-			if(!$this->SetServer($server)) return false;
+			if(!$this->SetServer($server)) {
+				return false;
+			}
+		}
+		if($this->_ready) {
+			return true;
 		}
-		if($this->_ready) return true;
 	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
 		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
 			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
@@ -328,29 +367,46 @@ 
 		}
 		$this->SendMSG("Connected to remote host \"".$this->_fullhost.":".$this->_port."\". Waiting for greeting.");
 		do {
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if(!$this->_readmsg()) {
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				return FALSE;
+			}
 			$this->_lastaction=time();
 		} while($this->_code<200);
 		$this->_ready=true;
 		$syst=$this->systype();
-		if(!$syst) $this->SendMSG("Can't detect remote OS");
-		else {
-			if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows;
-			elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac;
-			elseif(preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote=FTP_OS_Unix;
-			else $this->OS_remote=FTP_OS_Mac;
+		if(!$syst) {
+			$this->SendMSG("Can't detect remote OS");
+		} else {
+			if(preg_match("/win|dos|novell/i", $syst[0])) {
+				$this->OS_remote=FTP_OS_Windows;
+			} elseif(preg_match("/os/i", $syst[0])) {
+				$this->OS_remote=FTP_OS_Mac;
+			} elseif(preg_match("/(li|u)nix/i", $syst[0])) {
+				$this->OS_remote=FTP_OS_Unix;
+			} else {
+				$this->OS_remote=FTP_OS_Mac;
+			}
 			$this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]);
 		}
-		if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
-		else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		if(!$this->features()) {
+			$this->SendMSG("Can't get features list. All supported - disabled");
+		} else {
+			$this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		}
 		return TRUE;
 	}
 
 	function quit($force=false) {
 		if($this->_ready) {
-			if(!$this->_exec("QUIT") and !$force) return FALSE;
-			if(!$this->_checkCode() and !$force) return FALSE;
+			if(!$this->_exec("QUIT") and !$force) {
+				return FALSE;
+			}
+			if(!$this->_checkCode() and !$force) {
+				return FALSE;
+			}
 			$this->_ready=false;
 			$this->SendMSG("Session finished");
 		}
@@ -359,61 +415,108 @@ 
 	}
 
 	function login($user=NULL, $pass=NULL) {
-		if(!is_null($user)) $this->_login=$user;
-		else $this->_login="anonymous";
-		if(!is_null($pass)) $this->_password=$pass;
-		else $this->_password="anon@anon.com";
-		if(!$this->_exec("USER ".$this->_login, "login")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!is_null($user)) {
+			$this->_login=$user;
+		} else {
+			$this->_login="anonymous";
+		}
+		if(!is_null($pass)) {
+			$this->_password=$pass;
+		} else {
+			$this->_password="anon@anon.com";
+		}
+		if(!$this->_exec("USER ".$this->_login, "login")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		if($this->_code!=230) {
-			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) {
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				return FALSE;
+			}
 		}
 		$this->SendMSG("Authentication succeeded");
 		if(empty($this->_features)) {
-			if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
-			else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+			if(!$this->features()) {
+				$this->SendMSG("Can't get features list. All supported - disabled");
+			} else {
+				$this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+			}
 		}
 		return TRUE;
 	}
 
 	function pwd() {
-		if(!$this->_exec("PWD", "pwd")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("PWD", "pwd")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message);
 	}
 
 	function cdup() {
-		if(!$this->_exec("CDUP", "cdup")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("CDUP", "cdup")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return true;
 	}
 
 	function chdir($pathname) {
-		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("CWD ".$pathname, "chdir")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function rmdir($pathname) {
-		if(!$this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("RMD ".$pathname, "rmdir")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function mkdir($pathname) {
-		if(!$this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("MKD ".$pathname, "mkdir")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function rename($from, $to) {
-		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("RNFR ".$from, "rename")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		if($this->_code==350) {
-			if(!$this->_exec("RNTO ".$to, "rename")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-		} else return FALSE;
+			if(!$this->_exec("RNTO ".$to, "rename")) {
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				return FALSE;
+			}
+		} else {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
@@ -422,17 +525,29 @@ 
 			$this->PushError("filesize", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SIZE ".$pathname, "filesize")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 	}
 
 	function abort() {
-		if(!$this->_exec("ABOR", "abort")) return FALSE;
+		if(!$this->_exec("ABOR", "abort")) {
+			return FALSE;
+		}
 		if(!$this->_checkCode()) {
-			if($this->_code!=426) return FALSE;
-			if(!$this->_readmsg("abort")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if($this->_code!=426) {
+				return FALSE;
+			}
+			if(!$this->_readmsg("abort")) {
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				return FALSE;
+			}
 		}
 		return true;
 	}
@@ -442,8 +557,12 @@ 
 			$this->PushError("mdtm", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("MDTM ".$pathname, "mdtm")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		$mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 		$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
 		$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
@@ -451,26 +570,40 @@ 
 	}
 
 	function systype() {
-		if(!$this->_exec("SYST", "systype")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SYST", "systype")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		$DATA = explode(" ", $this->_message);
 		return array($DATA[1], $DATA[3]);
 	}
 
 	function delete($pathname) {
-		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("DELE ".$pathname, "delete")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function site($command, $fnction="site") {
-		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SITE ".$command, $fnction)) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function chmod($pathname, $mode) {
-		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
+		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
@@ -483,14 +616,22 @@ 
 			$this->PushError("restore", "can't restore in ASCII mode");
 			return FALSE;
 		}
-		if(!$this->_exec("REST ".$from, "resore")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("REST ".$from, "resore")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function features() {
-		if(!$this->_exec("FEAT", "features")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("FEAT", "features")) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		$f=preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
 		$this->_features=array();
 		foreach($f as $k=>$v) {
@@ -514,25 +655,38 @@ 
 
 	function file_exists($pathname) {
 		$exists=true;
-		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=FALSE;
-		else {
-			if(!$this->_checkCode()) $exists=FALSE;
+		if(!$this->_exec("RNFR ".$pathname, "rename")) {
+			$exists=FALSE;
+		} else {
+			if(!$this->_checkCode()) {
+				$exists=FALSE;
+			}
 			$this->abort();
 		}
-		if($exists) $this->SendMSG("Remote file ".$pathname." exists");
-		else $this->SendMSG("Remote file ".$pathname." does not exist");
+		if($exists) {
+			$this->SendMSG("Remote file ".$pathname." exists");
+		} else {
+			$this->SendMSG("Remote file ".$pathname." does not exist");
+		}
 		return $exists;
 	}
 
 	function fget($fp, $remotefile,$rest=0) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+			fseek($fp, $rest);
+		}
 		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+			$mode=FTP_ASCII;
+		} else {
+			$mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+			$this->restore($rest);
+		}
 		if(!$this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			return FALSE;
@@ -543,28 +697,43 @@ 
 		}
 		$out=$this->_data_read($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return $out;
 	}
 
 	function get($remotefile, $localfile=NULL, $rest=0) {
-		if(is_null($localfile)) $localfile=$remotefile;
-		if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten");
+		if(is_null($localfile)) {
+			$localfile=$remotefile;
+		}
+		if (@file_exists($localfile)) {
+			$this->SendMSG("Warning : local file will be overwritten");
+		}
 		$fp = @fopen($localfile, "w");
 		if (!$fp) {
 			$this->PushError("get","can't open local file", "Cannot create \"".$localfile."\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+			fseek($fp, $rest);
+		}
 		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+			$mode=FTP_ASCII;
+		} else {
+			$mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+			$this->restore($rest);
+		}
 		if(!$this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			fclose($fp);
@@ -578,20 +747,31 @@ 
 		$out=$this->_data_read($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return $out;
 	}
 
 	function fput($remotefile, $fp) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+			fseek($fp, $rest);
+		}
 		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+			$mode=FTP_ASCII;
+		} else {
+			$mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+			$this->restore($rest);
+		}
 		if(!$this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			return FALSE;
@@ -602,13 +782,19 @@ 
 		}
 		$ret=$this->_data_write($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return $ret;
 	}
 
 	function put($localfile, $remotefile=NULL, $rest=0) {
-		if(is_null($remotefile)) $remotefile=$localfile;
+		if(is_null($remotefile)) {
+			$remotefile=$localfile;
+		}
 		if (!file_exists($localfile)) {
 			$this->PushError("put","can't open local file", "No such file or directory \"".$localfile."\"");
 			return FALSE;
@@ -619,15 +805,22 @@ 
 			$this->PushError("put","can't open local file", "Cannot read file \"".$localfile."\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+			fseek($fp, $rest);
+		}
 		$pi=pathinfo($localfile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+			$mode=FTP_ASCII;
+		} else {
+			$mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+			$this->restore($rest);
+		}
 		if(!$this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			fclose($fp);
@@ -641,8 +834,12 @@ 
 		$ret=$this->_data_write($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			return FALSE;
+		}
 		return $ret;
 	}
 
@@ -652,27 +849,41 @@ 
 			$this->PushError("mput","can't open local folder", "Cannot stat folder \"".$local."\"");
 			return FALSE;
 		}
-		if(!is_dir($local)) return $this->put($local, $remote);
-		if(empty($remote)) $remote=".";
-		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
+		if(!is_dir($local)) {
+			return $this->put($local, $remote);
+		}
+		if(empty($remote)) {
+			$remote=".";
+		} elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) {
+			return FALSE;
+		}
 		if($handle = opendir($local)) {
 			$list=array();
 			while (false !== ($file = readdir($handle))) {
-				if ($file != "." && $file != "..") $list[]=$file;
+				if ($file != "." && $file != "..") {
+					$list[]=$file;
+				}
 			}
 			closedir($handle);
 		} else {
 			$this->PushError("mput","can't open local folder", "Cannot read folder \"".$local."\"");
 			return FALSE;
 		}
-		if(empty($list)) return TRUE;
+		if(empty($list)) {
+			return TRUE;
+		}
 		$ret=true;
 		foreach($list as $el) {
-			if(is_dir($local."/".$el)) $t=$this->mput($local."/".$el, $remote."/".$el);
-			else $t=$this->put($local."/".$el, $remote."/".$el);
+			if(is_dir($local."/".$el)) {
+				$t=$this->mput($local."/".$el, $remote."/".$el);
+			} else {
+				$t=$this->put($local."/".$el, $remote."/".$el);
+			}
 			if(!$t) {
 				$ret=FALSE;
-				if(!$continious) break;
+				if(!$continious) {
+					break;
+				}
 			}
 		}
 		return $ret;
@@ -685,7 +896,9 @@ 
 			$this->PushError("mget","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
 			return FALSE;
 		}
-		if(empty($list)) return true;
+		if(empty($list)) {
+			return true;
+		}
 		if(!@file_exists($local)) {
 			if(!@mkdir($local)) {
 				$this->PushError("mget","can't create local folder", "Cannot create folder \"".$local."\"");
@@ -694,7 +907,9 @@ 
 		}
 		foreach($list as $k=>$v) {
 			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") {
+				unset($list[$k]);
+			}
 		}
 		$ret=true;
 		foreach($list as $el) {
@@ -702,18 +917,24 @@ 
 				if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) {
 					$this->PushError("mget", "can't copy folder", "Can't copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+						break;
+					}
 				}
 			} else {
 				if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) {
 					$this->PushError("mget", "can't copy file", "Can't copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+						break;
+					}
 				}
 			}
 			@chmod($local."/".$el["name"], $el["perms"]);
 			$t=strtotime($el["date"]);
-			if($t!==-1 and $t!==false) @touch($local."/".$el["name"], $t);
+			if($t!==-1 and $t!==false) {
+				@touch($local."/".$el["name"], $t);
+			}
 		}
 		return $ret;
 	}
@@ -727,24 +948,31 @@ 
 
 		foreach($list as $k=>$v) {
 			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") {
+				unset($list[$k]);
+			}
 		}
 		$ret=true;
 
 		foreach($list as $el) {
-			if ( empty($el) )
-				continue;
+			if ( empty($el) ) {
+							continue;
+			}
 
 			if($el["type"]=="d") {
 				if(!$this->mdel($remote."/".$el["name"], $continious)) {
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+						break;
+					}
 				}
 			} else {
 				if (!$this->delete($remote."/".$el["name"])) {
 					$this->PushError("mdel", "can't delete file", "Can't delete remote file \"".$remote."/".$el["name"]."\"");
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+						break;
+					}
 				}
 			}
 		}
@@ -757,9 +985,15 @@ 
 	}
 
 	function mmkdir($dir, $mode = 0777) {
-		if(empty($dir)) return FALSE;
-		if($this->is_exists($dir) or $dir == "/" ) return TRUE;
-		if(!$this->mmkdir(dirname($dir), $mode)) return false;
+		if(empty($dir)) {
+			return FALSE;
+		}
+		if($this->is_exists($dir) or $dir == "/" ) {
+			return TRUE;
+		}
+		if(!$this->mmkdir(dirname($dir), $mode)) {
+			return false;
+		}
 		$r=$this->mkdir($dir, $mode);
 		$this->chmod($dir,$mode);
 		return $r;
@@ -767,28 +1001,39 @@ 
 
 	function glob($pattern, $handle=NULL) {
 		$path=$output=null;
-		if(PHP_OS=='WIN32') $slash='\\';
-		else $slash='/';
+		if(PHP_OS=='WIN32') {
+			$slash='\\';
+		} else {
+			$slash='/';
+		}
 		$lastpos=strrpos($pattern,$slash);
 		if(!($lastpos===false)) {
 			$path=substr($pattern,0,-$lastpos-1);
 			$pattern=substr($pattern,$lastpos);
-		} else $path=getcwd();
+		} else {
+			$path=getcwd();
+		}
 		if(is_array($handle) and !empty($handle)) {
 			while($dir=each($handle)) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+				if($this->glob_pattern_match($pattern,$dir)) {
+								$output[]=$dir;
+				}
 			}
 		} else {
 			$handle=@opendir($path);
-			if($handle===false) return false;
+			if($handle===false) {
+				return false;
+			}
 			while($dir=readdir($handle)) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+				if($this->glob_pattern_match($pattern,$dir)) {
+								$output[]=$dir;
+				}
 			}
 			closedir($handle);
 		}
-		if(is_array($output)) return $output;
+		if(is_array($output)) {
+			return $output;
+		}
 		return false;
 	}
 
@@ -797,20 +1042,24 @@ 
 		$chunks=explode(';',$pattern);
 		foreach($chunks as $pattern) {
 			$escape=array('$','^','.','{','}','(',')','[',']','|');
-			while(strpos($pattern,'**')!==false)
-				$pattern=str_replace('**','*',$pattern);
-			foreach($escape as $probe)
-				$pattern=str_replace($probe,"\\$probe",$pattern);
+			while(strpos($pattern,'**')!==false) {
+							$pattern=str_replace('**','*',$pattern);
+			}
+			foreach($escape as $probe) {
+							$pattern=str_replace($probe,"\\$probe",$pattern);
+			}
 			$pattern=str_replace('?*','*',
 				str_replace('*?','*',
 					str_replace('*',".*",
 						str_replace('?','.{1,1}',$pattern))));
 			$out[]=$pattern;
 		}
-		if(count($out)==1) return($this->glob_regexp("^$out[0]$",$string));
-		else {
-			foreach($out as $tester)
-				if($this->my_regexp("^$tester$",$string)) return true;
+		if(count($out)==1) {
+			return($this->glob_regexp("^$out[0]$",$string));
+		} else {
+			foreach($out as $tester) {
+							if($this->my_regexp("^$tester$",$string)) return true;
+			}
 		}
 		return false;
 	}
@@ -833,11 +1082,13 @@ 
 		$dirlist = array();
 		foreach($list as $k=>$v) {
 			$entry=$this->parselisting($v);
-			if ( empty($entry) )
-				continue;
+			if ( empty($entry) ) {
+							continue;
+			}
 
-			if($entry["name"]=="." or $entry["name"]=="..")
-				continue;
+			if($entry["name"]=="." or $entry["name"]=="..") {
+							continue;
+			}
 
 			$dirlist[$entry['name']] = $entry;
 		}
@@ -852,7 +1103,9 @@ 
 	}
 
 	function _list($arg="", $cmd="LIST", $fnction="_list") {
-		if(!$this->_data_prepare()) return false;
+		if(!$this->_data_prepare()) {
+			return false;
+		}
 		if(!$this->_exec($cmd.$arg, $fnction)) {
 			$this->_data_close();
 			return FALSE;
@@ -865,9 +1118,15 @@ 
 		if($this->_code<200) {
 			$out=$this->_data_read();
 			$this->_data_close();
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			if($out === FALSE ) return FALSE;
+			if(!$this->_readmsg()) {
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				return FALSE;
+			}
+			if($out === FALSE ) {
+				return FALSE;
+			}
 			$out=preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
 //			$this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
 		}
@@ -884,15 +1143,22 @@ 
 		$error['fctname']=$fctname;
 		$error['msg']=$msg;
 		$error['desc']=$desc;
-		if($desc) $tmp=' ('.$desc.')'; else $tmp='';
+		if($desc) {
+			$tmp=' ('.$desc.')';
+		} else {
+			$tmp='';
+		}
 		$this->SendMSG($fctname.': '.$msg.$tmp);
 		return(array_push($this->_error_array,$error));
 	}
 
 // Rcupre une erreur externe
 	function PopError(){
-		if(count($this->_error_array)) return(array_pop($this->_error_array));
-			else return(false);
+		if(count($this->_error_array)) {
+			return(array_pop($this->_error_array));
+		} else {
+				return(false);
+			}
 	}
 }
 

src/wp-admin/includes/class-pclzip.php

Doc Comments +22 added lines

@@ -2339,6 +2339,10 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_mode
+   */
   function privOpenFd($p_mode)
   {
     $v_result=1;
@@ -4150,6 +4154,10 @@ 
   // Parameters :
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_string
+   */
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
     $v_result=1;
@@ -5041,6 +5049,10 @@ 
   // Parameters :
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param PclZip $p_archive_to_add
+   */
   function privMerge(&$p_archive_to_add)
   {
     $v_result=1;
@@ -5548,6 +5560,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param integer $p_src
+   * @param integer $p_dest
+   */
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
     $v_result = 1;
@@ -5610,6 +5627,11 @@ 
   // Return Values :
   //   1 on success, 0 on failure.
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_src
+   * @param string $p_dest
+   */
   function PclZipUtilRename($p_src, $p_dest)
   {
     $v_result = 1;

Indentation +3781 added lines, -3781 removed lines

@@ -27,7 +27,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+	define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
   }
 
   // ----- File list separator
@@ -41,7 +41,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+	define( 'PCLZIP_SEPARATOR', ',' );
   }
 
   // ----- Error configuration
@@ -50,7 +50,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+	define( 'PCLZIP_ERROR_EXTERNAL', 0 );
   }
 
   // ----- Optional static temporary directory
@@ -63,7 +63,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+	define( 'PCLZIP_TEMPORARY_DIR', '' );
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -75,7 +75,7 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+	define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
   }
 
 // --------------------------------------------------------------------------------
@@ -189,20 +189,20 @@ 
   // --------------------------------------------------------------------------------
   class PclZip
   {
-    // ----- Filename of the zip file
-    var $zipname = '';
+	// ----- Filename of the zip file
+	var $zipname = '';
 
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+	// ----- File descriptor of the zip file
+	var $zip_fd = 0;
 
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
+	// ----- Internal error handling
+	var $error_code = 1;
+	var $error_string = '';
 
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+	// ----- Current status of the magic_quotes_runtime
+	// This value store the php configuration for magic_quotes
+	// The class can then disable the magic_quotes and reset it after
+	var $magic_quotes_status;
 
   // --------------------------------------------------------------------------------
   // Function : PclZip()
@@ -215,23 +215,23 @@ 
   function __construct($p_zipname)
   {
 
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
+	// ----- Tests the zlib
+	if (!function_exists('gzopen'))
+	{
+	  die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+	}
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
+	// ----- Set the attributes
+	$this->zipname = $p_zipname;
+	$this->zip_fd = 0;
+	$this->magic_quotes_status = -1;
 
-    // ----- Return
-    return;
+	// ----- Return
+	return;
   }
 
   public function PclZip($p_zipname) {
-    self::__construct($p_zipname);
+	self::__construct($p_zipname);
   }
   // --------------------------------------------------------------------------------
 
@@ -274,149 +274,149 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
+	$v_result=1;
+
+	// ----- Reset the error handler
+	$this->privErrorReset();
+
+	// ----- Set default values
+	$v_options = array();
+	$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove from the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_ADD => 'optional',
+												   PCLZIP_CB_POST_ADD => 'optional',
+												   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+												   PCLZIP_OPT_COMMENT => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   //, PCLZIP_OPT_CRYPT => 'optional'
+											 ));
+		if ($v_result != 1) {
+		  return 0;
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+							   "Invalid number / type of arguments");
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
+	// ----- Init
+	$v_string_list = array();
+	$v_att_list = array();
+	$v_filedescr_list = array();
+	$p_result_list = array();
 
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
+	// ----- Look if the $p_filelist is really an array
+	if (is_array($p_filelist)) {
 
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
+	  // ----- Look if the first element is also an array
+	  //       This will mean that this is a file description entry
+	  if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+		$v_att_list = $p_filelist;
+	  }
 
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
+	  // ----- The list is a list of string names
+	  else {
+		$v_string_list = $p_filelist;
+	  }
+	}
 
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
+	// ----- Look if the $p_filelist is a string
+	else if (is_string($p_filelist)) {
+	  // ----- Create a list from the string
+	  $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+	}
 
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
+	// ----- Invalid variable type for $p_filelist
+	else {
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+	  return 0;
+	}
 
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
+	// ----- Reformat the string list
+	if (sizeof($v_string_list) != 0) {
+	  foreach ($v_string_list as $v_string) {
+		if ($v_string != '') {
+		  $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+		}
+		else {
+		}
+	  }
+	}
 
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+	// ----- For each file in the list check the attributes
+	$v_supported_attributes
+	= array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+			 ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_MTIME => 'optional'
+			 ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+			 ,PCLZIP_ATT_FILE_COMMENT => 'optional'
 						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
+	foreach ($v_att_list as $v_entry) {
+	  $v_result = $this->privFileDescrParseAtt($v_entry,
+											   $v_filedescr_list[],
+											   $v_options,
+											   $v_supported_attributes);
+	  if ($v_result != 1) {
+		return 0;
+	  }
+	}
 
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Expand the filelist (expand directories)
+	$v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Call the create fct
+	$v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Return
-    return $p_result_list;
+	// ----- Return
+	return $p_result_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -457,149 +457,149 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+	$v_result=1;
+
+	// ----- Reset the error handler
+	$this->privErrorReset();
+
+	// ----- Set default values
+	$v_options = array();
+	$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove form the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_ADD => 'optional',
+												   PCLZIP_CB_POST_ADD => 'optional',
+												   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+												   PCLZIP_OPT_COMMENT => 'optional',
+												   PCLZIP_OPT_ADD_COMMENT => 'optional',
+												   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   //, PCLZIP_OPT_CRYPT => 'optional'
 												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
+		if ($v_result != 1) {
+		  return 0;
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
+	// ----- Init
+	$v_string_list = array();
+	$v_att_list = array();
+	$v_filedescr_list = array();
+	$p_result_list = array();
 
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
+	// ----- Look if the $p_filelist is really an array
+	if (is_array($p_filelist)) {
 
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
+	  // ----- Look if the first element is also an array
+	  //       This will mean that this is a file description entry
+	  if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+		$v_att_list = $p_filelist;
+	  }
 
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
+	  // ----- The list is a list of string names
+	  else {
+		$v_string_list = $p_filelist;
+	  }
+	}
 
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
+	// ----- Look if the $p_filelist is a string
+	else if (is_string($p_filelist)) {
+	  // ----- Create a list from the string
+	  $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+	}
 
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
+	// ----- Invalid variable type for $p_filelist
+	else {
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+	  return 0;
+	}
 
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
+	// ----- Reformat the string list
+	if (sizeof($v_string_list) != 0) {
+	  foreach ($v_string_list as $v_string) {
+		$v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+	  }
+	}
 
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+	// ----- For each file in the list check the attributes
+	$v_supported_attributes
+	= array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+			 ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_MTIME => 'optional'
+			 ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+			 ,PCLZIP_ATT_FILE_COMMENT => 'optional'
 						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
+	foreach ($v_att_list as $v_entry) {
+	  $v_result = $this->privFileDescrParseAtt($v_entry,
+											   $v_filedescr_list[],
+											   $v_options,
+											   $v_supported_attributes);
+	  if ($v_result != 1) {
+		return 0;
+	  }
+	}
 
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Expand the filelist (expand directories)
+	$v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Call the create fct
+	$v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Return
-    return $p_result_list;
+	// ----- Return
+	return $p_result_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -646,26 +646,26 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
+	// ----- Call the extracting fct
+	$p_list = array();
+	if (($v_result = $this->privList($p_list)) != 1)
+	{
+	  unset($p_list);
+	  return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -703,120 +703,120 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
+	// ----- Set default values
+	$v_options = array();
 //    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
+	$v_path = '';
+	$v_remove_path = "";
+	$v_remove_all_path = false;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Default values for option
+	$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+	// ----- Look for arguments
+	if ($v_size > 0) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_EXTRACT => 'optional',
+												   PCLZIP_CB_POST_EXTRACT => 'optional',
+												   PCLZIP_OPT_SET_CHMOD => 'optional',
+												   PCLZIP_OPT_BY_NAME => 'optional',
+												   PCLZIP_OPT_BY_EREG => 'optional',
+												   PCLZIP_OPT_BY_PREG => 'optional',
+												   PCLZIP_OPT_BY_INDEX => 'optional',
+												   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+												   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+												   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+												   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+												   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+													));
+		if ($v_result != 1) {
+		  return 0;
+		}
+
+		// ----- Set the arguments
+		if (isset($v_options[PCLZIP_OPT_PATH])) {
+		  $v_path = $v_options[PCLZIP_OPT_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+		  $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+		  $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+		  // ----- Check for '/' in last path char
+		  if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+			$v_path .= '/';
+		  }
+		  $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_remove_path = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Trace
+	// ----- Trace
 
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
+	// ----- Call the extracting fct
+	$p_list = array();
+	$v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
+										 $v_remove_all_path, $v_options);
+	if ($v_result < 1) {
+	  unset($p_list);
+	  return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -860,132 +860,132 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
+	// ----- Set default values
+	$v_options = array();
 //    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+	$v_path = '';
+	$v_remove_path = "";
+	$v_remove_all_path = false;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Default values for option
+	$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove form the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_EXTRACT => 'optional',
+												   PCLZIP_CB_POST_EXTRACT => 'optional',
+												   PCLZIP_OPT_SET_CHMOD => 'optional',
+												   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+												   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+												   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
 												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
+		if ($v_result != 1) {
+		  return 0;
+		}
+
+		// ----- Set the arguments
+		if (isset($v_options[PCLZIP_OPT_PATH])) {
+		  $v_path = $v_options[PCLZIP_OPT_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+		  $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+		  $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+		  // ----- Check for '/' in last path char
+		  if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+			$v_path .= '/';
+		  }
+		  $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+		}
+		if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+		  $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+		}
+		else {
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_remove_path = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+	// ----- Trace
+
+	// ----- Trick
+	// Here I want to reuse extractByRule(), so I need to parse the $p_index
+	// with privParseOptions()
+	$v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+	$v_options_trick = array();
+	$v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
+										array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+	if ($v_result != 1) {
+		return 0;
+	}
+	$v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
+	// ----- Call the extracting fct
+	if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+		return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1009,54 +1009,54 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
+	// ----- Set default values
+	$v_options = array();
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 0) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Parse the options
+	  $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+										array (PCLZIP_OPT_BY_NAME => 'optional',
+											   PCLZIP_OPT_BY_EREG => 'optional',
+											   PCLZIP_OPT_BY_PREG => 'optional',
+											   PCLZIP_OPT_BY_INDEX => 'optional' ));
+	  if ($v_result != 1) {
+		  return 0;
+	  }
+	}
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
+	// ----- Call the delete fct
+	$v_list = array();
+	if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+	  $this->privSwapBackMagicQuotes();
+	  unset($v_list);
+	  return(0);
+	}
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_list;
+	// ----- Return
+	return $v_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1069,10 +1069,10 @@ 
   function deleteByIndex($p_index)
   {
 
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+	$p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1093,61 +1093,61 @@ 
   function properties()
   {
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  $this->privSwapBackMagicQuotes();
+	  return(0);
+	}
 
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        return 0;
-      }
+	// ----- Default properties
+	$v_prop = array();
+	$v_prop['comment'] = '';
+	$v_prop['nb'] = 0;
+	$v_prop['status'] = 'not_exist';
+
+	// ----- Look if file exists
+	if (@is_file($this->zipname))
+	{
+	  // ----- Open the zip file
+	  if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+	  {
+		$this->privSwapBackMagicQuotes();
+
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+		// ----- Return
+		return 0;
+	  }
 
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
+	  // ----- Read the central directory informations
+	  $v_central_dir = array();
+	  if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	  {
+		$this->privSwapBackMagicQuotes();
+		return 0;
+	  }
 
-      // ----- Close the zip file
-      $this->privCloseFd();
+	  // ----- Close the zip file
+	  $this->privCloseFd();
 
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
+	  // ----- Set the user attributes
+	  $v_prop['comment'] = $v_central_dir['comment'];
+	  $v_prop['nb'] = $v_central_dir['entries'];
+	  $v_prop['status'] = 'ok';
+	}
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_prop;
+	// ----- Return
+	return $v_prop;
   }
   // --------------------------------------------------------------------------------
 
@@ -1165,46 +1165,46 @@ 
   // --------------------------------------------------------------------------------
   function duplicate($p_archive)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
+	// ----- Look if the $p_archive is a PclZip object
+	if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+	{
 
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
+	  // ----- Duplicate the archive
+	  $v_result = $this->privDuplicate($p_archive->zipname);
+	}
 
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
+	// ----- Look if the $p_archive is a string (so a filename)
+	else if (is_string($p_archive))
+	{
 
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
+	  // ----- Check that $p_archive is a valid zip file
+	  // TBC : Should also check the archive format
+	  if (!is_file($p_archive)) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+		$v_result = PCLZIP_ERR_MISSING_FILE;
+	  }
+	  else {
+		// ----- Duplicate the archive
+		$v_result = $this->privDuplicate($p_archive);
+	  }
+	}
 
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
+	// ----- Invalid variable
+	else
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+	  $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1224,45 +1224,45 @@ 
   // --------------------------------------------------------------------------------
   function merge($p_archive_to_add)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
+	// ----- Look if the $p_archive_to_add is a PclZip object
+	if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
+	{
 
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
+	  // ----- Merge the archive
+	  $v_result = $this->privMerge($p_archive_to_add);
+	}
 
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
+	// ----- Look if the $p_archive_to_add is a string (so a filename)
+	else if (is_string($p_archive_to_add))
+	{
 
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
+	  // ----- Create a temporary archive
+	  $v_object_archive = new PclZip($p_archive_to_add);
 
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
+	  // ----- Merge the archive
+	  $v_result = $this->privMerge($v_object_archive);
+	}
 
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
+	// ----- Invalid variable
+	else
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+	  $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1275,12 +1275,12 @@ 
   // --------------------------------------------------------------------------------
   function errorCode()
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  return(PclErrorCode());
+	}
+	else {
+	  return($this->error_code);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1291,42 +1291,42 @@ 
   // --------------------------------------------------------------------------------
   function errorName($p_with_code=false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
+	$v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+					  PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+					  PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+					  PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+					  PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+					  PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+					  PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+					  PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+					  PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+					  PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+					  PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+					  PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+					  PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+					  PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+					  PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+					  PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+					  PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+					  PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+					  PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
+					  ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
+					  ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+					);
+
+	if (isset($v_name[$this->error_code])) {
+	  $v_value = $v_name[$this->error_code];
+	}
+	else {
+	  $v_value = 'NoName';
+	}
 
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
+	if ($p_with_code) {
+	  return($v_value.' ('.$this->error_code.')');
+	}
+	else {
+	  return($v_value);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1337,17 +1337,17 @@ 
   // --------------------------------------------------------------------------------
   function errorInfo($p_full=false)
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  return(PclErrorString());
+	}
+	else {
+	  if ($p_full) {
+		return($this->errorName(true)." : ".$this->error_string);
+	  }
+	  else {
+		return($this->error_string." [code ".$this->error_code."]");
+	  }
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1376,39 +1376,39 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFormat($p_level=0)
   {
-    $v_result = true;
+	$v_result = true;
 
 	// ----- Reset the file system cache
-    clearstatcache();
+	clearstatcache();
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
+	// ----- Look if the file exits
+	if (!is_file($this->zipname)) {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+	  return(false);
+	}
 
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
+	// ----- Check that the file is readeable
+	if (!is_readable($this->zipname)) {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+	  return(false);
+	}
 
-    // ----- Check the magic code
-    // TBC
+	// ----- Check the magic code
+	// TBC
 
-    // ----- Check the central header
-    // TBC
+	// ----- Check the central header
+	// TBC
 
-    // ----- Check each file header
-    // TBC
+	// ----- Check each file header
+	// TBC
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1429,395 +1429,395 @@ 
   // --------------------------------------------------------------------------------
   function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+	// ----- Read the options
+	$i=0;
+	while ($i<$p_size) {
 
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+	  // ----- Check if the option is supported
+	  if (!isset($v_requested_options[$p_options_list[$i]])) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+	  // ----- Look for next option
+	  switch ($p_options_list[$i]) {
+		// ----- Look for options that request a path value
+		case PCLZIP_OPT_PATH :
+		case PCLZIP_OPT_REMOVE_PATH :
+		case PCLZIP_OPT_ADD_PATH :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
+		  // ----- Get the value
+		  $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+		  $i++;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
+		  // ----- Check the value
+		  $v_value = $p_options_list[$i+1];
+		  if ((!is_integer($v_value)) || ($v_value<0)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
+		  // ----- Get the value (and convert it in bytes)
+		  $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+		  $i++;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_ON :
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+			return PclZip::errorCode();
+		  }
 
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_OFF :
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+			return PclZip::errorCode();
+		  }
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+			return PclZip::errorCode();
+		  }
 
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
 
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
+		  // ----- Get the value
+		  if (   is_string($p_options_list[$i+1])
+			  && ($p_options_list[$i+1] != '')) {
+			$v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+			$i++;
+		  }
+		  else {
+		  }
+		break;
 
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		// ----- Look for options that request an array of string for value
+		case PCLZIP_OPT_BY_NAME :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+		  }
+		  else if (is_array($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that request an EREG or PREG expression
+		case PCLZIP_OPT_BY_EREG :
+		  // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+		  // to PCLZIP_OPT_BY_PREG
+		  $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+		case PCLZIP_OPT_BY_PREG :
+		//case PCLZIP_OPT_CRYPT :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that takes a string
+		case PCLZIP_OPT_COMMENT :
+		case PCLZIP_OPT_ADD_COMMENT :
+		case PCLZIP_OPT_PREPEND_COMMENT :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
+								 "Missing parameter value for option '"
 								 .PclZipUtilOptionText($p_options_list[$i])
 								 ."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
+								 "Wrong parameter value for option '"
 								 .PclZipUtilOptionText($p_options_list[$i])
 								 ."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that request an array of index
+		case PCLZIP_OPT_BY_INDEX :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+		  // ----- Get the value
+		  $v_work_list = array();
+		  if (is_string($p_options_list[$i+1])) {
 
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+			  // ----- Remove spaces
+			  $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
 
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			  // ----- Parse items
+			  $v_work_list = explode(",", $p_options_list[$i+1]);
+		  }
+		  else if (is_integer($p_options_list[$i+1])) {
+			  $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+		  }
+		  else if (is_array($p_options_list[$i+1])) {
+			  $v_work_list = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
+		  // ----- Reduce the index list
+		  // each index item in the list must be a couple with a start and
+		  // an end value : [0,3], [5-5], [8-10], ...
+		  // ----- Check the format of each item
+		  $v_sort_flag=false;
+		  $v_sort_value=0;
+		  for ($j=0; $j<sizeof($v_work_list); $j++) {
+			  // ----- Explode the item
+			  $v_item_list = explode("-", $v_work_list[$j]);
+			  $v_size_item_list = sizeof($v_item_list);
+
+			  // ----- TBC : Here we might check that each item is a
+			  // real integer ...
+
+			  // ----- Look for single value
+			  if ($v_size_item_list == 1) {
+				  // ----- Set the option value
+				  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+				  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
+			  }
+			  elseif ($v_size_item_list == 2) {
+				  // ----- Set the option value
+				  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+				  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
+			  }
+			  else {
+				  // ----- Error log
+				  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+				  // ----- Return
+				  return PclZip::errorCode();
+			  }
+
+
+			  // ----- Look for list sort
+			  if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+				  $v_sort_flag=true;
+
+				  // ----- TBC : An automatic sort should be writen ...
+				  // ----- Error log
+				  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+				  // ----- Return
+				  return PclZip::errorCode();
+			  }
+			  $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+		  }
 
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
+		  // ----- Sort the items
+		  if ($v_sort_flag) {
+			  // TBC : To Be Completed
+		  }
 
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+		  // ----- Next option
+		  $i++;
+		break;
+
+		// ----- Look for options that request no value
+		case PCLZIP_OPT_REMOVE_ALL_PATH :
+		case PCLZIP_OPT_EXTRACT_AS_STRING :
+		case PCLZIP_OPT_NO_COMPRESSION :
+		case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
+		case PCLZIP_OPT_REPLACE_NEWER :
+		case PCLZIP_OPT_STOP_ON_ERROR :
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
+
+		// ----- Look for options that request an octal value
+		case PCLZIP_OPT_SET_CHMOD :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
+		  // ----- Get the value
+		  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  $i++;
+		break;
+
+		// ----- Look for options that request a call-back
+		case PCLZIP_CB_PRE_EXTRACT :
+		case PCLZIP_CB_POST_EXTRACT :
+		case PCLZIP_CB_PRE_ADD :
+		case PCLZIP_CB_POST_ADD :
+		/* for futur use
         case PCLZIP_CB_PRE_DELETE :
         case PCLZIP_CB_POST_DELETE :
         case PCLZIP_CB_PRE_LIST :
         case PCLZIP_CB_POST_LIST :
         */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+		  // ----- Get the value
+		  $v_function_name = $p_options_list[$i+1];
 
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Check that the value is a valid existing function
+		  if (!function_exists($v_function_name)) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
+		  // ----- Set the attribute
+		  $v_result_list[$p_options_list[$i]] = $v_function_name;
+		  $i++;
+		break;
 
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
+		default :
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+							   "Unknown parameter '"
 							   .$p_options_list[$i]."'");
 
-          // ----- Return
-          return PclZip::errorCode();
-      }
+		  // ----- Return
+		  return PclZip::errorCode();
+	  }
 
-      // ----- Next options
-      $i++;
-    }
+	  // ----- Next options
+	  $i++;
+	}
 
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
+	// ----- Look for mandatory options
+	if ($v_requested_options !== false) {
+	  for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+		// ----- Look for mandatory option
+		if ($v_requested_options[$key] == 'mandatory') {
+		  // ----- Look if present
+		  if (!isset($v_result_list[$key])) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		}
+	  }
+	}
 
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+	// ----- Look for default values
+	if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
 
-    }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1829,37 +1829,37 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
+	if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+		|| isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+	  return $v_result;
+	}
 
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
+	// ----- Get 'memory_limit' configuration value
+	$v_memory_limit = ini_get('memory_limit');
+	$v_memory_limit = trim($v_memory_limit);
+	$last = strtolower(substr($v_memory_limit, -1));
 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+	if($last == 'g')
+		//$v_memory_limit = $v_memory_limit*1024*1024*1024;
+		$v_memory_limit = $v_memory_limit*1073741824;
+	if($last == 'm')
+		//$v_memory_limit = $v_memory_limit*1024*1024;
+		$v_memory_limit = $v_memory_limit*1048576;
+	if($last == 'k')
+		$v_memory_limit = $v_memory_limit*1024;
 
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+	$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
 
 
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
+	// ----- Sanity check : No threshold if value lower than 1M
+	if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+	  unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1873,116 +1873,116 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
+	// ----- For each file in the list check the attributes
+	foreach ($p_file_list as $v_key => $v_value) {
 
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+	  // ----- Check if the option is supported
+	  if (!isset($v_requested_options[$v_key])) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+	  // ----- Look for attribute
+	  switch ($v_key) {
+		case PCLZIP_ATT_FILE_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		  if ($p_filedescr['filename'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-        break;
+		break;
 
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
+		  if ($p_filedescr['new_short_name'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
+		break;
 
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_NEW_FULL_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
+		  if ($p_filedescr['new_full_name'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
+		break;
 
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		// ----- Look for options that takes a string
+		case PCLZIP_ATT_FILE_COMMENT :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['comment'] = $v_value;
-        break;
+		  $p_filedescr['comment'] = $v_value;
+		break;
 
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_MTIME :
+		  if (!is_integer($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['mtime'] = $v_value;
-        break;
+		  $p_filedescr['mtime'] = $v_value;
+		break;
 
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
+		case PCLZIP_ATT_FILE_CONTENT :
+		  $p_filedescr['content'] = $v_value;
+		break;
 
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
+		default :
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+								   "Unknown parameter '".$v_key."'");
 
-          // ----- Return
-          return PclZip::errorCode();
-      }
+		  // ----- Return
+		  return PclZip::errorCode();
+	  }
 
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
+	  // ----- Look for mandatory options
+	  if ($v_requested_options !== false) {
+		for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+		  // ----- Look for mandatory option
+		  if ($v_requested_options[$key] == 'mandatory') {
+			// ----- Look if present
+			if (!isset($p_file_list[$key])) {
+			  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+			  return PclZip::errorCode();
+			}
+		  }
+		}
+	  }
 
-    // end foreach
-    }
+	// end foreach
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2002,120 +2002,120 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Create a result list
-    $v_result_list = array();
-
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
+	$v_result=1;
+
+	// ----- Create a result list
+	$v_result_list = array();
+
+	// ----- Look each entry
+	for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+
+	  // ----- Get filedescr
+	  $v_descr = $p_filedescr_list[$i];
+
+	  // ----- Reduce the filename
+	  $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+	  $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+	  // ----- Look for real file or folder
+	  if (file_exists($v_descr['filename'])) {
+		if (@is_file($v_descr['filename'])) {
+		  $v_descr['type'] = 'file';
+		}
+		else if (@is_dir($v_descr['filename'])) {
+		  $v_descr['type'] = 'folder';
+		}
+		else if (@is_link($v_descr['filename'])) {
+		  // skip
+		  continue;
+		}
+		else {
+		  // skip
+		  continue;
+		}
+	  }
 
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
+	  // ----- Look for string added as file
+	  else if (isset($v_descr['content'])) {
+		$v_descr['type'] = 'virtual_file';
+	  }
 
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+	  // ----- Missing file
+	  else {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-
-            $v_dirlist_nb++;
-          }
+	  // ----- Calculate the stored filename
+	  $this->privCalculateStoredFilename($v_descr, $p_options);
+
+	  // ----- Add the descriptor in result list
+	  $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+	  // ----- Look for folder
+	  if ($v_descr['type'] == 'folder') {
+		// ----- List of items in folder
+		$v_dirlist_descr = array();
+		$v_dirlist_nb = 0;
+		if ($v_folder_handler = @opendir($v_descr['filename'])) {
+		  while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+			// ----- Skip '.' and '..'
+			if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+				continue;
+			}
+
+			// ----- Compose the full filename
+			$v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+
+			// ----- Look for different stored filename
+			// Because the name of the folder was changed, the name of the
+			// files/sub-folders also change
+			if (($v_descr['stored_filename'] != $v_descr['filename'])
+				 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+			  if ($v_descr['stored_filename'] != '') {
+				$v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+			  }
+			  else {
+				$v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+			  }
+			}
+
+			$v_dirlist_nb++;
+		  }
 
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
+		  @closedir($v_folder_handler);
+		}
+		else {
+		  // TBC : unable to open folder in read mode
+		}
+
+		// ----- Expand each element of the list
+		if ($v_dirlist_nb != 0) {
+		  // ----- Expand
+		  if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+			return $v_result;
+		  }
 
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
+		  // ----- Concat the resulting list
+		  $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+		}
+		else {
+		}
 
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
+		// ----- Free local array
+		unset($v_dirlist_descr);
+	  }
+	}
 
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
+	// ----- Get the result list
+	$p_filedescr_list = $v_result_list;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2127,30 +2127,30 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
+	$v_result=1;
+	$v_list_detail = array();
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the file in write mode
+	if (($v_result = $this->privOpenFd('wb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+	// ----- Add the list of files
+	$v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2162,175 +2162,175 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
+	$v_result=1;
+	$v_list_detail = array();
 
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
+	// ----- Look if the archive exists or is empty
+	if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+	{
 
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+	  // ----- Do a create
+	  $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
 
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	  // ----- Return
+	  return $v_result;
+	}
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Magic quotes trick
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+	// ----- Creates a temporay file
+	$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+	{
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = $v_central_dir['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Swap the file descriptor
+	// Here is a trick : I swap the temporary fd with the zip fd, in order to use
+	// the following methods on the temporary fil and not the real archive
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
+
+	// ----- Add the files
+	$v_header_list = array();
+	if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+	{
+	  fclose($v_zip_temp_fd);
+	  $this->privCloseFd();
+	  @unlink($v_zip_temp_name);
+	  $this->privSwapBackMagicQuotes();
+
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($this->zip_fd);
+
+	// ----- Copy the block of file headers from the old archive
+	$v_size = $v_central_dir['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
+	// ----- Create the Central Dir files header
+	for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+	{
+	  // ----- Create the file header
+	  if ($v_header_list[$i]['status'] == 'ok') {
+		if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+		  fclose($v_zip_temp_fd);
+		  $this->privCloseFd();
+		  @unlink($v_zip_temp_name);
+		  $this->privSwapBackMagicQuotes();
+
+		  // ----- Return
+		  return $v_result;
+		}
+		$v_count++;
+	  }
 
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
+	  // ----- Transform the header to a 'usable' info
+	  $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+	}
 
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
+	// ----- Zip file comment
+	$v_comment = $v_central_dir['comment'];
+	if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+	}
+	if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+	  $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+	}
+	if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+	}
 
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+	// ----- Calculate the size of the central header
+	$v_size = @ftell($this->zip_fd)-$v_offset;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  // ----- Reset the file list
+	  unset($v_header_list);
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap back the file descriptor
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
+	// ----- Delete the zip file
+	// TBC : I should test the result ...
+	@unlink($this->zipname);
 
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+	// ----- Rename the temporary file
+	// TBC : I should test the result ...
+	//@rename($v_zip_temp_name, $this->zipname);
+	PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2341,30 +2341,30 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+	// ----- Look if already open
+	if ($this->zip_fd != 0)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+	// ----- Open the zip file
+	if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2375,14 +2375,14 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+	$v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
+	if ($this->zip_fd != 0)
+	  @fclose($this->zip_fd);
+	$this->zip_fd = 0;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2402,56 +2402,56 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+
+	// ----- Add the files
+	$v_header_list = array();
+	if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($this->zip_fd);
+
+	// ----- Create the Central Dir files header
+	for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+	{
+	  // ----- Create the file header
+	  if ($v_header_list[$i]['status'] == 'ok') {
+		if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+		  // ----- Return
+		  return $v_result;
+		}
+		$v_count++;
+	  }
 
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
+	  // ----- Transform the header to a 'usable' info
+	  $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+	}
 
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
+	// ----- Zip file comment
+	$v_comment = '';
+	if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+	}
 
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+	// ----- Calculate the size of the central header
+	$v_size = @ftell($this->zip_fd)-$v_offset;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  // ----- Reset the file list
+	  unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2466,57 +2466,57 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_header = array();
+	$v_result=1;
+	$v_header = array();
 
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
+	// ----- Recuperate the current number of elt in list
+	$v_nb = sizeof($p_result_list);
 
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+	// ----- Loop on the files
+	for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+	  // ----- Format the filename
+	  $p_filedescr_list[$j]['filename']
+	  = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
 
 
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
+	  // ----- Skip empty file names
+	  // TBC : Can this be possible ? not checked in DescrParseAtt ?
+	  if ($p_filedescr_list[$j]['filename'] == "") {
+		continue;
+	  }
 
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
+	  // ----- Check the filename
+	  if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+		  && (!file_exists($p_filedescr_list[$j]['filename']))) {
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
+	  // ----- Look if it is a file or a dir with no all path remove option
+	  // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
+	  if (   ($p_filedescr_list[$j]['type'] == 'file')
+		  || ($p_filedescr_list[$j]['type'] == 'virtual_file')
+		  || (   ($p_filedescr_list[$j]['type'] == 'folder')
+			  && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+				  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
+		  ) {
+
+		// ----- Add the file
+		$v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
+									   $p_options);
+		if ($v_result != 1) {
+		  return $v_result;
+		}
+
+		// ----- Store the file infos
+		$p_result_list[$v_nb++] = $v_header;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2528,22 +2528,22 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
+	// ----- Working variable
+	$p_filename = $p_filedescr['filename'];
 
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+	// TBC : Already done in the fileAtt check ... ?
+	if ($p_filename == "") {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Look for a stored different filename
-    /* TBC : Removed
+	// ----- Look for a stored different filename
+	/* TBC : Removed
     if (isset($p_filedescr['stored_filename'])) {
       $v_stored_filename = $p_filedescr['stored_filename'];
     }
@@ -2552,242 +2552,242 @@ 
     }
     */
 
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
+	// ----- Set the file properties
+	clearstatcache();
+	$p_header['version'] = 20;
+	$p_header['version_extracted'] = 10;
+	$p_header['flag'] = 0;
+	$p_header['compression'] = 0;
+	$p_header['crc'] = 0;
+	$p_header['compressed_size'] = 0;
+	$p_header['filename_len'] = strlen($p_filename);
+	$p_header['extra_len'] = 0;
+	$p_header['disk'] = 0;
+	$p_header['internal'] = 0;
+	$p_header['offset'] = 0;
+	$p_header['filename'] = $p_filename;
 // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
+	$p_header['stored_filename'] = $p_filedescr['stored_filename'];
+	$p_header['extra'] = '';
+	$p_header['status'] = 'ok';
+	$p_header['index'] = -1;
+
+	// ----- Look for regular file
+	if ($p_filedescr['type']=='file') {
+	  $p_header['external'] = 0x00000000;
+	  $p_header['size'] = filesize($p_filename);
+	}
 
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
+	// ----- Look for regular folder
+	else if ($p_filedescr['type']=='folder') {
+	  $p_header['external'] = 0x00000010;
+	  $p_header['mtime'] = filemtime($p_filename);
+	  $p_header['size'] = filesize($p_filename);
+	}
 
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
+	// ----- Look for virtual file
+	else if ($p_filedescr['type'] == 'virtual_file') {
+	  $p_header['external'] = 0x00000000;
+	  $p_header['size'] = strlen($p_filedescr['content']);
+	}
 
 
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
+	// ----- Look for filetime
+	if (isset($p_filedescr['mtime'])) {
+	  $p_header['mtime'] = $p_filedescr['mtime'];
+	}
+	else if ($p_filedescr['type'] == 'virtual_file') {
+	  $p_header['mtime'] = time();
+	}
+	else {
+	  $p_header['mtime'] = filemtime($p_filename);
+	}
 
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
+	// ------ Look for file comment
+	if (isset($p_filedescr['comment'])) {
+	  $p_header['comment_len'] = strlen($p_filedescr['comment']);
+	  $p_header['comment'] = $p_filedescr['comment'];
+	}
+	else {
+	  $p_header['comment_len'] = 0;
+	  $p_header['comment'] = '';
+	}
 
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
+	// ----- Look for pre-add callback
+	if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_header['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+		$p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+	  }
+	}
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
+	// ----- Look for empty stored filename
+	if ($p_header['stored_filename'] == "") {
+	  $p_header['status'] = "filtered";
+	}
 
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+	// ----- Check the path length
+	if (strlen($p_header['stored_filename']) > 0xFF) {
+	  $p_header['status'] = 'filename_too_long';
+	}
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
+	// ----- Look if no error, or file not skipped
+	if ($p_header['status'] == 'ok') {
+
+	  // ----- Look for a file
+	  if ($p_filedescr['type'] == 'file') {
+		// ----- Look for using temporary file to zip
+		if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+			&& (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+				|| (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+					&& ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+		  $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+		  if ($v_result < PCLZIP_ERR_NO_ERROR) {
+			return $v_result;
+		  }
+		}
 
-        // ----- Use "in memory" zip algo
-        else {
+		// ----- Use "in memory" zip algo
+		else {
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
-        }
+		// ----- Open the source file
+		if (($v_file = @fopen($p_filename, "rb")) == 0) {
+		  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+		  return PclZip::errorCode();
+		}
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
+		// ----- Read the file content
+		$v_content = @fread($v_file, $p_header['size']);
 
-        // ----- Close the file
-        @fclose($v_file);
+		// ----- Close the file
+		@fclose($v_file);
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
+		// ----- Calculate the CRC
+		$p_header['crc'] = @crc32($v_content);
 
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
+		// ----- Look for no compression
+		if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = $p_header['size'];
+		  $p_header['compression'] = 0;
+		}
 
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
+		// ----- Look for normal compression
+		else {
+		  // ----- Compress the content
+		  $v_content = @gzdeflate($v_content);
 
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = strlen($v_content);
+		  $p_header['compression'] = 8;
+		}
 
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+		  @fclose($v_file);
+		  return $v_result;
+		}
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+		// ----- Write the compressed (or not) content
+		@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
 
-        }
+		}
 
-      }
+	  }
 
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
+	  // ----- Look for a virtual file (a file from string)
+	  else if ($p_filedescr['type'] == 'virtual_file') {
 
-        $v_content = $p_filedescr['content'];
+		$v_content = $p_filedescr['content'];
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
+		// ----- Calculate the CRC
+		$p_header['crc'] = @crc32($v_content);
 
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
+		// ----- Look for no compression
+		if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = $p_header['size'];
+		  $p_header['compression'] = 0;
+		}
 
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
+		// ----- Look for normal compression
+		else {
+		  // ----- Compress the content
+		  $v_content = @gzdeflate($v_content);
 
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = strlen($v_content);
+		  $p_header['compression'] = 8;
+		}
 
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+		  @fclose($v_file);
+		  return $v_result;
+		}
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
+		// ----- Write the compressed (or not) content
+		@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+	  }
 
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
+	  // ----- Look for a directory
+	  else if ($p_filedescr['type'] == 'folder') {
+		// ----- Look for directory last '/'
+		if (@substr($p_header['stored_filename'], -1) != '/') {
+		  $p_header['stored_filename'] .= '/';
+		}
+
+		// ----- Set the file properties
+		$p_header['size'] = 0;
+		//$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+		$p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
+		{
+		  return $v_result;
+		}
+	  }
+	}
 
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+	// ----- Look for post-add callback
+	if (isset($p_options[PCLZIP_CB_POST_ADD])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_header, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Ignored
+		$v_result = 1;
+	  }
 
-      // ----- Update the informations
-      // Nothing can be modified
-    }
+	  // ----- Update the informations
+	  // Nothing can be modified
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2799,105 +2799,105 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+	$v_result=PCLZIP_ERR_NO_ERROR;
 
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
+	// ----- Working variable
+	$p_filename = $p_filedescr['filename'];
 
 
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
+	// ----- Open the source file
+	if (($v_file = @fopen($p_filename, "rb")) == 0) {
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+	  return PclZip::errorCode();
+	}
 
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
+	// ----- Creates a compressed temporary file
+	$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+	if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+	  fclose($v_file);
+	  PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = filesize($p_filename);
+	while ($v_size != 0) {
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_file, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file);
+	@gzclose($v_file_compressed);
 
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
+	// ----- Check the minimum file size
+	if (filesize($v_gzip_temp_name) < 18) {
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Extract the compressed attributes
+	if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+	// ----- Read the gzip file header
+	$v_binary_data = @fread($v_file_compressed, 10);
+	$v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
 
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
+	// ----- Check some parameters
+	$v_data_header['os'] = bin2hex($v_data_header['os']);
 
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+	// ----- Read the gzip file footer
+	@fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+	$v_binary_data = @fread($v_file_compressed, 8);
+	$v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+	// ----- Set the attributes
+	$p_header['compression'] = ord($v_data_header['cm']);
+	//$p_header['mtime'] = $v_data_header['mtime'];
+	$p_header['crc'] = $v_data_footer['crc'];
+	$p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
 
-    // ----- Close the file
-    @fclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file_compressed);
 
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
+	// ----- Call the header generation
+	if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+	  return $v_result;
+	}
 
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Add the compressed data
+	if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
+	{
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	fseek($v_file_compressed, 10);
+	$v_size = $p_header['compressed_size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_file_compressed, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close the file
-    @fclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file_compressed);
 
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
+	// ----- Unlink the temporary file
+	@unlink($v_gzip_temp_name);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2911,107 +2911,107 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
+	$v_result=1;
 
+	// ----- Working variables
+	$p_filename = $p_filedescr['filename'];
+	if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+	  $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+	}
+	else {
+	  $p_add_dir = '';
+	}
+	if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+	  $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+	}
+	else {
+	  $p_remove_dir = '';
+	}
+	if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+	  $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+	}
+	else {
+	  $p_remove_all_dir = 0;
+	}
 
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
 
-    // ----- Look for path and/or short name change
-    else {
+	// ----- Look for full name change
+	if (isset($p_filedescr['new_full_name'])) {
+	  // ----- Remove drive letter if any
+	  $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+	}
 
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
+	// ----- Look for path and/or short name change
+	else {
+
+	  // ----- Look for short name change
+	  // Its when we cahnge just the filename but not the path
+	  if (isset($p_filedescr['new_short_name'])) {
+		$v_path_info = pathinfo($p_filename);
+		$v_dir = '';
+		if ($v_path_info['dirname'] != '') {
+		  $v_dir = $v_path_info['dirname'].'/';
+		}
+		$v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+	  }
+	  else {
+		// ----- Calculate the stored filename
+		$v_stored_filename = $p_filename;
+	  }
 
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+	  // ----- Look for all path to remove
+	  if ($p_remove_all_dir) {
+		$v_stored_filename = basename($p_filename);
+	  }
+	  // ----- Look for partial path remove
+	  else if ($p_remove_dir != "") {
+		if (substr($p_remove_dir, -1) != '/')
+		  $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
+		if (   (substr($p_filename, 0, 2) == "./")
+			|| (substr($p_remove_dir, 0, 2) == "./")) {
 
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
+		  if (   (substr($p_filename, 0, 2) == "./")
+			  && (substr($p_remove_dir, 0, 2) != "./")) {
+			$p_remove_dir = "./".$p_remove_dir;
+		  }
+		  if (   (substr($p_filename, 0, 2) != "./")
+			  && (substr($p_remove_dir, 0, 2) == "./")) {
+			$p_remove_dir = substr($p_remove_dir, 2);
+		  }
+		}
 
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
+		$v_compare = PclZipUtilPathInclusion($p_remove_dir,
+											 $v_stored_filename);
+		if ($v_compare > 0) {
+		  if ($v_compare == 2) {
+			$v_stored_filename = "";
+		  }
+		  else {
+			$v_stored_filename = substr($v_stored_filename,
+										strlen($p_remove_dir));
+		  }
+		}
+	  }
 
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+	  // ----- Remove drive letter if any
+	  $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
 
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
+	  // ----- Look for path to add
+	  if ($p_add_dir != "") {
+		if (substr($p_add_dir, -1) == "/")
+		  $v_stored_filename = $p_add_dir.$v_stored_filename;
+		else
+		  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+	  }
+	}
 
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
+	// ----- Filename (reduce the path of stored name)
+	$v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
+	$p_filedescr['stored_filename'] = $v_stored_filename;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3023,40 +3023,40 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
+	// ----- Store the offset position of the file
+	$p_header['offset'] = ftell($this->zip_fd);
 
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+	// ----- Transform UNIX mtime to DOS format mdate/mtime
+	$v_date = getdate($p_header['mtime']);
+	$v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+	$v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
+						  $p_header['version_extracted'], $p_header['flag'],
+						  $p_header['compression'], $v_mtime, $v_mdate,
+						  $p_header['crc'], $p_header['compressed_size'],
 						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
+						  strlen($p_header['stored_filename']),
 						  $p_header['extra_len']);
 
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
+	// ----- Write the first 148 bytes of the header in the archive
+	fputs($this->zip_fd, $v_binary_data, 30);
 
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
+	// ----- Write the variable fields
+	if (strlen($p_header['stored_filename']) != 0)
+	{
+	  fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+	}
+	if ($p_header['extra_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3068,48 +3068,48 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
+	// TBC
+	//for(reset($p_header); $key = key($p_header); next($p_header)) {
+	//}
 
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+	// ----- Transform UNIX mtime to DOS format mdate/mtime
+	$v_date = getdate($p_header['mtime']);
+	$v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+	$v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
 
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
+						  $p_header['version'], $p_header['version_extracted'],
+						  $p_header['flag'], $p_header['compression'],
 						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
+						  $p_header['compressed_size'], $p_header['size'],
+						  strlen($p_header['stored_filename']),
 						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
+						  $p_header['disk'], $p_header['internal'],
 						  $p_header['external'], $p_header['offset']);
 
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
+	// ----- Write the 42 bytes of the header in the zip file
+	fputs($this->zip_fd, $v_binary_data, 46);
 
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
+	// ----- Write the variable fields
+	if (strlen($p_header['stored_filename']) != 0)
+	{
+	  fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+	}
+	if ($p_header['extra_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+	}
+	if ($p_header['comment_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3121,24 +3121,24 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
+						  $p_nb_entries, $p_size,
 						  $p_offset, strlen($p_comment));
 
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
+	// ----- Write the 22 bytes of the header in the zip file
+	fputs($this->zip_fd, $v_binary_data, 22);
 
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
+	// ----- Write the variable fields
+	if (strlen($p_comment) != 0)
+	{
+	  fputs($this->zip_fd, $p_comment, strlen($p_comment));
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3150,69 +3150,69 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the zip file
+	if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+	{
+	  // ----- Magic quotes trick
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
+	// ----- Go to beginning of Central Dir
+	@rewind($this->zip_fd);
+	if (@fseek($this->zip_fd, $v_central_dir['offset']))
+	{
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
+	// ----- Read each entry
+	for ($i=0; $i<$v_central_dir['entries']; $i++)
+	{
+	  // ----- Read the file header
+	  if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+	  {
+		$this->privSwapBackMagicQuotes();
+		return $v_result;
+	  }
+	  $v_header['index'] = $i;
 
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
+	  // ----- Get the only interesting attributes
+	  $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+	  unset($v_header);
+	}
 
-    // ----- Close the zip file
-    $this->privCloseFd();
+	// ----- Close the zip file
+	$this->privCloseFd();
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3237,24 +3237,24 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
+	$v_result=1;
+
+	// ----- Get the interesting attributes
+	$v_temp_path = PclZipUtilPathReduction($p_header['filename']);
+	$p_info['filename'] = $v_temp_path;
+	$v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
+	$p_info['stored_filename'] = $v_temp_path;
+	$p_info['size'] = $p_header['size'];
+	$p_info['compressed_size'] = $p_header['compressed_size'];
+	$p_info['mtime'] = $p_header['mtime'];
+	$p_info['comment'] = $p_header['comment'];
+	$p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+	$p_info['index'] = $p_header['index'];
+	$p_info['status'] = $p_header['status'];
+	$p_info['crc'] = $p_header['crc'];
+
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3276,122 +3276,122 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
+	// ----- Check the path
+	if (   ($p_path == "")
+		|| (   (substr($p_path, 0, 1) != "/")
+			&& (substr($p_path, 0, 3) != "../")
 			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
+	  $p_path = "./".$p_path;
+
+	// ----- Reduce the path last (and duplicated) '/'
+	if (($p_path != "./") && ($p_path != "/"))
+	{
+	  // ----- Look for the path end '/'
+	  while (substr($p_path, -1) == "/")
+	  {
+		$p_path = substr($p_path, 0, strlen($p_path)-1);
+	  }
+	}
 
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
+	// ----- Look for path to remove format (should end by /)
+	if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
+	{
+	  $p_remove_path .= '/';
+	}
+	$p_remove_path_size = strlen($p_remove_path);
 
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result = $this->privOpenFd('rb')) != 1)
+	{
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  // ----- Close the zip file
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
 
-      return $v_result;
-    }
+	  return $v_result;
+	}
 
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
+	// ----- Start at beginning of Central Dir
+	$v_pos_entry = $v_central_dir['offset'];
 
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
+	// ----- Read each entry
+	$j_start = 0;
+	for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+	{
 
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
+	  // ----- Read next Central dir entry
+	  @rewind($this->zip_fd);
+	  if (@fseek($this->zip_fd, $v_pos_entry))
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
+		$this->privSwapBackMagicQuotes();
 
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
+	  // ----- Read the file header
+	  $v_header = array();
+	  if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
+		$this->privSwapBackMagicQuotes();
 
-        return $v_result;
-      }
+		return $v_result;
+	  }
 
-      // ----- Store the index
-      $v_header['index'] = $i;
+	  // ----- Store the index
+	  $v_header['index'] = $i;
 
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
+	  // ----- Store the file position
+	  $v_pos_entry = ftell($this->zip_fd);
 
-      // ----- Look for the specific extract rules
-      $v_extract = false;
+	  // ----- Look for the specific extract rules
+	  $v_extract = false;
 
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+	  // ----- Look for extract by name rule
+	  if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+		  && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+		  // ----- Look if the filename is in the list
+		  for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+			  // ----- Look for a directory
+			  if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
+				  // ----- Look if the directory is in the filename path
+				  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+					  && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_extract = true;
+				  }
+			  }
+			  // ----- Look for a filename
+			  elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+				  $v_extract = true;
+			  }
+		  }
+	  }
 
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
+	  // ----- Look for extract by ereg rule
+	  // ereg() is deprecated with PHP 5.3
+	  /*
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
 
@@ -3401,207 +3401,207 @@ 
       }
       */
 
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+	  // ----- Look for extract by preg rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+			   && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+		  if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+			  $v_extract = true;
+		  }
+	  }
 
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+	  // ----- Look for extract by index rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+			   && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+		  // ----- Look if the index is in the list
+		  for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
+			  if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+				  $v_extract = true;
+			  }
+			  if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+				  $j_start = $j+1;
+			  }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
+			  if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+				  break;
+			  }
+		  }
+	  }
 
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
+	  // ----- Look for no rule, which means extract all the archive
+	  else {
+		  $v_extract = true;
+	  }
 
 	  // ----- Check compression method
 	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
+		  && (   ($v_header['compression'] != 8)
+			  && ($v_header['compression'] != 0))) {
+		  $v_header['status'] = 'unsupported_compression';
 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		  // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		  if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			  && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-              $this->privSwapBackMagicQuotes();
+			  $this->privSwapBackMagicQuotes();
 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
+			  PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
+								   "Filename '".$v_header['stored_filename']."' is "
+				  			  	   ."compressed by an unsupported compression "
+				  			  	   ."method (".$v_header['compression'].") ");
 
-              return PclZip::errorCode();
+			  return PclZip::errorCode();
 		  }
 	  }
 
 	  // ----- Check encrypted files
 	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
+		  $v_header['status'] = 'unsupported_encryption';
 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		  // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		  if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			  && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-              $this->privSwapBackMagicQuotes();
+			  $this->privSwapBackMagicQuotes();
 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
+			  PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
+								   "Unsupported encryption for "
+				  			  	   ." filename '".$v_header['stored_filename']
 								   ."'");
 
-              return PclZip::errorCode();
+			  return PclZip::errorCode();
 		  }
-    }
+	}
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
+	  // ----- Look for real extraction
+	  if (($v_extract) && ($v_header['status'] != 'ok')) {
+		  $v_result = $this->privConvertHeader2FileInfo($v_header,
+												$p_file_list[$v_nb_extracted++]);
+		  if ($v_result != 1) {
+			  $this->privCloseFd();
+			  $this->privSwapBackMagicQuotes();
+			  return $v_result;
+		  }
 
-          $v_extract = false;
-      }
+		  $v_extract = false;
+	  }
 
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
+	  // ----- Look for real extraction
+	  if ($v_extract)
+	  {
 
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
+		// ----- Go to the file position
+		@rewind($this->zip_fd);
+		if (@fseek($this->zip_fd, $v_header['offset']))
+		{
+		  // ----- Close the zip file
+		  $this->privCloseFd();
 
-          $this->privSwapBackMagicQuotes();
+		  $this->privSwapBackMagicQuotes();
 
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-          // ----- Return
-          return PclZip::errorCode();
-        }
+		  // ----- Return
+		  return PclZip::errorCode();
+		}
 
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+		// ----- Look for extraction as string
+		if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
 
-          $v_string = '';
+		  $v_string = '';
 
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  // ----- Extracting the file
+		  $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
+		  {
+			// ----- Close the zip file
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
 
-            return $v_result;
-          }
+			return $v_result;
+		  }
 
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+		  // ----- Set the file content
+		  $p_file_list[$v_nb_extracted]['content'] = $v_string;
 
-          // ----- Next extracted file
-          $v_nb_extracted++;
+		  // ----- Next extracted file
+		  $v_nb_extracted++;
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+		// ----- Look for extraction in standard output
+		elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+				&& ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+		  // ----- Extracting the file in standard output
+		  $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result;
+		  }
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+		// ----- Look for normal extraction
+		else {
+		  // ----- Extracting the file
+		  $v_result1 = $this->privExtractFile($v_header,
+											  $p_path, $p_remove_path,
 											  $p_remove_all_path,
 											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
+		  {
+			// ----- Close the zip file
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
 
-            return $v_result;
-          }
+			return $v_result;
+		  }
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+	  }
+	}
 
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
+	// ----- Close the zip file
+	$this->privCloseFd();
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3616,344 +3616,344 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Read the file header
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+	// ----- Look for all path to remove
+	if ($p_remove_all_path == true) {
+		// ----- Look for folder entry that not need to be extracted
+		if (($p_entry['external']&0x00000010)==0x00000010) {
 
-            $p_entry['status'] = "filtered";
+			$p_entry['status'] = "filtered";
 
-            return $v_result;
-        }
+			return $v_result;
+		}
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+		// ----- Get the basename of the path
+		$p_entry['filename'] = basename($p_entry['filename']);
+	}
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+	// ----- Look for path to remove
+	else if ($p_remove_path != "")
+	{
+	  if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+		// ----- Change the file status
+		$p_entry['status'] = "filtered";
 
-        // ----- Return
-        return $v_result;
-      }
+		// ----- Return
+		return $v_result;
+	  }
 
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
+	  $p_remove_path_size = strlen($p_remove_path);
+	  if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
+	  {
 
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+		// ----- Remove the path
+		$p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
 
-      }
-    }
+	  }
+	}
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
+	// ----- Add the path
+	if ($p_path != '') {
+	  $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+	}
 
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']);
-      if ($v_inclusion == 0) {
+	// ----- Check a base_dir_restriction
+	if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+	  $v_inclusion
+	  = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
+								$p_entry['filename']);
+	  if ($v_inclusion == 0) {
 
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
+		PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
+								 "Filename '".$p_entry['filename']."' is "
 								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
-        return PclZip::errorCode();
-      }
-    }
+		return PclZip::errorCode();
+	  }
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
+	// ----- Look for specific actions while the file exist
+	if (file_exists($p_entry['filename']))
+	{
 
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
+	  // ----- Look if file is a directory
+	  if (is_dir($p_entry['filename']))
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
+		// ----- Change the file status
+		$p_entry['status'] = "already_a_directory";
 
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		// For historical reason first PclZip implementation does not stop
+		// when this kind of error occurs.
+		if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
+			PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
+								 "Filename '".$p_entry['filename']."' is "
 								 ."already used by an existing directory");
 
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
+			return PclZip::errorCode();
+			}
+	  }
+	  // ----- Look if file is write protected
+	  else if (!is_writeable($p_entry['filename']))
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
+		// ----- Change the file status
+		$p_entry['status'] = "write_protected";
 
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		// For historical reason first PclZip implementation does not stop
+		// when this kind of error occurs.
+		if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
+			PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+								 "Filename '".$p_entry['filename']."' exists "
 								 ."and is write protected");
 
-            return PclZip::errorCode();
-		    }
-      }
+			return PclZip::errorCode();
+			}
+	  }
 
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+	  // ----- Look if the extracted file is older
+	  else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
+	  {
+		// ----- Change the file status
+		if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+			&& ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
 	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
+			else {
+			$p_entry['status'] = "newer_exist";
+
+			// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+			// For historical reason first PclZip implementation does not stop
+			// when this kind of error occurs.
+			if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+				&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+				PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+						 "Newer version of '".$p_entry['filename']."' exists "
+						."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+				return PclZip::errorCode();
+			  }
+			}
+	  }
+	  else {
+	  }
+	}
 
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
+	// ----- Check the directory availability and create it if necessary
+	else {
+	  if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+		$v_dir_to_check = $p_entry['filename'];
+	  else if (!strstr($p_entry['filename'], "/"))
+		$v_dir_to_check = "";
+	  else
+		$v_dir_to_check = dirname($p_entry['filename']);
+
+		if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+
+		  // ----- Change the file status
+		  $p_entry['status'] = "path_creation_fail";
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+		  // ----- Return
+		  //return $v_result;
+		  $v_result = 1;
+		}
+	  }
+	}
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010))
+	  {
+		// ----- Look for not compressed file
+		if ($p_entry['compression'] == 0) {
 
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
+			  // ----- Opening destination file
+		  if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
+		  {
 
-            // ----- Return
-            return $v_result;
-          }
+			// ----- Change the file status
+			$p_entry['status'] = "write_error";
+
+			// ----- Return
+			return $v_result;
+		  }
 
 
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
+		  // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+		  $v_size = $p_entry['compressed_size'];
+		  while ($v_size != 0)
+		  {
+			$v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+			$v_buffer = @fread($this->zip_fd, $v_read_size);
+			/* Try to speed up the code
             $v_binary_data = pack('a'.$v_read_size, $v_buffer);
             @fwrite($v_dest_file, $v_binary_data, $v_read_size);
             */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-          }
+			@fwrite($v_dest_file, $v_buffer, $v_read_size);
+			$v_size -= $v_read_size;
+		  }
 
-          // ----- Closing the destination file
-          fclose($v_dest_file);
+		  // ----- Closing the destination file
+		  fclose($v_dest_file);
 
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
+		  // ----- Change the file mtime
+		  touch($p_entry['filename'], $p_entry['mtime']);
 
 
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
+		}
+		else {
+		  // ----- TBC
+		  // Need to be finished
+		  if (($p_entry['flag'] & 1) == 1) {
+			PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+			return PclZip::errorCode();
+		  }
 
 
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
+		  // ----- Look for using temporary file to unzip
+		  if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+			  && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+				  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+					  && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+			$v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+			if ($v_result < PCLZIP_ERR_NO_ERROR) {
+			  return $v_result;
+			}
+		  }
 
-          // ----- Look for extract in memory
-          else {
+		  // ----- Look for extract in memory
+		  else {
 
 
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+			// ----- Read the compressed file in a buffer (one shot)
+			$v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
+			// ----- Decompress the file
+			$v_file_content = @gzinflate($v_buffer);
+			unset($v_buffer);
+			if ($v_file_content === FALSE) {
 
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
+			  // ----- Change the file status
+			  // TBC
+			  $p_entry['status'] = "error";
 
-              return $v_result;
-            }
+			  return $v_result;
+			}
 
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+			// ----- Opening destination file
+			if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
 
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
+			  // ----- Change the file status
+			  $p_entry['status'] = "write_error";
 
-              return $v_result;
-            }
+			  return $v_result;
+			}
 
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
+			// ----- Write the uncompressed data
+			@fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+			unset($v_file_content);
 
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
+			// ----- Closing the destination file
+			@fclose($v_dest_file);
 
-          }
+		  }
 
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
+		  // ----- Change the file mtime
+		  @touch($p_entry['filename'], $p_entry['mtime']);
+		}
 
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+		// ----- Look for chmod option
+		if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
 
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
+		  // ----- Change the mode of the file
+		  @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+		}
 
-      }
-    }
+	  }
+	}
 
   	// ----- Change abort status
   	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
+		$p_entry['status'] = "skipped";
   	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3965,71 +3965,71 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
+	$v_result=1;
+
+	// ----- Creates a temporary file
+	$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+	if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+	  fclose($v_file);
+	  PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+	  return PclZip::errorCode();
+	}
 
 
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
+	// ----- Write gz file format header
+	$v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+	@fwrite($v_dest_file, $v_binary_data, 10);
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = $p_entry['compressed_size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($this->zip_fd, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($v_dest_file, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
+	// ----- Write gz file format footer
+	$v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+	@fwrite($v_dest_file, $v_binary_data, 8);
 
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
+	// ----- Close the temporary file
+	@fclose($v_dest_file);
 
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
+	// ----- Opening destination file
+	if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+	  $p_entry['status'] = "write_error";
+	  return $v_result;
+	}
 
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Open the temporary gz file
+	if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+	  @fclose($v_dest_file);
+	  $p_entry['status'] = "read_error";
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = $p_entry['size'];
+	while ($v_size != 0) {
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @gzread($v_src_file, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($v_dest_file, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
+	@fclose($v_dest_file);
+	@gzclose($v_src_file);
 
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
+	// ----- Delete the temporary file
+	@unlink($v_gzip_temp_name);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4041,106 +4041,106 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
+	// ----- Read the file header
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
-    // ----- Trace
+	// ----- Trace
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+		// ----- Look for not compressed file
+		if ($p_entry['compressed_size'] == $p_entry['size']) {
 
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Read the file in a buffer (one shot)
+		  $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
+		  // ----- Send the file to the output
+		  echo $v_buffer;
+		  unset($v_buffer);
+		}
+		else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Read the compressed file in a buffer (one shot)
+		  $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
+		  // ----- Decompress the file
+		  $v_file_content = gzinflate($v_buffer);
+		  unset($v_buffer);
 
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-      }
-    }
+		  // ----- Send the file to the output
+		  echo $v_file_content;
+		  unset($v_file_content);
+		}
+	  }
+	}
 
 	// ----- Change abort status
 	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
+	  $p_entry['status'] = "skipped";
 	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    return $v_result;
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4152,116 +4152,116 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+
+	// ----- Read the file header
+	$v_header = array();
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+		// ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
+		if ($p_entry['compression'] == 0) {
 
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+		  // ----- Reading the file
+		  $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+		}
+		else {
 
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Reading the file
+		  $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
-        }
+		  // ----- Decompress the file
+		  if (($p_string = @gzinflate($v_data)) === FALSE) {
+			  // TBC
+		  }
+		}
 
-        // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
+		// ----- Trace
+	  }
+	  else {
+		  // TBC : error : can not extract a folder in a string
+	  }
 
-    }
+	}
 
   	// ----- Change abort status
   	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
+		$p_entry['status'] = "skipped";
   	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
+	  // ----- Swap the content to header
+	  $v_local_header['content'] = $p_string;
+	  $p_string = '';
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
+	  // ----- Swap back the content to header
+	  $p_string = $v_local_header['content'];
+	  unset($v_local_header['content']);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4273,98 +4273,98 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
+	// ----- Read the 4 bytes signature
+	$v_binary_data = @fread($this->zip_fd, 4);
+	$v_data = unpack('Vid', $v_binary_data);
 
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
+	// ----- Check signature
+	if ($v_data['id'] != 0x04034b50)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
+	// ----- Read the first 42 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 26);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 26)
+	{
+	  $p_header['filename'] = "";
+	  $p_header['status'] = "invalid_header";
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+	// ----- Extract the values
+	$v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
 
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+	// ----- Get filename
+	$p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
 
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
+	// ----- Get extra_fields
+	if ($v_data['extra_len'] != 0) {
+	  $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+	}
+	else {
+	  $p_header['extra'] = '';
+	}
 
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+	// ----- Extract properties
+	$p_header['version_extracted'] = $v_data['version'];
+	$p_header['compression'] = $v_data['compression'];
+	$p_header['size'] = $v_data['size'];
+	$p_header['compressed_size'] = $v_data['compressed_size'];
+	$p_header['crc'] = $v_data['crc'];
+	$p_header['flag'] = $v_data['flag'];
+	$p_header['filename_len'] = $v_data['filename_len'];
+
+	// ----- Recuperate date in UNIX format
+	$p_header['mdate'] = $v_data['mdate'];
+	$p_header['mtime'] = $v_data['mtime'];
+	if ($p_header['mdate'] && $p_header['mtime'])
+	{
+	  // ----- Extract time
+	  $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+	  $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+	  $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+	  // ----- Extract date
+	  $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+	  $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+	  $v_day = $p_header['mdate'] & 0x001F;
+
+	  // ----- Get UNIX date format
+	  $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
+	}
+	else
+	{
+	  $p_header['mtime'] = time();
+	}
 
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
+	// TBC
+	//for(reset($v_data); $key = key($v_data); next($v_data)) {
+	//}
 
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
+	// ----- Set the stored filename
+	$p_header['stored_filename'] = $p_header['filename'];
 
-    // ----- Set the status field
-    $p_header['status'] = "ok";
+	// ----- Set the status field
+	$p_header['status'] = "ok";
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4376,101 +4376,101 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
+	// ----- Read the 4 bytes signature
+	$v_binary_data = @fread($this->zip_fd, 4);
+	$v_data = unpack('Vid', $v_binary_data);
 
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
+	// ----- Check signature
+	if ($v_data['id'] != 0x02014b50)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
+	// ----- Read the first 42 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 42);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 42)
+	{
+	  $p_header['filename'] = "";
+	  $p_header['status'] = "invalid_header";
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+	// ----- Extract the values
+	$p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+	// ----- Get filename
+	if ($p_header['filename_len'] != 0)
+	  $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+	else
+	  $p_header['filename'] = '';
+
+	// ----- Get extra
+	if ($p_header['extra_len'] != 0)
+	  $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+	else
+	  $p_header['extra'] = '';
+
+	// ----- Get comment
+	if ($p_header['comment_len'] != 0)
+	  $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+	else
+	  $p_header['comment'] = '';
+
+	// ----- Extract properties
+
+	// ----- Recuperate date in UNIX format
+	//if ($p_header['mdate'] && $p_header['mtime'])
+	// TBC : bug : this was ignoring time with 0/0/0
+	if (1)
+	{
+	  // ----- Extract time
+	  $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+	  $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+	  $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+	  // ----- Extract date
+	  $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+	  $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+	  $v_day = $p_header['mdate'] & 0x001F;
+
+	  // ----- Get UNIX date format
+	  $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
+	}
+	else
+	{
+	  $p_header['mtime'] = time();
+	}
 
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
+	// ----- Set the stored filename
+	$p_header['stored_filename'] = $p_header['filename'];
 
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
+	// ----- Set default status to ok
+	$p_header['status'] = 'ok';
 
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
+	// ----- Look if it is a directory
+	if (substr($p_header['filename'], -1) == '/') {
+	  //$p_header['external'] = 0x41FF0010;
+	  $p_header['external'] = 0x00000010;
+	}
 
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4484,7 +4484,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+	$v_result=1;
 
   	// ----- Check the static values
   	// TBC
@@ -4503,13 +4503,13 @@ 
 
   	// ----- Look for flag bit 3
   	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
+		  $p_local_header['size'] = $p_central_header['size'];
+		  $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+		  $p_local_header['crc'] = $p_central_header['crc'];
   	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4521,152 +4521,152 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	$v_result=1;
+
+	// ----- Go to the end of the zip file
+	$v_size = filesize($this->zipname);
+	@fseek($this->zip_fd, $v_size);
+	if (@ftell($this->zip_fd) != $v_size)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
+	// ----- First try : look if this is an archive with no commentaries (most of the time)
+	// in this case the end of central dir is at 22 bytes of the file end
+	$v_found = 0;
+	if ($v_size > 26) {
+	  @fseek($this->zip_fd, $v_size-22);
+	  if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+	  {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
+	  // ----- Read for bytes
+	  $v_binary_data = @fread($this->zip_fd, 4);
+	  $v_data = @unpack('Vid', $v_binary_data);
 
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
+	  // ----- Check signature
+	  if ($v_data['id'] == 0x06054b50) {
+		$v_found = 1;
+	  }
 
-      $v_pos = ftell($this->zip_fd);
-    }
+	  $v_pos = ftell($this->zip_fd);
+	}
 
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
+	// ----- Go back to the maximum possible size of the Central Dir End Record
+	if (!$v_found) {
+	  $v_maximum_size = 65557; // 0xFFFF + 22;
+	  if ($v_maximum_size > $v_size)
+		$v_maximum_size = $v_size;
+	  @fseek($this->zip_fd, $v_size-$v_maximum_size);
+	  if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+	  {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
+	  // ----- Read byte per byte in order to find the signature
+	  $v_pos = ftell($this->zip_fd);
+	  $v_bytes = 0x00000000;
+	  while ($v_pos < $v_size)
+	  {
+		// ----- Read a byte
+		$v_byte = @fread($this->zip_fd, 1);
+
+		// -----  Add the byte
+		//$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+		// Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+		// Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+		$v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+		// ----- Compare the bytes
+		if ($v_bytes == 0x504b0506)
+		{
+		  $v_pos++;
+		  break;
+		}
+
+		$v_pos++;
+	  }
 
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
+	  // ----- Look if not found end of central dir
+	  if ($v_pos == $v_size)
+	  {
 
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
-    }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
+	}
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
+	// ----- Read the first 18 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 18);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 18)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+	// ----- Extract the values
+	$v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
 
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+	// ----- Check the global size
+	if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
 
 	  // ----- Removed in release 2.2 see readme file
 	  // The check of the file size is a little too strict.
 	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
 	  // While decrypted, zip has training 0 bytes
 	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
+						   'The central dir is not at the end of the archive.'
 						   .' Some trailing bytes exists after the archive.');
 
-      // ----- Return
-      return PclZip::errorCode();
+	  // ----- Return
+	  return PclZip::errorCode();
 	  }
-    }
+	}
 
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
+	// ----- Get comment
+	if ($v_data['comment_size'] != 0) {
+	  $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+	}
+	else
+	  $p_central_dir['comment'] = '';
+
+	$p_central_dir['entries'] = $v_data['entries'];
+	$p_central_dir['disk_entries'] = $v_data['disk_entries'];
+	$p_central_dir['offset'] = $v_data['offset'];
+	$p_central_dir['size'] = $v_data['size'];
+	$p_central_dir['disk'] = $v_data['disk'];
+	$p_central_dir['disk_start'] = $v_data['disk_start'];
+
+	// TBC
+	//for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+	//}
+
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4678,96 +4678,96 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+	$v_list_detail = array();
+
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
+	// ----- Scan all the files
+	// ----- Start at beginning of Central Dir
+	$v_pos_entry = $v_central_dir['offset'];
+	@rewind($this->zip_fd);
+	if (@fseek($this->zip_fd, $v_pos_entry))
+	{
+	  // ----- Close the zip file
+	  $this->privCloseFd();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
+	// ----- Read each entry
+	$v_header_list = array();
+	$j_start = 0;
+	for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+	{
 
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
+	  // ----- Read the file header
+	  $v_header_list[$v_nb_extracted] = array();
+	  if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
 
-        return $v_result;
-      }
+		return $v_result;
+	  }
 
 
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
+	  // ----- Store the index
+	  $v_header_list[$v_nb_extracted]['index'] = $i;
+
+	  // ----- Look for the specific extract rules
+	  $v_found = false;
+
+	  // ----- Look for extract by name rule
+	  if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+		  && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+		  // ----- Look if the filename is in the list
+		  for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+			  // ----- Look for a directory
+			  if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+				  // ----- Look if the directory is in the filename path
+				  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+					  && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_found = true;
+				  }
+				  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+						  && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_found = true;
+				  }
+			  }
+			  // ----- Look for a filename
+			  elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+				  $v_found = true;
+			  }
+		  }
+	  }
 
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
+	  // ----- Look for extract by ereg rule
+	  // ereg() is deprecated with PHP 5.3
+	  /*
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
 
@@ -4777,201 +4777,201 @@ 
       }
       */
 
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+	  // ----- Look for extract by preg rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+			   && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
+		  if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+			  $v_found = true;
+		  }
+	  }
 
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+	  // ----- Look for extract by index rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+			   && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+		  // ----- Look if the index is in the list
+		  for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
+			  if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+				  $v_found = true;
+			  }
+			  if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+				  $j_start = $j+1;
+			  }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
+			  if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+				  break;
+			  }
+		  }
+	  }
+	  else {
+	  	$v_found = true;
+	  }
 
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
+	  // ----- Look for deletion
+	  if ($v_found)
+	  {
+		unset($v_header_list[$v_nb_extracted]);
+	  }
+	  else
+	  {
+		$v_nb_extracted++;
+	  }
+	}
 
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
+	// ----- Look if something need to be deleted
+	if ($v_nb_extracted > 0) {
+
+		// ----- Creates a temporay file
+		$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+		// ----- Creates a temporary zip archive
+		$v_temp_zip = new PclZip($v_zip_temp_name);
+
+		// ----- Open the temporary zip file in write mode
+		if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+			$this->privCloseFd();
+
+			// ----- Return
+			return $v_result;
+		}
+
+		// ----- Look which file need to be kept
+		for ($i=0; $i<sizeof($v_header_list); $i++) {
+
+			// ----- Calculate the position of the header
+			@rewind($this->zip_fd);
+			if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Error log
+				PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+				// ----- Return
+				return PclZip::errorCode();
+			}
+
+			// ----- Read the file header
+			$v_local_header = array();
+			if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Check that local file header is same as central file header
+			if ($this->privCheckFileHeaders($v_local_header,
+											$v_header_list[$i]) != 1) {
+				// TBC
+			}
+			unset($v_local_header);
+
+			// ----- Write the file header
+			if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Read/write the data block
+			if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+		}
+
+		// ----- Store the offset of the central dir
+		$v_offset = @ftell($v_temp_zip->zip_fd);
+
+		// ----- Re-Create the Central Dir files header
+		for ($i=0; $i<sizeof($v_header_list); $i++) {
+			// ----- Create the file header
+			if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+				$v_temp_zip->privCloseFd();
+				$this->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Transform the header to a 'usable' info
+			$v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+		}
+
+
+		// ----- Zip file comment
+		$v_comment = '';
+		if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+		  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+		}
+
+		// ----- Calculate the size of the central header
+		$v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+
+		// ----- Create the central dir footer
+		if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+			// ----- Reset the file list
+			unset($v_header_list);
+			$v_temp_zip->privCloseFd();
+			$this->privCloseFd();
+			@unlink($v_zip_temp_name);
+
+			// ----- Return
+			return $v_result;
+		}
+
+		// ----- Close
+		$v_temp_zip->privCloseFd();
+		$this->privCloseFd();
+
+		// ----- Delete the zip file
+		// TBC : I should test the result ...
+		@unlink($this->zipname);
+
+		// ----- Rename the temporary file
+		// TBC : I should test the result ...
+		//@rename($v_zip_temp_name, $this->zipname);
+		PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+		// ----- Destroy the temporary archive
+		unset($v_temp_zip);
+	}
 
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
+	// ----- Remove every files : reset the file
+	else if ($v_central_dir['entries'] != 0) {
+		$this->privCloseFd();
 
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
-        }
+		if (($v_result = $this->privOpenFd('wb')) != 1) {
+		  return $v_result;
+		}
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
-        }
+		if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+		  return $v_result;
+		}
 
-        $this->privCloseFd();
-    }
+		$this->privCloseFd();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4988,49 +4988,49 @@ 
   // --------------------------------------------------------------------------------
   function privDirCheck($p_dir, $p_is_dir=false)
   {
-    $v_result = 1;
+	$v_result = 1;
 
 
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
+	// ----- Remove the final '/'
+	if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+	{
+	  $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+	}
 
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
+	// ----- Check the directory availability
+	if ((is_dir($p_dir)) || ($p_dir == ""))
+	{
+	  return 1;
+	}
 
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
+	// ----- Extract parent directory
+	$p_parent_dir = dirname($p_dir);
+
+	// ----- Just a check
+	if ($p_parent_dir != $p_dir)
+	{
+	  // ----- Look for parent directory
+	  if ($p_parent_dir != "")
+	  {
+		if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
+		{
+		  return $v_result;
+		}
+	  }
+	}
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+	// ----- Create the directory
+	if (!@mkdir($p_dir, 0777))
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5043,180 +5043,180 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
+	// ----- Look if the archive_to_add exists
+	if (!is_file($p_archive_to_add->zipname))
+	{
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+	  // ----- Nothing to merge, so merge is a success
+	  $v_result = 1;
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
+	// ----- Look if the archive exists
+	if (!is_file($this->zipname))
+	{
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+	  // ----- Do a duplicate
+	  $v_result = $this->privDuplicate($p_archive_to_add->zipname);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
+	// ----- Open the archive_to_add file
+	if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+	{
+	  $this->privCloseFd();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
+	// ----- Read the central directory informations
+	$v_central_dir_to_add = array();
+	if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
 
-      return $v_result;
-    }
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($p_archive_to_add->zip_fd);
 
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+	// ----- Creates a temporay file
+	$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = $v_central_dir['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive_to_add into the temporary file
+	$v_size = $v_central_dir_to_add['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($v_zip_temp_fd);
+
+	// ----- Copy the block of file headers from the old archive
+	$v_size = $v_central_dir['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the block of file headers from the archive_to_add
+	$v_size = $v_central_dir_to_add['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+	// ----- Merge the file comments
+	$v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+	// ----- Calculate the size of the (new) central header
+	$v_size = @ftell($v_zip_temp_fd)-$v_offset;
 
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap the file descriptor
+	// Here is a trick : I swap the temporary fd with the zip fd, in order to use
+	// the following methods on the temporary fil and not the real archive fd
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
+	  @fclose($v_zip_temp_fd);
+	  $this->zip_fd = null;
 
-      // ----- Reset the file list
-      unset($v_header_list);
+	  // ----- Reset the file list
+	  unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap back the file descriptor
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
+	$p_archive_to_add->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
+	// ----- Delete the zip file
+	// TBC : I should test the result ...
+	@unlink($this->zipname);
 
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+	// ----- Rename the temporary file
+	// TBC : I should test the result ...
+	//@rename($v_zip_temp_name, $this->zipname);
+	PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5228,56 +5228,56 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
+	// ----- Look if the $p_archive_filename exists
+	if (!is_file($p_archive_filename))
+	{
 
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
+	  // ----- Nothing to duplicate, so duplicate is a success.
+	  $v_result = 1;
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('wb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
+	{
+	  $this->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = filesize($p_archive_filename);
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($v_zip_temp_fd, $v_read_size);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5288,13 +5288,13 @@ 
   // --------------------------------------------------------------------------------
   function privErrorLog($p_error_code=0, $p_error_string='')
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  PclError($p_error_code, $p_error_string);
+	}
+	else {
+	  $this->error_code = $p_error_code;
+	  $this->error_string = $p_error_string;
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5305,13 +5305,13 @@ 
   // --------------------------------------------------------------------------------
   function privErrorReset()
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  PclErrorReset();
+	}
+	else {
+	  $this->error_code = 0;
+	  $this->error_string = '';
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5323,17 +5323,17 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
+	// ----- Look if function exists
+	if (   (!function_exists("get_magic_quotes_runtime"))
+		|| (!function_exists("set_magic_quotes_runtime"))) {
+	  return $v_result;
 	}
 
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
+	// ----- Look if already done
+	if ($this->magic_quotes_status != -1) {
+	  return $v_result;
 	}
 
 	// ----- Get and memorize the magic_quote value
@@ -5344,8 +5344,8 @@ 
 	  @set_magic_quotes_runtime(0);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5357,17 +5357,17 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
+	// ----- Look if function exists
+	if (   (!function_exists("get_magic_quotes_runtime"))
+		|| (!function_exists("set_magic_quotes_runtime"))) {
+	  return $v_result;
 	}
 
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
+	// ----- Look if something to do
+	if ($this->magic_quotes_status != -1) {
+	  return $v_result;
 	}
 
 	// ----- Swap back magic_quotes
@@ -5375,8 +5375,8 @@ 
   	  @set_magic_quotes_runtime($this->magic_quotes_status);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5392,67 +5392,67 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilPathReduction($p_dir)
   {
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+	$v_result = "";
+
+	// ----- Look for not empty path
+	if ($p_dir != "") {
+	  // ----- Explode path by directory names
+	  $v_list = explode("/", $p_dir);
+
+	  // ----- Study directories from last to first
+	  $v_skip = 0;
+	  for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+		// ----- Look for current path
+		if ($v_list[$i] == ".") {
+		  // ----- Ignore this directory
+		  // Should be the first $i=0, but no check is done
+		}
+		else if ($v_list[$i] == "..") {
 		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
+		}
+		else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
+			$v_result = "/".$v_result;
+			if ($v_skip > 0) {
+				// ----- It is an invalid path, so the path is not modified
+				// TBC
+				$v_result = $p_dir;
+				$v_skip = 0;
+			}
 		  }
 		  // ----- Last '/' i.e. indicates a directory
 		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
+			$v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
 		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
+			// ----- Ignore only the double '//' in path,
+			// but not the first and last '/'
 		  }
-        }
-        else {
+		}
+		else {
 		  // ----- Look for item to skip
 		  if ($v_skip > 0) {
-		    $v_skip--;
+			$v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+			$v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
-        }
-      }
+		}
+	  }
 
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
+	  // ----- Look for skip
+	  if ($v_skip > 0) {
+		while ($v_skip > 0) {
+			$v_result = '../'.$v_result;
+			$v_skip--;
+		}
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5473,67 +5473,67 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilPathInclusion($p_dir, $p_path)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-    }
+	// ----- Look for path beginning by ./
+	if (   ($p_dir == '.')
+		|| ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+	  $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+	}
+	if (   ($p_path == '.')
+		|| ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+	  $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+	}
 
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
+	// ----- Explode dir and path by directory separator
+	$v_list_dir = explode("/", $p_dir);
+	$v_list_dir_size = sizeof($v_list_dir);
+	$v_list_path = explode("/", $p_path);
+	$v_list_path_size = sizeof($v_list_path);
+
+	// ----- Study directories paths
+	$i = 0;
+	$j = 0;
+	while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
+
+	  // ----- Look for empty dir (path reduction)
+	  if ($v_list_dir[$i] == '') {
+		$i++;
+		continue;
+	  }
+	  if ($v_list_path[$j] == '') {
+		$j++;
+		continue;
+	  }
 
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
+	  // ----- Compare the items
+	  if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+		$v_result = 0;
+	  }
 
-      // ----- Next items
-      $i++;
-      $j++;
-    }
+	  // ----- Next items
+	  $i++;
+	  $j++;
+	}
 
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+	// ----- Look if everything seems to be the same
+	if ($v_result) {
+	  // ----- Skip all the empty items
+	  while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
+	  while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
+	  if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+		// ----- There are exactly the same
+		$v_result = 2;
+	  }
+	  else if ($i < $v_list_dir_size) {
+		// ----- The path is shorter than the dir
+		$v_result = 0;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5550,51 +5550,51 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
+	$v_result = 1;
+
+	if ($p_mode==0)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @fread($p_src, $v_read_size);
+		@fwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==1)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @gzread($p_src, $v_read_size);
+		@fwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==2)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @fread($p_src, $v_read_size);
+		@gzwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==3)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @gzread($p_src, $v_read_size);
+		@gzwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5612,22 +5612,22 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilRename($p_src, $p_dest)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
+	// ----- Try to rename the files
+	if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
+	  // ----- Try to copy & unlink the src
+	  if (!@copy($p_src, $p_dest)) {
+		$v_result = 0;
+	  }
+	  else if (!@unlink($p_src)) {
+		$v_result = 0;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5643,20 +5643,20 @@ 
   function PclZipUtilOptionText($p_option)
   {
 
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
-    }
+	$v_list = get_defined_constants();
+	for (reset($v_list); $v_key = key($v_list); next($v_list)) {
+		$v_prefix = substr($v_key, 0, 10);
+		if ((   ($v_prefix == 'PCLZIP_OPT')
+		   || ($v_prefix == 'PCLZIP_CB_')
+		   || ($v_prefix == 'PCLZIP_ATT'))
+			&& ($v_list[$v_key] == $p_option)) {
+		return $v_key;
+		}
+	}
 
-    $v_result = 'Unknown';
+	$v_result = 'Unknown';
 
-    return $v_result;
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5673,17 +5673,17 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
   {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
+	if (stristr(php_uname(), 'windows')) {
+	  // ----- Look for potential disk letter
+	  if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+		  $p_path = substr($p_path, $v_position+1);
+	  }
+	  // ----- Change potential windows directory separator
+	  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+		  $p_path = strtr($p_path, '\\', '/');
+	  }
+	}
+	return $p_path;
   }
   // --------------------------------------------------------------------------------
 

Spacing +325 added lines, -325 removed lines

@@ -26,8 +26,8 @@ 
 // --------------------------------------------------------------------------------
 
   // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+  if ( ! defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
   }
 
   // ----- File list separator
@@ -40,8 +40,8 @@ 
   // Recommanded values for compatibility with older versions :
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+  if ( ! defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
   }
 
   // ----- Error configuration
@@ -49,8 +49,8 @@ 
   // 1 : PclError external library error handling. By enabling this
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+  if ( ! defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
   }
 
   // ----- Optional static temporary directory
@@ -62,8 +62,8 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+  if ( ! defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -74,8 +74,8 @@ 
   //       Recommended values are under 0.5. Default 0.47.
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+  if ( ! defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
   }
 
 // --------------------------------------------------------------------------------
@@ -100,72 +100,72 @@ 
   //  -12 : Unable to rename file (rename)
   //  -13 : Invalid header checksum
   //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+  define('PCLZIP_ERR_USER_ABORTED', 2);
+  define('PCLZIP_ERR_NO_ERROR', 0);
+  define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+  define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+  define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+  define('PCLZIP_ERR_MISSING_FILE', -4);
+  define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+  define('PCLZIP_ERR_INVALID_ZIP', -6);
+  define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+  define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+  define('PCLZIP_ERR_BAD_EXTENSION', -9);
+  define('PCLZIP_ERR_BAD_FORMAT', -10);
+  define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+  define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+  define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+  define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+  define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+  define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+  define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+  define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+  define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+  define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+  define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
   // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  define('PCLZIP_OPT_PATH', 77001);
+  define('PCLZIP_OPT_ADD_PATH', 77002);
+  define('PCLZIP_OPT_REMOVE_PATH', 77003);
+  define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+  define('PCLZIP_OPT_SET_CHMOD', 77005);
+  define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+  define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+  define('PCLZIP_OPT_BY_NAME', 77008);
+  define('PCLZIP_OPT_BY_INDEX', 77009);
+  define('PCLZIP_OPT_BY_EREG', 77010);
+  define('PCLZIP_OPT_BY_PREG', 77011);
+  define('PCLZIP_OPT_COMMENT', 77012);
+  define('PCLZIP_OPT_ADD_COMMENT', 77013);
+  define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+  define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+  define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+  define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
   // Having big trouble with crypt. Need to multiply 2 long int
   // which is not correctly supported by PHP ...
   //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+  define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+  define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+  define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+  define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
   // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+  define('PCLZIP_ATT_FILE_NAME', 79001);
+  define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+  define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+  define('PCLZIP_ATT_FILE_MTIME', 79004);
+  define('PCLZIP_ATT_FILE_CONTENT', 79005);
+  define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
   // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  define('PCLZIP_CB_PRE_EXTRACT', 78001);
+  define('PCLZIP_CB_POST_EXTRACT', 78002);
+  define('PCLZIP_CB_PRE_ADD', 78003);
+  define('PCLZIP_CB_POST_ADD', 78004);
   /* For futur use
   define( 'PCLZIP_CB_PRE_LIST', 78005 );
   define( 'PCLZIP_CB_POST_LIST', 78006 );
@@ -216,7 +216,7 @@ 
   {
 
     // ----- Tests the zlib
-    if (!function_exists('gzopen'))
+    if ( ! function_exists('gzopen'))
     {
       die('Abort '.basename(__FILE__).' : Missing zlib extensions');
     }
@@ -274,7 +274,7 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -300,7 +300,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -386,7 +386,7 @@ 
 
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -457,7 +457,7 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -483,7 +483,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -569,7 +569,7 @@ 
 
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -646,13 +646,13 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -703,13 +703,13 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -736,7 +736,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
@@ -860,13 +860,13 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -897,7 +897,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
@@ -933,7 +933,7 @@ 
           }
           $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
         }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+        if ( ! isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
         }
         else {
@@ -967,10 +967,10 @@ 
     // ----- Trick
     // Here I want to reuse extractByRule(), so I need to parse the $p_index
     // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);
     $v_options_trick = array();
     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                        array(PCLZIP_OPT_BY_INDEX => 'optional'));
     if ($v_result != 1) {
         return 0;
     }
@@ -1009,13 +1009,13 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -1032,10 +1032,10 @@ 
 
       // ----- Parse the options
       $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                        array(PCLZIP_OPT_BY_NAME => 'optional',
                                                PCLZIP_OPT_BY_EREG => 'optional',
                                                PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                               PCLZIP_OPT_BY_INDEX => 'optional'));
       if ($v_result != 1) {
           return 0;
       }
@@ -1100,7 +1100,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       $this->privSwapBackMagicQuotes();
       return(0);
     }
@@ -1184,7 +1184,7 @@ 
 
       // ----- Check that $p_archive is a valid zip file
       // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
+      if ( ! is_file($p_archive)) {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
         $v_result = PCLZIP_ERR_MISSING_FILE;
@@ -1230,7 +1230,7 @@ 
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -1289,9 +1289,9 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
+  function errorName($p_with_code = false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+    $v_name = array(PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
                       PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
                       PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
                       PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
@@ -1335,7 +1335,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
+  function errorInfo($p_full = false)
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
@@ -1374,7 +1374,7 @@ 
   //   true on success,
   //   false on error, the error code is set.
   // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
+  function privCheckFormat($p_level = 0)
   {
     $v_result = true;
 
@@ -1385,14 +1385,14 @@ 
     $this->privErrorReset();
 
     // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
+    if ( ! is_file($this->zipname)) {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
       return(false);
     }
 
     // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
+    if ( ! is_readable($this->zipname)) {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
       return(false);
@@ -1427,16 +1427,16 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+    $i = 0;
+    while ($i < $p_size) {
 
       // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
+      if ( ! isset($v_requested_options[$p_options_list[$i]])) {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
 
@@ -1451,7 +1451,7 @@ 
         case PCLZIP_OPT_REMOVE_PATH :
         case PCLZIP_OPT_ADD_PATH :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1460,13 +1460,13 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
           $i++;
         break;
 
         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
@@ -1478,14 +1478,14 @@ 
           }
 
           // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
+          $v_value = $p_options_list[$i + 1];
+          if (( ! is_integer($v_value)) || ($v_value < 0)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
 
           // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
           $i++;
         break;
 
@@ -1516,7 +1516,7 @@ 
 
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1525,9 +1525,9 @@ 
           }
 
           // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          if (is_string($p_options_list[$i + 1])
+              && ($p_options_list[$i + 1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
             $i++;
           }
           else {
@@ -1537,7 +1537,7 @@ 
         // ----- Look for options that request an array of string for value
         case PCLZIP_OPT_BY_NAME :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1546,11 +1546,11 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
           }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1570,7 +1570,7 @@ 
         case PCLZIP_OPT_BY_PREG :
         //case PCLZIP_OPT_CRYPT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1579,8 +1579,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1597,7 +1597,7 @@ 
         case PCLZIP_OPT_ADD_COMMENT :
         case PCLZIP_OPT_PREPEND_COMMENT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
 			                     "Missing parameter value for option '"
@@ -1609,8 +1609,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1628,7 +1628,7 @@ 
         // ----- Look for options that request an array of index
         case PCLZIP_OPT_BY_INDEX :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1638,19 +1638,19 @@ 
 
           // ----- Get the value
           $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+          if (is_string($p_options_list[$i + 1])) {
 
               // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+              $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
 
               // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
+              $v_work_list = explode(",", $p_options_list[$i + 1]);
           }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+          else if (is_integer($p_options_list[$i + 1])) {
+              $v_work_list[0] = $p_options_list[$i + 1].'-'.$p_options_list[$i + 1];
           }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_work_list = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1664,9 +1664,9 @@ 
           // each index item in the list must be a couple with a start and
           // an end value : [0,3], [5-5], [8-10], ...
           // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
+          $v_sort_flag = false;
+          $v_sort_value = 0;
+          for ($j = 0; $j < sizeof($v_work_list); $j++) {
               // ----- Explode the item
               $v_item_list = explode("-", $v_work_list[$j]);
               $v_size_item_list = sizeof($v_item_list);
@@ -1696,7 +1696,7 @@ 
 
               // ----- Look for list sort
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
+                  $v_sort_flag = true;
 
                   // ----- TBC : An automatic sort should be writen ...
                   // ----- Error log
@@ -1730,7 +1730,7 @@ 
         // ----- Look for options that request an octal value
         case PCLZIP_OPT_SET_CHMOD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1739,7 +1739,7 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           $i++;
         break;
 
@@ -1755,7 +1755,7 @@ 
         case PCLZIP_CB_POST_LIST :
         */
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1764,10 +1764,10 @@ 
           }
 
           // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+          $v_function_name = $p_options_list[$i + 1];
 
           // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
+          if ( ! function_exists($v_function_name)) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1796,11 +1796,11 @@ 
 
     // ----- Look for mandatory options
     if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+      for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
         // ----- Look for mandatory option
         if ($v_requested_options[$key] == 'mandatory') {
           // ----- Look if present
-          if (!isset($v_result_list[$key])) {
+          if ( ! isset($v_result_list[$key])) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
 
@@ -1812,7 +1812,7 @@ 
     }
 
     // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+    if ( ! isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
 
     }
 
@@ -1829,7 +1829,7 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1841,16 +1841,16 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
 
-    if($last == 'g')
+    if ($last == 'g')
         //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
+        $v_memory_limit = $v_memory_limit * 1073741824;
+    if ($last == 'm')
         //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+        $v_memory_limit = $v_memory_limit * 1048576;
+    if ($last == 'k')
+        $v_memory_limit = $v_memory_limit * 1024;
 
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
 
 
     // ----- Sanity check : No threshold if value lower than 1M
@@ -1871,15 +1871,15 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- For each file in the list check the attributes
     foreach ($p_file_list as $v_key => $v_value) {
 
       // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
+      if ( ! isset($v_requested_options[$v_key])) {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
 
@@ -1890,7 +1890,7 @@ 
       // ----- Look for attribute
       switch ($v_key) {
         case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1905,7 +1905,7 @@ 
         break;
 
         case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1919,7 +1919,7 @@ 
         break;
 
         case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1934,7 +1934,7 @@ 
 
         // ----- Look for options that takes a string
         case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1943,7 +1943,7 @@ 
         break;
 
         case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
+          if ( ! is_integer($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1966,11 +1966,11 @@ 
 
       // ----- Look for mandatory options
       if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+        for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
           // ----- Look for mandatory option
           if ($v_requested_options[$key] == 'mandatory') {
             // ----- Look if present
-            if (!isset($p_file_list[$key])) {
+            if ( ! isset($p_file_list[$key])) {
               PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
               return PclZip::errorCode();
             }
@@ -2002,13 +2002,13 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Create a result list
     $v_result_list = array();
 
     // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
 
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
@@ -2075,7 +2075,7 @@ 
             // Because the name of the folder was changed, the name of the
             // files/sub-folders also change
             if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                 && ( ! isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
               if ($v_descr['stored_filename'] != '') {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
               }
@@ -2127,7 +2127,7 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Magic quotes trick
@@ -2162,11 +2162,11 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+    if (( ! is_file($this->zipname)) || (filesize($this->zipname) == 0))
     {
 
       // ----- Do a create
@@ -2179,7 +2179,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
@@ -2260,7 +2260,7 @@ 
     }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2293,10 +2293,10 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       // ----- Reset the file list
       unset($v_header_list);
@@ -2341,7 +2341,7 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if already open
     if ($this->zip_fd != 0)
@@ -2375,7 +2375,7 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+    $v_result = 1;
 
     if ($this->zip_fd != 0)
       @fclose($this->zip_fd);
@@ -2402,7 +2402,7 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -2416,7 +2416,7 @@ 
     $v_offset = @ftell($this->zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2438,7 +2438,7 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
@@ -2466,14 +2466,14 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = sizeof($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
       // ----- Format the filename
       $p_filedescr_list[$j]['filename']
       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
@@ -2486,8 +2486,8 @@ 
       }
 
       // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
+      if (($p_filedescr_list[$j]['type'] != 'virtual_file')
+          && ( ! file_exists($p_filedescr_list[$j]['filename']))) {
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
         return PclZip::errorCode();
       }
@@ -2496,11 +2496,11 @@ 
       // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
+      if (($p_filedescr_list[$j]['type'] == 'file')
           || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
+          || (($p_filedescr_list[$j]['type'] == 'folder')
+              && ( ! isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+                  || ! $p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
           ) {
 
         // ----- Add the file
@@ -2528,7 +2528,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2573,13 +2573,13 @@ 
     $p_header['index'] = -1;
 
     // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
+    if ($p_filedescr['type'] == 'file') {
       $p_header['external'] = 0x00000000;
       $p_header['size'] = filesize($p_filename);
     }
 
     // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
+    else if ($p_filedescr['type'] == 'folder') {
       $p_header['external'] = 0x00000010;
       $p_header['mtime'] = filemtime($p_filename);
       $p_header['size'] = filesize($p_filename);
@@ -2653,10 +2653,10 @@ 
       // ----- Look for a file
       if ($p_filedescr['type'] == 'file') {
         // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+        if (( ! isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
           $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
           if ($v_result < PCLZIP_ERR_NO_ERROR) {
             return $v_result;
@@ -2756,7 +2756,7 @@ 
         // ----- Set the file properties
         $p_header['size'] = 0;
         //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
@@ -2799,7 +2799,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+    $v_result = PCLZIP_ERR_NO_ERROR;
 
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2853,7 +2853,7 @@ 
     $v_data_header['os'] = bin2hex($v_data_header['os']);
 
     // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
     $v_binary_data = @fread($v_file_compressed, 8);
     $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
@@ -2861,7 +2861,7 @@ 
     $p_header['compression'] = ord($v_data_header['cm']);
     //$p_header['mtime'] = $v_data_header['mtime'];
     $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
 
     // ----- Close the file
     @fclose($v_file_compressed);
@@ -2911,7 +2911,7 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Working variables
     $p_filename = $p_filedescr['filename'];
@@ -2968,14 +2968,14 @@ 
         if (substr($p_remove_dir, -1) != '/')
           $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
+        if ((substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
 
-          if (   (substr($p_filename, 0, 2) == "./")
+          if ((substr($p_filename, 0, 2) == "./")
               && (substr($p_remove_dir, 0, 2) != "./")) {
             $p_remove_dir = "./".$p_remove_dir;
           }
-          if (   (substr($p_filename, 0, 2) != "./")
+          if ((substr($p_filename, 0, 2) != "./")
               && (substr($p_remove_dir, 0, 2) == "./")) {
             $p_remove_dir = substr($p_remove_dir, 2);
           }
@@ -3023,15 +3023,15 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Store the offset position of the file
     $p_header['offset'] = ftell($this->zip_fd);
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
@@ -3068,7 +3068,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -3076,8 +3076,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
 
     // ----- Packed data
@@ -3121,7 +3121,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
@@ -3150,7 +3150,7 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
@@ -3190,7 +3190,7 @@ 
     }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0; $i < $v_central_dir['entries']; $i++)
     {
       // ----- Read the file header
       if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
@@ -3237,7 +3237,7 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Get the interesting attributes
     $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
@@ -3248,7 +3248,7 @@ 
     $p_info['compressed_size'] = $p_header['compressed_size'];
     $p_info['mtime'] = $p_header['mtime'];
     $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
     $p_info['index'] = $p_header['index'];
     $p_info['status'] = $p_header['status'];
     $p_info['crc'] = $p_header['crc'];
@@ -3276,16 +3276,16 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
+    if (($p_path == "")
+	    || ((substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
+			&& (substr($p_path, 1, 2) != ":/")))
       $p_path = "./".$p_path;
 
     // ----- Reduce the path last (and duplicated) '/'
@@ -3294,7 +3294,7 @@ 
       // ----- Look for the path end '/'
       while (substr($p_path, -1) == "/")
       {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
+        $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -3328,7 +3328,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read next Central dir entry
@@ -3367,17 +3367,17 @@ 
       $v_extract = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && ( ! $v_extract); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_extract = true;
                   }
@@ -3402,7 +3402,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
@@ -3411,20 +3411,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && ( ! $v_extract); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -3436,14 +3436,14 @@ 
       }
 
 	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
+	  if (($v_extract)
+	      && (($v_header['compression'] != 8)
 		      && ($v_header['compression'] != 0))) {
           $v_header['status'] = 'unsupported_compression';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
@@ -3461,8 +3461,8 @@ 
           $v_header['status'] = 'unsupported_encryption';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
@@ -3543,7 +3543,7 @@ 
           }
         }
         // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+        elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
 		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
           // ----- Extracting the file in standard output
           $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
@@ -3616,7 +3616,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
@@ -3634,7 +3634,7 @@ 
     // ----- Look for all path to remove
     if ($p_remove_all_path == true) {
         // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        if (($p_entry['external'] & 0x00000010) == 0x00000010) {
 
             $p_entry['status'] = "filtered";
 
@@ -3735,8 +3735,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
 			                     "Filename '".$p_entry['filename']."' is "
@@ -3746,7 +3746,7 @@ 
 		    }
       }
       // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
+      else if ( ! is_writeable($p_entry['filename']))
       {
 
         // ----- Change the file status
@@ -3755,8 +3755,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			                     "Filename '".$p_entry['filename']."' exists "
@@ -3770,8 +3770,8 @@ 
       else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
       {
         // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
 	  	  }
 		    else {
             $p_entry['status'] = "newer_exist";
@@ -3779,8 +3779,8 @@ 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
             // For historical reason first PclZip implementation does not stop
             // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			             "Newer version of '".$p_entry['filename']."' exists "
@@ -3796,14 +3796,14 @@ 
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+      if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/'))
         $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
+      else if ( ! strstr($p_entry['filename'], "/"))
         $v_dir_to_check = "";
       else
         $v_dir_to_check = dirname($p_entry['filename']);
 
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
 
           // ----- Change the file status
           $p_entry['status'] = "path_creation_fail";
@@ -3819,7 +3819,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      if ( ! (($p_entry['external'] & 0x00000010) == 0x00000010))
       {
         // ----- Look for not compressed file
         if ($p_entry['compression'] == 0) {
@@ -3868,10 +3868,10 @@ 
 
 
           // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+          if (( ! isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
             if ($v_result < PCLZIP_ERR_NO_ERROR) {
               return $v_result;
@@ -3965,7 +3965,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Creates a temporary file
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
@@ -4041,7 +4041,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -4090,7 +4090,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if ( ! (($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
@@ -4152,7 +4152,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -4202,7 +4202,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if ( ! (($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
         if ($p_entry['compression'] == 0) {
@@ -4273,7 +4273,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4337,7 +4337,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4376,7 +4376,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4440,7 +4440,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4484,7 +4484,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
   	// ----- Check the static values
   	// TBC
@@ -4521,7 +4521,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->zipname);
@@ -4539,8 +4539,8 @@ 
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
     if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+      @fseek($this->zip_fd, $v_size - 22);
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22))
       {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
@@ -4562,12 +4562,12 @@ 
     }
 
     // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
+    if ( ! $v_found) {
       $v_maximum_size = 65557; // 0xFFFF + 22;
       if ($v_maximum_size > $v_size)
         $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+      @fseek($this->zip_fd, $v_size - $v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size))
       {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
@@ -4588,7 +4588,7 @@ 
         //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
         // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
 
         // ----- Compare the bytes
         if ($v_bytes == 0x504b0506)
@@ -4678,11 +4678,11 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -4718,7 +4718,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read the file header
@@ -4739,21 +4739,21 @@ 
       $v_found = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && ( ! $v_found); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -4778,7 +4778,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
@@ -4787,20 +4787,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && ( ! $v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -4838,11 +4838,11 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+            if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
                 // ----- Close the zip file
                 $this->privCloseFd();
                 $v_temp_zip->privCloseFd();
@@ -4901,7 +4901,7 @@ 
         $v_offset = @ftell($v_temp_zip->zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                 $v_temp_zip->privCloseFd();
@@ -4924,7 +4924,7 @@ 
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
@@ -4986,15 +4986,15 @@ 
   //    1 : OK
   //   -1 : Unable to create directory
   // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
+  function privDirCheck($p_dir, $p_is_dir = false)
   {
     $v_result = 1;
 
 
     // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    if (($p_is_dir) && (substr($p_dir, -1) == '/'))
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+      $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
     }
 
     // ----- Check the directory availability
@@ -5020,7 +5020,7 @@ 
     }
 
     // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
+    if ( ! @mkdir($p_dir, 0777))
     {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
@@ -5043,10 +5043,10 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
+    if ( ! is_file($p_archive_to_add->zipname))
     {
 
       // ----- Nothing to merge, so merge is a success
@@ -5057,7 +5057,7 @@ 
     }
 
     // ----- Look if the archive exists
-    if (!is_file($this->zipname))
+    if ( ! is_file($this->zipname))
     {
 
       // ----- Do a duplicate
@@ -5068,7 +5068,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5086,7 +5086,7 @@ 
     @rewind($this->zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1)
     {
       $this->privCloseFd();
 
@@ -5170,7 +5170,7 @@ 
     $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -5180,7 +5180,7 @@ 
     $v_zip_temp_fd = $v_swap;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       $this->privCloseFd();
       $p_archive_to_add->privCloseFd();
@@ -5228,10 +5228,10 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
+    if ( ! is_file($p_archive_filename))
     {
 
       // ----- Nothing to duplicate, so duplicate is a success.
@@ -5242,7 +5242,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
+    if (($v_result = $this->privOpenFd('wb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5286,7 +5286,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
+  function privErrorLog($p_error_code = 0, $p_error_string = '')
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
@@ -5323,11 +5323,11 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
+    if (( ! function_exists("get_magic_quotes_runtime"))
+	    || ( ! function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
 
@@ -5357,11 +5357,11 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
+    if (( ! function_exists("get_magic_quotes_runtime"))
+	    || ( ! function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
 
@@ -5401,7 +5401,7 @@ 
 
       // ----- Study directories from last to first
       $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+      for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
         // ----- Look for current path
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
@@ -5422,7 +5422,7 @@ 
 		    }
 		  }
 		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
+		  else if ($i == (sizeof($v_list) - 1)) {
             $v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
@@ -5437,7 +5437,7 @@ 
 		    $v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+            $v_result = $v_list[$i].($i != (sizeof($v_list) - 1) ? "/".$v_result : "");
 		  }
         }
       }
@@ -5476,12 +5476,12 @@ 
     $v_result = 1;
 
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+    if (($p_dir == '.')
+        || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
       $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+    if (($p_path == '.')
+        || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
       $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
     }
 
@@ -5507,7 +5507,7 @@ 
       }
 
       // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
         $v_result = 0;
       }
 
@@ -5548,11 +5548,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
     $v_result = 1;
 
-    if ($p_mode==0)
+    if ($p_mode == 0)
     {
       while ($p_size != 0)
       {
@@ -5562,7 +5562,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==1)
+    else if ($p_mode == 1)
     {
       while ($p_size != 0)
       {
@@ -5572,7 +5572,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==2)
+    else if ($p_mode == 2)
     {
       while ($p_size != 0)
       {
@@ -5582,7 +5582,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==3)
+    else if ($p_mode == 3)
     {
       while ($p_size != 0)
       {
@@ -5615,13 +5615,13 @@ 
     $v_result = 1;
 
     // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
+    if ( ! @rename($p_src, $p_dest)) {
 
       // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
+      if ( ! @copy($p_src, $p_dest)) {
         $v_result = 0;
       }
-      else if (!@unlink($p_src)) {
+      else if ( ! @unlink($p_src)) {
         $v_result = 0;
       }
     }
@@ -5646,7 +5646,7 @@ 
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
 	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
+	    if ((($v_prefix == 'PCLZIP_OPT')
            || ($v_prefix == 'PCLZIP_CB_')
            || ($v_prefix == 'PCLZIP_ATT'))
 	        && ($v_list[$v_key] == $p_option)) {
@@ -5671,15 +5671,15 @@ 
   // Return Values :
   //   The path translated.
   // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
   {
     if (stristr(php_uname(), 'windows')) {
       // ----- Look for potential disk letter
       if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
           $p_path = strtr($p_path, '\\', '/');
       }
     }

Braces +115 added lines, -158 removed lines

@@ -328,8 +328,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
 		                       "Invalid number / type of arguments");
           return 0;
@@ -378,8 +377,7 @@ 
       foreach ($v_string_list as $v_string) {
         if ($v_string != '') {
           $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
+        } else {
         }
       }
     }
@@ -513,8 +511,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -790,8 +787,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -935,8 +931,7 @@ 
         }
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
+        } else {
         }
       }
 
@@ -951,8 +946,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -1188,8 +1182,7 @@ 
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
         $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
+      } else {
         // ----- Duplicate the archive
         $v_result = $this->privDuplicate($p_archive);
       }
@@ -1277,8 +1270,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorCode());
-    }
-    else {
+    } else {
       return($this->error_code);
     }
   }
@@ -1316,15 +1308,13 @@ 
 
     if (isset($v_name[$this->error_code])) {
       $v_value = $v_name[$this->error_code];
-    }
-    else {
+    } else {
       $v_value = 'NoName';
     }
 
     if ($p_with_code) {
       return($v_value.' ('.$this->error_code.')');
-    }
-    else {
+    } else {
       return($v_value);
     }
   }
@@ -1339,12 +1329,10 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
-    }
-    else {
+    } else {
       if ($p_full) {
         return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
+      } else {
         return($this->error_string." [code ".$this->error_code."]");
       }
     }
@@ -1529,8 +1517,7 @@ 
               && ($p_options_list[$i+1] != '')) {
             $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
             $i++;
-          }
-          else {
+          } else {
           }
         break;
 
@@ -1548,11 +1535,9 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1581,8 +1566,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1611,8 +1595,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
 			                     "Wrong parameter value for option '"
@@ -1645,14 +1628,11 @@ 
 
               // ----- Parse items
               $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
+          } else if (is_integer($p_options_list[$i+1])) {
               $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_work_list = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1679,13 +1659,11 @@ 
                   // ----- Set the option value
                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
+              } elseif ($v_size_item_list == 2) {
                   // ----- Set the option value
                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
+              } else {
                   // ----- Error log
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1841,14 +1819,17 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+    if($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
         $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
+    }
+    if($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
         $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+    }
+    if($last == 'k') {
+            $v_memory_limit = $v_memory_limit*1024;
+    }
 
     $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
 
@@ -2021,15 +2002,12 @@ 
       if (file_exists($v_descr['filename'])) {
         if (@is_file($v_descr['filename'])) {
           $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
+        } else if (@is_dir($v_descr['filename'])) {
           $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
+        } else if (@is_link($v_descr['filename'])) {
           // skip
           continue;
-        }
-        else {
+        } else {
           // skip
           continue;
         }
@@ -2078,8 +2056,7 @@ 
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
               if ($v_descr['stored_filename'] != '') {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
+              } else {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
               }
             }
@@ -2088,8 +2065,7 @@ 
           }
 
           @closedir($v_folder_handler);
-        }
-        else {
+        } else {
           // TBC : unable to open folder in read mode
         }
 
@@ -2102,8 +2078,7 @@ 
 
           // ----- Concat the resulting list
           $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
+        } else {
         }
 
         // ----- Free local array
@@ -2377,8 +2352,9 @@ 
   {
     $v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
+    if ($this->zip_fd != 0) {
+          @fclose($this->zip_fd);
+    }
     $this->zip_fd = 0;
 
     // ----- Return
@@ -2595,11 +2571,9 @@ 
     // ----- Look for filetime
     if (isset($p_filedescr['mtime'])) {
       $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
+    } else if ($p_filedescr['type'] == 'virtual_file') {
       $p_header['mtime'] = time();
-    }
-    else {
+    } else {
       $p_header['mtime'] = filemtime($p_filename);
     }
 
@@ -2607,8 +2581,7 @@ 
     if (isset($p_filedescr['comment'])) {
       $p_header['comment_len'] = strlen($p_filedescr['comment']);
       $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
+    } else {
       $p_header['comment_len'] = 0;
       $p_header['comment'] = '';
     }
@@ -2917,20 +2890,17 @@ 
     $p_filename = $p_filedescr['filename'];
     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
       $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
+    } else {
       $p_add_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
       $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
+    } else {
       $p_remove_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
       $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
+    } else {
       $p_remove_all_dir = 0;
     }
 
@@ -2953,8 +2923,7 @@ 
           $v_dir = $v_path_info['dirname'].'/';
         }
         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
+      } else {
         // ----- Calculate the stored filename
         $v_stored_filename = $p_filename;
       }
@@ -2965,8 +2934,9 @@ 
       }
       // ----- Look for partial path remove
       else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+        if (substr($p_remove_dir, -1) != '/') {
+                  $p_remove_dir .= "/";
+        }
 
         if (   (substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
@@ -2986,8 +2956,7 @@ 
         if ($v_compare > 0) {
           if ($v_compare == 2) {
             $v_stored_filename = "";
-          }
-          else {
+          } else {
             $v_stored_filename = substr($v_stored_filename,
                                         strlen($p_remove_dir));
           }
@@ -2999,10 +2968,11 @@ 
 
       // ----- Look for path to add
       if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        if (substr($p_add_dir, -1) == "/") {
+                  $v_stored_filename = $p_add_dir.$v_stored_filename;
+        } else {
+                  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        }
       }
     }
 
@@ -3285,8 +3255,9 @@ 
     if (   ($p_path == "")
 	    || (   (substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
+			&& (substr($p_path,1,2)!=":/"))) {
+          $p_path = "./".$p_path;
+    }
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != "./") && ($p_path != "/"))
@@ -3772,8 +3743,7 @@ 
         // ----- Change the file status
         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
 		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
+	  	  } else {
             $p_entry['status'] = "newer_exist";
 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
@@ -3789,19 +3759,19 @@ 
                 return PclZip::errorCode();
 		      }
 		    }
-      }
-      else {
+      } else {
       }
     }
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
+      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+              $v_dir_to_check = $p_entry['filename'];
+      } else if (!strstr($p_entry['filename'], "/")) {
+              $v_dir_to_check = "";
+      } else {
+              $v_dir_to_check = dirname($p_entry['filename']);
+      }
 
         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
 
@@ -3857,8 +3827,7 @@ 
           touch($p_entry['filename'], $p_entry['mtime']);
 
 
-        }
-        else {
+        } else {
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
@@ -4100,8 +4069,7 @@ 
           // ----- Send the file to the output
           echo $v_buffer;
           unset($v_buffer);
-        }
-        else {
+        } else {
 
           // ----- Read the compressed file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4209,8 +4177,7 @@ 
 
           // ----- Reading the file
           $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+        } else {
 
           // ----- Reading the file
           $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4222,8 +4189,7 @@ 
         }
 
         // ----- Trace
-      }
-      else {
+      } else {
           // TBC : error : can not extract a folder in a string
       }
 
@@ -4315,8 +4281,7 @@ 
     // ----- Get extra_fields
     if ($v_data['extra_len'] != 0) {
       $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
+    } else {
       $p_header['extra'] = '';
     }
 
@@ -4347,8 +4312,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4413,22 +4377,25 @@ 
     $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
 
     // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
+    if ($p_header['filename_len'] != 0) {
+          $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    } else {
+          $p_header['filename'] = '';
+    }
 
     // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
+    if ($p_header['extra_len'] != 0) {
+          $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    } else {
+          $p_header['extra'] = '';
+    }
 
     // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
+    if ($p_header['comment_len'] != 0) {
+          $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    } else {
+          $p_header['comment'] = '';
+    }
 
     // ----- Extract properties
 
@@ -4450,8 +4417,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4564,8 +4530,9 @@ 
     // ----- Go back to the maximum possible size of the Central Dir End Record
     if (!$v_found) {
       $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
+      if ($v_maximum_size > $v_size) {
+              $v_maximum_size = $v_size;
+      }
       @fseek($this->zip_fd, $v_size-$v_maximum_size);
       if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
       {
@@ -4650,9 +4617,9 @@ 
     // ----- Get comment
     if ($v_data['comment_size'] != 0) {
       $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    } else {
+          $p_central_dir['comment'] = '';
     }
-    else
-      $p_central_dir['comment'] = '';
 
     $p_central_dir['entries'] = $v_data['entries'];
     $p_central_dir['disk_entries'] = $v_data['disk_entries'];
@@ -4752,8 +4719,7 @@ 
                   if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  } elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -4804,8 +4770,7 @@ 
                   break;
               }
           }
-      }
-      else {
+      } else {
       	$v_found = true;
       }
 
@@ -4813,8 +4778,7 @@ 
       if ($v_found)
       {
         unset($v_header_list[$v_nb_extracted]);
-      }
-      else
+      } else
       {
         $v_nb_extracted++;
       }
@@ -5290,8 +5254,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
-    }
-    else {
+    } else {
       $this->error_code = $p_error_code;
       $this->error_string = $p_error_string;
     }
@@ -5307,8 +5270,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclErrorReset();
-    }
-    else {
+    } else {
       $this->error_code = 0;
       $this->error_string = '';
     }
@@ -5406,11 +5368,9 @@ 
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
           // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+        } else if ($v_list[$i] == "..") {
 		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
+        } else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
             $v_result = "/".$v_result;
@@ -5430,13 +5390,11 @@ 
             // ----- Ignore only the double '//' in path,
             // but not the first and last '/'
 		  }
-        }
-        else {
+        } else {
 		  // ----- Look for item to skip
 		  if ($v_skip > 0) {
 		    $v_skip--;
-		  }
-		  else {
+		  } else {
             $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
         }
@@ -5519,14 +5477,17 @@ 
     // ----- Look if everything seems to be the same
     if ($v_result) {
       // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+      	$j++;
+      }
+      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+      	$i++;
+      }
 
       if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
         // ----- There are exactly the same
         $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
+      } else if ($i < $v_list_dir_size) {
         // ----- The path is shorter than the dir
         $v_result = 0;
       }
@@ -5561,8 +5522,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==1)
+    } else if ($p_mode==1)
     {
       while ($p_size != 0)
       {
@@ -5571,8 +5531,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==2)
+    } else if ($p_mode==2)
     {
       while ($p_size != 0)
       {
@@ -5581,8 +5540,7 @@ 
         @gzwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==3)
+    } else if ($p_mode==3)
     {
       while ($p_size != 0)
       {
@@ -5620,8 +5578,7 @@ 
       // ----- Try to copy & unlink the src
       if (!@copy($p_src, $p_dest)) {
         $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
+      } else if (!@unlink($p_src)) {
         $v_result = 0;
       }
     }

src/wp-admin/includes/class-wp-filesystem-base.php

Doc Comments +13 added lines, -13 removed lines

@@ -374,7 +374,7 @@ 
 	 * @since 2.5.0
 	 *
 	 * @param string $mode string The *nix-style file permission.
-	 * @return int octal representation
+	 * @return string octal representation
 	 */
 	public function getnumchmodfromh( $mode ) {
 		$realmode = '';
@@ -443,7 +443,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Name of the file to read.
-	 * @return mixed|bool Returns the read data or false on failure.
+	 * @return boolean Returns the read data or false on failure.
 	 */
 	public function get_contents( $file ) {
 		return false;
@@ -455,7 +455,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Path to the file.
-	 * @return array|bool the file contents in an array or false on failure.
+	 * @return boolean the file contents in an array or false on failure.
 	 */
 	public function get_contents_array( $file ) {
 		return false;
@@ -480,7 +480,7 @@ 
 	 *
 	 * @since 2.5.0
 	 * @abstract
-	 * @return string|bool The current working directory on success, or false on failure.
+	 * @return boolean The current working directory on success, or false on failure.
 	 */
 	public function cwd() {
 		return false;
@@ -492,7 +492,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $dir The new current directory.
-	 * @return bool|string
+	 * @return boolean
 	 */
 	public function chdir( $dir ) {
 		return false;
@@ -506,7 +506,7 @@ 
 	 * @param string $file      Path to the file.
 	 * @param mixed  $group     A group name or number.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
-	 * @return bool|string
+	 * @return boolean
 	 */
 	public function chgrp( $file, $group, $recursive = false ) {
 		return false;
@@ -520,7 +520,7 @@ 
 	 * @param string $file      Path to the file.
 	 * @param int    $mode      Optional. The permissions as octal number, usually 0644 for files, 0755 for dirs.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
-	 * @return bool|string
+	 * @return boolean
 	 */
 	public function chmod( $file, $mode = false, $recursive = false ) {
 		return false;
@@ -532,7 +532,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Path to the file.
-	 * @return string|bool Username of the user or false on error.
+	 * @return boolean Username of the user or false on error.
 	 */
 	public function owner( $file ) {
 		return false;
@@ -544,7 +544,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Path to the file.
-	 * @return string|bool The group or false on error.
+	 * @return boolean The group or false on error.
 	 */
 	public function group( $file ) {
 		return false;
@@ -663,7 +663,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Path to file.
-	 * @return int|bool Unix timestamp representing last access time.
+	 * @return boolean Unix timestamp representing last access time.
 	 */
 	public function atime( $file ) {
 		return false;
@@ -675,7 +675,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Path to file.
-	 * @return int|bool Unix timestamp representing modification time.
+	 * @return boolean Unix timestamp representing modification time.
 	 */
 	public function mtime( $file ) {
 		return false;
@@ -687,7 +687,7 @@ 
 	 * @since 2.5.0
 	 * @abstract
 	 * @param string $file Path to file.
-	 * @return int|bool Size of the file in bytes.
+	 * @return boolean Size of the file in bytes.
 	 */
 	public function size( $file ) {
 		return false;
@@ -754,7 +754,7 @@ 
 	 *                               Default true.
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
-	 * @return array|bool {
+	 * @return boolean {
 	 *     Array of files. False if unable to list directory contents.
 	 *
 	 *     @type string $name        Name of the file/directory.

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Base WordPress Filesystem
- *
- * @package WordPress
- * @subpackage Filesystem
- */
+	 * Base WordPress Filesystem
+	 *
+	 * @package WordPress
+	 * @subpackage Filesystem
+	 */
 
 /**
  * Base WordPress Filesystem class for which Filesystem implementations extend
@@ -367,7 +367,7 @@ 
 	 *
 	 * Converts '-rw-r--r--' to 0644
 	 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
- 	 *
+	 *
 	 * @link http://docs.php.net/manual/en/function.chmod.php#49614
 	 *
 	 * @access public

Spacing +89 added lines, -92 removed lines

@@ -60,7 +60,7 @@ 
 	public function abspath() {
 		$folder = $this->find_folder(ABSPATH);
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir( '/' . WPINC ) )
+		if ( ! $folder && $this->is_dir('/'.WPINC))
 			$folder = '/';
 		return $folder;
 	}
@@ -98,14 +98,14 @@ 
 	 * @param string $theme The Theme stylesheet or template for the directory.
 	 * @return string The location of the remote path.
 	 */
-	public function wp_themes_dir( $theme = false ) {
-		$theme_root = get_theme_root( $theme );
+	public function wp_themes_dir($theme = false) {
+		$theme_root = get_theme_root($theme);
 
 		// Account for relative theme roots
-		if ( '/themes' == $theme_root || ! is_dir( $theme_root ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ('/themes' == $theme_root || ! is_dir($theme_root))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 
-		return $this->find_folder( $theme_root );
+		return $this->find_folder($theme_root);
 	}
 
 	/**
@@ -137,8 +137,8 @@ 
 	 *                     Default false.
 	 * @return string The location of the remote path.
 	 */
-	public function find_base_dir( $base = '.', $echo = false ) {
-		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+	public function find_base_dir($base = '.', $echo = false) {
+		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()');
 		$this->verbose = $echo;
 		return $this->abspath();
 	}
@@ -159,8 +159,8 @@ 
 	 * @param bool   $echo True to display debug information.
 	 * @return string The location of the remote path.
 	 */
-	public function get_base_dir( $base = '.', $echo = false ) {
-		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+	public function get_base_dir($base = '.', $echo = false) {
+		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()');
 		$this->verbose = $echo;
 		return $this->abspath();
 	}
@@ -177,11 +177,11 @@ 
 	 * @param string $folder the folder to locate.
 	 * @return string|false The location of the remote path, false on failure.
 	 */
-	public function find_folder( $folder ) {
-		if ( isset( $this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
+	public function find_folder($folder) {
+		if (isset($this->cache[$folder]))
+			return $this->cache[$folder];
 
-		if ( stripos($this->method, 'ftp') !== false ) {
+		if (stripos($this->method, 'ftp') !== false) {
 			$constant_overrides = array(
 				'FTP_BASE' => ABSPATH,
 				'FTP_CONTENT_DIR' => WP_CONTENT_DIR,
@@ -190,28 +190,28 @@ 
 			);
 
 			// Direct matches ( folder = CONSTANT/ )
-			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
+			foreach ($constant_overrides as $constant => $dir) {
+				if ( ! defined($constant))
 					continue;
-				if ( $folder === $dir )
-					return trailingslashit( constant( $constant ) );
+				if ($folder === $dir)
+					return trailingslashit(constant($constant));
 			}
 
 			// Prefix Matches ( folder = CONSTANT/subdir )
-			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
+			foreach ($constant_overrides as $constant => $dir) {
+				if ( ! defined($constant))
 					continue;
-				if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir
-					$potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
-					$potential_folder = trailingslashit( $potential_folder );
+				if (0 === stripos($folder, $dir)) { // $folder starts with $dir
+					$potential_folder = preg_replace('#^'.preg_quote($dir, '#').'/#i', trailingslashit(constant($constant)), $folder);
+					$potential_folder = trailingslashit($potential_folder);
 
-					if ( $this->is_dir( $potential_folder ) ) {
-						$this->cache[ $folder ] = $potential_folder;
+					if ($this->is_dir($potential_folder)) {
+						$this->cache[$folder] = $potential_folder;
 						return $potential_folder;
 					}
 				}
 			}
-		} elseif ( 'direct' == $this->method ) {
+		} elseif ('direct' == $this->method) {
 			$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
 			return trailingslashit($folder);
 		}
@@ -219,16 +219,16 @@ 
 		$folder = preg_replace('|^([a-z]{1}):|i', '', $folder); // Strip out windows drive letter if it's there.
 		$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
 
-		if ( isset($this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
+		if (isset($this->cache[$folder]))
+			return $this->cache[$folder];
 
-		if ( $this->exists($folder) ) { // Folder exists at that absolute path.
+		if ($this->exists($folder)) { // Folder exists at that absolute path.
 			$folder = trailingslashit($folder);
-			$this->cache[ $folder ] = $folder;
+			$this->cache[$folder] = $folder;
 			return $folder;
 		}
-		if ( $return = $this->search_for_folder($folder) )
-			$this->cache[ $folder ] = $return;
+		if ($return = $this->search_for_folder($folder))
+			$this->cache[$folder] = $return;
 		return $return;
 	}
 
@@ -245,26 +245,26 @@ 
 	 * @param bool   $loop   If the function has recursed, Internal use only.
 	 * @return string|false The location of the remote path, false to cease looping.
 	 */
-	public function search_for_folder( $folder, $base = '.', $loop = false ) {
-		if ( empty( $base ) || '.' == $base )
+	public function search_for_folder($folder, $base = '.', $loop = false) {
+		if (empty($base) || '.' == $base)
 			$base = trailingslashit($this->cwd());
 
 		$folder = untrailingslashit($folder);
 
-		if ( $this->verbose ) {
+		if ($this->verbose) {
 			/* translators: 1: folder to locate, 2: folder to start searching from */
-			printf( "\n" . __( 'Looking for %1$s in %2$s' ) . "<br/>\n", $folder, $base );
+			printf("\n".__('Looking for %1$s in %2$s')."<br/>\n", $folder, $base);
 		}
 
 		$folder_parts = explode('/', $folder);
-		$folder_part_keys = array_keys( $folder_parts );
-		$last_index = array_pop( $folder_part_keys );
-		$last_path = $folder_parts[ $last_index ];
+		$folder_part_keys = array_keys($folder_parts);
+		$last_index = array_pop($folder_part_keys);
+		$last_path = $folder_parts[$last_index];
 
-		$files = $this->dirlist( $base );
+		$files = $this->dirlist($base);
 
-		foreach ( $folder_parts as $index => $key ) {
-			if ( $index == $last_index )
+		foreach ($folder_parts as $index => $key) {
+			if ($index == $last_index)
 				continue; // We want this to be caught by the next code block.
 
 			/*
@@ -274,40 +274,40 @@ 
 			 * folder level, and see if that matches, and so on. If it reaches the end, and still
 			 * cant find it, it'll return false for the entire function.
 			 */
-			if ( isset($files[ $key ]) ){
+			if (isset($files[$key])) {
 
 				// Let's try that folder:
 				$newdir = trailingslashit(path_join($base, $key));
-				if ( $this->verbose ) {
+				if ($this->verbose) {
 					/* translators: %s: directory name */
-					printf( "\n" . __( 'Changing to %s' ) . "<br/>\n", $newdir );
+					printf("\n".__('Changing to %s')."<br/>\n", $newdir);
 				}
 
 				// Only search for the remaining path tokens in the directory, not the full path again.
-				$newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
-				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
+				$newfolder = implode('/', array_slice($folder_parts, $index + 1));
+				if ($ret = $this->search_for_folder($newfolder, $newdir, $loop))
 					return $ret;
 			}
 		}
 
 		// Only check this as a last resort, to prevent locating the incorrect install.
 		// All above procedures will fail quickly if this is the right branch to take.
-		if (isset( $files[ $last_path ] ) ) {
-			if ( $this->verbose ) {
+		if (isset($files[$last_path])) {
+			if ($this->verbose) {
 				/* translators: %s: directory name */
-				printf( "\n" . __( 'Found %s' ) . "<br/>\n",  $base . $last_path );
+				printf("\n".__('Found %s')."<br/>\n", $base.$last_path);
 			}
-			return trailingslashit($base . $last_path);
+			return trailingslashit($base.$last_path);
 		}
 
 		// Prevent this function from looping again.
 		// No need to proceed if we've just searched in /
-		if ( $loop || '/' == $base )
+		if ($loop || '/' == $base)
 			return false;
 
 		// As an extra last resort, Change back to / if the folder wasn't found.
 		// This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
-		return $this->search_for_folder( $folder, '/', true );
+		return $this->search_for_folder($folder, '/', true);
 
 	}
 
@@ -324,8 +324,8 @@ 
 	 * @param string $file String filename.
 	 * @return string The *nix-style representation of permissions.
 	 */
-	public function gethchmod( $file ){
-		$perms = intval( $this->getchmod( $file ), 8 );
+	public function gethchmod($file) {
+		$perms = intval($this->getchmod($file), 8);
 		if (($perms & 0xC000) == 0xC000) // Socket
 			$info = 's';
 		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
@@ -347,22 +347,19 @@ 
 		$info .= (($perms & 0x0100) ? 'r' : '-');
 		$info .= (($perms & 0x0080) ? 'w' : '-');
 		$info .= (($perms & 0x0040) ?
-					(($perms & 0x0800) ? 's' : 'x' ) :
-					(($perms & 0x0800) ? 'S' : '-'));
+					(($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
 
 		// Group
 		$info .= (($perms & 0x0020) ? 'r' : '-');
 		$info .= (($perms & 0x0010) ? 'w' : '-');
 		$info .= (($perms & 0x0008) ?
-					(($perms & 0x0400) ? 's' : 'x' ) :
-					(($perms & 0x0400) ? 'S' : '-'));
+					(($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
 
 		// World
 		$info .= (($perms & 0x0004) ? 'r' : '-');
 		$info .= (($perms & 0x0002) ? 'w' : '-');
 		$info .= (($perms & 0x0001) ?
-					(($perms & 0x0200) ? 't' : 'x' ) :
-					(($perms & 0x0200) ? 'T' : '-'));
+					(($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
 		return $info;
 	}
 
@@ -374,7 +371,7 @@ 
 	 * @param string $file
 	 * @return string the last 3 characters of the octal number
 	 */
-	public function getchmod( $file ) {
+	public function getchmod($file) {
 		return '777';
 	}
 
@@ -392,12 +389,12 @@ 
 	 * @param string $mode string The *nix-style file permission.
 	 * @return int octal representation
 	 */
-	public function getnumchmodfromh( $mode ) {
+	public function getnumchmodfromh($mode) {
 		$realmode = '';
-		$legal =  array('', 'w', 'r', 'x', '-');
+		$legal = array('', 'w', 'r', 'x', '-');
 		$attarray = preg_split('//', $mode);
 
-		for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
+		for ($i = 0, $c = count($attarray); $i < $c; $i++) {
 		   if ($key = array_search($attarray[$i], $legal)) {
 			   $realmode .= $legal[$key];
 		   }
@@ -405,7 +402,7 @@ 
 
 		$mode = str_pad($realmode, 10, '-', STR_PAD_LEFT);
 		$trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
-		$mode = strtr($mode,$trans);
+		$mode = strtr($mode, $trans);
 
 		$newmode = $mode[0];
 		$newmode .= $mode[1] + $mode[2] + $mode[3];
@@ -423,8 +420,8 @@ 
 	 * @param string $text String to test against.
 	 * @return bool true if string is binary, false otherwise.
 	 */
-	public function is_binary( $text ) {
-		return (bool) preg_match( '|[^\x20-\x7E]|', $text ); // chr(32)..chr(127)
+	public function is_binary($text) {
+		return (bool) preg_match('|[^\x20-\x7E]|', $text); // chr(32)..chr(127)
 	}
 
 	/**
@@ -440,7 +437,7 @@ 
 	 * @param bool   $recursive Optional. If set True changes file owner recursivly. Defaults to False.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	public function chown( $file, $owner, $recursive = false ) {
+	public function chown($file, $owner, $recursive = false) {
 		return false;
 	}
 
@@ -467,7 +464,7 @@ 
 	 * @param string $file Name of the file to read.
 	 * @return mixed|bool Returns the read data or false on failure.
 	 */
-	public function get_contents( $file ) {
+	public function get_contents($file) {
 		return false;
 	}
 
@@ -481,7 +478,7 @@ 
 	 * @param string $file Path to the file.
 	 * @return array|bool the file contents in an array or false on failure.
 	 */
-	public function get_contents_array( $file ) {
+	public function get_contents_array($file) {
 		return false;
 	}
 
@@ -497,7 +494,7 @@ 
 	 * @param int    $mode     Optional. The file permissions as octal number, usually 0644.
 	 * @return bool False on failure.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
+	public function put_contents($file, $contents, $mode = false) {
 		return false;
 	}
 
@@ -524,7 +521,7 @@ 
 	 * @param string $dir The new current directory.
 	 * @return bool|string
 	 */
-	public function chdir( $dir ) {
+	public function chdir($dir) {
 		return false;
 	}
 
@@ -540,7 +537,7 @@ 
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
 	 * @return bool|string
 	 */
-	public function chgrp( $file, $group, $recursive = false ) {
+	public function chgrp($file, $group, $recursive = false) {
 		return false;
 	}
 
@@ -556,7 +553,7 @@ 
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
 	 * @return bool|string
 	 */
-	public function chmod( $file, $mode = false, $recursive = false ) {
+	public function chmod($file, $mode = false, $recursive = false) {
 		return false;
 	}
 
@@ -570,7 +567,7 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|bool Username of the user or false on error.
 	 */
-	public function owner( $file ) {
+	public function owner($file) {
 		return false;
 	}
 
@@ -584,7 +581,7 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|bool The group or false on error.
 	 */
-	public function group( $file ) {
+	public function group($file) {
 		return false;
 	}
 
@@ -603,7 +600,7 @@ 
 	 *                            Default false.
 	 * @return bool True if file copied successfully, False otherwise.
 	 */
-	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
 		return false;
 	}
 
@@ -620,7 +617,7 @@ 
 	 *                            Default false.
 	 * @return bool True if file copied successfully, False otherwise.
 	 */
-	public function move( $source, $destination, $overwrite = false ) {
+	public function move($source, $destination, $overwrite = false) {
 		return false;
 	}
 
@@ -638,7 +635,7 @@ 
 	 *                          Default false.
 	 * @return bool True if the file or directory was deleted, false on failure.
 	 */
-	public function delete( $file, $recursive = false, $type = false ) {
+	public function delete($file, $recursive = false, $type = false) {
 		return false;
 	}
 
@@ -652,7 +649,7 @@ 
 	 * @param string $file Path to file/directory.
 	 * @return bool Whether $file exists or not.
 	 */
-	public function exists( $file ) {
+	public function exists($file) {
 		return false;
 	}
 
@@ -666,7 +663,7 @@ 
 	 * @param string $file File path.
 	 * @return bool Whether $file is a file.
 	 */
-	public function is_file( $file ) {
+	public function is_file($file) {
 		return false;
 	}
 
@@ -680,7 +677,7 @@ 
 	 * @param string $path Directory path.
 	 * @return bool Whether $path is a directory.
 	 */
-	public function is_dir( $path ) {
+	public function is_dir($path) {
 		return false;
 	}
 
@@ -694,7 +691,7 @@ 
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is readable.
 	 */
-	public function is_readable( $file ) {
+	public function is_readable($file) {
 		return false;
 	}
 
@@ -708,7 +705,7 @@ 
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is writable.
 	 */
-	public function is_writable( $file ) {
+	public function is_writable($file) {
 		return false;
 	}
 
@@ -722,7 +719,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|bool Unix timestamp representing last access time.
 	 */
-	public function atime( $file ) {
+	public function atime($file) {
 		return false;
 	}
 
@@ -736,7 +733,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|bool Unix timestamp representing modification time.
 	 */
-	public function mtime( $file ) {
+	public function mtime($file) {
 		return false;
 	}
 
@@ -750,7 +747,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|bool Size of the file in bytes.
 	 */
-	public function size( $file ) {
+	public function size($file) {
 		return false;
 	}
 
@@ -770,7 +767,7 @@ 
 	 *                      Default 0.
 	 * @return bool Whether operation was successful or not.
 	 */
-	public function touch( $file, $time = 0, $atime = 0 ) {
+	public function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 
@@ -790,7 +787,7 @@ 
 	 *                      Default false.
 	 * @return bool False if directory cannot be created, true otherwise.
 	 */
-	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		return false;
 	}
 
@@ -806,7 +803,7 @@ 
 	 *                          Default false.
 	 * @return bool Whether directory is deleted successfully or not.
 	 */
-	public function rmdir( $path, $recursive = false ) {
+	public function rmdir($path, $recursive = false) {
 		return false;
 	}
 
@@ -837,7 +834,7 @@ 
 	 *     @type mixed  $files       If a directory and $recursive is true, contains another array of files.
 	 * }
 	 */
-	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
+	public function dirlist($path, $include_hidden = true, $recursive = false) {
 		return false;
 	}
 

Braces +54 added lines, -32 removed lines

@@ -60,8 +60,9 @@ 
 	public function abspath() {
 		$folder = $this->find_folder(ABSPATH);
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir( '/' . WPINC ) )
-			$folder = '/';
+		if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {
+					$folder = '/';
+		}
 		return $folder;
 	}
 
@@ -102,8 +103,9 @@ 
 		$theme_root = get_theme_root( $theme );
 
 		// Account for relative theme roots
-		if ( '/themes' == $theme_root || ! is_dir( $theme_root ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( '/themes' == $theme_root || ! is_dir( $theme_root ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 
 		return $this->find_folder( $theme_root );
 	}
@@ -178,8 +180,9 @@ 
 	 * @return string|false The location of the remote path, false on failure.
 	 */
 	public function find_folder( $folder ) {
-		if ( isset( $this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
+		if ( isset( $this->cache[ $folder ] ) ) {
+					return $this->cache[ $folder ];
+		}
 
 		if ( stripos($this->method, 'ftp') !== false ) {
 			$constant_overrides = array(
@@ -191,16 +194,19 @@ 
 
 			// Direct matches ( folder = CONSTANT/ )
 			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
-					continue;
-				if ( $folder === $dir )
-					return trailingslashit( constant( $constant ) );
+				if ( ! defined( $constant ) ) {
+									continue;
+				}
+				if ( $folder === $dir ) {
+									return trailingslashit( constant( $constant ) );
+				}
 			}
 
 			// Prefix Matches ( folder = CONSTANT/subdir )
 			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
-					continue;
+				if ( ! defined( $constant ) ) {
+									continue;
+				}
 				if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir
 					$potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
 					$potential_folder = trailingslashit( $potential_folder );
@@ -219,16 +225,18 @@ 
 		$folder = preg_replace('|^([a-z]{1}):|i', '', $folder); // Strip out windows drive letter if it's there.
 		$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
 
-		if ( isset($this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
+		if ( isset($this->cache[ $folder ] ) ) {
+					return $this->cache[ $folder ];
+		}
 
 		if ( $this->exists($folder) ) { // Folder exists at that absolute path.
 			$folder = trailingslashit($folder);
 			$this->cache[ $folder ] = $folder;
 			return $folder;
 		}
-		if ( $return = $this->search_for_folder($folder) )
-			$this->cache[ $folder ] = $return;
+		if ( $return = $this->search_for_folder($folder) ) {
+					$this->cache[ $folder ] = $return;
+		}
 		return $return;
 	}
 
@@ -246,8 +254,9 @@ 
 	 * @return string|false The location of the remote path, false to cease looping.
 	 */
 	public function search_for_folder( $folder, $base = '.', $loop = false ) {
-		if ( empty( $base ) || '.' == $base )
-			$base = trailingslashit($this->cwd());
+		if ( empty( $base ) || '.' == $base ) {
+					$base = trailingslashit($this->cwd());
+		}
 
 		$folder = untrailingslashit($folder);
 
@@ -264,8 +273,10 @@ 
 		$files = $this->dirlist( $base );
 
 		foreach ( $folder_parts as $index => $key ) {
-			if ( $index == $last_index )
-				continue; // We want this to be caught by the next code block.
+			if ( $index == $last_index ) {
+							continue;
+			}
+			// We want this to be caught by the next code block.
 
 			/*
 			 * Working from /home/ to /user/ to /wordpress/ see if that file exists within
@@ -285,8 +296,9 @@ 
 
 				// Only search for the remaining path tokens in the directory, not the full path again.
 				$newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
-				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
-					return $ret;
+				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) ) {
+									return $ret;
+				}
 			}
 		}
 
@@ -302,8 +314,9 @@ 
 
 		// Prevent this function from looping again.
 		// No need to proceed if we've just searched in /
-		if ( $loop || '/' == $base )
-			return false;
+		if ( $loop || '/' == $base ) {
+					return false;
+		}
 
 		// As an extra last resort, Change back to / if the folder wasn't found.
 		// This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
@@ -326,22 +339,31 @@ 
 	 */
 	public function gethchmod( $file ){
 		$perms = intval( $this->getchmod( $file ), 8 );
-		if (($perms & 0xC000) == 0xC000) // Socket
+		if (($perms & 0xC000) == 0xC000) {
+			// Socket
 			$info = 's';
-		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
+		} elseif (($perms & 0xA000) == 0xA000) {
+			// Symbolic Link
 			$info = 'l';
-		elseif (($perms & 0x8000) == 0x8000) // Regular
+		} elseif (($perms & 0x8000) == 0x8000) {
+			// Regular
 			$info = '-';
-		elseif (($perms & 0x6000) == 0x6000) // Block special
+		} elseif (($perms & 0x6000) == 0x6000) {
+			// Block special
 			$info = 'b';
-		elseif (($perms & 0x4000) == 0x4000) // Directory
+		} elseif (($perms & 0x4000) == 0x4000) {
+			// Directory
 			$info = 'd';
-		elseif (($perms & 0x2000) == 0x2000) // Character special
+		} elseif (($perms & 0x2000) == 0x2000) {
+			// Character special
 			$info = 'c';
-		elseif (($perms & 0x1000) == 0x1000) // FIFO pipe
+		} elseif (($perms & 0x1000) == 0x1000) {
+			// FIFO pipe
 			$info = 'p';
-		else // Unknown
+		} else {
+			// Unknown
 			$info = 'u';
+		}
 
 		// Owner
 		$info .= (($perms & 0x0100) ? 'r' : '-');

src/wp-admin/includes/class-wp-filesystem-ftpext.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	/**
 	 * @param string $file
 	 * @param string $contents
-	 * @param bool|int $mode
+	 * @param string|boolean $mode
 	 * @return bool
 	 */
 	public function put_contents($file, $contents, $mode = false ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress FTP Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
+	 * WordPress FTP Filesystem.
+	 *
+	 * @package WordPress
+	 * @subpackage Filesystem
+	 */
 
 /**
  * WordPress Filesystem Class for implementing FTP.

Spacing +95 added lines, -95 removed lines

@@ -22,44 +22,44 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! extension_loaded('ftp') ) {
+		if ( ! extension_loaded('ftp')) {
 			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
 			return;
 		}
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
+		if ( ! defined('FS_TIMEOUT'))
 			define('FS_TIMEOUT', 240);
 
-		if ( empty($opt['port']) )
+		if (empty($opt['port']))
 			$this->options['port'] = 21;
 		else
 			$this->options['port'] = $opt['port'];
 
-		if ( empty($opt['hostname']) )
+		if (empty($opt['hostname']))
 			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
+		if (empty($opt['username']))
 			$this->errors->add('empty_username', __('FTP username is required'));
 		else
 			$this->options['username'] = $opt['username'];
 
-		if ( empty($opt['password']) )
+		if (empty($opt['password']))
 			$this->errors->add('empty_password', __('FTP password is required'));
 		else
 			$this->options['password'] = $opt['password'];
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
+		if (isset($opt['connection_type']) && 'ftps' == $opt['connection_type'])
 			$this->options['ssl'] = true;
 	}
 
@@ -69,25 +69,25 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
+		if (isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect'))
 			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		else
 			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 
-		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to FTP Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( ! @ftp_login( $this->link,$this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add( 'auth',
+		if ( ! @ftp_login($this->link, $this->options['username'], $this->options['password'])) {
+			$this->errors->add('auth',
 				/* translators: %s: username */
-				sprintf( __( 'Username/Password incorrect for %s' ),
+				sprintf(__('Username/Password incorrect for %s'),
 					$this->options['username']
 				)
 			);
@@ -95,8 +95,8 @@ 
 		}
 
 		// Set the Connection to use Passive FTP
-		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+		@ftp_pasv($this->link, true);
+		if (@ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT)
 			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 
 		return true;
@@ -112,25 +112,25 @@ 
 	 * @return string|false File contents on success, false if no temp file could be opened,
 	 *                      or if the file couldn't be retrieved.
 	 */
-	public function get_contents( $file ) {
+	public function get_contents($file) {
 		$tempfile = wp_tempnam($file);
 		$temp = fopen($tempfile, 'w+');
 
-		if ( ! $temp ) {
-			unlink( $tempfile );
+		if ( ! $temp) {
+			unlink($tempfile);
 			return false;
 		}
 		
-		if ( ! @ftp_fget( $this->link, $temp, $file, FTP_BINARY ) ) {
-			fclose( $temp );
-			unlink( $tempfile );
+		if ( ! @ftp_fget($this->link, $temp, $file, FTP_BINARY)) {
+			fclose($temp);
+			unlink($tempfile);
 			return false;
 		}
 		
-		fseek( $temp, 0 ); // Skip back to the start of the file being written to
+		fseek($temp, 0); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
+		while ( ! feof($temp))
 			$contents .= fread($temp, 8192);
 
 		fclose($temp);
@@ -156,28 +156,28 @@ 
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
+	public function put_contents($file, $contents, $mode = false) {
 		$tempfile = wp_tempnam($file);
-		$temp = fopen( $tempfile, 'wb+' );
-		if ( ! $temp )
+		$temp = fopen($tempfile, 'wb+');
+		if ( ! $temp)
 			return false;
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
-		$bytes_written = fwrite( $temp, $contents );
+		$data_length = strlen($contents);
+		$bytes_written = fwrite($temp, $contents);
 
 		reset_mbstring_encoding();
 
-		if ( $data_length !== $bytes_written ) {
-			fclose( $temp );
-			unlink( $tempfile );
+		if ($data_length !== $bytes_written) {
+			fclose($temp);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temp, 0 ); // Skip back to the start of the file being written to
+		fseek($temp, 0); // Skip back to the start of the file being written to
 
-		$ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY );
+		$ret = @ftp_fput($this->link, $file, $temp, FTP_BINARY);
 
 		fclose($temp);
 		unlink($tempfile);
@@ -194,7 +194,7 @@ 
 	 */
 	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
+		if ($cwd)
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
@@ -218,26 +218,26 @@ 
 	 * @return bool
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir($file) ) {
+		if ($recursive && $this->is_dir($file)) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ((array) $filelist as $filename => $filemeta)
+				$this->chmod($file.'/'.$filename, $mode, $recursive);
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-		return (bool)@ftp_chmod($this->link, $mode, $file);
+		if ( ! function_exists('ftp_chmod'))
+			return (bool) @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		return (bool) @ftp_chmod($this->link, $mode, $file);
 	}
 
 	/**
@@ -282,10 +282,10 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 		$content = $this->get_contents($source);
-		if ( false === $content )
+		if (false === $content)
 			return false;
 		return $this->put_contents($destination, $content, $mode);
 	}
@@ -311,17 +311,17 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
+		if (empty($file))
 			return false;
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
+		if ( ! $recursive)
 			return @ftp_rmdir($this->link, $file);
 
-		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
-				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
+		$filelist = $this->dirlist(trailingslashit($file));
+		if ( ! empty($filelist))
+			foreach ($filelist as $delete_file)
+				$this->delete(trailingslashit($file).$delete_file['name'], $recursive, $delete_file['type']);
 		return @ftp_rmdir($this->link, $file);
 	}
 
@@ -334,11 +334,11 @@ 
 	public function exists($file) {
 		$list = @ftp_nlist($this->link, $file);
 
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		if (empty($list) && $this->is_dir($file)) {
 			return true; // File is an empty directory.
 		}
 
-		return !empty($list); //empty list = no file, so invert.
+		return ! empty($list); //empty list = no file, so invert.
 	}
 
 	/**
@@ -348,7 +348,7 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		return $this->exists($file) && !$this->is_dir($file);
+		return $this->exists($file) && ! $this->is_dir($file);
 	}
 
 	/**
@@ -359,8 +359,8 @@ 
 	 */
 	public function is_dir($path) {
 		$cwd = $this->cwd();
-		$result = @ftp_chdir($this->link, trailingslashit($path) );
-		if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
+		$result = @ftp_chdir($this->link, trailingslashit($path));
+		if ($result && $path == $this->cwd() || $this->cwd() != $cwd) {
 			@ftp_chdir($this->link, $cwd);
 			return true;
 		}
@@ -438,10 +438,10 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( !@ftp_mkdir($this->link, $path) )
+		if ( ! @ftp_mkdir($this->link, $path))
 			return false;
 		$this->chmod($path, $chmod);
 		return true;
@@ -467,17 +467,17 @@ 
 	 */
 	public function parselisting($line) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if (is_null($is_windows))
+			$is_windows = stripos(ftp_systype($this->link), 'win') !== false;
 
-		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
+		if ($is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer)) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
+			if ($lucifer[3] < 70)
+				$lucifer[3] += 2000;
 			else
 				$lucifer[3] += 1900; // 4digit year fix
-			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
+			$b['isdir'] = ($lucifer[7] == '<DIR>');
+			if ($b['isdir'])
 				$b['type'] = 'd';
 			else
 				$b['type'] = 'f';
@@ -490,27 +490,27 @@ 
 			$b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
 			$b['am/pm'] = $lucifer[6];
 			$b['name'] = $lucifer[8];
-		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
+		} elseif ( ! $is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount = count($lucifer);
-			if ( $lcount < 8 )
+			if ($lcount < 8)
 				return '';
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
+			if ($b['isdir'])
 				$b['type'] = 'd';
-			elseif ( $b['islink'] )
+			elseif ($b['islink'])
 				$b['type'] = 'l';
 			else
 				$b['type'] = 'f';
 			$b['perms'] = $lucifer[0];
-			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
+			$b['permsn'] = $this->getnumchmodfromh($b['perms']);
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
 			$b['size'] = $lucifer[4];
-			if ( $lcount == 8 ) {
+			if ($lcount == 8) {
 				sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
 				sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
 				$b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
@@ -518,7 +518,7 @@ 
 			} else {
 				$b['month'] = $lucifer[5];
 				$b['day'] = $lucifer[6];
-				if ( preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2) ) {
+				if (preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2)) {
 					$b['year'] = date("Y");
 					$b['hour'] = $l2[1];
 					$b['minute'] = $l2[2];
@@ -527,14 +527,14 @@ 
 					$b['hour'] = 0;
 					$b['minute'] = 0;
 				}
-				$b['time'] = strtotime( sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']) );
+				$b['time'] = strtotime(sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']));
 				$b['name'] = $lucifer[8];
 			}
 		}
 
 		// Replace symlinks formatted as "source -> target" with just the source name
-		if ( isset( $b['islink'] ) && $b['islink'] ) {
-			$b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+		if (isset($b['islink']) && $b['islink']) {
+			$b['name'] = preg_replace('/(\s*->\s*.*)$/', '', $b['name']);
 		}
 
 		return $b;
@@ -549,50 +549,50 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
-			$path = dirname($path) . '/';
+			$path = dirname($path).'/';
 		} else {
 			$limit_file = false;
 		}
 
 		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		if ( ! @ftp_chdir($this->link, $path)) // Cant change to folder = folder doesn't exist
 			return false;
 		$list = @ftp_rawlist($this->link, '-a', false);
 		@ftp_chdir($this->link, $pwd);
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if (empty($list)) // Empty array = non-existent folder (real folder will show . at least)
 			return false;
 
 		$dirlist = array();
-		foreach ( $list as $k => $v ) {
+		foreach ($list as $k => $v) {
 			$entry = $this->parselisting($v);
-			if ( empty($entry) )
+			if (empty($entry))
 				continue;
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
+			if ('.' == $entry['name'] || '..' == $entry['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
+			if ( ! $include_hidden && '.' == $entry['name'][0])
 				continue;
 
-			if ( $limit_file && $entry['name'] != $limit_file)
+			if ($limit_file && $entry['name'] != $limit_file)
 				continue;
 
-			$dirlist[ $entry['name'] ] = $entry;
+			$dirlist[$entry['name']] = $entry;
 		}
 
 		$ret = array();
-		foreach ( (array)$dirlist as $struc ) {
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+		foreach ((array) $dirlist as $struc) {
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		return $ret;
 	}
@@ -601,7 +601,7 @@ 
 	 * @access public
 	 */
 	public function __destruct() {
-		if ( $this->link )
+		if ($this->link)
 			ftp_close($this->link);
 	}
 }

Braces +130 added lines, -92 removed lines

@@ -34,33 +34,39 @@ 
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
-			define('FS_TIMEOUT', 240);
+		if ( ! defined('FS_TIMEOUT') ) {
+					define('FS_TIMEOUT', 240);
+		}
 
-		if ( empty($opt['port']) )
-			$this->options['port'] = 21;
-		else
-			$this->options['port'] = $opt['port'];
+		if ( empty($opt['port']) ) {
+					$this->options['port'] = 21;
+		} else {
+					$this->options['port'] = $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
+		if ( empty($opt['hostname']) ) {
+					$this->errors->add('empty_hostname', __('FTP hostname is required'));
+		} else {
+					$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
-			$this->options['username'] = $opt['username'];
+		if ( empty($opt['username']) ) {
+					$this->errors->add('empty_username', __('FTP username is required'));
+		} else {
+					$this->options['username'] = $opt['username'];
+		}
 
-		if ( empty($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
-			$this->options['password'] = $opt['password'];
+		if ( empty($opt['password']) ) {
+					$this->errors->add('empty_password', __('FTP password is required'));
+		} else {
+					$this->options['password'] = $opt['password'];
+		}
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
-			$this->options['ssl'] = true;
+		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] ) {
+					$this->options['ssl'] = true;
+		}
 	}
 
 	/**
@@ -69,10 +75,11 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
-		else
-			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') ) {
+					$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		} else {
+					$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		}
 
 		if ( ! $this->link ) {
 			$this->errors->add( 'connect',
@@ -96,8 +103,9 @@ 
 
 		// Set the Connection to use Passive FTP
 		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
-			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT ) {
+					@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		}
 
 		return true;
 	}
@@ -130,8 +138,9 @@ 
 		fseek( $temp, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
-			$contents .= fread($temp, 8192);
+		while ( ! feof($temp) ) {
+					$contents .= fread($temp, 8192);
+		}
 
 		fclose($temp);
 		unlink($tempfile);
@@ -159,8 +168,9 @@ 
 	public function put_contents($file, $contents, $mode = false ) {
 		$tempfile = wp_tempnam($file);
 		$temp = fopen( $tempfile, 'wb+' );
-		if ( ! $temp )
-			return false;
+		if ( ! $temp ) {
+					return false;
+		}
 
 		mbstring_binary_safe_encoding();
 
@@ -194,8 +204,9 @@ 
 	 */
 	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		if ( $cwd ) {
+					$cwd = trailingslashit($cwd);
+		}
 		return $cwd;
 	}
 
@@ -219,24 +230,27 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
 		// chmod any sub-objects if recursive.
 		if ( $recursive && $this->is_dir($file) ) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ( (array)$filelist as $filename => $filemeta ) {
+							$this->chmod($file . '/' . $filename, $mode, $recursive);
+			}
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		if ( ! function_exists('ftp_chmod') ) {
+					return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		}
 		return (bool)@ftp_chmod($this->link, $mode, $file);
 	}
 
@@ -282,11 +296,13 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 		$content = $this->get_contents($source);
-		if ( false === $content )
-			return false;
+		if ( false === $content ) {
+					return false;
+		}
 		return $this->put_contents($destination, $content, $mode);
 	}
 
@@ -311,17 +327,21 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
-			return false;
-		if ( 'f' == $type || $this->is_file($file) )
-			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
-			return @ftp_rmdir($this->link, $file);
+		if ( empty($file) ) {
+					return false;
+		}
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return @ftp_delete($this->link, $file);
+		}
+		if ( !$recursive ) {
+					return @ftp_rmdir($this->link, $file);
+		}
 
 		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
+		if ( !empty($filelist) ) {
+					foreach ( $filelist as $delete_file )
 				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
+		}
 		return @ftp_rmdir($this->link, $file);
 	}
 
@@ -438,11 +458,13 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( !@ftp_mkdir($this->link, $path) )
-			return false;
+		if ( !@ftp_mkdir($this->link, $path) ) {
+					return false;
+		}
 		$this->chmod($path, $chmod);
 		return true;
 	}
@@ -467,20 +489,24 @@ 
 	 */
 	public function parselisting($line) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if ( is_null($is_windows) ) {
+					$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		}
 
 		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
-			else
-				$lucifer[3] += 1900; // 4digit year fix
+			if ( $lucifer[3] < 70 ) {
+							$lucifer[3] +=2000;
+			} else {
+							$lucifer[3] += 1900;
+			}
+			// 4digit year fix
 			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['size'] = $lucifer[7];
 			$b['month'] = $lucifer[1];
 			$b['day'] = $lucifer[2];
@@ -493,17 +519,19 @@ 
 		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount = count($lucifer);
-			if ( $lcount < 8 )
-				return '';
+			if ( $lcount < 8 ) {
+							return '';
+			}
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} elseif ( $b['islink'] ) {
+							$b['type'] = 'l';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['perms'] = $lucifer[0];
 			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
 			$b['number'] = $lucifer[1];
@@ -557,28 +585,36 @@ 
 		}
 
 		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		if ( ! @ftp_chdir($this->link, $path) ) {
+			// Cant change to folder = folder doesn't exist
 			return false;
+		}
 		$list = @ftp_rawlist($this->link, '-a', false);
 		@ftp_chdir($this->link, $pwd);
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if ( empty($list) ) {
+			// Empty array = non-existent folder (real folder will show . at least)
 			return false;
+		}
 
 		$dirlist = array();
 		foreach ( $list as $k => $v ) {
 			$entry = $this->parselisting($v);
-			if ( empty($entry) )
-				continue;
+			if ( empty($entry) ) {
+							continue;
+			}
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
-				continue;
+			if ( '.' == $entry['name'] || '..' == $entry['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $entry['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $entry['name'] != $limit_file)
-				continue;
+			if ( $limit_file && $entry['name'] != $limit_file) {
+							continue;
+			}
 
 			$dirlist[ $entry['name'] ] = $entry;
 		}
@@ -586,10 +622,11 @@ 
 		$ret = array();
 		foreach ( (array)$dirlist as $struc ) {
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;
@@ -601,7 +638,8 @@ 
 	 * @access public
 	 */
 	public function __destruct() {
-		if ( $this->link )
-			ftp_close($this->link);
+		if ( $this->link ) {
+					ftp_close($this->link);
+		}
 	}
 }

src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

Doc Comments +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
 
 	/**
 	 * @param string $file
-	 * @return int
+	 * @return false|string
 	 */
 	public function size($file) {
 		return $this->ftp->filesize($file);

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress FTP Sockets Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
+	 * WordPress FTP Sockets Filesystem.
+	 *
+	 * @package WordPress
+	 * @subpackage Filesystem
+	 */
 
 /**
  * WordPress Filesystem Class for implementing FTP Sockets.

Spacing +79 added lines, -79 removed lines

@@ -26,33 +26,33 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt  = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ftpsockets';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) {
+		if ( ! @include_once(ABSPATH.'wp-admin/includes/class-ftp.php')) {
 			return;
 		}
 		$this->ftp = new ftp();
 
-		if ( empty($opt['port']) )
+		if (empty($opt['port']))
 			$this->options['port'] = 21;
 		else
 			$this->options['port'] = (int) $opt['port'];
 
-		if ( empty($opt['hostname']) )
+		if (empty($opt['hostname']))
 			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
 		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
+		if (empty ($opt['username']))
 			$this->errors->add('empty_username', __('FTP username is required'));
 		else
 			$this->options['username'] = $opt['username'];
 
-		if ( empty ($opt['password']) )
+		if (empty ($opt['password']))
 			$this->errors->add('empty_password', __('FTP password is required'));
 		else
 			$this->options['password'] = $opt['password'];
@@ -64,44 +64,44 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( ! $this->ftp )
+		if ( ! $this->ftp)
 			return false;
 
 		$this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 
-		if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port'])) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to FTP Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( ! $this->ftp->connect() ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->ftp->connect()) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to FTP Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add( 'auth',
+		if ( ! $this->ftp->login($this->options['username'], $this->options['password'])) {
+			$this->errors->add('auth',
 				/* translators: %s: username */
-				sprintf( __( 'Username/Password incorrect for %s' ),
+				sprintf(__('Username/Password incorrect for %s'),
 					$this->options['username']
 				)
 			);
 			return false;
 		}
 
-		$this->ftp->SetType( FTP_BINARY );
-		$this->ftp->Passive( true );
-		$this->ftp->setTimeout( FS_TIMEOUT );
+		$this->ftp->SetType(FTP_BINARY);
+		$this->ftp->Passive(true);
+		$this->ftp->setTimeout(FS_TIMEOUT);
 		return true;
 	}
 
@@ -115,18 +115,18 @@ 
 	 * @return string|false File contents on success, false if no temp file could be opened,
 	 *                      or if the file doesn't exist.
 	 */
-	public function get_contents( $file ) {
-		if ( ! $this->exists($file) )
+	public function get_contents($file) {
+		if ( ! $this->exists($file))
 			return false;
 
-		$temp = wp_tempnam( $file );
+		$temp = wp_tempnam($file);
 
-		if ( ! $temphandle = fopen($temp, 'w+') )
+		if ( ! $temphandle = fopen($temp, 'w+'))
 			return false;
 
 		mbstring_binary_safe_encoding();
 
-		if ( ! $this->ftp->fget($temphandle, $file) ) {
+		if ( ! $this->ftp->fget($temphandle, $file)) {
 			fclose($temphandle);
 			unlink($temp);
 
@@ -137,10 +137,10 @@ 
 
 		reset_mbstring_encoding();
 
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
+		fseek($temphandle, 0); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temphandle) )
+		while ( ! feof($temphandle))
 			$contents .= fread($temphandle, 8192);
 
 		fclose($temphandle);
@@ -155,7 +155,7 @@ 
 	 * @return array
 	 */
 	public function get_contents_array($file) {
-		return explode("\n", $this->get_contents($file) );
+		return explode("\n", $this->get_contents($file));
 	}
 
 	/**
@@ -166,9 +166,9 @@ 
 	 * @param int|bool $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
-		$temp = wp_tempnam( $file );
-		if ( ! $temphandle = @fopen($temp, 'w+') ) {
+	public function put_contents($file, $contents, $mode = false) {
+		$temp = wp_tempnam($file);
+		if ( ! $temphandle = @fopen($temp, 'w+')) {
 			unlink($temp);
 			return false;
 		}
@@ -176,17 +176,17 @@ 
 		// The FTP class uses string functions internally during file download/upload
 		mbstring_binary_safe_encoding();
 
-		$bytes_written = fwrite( $temphandle, $contents );
-		if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
-			fclose( $temphandle );
-			unlink( $temp );
+		$bytes_written = fwrite($temphandle, $contents);
+		if (false === $bytes_written || $bytes_written != strlen($contents)) {
+			fclose($temphandle);
+			unlink($temp);
 
 			reset_mbstring_encoding();
 
 			return false;
 		}
 
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
+		fseek($temphandle, 0); // Skip back to the start of the file being written to
 
 		$ret = $this->ftp->fput($file, $temphandle);
 
@@ -207,7 +207,7 @@ 
 	 */
 	public function cwd() {
 		$cwd = $this->ftp->pwd();
-		if ( $cwd )
+		if ($cwd)
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
@@ -230,21 +230,21 @@ 
 	 * @param bool $recursive
 	 * @return bool
 	 */
-	public function chmod($file, $mode = false, $recursive = false ) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+	public function chmod($file, $mode = false, $recursive = false) {
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir($file) ) {
+		if ($recursive && $this->is_dir($file)) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ((array) $filelist as $filename => $filemeta)
+				$this->chmod($file.'/'.$filename, $mode, $recursive);
 		}
 
 		// chmod the file or directory
@@ -294,11 +294,11 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		$content = $this->get_contents($source);
-		if ( false === $content )
+		if (false === $content)
 			return false;
 
 		return $this->put_contents($destination, $content, $mode);
@@ -312,7 +312,7 @@ 
 	 * @param bool   $overwrite
 	 * @return bool
 	 */
-	public function move($source, $destination, $overwrite = false ) {
+	public function move($source, $destination, $overwrite = false) {
 		return $this->ftp->rename($source, $destination);
 	}
 
@@ -325,11 +325,11 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
+		if (empty($file))
 			return false;
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return $this->ftp->delete($file);
-		if ( !$recursive )
+		if ( ! $recursive)
 			return $this->ftp->rmdir($file);
 
 		return $this->ftp->mdel($file);
@@ -341,14 +341,14 @@ 
 	 * @param string $file
 	 * @return bool
 	 */
-	public function exists( $file ) {
-		$list = $this->ftp->nlist( $file );
+	public function exists($file) {
+		$list = $this->ftp->nlist($file);
 
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		if (empty($list) && $this->is_dir($file)) {
 			return true; // File is an empty directory.
 		}
 
-		return !empty( $list ); //empty list = no file, so invert.
+		return ! empty($list); //empty list = no file, so invert.
 		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
 	}
 
@@ -359,9 +359,9 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		if ( $this->is_dir($file) )
+		if ($this->is_dir($file))
 			return false;
-		if ( $this->exists($file) )
+		if ($this->exists($file))
 			return true;
 		return false;
 	}
@@ -374,7 +374,7 @@ 
 	 */
 	public function is_dir($path) {
 		$cwd = $this->cwd();
-		if ( $this->chdir($path) ) {
+		if ($this->chdir($path)) {
 			$this->chdir($cwd);
 			return true;
 		}
@@ -437,7 +437,7 @@ 
 	 * @param int $atime
 	 * @return bool
 	 */
-	public function touch($file, $time = 0, $atime = 0 ) {
+	public function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 
@@ -450,14 +450,14 @@ 
 	 * @param mixed  $chgrp
 	 * @return bool
 	 */
-	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( ! $this->ftp->mkdir($path) )
+		if ( ! $this->ftp->mkdir($path))
 			return false;
-		if ( ! $chmod )
+		if ( ! $chmod)
 			$chmod = FS_CHMOD_DIR;
 		$this->chmod($path, $chmod);
 		return true;
@@ -469,7 +469,7 @@ 
 	 * @param string $path
 	 * @param bool $recursive
 	 */
-	public function rmdir($path, $recursive = false ) {
+	public function rmdir($path, $recursive = false) {
 		$this->delete($path, $recursive);
 	}
 
@@ -481,10 +481,10 @@ 
 	 * @param bool   $recursive
 	 * @return bool|array
 	 */
-	public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
-		if ( $this->is_file($path) ) {
+	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
-			$path = dirname($path) . '/';
+			$path = dirname($path).'/';
 		} else {
 			$limit_file = false;
 		}
@@ -492,7 +492,7 @@ 
 		mbstring_binary_safe_encoding();
 
 		$list = $this->ftp->dirlist($path);
-		if ( empty( $list ) && ! $this->exists( $path ) ) {
+		if (empty($list) && ! $this->exists($path)) {
 
 			reset_mbstring_encoding();
 
@@ -500,32 +500,32 @@ 
 		}
 
 		$ret = array();
-		foreach ( $list as $struc ) {
+		foreach ($list as $struc) {
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ('.' == $struc['name'] || '..' == $struc['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0])
 				continue;
 
-			if ( $limit_file && $struc['name'] != $limit_file )
+			if ($limit_file && $struc['name'] != $limit_file)
 				continue;
 
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
 			// Replace symlinks formatted as "source -> target" with just the source name
-			if ( $struc['islink'] )
-				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+			if ($struc['islink'])
+				$struc['name'] = preg_replace('/(\s*->\s*.*)$/', '', $struc['name']);
 
 			// Add the Octal representation of the file permissions
-			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
+			$struc['permsn'] = $this->getnumchmodfromh($struc['perms']);
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 
 		reset_mbstring_encoding();

Braces +93 added lines, -67 removed lines

@@ -36,26 +36,30 @@ 
 		}
 		$this->ftp = new ftp();
 
-		if ( empty($opt['port']) )
-			$this->options['port'] = 21;
-		else
-			$this->options['port'] = (int) $opt['port'];
+		if ( empty($opt['port']) ) {
+					$this->options['port'] = 21;
+		} else {
+					$this->options['port'] = (int) $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
+		if ( empty($opt['hostname']) ) {
+					$this->errors->add('empty_hostname', __('FTP hostname is required'));
+		} else {
+					$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
-			$this->options['username'] = $opt['username'];
-
-		if ( empty ($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
-			$this->options['password'] = $opt['password'];
+		if ( empty ($opt['username']) ) {
+					$this->errors->add('empty_username', __('FTP username is required'));
+		} else {
+					$this->options['username'] = $opt['username'];
+		}
+
+		if ( empty ($opt['password']) ) {
+					$this->errors->add('empty_password', __('FTP password is required'));
+		} else {
+					$this->options['password'] = $opt['password'];
+		}
 	}
 
 	/**
@@ -64,8 +68,9 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( ! $this->ftp )
-			return false;
+		if ( ! $this->ftp ) {
+					return false;
+		}
 
 		$this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 
@@ -116,13 +121,15 @@ 
 	 *                      or if the file doesn't exist.
 	 */
 	public function get_contents( $file ) {
-		if ( ! $this->exists($file) )
-			return false;
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
 
 		$temp = wp_tempnam( $file );
 
-		if ( ! $temphandle = fopen($temp, 'w+') )
-			return false;
+		if ( ! $temphandle = fopen($temp, 'w+') ) {
+					return false;
+		}
 
 		mbstring_binary_safe_encoding();
 
@@ -140,8 +147,9 @@ 
 		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temphandle) )
-			$contents .= fread($temphandle, 8192);
+		while ( ! feof($temphandle) ) {
+					$contents .= fread($temphandle, 8192);
+		}
 
 		fclose($temphandle);
 		unlink($temp);
@@ -207,8 +215,9 @@ 
 	 */
 	public function cwd() {
 		$cwd = $this->ftp->pwd();
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		if ( $cwd ) {
+					$cwd = trailingslashit($cwd);
+		}
 		return $cwd;
 	}
 
@@ -232,19 +241,21 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false ) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
 		// chmod any sub-objects if recursive.
 		if ( $recursive && $this->is_dir($file) ) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ( (array)$filelist as $filename => $filemeta ) {
+							$this->chmod($file . '/' . $filename, $mode, $recursive);
+			}
 		}
 
 		// chmod the file or directory
@@ -294,12 +305,14 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		$content = $this->get_contents($source);
-		if ( false === $content )
-			return false;
+		if ( false === $content ) {
+					return false;
+		}
 
 		return $this->put_contents($destination, $content, $mode);
 	}
@@ -325,12 +338,15 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
-			return false;
-		if ( 'f' == $type || $this->is_file($file) )
-			return $this->ftp->delete($file);
-		if ( !$recursive )
-			return $this->ftp->rmdir($file);
+		if ( empty($file) ) {
+					return false;
+		}
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return $this->ftp->delete($file);
+		}
+		if ( !$recursive ) {
+					return $this->ftp->rmdir($file);
+		}
 
 		return $this->ftp->mdel($file);
 	}
@@ -359,10 +375,12 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		if ( $this->is_dir($file) )
-			return false;
-		if ( $this->exists($file) )
-			return true;
+		if ( $this->is_dir($file) ) {
+					return false;
+		}
+		if ( $this->exists($file) ) {
+					return true;
+		}
 		return false;
 	}
 
@@ -452,13 +470,16 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( ! $this->ftp->mkdir($path) )
-			return false;
-		if ( ! $chmod )
-			$chmod = FS_CHMOD_DIR;
+		if ( ! $this->ftp->mkdir($path) ) {
+					return false;
+		}
+		if ( ! $chmod ) {
+					$chmod = FS_CHMOD_DIR;
+		}
 		$this->chmod($path, $chmod);
 		return true;
 	}
@@ -502,25 +523,30 @@ 
 		$ret = array();
 		foreach ( $list as $struc ) {
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue;
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file )
-				continue;
+			if ( $limit_file && $struc['name'] != $limit_file ) {
+							continue;
+			}
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			// Replace symlinks formatted as "source -> target" with just the source name
-			if ( $struc['islink'] )
-				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+			if ( $struc['islink'] ) {
+							$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+			}
 
 			// Add the Octal representation of the file permissions
 			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );

src/wp-admin/includes/class-wp-filesystem-ssh2.php

Doc Comments +3 added lines, -3 removed lines

@@ -155,7 +155,7 @@ 
 
 	/**
 	 * @param string $file
-	 * @return string|false
+	 * @return string
 	 */
 	public function get_contents( $file ) {
 		$file = ltrim($file, '/');
@@ -190,7 +190,7 @@ 
 
 	/**
 	 *
-	 * @return bool
+	 * @return string
 	 */
 	public function cwd() {
 		$cwd = ssh2_sftp_realpath( $this->sftp_link, '.' );
@@ -213,7 +213,7 @@ 
 	 * @param string $group
 	 * @param bool   $recursive
 	 *
-	 * @return bool
+	 * @return boolean|string
 	 */
 	public function chgrp($file, $group, $recursive = false ) {
 		if ( ! $this->exists($file) )

Braces +112 added lines, -78 removed lines

@@ -61,15 +61,17 @@ 
 		}
 
 		// Set defaults:
-		if ( empty($opt['port']) )
-			$this->options['port'] = 22;
-		else
-			$this->options['port'] = $opt['port'];
+		if ( empty($opt['port']) ) {
+					$this->options['port'] = 22;
+		} else {
+					$this->options['port'] = $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
+		if ( empty($opt['hostname']) ) {
+					$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
+		} else {
+					$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
 		if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
@@ -83,13 +85,15 @@ 
 			$this->errors->add('empty_username', __('SSH2 username is required'));
 		}
 
-		if ( !empty($opt['username']) )
-			$this->options['username'] = $opt['username'];
+		if ( !empty($opt['username']) ) {
+					$this->options['username'] = $opt['username'];
+		}
 
 		if ( empty ($opt['password']) ) {
 			// Password can be blank if we are using keys.
-			if ( !$this->keys )
-				$this->errors->add('empty_password', __('SSH2 password is required'));
+			if ( !$this->keys ) {
+							$this->errors->add('empty_password', __('SSH2 password is required'));
+			}
 		} else {
 			$this->options['password'] = $opt['password'];
 		}
@@ -134,8 +138,9 @@ 
 	 * @return bool|string
 	 */
 	public function run_command( $command, $returnbool = false ) {
-		if ( ! $this->link )
-			return false;
+		if ( ! $this->link ) {
+					return false;
+		}
 
 		if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
 			$this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
@@ -145,10 +150,11 @@ 
 			$data = stream_get_contents( $stream );
 			fclose( $stream );
 
-			if ( $returnbool )
-				return ( $data === false ) ? false : '' != trim($data);
-			else
-				return $data;
+			if ( $returnbool ) {
+							return ( $data === false ) ? false : '' != trim($data);
+			} else {
+							return $data;
+			}
 		}
 		return false;
 	}
@@ -180,8 +186,9 @@ 
 	public function put_contents($file, $contents, $mode = false ) {
 		$ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents );
 
-		if ( $ret !== strlen( $contents ) )
-			return false;
+		if ( $ret !== strlen( $contents ) ) {
+					return false;
+		}
 
 		$this->chmod($file, $mode);
 
@@ -216,10 +223,12 @@ 
 	 * @return bool
 	 */
 	public function chgrp($file, $group, $recursive = false ) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+		}
 		return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 	}
 
@@ -230,20 +239,23 @@ 
 	 * @return bool|string
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
 
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
+		}
 		return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
 	}
 
@@ -258,10 +270,12 @@ 
 	 * @return bool|string Returns true on success or false on failure.
 	 */
 	public function chown( $file, $owner, $recursive = false ) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+		}
 		return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 	}
 
@@ -271,10 +285,12 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
-		if ( ! $owneruid )
-			return false;
-		if ( ! function_exists('posix_getpwuid') )
-			return $owneruid;
+		if ( ! $owneruid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getpwuid') ) {
+					return $owneruid;
+		}
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
 	}
@@ -292,10 +308,12 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
-		if ( ! $gid )
-			return false;
-		if ( ! function_exists('posix_getgrgid') )
-			return $gid;
+		if ( ! $gid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getgrgid') ) {
+					return $gid;
+		}
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
 	}
@@ -308,11 +326,13 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 		$content = $this->get_contents($source);
-		if ( false === $content)
-			return false;
+		if ( false === $content) {
+					return false;
+		}
 		return $this->put_contents($destination, $content, $mode);
 	}
 
@@ -333,10 +353,12 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( 'f' == $type || $this->is_file($file) )
-			return ssh2_sftp_unlink($this->sftp_link, $file);
-		if ( ! $recursive )
-			 return ssh2_sftp_rmdir($this->sftp_link, $file);
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return ssh2_sftp_unlink($this->sftp_link, $file);
+		}
+		if ( ! $recursive ) {
+					 return ssh2_sftp_rmdir($this->sftp_link, $file);
+		}
 		$filelist = $this->dirlist($file);
 		if ( is_array($filelist) ) {
 			foreach ( $filelist as $filename => $fileinfo) {
@@ -431,17 +453,22 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( ! $chmod )
-			$chmod = FS_CHMOD_DIR;
-		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
-			return false;
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		if ( ! $chmod ) {
+					$chmod = FS_CHMOD_DIR;
+		}
+		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) ) {
+					return false;
+		}
+		if ( $chown ) {
+					$this->chown($path, $chown);
+		}
+		if ( $chgrp ) {
+					$this->chgrp($path, $chgrp);
+		}
 		return true;
 	}
 
@@ -468,27 +495,33 @@ 
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
-			return false;
+		if ( ! $this->is_dir($path) ) {
+					return false;
+		}
 
 		$ret = array();
 		$dir = @dir('ssh2.sftp://' . $this->sftp_link .'/' . ltrim($path, '/') );
 
-		if ( ! $dir )
-			return false;
+		if ( ! $dir ) {
+					return false;
+		}
 
 		while (false !== ($entry = $dir->read()) ) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue; //Do not care about these folders.
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+							continue;
+			}
+			//Do not care about these folders.
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file )
-				continue;
+			if ( $limit_file && $struc['name'] != $limit_file ) {
+							continue;
+			}
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
@@ -502,10 +535,11 @@ 
 			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;

Indentation +33 added lines, -33 removed lines

@@ -1,38 +1,38 @@
 <?php
 /**
- * WordPress Filesystem Class for implementing SSH2
- *
- * To use this class you must follow these steps for PHP 5.2.6+
- *
- * @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes
- *
- * Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now, But many users have found the latest versions work)
- *
- * cd /usr/src
- * wget http://surfnet.dl.sourceforge.net/sourceforge/libssh2/libssh2-0.14.tar.gz
- * tar -zxvf libssh2-0.14.tar.gz
- * cd libssh2-0.14/
- * ./configure
- * make all install
- *
- * Note: Do not leave the directory yet!
- *
- * Enter: pecl install -f ssh2
- *
- * Copy the ssh.so file it creates to your PHP Module Directory.
- * Open up your PHP.INI file and look for where extensions are placed.
- * Add in your PHP.ini file: extension=ssh2.so
- *
- * Restart Apache!
- * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
- *
- * Note: as of WordPress 2.8, This utilises the PHP5+ function 'stream_get_contents'
- *
- * @since 2.7.0
- *
- * @package WordPress
- * @subpackage Filesystem
- */
+	 * WordPress Filesystem Class for implementing SSH2
+	 *
+	 * To use this class you must follow these steps for PHP 5.2.6+
+	 *
+	 * @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes
+	 *
+	 * Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now, But many users have found the latest versions work)
+	 *
+	 * cd /usr/src
+	 * wget http://surfnet.dl.sourceforge.net/sourceforge/libssh2/libssh2-0.14.tar.gz
+	 * tar -zxvf libssh2-0.14.tar.gz
+	 * cd libssh2-0.14/
+	 * ./configure
+	 * make all install
+	 *
+	 * Note: Do not leave the directory yet!
+	 *
+	 * Enter: pecl install -f ssh2
+	 *
+	 * Copy the ssh.so file it creates to your PHP Module Directory.
+	 * Open up your PHP.INI file and look for where extensions are placed.
+	 * Add in your PHP.ini file: extension=ssh2.so
+	 *
+	 * Restart Apache!
+	 * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
+	 *
+	 * Note: as of WordPress 2.8, This utilises the PHP5+ function 'stream_get_contents'
+	 *
+	 * @since 2.7.0
+	 *
+	 * @package WordPress
+	 * @subpackage Filesystem
+	 */
 class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
 	/**

Spacing +108 added lines, -108 removed lines

@@ -52,21 +52,21 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ssh2';
 		$this->errors = new WP_Error();
 
 		//Check if possible to use ssh2 functions.
-		if ( ! extension_loaded('ssh2') ) {
+		if ( ! extension_loaded('ssh2')) {
 			$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
 			return;
 		}
-		if ( !function_exists('stream_get_contents') ) {
+		if ( ! function_exists('stream_get_contents')) {
 			$this->errors->add(
 				'ssh2_php_requirement',
 				sprintf(
 					/* translators: %s: stream_get_contents() */
-					__( 'The ssh2 PHP extension is available, however, we require the PHP5 function %s' ),
+					__('The ssh2 PHP extension is available, however, we require the PHP5 function %s'),
 					'<code>stream_get_contents()</code>'
 				)
 			);
@@ -74,34 +74,34 @@ 
 		}
 
 		// Set defaults:
-		if ( empty($opt['port']) )
+		if (empty($opt['port']))
 			$this->options['port'] = 22;
 		else
 			$this->options['port'] = $opt['port'];
 
-		if ( empty($opt['hostname']) )
+		if (empty($opt['hostname']))
 			$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
 		// Check if the options provided are OK.
-		if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
+		if ( ! empty ($opt['public_key']) && ! empty ($opt['private_key'])) {
 			$this->options['public_key'] = $opt['public_key'];
 			$this->options['private_key'] = $opt['private_key'];
 
 			$this->options['hostkey'] = array('hostkey' => 'ssh-rsa');
 
 			$this->keys = true;
-		} elseif ( empty ($opt['username']) ) {
+		} elseif (empty ($opt['username'])) {
 			$this->errors->add('empty_username', __('SSH2 username is required'));
 		}
 
-		if ( !empty($opt['username']) )
+		if ( ! empty($opt['username']))
 			$this->options['username'] = $opt['username'];
 
-		if ( empty ($opt['password']) ) {
+		if (empty ($opt['password'])) {
 			// Password can be blank if we are using keys.
-			if ( !$this->keys )
+			if ( ! $this->keys)
 				$this->errors->add('empty_password', __('SSH2 password is required'));
 		} else {
 			$this->options['password'] = $opt['password'];
@@ -114,37 +114,37 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( ! $this->keys ) {
+		if ( ! $this->keys) {
 			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
 		} else {
 			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
 		}
 
-		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to SSH2 Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to SSH2 Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( !$this->keys ) {
-			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
-				$this->errors->add( 'auth',
+		if ( ! $this->keys) {
+			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password'])) {
+				$this->errors->add('auth',
 					/* translators: %s: username */
-					sprintf( __( 'Username/Password incorrect for %s' ),
+					sprintf(__('Username/Password incorrect for %s'),
 						$this->options['username']
 					)
 				);
 				return false;
 			}
 		} else {
-			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
-				$this->errors->add( 'auth',
+			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'])) {
+				$this->errors->add('auth',
 					/* translators: %s: username */
-					sprintf( __( 'Public and Private keys incorrect for %s' ),
+					sprintf(__('Public and Private keys incorrect for %s'),
 						$this->options['username']
 					)
 				);
@@ -152,12 +152,12 @@ 
 			}
 		}
 
-		$this->sftp_link = ssh2_sftp( $this->link );
-		if ( ! $this->sftp_link ) {
-			$this->errors->add( 'connect',
+		$this->sftp_link = ssh2_sftp($this->link);
+		if ( ! $this->sftp_link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to initialize a SFTP subsystem session with the SSH2 Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
@@ -181,11 +181,11 @@ 
 	 * @param string $path The File/Directory path on the remote server to return
 	 * @return string The ssh2.sftp:// wrapped path to use.
 	 */
-	public function sftp_path( $path ) {
-		if ( '/' === $path ) {
+	public function sftp_path($path) {
+		if ('/' === $path) {
 			$path = '/./';
 		}
-		return 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $path, '/' );
+		return 'ssh2.sftp://'.$this->sftp_link.'/'.ltrim($path, '/');
 	}
 
 	/**
@@ -195,25 +195,25 @@ 
 	 * @param bool $returnbool
 	 * @return bool|string
 	 */
-	public function run_command( $command, $returnbool = false ) {
-		if ( ! $this->link )
+	public function run_command($command, $returnbool = false) {
+		if ( ! $this->link)
 			return false;
 
-		if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
-			$this->errors->add( 'command',
+		if ( ! ($stream = ssh2_exec($this->link, $command))) {
+			$this->errors->add('command',
 				/* translators: %s: command */
-				sprintf( __( 'Unable to perform command: %s'),
+				sprintf(__('Unable to perform command: %s'),
 					$command
 				)
 			);
 		} else {
-			stream_set_blocking( $stream, true );
-			stream_set_timeout( $stream, FS_TIMEOUT );
-			$data = stream_get_contents( $stream );
-			fclose( $stream );
+			stream_set_blocking($stream, true);
+			stream_set_timeout($stream, FS_TIMEOUT);
+			$data = stream_get_contents($stream);
+			fclose($stream);
 
-			if ( $returnbool )
-				return ( $data === false ) ? false : '' != trim($data);
+			if ($returnbool)
+				return ($data === false) ? false : '' != trim($data);
 			else
 				return $data;
 		}
@@ -226,8 +226,8 @@ 
 	 * @param string $file
 	 * @return string|false
 	 */
-	public function get_contents( $file ) {
-		return file_get_contents( $this->sftp_path( $file ) );
+	public function get_contents($file) {
+		return file_get_contents($this->sftp_path($file));
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @return array
 	 */
 	public function get_contents_array($file) {
-		return file( $this->sftp_path( $file ) );
+		return file($this->sftp_path($file));
 	}
 
 	/**
@@ -248,10 +248,10 @@ 
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
-		$ret = file_put_contents( $this->sftp_path( $file ), $contents );
+	public function put_contents($file, $contents, $mode = false) {
+		$ret = file_put_contents($this->sftp_path($file), $contents);
 
-		if ( $ret !== strlen( $contents ) )
+		if ($ret !== strlen($contents))
 			return false;
 
 		$this->chmod($file, $mode);
@@ -265,9 +265,9 @@ 
 	 * @return bool
 	 */
 	public function cwd() {
-		$cwd = ssh2_sftp_realpath( $this->sftp_link, '.' );
-		if ( $cwd ) {
-			$cwd = trailingslashit( trim( $cwd ) );
+		$cwd = ssh2_sftp_realpath($this->sftp_link, '.');
+		if ($cwd) {
+			$cwd = trailingslashit(trim($cwd));
 		}
 		return $cwd;
 	}
@@ -279,7 +279,7 @@ 
 	 * @return bool|string
 	 */
 	public function chdir($dir) {
-		return $this->run_command('cd ' . $dir, true);
+		return $this->run_command('cd '.$dir, true);
 	}
 
 	/**
@@ -291,10 +291,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function chgrp($file, $group, $recursive = false ) {
-		if ( ! $this->exists($file) )
+	public function chgrp($file, $group, $recursive = false) {
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 		return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 	}
@@ -308,19 +308,19 @@ 
 	 * @return bool|string
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
 
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
 		return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
 	}
@@ -335,10 +335,10 @@ 
 	 * @param bool       $recursive Optional. If set True changes file owner recursivly. Defaults to False.
 	 * @return bool|string Returns true on success or false on failure.
 	 */
-	public function chown( $file, $owner, $recursive = false ) {
-		if ( ! $this->exists($file) )
+	public function chown($file, $owner, $recursive = false) {
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 		return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 	}
@@ -350,10 +350,10 @@ 
 	 * @return string|false
 	 */
 	public function owner($file) {
-		$owneruid = @fileowner( $this->sftp_path( $file ) );
-		if ( ! $owneruid )
+		$owneruid = @fileowner($this->sftp_path($file));
+		if ( ! $owneruid)
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		if ( ! function_exists('posix_getpwuid'))
 			return $owneruid;
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
@@ -366,7 +366,7 @@ 
 	 * @return string
 	 */
 	public function getchmod($file) {
-		return substr( decoct( @fileperms( $this->sftp_path( $file ) ) ), -3 );
+		return substr(decoct(@fileperms($this->sftp_path($file))), -3);
 	}
 
 	/**
@@ -376,10 +376,10 @@ 
 	 * @return string|false
 	 */
 	public function group($file) {
-		$gid = @filegroup( $this->sftp_path( $file ) );
-		if ( ! $gid )
+		$gid = @filegroup($this->sftp_path($file));
+		if ( ! $gid)
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		if ( ! function_exists('posix_getgrgid'))
 			return $gid;
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
@@ -395,10 +395,10 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 		$content = $this->get_contents($source);
-		if ( false === $content)
+		if (false === $content)
 			return false;
 		return $this->put_contents($destination, $content, $mode);
 	}
@@ -412,7 +412,7 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		return @ssh2_sftp_rename( $this->sftp_link, $source, $destination );
+		return @ssh2_sftp_rename($this->sftp_link, $source, $destination);
 	}
 
 	/**
@@ -424,14 +424,14 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return ssh2_sftp_unlink($this->sftp_link, $file);
-		if ( ! $recursive )
+		if ( ! $recursive)
 			 return ssh2_sftp_rmdir($this->sftp_link, $file);
 		$filelist = $this->dirlist($file);
-		if ( is_array($filelist) ) {
-			foreach ( $filelist as $filename => $fileinfo) {
-				$this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
+		if (is_array($filelist)) {
+			foreach ($filelist as $filename => $fileinfo) {
+				$this->delete($file.'/'.$filename, $recursive, $fileinfo['type']);
 			}
 		}
 		return ssh2_sftp_rmdir($this->sftp_link, $file);
@@ -444,7 +444,7 @@ 
 	 * @return bool
 	 */
 	public function exists($file) {
-		return file_exists( $this->sftp_path( $file ) );
+		return file_exists($this->sftp_path($file));
 	}
 
 	/**
@@ -454,7 +454,7 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		return is_file( $this->sftp_path( $file ) );
+		return is_file($this->sftp_path($file));
 	}
 
 	/**
@@ -464,7 +464,7 @@ 
 	 * @return bool
 	 */
 	public function is_dir($path) {
-		return is_dir( $this->sftp_path( $path ) );
+		return is_dir($this->sftp_path($path));
 	}
 
 	/**
@@ -474,7 +474,7 @@ 
 	 * @return bool
 	 */
 	public function is_readable($file) {
-		return is_readable( $this->sftp_path( $file ) );
+		return is_readable($this->sftp_path($file));
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 	 * @return int
 	 */
 	public function atime($file) {
-		return fileatime( $this->sftp_path( $file ) );
+		return fileatime($this->sftp_path($file));
 	}
 
 	/**
@@ -505,7 +505,7 @@ 
 	 * @return int
 	 */
 	public function mtime($file) {
-		return filemtime( $this->sftp_path( $file ) );
+		return filemtime($this->sftp_path($file));
 	}
 
 	/**
@@ -515,7 +515,7 @@ 
 	 * @return int
 	 */
 	public function size($file) {
-		return filesize( $this->sftp_path( $file ) );
+		return filesize($this->sftp_path($file));
 	}
 
 	/**
@@ -540,16 +540,16 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( ! $chmod )
+		if ( ! $chmod)
 			$chmod = FS_CHMOD_DIR;
-		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
+		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true))
 			return false;
-		if ( $chown )
+		if ($chown)
 			$this->chown($path, $chown);
-		if ( $chgrp )
+		if ($chgrp)
 			$this->chgrp($path, $chgrp);
 		return true;
 	}
@@ -574,54 +574,54 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
 			$path = dirname($path);
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir($path))
 			return false;
 
 		$ret = array();
-		$dir = @dir( $this->sftp_path( $path ) );
+		$dir = @dir($this->sftp_path($path));
 
-		if ( ! $dir )
+		if ( ! $dir)
 			return false;
 
-		while (false !== ($entry = $dir->read()) ) {
+		while (false !== ($entry = $dir->read())) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ('.' == $struc['name'] || '..' == $struc['name'])
 				continue; //Do not care about these folders.
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0])
 				continue;
 
-			if ( $limit_file && $struc['name'] != $limit_file )
+			if ($limit_file && $struc['name'] != $limit_file)
 				continue;
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
+			$struc['number'] = false;
 			$struc['owner']    	= $this->owner($path.'/'.$entry);
 			$struc['group']    	= $this->group($path.'/'.$entry);
 			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
-
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+			$struc['lastmodunix'] = $this->mtime($path.'/'.$entry);
+			$struc['lastmod']   = date('M j', $struc['lastmodunix']);
+			$struc['time']    	= date('h:i:s', $struc['lastmodunix']);
+			$struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		$dir->close();
 		unset($dir);

src/wp-admin/includes/class-wp-list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Administration API: WP_List_Table class
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- */
+	 * Administration API: WP_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 */
 
 /**
  * Base class for displaying a list of items in an ajaxified HTML table.

Spacing +269 added lines, -269 removed lines

@@ -93,7 +93,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $compat_fields = array( '_args', '_pagination_args', 'screen', '_actions', '_pagination' );
+	protected $compat_fields = array('_args', '_pagination_args', 'screen', '_actions', '_pagination');
 
 	/**
 	 * {@internal Missing Summary}
@@ -101,10 +101,10 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $compat_methods = array( 'set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
+	protected $compat_methods = array('set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
 		'row_actions', 'months_dropdown', 'view_switcher', 'comments_bubble', 'get_items_per_page', 'pagination',
 		'get_sortable_columns', 'get_column_info', 'get_table_classes', 'display_tablenav', 'extra_tablenav',
-		'single_row_columns' );
+		'single_row_columns');
 
 	/**
 	 * Constructor.
@@ -132,35 +132,35 @@ 
 	 *                            Default null.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
-		$args = wp_parse_args( $args, array(
+	public function __construct($args = array()) {
+		$args = wp_parse_args($args, array(
 			'plural' => '',
 			'singular' => '',
 			'ajax' => false,
 			'screen' => null,
-		) );
+		));
 
-		$this->screen = convert_to_screen( $args['screen'] );
+		$this->screen = convert_to_screen($args['screen']);
 
-		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
+		add_filter("manage_{$this->screen->id}_columns", array($this, 'get_columns'), 0);
 
-		if ( !$args['plural'] )
+		if ( ! $args['plural'])
 			$args['plural'] = $this->screen->base;
 
-		$args['plural'] = sanitize_key( $args['plural'] );
-		$args['singular'] = sanitize_key( $args['singular'] );
+		$args['plural'] = sanitize_key($args['plural']);
+		$args['singular'] = sanitize_key($args['singular']);
 
 		$this->_args = $args;
 
-		if ( $args['ajax'] ) {
+		if ($args['ajax']) {
 			// wp_enqueue_script( 'list-table' );
-			add_action( 'admin_footer', array( $this, '_js_vars' ) );
+			add_action('admin_footer', array($this, '_js_vars'));
 		}
 
-		if ( empty( $this->modes ) ) {
+		if (empty($this->modes)) {
 			$this->modes = array(
-				'list'    => __( 'List View' ),
-				'excerpt' => __( 'Excerpt View' )
+				'list'    => __('List View'),
+				'excerpt' => __('Excerpt View')
 			);
 		}
 	}
@@ -174,8 +174,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -190,8 +190,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -205,9 +205,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -219,9 +219,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 
@@ -235,9 +235,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|bool Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -250,7 +250,7 @@ 
 	 * @abstract
 	 */
 	public function ajax_user_can() {
-		die( 'function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 * @abstract
 	 */
 	public function prepare_items() {
-		die( 'function WP_List_Table::prepare_items() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::prepare_items() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -273,19 +273,19 @@ 
 	 *
 	 * @param array|string $args Array or string of arguments with information about the pagination.
 	 */
-	protected function set_pagination_args( $args ) {
-		$args = wp_parse_args( $args, array(
+	protected function set_pagination_args($args) {
+		$args = wp_parse_args($args, array(
 			'total_items' => 0,
 			'total_pages' => 0,
 			'per_page' => 0,
-		) );
+		));
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( ! $args['total_pages'] && $args['per_page'] > 0)
+			$args['total_pages'] = ceil($args['total_items'] / $args['per_page']);
 
 		// Redirect if page number is invalid and headers are not already sent.
-		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
-			wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
+		if ( ! headers_sent() && ( ! defined('DOING_AJAX') || ! DOING_AJAX) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages']) {
+			wp_redirect(add_query_arg('paged', $args['total_pages']));
 			exit;
 		}
 
@@ -302,12 +302,12 @@ 
 	 *                    'total_pages', 'per_page', or 'infinite_scroll'.
 	 * @return int Number of items that correspond to the given pagination argument.
 	 */
-	public function get_pagination_arg( $key ) {
-		if ( 'page' === $key ) {
+	public function get_pagination_arg($key) {
+		if ('page' === $key) {
 			return $this->get_pagenum();
 		}
 
-		if ( isset( $this->_pagination_args[$key] ) ) {
+		if (isset($this->_pagination_args[$key])) {
 			return $this->_pagination_args[$key];
 		}
 	}
@@ -321,7 +321,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return !empty( $this->items );
+		return ! empty($this->items);
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No items found.' );
+		_e('No items found.');
 	}
 
 	/**
@@ -343,25 +343,25 @@ 
 	 * @param string $text The search button text
 	 * @param string $input_id The search input id
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items())
 			return;
 
-		$input_id = $input_id . '-search-input';
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby']))
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
+		if ( ! empty($_REQUEST['order']))
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
+		if ( ! empty($_REQUEST['post_mime_type']))
+			echo '<input type="hidden" name="post_mime_type" value="'.esc_attr($_REQUEST['post_mime_type']).'" />';
+		if ( ! empty($_REQUEST['detached']))
+			echo '<input type="hidden" name="detached" value="'.esc_attr($_REQUEST['detached']).'" />';
 ?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', '', false, array('id' => 'search-submit') ); ?>
+	<?php submit_button($text, 'button', '', false, array('id' => 'search-submit')); ?>
 </p>
 <?php
 	}
@@ -397,18 +397,18 @@ 
 		 *
 		 * @param array $views An array of available list table views.
 		 */
-		$views = apply_filters( "views_{$this->screen->id}", $views );
+		$views = apply_filters("views_{$this->screen->id}", $views);
 
-		if ( empty( $views ) )
+		if (empty($views))
 			return;
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $class => $view ) {
-			$views[ $class ] = "\t<li class='$class'>$view";
+		foreach ($views as $class => $view) {
+			$views[$class] = "\t<li class='$class'>$view";
 		}
-		echo implode( " |</li>\n", $views ) . "</li>\n";
+		echo implode(" |</li>\n", $views)."</li>\n";
 		echo "</ul>";
 	}
 
@@ -434,8 +434,8 @@ 
 	 * @param string $which The location of the bulk actions: 'top' or 'bottom'.
 	 *                      This is designated as optional for backwards-compatibility.
 	 */
-	protected function bulk_actions( $which = '' ) {
-		if ( is_null( $this->_actions ) ) {
+	protected function bulk_actions($which = '') {
+		if (is_null($this->_actions)) {
 			$no_new_actions = $this->_actions = $this->get_bulk_actions();
 			/**
 			 * Filter the list table Bulk Actions drop-down.
@@ -449,29 +449,29 @@ 
 			 *
 			 * @param array $actions An array of the available bulk actions.
 			 */
-			$this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions );
-			$this->_actions = array_intersect_assoc( $this->_actions, $no_new_actions );
+			$this->_actions = apply_filters("bulk_actions-{$this->screen->id}", $this->_actions);
+			$this->_actions = array_intersect_assoc($this->_actions, $no_new_actions);
 			$two = '';
 		} else {
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
+		if (empty($this->_actions))
 			return;
 
-		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
-		echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
-		echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>\n";
+		echo '<label for="bulk-action-selector-'.esc_attr($which).'" class="screen-reader-text">'.__('Select bulk action').'</label>';
+		echo '<select name="action'.$two.'" id="bulk-action-selector-'.esc_attr($which)."\">\n";
+		echo '<option value="-1">'.__('Bulk Actions')."</option>\n";
 
-		foreach ( $this->_actions as $name => $title ) {
+		foreach ($this->_actions as $name => $title) {
 			$class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
-			echo "\t" . '<option value="' . $name . '"' . $class . '>' . $title . "</option>\n";
+			echo "\t".'<option value="'.$name.'"'.$class.'>'.$title."</option>\n";
 		}
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+		submit_button(__('Apply'), 'action', '', false, array('id' => "doaction$two"));
 		echo "\n";
 	}
 
@@ -484,13 +484,13 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
+		if (isset($_REQUEST['filter_action']) && ! empty($_REQUEST['filter_action']))
 			return false;
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
+		if (isset($_REQUEST['action']) && -1 != $_REQUEST['action'])
 			return $_REQUEST['action'];
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
+		if (isset($_REQUEST['action2']) && -1 != $_REQUEST['action2'])
 			return $_REQUEST['action2'];
 
 		return false;
@@ -506,22 +506,22 @@ 
 	 * @param bool $always_visible Whether the actions should be always visible
 	 * @return string
 	 */
-	protected function row_actions( $actions, $always_visible = false ) {
-		$action_count = count( $actions );
+	protected function row_actions($actions, $always_visible = false) {
+		$action_count = count($actions);
 		$i = 0;
 
-		if ( !$action_count )
+		if ( ! $action_count)
 			return '';
 
-		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
-		foreach ( $actions as $action => $link ) {
+		$out = '<div class="'.($always_visible ? 'row-actions visible' : 'row-actions').'">';
+		foreach ($actions as $action => $link) {
 			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+			($i == $action_count) ? $sep = '' : $sep = ' | ';
 			$out .= "<span class='$action'>$link$sep</span>";
 		}
 		$out .= '</div>';
 
-		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>';
 
 		return $out;
 	}
@@ -537,7 +537,7 @@ 
 	 *
 	 * @param string $post_type
 	 */
-	protected function months_dropdown( $post_type ) {
+	protected function months_dropdown($post_type) {
 		global $wpdb, $wp_locale;
 
 		/**
@@ -548,24 +548,24 @@ 
 		 * @param bool   $disable   Whether to disable the drop-down. Default false.
 		 * @param string $post_type The post type.
 		 */
-		if ( apply_filters( 'disable_months_dropdown', false, $post_type ) ) {
+		if (apply_filters('disable_months_dropdown', false, $post_type)) {
 			return;
 		}
 
 		$extra_checks = "AND post_status != 'auto-draft'";
-		if ( ! isset( $_GET['post_status'] ) || 'trash' !== $_GET['post_status'] ) {
+		if ( ! isset($_GET['post_status']) || 'trash' !== $_GET['post_status']) {
 			$extra_checks .= " AND post_status != 'trash'";
-		} elseif ( isset( $_GET['post_status'] ) ) {
-			$extra_checks = $wpdb->prepare( ' AND post_status = %s', $_GET['post_status'] );
+		} elseif (isset($_GET['post_status'])) {
+			$extra_checks = $wpdb->prepare(' AND post_status = %s', $_GET['post_status']);
 		}
 
-		$months = $wpdb->get_results( $wpdb->prepare( "
+		$months = $wpdb->get_results($wpdb->prepare("
 			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 			FROM $wpdb->posts
 			WHERE post_type = %s
 			$extra_checks
 			ORDER BY post_date DESC
-		", $post_type ) );
+		", $post_type));
 
 		/**
 		 * Filter the 'Months' drop-down results.
@@ -575,31 +575,31 @@ 
 		 * @param object $months    The months drop-down query results.
 		 * @param string $post_type The post type.
 		 */
-		$months = apply_filters( 'months_dropdown_results', $months, $post_type );
+		$months = apply_filters('months_dropdown_results', $months, $post_type);
 
-		$month_count = count( $months );
+		$month_count = count($months);
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+		if ( ! $month_count || (1 == $month_count && 0 == $months[0]->month))
 			return;
 
-		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
+		$m = isset($_GET['m']) ? (int) $_GET['m'] : 0;
 ?>
-		<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
+		<label for="filter-by-date" class="screen-reader-text"><?php _e('Filter by date'); ?></label>
 		<select name="m" id="filter-by-date">
-			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
+			<option<?php selected($m, 0); ?> value="0"><?php _e('All dates'); ?></option>
 <?php
-		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
+		foreach ($months as $arc_row) {
+			if (0 == $arc_row->year)
 				continue;
 
-			$month = zeroise( $arc_row->month, 2 );
+			$month = zeroise($arc_row->month, 2);
 			$year = $arc_row->year;
 
-			printf( "<option %s value='%s'>%s</option>\n",
-				selected( $m, $year . $month, false ),
-				esc_attr( $arc_row->year . $month ),
+			printf("<option %s value='%s'>%s</option>\n",
+				selected($m, $year.$month, false),
+				esc_attr($arc_row->year.$month),
 				/* translators: 1: month name, 2: 4-digit year */
-				sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
+				sprintf(__('%1$s %2$d'), $wp_locale->get_month($month), $year)
 			);
 		}
 ?>
@@ -615,19 +615,19 @@ 
 	 *
 	 * @param string $current_mode
 	 */
-	protected function view_switcher( $current_mode ) {
+	protected function view_switcher($current_mode) {
 ?>
-		<input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
+		<input type="hidden" name="mode" value="<?php echo esc_attr($current_mode); ?>" />
 		<div class="view-switch">
 <?php
-			foreach ( $this->modes as $mode => $title ) {
-				$classes = array( 'view-' . $mode );
-				if ( $current_mode === $mode )
+			foreach ($this->modes as $mode => $title) {
+				$classes = array('view-'.$mode);
+				if ($current_mode === $mode)
 					$classes[] = 'current';
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
-					esc_url( add_query_arg( 'mode', $mode ) ),
-					implode( ' ', $classes ),
+					esc_url(add_query_arg('mode', $mode)),
+					implode(' ', $classes),
 					$title
 				);
 			}
@@ -645,45 +645,45 @@ 
 	 * @param int $post_id          The post ID.
 	 * @param int $pending_comments Number of pending comments.
 	 */
-	protected function comments_bubble( $post_id, $pending_comments ) {
+	protected function comments_bubble($post_id, $pending_comments) {
 		$approved_comments = get_comments_number();
 
-		$approved_comments_number = number_format_i18n( $approved_comments );
-		$pending_comments_number = number_format_i18n( $pending_comments );
+		$approved_comments_number = number_format_i18n($approved_comments);
+		$pending_comments_number = number_format_i18n($pending_comments);
 
-		$approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
-		$approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
-		$pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
+		$approved_only_phrase = sprintf(_n('%s comment', '%s comments', $approved_comments), $approved_comments_number);
+		$approved_phrase = sprintf(_n('%s approved comment', '%s approved comments', $approved_comments), $approved_comments_number);
+		$pending_phrase = sprintf(_n('%s pending comment', '%s pending comments', $pending_comments), $pending_comments_number);
 
 		// No comments at all.
-		if ( ! $approved_comments && ! $pending_comments ) {
-			printf( '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
-				__( 'No comments' )
+		if ( ! $approved_comments && ! $pending_comments) {
+			printf('<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
+				__('No comments')
 			);
 		// Approved comments have different display depending on some conditions.
-		} elseif ( $approved_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'approved' ), admin_url( 'edit-comments.php' ) ) ),
+		} elseif ($approved_comments) {
+			printf('<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(add_query_arg(array('p' => $post_id, 'comment_status' => 'approved'), admin_url('edit-comments.php'))),
 				$approved_comments_number,
 				$pending_comments ? $approved_phrase : $approved_only_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf('<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$approved_comments_number,
-				$pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
+				$pending_comments ? __('No approved comments') : __('No comments')
 			);
 		}
 
-		if ( $pending_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'moderated' ), admin_url( 'edit-comments.php' ) ) ),
+		if ($pending_comments) {
+			printf('<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(add_query_arg(array('p' => $post_id, 'comment_status' => 'moderated'), admin_url('edit-comments.php'))),
 				$pending_comments_number,
 				$pending_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf('<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$pending_comments_number,
-				$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
+				$approved_comments ? __('No pending comments') : __('No comments')
 			);
 		}
 	}
@@ -697,12 +697,12 @@ 
 	 * @return int
 	 */
 	public function get_pagenum() {
-		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
+		$pagenum = isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
+		if (isset($this->_pagination_args['total_pages']) && $pagenum > $this->_pagination_args['total_pages'])
 			$pagenum = $this->_pagination_args['total_pages'];
 
-		return max( 1, $pagenum );
+		return max(1, $pagenum);
 	}
 
 	/**
@@ -715,9 +715,9 @@ 
 	 * @param int    $default
 	 * @return int
 	 */
-	protected function get_items_per_page( $option, $default = 20 ) {
-		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
+	protected function get_items_per_page($option, $default = 20) {
+		$per_page = (int) get_user_option($option);
+		if (empty($per_page) || $per_page < 1)
 			$per_page = $default;
 
 		/**
@@ -733,7 +733,7 @@ 
 		 *
 		 * @param int $per_page Number of items to be displayed. Default 20.
 		 */
-		return (int) apply_filters( $option, $per_page );
+		return (int) apply_filters($option, $per_page);
 	}
 
 	/**
@@ -744,29 +744,29 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function pagination( $which ) {
-		if ( empty( $this->_pagination_args ) ) {
+	protected function pagination($which) {
+		if (empty($this->_pagination_args)) {
 			return;
 		}
 
 		$total_items = $this->_pagination_args['total_items'];
 		$total_pages = $this->_pagination_args['total_pages'];
 		$infinite_scroll = false;
-		if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+		if (isset($this->_pagination_args['infinite_scroll'])) {
 			$infinite_scroll = $this->_pagination_args['infinite_scroll'];
 		}
 
-		if ( 'top' === $which && $total_pages > 1 ) {
-			$this->screen->render_screen_reader_content( 'heading_pagination' );
+		if ('top' === $which && $total_pages > 1) {
+			$this->screen->render_screen_reader_content('heading_pagination');
 		}
 
-		$output = '<span class="displaying-num">' . sprintf( _n( '%s item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
+		$output = '<span class="displaying-num">'.sprintf(_n('%s item', '%s items', $total_items), number_format_i18n($total_items)).'</span>';
 
 		$current = $this->get_pagenum();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
-		$current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url );
+		$current_url = remove_query_arg(array('hotkeys_highlight_last', 'hotkeys_highlight_first'), $current_url);
 
 		$page_links = array();
 
@@ -775,81 +775,81 @@ 
 
 		$disable_first = $disable_last = $disable_prev = $disable_next = false;
 
- 		if ( $current == 1 ) {
+ 		if ($current == 1) {
 			$disable_first = true;
 			$disable_prev = true;
  		}
-		if ( $current == 2 ) {
+		if ($current == 2) {
 			$disable_first = true;
 		}
- 		if ( $current == $total_pages ) {
+ 		if ($current == $total_pages) {
 			$disable_last = true;
 			$disable_next = true;
  		}
-		if ( $current == $total_pages - 1 ) {
+		if ($current == $total_pages - 1) {
 			$disable_last = true;
 		}
 
-		if ( $disable_first ) {
+		if ($disable_first) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&laquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( remove_query_arg( 'paged', $current_url ) ),
-				__( 'First page' ),
+			$page_links[] = sprintf("<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(remove_query_arg('paged', $current_url)),
+				__('First page'),
 				'&laquo;'
 			);
 		}
 
-		if ( $disable_prev ) {
+		if ($disable_prev) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
-				__( 'Previous page' ),
+			$page_links[] = sprintf("<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', max(1, $current - 1), $current_url)),
+				__('Previous page'),
 				'&lsaquo;'
 			);
 		}
 
-		if ( 'bottom' === $which ) {
+		if ('bottom' === $which) {
 			$html_current_page  = $current;
-			$total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input">';
+			$total_pages_before = '<span class="screen-reader-text">'.__('Current Page').'</span><span id="table-paging" class="paging-input">';
 		} else {
-			$html_current_page = sprintf( "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' />",
-				'<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
+			$html_current_page = sprintf("%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' />",
+				'<label for="current-page-selector" class="screen-reader-text">'.__('Current Page').'</label>',
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
-		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
+		$html_total_pages = sprintf("<span class='total-pages'>%s</span>", number_format_i18n($total_pages));
+		$page_links[] = $total_pages_before.sprintf(_x('%1$s of %2$s', 'paging'), $html_current_page, $html_total_pages).$total_pages_after;
 
-		if ( $disable_next ) {
+		if ($disable_next) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
-				__( 'Next page' ),
+			$page_links[] = sprintf("<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', min($total_pages, $current + 1), $current_url)),
+				__('Next page'),
 				'&rsaquo;'
 			);
 		}
 
-		if ( $disable_last ) {
+		if ($disable_last) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&raquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
-				__( 'Last page' ),
+			$page_links[] = sprintf("<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', $total_pages, $current_url)),
+				__('Last page'),
 				'&raquo;'
 			);
 		}
 
 		$pagination_links_class = 'pagination-links';
-		if ( ! empty( $infinite_scroll ) ) {
+		if ( ! empty($infinite_scroll)) {
 			$pagination_links_class = ' hide-if-js';
 		}
-		$output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
+		$output .= "\n<span class='$pagination_links_class'>".join("\n", $page_links).'</span>';
 
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
@@ -870,7 +870,7 @@ 
 	 * @return array
 	 */
 	public function get_columns() {
-		die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::get_columns() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -902,14 +902,14 @@ 
 		$columns = $this->get_columns();
 		$column = '';
 
-		if ( empty( $columns ) ) {
+		if (empty($columns)) {
 			return $column;
 		}
 
 		// We need a primary defined so responsive views show something,
 		// so let's fall back to the first non-checkbox column.
-		foreach ( $columns as $col => $column_name ) {
-			if ( 'cb' === $col ) {
+		foreach ($columns as $col => $column_name) {
+			if ('cb' === $col) {
 				continue;
 			}
 
@@ -941,12 +941,12 @@ 
 	 * @return string The name of the primary column.
 	 */
 	protected function get_primary_column_name() {
-		$columns = get_column_headers( $this->screen );
+		$columns = get_column_headers($this->screen);
 		$default = $this->get_default_primary_column_name();
 
 		// If the primary column doesn't exist fall back to the
 		// first non-checkbox column.
-		if ( ! isset( $columns[ $default ] ) ) {
+		if ( ! isset($columns[$default])) {
 			$default = WP_List_Table::get_default_primary_column_name();
 		}
 
@@ -958,9 +958,9 @@ 
 		 * @param string $default Column name default for the specific list table, e.g. 'name'.
 		 * @param string $context Screen ID for specific list table, e.g. 'plugins'.
 		 */
-		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
+		$column  = apply_filters('list_table_primary_column', $default, $this->screen->id);
 
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+		if (empty($column) || ! isset($columns[$column])) {
 			$column = $default;
 		}
 
@@ -977,19 +977,19 @@ 
 	 */
 	protected function get_column_info() {
 		// $_column_headers is already set / cached
-		if ( isset( $this->_column_headers ) && is_array( $this->_column_headers ) ) {
+		if (isset($this->_column_headers) && is_array($this->_column_headers)) {
 			// Back-compat for list tables that have been manually setting $_column_headers for horse reasons.
 			// In 4.3, we added a fourth argument for primary column.
-			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
-			foreach ( $this->_column_headers as $key => $value ) {
-				$column_headers[ $key ] = $value;
+			$column_headers = array(array(), array(), array(), $this->get_primary_column_name());
+			foreach ($this->_column_headers as $key => $value) {
+				$column_headers[$key] = $value;
 			}
 
 			return $column_headers;
 		}
 
-		$columns = get_column_headers( $this->screen );
-		$hidden = get_hidden_columns( $this->screen );
+		$columns = get_column_headers($this->screen);
+		$hidden = get_hidden_columns($this->screen);
 
 		$sortable_columns = $this->get_sortable_columns();
 		/**
@@ -1002,22 +1002,22 @@ 
 		 *
 		 * @param array $sortable_columns An array of sortable columns.
 		 */
-		$_sortable = apply_filters( "manage_{$this->screen->id}_sortable_columns", $sortable_columns );
+		$_sortable = apply_filters("manage_{$this->screen->id}_sortable_columns", $sortable_columns);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$data[1] = false;
 
 			$sortable[$id] = $data;
 		}
 
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 
 		return $this->_column_headers;
 	}
@@ -1031,9 +1031,9 @@ 
 	 * @return int
 	 */
 	public function get_column_count() {
-		list ( $columns, $hidden ) = $this->get_column_info();
-		$hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
-		return count( $columns ) - count( $hidden );
+		list ($columns, $hidden) = $this->get_column_info();
+		$hidden = array_intersect(array_keys($columns), array_filter($hidden));
+		return count($columns) - count($hidden);
 	}
 
 	/**
@@ -1046,51 +1046,51 @@ 
 	 *
 	 * @param bool $with_id Whether to set the id attribute or not
 	 */
-	public function print_column_headers( $with_id = true ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function print_column_headers($with_id = true) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-		$current_url = remove_query_arg( 'paged', $current_url );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+		$current_url = remove_query_arg('paged', $current_url);
 
-		if ( isset( $_GET['orderby'] ) ) {
+		if (isset($_GET['orderby'])) {
 			$current_orderby = $_GET['orderby'];
 		} else {
 			$current_orderby = '';
 		}
 
-		if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
+		if (isset($_GET['order']) && 'desc' === $_GET['order']) {
 			$current_order = 'desc';
 		} else {
 			$current_order = 'asc';
 		}
 
-		if ( ! empty( $columns['cb'] ) ) {
+		if ( ! empty($columns['cb'])) {
 			static $cb_counter = 1;
-			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
-				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
+			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-'.$cb_counter.'">'.__('Select All').'</label>'
+				. '<input id="cb-select-all-'.$cb_counter.'" type="checkbox" />';
 			$cb_counter++;
 		}
 
-		foreach ( $columns as $column_key => $column_display_name ) {
-			$class = array( 'manage-column', "column-$column_key" );
+		foreach ($columns as $column_key => $column_display_name) {
+			$class = array('manage-column', "column-$column_key");
 
-			if ( in_array( $column_key, $hidden ) ) {
+			if (in_array($column_key, $hidden)) {
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' === $column_key )
+			if ('cb' === $column_key)
 				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
+			elseif (in_array($column_key, array('posts', 'comments', 'links')))
 				$class[] = 'num';
 
-			if ( $column_key === $primary ) {
+			if ($column_key === $primary) {
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[$column_key] ) ) {
-				list( $orderby, $desc_first ) = $sortable[$column_key];
+			if (isset($sortable[$column_key])) {
+				list($orderby, $desc_first) = $sortable[$column_key];
 
-				if ( $current_orderby === $orderby ) {
+				if ($current_orderby === $orderby) {
 					$order = 'asc' === $current_order ? 'desc' : 'asc';
 					$class[] = 'sorted';
 					$class[] = $current_order;
@@ -1100,15 +1100,15 @@ 
 					$class[] = $desc_first ? 'asc' : 'desc';
 				}
 
-				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
+				$column_display_name = '<a href="'.esc_url(add_query_arg(compact('orderby', 'order'), $current_url)).'"><span>'.$column_display_name.'</span><span class="sorting-indicator"></span></a>';
 			}
 
-			$tag = ( 'cb' === $column_key ) ? 'td' : 'th';
-			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
+			$tag = ('cb' === $column_key) ? 'td' : 'th';
+			$scope = ('th' === $tag) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( ! empty($class))
+				$class = "class='".join(' ', $class)."'";
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1123,11 +1123,11 @@ 
 	public function display() {
 		$singular = $this->_args['singular'];
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 
-		$this->screen->render_screen_reader_content( 'heading_list' );
+		$this->screen->render_screen_reader_content('heading_list');
 ?>
-<table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<table class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
@@ -1135,7 +1135,7 @@ 
 	</thead>
 
 	<tbody id="the-list"<?php
-		if ( $singular ) {
+		if ($singular) {
 			echo " data-wp-lists='list:$singular'";
 		} ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
@@ -1143,13 +1143,13 @@ 
 
 	<tfoot>
 	<tr>
-		<?php $this->print_column_headers( false ); ?>
+		<?php $this->print_column_headers(false); ?>
 	</tr>
 	</tfoot>
 
 </table>
 <?php
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -1161,7 +1161,7 @@ 
 	 * @return array List of CSS classes for the table tag.
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', $this->_args['plural'] );
+		return array('widefat', 'fixed', 'striped', $this->_args['plural']);
 	}
 
 	/**
@@ -1171,20 +1171,20 @@ 
 	 * @access protected
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-	<div class="tablenav <?php echo esc_attr( $which ); ?>">
+	<div class="tablenav <?php echo esc_attr($which); ?>">
 
-		<?php if ( $this->has_items() ): ?>
+		<?php if ($this->has_items()): ?>
 		<div class="alignleft actions bulkactions">
-			<?php $this->bulk_actions( $which ); ?>
+			<?php $this->bulk_actions($which); ?>
 		</div>
 		<?php endif;
-		$this->extra_tablenav( $which );
-		$this->pagination( $which );
+		$this->extra_tablenav($which);
+		$this->pagination($which);
 ?>
 
 		<br class="clear" />
@@ -1200,7 +1200,7 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {}
+	protected function extra_tablenav($which) {}
 
 	/**
 	 * Generate the tbody element for the list table.
@@ -1209,10 +1209,10 @@ 
 	 * @access public
 	 */
 	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
+		if ($this->has_items()) {
 			$this->display_rows();
 		} else {
-			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+			echo '<tr class="no-items"><td class="colspanchange" colspan="'.$this->get_column_count().'">';
 			$this->no_items();
 			echo '</td></tr>';
 		}
@@ -1225,8 +1225,8 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $item )
-			$this->single_row( $item );
+		foreach ($this->items as $item)
+			$this->single_row($item);
 	}
 
 	/**
@@ -1237,9 +1237,9 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		echo '<tr>';
-		$this->single_row_columns( $item );
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -1248,13 +1248,13 @@ 
 	 * @param object $item
 	 * @param string $column_name
 	 */
-	protected function column_default( $item, $column_name ) {}
+	protected function column_default($item, $column_name) {}
 
 	/**
 	 *
 	 * @param object $item
 	 */
-	protected function column_cb( $item ) {}
+	protected function column_cb($item) {}
 
 	/**
 	 * Generates the columns for a single row of the table
@@ -1264,46 +1264,46 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	protected function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	protected function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
 
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$classes .= ' hidden';
 			}
 
 			// Comments column uses HTML in the display name with screen reader text.
 			// Instead of using esc_attr(), we strip tags to get closer to a user-friendly string.
-			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = 'data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$attributes = "class='$classes' $data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				echo '<th scope="row" class="check-column">';
-				echo $this->column_cb( $item );
+				echo $this->column_cb($item);
 				echo '</th>';
-			} elseif ( method_exists( $this, '_column_' . $column_name ) ) {
+			} elseif (method_exists($this, '_column_'.$column_name)) {
 				echo call_user_func(
-					array( $this, '_column_' . $column_name ),
+					array($this, '_column_'.$column_name),
 					$item,
 					$classes,
 					$data,
 					$primary
 				);
-			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			} elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo call_user_func( array( $this, 'column_' . $column_name ), $item );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo call_user_func(array($this, 'column_'.$column_name), $item);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			} else {
 				echo "<td $attributes>";
-				echo $this->column_default( $item, $column_name );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo $this->column_default($item, $column_name);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -1320,8 +1320,8 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string The row actions HTML, or an empty string if the current column is the primary column.
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
+	protected function handle_row_actions($item, $column_name, $primary) {
+		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>' : '';
  	}
 
 	/**
@@ -1334,7 +1334,7 @@ 
 		$this->prepare_items();
 
 		ob_start();
-		if ( ! empty( $_REQUEST['no_placeholder'] ) ) {
+		if ( ! empty($_REQUEST['no_placeholder'])) {
 			$this->display_rows();
 		} else {
 			$this->display_rows_or_placeholder();
@@ -1342,20 +1342,20 @@ 
 
 		$rows = ob_get_clean();
 
-		$response = array( 'rows' => $rows );
+		$response = array('rows' => $rows);
 
-		if ( isset( $this->_pagination_args['total_items'] ) ) {
+		if (isset($this->_pagination_args['total_items'])) {
 			$response['total_items_i18n'] = sprintf(
-				_n( '%s item', '%s items', $this->_pagination_args['total_items'] ),
-				number_format_i18n( $this->_pagination_args['total_items'] )
+				_n('%s item', '%s items', $this->_pagination_args['total_items']),
+				number_format_i18n($this->_pagination_args['total_items'])
 			);
 		}
-		if ( isset( $this->_pagination_args['total_pages'] ) ) {
+		if (isset($this->_pagination_args['total_pages'])) {
 			$response['total_pages'] = $this->_pagination_args['total_pages'];
-			$response['total_pages_i18n'] = number_format_i18n( $this->_pagination_args['total_pages'] );
+			$response['total_pages_i18n'] = number_format_i18n($this->_pagination_args['total_pages']);
 		}
 
-		die( wp_json_encode( $response ) );
+		die(wp_json_encode($response));
 	}
 
 	/**
@@ -1365,13 +1365,13 @@ 
 	 */
 	public function _js_vars() {
 		$args = array(
-			'class'  => get_class( $this ),
+			'class'  => get_class($this),
 			'screen' => array(
 				'id'   => $this->screen->id,
 				'base' => $this->screen->base,
 			)
 		);
 
-		printf( "<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode( $args ) );
+		printf("<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode($args));
 	}
 }

Braces +72 added lines, -49 removed lines

@@ -144,8 +144,9 @@ 
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
-			$args['plural'] = $this->screen->base;
+		if ( !$args['plural'] ) {
+					$args['plural'] = $this->screen->base;
+		}
 
 		$args['plural'] = sanitize_key( $args['plural'] );
 		$args['singular'] = sanitize_key( $args['singular'] );
@@ -280,8 +281,9 @@ 
 			'per_page' => 0,
 		) );
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( !$args['total_pages'] && $args['per_page'] > 0 ) {
+					$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		}
 
 		// Redirect if page number is invalid and headers are not already sent.
 		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
@@ -344,20 +346,25 @@ 
 	 * @param string $input_id The search input id
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
-			return;
+		if ( empty( $_REQUEST['s'] ) && !$this->has_items() ) {
+					return;
+		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
-?>
+		if ( ! empty( $_REQUEST['orderby'] ) ) {
+					echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['order'] ) ) {
+					echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['post_mime_type'] ) ) {
+					echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['detached'] ) ) {
+					echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		}
+		?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
@@ -399,8 +406,9 @@ 
 		 */
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
-		if ( empty( $views ) )
-			return;
+		if ( empty( $views ) ) {
+					return;
+		}
 
 		$this->screen->render_screen_reader_content( 'heading_views' );
 
@@ -456,8 +464,9 @@ 
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
-			return;
+		if ( empty( $this->_actions ) ) {
+					return;
+		}
 
 		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
 		echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
@@ -484,14 +493,17 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
-			return false;
+		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) ) {
+					return false;
+		}
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
-			return $_REQUEST['action'];
+		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
+					return $_REQUEST['action'];
+		}
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
-			return $_REQUEST['action2'];
+		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
+					return $_REQUEST['action2'];
+		}
 
 		return false;
 	}
@@ -510,8 +522,9 @@ 
 		$action_count = count( $actions );
 		$i = 0;
 
-		if ( !$action_count )
-			return '';
+		if ( !$action_count ) {
+					return '';
+		}
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
@@ -579,8 +592,9 @@ 
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-			return;
+		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+					return;
+		}
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
@@ -589,8 +603,9 @@ 
 			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
 		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
-				continue;
+			if ( 0 == $arc_row->year ) {
+							continue;
+			}
 
 			$month = zeroise( $arc_row->month, 2 );
 			$year = $arc_row->year;
@@ -622,8 +637,9 @@ 
 <?php
 			foreach ( $this->modes as $mode => $title ) {
 				$classes = array( 'view-' . $mode );
-				if ( $current_mode === $mode )
-					$classes[] = 'current';
+				if ( $current_mode === $mode ) {
+									$classes[] = 'current';
+				}
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
 					esc_url( add_query_arg( 'mode', $mode ) ),
@@ -699,8 +715,9 @@ 
 	public function get_pagenum() {
 		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
-			$pagenum = $this->_pagination_args['total_pages'];
+		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) {
+					$pagenum = $this->_pagination_args['total_pages'];
+		}
 
 		return max( 1, $pagenum );
 	}
@@ -717,8 +734,9 @@ 
 	 */
 	protected function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
-			$per_page = $default;
+		if ( empty( $per_page ) || $per_page < 1 ) {
+					$per_page = $default;
+		}
 
 		/**
 		 * Filter the number of items to be displayed on each page of the list table.
@@ -1006,12 +1024,14 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
-				$data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$data[1] = false;
+			}
 
 			$sortable[$id] = $data;
 		}
@@ -1078,10 +1098,11 @@ 
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' === $column_key )
-				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
-				$class[] = 'num';
+			if ( 'cb' === $column_key ) {
+							$class[] = 'check-column';
+			} elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) ) {
+							$class[] = 'num';
+			}
 
 			if ( $column_key === $primary ) {
 				$class[] = 'column-primary';
@@ -1107,8 +1128,9 @@ 
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( !empty( $class ) ) {
+							$class = "class='" . join( ' ', $class ) . "'";
+			}
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1225,8 +1247,9 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $item )
-			$this->single_row( $item );
+		foreach ( $this->items as $item ) {
+					$this->single_row( $item );
+		}
 	}
 
 	/**

src/wp-admin/includes/class-wp-ms-themes-list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		// todo: remove and add CSS for .themes

Spacing +187 added lines, -187 removed lines

@@ -35,24 +35,24 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $status, $page;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'themes',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
-		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
+		$status = isset($_REQUEST['theme_status']) ? $_REQUEST['theme_status'] : 'all';
+		if ( ! in_array($status, array('all', 'enabled', 'disabled', 'upgrade', 'search', 'broken')))
 			$status = 'all';
 
 		$page = $this->get_pagenum();
 
-		$this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
+		$this->is_site_themes = ('site-themes-network' === $this->screen->id) ? true : false;
 
-		if ( $this->is_site_themes )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ($this->is_site_themes)
+			$this->site_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	protected function get_table_classes() {
 		// todo: remove and add CSS for .themes
-		return array( 'widefat', 'plugins' );
+		return array('widefat', 'plugins');
 	}
 
 	/**
@@ -69,10 +69,10 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_themes )
-			return current_user_can( 'manage_sites' );
+		if ($this->is_site_themes)
+			return current_user_can('manage_sites');
 		else
-			return current_user_can( 'manage_network_themes' );
+			return current_user_can('manage_network_themes');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	public function prepare_items() {
 		global $status, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('orderby', 'order', 's'));
 
 		$themes = array(
 			/**
@@ -98,79 +98,79 @@ 
 			 *
 			 * @param array $all An array of WP_Theme objects to display in the list table.
 			 */
-			'all' => apply_filters( 'all_themes', wp_get_themes() ),
+			'all' => apply_filters('all_themes', wp_get_themes()),
 			'search' => array(),
 			'enabled' => array(),
 			'disabled' => array(),
 			'upgrade' => array(),
-			'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
+			'broken' => $this->is_site_themes ? array() : wp_get_themes(array('errors' => true)),
 		);
 
-		if ( $this->is_site_themes ) {
-			$themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
+		if ($this->is_site_themes) {
+			$themes_per_page = $this->get_items_per_page('site_themes_network_per_page');
 			$allowed_where = 'site';
 		} else {
-			$themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
+			$themes_per_page = $this->get_items_per_page('themes_network_per_page');
 			$allowed_where = 'network';
 		}
 
-		$maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
+		$maybe_update = current_user_can('update_themes') && ! $this->is_site_themes && $current = get_site_transient('update_themes');
 
-		foreach ( (array) $themes['all'] as $key => $theme ) {
-			if ( $this->is_site_themes && $theme->is_allowed( 'network' ) ) {
-				unset( $themes['all'][ $key ] );
+		foreach ((array) $themes['all'] as $key => $theme) {
+			if ($this->is_site_themes && $theme->is_allowed('network')) {
+				unset($themes['all'][$key]);
 				continue;
 			}
 
-			if ( $maybe_update && isset( $current->response[ $key ] ) ) {
-				$themes['all'][ $key ]->update = true;
-				$themes['upgrade'][ $key ] = $themes['all'][ $key ];
+			if ($maybe_update && isset($current->response[$key])) {
+				$themes['all'][$key]->update = true;
+				$themes['upgrade'][$key] = $themes['all'][$key];
 			}
 
-			$filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
-			$themes[ $filter ][ $key ] = $themes['all'][ $key ];
+			$filter = $theme->is_allowed($allowed_where, $this->site_id) ? 'enabled' : 'disabled';
+			$themes[$filter][$key] = $themes['all'][$key];
 		}
 
-		if ( $s ) {
+		if ($s) {
 			$status = 'search';
-			$themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
+			$themes['search'] = array_filter(array_merge($themes['all'], $themes['broken']), array($this, '_search_callback'));
 		}
 
 		$totals = array();
-		foreach ( $themes as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ($themes as $type => $list)
+			$totals[$type] = count($list);
 
-		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if (empty($themes[$status]) && ! in_array($status, array('all', 'search')))
 			$status = 'all';
 
-		$this->items = $themes[ $status ];
-		WP_Theme::sort_by_name( $this->items );
+		$this->items = $themes[$status];
+		WP_Theme::sort_by_name($this->items);
 
-		$this->has_items = ! empty( $themes['all'] );
-		$total_this_page = $totals[ $status ];
+		$this->has_items = ! empty($themes['all']);
+		$total_this_page = $totals[$status];
 
-		if ( $orderby ) {
-			$orderby = ucfirst( $orderby );
-			$order = strtoupper( $order );
+		if ($orderby) {
+			$orderby = ucfirst($orderby);
+			$order = strtoupper($order);
 
-			if ( $orderby === 'Name' ) {
-				if ( 'ASC' === $order ) {
-					$this->items = array_reverse( $this->items );
+			if ($orderby === 'Name') {
+				if ('ASC' === $order) {
+					$this->items = array_reverse($this->items);
 				}
 			} else {
-				uasort( $this->items, array( $this, '_order_callback' ) );
+				uasort($this->items, array($this, '_order_callback'));
 			}
 		}
 
-		$start = ( $page - 1 ) * $themes_per_page;
+		$start = ($page - 1) * $themes_per_page;
 
-		if ( $total_this_page > $themes_per_page )
-			$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		if ($total_this_page > $themes_per_page)
+			$this->items = array_slice($this->items, $start, $themes_per_page, true);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_this_page,
 			'per_page' => $themes_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -178,21 +178,21 @@ 
 	 * @param WP_Theme $theme
 	 * @return bool
 	 */
-	public function _search_callback( $theme ) {
+	public function _search_callback($theme) {
 		static $term = null;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+		if (is_null($term))
+			$term = wp_unslash($_REQUEST['s']);
 
-		foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
+		foreach (array('Name', 'Description', 'Author', 'Author', 'AuthorURI') as $field) {
 			// Don't mark up; Do translate.
-			if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
+			if (false !== stripos($theme->display($field, false, true), $term))
 				return true;
 		}
 
-		if ( false !== stripos( $theme->get_stylesheet(), $term ) )
+		if (false !== stripos($theme->get_stylesheet(), $term))
 			return true;
 
-		if ( false !== stripos( $theme->get_template(), $term ) )
+		if (false !== stripos($theme->get_template(), $term))
 			return true;
 
 		return false;
@@ -206,29 +206,29 @@ 
 	 * @param array $theme_b
 	 * @return int
 	 */
-	public function _order_callback( $theme_a, $theme_b ) {
+	public function _order_callback($theme_a, $theme_b) {
 		global $orderby, $order;
 
-		$a = $theme_a[ $orderby ];
-		$b = $theme_b[ $orderby ];
+		$a = $theme_a[$orderby];
+		$b = $theme_b[$orderby];
 
-		if ( $a == $b )
+		if ($a == $b)
 			return 0;
 
-		if ( 'DESC' === $order )
-			return ( $a < $b ) ? 1 : -1;
+		if ('DESC' === $order)
+			return ($a < $b) ? 1 : -1;
 		else
-			return ( $a < $b ) ? -1 : 1;
+			return ($a < $b) ? -1 : 1;
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		if ( $this->has_items ) {
-			_e( 'No themes found.' );
+		if ($this->has_items) {
+			_e('No themes found.');
 		} else {
-			_e( 'You do not appear to have any themes available at this time.' );
+			_e('You do not appear to have any themes available at this time.');
 		}
 	}
 
@@ -239,8 +239,8 @@ 
 	public function get_columns() {
 		return array(
 			'cb'          => '<input type="checkbox" />',
-			'name'        => __( 'Theme' ),
-			'description' => __( 'Description' ),
+			'name'        => __('Theme'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -276,38 +276,38 @@ 
 		global $totals, $status;
 
 		$status_links = array();
-		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+		foreach ($totals as $type => $count) {
+			if ( ! $count)
 				continue;
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'all':
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes');
 					break;
 				case 'enabled':
-					$text = _n( 'Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count );
+					$text = _n('Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count);
 					break;
 				case 'disabled':
-					$text = _n( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count );
+					$text = _n('Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count);
 					break;
 				case 'upgrade':
-					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+					$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count);
 					break;
 				case 'broken' :
-					$text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
+					$text = _n('Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count);
 					break;
 			}
 
-			if ( $this->is_site_themes )
-				$url = 'site-themes.php?id=' . $this->site_id;
+			if ($this->is_site_themes)
+				$url = 'site-themes.php?id='.$this->site_id;
 			else
 				$url = 'themes.php';
 
-			if ( 'search' != $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-					esc_url( add_query_arg('theme_status', $type, $url) ),
-					( $type === $status ) ? ' class="current"' : '',
-					sprintf( $text, number_format_i18n( $count ) )
+			if ('search' != $type) {
+				$status_links[$type] = sprintf("<a href='%s' %s>%s</a>",
+					esc_url(add_query_arg('theme_status', $type, $url)),
+					($type === $status) ? ' class="current"' : '',
+					sprintf($text, number_format_i18n($count))
 				);
 			}
 		}
@@ -324,15 +324,15 @@ 
 		global $status;
 
 		$actions = array();
-		if ( 'enabled' != $status )
-			$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
-		if ( 'disabled' != $status )
-			$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
-		if ( ! $this->is_site_themes ) {
-			if ( current_user_can( 'update_themes' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_themes' ) )
-				$actions['delete-selected'] = __( 'Delete' );
+		if ('enabled' != $status)
+			$actions['enable-selected'] = $this->is_site_themes ? __('Enable') : __('Network Enable');
+		if ('disabled' != $status)
+			$actions['disable-selected'] = $this->is_site_themes ? __('Disable') : __('Network Disable');
+		if ( ! $this->is_site_themes) {
+			if (current_user_can('update_themes'))
+				$actions['update-selected'] = __('Update');
+			if (current_user_can('delete_themes'))
+				$actions['delete-selected'] = __('Delete');
 		}
 		return $actions;
 	}
@@ -341,8 +341,8 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $theme )
-			$this->single_row( $theme );
+		foreach ($this->items as $theme)
+			$this->single_row($theme);
 	}
 
 	/**
@@ -353,11 +353,11 @@ 
 	 *
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function column_cb( $theme ) {
-		$checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+	public function column_cb($theme) {
+		$checkbox_id = 'checkbox_'.md5($theme->get('Name'));
 		?>
-		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
-		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
+		<input type="checkbox" name="checked[]" value="<?php echo esc_attr($theme->get_stylesheet()) ?>" id="<?php echo $checkbox_id ?>" />
+		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e('Select') ?>  <?php echo $theme->display('Name') ?></label>
 		<?php
 	}
 
@@ -373,17 +373,17 @@ 
 	 *
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function column_name( $theme ) {
+	public function column_name($theme) {
 		global $status, $page, $s;
 
 		$context = $status;
 
-		if ( $this->is_site_themes ) {
+		if ($this->is_site_themes) {
 			$url = "site-themes.php?id={$this->site_id}&amp;";
-			$allowed = $theme->is_allowed( 'site', $this->site_id );
+			$allowed = $theme->is_allowed('site', $this->site_id);
 		} else {
 			$url = 'themes.php?';
-			$allowed = $theme->is_allowed( 'network' );
+			$allowed = $theme->is_allowed('network');
 		}
 
 		// Pre-order.
@@ -395,85 +395,85 @@ 
 		);
 
 		$stylesheet = $theme->get_stylesheet();
-		$theme_key = urlencode( $stylesheet );
+		$theme_key = urlencode($stylesheet);
 
-		if ( ! $allowed ) {
-			if ( ! $theme->errors() ) {
-				$url = add_query_arg( array(
+		if ( ! $allowed) {
+			if ( ! $theme->errors()) {
+				$url = add_query_arg(array(
 					'action' => 'enable',
 					'theme'  => $theme_key,
 					'paged'  => $page,
 					's'      => $s,
-				), $url );
+				), $url);
 
-				if ( $this->is_site_themes ) {
+				if ($this->is_site_themes) {
 					/* translators: %s: theme name */
-					$aria_label = sprintf( __( 'Enable %s' ), $theme->display( 'Name' ) );
+					$aria_label = sprintf(__('Enable %s'), $theme->display('Name'));
 				} else {
 					/* translators: %s: theme name */
-					$aria_label = sprintf( __( 'Network Enable %s' ), $theme->display( 'Name' ) );
+					$aria_label = sprintf(__('Network Enable %s'), $theme->display('Name'));
 				}
 
-				$actions['enable'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
-					esc_url( wp_nonce_url( $url, 'enable-theme_' . $stylesheet ) ),
-					esc_attr( $aria_label ),
-					( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) )
+				$actions['enable'] = sprintf('<a href="%s" class="edit" aria-label="%s">%s</a>',
+					esc_url(wp_nonce_url($url, 'enable-theme_'.$stylesheet)),
+					esc_attr($aria_label),
+					($this->is_site_themes ? __('Enable') : __('Network Enable'))
 				);
 			}
 		} else {
-			$url = add_query_arg( array(
+			$url = add_query_arg(array(
 				'action' => 'disable',
 				'theme'  => $theme_key,
 				'paged'  => $page,
 				's'      => $s,
-			), $url );
+			), $url);
 
-			if ( $this->is_site_themes ) {
+			if ($this->is_site_themes) {
 				/* translators: %s: theme name */
-				$aria_label = sprintf( __( 'Disable %s' ), $theme->display( 'Name' ) );
+				$aria_label = sprintf(__('Disable %s'), $theme->display('Name'));
 			} else {
 				/* translators: %s: theme name */
-				$aria_label = sprintf( __( 'Network Disable %s' ), $theme->display( 'Name' ) );
+				$aria_label = sprintf(__('Network Disable %s'), $theme->display('Name'));
 			}
 
-			$actions['disable'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
-				esc_url( wp_nonce_url( $url, 'disable-theme_' . $stylesheet ) ),
-				esc_attr( $aria_label ),
-				( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) )
+			$actions['disable'] = sprintf('<a href="%s" aria-label="%s">%s</a>',
+				esc_url(wp_nonce_url($url, 'disable-theme_'.$stylesheet)),
+				esc_attr($aria_label),
+				($this->is_site_themes ? __('Disable') : __('Network Disable'))
 			);
 		}
 
-		if ( current_user_can('edit_themes') ) {
-			$url = add_query_arg( array(
+		if (current_user_can('edit_themes')) {
+			$url = add_query_arg(array(
 				'theme' => $theme_key,
-			), 'theme-editor.php' );
+			), 'theme-editor.php');
 
 			/* translators: %s: theme name */
-			$aria_label = sprintf( __( 'Open %s in the Theme Editor' ), $theme->display( 'Name' ) );
+			$aria_label = sprintf(__('Open %s in the Theme Editor'), $theme->display('Name'));
 
-			$actions['edit'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
-				esc_url( $url ),
-				esc_attr( $aria_label ),
-				__( 'Edit' )
+			$actions['edit'] = sprintf('<a href="%s" class="edit" aria-label="%s">%s</a>',
+				esc_url($url),
+				esc_attr($aria_label),
+				__('Edit')
 			);
 		}
 
-		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
-			$url = add_query_arg( array(
+		if ( ! $allowed && current_user_can('delete_themes') && ! $this->is_site_themes && $stylesheet != get_option('stylesheet') && $stylesheet != get_option('template')) {
+			$url = add_query_arg(array(
 				'action'       => 'delete-selected',
 				'checked[]'    => $theme_key,
 				'theme_status' => $context,
 				'paged'        => $page,
 				's'            => $s,
-			), 'themes.php' );
+			), 'themes.php');
 
 			/* translators: %s: theme name */
-			$aria_label = sprintf( __( 'Delete %s' ), $theme->display( 'Name' ) );
+			$aria_label = sprintf(__('Delete %s'), $theme->display('Name'));
 
-			$actions['delete'] = sprintf( '<a href="%s" class="delete" aria-label="%s">%s</a>',
-				esc_url( wp_nonce_url( $url, 'bulk-themes' ) ),
-				esc_attr( $aria_label ),
-				__( 'Delete' )
+			$actions['delete'] = sprintf('<a href="%s" class="delete" aria-label="%s">%s</a>',
+				esc_url(wp_nonce_url($url, 'bulk-themes')),
+				esc_attr($aria_label),
+				__('Delete')
 			);
 		}
 		/**
@@ -498,7 +498,7 @@ 
 		 * @param WP_Theme $theme   The current WP_Theme object.
 		 * @param string   $context Status of the theme.
 		 */
-		$actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context );
+		$actions = apply_filters('theme_action_links', array_filter($actions), $theme, $context);
 
 		/**
 		 * Filter the action links of a specific theme in the Multisite themes
@@ -514,9 +514,9 @@ 
 		 * @param WP_Theme $theme   The current WP_Theme object.
 		 * @param string   $context Status of the theme.
 		 */
-		$actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
+		$actions = apply_filters("theme_action_links_$stylesheet", $actions, $theme, $context);
 
-		echo $this->row_actions( $actions, true );
+		echo $this->row_actions($actions, true);
 	}
 
 	/**
@@ -530,42 +530,42 @@ 
 	 *
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function column_description( $theme ) {
+	public function column_description($theme) {
 		global $status, $totals;
-		if ( $theme->errors() ) {
-			$pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
-			echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+		if ($theme->errors()) {
+			$pre = $status === 'broken' ? __('Broken Theme:').' ' : '';
+			echo '<p><strong class="error-message">'.$pre.$theme->errors()->get_error_message().'</strong></p>';
 		}
 
-		if ( $this->is_site_themes ) {
-			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		if ($this->is_site_themes) {
+			$allowed = $theme->is_allowed('site', $this->site_id);
 		} else {
-			$allowed = $theme->is_allowed( 'network' );
+			$allowed = $theme->is_allowed('network');
 		}
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+		if ( ! empty($totals['upgrade']) && ! empty($theme->update))
 			$class .= ' update';
 
-		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
+		echo "<div class='theme-description'><p>".$theme->display('Description')."</p></div>
 			<div class='$class second theme-version-author-uri'>";
 
 		$stylesheet = $theme->get_stylesheet();
 		$theme_meta = array();
 
-		if ( $theme->get('Version') ) {
-			$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+		if ($theme->get('Version')) {
+			$theme_meta[] = sprintf(__('Version %s'), $theme->display('Version'));
 		}
-		$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+		$theme_meta[] = sprintf(__('By %s'), $theme->display('Author'));
 
-		if ( $theme->get('ThemeURI') ) {
+		if ($theme->get('ThemeURI')) {
 			/* translators: %s: theme name */
-			$aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
+			$aria_label = sprintf(__('Visit %s homepage'), $theme->display('Name'));
 
-			$theme_meta[] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
-				$theme->display( 'ThemeURI' ),
-				esc_attr( $aria_label ),
-				__( 'Visit Theme Site' )
+			$theme_meta[] = sprintf('<a href="%s" aria-label="%s">%s</a>',
+				$theme->display('ThemeURI'),
+				esc_attr($aria_label),
+				__('Visit Theme Site')
 			);
 		}
 		/**
@@ -581,8 +581,8 @@ 
 		 * @param WP_Theme $theme      WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
-		echo implode( ' | ', $theme_meta );
+		$theme_meta = apply_filters('theme_row_meta', $theme_meta, $stylesheet, $theme, $status);
+		echo implode(' | ', $theme_meta);
 
 		echo '</div>';
 	}
@@ -596,7 +596,7 @@ 
 	 * @param WP_Theme $theme       The current WP_Theme object.
 	 * @param string   $column_name The current column name.
 	 */
-	public function column_default( $theme, $column_name ) {
+	public function column_default($theme, $column_name) {
 		$stylesheet = $theme->get_stylesheet();
 
 		/**
@@ -608,7 +608,7 @@ 
 		 * @param string   $stylesheet  Directory name of the theme.
 		 * @param WP_Theme $theme       Current WP_Theme object.
 		 */
-		do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+		do_action('manage_themes_custom_column', $column_name, $stylesheet, $theme);
 	}
 
 	/**
@@ -619,28 +619,28 @@ 
 	 *
 	 * @param WP_Theme $item The current WP_Theme object.
 	 */
-	public function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$extra_classes = '';
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$extra_classes .= ' hidden';
 			}
 
-			switch ( $column_name ) {
+			switch ($column_name) {
 				case 'cb':
 					echo '<th scope="row" class="check-column">';
 
-					$this->column_cb( $item );
+					$this->column_cb($item);
 
 					echo '</th>';
 					break;
 
 				case 'name':
-					echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
+					echo "<td class='theme-title column-primary{$extra_classes}'><strong>".$item->display('Name')."</strong>";
 
-					$this->column_name( $item );
+					$this->column_name($item);
 
 					echo "</td>";
 					break;
@@ -648,7 +648,7 @@ 
 				case 'description':
 					echo "<td class='column-description desc{$extra_classes}'>";
 
-					$this->column_description( $item );
+					$this->column_description($item);
 
 					echo '</td>';
 					break;
@@ -656,7 +656,7 @@ 
 				default:
 					echo "<td class='$column_name column-$column_name{$extra_classes}'>";
 
-					$this->column_default( $item, $column_name );
+					$this->column_default($item, $column_name);
 
 					echo "</td>";
 					break;
@@ -670,33 +670,33 @@ 
 	 *
 	 * @param WP_Theme $theme
 	 */
-	public function single_row( $theme ) {
+	public function single_row($theme) {
 		global $status, $totals;
 
-		if ( $this->is_site_themes ) {
-			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		if ($this->is_site_themes) {
+			$allowed = $theme->is_allowed('site', $this->site_id);
 		} else {
-			$allowed = $theme->is_allowed( 'network' );
+			$allowed = $theme->is_allowed('network');
 		}
 
 		$stylesheet = $theme->get_stylesheet();
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+		if ( ! empty($totals['upgrade']) && ! empty($theme->update)) {
 			$class .= ' update';
 		}
 
-		printf( '<tr class="%s" data-slug="%s">',
-			esc_attr( $class ),
-			esc_attr( $stylesheet )
+		printf('<tr class="%s" data-slug="%s">',
+			esc_attr($class),
+			esc_attr($stylesheet)
 		);
 
-		$this->single_row_columns( $theme );
+		$this->single_row_columns($theme);
 
 		echo "</tr>";
 
-		if ( $this->is_site_themes )
-			remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		if ($this->is_site_themes)
+			remove_action("after_theme_row_$stylesheet", 'wp_theme_update_row');
 
 		/**
 		 * Fires after each row in the Multisite themes list table.
@@ -707,7 +707,7 @@ 
 		 * @param WP_Theme $theme      Current WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		do_action( 'after_theme_row', $stylesheet, $theme, $status );
+		do_action('after_theme_row', $stylesheet, $theme, $status);
 
 		/**
 		 * Fires after each specific row in the Multisite themes list table.
@@ -722,6 +722,6 @@ 
 		 * @param WP_Theme $theme      Current WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		do_action( "after_theme_row_$stylesheet", $stylesheet, $theme, $status );
+		do_action("after_theme_row_$stylesheet", $stylesheet, $theme, $status);
 	}
 }

Braces +69 added lines, -48 removed lines

@@ -44,15 +44,17 @@ 
 		) );
 
 		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
-			$status = 'all';
+		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) {
+					$status = 'all';
+		}
 
 		$page = $this->get_pagenum();
 
 		$this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
 
-		if ( $this->is_site_themes )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ( $this->is_site_themes ) {
+					$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
@@ -69,10 +71,11 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_themes )
-			return current_user_can( 'manage_sites' );
-		else
-			return current_user_can( 'manage_network_themes' );
+		if ( $this->is_site_themes ) {
+					return current_user_can( 'manage_sites' );
+		} else {
+					return current_user_can( 'manage_network_themes' );
+		}
 	}
 
 	/**
@@ -137,11 +140,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $themes as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $themes as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = $themes[ $status ];
 		WP_Theme::sort_by_name( $this->items );
@@ -164,8 +169,9 @@ 
 
 		$start = ( $page - 1 ) * $themes_per_page;
 
-		if ( $total_this_page > $themes_per_page )
-			$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		if ( $total_this_page > $themes_per_page ) {
+					$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -180,20 +186,24 @@ 
 	 */
 	public function _search_callback( $theme ) {
 		static $term = null;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+		if ( is_null( $term ) ) {
+					$term = wp_unslash( $_REQUEST['s'] );
+		}
 
 		foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
 			// Don't mark up; Do translate.
-			if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
-				return true;
+			if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) {
+							return true;
+			}
 		}
 
-		if ( false !== stripos( $theme->get_stylesheet(), $term ) )
-			return true;
+		if ( false !== stripos( $theme->get_stylesheet(), $term ) ) {
+					return true;
+		}
 
-		if ( false !== stripos( $theme->get_template(), $term ) )
-			return true;
+		if ( false !== stripos( $theme->get_template(), $term ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -212,13 +222,15 @@ 
 		$a = $theme_a[ $orderby ];
 		$b = $theme_b[ $orderby ];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
-		if ( 'DESC' === $order )
-			return ( $a < $b ) ? 1 : -1;
-		else
-			return ( $a < $b ) ? -1 : 1;
+		if ( 'DESC' === $order ) {
+					return ( $a < $b ) ? 1 : -1;
+		} else {
+					return ( $a < $b ) ? -1 : 1;
+		}
 	}
 
 	/**
@@ -277,8 +289,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -298,10 +311,11 @@ 
 					break;
 			}
 
-			if ( $this->is_site_themes )
-				$url = 'site-themes.php?id=' . $this->site_id;
-			else
-				$url = 'themes.php';
+			if ( $this->is_site_themes ) {
+							$url = 'site-themes.php?id=' . $this->site_id;
+			} else {
+							$url = 'themes.php';
+			}
 
 			if ( 'search' != $type ) {
 				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
@@ -324,15 +338,19 @@ 
 		global $status;
 
 		$actions = array();
-		if ( 'enabled' != $status )
-			$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
-		if ( 'disabled' != $status )
-			$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
+		if ( 'enabled' != $status ) {
+					$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
+		}
+		if ( 'disabled' != $status ) {
+					$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
+		}
 		if ( ! $this->is_site_themes ) {
-			if ( current_user_can( 'update_themes' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_themes' ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_themes' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_themes' ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 		return $actions;
 	}
@@ -341,8 +359,9 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $theme )
-			$this->single_row( $theme );
+		foreach ( $this->items as $theme ) {
+					$this->single_row( $theme );
+		}
 	}
 
 	/**
@@ -544,8 +563,9 @@ 
 		}
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+					$class .= ' update';
+		}
 
 		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
 			<div class='$class second theme-version-author-uri'>";
@@ -695,8 +715,9 @@ 
 
 		echo "</tr>";
 
-		if ( $this->is_site_themes )
-			remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		if ( $this->is_site_themes ) {
+					remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		}
 
 		/**
 		 * Fires after each row in the Multisite themes list table.