Changeset 1375 for trunk

Timestamp:

08/27/09 17:56:52 (15 years ago)

Author:

niltonneto

Message:

Ticket #620 - Corrigido problema quando pasta "user" é criada no IMAP.

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)
• expressoMail1_2/inc/hook_settings.inc.php (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (2 diffs)
• phpgwapi/js/dftree/dftree.js (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1389 +1389 @@
     }
 
+         /**
+     * Metodo que retorna todas as pastas do usuario logado.
+     * @param $params array opcional para repassar os argumentos ao metodo.
+     * Se usar $params['noSharedFolders'] = true, ira retornar todas as pastas do usuário logado,
+     * excluindo as compartilhadas para ele.
+     * @return Retorna um array contendo as seguintes informacoes de cada pasta: folder_unseen, 
+     * folder_id, folder_name, folder_parent e folder_hasChildren.
+     */ 
         function get_folders_list($params = null)
         {
                 $mbox_stream = $this->open_mbox();              
                 $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
-                $folders_list = imap_getmailboxes($mbox_stream, $serverString, "*");
+                $folders_list = imap_getmailboxes($mbox_stream, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*");
                 $folders_list = array_slice($folders_list,0,$this->foldersLimit);
 
@@ -1421 +1429 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                if (is_numeric($result[$i]['folder_name']))     {
+                                if (substr($folder_id,0,4) == 'user' && is_numeric($result[$i]['folder_name'])) {
                                         //$this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){
@@ -2150 +2158 @@
         }
         //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
-        if (substr($new_folder_name,0,4) == 'user'){
+        if (substr($new_folder_name,0,4) == 'user'){            
                 $this->ldap = new ldap_functions();
                 $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -126 +126 @@
         $default[-1] = lang('Select on send');
         
-        foreach($imap -> get_folders_list() as $id => $folder){
-                if(!is_numeric($id) || (strstr($folder['folder_id'],"user".$e_server['imapDelimiter'])))
+        foreach($imap -> get_folders_list(array('noSharedFolders' => true)) as $id => $folder){
+                if(!is_numeric($id))
                         continue;
                 else{

trunk/expressoMail1_2/js/draw_api.js

@@ -152 +152 @@
                                 if (folders[i].folder_parent == '')
                                         folders[i].folder_parent = 'root';
-                                else if (folders[i].folder_parent == 'user'){
+                                else if (folders[i].folder_parent == 'user'){   
+                                        
                                         if (!tree_folders.getNodeById('user')){
                                                 var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared folders"), plusSign:true}); 
@@ -2381 +2382 @@
         }
         // Get the shared folders.....
-        var RegExp_name = new RegExp("(user)"+cyrus_delimiter+"(.*)$", "i");
         var sharedFolders = new Array();
         for(var i = 0; i < folders.length; i++) {
                 var x = folders[i].folder_id;
-        if (RegExp_name.test(x)){
+        if (folders[i].folder_parent == 'user'){
                 sharedFolders[sharedFolders.length] = x;
         }

trunk/phpgwapi/js/dftree/dftree.js

@@ -558 +558 @@
                 nodes[a]=[];
                 nodes[a].id = node.id;
-                nodes[a].parent = node._parent ? node._parent.id : 'root';
+                nodes[a].parent = node._parent ? node._parent.id : 'root';              
                 var tmp = node.id.split(imapDelimiter);
                 var tmp_caption = node.caption.split("<");
 
-                if (tmp[tmp.length-1] == 'INBOX')
+                if (node.id == 'INBOX')
                         nodes[a].caption = get_lang('Inbox');
-                else if (tmp[tmp.length-1] == 'user')
+                else if (node.id == 'user')
                         nodes[a].caption = get_lang("Shared Folders");
                 else