- Timestamp:
- 09/24/08 09:46:11 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r449 r469 432 432 $this->has_cid = true; 433 433 434 if (strtolower($msg->structure[$msg_number]->subtype) == "alternative") 435 { 436 $show_only_html = false; 437 foreach($msg->pid[$msg_number] as $values => $msg_part) 438 { 434 if (strtolower($msg->structure[$msg_number]->subtype) == "alternative") { 435 $show_only_html = false; 436 foreach($msg->pid[$msg_number] as $values => $msg_part) { 439 437 $file_type = strtolower($msg->file_type[$msg_number][$values]); 440 438 if($file_type == "text/html") 441 $show_only_html = true;442 } 443 439 $show_only_html = true; 440 } 441 } 444 442 else 445 443 $show_only_html = false; … … 989 987 if (is_array($folders_list)) { 990 988 reset($folders_list); 991 $this->ldap = new ldap_functions();992 989 993 990 $i = 0; … … 1005 1002 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name']; 1006 1003 if (is_numeric($result[$i]['folder_name'])) { 1004 $this->ldap = new ldap_functions(); 1007 1005 if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){ 1008 1006 $result[$i]['folder_name'] = $cn; … … 1310 1308 error_log("$now - $userip - $sent [$subject] - $userid => $addrs\r\n", 3, "/home/expressolivre/mail_senders.log"); 1311 1309 } 1312 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) 1313 { 1314 $contacts = new dynamic_contacts(); 1315 $contacts->add_dynamic_contacts($toaddress.$ccaddress.$ccoaddress); 1310 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) { 1311 $contacts = new dynamic_contacts(); 1312 $contacts->add_dynamic_contacts($toaddress.$ccaddress.$ccoaddress); 1316 1313 } 1317 1314 return true; … … 2192 2189 } 2193 2190 2194 function search_msg($params = ''){ 2195 $this->ldap = new ldap_functions(); 2191 function search_msg($params = ''){ 2196 2192 $retorno = ""; 2197 2193 $mbox_stream = ""; … … 2215 2211 $name_box = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" ); 2216 2212 $filter = $this->remove_accents($filter); 2213 //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name 2217 2214 $folder_name = explode($this->imap_delimiter,$name_box); 2218 if (is_numeric($folder_name[1])) 2219 { 2220 if ($cn = $this->ldap->uid2cn($folder_name[1])) 2221 { 2222 $folder_name[1] = $cn; 2215 if (is_numeric($folder_name[1])) { 2216 $this->ldap = new ldap_functions(); 2217 if ($cn = $this->ldap->uid2cn($folder_name[1])) { 2218 $folder_name[1] = $cn; 2223 2219 } 2224 2220 }
Note: See TracChangeset
for help on using the changeset viewer.