Changeset 11633

Timestamp:

06/23/2009 09:55:22 PM (15 years ago)

Author:

ryan

Message:

Enforce stream_get_contents() requirement for ssh2 fs. Props dd32. fixes #10093 for 2.8.1

Location:

branches/2.8/wp-admin/includes

Files:

• class-wp-filesystem-ssh2.php (modified) (9 diffs)
• file.php (modified) (3 diffs)

branches/2.8/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -14 +14 @@
  * @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes
  *
- * Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now.)
+ * Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now, But many users have found the latest versions work)
  *
  * cd /usr/src
@@ -23 +23 @@
  * make all install
  *
- * Note: No not leave the directory yet!
+ * Note: Do not leave the directory yet!
  *
  * Enter: pecl install -f ssh2
@@ -34 +34 @@
  * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
  *
+ * Note: as of WordPress 2.8, This utilises the PHP5+ function 'stream_get_contents'
  *
  * @since 2.7
@@ -46 +47 @@
     var $keys = false;
     /*
-     * This is the timeout value for ssh results to comeback.
+     * This is the timeout value for ssh results.
      * Slower servers might need this incressed, but this number otherwise should not change.
      *
@@ -67 +68 @@
             return false;
         }
-        if ( ! version_compare(phpversion(), '5', '>=') ) {
-            $this->errors->add('ssh2_php_requirement', __('The ssh2 PHP extension is available, however requires PHP 5+'));
+        if ( !function_exists('stream_get_contents') ) {
+            $this->errors->add('ssh2_php_requirement', __('The ssh2 PHP extension is available, however, we require the PHP5 function <code>stream_get_contents()</code>'));
             return false;
         }
@@ -102 +103 @@
 
         if ( empty ($opt['password']) ) {
-            if ( !$this->keys ) //   password can be blank if we are using keys
+            if ( !$this->keys ) //password can be blank if we are using keys
                 $this->errors->add('empty_password', __('SSH2 password is required'));
         } else {
@@ -149 +150 @@
             stream_set_blocking( $stream, true );
             stream_set_timeout( $stream, $this->timeout );
-            $data = stream_get_contents($stream);
+            $data = stream_get_contents( $stream );
+            fclose( $stream );
 
             if ( $returnbool )
-                return '' != trim($data);
+                return ( $data === false ) ? false : '' != trim($data);
             else
                 return $data;
@@ -167 +169 @@
     function get_contents($file, $type = '', $resumepos = 0 ) {
         $file = ltrim($file, '/');
-        return file_get_contents('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function get_contents_array($file) {
         $file = ltrim($file, '/');
-        return file('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function put_contents($file, $contents, $type = '' ) {
         $file = ltrim($file, '/');
-        return file_put_contents('ssh2.sftp://' . $this->sftp_link .'/' . $file, $contents);
+        return file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
     }
 
@@ -271 +273 @@
 
     function exists($file) {
-        //return $this->run_command(sprintf('ls -lad %s', escapeshellarg($file)), true);
-        $file = ltrim($file, '/');
-        return file_exists('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        $file = ltrim($file, '/');
+        return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function is_file($file) {
         $file = ltrim($file, '/');
-        return is_file('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function is_dir($path) {
         $path = ltrim($path, '/');
-        return is_dir('ssh2.sftp://' . $this->sftp_link .'/' . $path);
+        return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
     }
 
     function is_readable($file) {
         $file = ltrim($file, '/');
-        return is_readable('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function is_writable($file) {
         $file = ltrim($file, '/');
-        return is_writable('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function atime($file) {
         $file = ltrim($file, '/');
-        return fileatime('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function mtime($file) {
         $file = ltrim($file, '/');
-        return filemtime('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 
     function size($file) {
         $file = ltrim($file, '/');
-        return filesize('ssh2.sftp://' . $this->sftp_link .'/' . $file);
+        return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
     }
 

branches/2.8/wp-admin/includes/file.php

@@ -646 +646 @@
     }
 
-    if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && extension_loaded('sockets') ) $method = 'ssh2';
+    if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
     if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
     if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
@@ -762 +762 @@
 </tr>
 
-<?php if ( extension_loaded('ssh2') ) : ?>
+<?php if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) : ?>
 <tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">
 <th scope="row"><?php _e('Authentication Keys') ?>
@@ -782 +782 @@
 <br /><label><input id="ftps" name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"';  ?>/> <?php _e('FTPS (SSL)') ?></label>
 <?php endif; ?>
-<?php if ( extension_loaded('ssh2') ) : ?>
+<?php if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) : ?>
 <br /><label><input id="ssh" name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type);  if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('SSH') ?></label>
 <?php endif; ?>