Changeset 1954 for branches/2.0

Timestamp:

02/01/10 15:12:40 (14 years ago)

Author:

niltonneto

Message:

Ticket #758 - Melhorada a implementação que remove "INBOX/decifradas".

Location:

branches/2.0/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (3 diffs)
• js/main.js (modified) (2 diffs)

branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1440 +1440 @@
         function get_folders_list($params = null)
         {
-                $mbox_stream = $this->open_mbox();              
+                $mbox_stream = $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/*" : "*");
@@ -1552 +1555 @@
                 $namebox = $arr['del_past'];
                 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];
-                $mbox_stream = $this->open_mbox();
+                $mbox_stream = $this->mbox ? $this->mbox : $this->open_mbox();
                 //$del_folder = imap_deletemailbox($mbox_stream,"{".$imap_server."}INBOX.$namebox");
                 
@@ -1561 +1564 @@
                         $result = implode("<br />\n", imap_errors());
                 }
+                /*
                 if($mbox_stream)
                         imap_close($mbox_stream);
+                */
                 return $result;
         }

branches/2.0/expressoMail1_2/js/main.js

@@ -31 +31 @@
         // Fim da inserção da applet
 
-                cExecute ("$this.imap_functions.get_folders_list", update_menu);
+                cExecute ("$this.imap_functions.get_folders_list&onload=true", update_menu);
         }
         var handler_automatic_trash_cleanness = function(data){
@@ -44 +44 @@
         // Get cyrus delimiter
         cyrus_delimiter = Element('cyrus_delimiter').value;
-    var del_return = function(data){
-                //alert(data);
-        }
-
-        cExecute ("$this.imap_functions.delete_mailbox&del_past=INBOX/decifradas", del_return);
+
         cExecute ("$this.db_functions.get_dropdown_contacts", save_contacts);
         cExecute ("$this.functions.get_preferences", save_preferences);