Changeset 41 for trunk/expressoMail1_2

Timestamp:

07/09/07 17:15:11 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoMail1_2

Files:

• docs/change_log.txt (modified) (1 diff)
• inc/class.imap_functions.inc.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• js/draw_api.js (modified) (4 diffs)
• js/filter.js (modified) (1 diff)

trunk/expressoMail1_2/docs/change_log.txt

@@ -79 +79 @@
 - Corrigido problema ao montar lista de mensagens, quando alguma delas tinha no campo "Para", caracteres especiais.
 - Modificada a implementação da Busca rápida de Detalhes do Remetente da Mensagem, para preparar a integração com os demais serviços.
+
+09/07/2007 - [1.2033]
+- Corrigido problema na funcionalidade filtros, que não permitia adicionar filtro quando se definia tamanho máximo de mensagem.
+- Corrigido problema no campo "Responder Para", quando esse possuía formato HTML.
+- Modificado link do botão Cancelar, do template das preferências.
+- Corrigido problema na busca rápida.

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

@@ -54 +54 @@
                 $mbox_stream = $this->open_mbox($folder);
                 
-                switch($sort_box_type) {        
-                        
+                switch($sort_box_type){
                         case 'SORTFROM':
-                        $sort_array_msg = $this->imap_sortfrom($mbox_stream, $sort_box_reverse, $folder);
-                        break;
+                                $sort_array_msg = $this->imap_sortfrom($mbox_stream, $sort_box_reverse, $folder);
+                                break;
                         case 'SORTSUBJECT':
-                        $sort_array_msg = imap_sort($mbox_stream, SORTSUBJECT, $sort_box_reverse, SE_UID);
-                        break;
+                                $sort_array_msg = imap_sort($mbox_stream, SORTSUBJECT, $sort_box_reverse, SE_UID);
+                                break;
                         case 'SORTARRIVAL':
-                        $sort_array_msg = imap_sort($mbox_stream, SORTARRIVAL, $sort_box_reverse, SE_UID);
-                        break;
+                                $sort_array_msg = imap_sort($mbox_stream, SORTARRIVAL, $sort_box_reverse, SE_UID);
+                                break;
                         case 'SORTSIZE':
-                        $sort_array_msg = imap_sort($mbox_stream, SORTSIZE, $sort_box_reverse, SE_UID);
-                        break;
-                        case 'UNSEEN':
-                        $sort_array_msg = imap_search($mbox_stream,"UNSEEN", SE_UID); // nao lidas
-                        break;
-                        case 'ANSWERED':
-                        $sort_array_msg = imap_search($mbox_stream,"ANSWERED", SE_UID); // repondidas
-                        break;
-                        case 'SEEN':
-                        $sort_array_msg = imap_search($mbox_stream,"SEEN", SE_UID); // lidas
-                        break;
-                        case 'FLAGGED':
-                        $sort_array_msg = imap_search($mbox_stream,"FLAGGED", SE_UID); // importantes
-                        break;
-                        case 'ALL':
-                        $sort_array_msg = imap_search($mbox_stream,SORTARRIVAL,$sort_box_reverse,  SE_UID); // Todas
-                        break;
+                                $sort_array_msg = imap_sort($mbox_stream, SORTSIZE, $sort_box_reverse, SE_UID);
+                                break;
                 }
                 
@@ -342 +326 @@
                                 {
                                         $personal_reply_to = imap_mime_header_decode($tmp_reply_to->personal);
-                                        $return['reply_to'] .= '"' . $personal_reply_to[0]->text . '"';
-                                        $return['reply_to'] .= " ";
-                                        $return['reply_to'] .= "<";
-                                        $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host;
-                                        $return['reply_to'] .= ">";
+                                        if(!empty($personal_reply_to[0]->text)) {
+                                                $return['reply_to'] .= '"' . $personal_reply_to[0]->text . '"';
+                                                $return['reply_to'] .= " ";
+                                                $return['reply_to'] .= "<";
+                                                $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host;
+                                                $return['reply_to'] .= ">";
+                                        }
+                                        else {
+                                                $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host;
+                                        }
                                 }
                                 else

trunk/expressoMail1_2/index.php

@@ -4 +4 @@
                 'nonavbar' => False,
                 'currentapp' => 'expressoMail1_2',
-                'update_version'        => '1.20314',
+                'update_version'        => '1.2033',
                 'enable_nextmatchs_class' => True
         );

trunk/expressoMail1_2/js/draw_api.js

@@ -410 +410 @@
         span_T.style.height = "10";
         span_options.style.fontSize = "12";
+        span_options.width = "50%";
         span_options.innerHTML = 
         '<span title="'+get_lang("Delete")+'" style="margin-left:8px" class="message_options" onclick=delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span> | '+
         '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span> | '+
         '<span title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span> | '+
-        '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span> | '+
-        '<select onchange="listByFlag(this.value)">'+
-        '<option value="SORTARRIVAL" '+(sort_box_type == 'SORTARRIVAL' ? 'selected':'')+'>Todas</option>'+
-        '<option value="UNSEEN" '+(sort_box_type == 'UNSEEN' ? 'selected':'')+'>Não Lidas</option>'+
-        '<option value="SEEN" '+(sort_box_type == 'SEEN' ? 'selected':'')+'>Lidas</option>'+
-        '<option value="ANSWERED" '+(sort_box_type == 'ANSWERED' ? 'selected':'')+'>Respondidas/Encaminhadas</option>'+
-        '<option value="FLAGGED" '+(sort_box_type == 'FLAGGED' ? 'selected':'')+'>Importantes</option>'+
-        '</select>';
+        '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span>';
         var span_D = document.createElement("TD");
         span_R.appendChild(span_D);
@@ -437 +431 @@
         alternate_border(0);
         resizeWindow();
-
         Element('main_table').style.display = '';
         span_T.style.visibility = 'visible';
@@ -684 +677 @@
                 default:
                         type_name = get_lang("Date");
+                        sort_box_type = 'SORTARRIVAL';
                 break;
         }
 
-        Element("message_header_"+(sort_box_type.lastIndexOf("SORT") != "-1" ? sort_box_type : "SORTARRIVAL") ).innerHTML = "<B>"+type_name+"</B><img src ='templates/default/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>";
+        Element("message_header_"+sort_box_type).innerHTML = "<B>"+type_name+"</B><img src ='templates/default/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>";
 }
 function draw_message(info_msg, ID){
@@ -2131 +2125 @@
         div_address_full.style.display='';
 }
-function listByFlag(flag_type){
-        sort_box_type = flag_type;
-        cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+flag_type+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
-}

trunk/expressoMail1_2/js/filter.js

@@ -402 +402 @@
                         }
 
-                        if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == ""){
+                        if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == "" && Element("field4").value == "")
+                        {
                                 alert(get_lang("It defines criteria for the fields From, To and Subject with more than 3 characters!"));
                                 return false;
                         }
-                        
-                        if((LTrim(Element("field1").value).length <= 3) && (LTrim(Element("field2").value).length <= 3) && (LTrim(Element("field3").value).length <= 3)){
+
+                        if((LTrim(Element("field1").value).length <= 3) && (LTrim(Element("field2").value).length <= 3) && (LTrim(Element("field3").value).length <= 3 && Element("field4").value == "")){
                                 alert(get_lang("It defines criteria for the fields From, To and Subject with more than 3 characters!"));
                                 return false;