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

Timestamp:

08/19/09 08:43:17 (15 years ago)

Author:

amuller

Message:

Ticket #605 - reverte modificação que criou problema na busca

File:

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

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

@@ -1424 +1424 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){
-                                        $this->ldap = new ldap_functions();
+                                if (is_numeric($result[$i]['folder_name']))     {
+                                        //$this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){
                                                 $result[$i]['folder_name'] = $cn;
@@ -2153 +2153 @@
         }
         //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
-        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 (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;
-                }
         }
                 
@@ -2918 +2917 @@
                                 $filter = $this->remove_accents($filter);
                                 //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name
-                                if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){
-                                        $folder_name = explode($this->imap_delimiter,$name_box);
+                                $folder_name = explode($this->imap_delimiter,$name_box);
+                                if (is_numeric($folder_name[1])) {
                                         $this->ldap = new ldap_functions();
-                                        if ($cn = $this->ldap->uid2cn($folder_name[1])){
+                                        if ($cn = $this->ldap->uid2cn($folder_name[1])) {
                                                 $folder_name[1] = $cn;
                                         }
-                                        $folder_name = implode($this->imap_delimiter,$folder_name);
-                                }
-                                else
-                                        $folder_name = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" );
+                                }
+                                $folder_name = implode($this->imap_delimiter,$folder_name);
                                 
                                 if(!is_resource($mbox_stream))
@@ -2946 +2943 @@
                                                 {
                                                         foreach($search_criteria as $new_search){
-                                                                $m_token = trim("##". mb_convert_encoding( $folder_name, "ISO_8859-1", "UTF7-IMAP" ) . "--" . mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--".$new_search."##"."\n");
+                                                                $m_token = trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--".$new_search."##"."\n");
                                                                 if(!@strstr($retorno,$m_token))
                                                                         $retorno .= $m_token;
@@ -2960 +2957 @@
                                         {
                                                 foreach($search_criteria as $new_search)
-                                                        $retorno .= trim("##". mb_convert_encoding( $folder_name, "ISO_8859-1", "UTF7-IMAP" ) . "--" . mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--" . $new_search."##"."\n");
+                                                        $retorno .= trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--" . $new_search."##"."\n");
                                         }
                                 }