Changeset 830

Timestamp:

05/11/09 15:23:21 (15 years ago)

Author:

niltonneto

Message:

ticket #484 - Correção de código que estava em hardcoded.

File:

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

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

@@ -104 +104 @@
                 include_once("class.imap_attachment.inc.php");
                 $imap_attachment = new imap_attachment();
+
+
 
                 /*Como eu preciso do atributo Importance para saber se o email é 
@@ -229 +231 @@
                                 zip_close($zip);
                         }
-                }
+                        }
                 else if(substr($filename,strlen($filename)-4)==".eml") {
                         $email = implode("",file($params['FILES'][0]['tmp_name']));
@@ -2009 +2011 @@
                 $body = $mail->CreateBody(); 
 
-        if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes')
-                {
-                        $imap_options = '/tls/novalidate-cert';
-                }
-                else
-                {
-                        $imap_options = '/notls/novalidate-cert';
-                }
-                $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'];
-                $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$folder, $username, $password);
-        
+                $mbox_stream = $this->open_mbox($folder);       
                 $new_header = str_replace("\n", "\r\n", $header);
                 $new_body = str_replace("\n", "\r\n", $body);
-                
-                $return['append'] = imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$folder, $new_header . $new_body, "\\Seen \\Draft");
+                $return['append'] = imap_append($mbox_stream, "{".$this->imap_server.":".$this->imap_port."}".$folder, $new_header . $new_body, "\\Seen \\Draft");
                 $status = imap_status($mbox_stream, "{".$this->imap_server.":".$this->imap_port."}".$folder, SA_UIDNEXT);
                 $return['msg_no'] = $status->uidnext - 1;