Changeset 7126

Timestamp:

03/01/2008 09:20:23 PM (17 years ago)

Author:

ryan

Message:

Plugin updater updates. see #5586

Location:

trunk/wp-admin/includes

Files:

• class-ftp-pure.php (added)
• class-ftp-sockets.php (added)
• class-ftp.php (modified) (1 diff)
• class-wp-filesystem-ftpext.php (modified) (7 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (15 diffs)
• file.php (modified) (4 diffs)
• update.php (modified) (2 diffs)

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

@@ -1 +1 @@
 <?php
-    //http://phpclasses.dknss.com/browse/package/3174.html
-    define("FTP_TIMEOUT",10);
-
-    // FTP Statuscodes
-    define("FTP_COMMAND_OK",200);
-    define("FTP_FILE_ACTION_OK",250);
-    define("FTP_FILE_TRANSFER_OK",226);
-    define("FTP_COMMAND_NOT_IMPLEMENTED",502);
-    define("FTP_FILE_STATUS",213);
-    define("FTP_NAME_SYSTEM_TYPE",215);
-    define("FTP_PASSIVE_MODE",227);
-    define("FTP_PATHNAME",257);
-    define("FTP_SERVICE_READY",220);
-    define("FTP_USER_LOGGED_IN",230);
-    define("FTP_PASSWORD_NEEDED",331);
-    define("FTP_USER_NOT_LOGGED_IN",530);
+if(!defined('CRLF')) define('CRLF',"\r\n");
+if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
+if(!defined("FTP_BINARY")) define("FTP_BINARY", 1);
+if(!defined("FTP_ASCII")) define("FTP_ASCII", 0);
+if(!defined('FTP_FORCE')) define('FTP_FORCE', TRUE);
+define('FTP_OS_Unix','u');
+define('FTP_OS_Windows','w');
+define('FTP_OS_Mac','m');
+
+class ftp_base {
+    /* Public variables */
+    var $LocalEcho;
+    var $Verbose;
+    var $OS_local;
+    var $OS_remote;
     
-    if (!defined("FTP_ASCII")) define("FTP_ASCII",0);
-    if (!defined("FTP_BINARY")) define("FTP_BINARY",1);
-
-    class FTP {
-
-        var $passiveMode = TRUE;
-        var $lastLines = array();
-        var $lastLine = "";
-        var $controlSocket = NULL;
-        var $newResult = FALSE;
-        var $lastResult = -1;
-        var $pasvAddr = NULL; 
+    /* Private variables */
+    var $_lastaction;
+    var $_errors;
+    var $_type;
+    var $_umask;
+    var $_timeout;
+    var $_passive;
+    var $_host;
+    var $_fullhost;
+    var $_port;
+    var $_datahost;
+    var $_dataport;
+    var $_ftp_control_sock;
+    var $_ftp_data_sock;
+    var $_ftp_temp_sock;
+    var $_ftp_buff_size;
+    var $_login;
+    var $_password;
+    var $_connected;
+    var $_ready;
+    var $_code;
+    var $_message;
+    var $_can_restore;
+    var $_port_available;
+    var $_curtype;
+    var $_features;
+
+    var $_error_array;
+    var $AuthorizedTransferMode;
+    var $OS_FullName;
+    var $_eol_code;
+    var $AutoAsciiExt;
+
+    /* Constructor */
+    function ftp_base($port_mode=FALSE) {
+        $this->__construct($port_mode);
+    }
+
+    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;
+    }
+
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!--       Public functions                                                                  -->
+// <!-- --------------------------------------------------------------------------------------- -->
+
+    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)) {
+            $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';
+            $b['size'] = $lucifer[7];
+            $b['month'] = $lucifer[1];
+            $b['day'] = $lucifer[2];
+            $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['am/pm'] = $lucifer[6];
+            $b['name'] = $lucifer[8];
+        } else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
+            //echo $line."\n";
+            $lcount=count($lucifer);
+            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';
+            $b['perms'] = $lucifer[0];
+            $b['number'] = $lucifer[1];
+            $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']);
+                $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)) {
+                    $b['year'] = date("Y");
+                    $b['hour'] = $l2[1];
+                    $b['minute'] = $l2[2];
+                } else {
+                    $b['year'] = $lucifer[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['name'] = $lucifer[8];
+            }
+        }
+
+        return $b;
+    }
+
+    function SendMSG($message = "", $crlf=true) {
+        if ($this->Verbose) {
+            echo $message.($crlf?CRLF:"");
+            flush();
+        }
+        return TRUE;
+    }
+
+    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") ) );
+        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;
+                }
+            } 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) {
+            $this->SendMSG("Only passive connections available!");
+            $this->_passive=TRUE;
+            return FALSE;
+        }
+        $this->SendMSG("Passive mode ".($this->_passive?"on":"off"));
+        return 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;
+            if(ip2long($ip) === -1) {
+                $this->SendMSG("Wrong host name/address \"".$host."\"");
+                return FALSE;
+            }
+            $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) {
+                $this->SendMSG("Reconnecting");
+                if(!$this->quit(FTP_FORCE)) return FALSE;
+                if(!$this->connect()) return FALSE;
+            }
+        }
+        return TRUE;
+    }
+
+    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;
+        $this->SendMSG("Timeout ".$this->_timeout);
+        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->_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."\"");
+            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");
+        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)));
+        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;
+            $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;
+        }
+        $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)));
+        }
+        return TRUE;
+    }
+
+    function pwd() {
+        if(!$this->_exec("PWD", "pwd")) return FALSE;
+        if(!$this->_checkCode()) return FALSE;
+        return ereg_replace("^[0-9]{3} \"(.+)\" .+".CRLF, "\\1", $this->_message);
+    }
+
+    function cdup() {
+        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;
+        return TRUE;
+    }
+
+    function rmdir($pathname) {
+        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;
+        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;
+        } else return FALSE;
+        return TRUE;
+    }
+
+    function filesize($pathname) {
+        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;
+        return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\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;
+        }
+        return true;
+    }
+
+    function mdtm($pathname) {
+        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;
+        $mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\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]);
+        return $timestamp;
+    }
+
+    function systype() {
+        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;
+        return TRUE;
+    }
+
+    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;
+        return TRUE;
+    }
+
+    function restore($from) {
+        if(!isset($this->_features["REST"])) {
+            $this->PushError("restore", "not supported by server");
+            return FALSE;
+        }
+        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;
+        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;;
+        }
+        return true;
+    }
+
+    function rawlist($pathname="", $arg="") {
+        return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist");
+    }
+
+    function nlist($pathname="") {
+        return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist");
+    }
+
+    function is_exists($pathname) {
+        return $this->file_exists($pathname);
+    }
+
+    function file_exists($pathname) {
+        $exists=true;
+        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");
+        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)) {
+            return FALSE;
+        }
+        if($this->_can_restore and $rest!=0) $this->restore($rest);
+        if(!$this->_exec("RETR ".$remotefile, "get")) {
+            $this->_data_close();
+            return FALSE;
+        }
+        if(!$this->_checkCode()) {
+            $this->_data_close();
+            return FALSE;
+        }
+        $out=$this->_data_read($mode, $fp);
+        $this->_data_close();
+        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");
+        $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);
+        $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")) {
+            $this->_data_close();
+            fclose($fp);
+            return FALSE;
+        }
+        if(!$this->_checkCode()) {
+            $this->_data_close();
+            fclose($fp);
+            return FALSE;
+        }
+        $out=$this->_data_read($mode, $fp);
+        fclose($fp);
+        $this->_data_close();
+        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)) {
+            return FALSE;
+        }
+        if($this->_can_restore and $rest!=0) $this->restore($rest);
+        if(!$this->_exec("STOR ".$remotefile, "put")) {
+            $this->_data_close();
+            return FALSE;
+        }
+        if(!$this->_checkCode()) {
+            $this->_data_close();
+            return FALSE;
+        }
+        $ret=$this->_data_write($mode, $fp);
+        $this->_data_close();
+        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."\"");
+            return FALSE;
+        }
+        $fp = @fopen($localfile, "r");
+
+        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)) {
+            fclose($fp);
+            return FALSE;
+        }
+        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()) {
+            $this->_data_close();
+            fclose($fp);
+            return FALSE;
+        }
+        $ret=$this->_data_write($mode, $fp);
+        fclose($fp);
+        $this->_data_close();
+        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."\"");
+            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;
+            }
+            closedir($handle);
+        } else {
+            $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;
+            }
+        }
+        return $ret;
         
-        var $error_no = NULL;
-        var $error_msg = NULL;
-        
-        function FTP() {
-        }
-
-        function connect($host, $port=21, $timeout=FTP_TIMEOUT) { //Opens an FTP connection
-            $this->_resetError();
-
-            $err_no = 0;
-            $err_msg = "";
-            $this->controlSocket = @fsockopen($host, $port, $err_no, $err_msg, $timeout) or $this->_setError(-1,"fsockopen failed"); 
-            if ($err_no<>0) $this->setError($err_no,$err_msg);
-
-            if ($this->_isError()) return false;
-            
-            @socket_set_timeout($this->controlSocket,$timeout) or $this->_setError(-1,"socket_set_timeout failed");
-            if ($this->_isError()) return false;
-            
-            $this->_waitForResult();
-            if ($this->_isError()) return false;
-            
-            return $this->getLastResult() == FTP_SERVICE_READY;
-        }
-        
-        function isConnected() {
-            return $this->controlSocket != NULL;
-        }
-        
-        function disconnect() {
-            if (!$this->isConnected()) return;
-            @fclose($this->controlSocket);
-        }
-
-        function close() { //Closes an FTP connection
-            $this->disconnect();
-        }
-        
-        function login($user, $pass) {  //Logs in to an FTP connection
-            $this->_resetError();
-
-            $this->_printCommand("USER $user");
-            if ($this->_isError()) return false;
-
-            $this->_waitForResult();
-            if ($this->_isError()) return false;
-
-            if ($this->getLastResult() == FTP_PASSWORD_NEEDED){
-                $this->_printCommand("PASS $pass");
-                if ($this->_isError()) return FALSE;
-
-                $this->_waitForResult();
-                if ($this->_isError()) return FALSE;
-            }
-            
-            $result = $this->getLastResult() == FTP_USER_LOGGED_IN;
-            return $result;
-        }
-
-        function cdup() { //Changes to the parent directory
-            $this->_resetError();
-
-            $this->_printCommand("CDUP");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return ($lr==FTP_FILE_ACTION_OK || $lr==FTP_COMMAND_OK);
-        }
-        
-        function cwd($path) {
-            $this->_resetError();
-
-            $this->_printCommand("CWD $path");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return ($lr==FTP_FILE_ACTION_OK || $lr==FTP_COMMAND_OK);
-        }
-
-        function cd($path) {
-            return $this->cwd($path);
-        }
-
-        function chdir($path) { //Changes directories on a FTP server
-            return $this->cwd($path);
-        }
-
-        function chmod($mode,$filename) { //Set permissions on a file via FTP
-            return $this->site("CHMOD $mode $filename");
-        }
-
-        function delete($filename) { //Deletes a file on the FTP server
-            $this->_resetError();
-
-            $this->_printCommand("DELE $filename");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return ($lr==FTP_FILE_ACTION_OK || $lr==FTP_COMMAND_OK);
-        }
-
-        function exec($cmd) { //Requests execution of a program on the FTP server
-            return $this->site("EXEC $cmd");
-        }
-
-        function fget($fp,$remote,$mode=FTP_BINARY,$resumepos=0) { //Downloads a file from the FTP server and saves to an open file
-            $this->_resetError();
-            
-            $type = "I";
-            if ($mode==FTP_ASCII) $type = "A";
-            
-            $this->_printCommand("TYPE $type");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            
-            $result = $this->_download("RETR $remote");
-            if ($result) {
-                fwrite($fp,$result);
-            }
-            return $result;
-        }
-
-        function fput($remote,$resource,$mode=FTP_BINARY,$startpos=0) { //Uploads from an open file to the FTP server
-            $this->_resetError();
-            
-            $type = "I";
-            if ($mode==FTP_ASCII) $type = "A";
-            
-            $this->_printCommand("TYPE $type");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            
-            if ($startpos>0) fseek($resource,$startpos);
-            $result = $this->_uploadResource("STOR $remote",$resource);
-            return $result;
-        }
-
-        function get_option($option) { //Retrieves various runtime behaviours of the current FTP stream
-            $this->_resetError();
-
-            switch ($option) {
-                case "FTP_TIMEOUT_SEC" : return FTP_TIMEOUT;
-                case "PHP_FTP_OPT_AUTOSEEK" : return FALSE;
-            }
-            setError(-1,"Unknown option: $option");
+    }
+
+    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."\"");
+                return FALSE;
+            }
+        }
+        foreach($list as $k=>$v) {
+            $list[$k]=$this->parselisting($v);
+            if($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)) {
+                    $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;
+                }
+            } 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;
+                }
+            }
+            @chmod($local."/".$el["name"], $el["perms"]);
+            $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");
             return false;
         }
-
-        function get($locale,$remote,$mode=FTP_BINARY,$resumepos=0) { //Downloads a file from the FTP server
-            if (!($fp = @fopen($locale,"wb"))) return FALSE;
-            $result = $this->fget($fp,$remote,$mode,$resumepos);
-            @fclose($fp);
-            if (!$result) @unlink($locale);
-            return $result;
-        }
-        function mdtm($name) { //Returns the last modified time of the given file
-            $this->_resetError();
-
-            $this->_printCommand("MDTM $name");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            if ($lr!=FTP_FILE_STATUS) return FALSE;
-            $subject = trim(substr($this->lastLine,4));
-            $lucifer = array();
-            if (preg_match("/([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])/",$subject,$lucifer))
-                return mktime($lucifer[4],$lucifer[5],$lucifer[6],$lucifer[2],$lucifer[3],$lucifer[1],0);
-            return FALSE;
-        }
-
-        function mkdir($name) { //Creates a directory
-            $this->_resetError();
-
-            $this->_printCommand("MKD $name");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return ($lr==FTP_PATHNAME || $lr==FTP_FILE_ACTION_OK || $lr==FTP_COMMAND_OK);
-        }
-
-        function nb_continue() { //Continues retrieving/sending a file (non-blocking)
-            $this->_resetError();
-            // todo
-        }
-
-        function nb_fget() { //Retrieves a file from the FTP server and writes it to an open file (non-blocking)
-            $this->_resetError();
-            // todo
-        }
-
-        function nb_fput() { //Stores a file from an open file to the FTP server (non-blocking)
-            $this->_resetError();
-            // todo
-        }
-
-        function nb_get() { //Retrieves a file from the FTP server and writes it to a local file (non-blocking)
-            $this->_resetError();
-            // todo
-        }
-
-        function nb_put() { //Stores a file on the FTP server (non-blocking)
-            $this->_resetError();
-            // todo
-        }
-
-        function nlist($remote_filespec="") { //Returns a list of files in the given directory
-            $this->_resetError();
-            $result = $this->_download(trim("NLST $remote_filespec"));
-            return ($result !== FALSE) ? explode("\n",str_replace("\r","",trim($result))) : $result;
-        }
-        
-        function pasv($pasv) { //Turns passive mode on or off
-            if (!$pasv) {
-                $this->_setError("Active (PORT) mode is not supported");
-                return false;
-            }
-            return true;
-        }
-
-        function put($remote,$local,$mode=FTP_BINARY,$startpos=0) { //Uploads a file to the FTP server
-            if (!($fp = @fopen($local,"rb"))) return FALSE;
-            $result = $this->fput($remote,$fp,$mode,$startpos);
-            @fclose($fp);
-            return $result;
-        }
-
-        function pwd() { //Returns the current directory name
-            $this->_resetError();
-
-            $this->_printCommand("PWD");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            if ($lr!=FTP_PATHNAME) return FALSE;
-            $subject = trim(substr($this->lastLine,4));
-            $lucifer = array();
-            if (preg_match("/\"(.*)\"/",$subject,$lucifer)) return $lucifer[1];
-            return FALSE;
-        }
-
-        function quit() { //Alias of close
-            $this->close();
-        }
-
-        function raw($cmd) { //Sends an arbitrary command to an FTP server
-            $this->_resetError();
-
-            $this->_printCommand($cmd);
-            $this->_waitForResult();
-            $this->getLastResult();
-            return array($this->lastLine);
-        }
-
-        function rawlist($remote_filespec="") { //Returns a detailed list of files in the given directory
-            $this->_resetError();
-            $result = $this->_download(trim("LIST $remote_filespec"));
-            return ($result !== FALSE) ? explode("\n",str_replace("\r","",trim($result))) : $result;
-        }
-        
-        function ls($remote_filespec="") { //Returns a parsed rawlist in an assoc array
-            $a = $this->rawlist($remote_filespec);
-            if (!$a) return $a;
-            $systype = $this->systype();
-            $is_windows = stristr($systype,"WIN")!==FALSE;
-            $b = array();
-            while (list($i,$line) = each($a)) {
-                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[$i] = array();
-                    if ($lucifer[3]<70) { $lucifer[3]+=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
-                    $b[$i]['isdir'] = ($lucifer[7]=="<DIR>");
-                    $b[$i]['size'] = $lucifer[7];
-                    $b[$i]['month'] = $lucifer[1];
-                    $b[$i]['day'] = $lucifer[2];
-                    $b[$i]['year'] = $lucifer[3];
-                    $b[$i]['hour'] = $lucifer[4];
-                    $b[$i]['minute'] = $lucifer[5];
-                    $b[$i]['time'] = @mktime($lucifer[4]+(strcasecmp($lucifer[6],"PM")==0?12:0),$lucifer[5],0,$lucifer[1],$lucifer[2],$lucifer[3]);
-                    $b[$i]['am/pm'] = $lucifer[6];
-                    $b[$i]['name'] = $lucifer[8];
-                } else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
-                    echo $line."\n";
-                    $lcount=count($lucifer);
-                    if ($lcount<8) continue;
-                    $b[$i] = array();
-                    $b[$i]['isdir'] = $lucifer[0]{0} === "d";
-                    $b[$i]['islink'] = $lucifer[0]{0} === "l";
-                    $b[$i]['perms'] = $lucifer[0];
-                    $b[$i]['number'] = $lucifer[1];
-                    $b[$i]['owner'] = $lucifer[2];
-                    $b[$i]['group'] = $lucifer[3];
-                    $b[$i]['size'] = $lucifer[4];
-                    if ($lcount==8) {
-                        sscanf($lucifer[5],"%d-%d-%d",$b[$i]['year'],$b[$i]['month'],$b[$i]['day']);
-                        sscanf($lucifer[6],"%d:%d",$b[$i]['hour'],$b[$i]['minute']);
-                        $b[$i]['time'] = @mktime($b[$i]['hour'],$b[$i]['minute'],0,$b[$i]['month'],$b[$i]['day'],$b[$i]['year']);
-                        $b[$i]['name'] = $lucifer[7];
-                    } else {
-                        $b[$i]['month'] = $lucifer[5];
-                        $b[$i]['day'] = $lucifer[6];
-                        if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
-                            $b[$i]['year'] = date("Y");
-                            $b[$i]['hour'] = $l2[1];
-                            $b[$i]['minute'] = $l2[2];
-                        } else {
-                            $b[$i]['year'] = $lucifer[7];
-                            $b[$i]['hour'] = 0;
-                            $b[$i]['minute'] = 0;
-                        }
-                        $b[$i]['time'] = strtotime(sprintf("%d %s %d %02d:%02d",$b[$i]['day'],$b[$i]['month'],$b[$i]['year'],$b[$i]['hour'],$b[$i]['minute']));
-                        $b[$i]['name'] = $lucifer[8];
-                    }
+    
+        foreach($list as $k=>$v) {
+            $list[$k]=$this->parselisting($v);
+            if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+        }
+        $ret=true;
+    
+        foreach($list as $el) {
+            if ( empty($el) )
+                continue;
+
+            if($el["type"]=="d") {
+                if(!$this->mdel($remote."/".$el["name"], $continious)) {
+                    $ret=false;
+                    if(!$continious) break;
                 }
-            }
-            return $b;
-        }
-
-        function rename($from,$to) { //Renames a file on the FTP server
-            $this->_resetError();
-
-            $this->_printCommand("RNFR $from");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            $this->_printCommand("RNTO $to");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return ($lr==FTP_FILE_ACTION_OK || $lr==FTP_COMMAND_OK);
-        }
-
-        function rmdir($name) { //Removes a directory
-            $this->_resetError();
-
-            $this->_printCommand("RMD $name");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return ($lr==FTP_FILE_ACTION_OK || $lr==FTP_COMMAND_OK);
-        }
-
-        function set_option() { //Set miscellaneous runtime FTP options
-            $this->_resetError();
-            $this->_setError(-1,"set_option not supported");
+            } 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(!$this->rmdir($remote)) {
+            $this->PushError("mdel", "can't delete folder", "Can't delete remote folder \"".$remote."/".$el["name"]."\"");
+            $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);
+        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;
+            }
+        } else {
+            $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;
+        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));
+        else {
+            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?
+            ereg($pattern,$probe):
+            eregi($pattern,$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");
             return false;
         }
 
-        function site($cmd) { //Sends a SITE command to the server
-            $this->_resetError();
-
-            $this->_printCommand("SITE $cmd");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return true;
-        }
-
-        function size($name) { //Returns the size of the given file
-            $this->_resetError();
-
-            $this->_printCommand("SIZE $name");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return $lr==FTP_FILE_STATUS ? trim(substr($this->lastLine,4)) : FALSE;
-        }
-
-        function ssl_connect() { //Opens an Secure SSL-FTP connection
-            $this->_resetError();
-            $this->_setError(-1,"ssl_connect not supported");
-            return false;
-        }
-
-        function systype() { // Returns the system type identifier of the remote FTP server
-            $this->_resetError();
-
-            $this->_printCommand("SYST");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            return $lr==FTP_NAME_SYSTEM_TYPE ? trim(substr($this->lastLine,4)) : FALSE;
-        }
-
-        function getLastResult() {
-            $this->newResult = FALSE;
-            return $this->lastResult;
-        }
-        
-        /* private */
-        function _hasNewResult() {
-            return $this->newResult;
-        }
-        
-        /* private */
-        function _waitForResult() {
-            while(!$this->_hasNewResult() && $this->_readln()!==FALSE && !$this->_isError()) { /* noop  */ }
-        }
-        
-        /* private */
-        function _readln() {
-            $line = fgets($this->controlSocket);
-            if ($line === FALSE) {
-                $this->_setError(-1,"fgets failed in _readln");
-                return FALSE;
-            }
-            if (strlen($line)==0) return $line;
-
-            $lucifer = array();
-            if (preg_match("/^[0-9][0-9][0-9] /",$line,$lucifer)) {
-                //its a resultline
-                $this->lastResult = intval($lucifer[0]);
-                $this->newResult = TRUE;
-                if (substr($lucifer[0],0,1)=='5') {
-                    $this->_setError($this->lastResult,trim(substr($line,4)));
-                }
-            }
+        $dirlist = array();
+        foreach($list as $k=>$v) {
+            $entry=$this->parselisting($v);
+            if ( empty($entry) )
+                continue;
+
+            if($entry["name"]=="." or $entry["name"]=="..")
+                continue;
+
+            $dirlist[$entry['name']] = $entry;
+        }
+
+        return $dirlist;
+    }
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!--       Private functions                                                                 -->
+// <!-- --------------------------------------------------------------------------------------- -->
+    function _checkCode() {
+        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)) {
+            $this->_data_close();
+            return FALSE;
+        }
+        if(!$this->_checkCode()) {
+            $this->_data_close();
+            return FALSE;
+        }
+        $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);
+//          $this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
+        }
+        return $out;
+    }
+
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!-- 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='';
+        $this->SendMSG($fctname.': '.$msg.$tmp);
+        return(array_push($this->_error_array,$error));
+    }
     
-            $this->lastLine = trim($line);
-            $this->lastLines[] = "< ".trim($line);
-            return $line;
-        }
-        
-        /* private */
-        function _printCommand($line) {
-            $this->lastLines[] = "> ".$line;
-            fwrite($this->controlSocket,$line."\r\n");
-            fflush($this->controlSocket);
-        }
-        
-        /* private */
-        function _pasv() {
-            $this->_resetError();
-            $this->_printCommand("PASV");
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if ($this->_isError()) return FALSE;
-            if ($lr!=FTP_PASSIVE_MODE) return FALSE;
-            $subject = trim(substr($this->lastLine,4));
-            $lucifer = array();
-            if (preg_match("/\\((\d{1,3}),(\d{1,3}),(\d{1,3}),(\d{1,3}),(\d{1,3}),(\d{1,3})\\)/",$subject,$lucifer)) {
-                $this->pasvAddr=$lucifer;
-                
-                $host = sprintf("%d.%d.%d.%d",$lucifer[1],$lucifer[2],$lucifer[3],$lucifer[4]);
-                $port = $lucifer[5]*256 + $lucifer[6];
-                
-                $err_no=0;
-                $err_msg="";
-                $passiveConnection = fsockopen($host,$port,$err_no,$err_msg, FTP_TIMEOUT);
-                if ($err_no!=0) {
-                    $this->_setError($err_no,$err_msg);
-                    return FALSE;
-                }
-
-                return $passiveConnection;
-            }
-            return FALSE;
-        }
-        
-        /* private */
-        function _download($cmd) {
-            if (!($passiveConnection = $this->_pasv())) return FALSE;
-            $this->_printCommand($cmd);
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if (!$this->_isError()) {
-                $result = "";
-                while (!feof($passiveConnection)) {
-                    $result .= fgets($passiveConnection);
-                }
-                fclose($passiveConnection);
-                $this->_waitForResult();
-                $lr = $this->getLastResult();
-                return ($lr==FTP_FILE_TRANSFER_OK) || ($lr==FTP_FILE_ACTION_OK) || ($lr==FTP_COMMAND_OK) ? $result : FALSE;
-            } else {
-                fclose($passiveConnection);
-                return FALSE;
-            }
-        }
-
-        /* upload */
-        function _uploadResource($cmd,$resource) {
-            if (!($passiveConnection = $this->_pasv())) return FALSE;
-            $this->_printCommand($cmd);
-            $this->_waitForResult();
-            $lr = $this->getLastResult();
-            if (!$this->_isError()) {
-                $result = "";
-                while (!feof($resource)) {
-                    $buf = fread($resource,1024);
-                    fwrite($passiveConnection,$buf);
-                }
-                fclose($passiveConnection);
-                $this->_waitForResult();
-                $lr = $this->getLastResult();
-                return ($lr==FTP_FILE_TRANSFER_OK) || ($lr==FTP_FILE_ACTION_OK) || ($lr==FTP_COMMAND_OK) ? $result : FALSE;
-            } else {
-                fclose($passiveConnection);
-                return FALSE;
-            }
-        }
-        
-        /* private */
-        function _resetError() {
-            $this->error_no = NULL;
-            $this->error_msg = NULL;
-        }
-
-        /* private */
-        function _setError($no,$msg) {
-            if (is_array($this->error_no)) {
-                $this->error_no[] = $no;
-                $this->error_msg[] = $msg;
-            } else if ($this->error_no!=NULL) {
-                $this->error_no = array($this->error_no,$no);
-                $this->error_msg = array($this->error_msg,$msg);
-            } else {
-                $this->error_no = $no;
-                $this->error_msg = $msg;
-            }
-        }
-        
-        /* private */
-        function _isError() {
-            return ($this->error_no != NULL) && ($this->error_no !== 0);
-        }
-
-    }
+// Rcupre une erreur externe
+    function PopError(){
+        if(count($this->_error_array)) return(array_pop($this->_error_array));
+            else return(false);
+    }
+}
+
+$mod_sockets=TRUE;
+if (!extension_loaded('sockets')) {
+    $prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : '';
+    if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=FALSE;
+}
+require_once "class-ftp-".($mod_sockets?"sockets":"pure").".php";
 ?>

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

@@ -167 +167 @@
         if( ! $mode )
             return false;
-        if( ! $this->exists($file) )
-            return false;
-        if( ! $recursive || ! $this->is_dir($file) ){
+        if ( ! $this->exists($file) )
+            return false;
+        if ( ! $recursive || ! $this->is_dir($file) ){
             if (!function_exists('ftp_chmod'))
                 return ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
@@ -268 +268 @@
         if( ! $overwrite && $this->exists($destination) )
             return false;
-        $content = $this->get_contents($source);
-        $this->put_contents($destination,$content);
+        if ( !$content = $this->get_contents($source) )
+            return false;
+        return $this->put_contents($destination,$content);
     }
     function move($source,$destination,$overwrite=false){
@@ -281 +282 @@
             return @ftp_rmdir($this->link,$file);
         $filelist = $this->dirlist($file);
-        foreach ($filelist as $filename => $fileinfo) {
+        foreach ((array) $filelist as $filename => $fileinfo) {
             $this->delete($file.'/'.$filename,$recursive);
         }
@@ -328 +329 @@
             return false;
         if( $chmod )
-            $this->chmod($chmod);
+            $this->chmod($path, $chmod);
         if( $chown )
-            $this->chown($chown);
+            $this->chown($path, $chown);
         if( $chgrp )
-            $this->chgrp($chgrp);
+            $this->chgrp($path, $chgrp);
         return true;
     }
@@ -344 +345 @@
             
     }
+
+    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)) {
+            $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';
+            $b['size'] = $lucifer[7];
+            $b['month'] = $lucifer[1];
+            $b['day'] = $lucifer[2];
+            $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['am/pm'] = $lucifer[6];
+            $b['name'] = $lucifer[8];
+        } else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
+            //echo $line."\n";
+            $lcount=count($lucifer);
+            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';
+            $b['perms'] = $lucifer[0];
+            $b['number'] = $lucifer[1];
+            $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']);
+                $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)) {
+                    $b['year'] = date("Y");
+                    $b['hour'] = $l2[1];
+                    $b['minute'] = $l2[2];
+                } else {
+                    $b['year'] = $lucifer[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['name'] = $lucifer[8];
+            }
+        }
+
+        return $b;
+    }
+
     function dirlist($path='.',$incdot=false,$recursive=false){
         if( $this->is_file($path) ){
@@ -353 +417 @@
         //if( ! $this->is_dir($path) )
         //  return false;
-        $list = ftp_rawlist($this->link,$path,false); //We'll do the recursive part ourseves...
-        //var_dump($list);
-        if( ! $list )
-            return false;
-        if( empty($list) )
+        $list = ftp_rawlist($this->link , '-a ' . $path, false);
+        if ( $list === false )
+            return false;
+
+        $dirlist = array();
+        foreach ( $list as $k => $v ) {
+            $entry = $this->parselisting($v);
+            if ( empty($entry) )
+                continue;
+
+            if ( $entry["name"]=="." or $entry["name"]==".." )
+                continue;
+
+            $dirlist[$entry['name']] = $entry;
+        }
+
+        if ( ! $dirlist )
+            return false;
+        if ( empty($dirlist) )
             return array();
 
         $ret = array();
-        foreach($list as $line){
-            if (substr(strtolower($line), 0, 5) == 'total') continue;
-            $struc = array();
-            $current = preg_split("/[\s]+/",$line,9);
-            $name_num = count($current) - 1;
-            $struc['name']      = str_replace('//','',$current[$name_num]);
-
-            if( '.' == $struc['name'][0] && !$incdot)
-                continue;
-            if( $limitFile && $struc['name'] != $limitFile)
-                continue;
-
-            $struc['perms']     = $current[0];
-            $struc['permsn']    = $this->getnumchmodfromh($current[0]);
-            $struc['number']    = $current[1];
-            $struc['owner']     = $current[2];
-            $struc['group']     = $current[3];
-            $struc['size']      = $current[4];
-            $struc['lastmod']   = $current[5].' '.$current[6];
-            $struc['time']      = $current[7];
-
-            $struc['type']      = ('d' == $struc['perms'][0] || 'l' == $struc['perms'][0] ) ? 'folder' : 'file';
-            if('folder' == $struc['type'] ){
+        foreach ( $dirlist as $struc ) {
+            
+            if ( 'd' == $struc['type'] ) {
                 $struc['files'] = array();
 
-                if( $incdot ){
+                if ( $incdot ){
                     //We're including the doted starts
                     if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
@@ -402 +460 @@
         return $ret;
     }
+
     function __destruct(){
         if( $this->link )

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

@@ -30 +30 @@
         if( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
                 return false;
-        $this->ftp = new FTP();
+        $this->ftp = new ftp();
 
         //Set defaults:
@@ -61 +61 @@
         if ( ! $this->ftp )
             return false;
-            
-        if ( ! $this->ftp->connect($this->options['hostname'], $this->options['port'], $this->timeout) ) {
+
+        //$this->ftp->Verbose = true;
+
+        if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port']) ) {
+            $this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+            return false;
+        }
+        if ( ! $this->ftp->connect() ) {
             $this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
             return false;
@@ -72 +78 @@
         }
 
+        $this->ftp->SetType(FTP_AUTOASCII);
+        $this->ftp->Passive(true);
         return true;
     }
@@ -114 +122 @@
         return $this->find_base_dir('/',$echo);
     }
+
     function get_base_dir($base = '.'){
         if( empty($this->wp_base) )
@@ -119 +128 @@
         return $this->wp_base;
     }
+
     function get_contents($file,$type='',$resumepos=0){
         if( empty($type) ){
@@ -125 +135 @@
         }
         $this->ftp->SetType($type);
-        
-        return $this->ftp->get($file);
-    }
+        $temp = tmpfile();
+        if ( ! $this->ftp->fget($temp, $file) ) {
+            fclose($temp);
+            return false;
+        }
+        fseek($temp, 0); //Skip back to the start of the file being written to
+        $contents = '';
+        while ( !feof($temp) )
+            $contents .= fread($temp, 8192);
+        fclose($temp);
+        return $contents;
+    }
+
     function get_contents_array($file){
         return explode("\n",$this->get_contents($file));
     }
+
     function put_contents($file,$contents,$type=''){
         if( empty($type) ){
-            $extension = substr(strrchr($filename, "."), 1);
+            $extension = substr(strrchr($file, "."), 1);
             $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII;
         }
@@ -141 +162 @@
         fwrite($temp,$contents);
         fseek($temp, 0); //Skip back to the start of the file being written to
-        $ret = $this->ftp->put($temp, $file);
+        $ret = $this->ftp->fput($file, $temp);
         fclose($temp);
         return $ret;
     }
+
     function cwd(){
         return $this->ftp->pwd();
     }
+
     function chgrp($file,$group,$recursive=false){
         return false;
     }
+    
     function chmod($file,$mode=false,$recursive=false){
         if( ! $mode )
@@ -168 +192 @@
         return true;
     }
+    
     function chown($file,$owner,$recursive=false){
         return false;
     }
+    
     function owner($file){
         $dir = $this->dirlist($file);
         return $dir[$file]['owner'];
     }
+    
     function getchmod($file){
         $dir = $this->dirlist($file);
         return $dir[$file]['permsn'];
     }
+
     function gethchmod($file){
         //From the PHP.net page for ...?
@@ -230 +258 @@
         return $info;
     }
+
     function getnumchmodfromh($mode) {
         $realmode = "";
@@ -248 +277 @@
         return $newmode;
     }
+
     function group($file){
         $dir = $this->dirlist($file);
         return $dir[$file]['group'];
     }
+
     function copy($source,$destination,$overwrite=false){
         if( ! $overwrite && $this->exists($destination) )
             return false;
+
         $content = $this->get_contents($source);
-        $this->put_contents($destination,$content);
-    }
+        if ( !$content )
+            return false;
+
+        return $this->put_contents($destination,$content);
+    }
+
     function move($source,$destination,$overwrite=false){
         return $this->ftp->rename($source,$destination);
@@ -267 +303 @@
         if ( !$recursive )
             return $this->ftp->rmdir($file);
-        $filelist = $this->dirlist($file);
-        foreach ($filelist as $filename) {
-            $this->delete($file.'/'.$filename,$recursive);
-        }
-        return $this->ftp->rmdir($file);
+
+        return $this->ftp->mdel($file);
     }
 
@@ -277 +310 @@
         return $this->ftp->is_exists($file);
     }
+
     function is_file($file){
-        //return $this->ftp->file_exists($file);
-        $list = $this->ftp->rawlist($file,'-a');
-        if( ! $list )
-            return false;
-        return ($list[0] == '-'); 
-    }
+        return $this->is_dir($file) ? false : true;
+    }
+
     function is_dir($path){
-        $list = $this->ftp->rawlist($file,'-a');
-        if( ! $list )
-            return false;
-        return true;
-    }
+        $cwd = $this->cwd();
+        if ( $this->ftp->chdir($path) ) {
+            $this->ftp->chdir($cwd);
+            return true;
+        }
+        return false;
+    }
+
     function is_readable($file){
         //Get dir list, Check if the file is writable by the current user??
         return true;
     }
+
     function is_writable($file){
         //Get dir list, Check if the file is writable by the current user??
         return true;
     }
+
     function atime($file){
         return false;
     }
+
     function mtime($file){
         return $this->ftp->mdtm($file);
     }
+
     function size($file){
         return $this->ftp->filesize($file);
     }
+
     function touch($file,$time=0,$atime=0){
         return false;
     }
+
     function mkdir($path,$chmod=false,$chown=false,$chgrp=false){
         if( ! $this->ftp->mkdir($path) )
             return false;
         if( $chmod )
-            $this->chmod($chmod);
+            $this->chmod($path, $chmod);
         if( $chown )
-            $this->chown($chown);
+            $this->chown($path, $chown);
         if( $chgrp )
-            $this->chgrp($chgrp);
+            $this->chgrp($path, $chgrp);
         return true;
     }
+
     function rmdir($path,$recursive=false){
         if( ! $recursive )
             return $this->ftp->rmdir($file);
-        return false;
-        //TODO: Recursive Directory delete, Have to delete files from the folder first.
-        //$dir = $this->dirlist($path);
-        //foreach($dir as $file)
-            
-    }
+
+        return $this->ftp->mdel($path);
+    }
+
     function dirlist($path='.',$incdot=false,$recursive=false){
         if( $this->is_file($path) ){
@@ -339 +378 @@
         //if( ! $this->is_dir($path) )
         //  return false;
-        $list = $this->ftp->rawlist($path,'-a');
-        //var_dump($list);
+        $list = $this->ftp->dirlist($path);
         if( ! $list )
             return false;
@@ -347 +385 @@
 
         $ret = array();
-        foreach($list as $line){
-            $struc = array();
-            $current = preg_split("/[\s]+/",$line,9);
-            $struc['name']      = str_replace('//','',$current[8]);
-
-            if( '.' == $struc['name'][0] && !$incdot)
-                continue;
-            if( $limitFile && $struc['name'] != $limitFile)
-                continue;
-
-            $struc['perms']     = $current[0];
-            $struc['permsn']    = $this->getnumchmodfromh($current[0]);
-            $struc['number']    = $current[1];
-            $struc['owner']     = $current[2];
-            $struc['group']     = $current[3];
-            $struc['size']      = $current[4];
-            $struc['lastmod']   = $current[5].' '.$current[6];
-            $struc['time']      = $current[7];
-
-            $struc['type']      = ('d' == $struc['perms'][0] || 'l' == $struc['perms'][0] ) ? 'folder' : 'file';
-            if('folder' == $struc['type'] ){
+        foreach ( $list as $struc ) {
+            
+            if ( 'd' == $struc['type'] ) {
                 $struc['files'] = array();
 
-                if( $incdot ){
+                if ( $incdot ){
                     //We're including the doted starts
                     if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
@@ -386 +406 @@
         return $ret;
     }
+
     function __destruct(){
         $this->ftp->quit();

trunk/wp-admin/includes/file.php

@@ -238 +238 @@
     $tmppath = '';
     for ( $j = 0; $j < count($path) - 1; $j++ ) {
+        $prevpath = $tmppath;
         $tmppath .= $path[$j] . '/';
         if ( ! $fs->is_dir($tmppath) ) {
-            $fs->mkdir($tmppath);
-        } else {
-            $fs->setDefaultPermissions( $fs->getchmod($tmppath) );
+            //$fs->setDefaultPermissions( $fs->getchmod($tmppath) );
+            $fs->mkdir($tmppath, 0755);
         }
     }
@@ -254 +254 @@
             $tmppath .= $path[$j] . '/';
             if ( ! $fs->is_dir($to . $tmppath) )
-                $fs->mkdir($to . $tmppath);
+                if ( !$fs->mkdir($to . $tmppath, 0755) )
+                    return new WP_Error('mkdir_failed', __('Could not create directory'));
         }
 
         // We've made sure the folders are there, so let's extract the file now:
         if ( ! $file['folder'] )
-            $fs->put_contents( $to . $file['filename'], $file['content']);
-    }
+            if ( !$fs->put_contents( $to . $file['filename'], $file['content']) )
+                return new WP_Error('copy_failed', __('Could not copy file'));
+            $fs->chmod($to . $file['filename'], 0644);
+    }
+
+    return true;
 }
 
@@ -272 +277 @@
 
     foreach ( (array) $dirlist as $filename => $fileinfo ) {
-        if ( 'file' == $fileinfo['type'] ) {
-            $wp_filesystem->copy($from . $filename, $to . $filename, true);
-        } elseif ( 'folder' == $fileinfo['type'] ) {
-            $wp_filesystem->mkdir($to . $filename);
-            copy_dir($from . $filename, $to . $filename);
+        if ( 'f' == $fileinfo['type'] ) {
+            if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
+                return false;
+            $wp_filesystem->chmod($to . $filename, 0644);
+        } elseif ( 'd' == $fileinfo['type'] ) {
+            if ( !$wp_filesystem->mkdir($to . $filename, 0755) )
+                return false;
+            if ( !copy_dir($from . $filename, $to . $filename) )
+                return false;
         }
     }
+
+    return true;
 }
 
@@ -303 +314 @@
 
 function get_filesystem_method() {
+    return 'ftpsockets';
+
     $tempFile = tempnam(get_temp_dir(), 'WPU');
 
     if ( getmyuid() == fileowner($tempFile) ) {
         unlink($tempFile);
-        //return 'direct';
+        return 'direct';
     } else {
         unlink($tempFile);

trunk/wp-admin/includes/update.php

@@ -159 +159 @@
 
     // Clean up working directory
-    $wp_filesystem->delete($working_dir, true);
+    if ( is_dir($working_dir) )
+        $wp_filesystem->delete($working_dir, true);
 
     apply_filters('update_feedback', __("Unpacking the update"));
@@ -175 +176 @@
     // Remove the existing plugin.
     apply_filters('update_feedback', __("Removing the old version of the plugin"));
-    $wp_filesystem->delete(ABSPATH . PLUGINDIR . "/$plugin");
     $plugin_dir = dirname(ABSPATH . PLUGINDIR . "/$plugin");
-
     // If plugin is in its own directory, recursively delete the directory.
     if ( '.' != $plugin_dir && ABSPATH . PLUGINDIR != $plugin_dir )
-        $wp_filesystem->delete($plugin_dir, true);
+        $deleted = $wp_filesystem->delete($plugin_dir, true);
+    else
+        $deleted = $wp_filesystem->delete(ABSPATH . PLUGINDIR . "/$plugin");
+    if ( !$deleted ) {
+        $wp_filesystem->delete($working_dir, true);
+        return new WP_Error('delete_failed', __('Could not remove the old plugin'));
+    }
 
     apply_filters('update_feedback', __("Installing the latest version"));
     // Copy new version of plugin into place.
-    copy_dir($working_dir, ABSPATH . PLUGINDIR);
+    if ( !copy_dir($working_dir, ABSPATH . PLUGINDIR) ) {
+        //$wp_filesystem->delete($working_dir, true);
+        return new WP_Error('install_failed', __('Installation failed'));
+    }
 
     // Remove working directory