Changeset 5306 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

01/04/12 14:55:54 (12 years ago)

Author:

thiago

Message:

Ticket #2350 - Deixar dinamico o nome das pastas no codigo

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

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

@@ -48 +48 @@
                 
                 //armazena os caminhos das pastas ( sent, spam, drafts, trash )
-                //$this->folders['sent']    = $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; //Variavel folders armazena o caminho /sent
-                $this->folders['sent']    =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; //Variavel folders armazena o caminho /sent
-                $this->folders['spam']    =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
-                $this->folders['drafts']  =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
-                $this->folders['trash']   =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
-                
-                if( empty ( $this->folders['sent'] ) ){
-                  //$this->folders['sent'] = $this->imap_delimiter . 'Sent';    
-                  $this->folders['sent'] = 'Sent';
-                }
-                if( empty ( $this->folders['spam'] ) ){
-                  $this->folders['spam'] = 'Spam';      
-                }
-                if( empty ( $this->folders['drafts'] ) ){
-                  $this->folders['drafts'] = 'Drafts';  
-                }
-                if( empty ( $this->folders['trash'] ) ){
-                  $this->folders['trash'] = 'Trash';    
-                }
-                
+                $this->folders['sent']    =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']) ? 'Sent' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; //Variavel folders armazena o caminho /sent
+                $this->folders['spam']    =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']) ? 'Spam' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
+                $this->folders['drafts']  =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']) ? 'Drafts' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
+                $this->folders['trash']   =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']) ? 'Trash' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+
                 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes')
                 {
@@ -79 +64 @@
         
         function mount_url_folder($folders){
-                
-                if(strlen($folders) == 1){
-                        
-                        $var = $this->imap_delimiter.$folders[0];
-                        return $var;
-                        
-                } else {
-                
-                $var = "";
-                for($i = 0; $i<strlen($folders)-1; $i++){
-                        $var += $folders[$i].$this->imap_delimiter;
-                }
-                        $var += $folders[strlen($folders) - 1];
-                        return $var;
-                }
+                return implode($this->imap_delimiter,$folders);
         }
         
@@ -2400 +2371 @@
                                         break;
                                 case 1:
-                                        if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['drafts'])) )) || $p === 0 )
+                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['drafts'])) )) || $p === 0 )
                                                 $principals[] = $folders[$p];
                                         break;
                                 case 2:
-                                        if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['sent'])) )) || $p === 0 )
+                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['sent'])) )) || $p === 0 )
                                                 $principals[] = $folders[$p];
                                         break;
                                 case 3:
-                                        if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['spam'])) )) || $p === 0 )
+                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['spam'])) )) || $p === 0 )
                                                 $principals[] = $folders[$p];
                                         break;
                                 case 4:
-                                        if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['trash'])) )) || $p === 0  )
+                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['trash'])) )) || $p === 0  )
                                                 $principals[] = $folders[$p];                                           
                                         break;