Changeset 32923

Timestamp:

06/24/2015 04:48:18 AM (10 years ago)

Author:

dd32

Message:

WP Filesystem: Correctly parse the permissions field in the directory listings, and actually set it in FTP environments
Props mnelson4 for initial patch.
Fixes #29548

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-filesystem-base.php (modified) (2 diffs)
• class-wp-filesystem-ftpext.php (modified) (2 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (1 diff)

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

@@ -311 +311 @@
      */
     public function gethchmod( $file ){
-        $perms = $this->getchmod($file);
+        $perms = intval( $this->getchmod( $file ), 8 );
         if (($perms & 0xC000) == 0xC000) // Socket
             $info = 's';
@@ -353 +353 @@
 
     /**
+     * Gets the permissions of the specified file or filepath in their octal format
+     *
+     * @since 4.0
+     * @param string $file
+     * @return string the last 3 characters of the octal number
+     */
+    public function getchmod( $file ) {
+        return '777';
+    }
+
+    /**
      * Convert *nix-style file permissions to a octal number.
      *

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

@@ -385 +385 @@
      * @staticvar bool $is_windows
      * @param string $line
-     * @return string
+     * @return array
      */
     public function parselisting($line) {
@@ -427 +427 @@
                 $b['type'] = 'f';
             $b['perms'] = $lucifer[0];
+            $b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
             $b['number'] = $lucifer[1];
             $b['owner'] = $lucifer[2];

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

@@ -450 +450 @@
                 $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
 
+            // Add the Octal representation of the file permissions
+            $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
+
             $ret[ $struc['name'] ] = $struc;
         }