Changeset 6340 for branches/2.3

Timestamp:

05/29/12 14:05:15 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2809 - Mensagem é apagada da origem caso o desarquivamento não tenha sucesso.

Location:

branches/2.3/expressoMail1_2

Files:

• imap.py (modified) (1 diff)
• inc/class.imap_functions.inc.php (modified) (4 diffs)
• js/local_messages.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

branches/2.3/expressoMail1_2/imap.py

@@ -19 +19 @@
     M.login(user,password)
     flags=""
-    M.append(mailbox,flags,date_time,message)
+    data = M.append(mailbox,flags,date_time,message)
+
+    result = data[0]+':'+data[1][0]
+    
+    print result
+
     #print mailbox+flags+date_time+message
-    M.logout()
     #M.close()
-    print "no errors"
+    #print "no errors"
 except imaplib.IMAP4.error, erro:
     print erro
+finally:
+    M.logout()

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

@@ -4056 +4056 @@
             imap_createmailbox($mbox_stream,imap_utf7_encode("{".$imap_server."}".$folder));
         }
+        
+        // string date ( string $format [, int $timestamp = time() ] )
+        // bool imap_append ( resource $imap_stream , string $mailbox , string $message [, string $options = NULL [, string $internal_date = NULL ]] )
+        // 'd-M-Y H:i:s O'
+        
+        $return = array();
         if($timestamp){
             $tempDir = $_SESSION['phpgw_info']['server']['temp_dir'];
@@ -4067 +4073 @@
             $return['append'] = imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$folder, $source, "\\Seen");
         }
+        
+        if (!empty($return['command']))
+        {
+            list ($result, $msg) = explode(':',$return['command']);
+            if (strtoupper($result) === 'NO')
+            {
+                $return['error'] = $msg;
+                return $return;
+            }
+        }
+        
         $status = imap_status($mbox_stream, "{".$this->imap_server.":".$this->imap_port."}".$folder, SA_UIDNEXT);
 
@@ -4182 +4199 @@
         $flags = explode("#@#@#@",$params['flags']);
         $ids = explode("#@#@#@",$params['id']);
-        $return = array(); 
+        $return = array();
+        $archived = array();
+        $error = array();
 
         foreach($sources as $index=>$src)
@@ -4190 +4209 @@
                 $source = $this->treat_base64_from_post($src);
                 $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]);
-                if(!$insert['error'])
-                    $return[] = $ids[$index];
+                if($insert['error'])
+                {
+                    $error[] = $ids[$index];
+                }
+                else 
+                {
+                    $archived[] = $ids[$index];
+                }
             }
         }
+        
+        if (!empty($error))
+        {
+            $return['error'] = $error;
+        }
+        if (!empty($archived))
+        {
+            $return['archived'] = $archived;
+        }
         
         return $return;

branches/2.3/expressoMail1_2/js/local_messages.js

@@ -1239 +1239 @@
     var handler_unarchive = function(data)
     {
+        var archived = typeof (data.archived) == 'undefined' ? Array() : data.archived;
         if(preferences.keep_archived_messages == "0")
-             expresso_local_messages.delete_msgs(data.join());
+             expresso_local_messages.delete_msgs(archived.join());
         if(currentTab != 0)
-            delete_border(currentTab,'false'); 
-        write_msg(get_lang('All messages are successfully unarchived'));
-
+            delete_border(currentTab,'false');
+        
+        if (!data.error)
+        {
+            write_msg(get_lang('All messages are successfully unarchived'));
+        }
+        else if (!data.archived)
+            {
+                write_msg(get_lang('No messages were unarchived'));
+            }
+            else
+            {
+                write_msg(get_lang("Some messages weren't successfully unarchived"));
+            }
     }
 

branches/2.3/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -18 +18 @@
 all     expressoMail1_2 pt-br   Todas
 All messages are successfully unarchived        expressoMail1_2 pt-br   Mensagens desarquivadas com sucesso
+No messages were unarchived     expressoMail1_2 pt-br   Nenhuma mensagem foi desarquivada
+Some messages weren't successfully unarchived   expressoMail1_2 pt-br   Algumas mensagens não puderam ser desarquivadas
 Allowed domains for sieve forwarding    admin   pt-br   Domínios permitidos para encaminhamento em filtros
 Also check message against next rule    expressoMail1_2 pt-br   Checar mensagem contra próxima regra também