Changes in trunk/src/wp-admin/includes/class-ftp.php [46626:32990]

File:

• trunk/src/wp-admin/includes/class-ftp.php (modified) (21 diffs)

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

@@ -1 +1 @@
 <?php
 /**
- * PemFTP - An Ftp implementation in pure PHP
+ * PemFTP - A Ftp implementation in pure PHP
  *
  * @package PemFTP
- * @since 2.5.0
+ * @since 2.5
  *
  * @version 1.0
  * @copyright Alexey Dotsenko
  * @author Alexey Dotsenko
- * @link https://www.phpclasses.org/package/1743-PHP-FTP-client-in-pure-PHP.html
- * @license LGPL https://opensource.org/licenses/lgpl-license.html
+ * @link http://www.phpclasses.org/browse/package/1743.html Site
+ * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
  */
 
@@ -18 +18 @@
  * This can be redefined.
  *
- * @since 2.5.0
+ * @since 2.5
  * @var string
  */
@@ -28 +28 @@
  * This can be redefined.
  *
- * @since 2.5.0
+ * @since 2.5
  * @var int
  */
@@ -36 +36 @@
  *
  * This can be redefined.
- * @since 2.5.0
+ * @since 2.5
  * @var int
  */
@@ -44 +44 @@
  *
  * This can be redefined.
- * @since 2.5.0
+ * @since 2.5
  * @var int
  */
@@ -54 +54 @@
  * This can be redefined.
  *
- * @since 2.5.0
+ * @since 2.5
  * @var bool
  */
@@ -60 +60 @@
 
 /**
- * @since 2.5.0
+ * @since 2.5
  * @var string
  */
@@ -66 +66 @@
 
 /**
- * @since 2.5.0
+ * @since 2.5
  * @var string
  */
@@ -72 +72 @@
 
 /**
- * @since 2.5.0
+ * @since 2.5
  * @var string
  */
@@ -186 +186 @@
             if ($lcount<8) return '';
             $b = array();
-            $b['isdir'] = $lucifer[0][0] === "d";
-            $b['islink'] = $lucifer[0][0] === "l";
+            $b['isdir'] = $lucifer[0]{0} === "d";
+            $b['islink'] = $lucifer[0]{0} === "l";
             if ( $b['isdir'] )
                 $b['type'] = 'd';
@@ -208 +208 @@
                 $b['day'] = $lucifer[6];
                 if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
-                    $b['year'] = gmdate("Y");
+                    $b['year'] = date("Y");
                     $b['hour'] = $l2[1];
                     $b['minute'] = $l2[2];
@@ -381 +381 @@
         if(!$this->_exec("PWD", "pwd")) return FALSE;
         if(!$this->_checkCode()) return FALSE;
-        return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message);
+        return ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message);
     }
 
@@ -425 +425 @@
         if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
         if(!$this->_checkCode()) return FALSE;
-        return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
+        return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
     }
 
@@ -445 +445 @@
         if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
         if(!$this->_checkCode()) return FALSE;
-        $mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
+        $mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\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]);
@@ -525 +525 @@
     }
 
-    function fget($fp, $remotefile, $rest=0) {
+    function fget($fp, $remotefile,$rest=0) {
         if($this->_can_restore and $rest!=0) fseek($fp, $rest);
         $pi=pathinfo($remotefile);
@@ -584 +584 @@
     }
 
-    function fput($remotefile, $fp, $rest=0) {
+    function fput($remotefile, $fp) {
         if($this->_can_restore and $rest!=0) fseek($fp, $rest);
         $pi=pathinfo($remotefile);
@@ -695 +695 @@
         foreach($list as $k=>$v) {
             $list[$k]=$this->parselisting($v);
-            if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+            if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
         }
         $ret=true;
@@ -728 +728 @@
         foreach($list as $k=>$v) {
             $list[$k]=$this->parselisting($v);
-            if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+            if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
         }
         $ret=true;
@@ -776 +776 @@
         } else $path=getcwd();
         if(is_array($handle) and !empty($handle)) {
-            foreach($handle as $dir) {
+            while($dir=each($handle)) {
                 if($this->glob_pattern_match($pattern,$dir))
                 $output[]=$dir;
@@ -819 +819 @@
         $sensitive=(PHP_OS!='WIN32');
         return ($sensitive?
-            preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
-            preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
+            ereg($pattern,$probe):
+            eregi($pattern,$probe)
         );
     }
@@ -905 +905 @@
 
 require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
-
-if ( $mod_sockets ) {
-    class ftp extends ftp_sockets {}
-} else {
-    class ftp extends ftp_pure {}
-}