Ticket #7940: wordpress-passive-ftp.diff

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

@@ -58 +58 @@
                         $this->options['password'] = $opt['password'];
 
                 $this->options['ssl'] = ( !empty($opt['ssl']) );
+                $this->options['pasv'] = ( !empty($opt['pasv']) );
         }
 
         function connect() {
@@ -76 +77 @@
                         return false;
                 }
 
+                // this enteres passive FTP mode if the server does have problems connection the FTP server due to some firewalling this could help
+                if( $this->options['pasv'] )
+                        @ftp_pasv( $this->link, 1 );
+
                 return true;
         }
 

wp-admin/update.php

@@ -23 +23 @@
         $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
         $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
         $credentials['ssl']      = defined('FTP_SSL')  ? FTP_SSL  : ( isset($_POST['ssl'])      ? $_POST['ssl']      : $credentials['ssl']);
+        $credentials['pasv']      = defined('FTP_PASV')  ? FTP_PASV  : ( isset($_POST['pasv'])      ? $_POST['pasv']      : $credentials['pasv']);
 
         if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
                 $stored_credentials = $credentials;
@@ -34 +35 @@
         $username = '';
         $password = '';
         $ssl = '';
+        $pasv = '';
         if ( !empty($credentials) )
                 extract($credentials, EXTR_OVERWRITE);
         if( $error )
@@ -69 +71 @@
 </select>
 </td>
 </tr>
+<tr valign="top">
+<th scope="row"><label for="pasv"><?php _e('Use passive FTP connection:') ?></label></th>
+<td>
+<select name="pasv" id="pasv"<?php if( defined('FTP_PASV') ) echo ' disabled="disabled"' ?>>
+<?php
+foreach ( array(0 => __('No'), 1 => __('Yes')) as $key => $value ) :
+        $selected = ($pasv == $value) ? 'selected="selected"' : '';
+        echo "\n\t<option value='$key' $selected>" . $value . '</option>';
+endforeach;
+?>
+</select>
+</td>
+</tr>
 </table>
 <p class="submit">
 <input type="submit" name="submit" value="<?php _e('Proceed'); ?>" />