- Timestamp:
- 04/13/10 09:05:32 (14 years ago)
- Location:
- trunk/expressoMail1_2/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r2484 r2493 93 93 // This error is returned from Postfix. 94 94 elseif(strstr($error,'message file too big')) { 95 return str_replace("%1",$this->preferences ->max_attachment_size,$this->functions->getLang('The size of this message has exceeded the limit (%1B).'));95 return str_replace("%1",$this->preferences['max_attachment_size'],$this->functions->getLang('The size of this message has exceeded the limit (%1B).')); 96 96 } 97 97 elseif(strstr($error,'virus')) { … … 765 765 $return = ""; 766 766 767 if( (isset($this->preferences ->preview_msg_subject) && ($this->preferences->preview_msg_subject == "0")) && (isset($this->preferences->preview_msg_tip) && ($this->preferences->preview_msg_tip== "0")) )767 if( (isset($this->preferences['preview_msg_subject']) && ($this->preferences['preview_msg_subject'] == "0")) && (isset($this->preferences['preview_msg_tip']) && ($this->preferences['preview_msg_tip'] == "0")) ) 768 768 { 769 769 $return['body'] = ""; … … 1654 1654 $spam = $inbox . $this->email_server['imapDelimiter ']. $this->email_server['imapDefaultSpamFolder']; 1655 1655 $sent = $inbox . $this->email_server['imapDelimiter ']. $this->email_server['imapDefaultSentFolder']; 1656 $uid2cn = $this->preferences ->uid2cn;1656 $uid2cn = $this->preferences['uid2cn']; 1657 1657 1658 1658 if(!$this->mbox || !is_resource($this->mbox)) … … 1885 1885 include_once("class.phpmailer.php"); 1886 1886 $mail = new PHPMailer(); 1887 $mail->email_server = $this->email_server; 1888 $mail->username = $this->username; 1889 $mail->password = $this->password; 1890 $mail->session_id = $this->session_id; 1891 1887 1892 // Set lang for PHPMailer using user prefs. 1888 1893 list($prefix,$userlang) = explode('-',$this->lang); … … 2020 2025 // Se uma das verificacoes falhar, nao enviar o e-mail e avisar o usuario. 2021 2026 // O array $mail->Certs_crypt soh deve ser preenchido se os certificados passarem nas verificacoes. 2022 $numero_maximo = $this->preferences ->num_max_certs_to_cipher; // Este valor dever ser configurado pelo administrador do site ....2027 $numero_maximo = $this->preferences['num_max_certs_to_cipher']; // Este valor dever ser configurado pelo administrador do site .... 2023 2028 $erros_acumulados = ""; 2024 2029 $aux_mails = array(); … … 2155 2160 { 2156 2161 $total_uploaded_size = 0; 2157 $upload_max_filesize = str_replace("M","",$this->preferences ->max_attachment_size) * 1024 * 1024;2162 $upload_max_filesize = str_replace("M","",$this->preferences['max_attachment_size']) * 1024 * 1024; 2158 2163 foreach ($attachments as $attach) 2159 2164 { … … 2238 2243 error_log("$now - $userip - $sent [$subject] - $userid => $addrs\r\n", 3, "/home/expressolivre/mail_senders.log"); 2239 2244 } 2240 if($this->preferences ->number_of_contacts&&2241 $this->preferences ->use_dynamic_contacts) {2245 if($this->preferences['number_of_contacts'] && 2246 $this->preferences['use_dynamic_contacts']) { 2242 2247 $contacts = new dynamic_contacts(); 2243 2248 $new_contacts = $contacts->add_dynamic_contacts($toaddress.",".$ccaddress.",".$ccoaddress); … … 2498 2503 } 2499 2504 //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name 2500 if ($this->preferences ->uid2cn){2505 if ($this->preferences['uid2cn']){ 2501 2506 if (substr($new_folder_name,0,4) == 'user'){ 2502 2507 $this->ldap = new ldap_functions(); … … 2620 2625 $mail->From = $this->email; 2621 2626 $session_id = $this->session_id; 2622 $max_resolution = $this->preferences ->image_size;2627 $max_resolution = $this->preferences['image_size']; 2623 2628 2624 2629 $this->add_recipients("to", $toaddress, &$mail); … … 2836 2841 imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number)) 2837 2842 ,$importance); 2838 if(strtolower($importance[1])=="high" && $this->preferences ->use_important_flag) {2843 if(strtolower($importance[1])=="high" && $this->preferences['use_important_flag']) { 2839 2844 $flag_importance=true; 2840 2845 } … … 2852 2857 } 2853 2858 2854 if($flag_importance && $this->preferences ->use_important_flag) {2859 if($flag_importance && $this->preferences['use_important_flag']) { 2855 2860 $return["status"] = false; 2856 2861 $return["msg"] = $this->functions->getLang("At least one of selected message cant be marked as normal"); … … 3335 3340 if($search){ 3336 3341 $search_criteria = ''; 3337 $search_result_number = $this->preferences ->search_result_number;3342 $search_result_number = $this->preferences['search_result_number']; 3338 3343 foreach($search as $tmp) 3339 3344 { … … 3365 3370 $filter = $this->remove_accents($filter); 3366 3371 //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name 3367 if ($this->preferences ->uid2cn&& substr($name_box,0,4) == 'user')3372 if ($this->preferences['uid2cn'] && substr($name_box,0,4) == 'user') 3368 3373 { 3369 3374 $folder_name = explode($this->email_server['imapDelimiter'],$name_box); … … 3724 3729 $header->udate += $pdate['zone']*(-60); 3725 3730 3726 if($header->Flagged != "F" && $this->preferences ->use_important_flag) {3731 if($header->Flagged != "F" && $this->preferences['use_important_flag']) { 3727 3732 $flag = preg_match('/importance *: *(.*)\r/i', 3728 3733 imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number)) -
trunk/expressoMail1_2/inc/class.phpmailer.php
r2360 r2493 257 257 var $LE = "\n"; 258 258 /**#@-*/ 259 260 /*Used for expresso*/ 261 var $session_id; 262 var $email_server; 263 var $username; 264 var $password; 265 259 266 260 267 ///////////////////////////////////////////////// … … 696 703 697 704 if ($this->SaveMessageInFolder){ 698 $username = $ _SESSION['phpgw_info']['expressomail']['user']['userid'];699 $password = $ _SESSION['phpgw_info']['expressomail']['user']['passwd'];700 $imap_server = $ _SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];701 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort'];705 $username = $this->username; 706 $password = $this->password; 707 $imap_server = $this->email_server['imapServer']; 708 $imap_port = $this->email_server['imapPort']; 702 709 703 if ($ _SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes')710 if ($this->email_server['imapTLSEncryption'] == 'yes') 704 711 { 705 712 $imap_options = '/tls/novalidate-cert'; … … 1371 1378 set_magic_quotes_runtime(0); 1372 1379 1373 $nameOut = ini_get("session.save_path").'/'."email_".$ _SESSION[ 'phpgw_session' ][ 'session_id' ].base_convert(microtime(), 10, 36).".base64";1380 $nameOut = ini_get("session.save_path").'/'."email_".$this->session_id.base_convert(microtime(), 10, 36).".base64"; 1374 1381 $fh2 = fopen($nameOut, 'wb'); 1375 1382 if ($encoding != "" && $encoding != 'base64') … … 1435 1442 1436 1443 set_magic_quotes_runtime($magic_quotes); 1437 1438 1444 return $nameOut; 1439 1445 //return $file_buffer;
Note: See TracChangeset
for help on using the changeset viewer.