Changeset 1375
- Timestamp:
- 08/27/09 17:56:52 (15 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r1367 r1375 1389 1389 } 1390 1390 1391 /** 1392 * Metodo que retorna todas as pastas do usuario logado. 1393 * @param $params array opcional para repassar os argumentos ao metodo. 1394 * Se usar $params['noSharedFolders'] = true, ira retornar todas as pastas do usuário logado, 1395 * excluindo as compartilhadas para ele. 1396 * @return Retorna um array contendo as seguintes informacoes de cada pasta: folder_unseen, 1397 * folder_id, folder_name, folder_parent e folder_hasChildren. 1398 */ 1391 1399 function get_folders_list($params = null) 1392 1400 { 1393 1401 $mbox_stream = $this->open_mbox(); 1394 1402 $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}"; 1395 $folders_list = imap_getmailboxes($mbox_stream, $serverString, "*");1403 $folders_list = imap_getmailboxes($mbox_stream, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*"); 1396 1404 $folders_list = array_slice($folders_list,0,$this->foldersLimit); 1397 1405 … … 1421 1429 $result[$i]['folder_name'] = array_pop($tmp_folder_parent); 1422 1430 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name']; 1423 if ( is_numeric($result[$i]['folder_name'])) {1431 if (substr($folder_id,0,4) == 'user' && is_numeric($result[$i]['folder_name'])) { 1424 1432 //$this->ldap = new ldap_functions(); 1425 1433 if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){ … … 2150 2158 } 2151 2159 //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name 2152 if (substr($new_folder_name,0,4) == 'user'){ 2160 if (substr($new_folder_name,0,4) == 'user'){ 2153 2161 $this->ldap = new ldap_functions(); 2154 2162 $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name); -
trunk/expressoMail1_2/inc/hook_settings.inc.php
r1373 r1375 126 126 $default[-1] = lang('Select on send'); 127 127 128 foreach($imap -> get_folders_list( ) as $id => $folder){129 if(!is_numeric($id) || (strstr($folder['folder_id'],"user".$e_server['imapDelimiter'])))128 foreach($imap -> get_folders_list(array('noSharedFolders' => true)) as $id => $folder){ 129 if(!is_numeric($id)) 130 130 continue; 131 131 else{ -
trunk/expressoMail1_2/js/draw_api.js
r1318 r1375 152 152 if (folders[i].folder_parent == '') 153 153 folders[i].folder_parent = 'root'; 154 else if (folders[i].folder_parent == 'user'){ 154 else if (folders[i].folder_parent == 'user'){ 155 155 156 if (!tree_folders.getNodeById('user')){ 156 157 var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared folders"), plusSign:true}); … … 2381 2382 } 2382 2383 // Get the shared folders..... 2383 var RegExp_name = new RegExp("(user)"+cyrus_delimiter+"(.*)$", "i");2384 2384 var sharedFolders = new Array(); 2385 2385 for(var i = 0; i < folders.length; i++) { 2386 2386 var x = folders[i].folder_id; 2387 if ( RegExp_name.test(x)){2387 if (folders[i].folder_parent == 'user'){ 2388 2388 sharedFolders[sharedFolders.length] = x; 2389 2389 } -
trunk/phpgwapi/js/dftree/dftree.js
r790 r1375 558 558 nodes[a]=[]; 559 559 nodes[a].id = node.id; 560 nodes[a].parent = node._parent ? node._parent.id : 'root'; 560 nodes[a].parent = node._parent ? node._parent.id : 'root'; 561 561 var tmp = node.id.split(imapDelimiter); 562 562 var tmp_caption = node.caption.split("<"); 563 563 564 if ( tmp[tmp.length-1]== 'INBOX')564 if (node.id == 'INBOX') 565 565 nodes[a].caption = get_lang('Inbox'); 566 else if ( tmp[tmp.length-1]== 'user')566 else if (node.id == 'user') 567 567 nodes[a].caption = get_lang("Shared Folders"); 568 568 else
Note: See TracChangeset
for help on using the changeset viewer.