Changeset 11005 for trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

Timestamp:

04/19/2009 07:36:28 PM (16 years ago)

Author:

ryan

Message:

consolidate plugin/theme/core upgrade/install functions. Props DD32. see #7875

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (6 diffs)

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

@@ -18 +18 @@
     var $link;
     var $timeout = 5;
-    var $errors = array();
+    var $errors = null;
     var $options = array();
 
@@ -66 +66 @@
 
     function connect() {
-        if ( $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'],$this->timeout);
         else
@@ -188 +188 @@
     }
 
-    function delete($file,$recursive=false) {
+    function delete($file, $recursive = false ) {
+        if ( empty($file) )
+            return false;
         if ( $this->is_file($file) )
             return @ftp_delete($this->link, $file);
         if ( !$recursive )
             return @ftp_rmdir($this->link, $file);
-        $filelist = $this->dirlist($file);
-        foreach ((array) $filelist as $filename => $fileinfo) {
-            $this->delete($file . '/' . $filename, $recursive);
-        }
+
+        $filelist = $this->dirlist( trailingslashit($file) );
+        if ( !empty($filelist) )
+            foreach ( $filelist as $delete_file )
+                $this->delete( trailingslashit($file) . $delete_file['name'], $recursive);
         return @ftp_rmdir($this->link, $file);
     }
 
     function exists($file) {
-        $list = ftp_rawlist($this->link, $file, false);
-        if( ! $list )
-            return false;
-        return count($list) == 1 ? true : false;
+        $list = @ftp_rawlist($this->link, $file, false);
+        return !empty($list); //empty list = no file, so invert.
     }
     function is_file($file) {
-        return $this->is_dir($file) ? false : true;
+        return $this->exists($file) && !$this->is_dir($file);
     }
     function is_dir($path) {
         $cwd = $this->cwd();
-        $result = @ftp_chdir($this->link, $path);
+        $result = @ftp_chdir($this->link, trailingslashit($path) );
         if( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
             @ftp_chdir($this->link, $cwd);
@@ -219 +220 @@
     }
     function is_readable($file) {
-        //Get dir list, Check if the file is writable by the current user??
+        //Get dir list, Check if the file is readable by the current user??
         return true;
     }
@@ -239 +240 @@
     }
     function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-        if( !@ftp_mkdir($this->link, $path) )
+        if( !ftp_mkdir($this->link, $path) )
             return false;
         if( $chmod )
@@ -250 +251 @@
     }
     function rmdir($path, $recursive = false) {
-        if( ! $recursive )
-            return @ftp_rmdir($this->link, $path);
-
-        //TODO: Recursive Directory delete, Have to delete files from the folder first.
-        //$dir = $this->dirlist($path);
-        //foreach($dir as $file)
-
+        return $this->delete($path, $recursive);
     }
 
     function parselisting($line) {
-        $is_windows = ($this->OS_remote == FTP_OS_Windows);
+        static $is_windows;
+        if ( is_null($is_windows) )
+            $is_windows = strpos( strtolower(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();