Changeset 3534
- Timestamp:
- 11/25/10 09:57:14 (13 years ago)
- Location:
- branches/2.2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/filemanager/inc/class.uiconfig.inc.php
r3019 r3534 183 183 'string' => $name, 184 184 'relatives' => array(RELATIVE_NONE) 185 ) );185 ),True); 186 186 $bo->vfs->flush_journal(array( 187 187 'string' => $name, -
branches/2.2/filemanager/inc/class.uifilemanager.inc.php
r3436 r3534 1199 1199 ); 1200 1200 1201 $ls_array = $this->bo->vfs->ls($tmp_arr );1201 $ls_array = $this->bo->vfs->ls($tmp_arr,True); 1202 1202 1203 1203 while(list($num, $dir) = each($ls_array)) -
branches/2.2/filemanager/js/handler.js
r3019 r3534 138 138 if (parentDir == '/home') 139 139 parentDir = 'root'; 140 next = (folders[i+1]?folders[i+1]:""); 141 folder = new dNode({id:folders[i], caption:name, plusSign:(next.indexOf(folders[i]+'/') == 0), onClick:'load(\''+folders[i]+'\',this)'}); 140 var search_child = function(afolders,name){ 141 for (j=0; j < afolders.length; j++) 142 if (afolders[j].indexOf(name+'/') == 0) 143 return true; 144 return false; 145 } 146 folder = new dNode({id:folders[i], caption:name, plusSign:search_child(folders,folders[i]), onClick:'load(\''+folders[i]+'\',this)'}); 142 147 folders_tree.add(folder,parentDir); 143 148 } -
branches/2.2/filemanager/templates/default/config_folders.tpl
r3019 r3534 2 2 <table border="0" cellpadding="1" cellspacing="1" style="width: 400px;"> 3 3 <tbody> 4 <tr style="width: 200px;">4 <tr style="width: 500px;"> 5 5 <td> 6 6 <b>{lang_search}</b></td> … … 14 14 <b>{lang_directory}</b></td> 15 15 <td> 16 <select id="search1" size="5" style="width: 200px;"></select> </td>16 <select id="search1" size="5" style="width: 500px;"></select> </td> 17 17 <td> 18 18 </td> -
branches/2.2/filemanager/templates/default/config_owner.tpl
r3019 r3534 2 2 <table border="0" cellpadding="1" cellspacing="1" style="width: 400px;"> 3 3 <tbody> 4 <tr style="width: 200px;">4 <tr style="width: 500px;"> 5 5 <td> 6 6 <b>{lang_search}</b></td> … … 14 14 <b>{lang_directory}</b></td> 15 15 <td> 16 <select id="search1" size="5" style="width: 200px;"></select> </td>16 <select id="search1" size="5" style="width: 500px;"></select> </td> 17 17 <td> 18 18 </td> … … 36 36 <b>{lang_users_and_groups}</b></td> 37 37 <td valign="top"> 38 <select id="search2" size="5" style="width: 200px;"></select> </td>38 <select id="search2" size="5" style="width: 500px;"></select> </td> 39 39 <td> 40 40 <table border="0"> -
branches/2.2/phpgwapi/inc/class.vfs_sql.inc.php
r3104 r3534 2668 2668 * If $data['file_id'] then the file_id is used instead of a path 2669 2669 */ 2670 function ls ($data )2670 function ls ($data,$recursive) 2671 2671 { 2672 2672 if (!is_array ($data)) … … 2826 2826 2827 2827 $dir_clean = $this->clean_string (array ('string' => $dir)); 2828 $sql .= " FROM phpgw_vfs WHERE ".$query_type." directory = '".$GLOBALS['phpgw']->db->db_addslashes($dir_clean)."'"; 2828 if ($recursive) 2829 $sql .= " FROM phpgw_vfs WHERE ".$query_type." directory like '".$GLOBALS['phpgw']->db->db_addslashes($dir_clean)."%'"; 2830 else 2831 $sql .= " FROM phpgw_vfs WHERE ".$query_type." directory = '".$GLOBALS['phpgw']->db->db_addslashes($dir_clean)."'"; 2829 2832 $sql .= $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)); 2830 2833 … … 2905 2908 { 2906 2909 $dir_handle = opendir ($p->real_full_path); 2910 2907 2911 while ($filename = readdir ($dir_handle)) 2908 2912 { … … 2932 2936 $rarray = array (); 2933 2937 } 2934 2935 2938 foreach($rarray as $num => $file_array) 2936 2939 {
Note: See TracChangeset
for help on using the changeset viewer.