Changeset 3541
- Timestamp:
- 11/26/10 14:38:47 (13 years ago)
- Location:
- branches/2.2/filemanager
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/filemanager/inc/class.uifilemanager.inc.php
r3535 r3541 538 538 } 539 539 /* small keys to safe bandwidth */ 540 $tuple['name'] = $files['name'];540 $tuple['name'] = htmlentities($files['name']); 541 541 if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1){ 542 542 if ($files['mime_type'] == 'image/png' || … … 596 596 foreach($this->dirs as $dir) 597 597 $return[] = $dir['directory'] . $dir['name']; 598 sort(&$return, SORT_STRING); 598 599 echo serialize($return); 599 600 } … … 609 610 $vars[css]='<link rel="stylesheet" type="text/css" href="filemanager/templates/default/main.css">'; 610 611 $vars[css].='<link rel="stylesheet" type="text/css" href="phpgwapi/js/dftree/dftree.css">'; 612 $_SESSION['phpgw_info']['user']['preferences']['filemanager']['lid'] = $GLOBALS['phpgw_info']['user']['account_lid']; 611 613 $vars[preferences]='<input type="hidden" id="userPreferences" value=\''.serialize($_SESSION['phpgw_info']['user']['preferences']['filemanager']).'\'>'; 612 614 // Used for important operations that needs security … … 1116 1118 $mime_type = 'text/plain'; 1117 1119 } 1118 $viewable = array(' ','text/plain','text/csv','text/html',1120 $viewable = array('text/plain','text/csv','text/html', 1119 1121 'text/text','image/jpeg','image/png','image/gif', 1120 1122 'audio/mpeg','video/mpeg'); -
branches/2.2/filemanager/js/handler.js
r3534 r3541 129 129 var rootFold = new dNode({id:'root', caption:get_lang("filemanager")}); 130 130 folders_tree.add(rootFold,'root'); 131 var myfolder = new dNode({id:folders[0], caption:get_lang("My Folder"), plusSign:(folders[1].indexOf(folders[0]+'/') == 0), onClick:'load(\''+folders[0]+'\',this)'}); 132 folders_tree.add(myfolder,'root'); 133 for (var i=1;i<folders.length;i++) 131 for (var i=0;i<folders.length;i++) 134 132 { 135 133 var lastIndex = folders[i].lastIndexOf('/'); 136 var name = folders[i].substr(lastIndex+1,folders[i].length); 134 if (folders[i] != "/home/"+preferences.lid) 135 var name = folders[i].substr(lastIndex+1,folders[i].length); 136 else 137 var name = get_lang("My Folder"); 137 138 var parentDir = folders[i].substr(0,lastIndex); 138 139 if (parentDir == '/home') … … 145 146 } 146 147 folder = new dNode({id:folders[i], caption:name, plusSign:search_child(folders,folders[i]), onClick:'load(\''+folders[i]+'\',this)'}); 147 folders_tree.add(folder,parentDir); 148 if (i == 0) 149 folders_tree.add(folder,'root'); 150 else 151 folders_tree.add(folder,parentDir); 148 152 } 149 153 document.getElementById('content_folders').innerHTML = "";
Note: See TracChangeset
for help on using the changeset viewer.