Changeset 12999

Timestamp:

02/07/2010 01:59:30 AM (14 years ago)

Author:

dd32

Message:

Standardise return values in WP_Filesystem::dirlist(), ::chmod() and ::exists()

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-ftpext.php (modified) (5 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (2 diffs)

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

@@ -161 +161 @@
         // chmod the file or directory
         if ( ! function_exists('ftp_chmod') )
-            return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-        return @ftp_chmod($this->link, $mode, $file);
+            return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+        return (bool)@ftp_chmod($this->link, $mode, $file);
     }
     function chown($file, $owner, $recursive = false ) {
@@ -243 +243 @@
     }
     function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-        if ( !ftp_mkdir($this->link, $path) )
+        if ( !@ftp_mkdir($this->link, $path) )
             return false;
         $this->chmod($path);
@@ -287 +287 @@
                 return '';
             $b = array();
-            $b['isdir'] = $lucifer[0]{0} === "d";
-            $b['islink'] = $lucifer[0]{0} === "l";
+            $b['isdir'] = $lucifer[0]{0} === 'd';
+            $b['islink'] = $lucifer[0]{0} === 'l';
             if ( $b['isdir'] )
                 $b['type'] = 'd';
@@ -335 +335 @@
         $list = @ftp_rawlist($this->link, '-a ' . $path, false);
 
-        if ( $list === false )
+        if ( empty($list) ) // Empty array = non-existant folder(real folder will show . at least
             return false;
 
@@ -355 +355 @@
             $dirlist[ $entry['name'] ] = $entry;
         }
-
-        if ( ! $dirlist )
-            return false;
 
         $ret = array();

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

@@ -225 +225 @@
 
     function is_file($file) {
-        return $this->is_dir($file) ? false : true;
+        if ( $this->is_dir($file) )
+            return false;
+        if ( $this->exists($file) )
+            return true;
+        return false;
     }
 
@@ -289 +293 @@
 
         $list = $this->ftp->dirlist($path);
-        if ( ! $list )
+        if ( empty($list) && !$this->exists($path) )
             return false;