Changeset 3911

Timestamp:

03/25/11 09:53:51 (13 years ago)

Author:

brunocosta

Message:

Ticket #1694 - Coloca os flags das mensagens desarquivadas.

Location:

branches/2.2/expressoMail1_2

Files:

• imap.py (modified) (1 diff)
• inc/class.imap_functions.inc.php (modified) (4 diffs)
• js/local_messages.js (modified) (2 diffs)

branches/2.2/expressoMail1_2/imap.py

@@ -16 +16 @@
 M = imaplib.IMAP4(host,port)
 M.login(user,password)
-flags="\\Seen"
+flags=""
 M.append(mailbox,flags,date_time,message)
 #print mailbox+flags+date_time+message

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

@@ -3835 +3835 @@
 ///expressoMail1_2/imap.py para inserir uma msg com o horário correto pois isso não é porssível com a função imap_append do php.
 
-    function insert_email($source,$folder,$timestamp,$flagged){
+    function insert_email($source,$folder,$timestamp,$flags){
         $username = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
         $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
@@ -3860 +3860 @@
                         
         $return['msg_no'] = $status->uidnext - 1;
-                                $return['error'] = imap_last_error();
-                                
-                                if(!$return['error'])
-                                        if($flagged && $flagged == "F")
-                                                $this->set_messages_flag(array('folder'=>$folder,'msgs_to_set'=>$return['msg_no'],'flag'=>'flagged'));
-
+        $return['error'] = imap_last_error();
+        if(!$return['error'] && $flags != '' ){
+
+                  $flags_array=explode(':',$flags);
+                  //"Answered","Draft","Flagged","Unseen"
+                  $flags_fixed = "";
+                  if($flags_array[0] == 'A')
+                        $flags_fixed.="\\Answered ";
+                  if($flags_array[1] == 'X')
+                        $flags_fixed.="\\Draft ";
+                  if($flags_array[2] == 'F')
+                        $flags_fixed.="\\Flagged ";
+                  if($flags_array[3] != 'U')
+                        $flags_fixed.="\\Seen ";
+
+                  imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
+                }
         if($mbox_stream)
-                                        imap_close($mbox_stream);
+            imap_close($mbox_stream);
         return $return;
     }
@@ -3952 +3963 @@
         $sources = explode("#@#@#@",$params['source']);
         $timestamps = explode("#@#@#@",$params['timestamp']);
-        $flaggeds = explode("#@#@#@",$params['flagged']);
+        $flags = explode("#@#@#@",$params['flags']);
 
         foreach($sources as $index=>$src)
@@ -3958 +3969 @@
             if($src!="")
             {
-                                                        $source = $this->treat_base64_from_post($src);
-                                                        $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flaggeds[$index]);
-                        }
-                                }
+                $source = $this->treat_base64_from_post($src);
+                $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]);
+            }
+        }
         
         return $insert;

branches/2.2/expressoMail1_2/js/local_messages.js

@@ -1177 +1177 @@
                 var rs = this.dbGears.execute("select mail,timestamp from mail where rowid in ("+msgs_number+")");
                 var source="";
-                var     flagged="";
-                var timestamp="";
-        
+                var flags="";
+                var timestamp="";
+                
                 while(rs.isValidRow()) {
                         mail=connector.unserialize(rs.field(0));
                         mail.msg_source?source_tmp = escape(mail.msg_source):source_tmp = escape(this.get_src(mail.url_export_file));
-
-                        flagged+="#@#@#@"+mail["Flagged"];
-                        source+="#@#@#@"+source_tmp;
+                        flags+="#@#@#@"+mail["Answered"]+":"+mail["Draft"]+":"+mail["Flagged"]+":"+mail["Unseen"];
+                        source+="#@#@#@"+source_tmp;
                         timestamp+="#@#@#@"+rs.field(1);
                         rs.next();
@@ -1199 +1198 @@
 
                 mail.msg_source?source = mail.msg_source:source = this.get_src(mail.url_export_file);
-                flagged = mail["Flagged"];
+                flags = mail["Answered"]+":"+mail["Draft"]+":"+mail["Flagged"]+":"+mail["Unseen"];
                 timestamp=rs.field(1);
                 rs.close();
                 this.finalize();
     }
-    params="&folder="+new_folder+"&source="+source+"&timestamp="+timestamp+"&flagged="+flagged;
+    params="&folder="+new_folder+"&source="+source+"&timestamp="+timestamp+"&flags="+flags;
     cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
 }