Changeset 2493

Timestamp:

04/13/10 09:05:32 (14 years ago)

Author:

amuller

Message:

Ticket #1026 - Corrigindo problema de sessao no phpmailer que não tinha sido pensado

Location:

trunk/expressoMail1_2/inc

Files:

• class.imap_functions.inc.php (modified) (14 diffs)
• class.phpmailer.php (modified) (4 diffs)

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

@@ -93 +93 @@
                 // This error is returned from Postfix.
                 elseif(strstr($error,'message file too big')) {
-                        return str_replace("%1",$this->preferences->max_attachment_size,$this->functions->getLang('The size of this message has exceeded  the limit (%1B).'));
+                        return str_replace("%1",$this->preferences['max_attachment_size'],$this->functions->getLang('The size of this message has exceeded  the limit (%1B).'));
                 }
                 elseif(strstr($error,'virus')) {
@@ -765 +765 @@
                 $return = "";
 
-                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")) )
+                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")) )
                 {
                         $return['body'] = "";
@@ -1654 +1654 @@
                 $spam = $inbox . $this->email_server['imapDelimiter ']. $this->email_server['imapDefaultSpamFolder'];
                 $sent = $inbox . $this->email_server['imapDelimiter ']. $this->email_server['imapDefaultSentFolder'];
-                $uid2cn = $this->preferences->uid2cn;
+                $uid2cn = $this->preferences['uid2cn'];
 
                 if(!$this->mbox || !is_resource($this->mbox))
@@ -1885 +1885 @@
                 include_once("class.phpmailer.php");
                 $mail = new PHPMailer();
+                $mail->email_server = $this->email_server;
+                $mail->username = $this->username;
+                $mail->password = $this->password;
+                $mail->session_id = $this->session_id;
+
                 // Set lang for PHPMailer using user prefs.
                 list($prefix,$userlang) = explode('-',$this->lang);
@@ -2020 +2025 @@
             // Se uma das verificacoes falhar, nao enviar o e-mail e avisar o usuario.
             // O array $mail->Certs_crypt soh deve ser preenchido se os certificados passarem nas verificacoes.
-            $numero_maximo = $this->preferences->num_max_certs_to_cipher;  // Este valor dever ser configurado pelo administrador do site ....
+            $numero_maximo = $this->preferences['num_max_certs_to_cipher'];  // Este valor dever ser configurado pelo administrador do site ....
             $erros_acumulados = "";
             $aux_mails = array();
@@ -2155 +2160 @@
                 {
                         $total_uploaded_size = 0;
-                        $upload_max_filesize = str_replace("M","",$this->preferences->max_attachment_size) * 1024 * 1024;
+                        $upload_max_filesize = str_replace("M","",$this->preferences['max_attachment_size']) * 1024 * 1024;
                         foreach ($attachments as $attach)
                         {
@@ -2238 +2243 @@
                                 error_log("$now - $userip - $sent [$subject] - $userid => $addrs\r\n", 3, "/home/expressolivre/mail_senders.log");
                         }
-                        if($this->preferences->number_of_contacts &&
-                           $this->preferences->use_dynamic_contacts) {
+                        if($this->preferences['number_of_contacts'] &&
+                           $this->preferences['use_dynamic_contacts']) {
                                 $contacts = new dynamic_contacts();
                                 $new_contacts = $contacts->add_dynamic_contacts($toaddress.",".$ccaddress.",".$ccoaddress);
@@ -2498 +2503 @@
         }
         //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
-        if ($this->preferences->uid2cn){
+        if ($this->preferences['uid2cn']){
             if (substr($new_folder_name,0,4) == 'user'){
                 $this->ldap = new ldap_functions();
@@ -2620 +2625 @@
                 $mail->From =  $this->email;
                 $session_id = $this->session_id;
-                $max_resolution = $this->preferences->image_size;
+                $max_resolution = $this->preferences['image_size'];
 
                 $this->add_recipients("to", $toaddress, &$mail);
@@ -2836 +2841 @@
                                         imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number))
                                         ,$importance);
-                                if(strtolower($importance[1])=="high" && $this->preferences->use_important_flag) {
+                                if(strtolower($importance[1])=="high" && $this->preferences['use_important_flag']) {
                                         $flag_importance=true;
                                 }
@@ -2852 +2857 @@
                         }
 
-                        if($flag_importance && $this->preferences->use_important_flag) {
+                        if($flag_importance && $this->preferences['use_important_flag']) {
                                 $return["status"] = false;
                                 $return["msg"] = $this->functions->getLang("At least one of selected message cant be marked as normal");
@@ -3335 +3340 @@
             if($search){
                 $search_criteria = '';
-                $search_result_number = $this->preferences->search_result_number;
+                $search_result_number = $this->preferences['search_result_number'];
                 foreach($search as $tmp)
                 {
@@ -3365 +3370 @@
                     $filter = $this->remove_accents($filter);
                     //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name
-                    if ($this->preferences->uid2cn && substr($name_box,0,4) == 'user')
+                    if ($this->preferences['uid2cn'] && substr($name_box,0,4) == 'user')
                     {
                         $folder_name = explode($this->email_server['imapDelimiter'],$name_box);
@@ -3724 +3729 @@
                 $header->udate +=  $pdate['zone']*(-60);
 
-                if($header->Flagged != "F" && $this->preferences->use_important_flag) {
+                if($header->Flagged != "F" && $this->preferences['use_important_flag']) {
                         $flag = preg_match('/importance *: *(.*)\r/i',
                                                 imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number))

trunk/expressoMail1_2/inc/class.phpmailer.php

@@ -257 +257 @@
     var $LE              = "\n";
     /**#@-*/
+
+    /*Used for expresso*/
+    var $session_id;
+    var $email_server;
+    var $username;
+    var $password; 
+
     
     /////////////////////////////////////////////////
@@ -696 +703 @@
 
         if ($this->SaveMessageInFolder){
-                        $username = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
-                        $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
-                        $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];
-                        $imap_port      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort'];
+                        $username = $this->username;
+                        $password = $this->password;
+                        $imap_server = $this->email_server['imapServer'];
+                        $imap_port = $this->email_server['imapPort'];
                         
-                        if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes')
+                        if ($this->email_server['imapTLSEncryption'] == 'yes')
                         {
                                 $imap_options = '/tls/novalidate-cert';
@@ -1371 +1378 @@
         set_magic_quotes_runtime(0);
 
-        $nameOut = ini_get("session.save_path").'/'."email_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].base_convert(microtime(), 10, 36).".base64";
+        $nameOut = ini_get("session.save_path").'/'."email_".$this->session_id.base_convert(microtime(), 10, 36).".base64";
         $fh2 = fopen($nameOut, 'wb');
         if ($encoding != "" && $encoding != 'base64')
@@ -1435 +1442 @@
 
         set_magic_quotes_runtime($magic_quotes);
-
         return $nameOut;
         //return $file_buffer;