Changeset 2427

Timestamp:

04/06/10 10:37:01 (14 years ago)

Author:

amuller

Message:

Ticket #1026 - Fechando a sessão em cada requisição do inicio do expressoMail

Location:

trunk/expressoMail1_2/inc

Files:

• class.db_functions.inc.php (modified) (2 diffs)
• class.imap_functions.inc.php (modified) (6 diffs)

trunk/expressoMail1_2/inc/class.db_functions.inc.php

@@ -220 +220 @@
         
         function get_dropdown_contacts(){
-                
+
+                $number_of_contacts = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'];
+                $use_dynamic_contacts = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']; 
+                // Free others requests
+                session_write_close();
+
                 $contacts = $this -> get_cc_contacts();
                 $groups = $this -> get_cc_groups();
@@ -233 +238 @@
                         $stringDropDownContacts = $groups;
                                         
-                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] &&
-                        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) {
-                                
-                        // Free others requests
-                        session_write_close();
+                if($number_of_contacts && $use_dynamic_contacts) {
                         $dynamic_contact = new dynamic_contacts();
                         $dynamic = $dynamic_contact->dynamic_contact_toString();

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

@@ -62 +62 @@
                         return $this->mbox;
                 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
-                $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
+                $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
                 return $this->mbox;
          }
@@ -1647 +1647 @@
         function get_folders_list($params = null)
         {
-                $mbox_stream = $this->open_mbox();
-                if($params && $params['onload'] && $_SESSION['phpgw_info']['expressomail']['server']['certificado']){
-                        $this->delete_mailbox(array("del_past" => "INBOX/decifradas"));
-                }
                 $inbox = 'INBOX';
                 $trash = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
@@ -1660 +1656 @@
                 session_write_close();
 
+                if(!$this->mbox || !is_resource($this->mbox))
+                        $this->mbox = $this->open_mbox();
+
+                if($params && $params['onload'] && $_SESSION['phpgw_info']['expressomail']['server']['certificado']){
+                        $this->delete_mailbox(array("del_past" => "INBOX/decifradas"));
+                }
+
                 $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
-                $folders_list = imap_getmailboxes($mbox_stream, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*");
+                $folders_list = imap_getmailboxes($this->mbox, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*");
                 $folders_list = array_slice($folders_list,0,$this->foldersLimit);
 
@@ -1674 +1677 @@
                         $i = 0;
                         while (list($key, $val) = each($folders_list)) {
-                                $status = imap_status($mbox_stream, $val->name, SA_UNSEEN);
+                                $status = imap_status($this->mbox, $val->name, SA_UNSEEN);
 
                                 //$tmp_folder_id = explode("}", imap_utf7_decode($val->name));
@@ -1680 +1683 @@
                                 if($tmp_folder_id[1]=='INBOX'.$this->imap_delimiter.'decifradas') {
                                         //error_log('passou', 3,'/tmp/imap_get_list.log');
-                                        //imap_deletemailbox($mbox_stream,imap_utf7_encode("{".$this->imap_server."}".'INBOX/decifradas'));
+                                        //imap_deletemailbox($this->mbox, imap_utf7_encode("{".$this->imap_server."}".'INBOX/decifradas'));
                                         continue;
                                 }
@@ -3278 +3281 @@
                 $before_date = date("m/d/Y", strtotime("-".$params['before_date']." day"));
                 $criteria =  'BEFORE "'.$before_date.'"';
-                $mbox_stream = $this->open_mbox('INBOX'.$this->imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']);
+                $trash_folder = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+                // Free others requests
+                session_write_close();
+
+                $mbox_stream = $this->open_mbox('INBOX'.$this->imap_delimiter.$trash_folder);
                 
                 // Free others requests