Changeset 1375 for trunk/expressoMail1_2/inc
- Timestamp:
- 08/27/09 17:56:52 (15 years ago)
- Location:
- trunk/expressoMail1_2/inc
- Files:
-
- 2 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{
Note: See TracChangeset
for help on using the changeset viewer.