WordPress 4.7.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / class-ftp-sockets.php

diff --git a/wp-admin/includes/class-ftp-sockets.php b/wp-admin/includes/class-ftp-sockets.php
index f9ea6cd5d2a7a654a8033293f6daddc7837cbc72..5ca4a2b579c87cdad93551a16a73976606c320df 100644 (file)
--- a/wp-admin/includes/class-ftp-sockets.php
+++ b/wp-admin/includes/class-ftp-sockets.php
@@ -25,11 +25,7 @@
  * @link http://www.phpclasses.org/browse/package/1743.html Site
  * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
  */
-class ftp extends ftp_base {
-
-       function ftp($verb=FALSE, $le=FALSE) {
-               $this->__construct($verb, $le);
-       }
+class ftp_sockets extends ftp_base {
 
        function __construct($verb=FALSE, $le=FALSE) {
                parent::__construct(true, $verb, $le);
@@ -131,9 +127,9 @@ class ftp extends ftp_base {
                                $this->_data_close();
                                return FALSE;
                        }
-                       $ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
+                       $ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
                        $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+                       $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
                        $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
                        if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
                                $this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));