Changeset 3534

Timestamp:

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

Author:

rodsouza

Message:

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

Location:

branches/2.2

Files:

• filemanager/inc/class.uiconfig.inc.php (modified) (1 diff)
• filemanager/inc/class.uifilemanager.inc.php (modified) (1 diff)
• filemanager/js/handler.js (modified) (1 diff)
• filemanager/templates/default/config_folders.tpl (modified) (2 diffs)
• filemanager/templates/default/config_owner.tpl (modified) (3 diffs)
• phpgwapi/inc/class.vfs_sql.inc.php (modified) (4 diffs)

branches/2.2/filemanager/inc/class.uiconfig.inc.php

@@ -183 +183 @@
                                  'string'        => $name,
                                  'relatives'     => array(RELATIVE_NONE)
-                         ));
+                         ),True);
                          $bo->vfs->flush_journal(array(
                                  'string' => $name,

branches/2.2/filemanager/inc/class.uifilemanager.inc.php

@@ -1199 +1199 @@
                         );
 
-                        $ls_array = $this->bo->vfs->ls($tmp_arr);
+                        $ls_array = $this->bo->vfs->ls($tmp_arr,True);
 
                         while(list($num, $dir) = each($ls_array))

branches/2.2/filemanager/js/handler.js

@@ -138 +138 @@
                 if (parentDir == '/home')
                         parentDir = 'root';
-                next = (folders[i+1]?folders[i+1]:"");
-                folder = new dNode({id:folders[i], caption:name, plusSign:(next.indexOf(folders[i]+'/') == 0), onClick:'load(\''+folders[i]+'\',this)'});
+                var search_child = function(afolders,name){
+                        for (j=0; j < afolders.length; j++)
+                                if (afolders[j].indexOf(name+'/') == 0)
+                                        return true;
+                        return false;
+                }
+                folder = new dNode({id:folders[i], caption:name, plusSign:search_child(folders,folders[i]), onClick:'load(\''+folders[i]+'\',this)'});
                 folders_tree.add(folder,parentDir);
         }

branches/2.2/filemanager/templates/default/config_folders.tpl

@@ -2 +2 @@
 <table border="0" cellpadding="1" cellspacing="1" style="width: 400px;">
         <tbody>
-                <tr style="width: 200px;">
+                <tr style="width: 500px;">
                         <td>
                                 <b>{lang_search}</b></td>
@@ -14 +14 @@
                                 <b>{lang_directory}</b></td>
                         <td>
-                                <select id="search1" size="5" style="width: 200px;"></select> </td>
+                                <select id="search1" size="5" style="width: 500px;"></select> </td>
                         <td>
                                 &nbsp;</td>

branches/2.2/filemanager/templates/default/config_owner.tpl

@@ -2 +2 @@
 <table border="0" cellpadding="1" cellspacing="1" style="width: 400px;">
         <tbody>
-                <tr style="width: 200px;">
+                <tr style="width: 500px;">
                         <td>
                                 <b>{lang_search}</b></td>
@@ -14 +14 @@
                                 <b>{lang_directory}</b></td>
                         <td>
-                                <select id="search1" size="5" style="width: 200px;"></select> </td>
+                                <select id="search1" size="5" style="width: 500px;"></select> </td>
                         <td>
                                 &nbsp;</td>
@@ -36 +36 @@
                                 <b>{lang_users_and_groups}</b></td>
                         <td valign="top">
-                                <select id="search2" size="5" style="width: 200px;"></select> </td>
+                                <select id="search2" size="5" style="width: 500px;"></select> </td>
                         <td>
                         <table border="0">

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)
                                 {