Changeset 1330 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php
- Timestamp:
- 08/17/09 14:51:21 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r1319 r1330 1424 1424 $result[$i]['folder_name'] = array_pop($tmp_folder_parent); 1425 1425 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name']; 1426 if ( is_numeric($result[$i]['folder_name'])){1427 //$this->ldap = new ldap_functions();1426 if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){ 1427 $this->ldap = new ldap_functions(); 1428 1428 if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){ 1429 1429 $result[$i]['folder_name'] = $cn; … … 2153 2153 } 2154 2154 //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name 2155 if ( substr($new_folder_name,0,4) == 'user'){2156 $this->ldap = new ldap_functions();2157 $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);2158 $return['new_folder_name'] = array_pop($tmp_folder_name);2159 if (is_numeric($return['new_folder_name']))2155 if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){ 2156 if (substr($new_folder_name,0,4) == 'user'){ 2157 $this->ldap = new ldap_functions(); 2158 $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name); 2159 $return['new_folder_name'] = array_pop($tmp_folder_name); 2160 2160 if( $cn = $this->ldap->uid2cn($return['new_folder_name'])) 2161 2161 $return['new_folder_name'] = $cn; 2162 } 2162 2163 } 2163 2164 … … 2917 2918 $filter = $this->remove_accents($filter); 2918 2919 //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name 2919 $folder_name = explode($this->imap_delimiter,$name_box);2920 if (is_numeric($folder_name[1])) {2920 if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']){ 2921 $folder_name = explode($this->imap_delimiter,$name_box); 2921 2922 $this->ldap = new ldap_functions(); 2922 if ($cn = $this->ldap->uid2cn($folder_name[1])) 2923 if ($cn = $this->ldap->uid2cn($folder_name[1])){ 2923 2924 $folder_name[1] = $cn; 2924 2925 } 2925 } 2926 $folder_name = implode($this->imap_delimiter,$folder_name); 2926 $folder_name = implode($this->imap_delimiter,$folder_name); 2927 } 2928 else 2929 $folder_name = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" ); 2927 2930 2928 2931 if(!is_resource($mbox_stream)) … … 2943 2946 { 2944 2947 foreach($search_criteria as $new_search){ 2945 $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");2948 $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"); 2946 2949 if(!@strstr($retorno,$m_token)) 2947 2950 $retorno .= $m_token; … … 2957 2960 { 2958 2961 foreach($search_criteria as $new_search) 2959 $retorno .= trim("##". mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--" . $new_search."##"."\n");2962 $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"); 2960 2963 } 2961 2964 }
Note: See TracChangeset
for help on using the changeset viewer.