cvs: pear(MAINT_1_3_4) /Net_FTP/Net FTP.php

jschippers		Tue Apr 22 20:33:18 2008 UTC

  Modified files:              (Branch: MAINT_1_3_4)
    /pear/Net_FTP/Net	FTP.php 
  Log:
  Made file list matching more strict
  
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/Net/FTP.php?r1=1.53.2.4&r2=1.53.2.5&diff_format=u
Index: pear/Net_FTP/Net/FTP.php
diff -u pear/Net_FTP/Net/FTP.php:1.53.2.4 pear/Net_FTP/Net/FTP.php:1.53.2.5
--- pear/Net_FTP/Net/FTP.php:1.53.2.4	Tue Apr 22 20:03:50 2008
+++ pear/Net_FTP/Net/FTP.php	Tue Apr 22 20:33:18 2008
@@ -20,7 +20,7 @@
  * @author    Jorrit Schippers <[email protected]>
  * @copyright 1997-2008 The PHP Group
  * @license   http://www.php.net/license/3_0.txt PHP License 3.0
- * @version   CVS: $Id: FTP.php,v 1.53.2.4 2008/04/22 20:03:50 jschippers Exp $
+ * @version   CVS: $Id: FTP.php,v 1.53.2.5 2008/04/22 20:33:18 jschippers Exp $
  * @link      http://pear.php.net/package/Net_FTP
  * @since     File available since Release 0.0.1
  */
@@ -632,7 +632,7 @@
         
         $this->_ls_match = array(
             'unix'    => array(
-                'pattern' => '/(?:(d)|.)([rwxts-]+)\s+(\w+)\s+([\w\d-()?]+)\s+'.
+                'pattern' => '/(?:(d)|.)([rwxts-]{9})\s+(\w+)\s+([\w\d-()?]+)\s+'.
                              '([\w\d-()?]+)\s+(\w+)\s+(\S+\s+\S+\s+\S+)\s+(.+)/',
                 'map'     => array(
                     'is_dir'        => 1,
@@ -2229,7 +2229,8 @@
     {
         foreach ($dir_list as $entry) {
             foreach ($this->_ls_match as $os => $match) {
-                if (preg_match($match['pattern'], $entry)) {
+                $matches = array();
+                if (preg_match($match['pattern'], $entry, $matches)) {
                     return $match;
                 }
             }