Changeset 5711

Timestamp:

03/13/12 10:51:32 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Correção na adequação dos ids dos followupflagged.

Location:

trunk

Files:

• expressoMail1_2/js/search.js (modified) (1 diff)
• prototype/modules/mail/js/followupflag.js (modified) (1 diff)
• prototype/services/ImapServiceAdapter.php (modified) (1 diff)

trunk/expressoMail1_2/js/search.js

@@ -587 +587 @@
                                                 // data[ 'followupflagged://' + mailbox + '/' + messageClickedId + '#' + flagged[0].id ] = false;
                                                 // DataLayer.dispatch('Sync', data, false, true);
-                                                DataLayer.remove('followupflagged', mailbox + '/' + messageClickedId + '#' + flagged[0].id );
+                                                DataLayer.remove('followupflagged', flagged[0].id );
                                                 if(current_folder == mailbox){
                                                         DataLayer.commit(false, false, function(){

trunk/prototype/modules/mail/js/followupflag.js

@@ -286 +286 @@
                                 if(onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id){
                                         var flag_id = onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id;
-                                        DataLayer.remove('followupflagged', folder_name + '/' + messageNumber + '#' + flag_id );
+                                        DataLayer.remove('followupflagged', flag_id );
                                         /**
                                          * TODO - corrigir o formato do ID no DataLayer, para que seja utilizado o ID composto

trunk/prototype/services/ImapServiceAdapter.php

@@ -526 +526 @@
 
                                         $this->mbox = $this->open_mbox($folderName);
-                                        imap_clearflag_full($this->mbox, $messageNumber, '$Followupflag' . $followupflaggedId, ST_UID);
+                                        $f1 = imap_clearflag_full($this->mbox, $messageNumber, '$Followupflag' . $followupflaggedId, ST_UID);
 
                                         /**
                                          * implementa a possibilidade de listar todas as mensagens sinalizadas através da busca
                                          */
-                                        imap_clearflag_full($this->mbox, $messageNumber, '$Followupflagged', ST_UID);
+                                        $f2 = imap_clearflag_full($this->mbox, $messageNumber, '$Followupflagged', ST_UID);
 
                                         imap_close($this->mbox, CL_EXPUNGE);
                                         $this->mbox = false;
-                                }
+                                        
+                                        return ($f1 && $f2);
+                                }
+                                
+                                return false;
                         }
                 }