Changeset 12998

Timestamp:

02/07/2010 01:31:40 AM (15 years ago)

Author:

dd32

Message:

Reduce code duplication, Formatting cleanups, Reduce Chmod IO calls. See #10913 for excess IO calls.

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (3 diffs)
• class-wp-filesystem-ftpext.php (modified) (6 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (2 diffs)

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

@@ -117 +117 @@
      */
     function chmod($file, $mode = false, $recursive = false) {
-        if ( ! $this->exists($file) )
-            return false;
-
         if ( ! $mode ) {
             if ( $this->is_file($file) )
@@ -129 +126 @@
         }
 
-        if ( ! $recursive )
-            return @chmod($file, $mode);
-        if ( ! $this->is_dir($file) )
+        if ( ! $recursive || ! $this->is_dir($file) )
             return @chmod($file, $mode);
         //Is a directory, and we want recursive
@@ -299 +294 @@
 
     function rmdir($path, $recursive = false) {
-        //Currently unused and untested, Use delete() instead.
-        if ( ! $recursive )
-            return @rmdir($path);
-        //recursive:
-        $filelist = $this->dirlist($path);
-        foreach ($filelist as $filename => $det) {
-            if ( '/' == substr($filename, -1, 1) )
-                $this->rmdir($path . '/' . $filename, $recursive);
-            @rmdir($filename);
-        }
-        return @rmdir($path);
+        return $this->delete($path, $recursive);
     }
 

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

@@ -143 +143 @@
     }
     function chmod($file, $mode = false, $recursive = false) {
-        if ( ! $this->exists($file) && ! $this->is_dir($file) )
-            return false;
-
         if ( ! $mode ) {
             if ( $this->is_file($file) )
@@ -246 +243 @@
     }
     function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-        if  ( !ftp_mkdir($this->link, $path) )
-            return false;
-        if ( ! $chmod )
-            $chmod = FS_CHMOD_DIR;
-        $this->chmod($path, $chmod);
+        if ( !ftp_mkdir($this->link, $path) )
+            return false;
+        $this->chmod($path);
         if ( $chown )
             $this->chown($path, $chown);
@@ -264 +259 @@
         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) ) {
+            $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();
-            if ( $lucifer[3] < 70 ) { $lucifer[3] +=2000; } else { $lucifer[3] += 1900; } // 4digit year fix
-            $b['isdir'] = ($lucifer[7]=="<DIR>");
+            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';
@@ -280 +278 @@
             $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)) {
+        } elseif ( !$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";
@@ -301 +300 @@
             $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];
@@ -318 +317 @@
                     $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];
             }

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

@@ -155 +155 @@
 
     function chmod($file, $mode = false, $recursive = false ) {
-
         if ( ! $mode ) {
             if ( $this->is_file($file) )
@@ -278 +277 @@
 
     function rmdir($path, $recursive = false ) {
-        if ( ! $recursive )
-            return $this->ftp->rmdir($path);
-
-        return $this->ftp->mdel($path);
+        $this->delete($path, $recursive);
     }