Changeset 2416 for trunk/expressoMail1_2/inc

Timestamp:

04/05/10 13:32:37 (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) (1 diff)
• class.imap_functions.inc.php (modified) (4 diffs)

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

@@ -235 +235 @@
                 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();
                         $dynamic_contact = new dynamic_contacts();
                         $dynamic = $dynamic_contact->dynamic_contact_toString();

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

@@ -87 +87 @@
         function get_range_msgs2($params)
         {
+                // Free others requests
+                session_write_close();
+
                 $folder = $params['folder'];
                 $msg_range_begin = $params['msg_range_begin'];
@@ -1648 +1651 @@
                         $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 = array_slice($folders_list,0,$this->foldersLimit);
-
-                $tmp = array();
-                $resultMine = array();
-                $resultDefault = array();
-
                 $inbox = 'INBOX';
                 $trash = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
                 $drafts = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
                 $spam = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
-                $sent = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
+                $sent = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
+                $uid2cn = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn'];
+                // Free others requests
+                session_write_close();
+
+                $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
+                $folders_list = imap_getmailboxes($mbox_stream, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*");
+                $folders_list = array_slice($folders_list,0,$this->foldersLimit);
+
+                $tmp = array();
+                $resultMine = array();
+                $resultDefault = array();
 
                 if (is_array($folders_list)) {
@@ -1684 +1690 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn'] && substr($folder_id,0,4) == 'user') {
+                                if ($uid2cn && substr($folder_id,0,4) == 'user') {
                                         //$this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])) {
@@ -3268 +3274 @@
                 $criteria =  'BEFORE "'.$before_date.'"';
                 $mbox_stream = $this->open_mbox('INBOX'.$this->imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']);
+                
+                // Free others requests
+                session_write_close();
+
                 $messages = imap_search($mbox_stream, $criteria, SE_UID);
+
                 if (is_array($messages)){
                         foreach ($messages as $msg_number){