Changeset 3534 for branches/2.2/phpgwapi

Timestamp:

11/25/10 09:57:14 (13 years ago)

Author:

rodsouza

Message:

Ticket #1371 - Corrige problema de reconstrução recursiva de pastas

File:

• branches/2.2/phpgwapi/inc/class.vfs_sql.inc.php (modified) (4 diffs)

branches/2.2/phpgwapi/inc/class.vfs_sql.inc.php

@@ -2668 +2668 @@
                  * If $data['file_id'] then the file_id is used instead of a path
                  */
-                function ls ($data)
+                function ls ($data,$recursive)
                 {
                         if (!is_array ($data))
@@ -2826 +2826 @@
 
                         $dir_clean = $this->clean_string (array ('string' => $dir));
-                        $sql .= " FROM phpgw_vfs WHERE ".$query_type." directory = '".$GLOBALS['phpgw']->db->db_addslashes($dir_clean)."'";
+                        if ($recursive)
+                                $sql .= " FROM phpgw_vfs WHERE ".$query_type." directory like '".$GLOBALS['phpgw']->db->db_addslashes($dir_clean)."%'";
+                        else
+                                $sql .= " FROM phpgw_vfs WHERE ".$query_type." directory = '".$GLOBALS['phpgw']->db->db_addslashes($dir_clean)."'";
                         $sql .= $this->extra_sql (array ('query_type' => VFS_SQL_SELECT));
 
@@ -2905 +2908 @@
                                 {
                                         $dir_handle = opendir ($p->real_full_path);
+
                                         while ($filename = readdir ($dir_handle))
                                         {
@@ -2932 +2936 @@
                                         $rarray = array ();
                                 }
-
                                 foreach($rarray as $num => $file_array)
                                 {