Changeset 7164

Timestamp:

03/06/2008 06:06:13 AM (14 years ago)

Author:

ryan

Message:

wpfs fixes from DD32. see #5586

Location:

trunk/wp-admin/includes

Files:

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

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

@@ -86 +86 @@
 
     function find_base_dir($base = '.',$echo = false){
+        $abspath = str_replace('\\','/',ABSPATH); //windows: Straighten up the paths..
+        if( strpos($abspath, ':') ){ //Windows, Strip out the driveletter
+            if( preg_match("|.{1}\:(.+)|i", $abspath, $mat) )
+                $abspath = $mat[1];
+        }
+    
         if( empty( $base ) || '.' == $base ) $base = $this->cwd();
         if( empty( $base ) ) $base = '/';
         if( '/' != substr($base, -1) ) $base .= '/';
 
-        if($echo) echo sprintf(__('Changing to %s'), $base) .'<br>';
-        if( false === ftp_chdir($this->link, $base) )
+        if($echo) echo __('Changing to ') . $base  .'<br>';
+        if( false === $this->chdir($base) )
             return false;
 
         if( $this->exists($base . 'wp-settings.php') ){
-            if($echo) echo sprintf(__('Found %s'), $base . 'wp-settings.php') . '<br>';
+            if($echo) echo __('Found ') . $base . 'wp-settings.php<br>';
             $this->wp_base = $base;
             return $this->wp_base;
         }
 
-        if( strpos(ABSPATH, $base) > 0)
-            $arrPath = split('/',substr(ABSPATH,strpos(ABSPATH, $base)));
+        if( strpos($abspath, $base) > 0)
+            $arrPath = split('/',substr($abspath,strpos($abspath, $base)));
         else
-            $arrPath = split('/',ABSPATH);
+            $arrPath = split('/',$abspath);
 
         for($i = 0; $i <= count($arrPath); $i++)
@@ -110 +116 @@
         foreach($arrPath as $key=>$folder){
             if( $this->is_dir($base . $folder) ){
-                if($echo) echo sprintf(__('Found %s'), $folder) . ' ' . sprintf(__('Changing to %s'), $base . $folder . '/') . '<br>';
+                if($echo) echo __('Found ') . $folder . ' ' . __('Changing to') . ' ' . $base . $folder . '/<br>';
                 return $this->find_base_dir($base .  $folder . '/',$echo);
             }
@@ -159 +165 @@
         return ftp_pwd($this->link);
     }
+    function chdir($dir){
+        return @ftp_chdir($dir);
+    }
     function chgrp($file,$group,$recursive=false){
         return false;
@@ -171 +180 @@
         if ( ! $recursive || ! $this->is_dir($file) ){
             if (!function_exists('ftp_chmod'))
-                return ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-            return ftp_chmod($this->link,$mode,$file);
+                return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+            return @ftp_chmod($this->link,$mode,$file);
         }
         //Is a directory, and we want recursive
@@ -268 +277 @@
         if( ! $overwrite && $this->exists($destination) )
             return false;
-        if ( !$content = $this->get_contents($source) )
+        $content = $this->get_contents($source);
+        if( false === $content)
             return false;
         return $this->put_contents($destination,$content);

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

@@ -88 +88 @@
 
     function find_base_dir($base = '.',$echo = false) {
+        $abspath = str_replace('\\','/',ABSPATH); //windows: Straighten up the paths..
+        if( strpos($abspath, ':') ){ //Windows, Strip out the driveletter
+            if( preg_match("|.{1}\:(.+)|i", $abspath, $mat) )
+                $abspath = $mat[1];
+        }
+    
         if( empty( $base ) || '.' == $base ) $base = $this->cwd();
         if( empty( $base ) ) $base = '/';
@@ -93 +99 @@
 
         if($echo) echo __('Changing to ') . $base  .'<br>';
-        if( false === $this->ftp->chdir($base) )
+        if( false === $this->chdir($base) )
             return false;
 
@@ -102 +108 @@
         }
 
-        if( strpos(ABSPATH, $base) > 0)
-            $arrPath = split('/',substr(ABSPATH,strpos(ABSPATH, $base)));
+        if( strpos($abspath, $base) > 0)
+            $arrPath = split('/',substr($abspath,strpos($abspath, $base)));
         else
-            $arrPath = split('/',ABSPATH);
+            $arrPath = split('/',$abspath);
 
         for($i = 0; $i <= count($arrPath); $i++)
@@ -130 +136 @@
 
     function get_contents($file,$type='',$resumepos=0){
+        if( ! $this->exists($file) )
+            return false;
+
         if( empty($type) ){
             $extension = substr(strrchr($filename, "."), 1);
@@ -138 +147 @@
         if ( ! $this->ftp->fget($temp, $file) ) {
             fclose($temp);
-            return false;
+            return ''; //Blank document, File does exist, Its just blank.
         }
         fseek($temp, 0); //Skip back to the start of the file being written to
@@ -288 +297 @@
 
         $content = $this->get_contents($source);
-        if ( !$content )
+        if ( false === $content )
             return false;