Changeset 34281 for trunk

Timestamp:

09/18/2015 08:19:18 AM (11 years ago)

Author:

dd32

Message:

Updates: FTP/PemFTP Library: Remove the usage of deprecated regular expression functions (ereg replaced by PCRE).

Props enshrined, aaroncampbell
Fixes #16026, #33432

Location:

trunk/src/wp-admin/includes

Files:

• class-ftp-pure.php (modified) (1 diff)
• class-ftp-sockets.php (modified) (1 diff)
• class-ftp.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-ftp-pure.php

@@ -111 +111 @@
                                 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]);

trunk/src/wp-admin/includes/class-ftp-sockets.php

@@ -132 +132 @@
                                 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)) {

trunk/src/wp-admin/includes/class-ftp.php

@@ -381 +381 @@
                 if(!$this->_exec("PWD", "pwd")) return FALSE;
                 if(!$this->_checkCode()) return FALSE;
-                return ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message);
+                return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message);
         }
 
@@ -425 +425 @@
                 if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
                 if(!$this->_checkCode()) return FALSE;
-                return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
+                return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
         }
 
@@ -445 +445 @@
                 if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
                 if(!$this->_checkCode()) return FALSE;
-                $mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
+                $mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/", "\\1", $this->_message);
                 $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
                 $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
@@ -819 +819 @@
                 $sensitive=(PHP_OS!='WIN32');
                 return ($sensitive?
-                        ereg($pattern,$probe):
-                        eregi($pattern,$probe)
+                        preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) : 
+                        preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
                 );
         }