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

Timestamp:

12/04/09 11:47:00 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #605 - Implementação de preferência sobre uid ou cn nas pastas compratilhadas.

File:

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

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

@@ -1499 +1499 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                if (substr($folder_id,0,4) == 'user' && is_numeric($result[$i]['folder_name'])) {
+                                if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn'] && substr($folder_id,0,4) == 'user')       {
                                         //$this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){
@@ -2232 +2232 @@
         }
         //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
-        if (substr($new_folder_name,0,4) == 'user'){
-                $this->ldap = new ldap_functions();
-                $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);
-                        $return['new_folder_name'] = array_pop($tmp_folder_name);
-                        if (is_numeric($return['new_folder_name']))
-                                if( $cn = $this->ldap->uid2cn($return['new_folder_name']))
-                                        $return['new_folder_name'] = $cn;
+        if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){
+            if (substr($new_folder_name,0,4) == 'user'){
+                $this->ldap = new ldap_functions();
+                $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);
+                $return['new_folder_name'] = array_pop($tmp_folder_name);
+                if( $cn = $this->ldap->uid2cn($return['new_folder_name']))
+                {
+                    $return['new_folder_name'] = $cn;
+                }
+            }
         }
 
@@ -3085 +3088 @@
                     $filter = $this->remove_accents($filter);
                     //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name
-                    $folder_name = explode($this->imap_delimiter,$name_box);
-                    if (is_numeric($folder_name[1]))
+                    if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn'] && substr($name_box,0,4) == 'user')
                     {
+                        $folder_name = explode($this->imap_delimiter,$name_box);
                         $this->ldap = new ldap_functions();
                         if ($cn = $this->ldap->uid2cn($folder_name[1]))
@@ -3093 +3096 @@
                             $folder_name[1] = $cn;
                         }
+                        $folder_name = implode($this->imap_delimiter,$folder_name);
                     }
-                    $folder_name = implode($this->imap_delimiter,$folder_name);
+                    else
+                    {
+                        $folder_name = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" );
+                    }
 
                     if(!is_resource($mbox_stream))