Changeset 3018 for branches/2.2/expressoMail1_2/js/draw_api.js

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/js/draw_api.js (modified) (24 diffs)

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -436 +436 @@
                         }
                         folders = data;
-                        cExecute ("$this.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1", handler_draw_box);
                 }
 }
@@ -726 +725 @@
         var _divScroll = document.getElementById("divScrollMain_"+numBox);
 
-        var bar = document.getElementById("toolbar");
-        var offset = 0;
 
         if(!_divScroll){                
@@ -742 +739 @@
                 _divScroll.style.width  ="99.3%";
         }
-        // Inicio: Redimensiona DIV SCROLL
-        var bar = Element("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden') 
-                offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);             
-        var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight;
-        var defaultHeight = screenHeight - offset;              
-        _divScroll.style.height         = defaultHeight - 110;
-        Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
-        // Fim: Redimensiona DIV SCROLL
         _divScroll.appendChild(table_element);
         openTab.content_id[numBox].appendChild(_divScroll);
@@ -758 +745 @@
 
                 if (headers_msgs.num_msgs == 0){
-                        td_info = document.createElement("H3");
-                        td_info.setAttribute("height", "25%");
+                        var tr_info = document.createElement("TR"); 
+                        var td_info = document.createElement("TD"); 
+                        td_info.setAttribute("colspan", "10"); 
                         td_info.setAttribute("background", "#FFF");
-                        td_info.setAttribute("id", "msg_info");
+                        tr_info.setAttribute("id", "msg_info");
                         td_info.align = "center";
+                        td_info.style.padding = "25px"; 
+                        td_info.style.fontWeight = "bold"; 
+                        td_info.style.fontSize = "11pt"; 
                         td_info.innerHTML = get_lang("This mail box is empty");
+                        tr_info.appendChild(td_info); 
                         tbody_element.appendChild(td_info);
                 }
@@ -788 +780 @@
         draw_footer_box(headers_msgs.num_msgs); 
         Element('main_table').style.display = '';
+        if(is_ie6)      // Stupid Fixing on IE6. 
+                setTimeout("resizeWindow()",1); 
+        else 
+                resizeWindow(); 
         if(debug) {
                 var _eTime = new Date();
@@ -954 +950 @@
                 _img_sent.src    = "templates/"+template+"/images/sent.gif";
 
+
+
+                var td_element25 = document.createElement("TD"); 
+                td_element25.className = "td_msg"; 
+                td_element25.setAttribute("width", "1%"); 
+                td_element25.id = "td_message_unseen_"+headers_msgs.msg_number; 
+                if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')) 
+                        td_element25.innerHTML = "<img src ='templates/"+template+"/images/unseen.gif' title='"+get_lang('Unseen')+"'>"; 
+                else 
+                        td_element25.innerHTML = "<img src ='templates/"+template+"/images/seen.gif' title='"+get_lang('Seen')+"'>"; 
+
+
                 td_element3 = document.createElement("TD");
                 td_element3.className = "td_msg";
@@ -964 +972 @@
                 if (typeof(headers_msgs.from) == 'undefined')
                         return false;
-                if(headers_msgs.from.email.toLowerCase() == Element("user_email").value)
+                if( headers_msgs.from.email && headers_msgs.from.email.toLowerCase() == Element("user_email").value )
                 { 
                         td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};
@@ -970 +978 @@
                                 td_element3.innerHTML += "<span style=\"color:red\">("+get_lang("Draft")+") </span>";
                         else{                           
-                                if(headers_msgs.to.email.toLowerCase() != Element("user_email").value)
+                                if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value) 
                                         td_element24.innerHTML = "<img valign='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>";
                         
@@ -1048 +1056 @@
                 tr_element.appendChild(td_element22);
                 tr_element.appendChild(td_element23);
-        tr_element.appendChild(td_element24);
+                tr_element.appendChild(td_element24);
+                tr_element.appendChild(td_element25); 
                 tr_element.appendChild(td_element3);
                 tr_element.appendChild(td_element4);
@@ -1115 +1124 @@
 function draw_message(info_msg, ID){
         var content = document.getElementById('content_id_' + ID);
-        var defaultWidth = document.body.offsetWidth - 37;
         
         var menuHidden = Element("folderscol").style.display == 'none' ? true : false;
-        if(!menuHidden)
-                defaultWidth -= Element("folderscol").offsetWidth;
          //////////////////////////////////////////////////////////////////////////////////////////////////////
         //Make the next/previous buttom.
@@ -1239 +1245 @@
         var tbody_message = document.createElement("TBODY");
         table_message.border = "0";
-        table_message.width = defaultWidth ;
+        table_message.width = "100%"; 
 
         //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1268 +1274 @@
 
         td.innerHTML = _name.bold() + ', ' + info_msg.smalldate;
-        if (info_msg.attachments.length > 0)
+        if (info_msg.attachments && info_msg.attachments.length > 0) 
                 td.innerHTML += "&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='templates/"+template+"/images/clip.gif' title='"+info_msg.attachments.names+"'>";
         
@@ -1296 +1302 @@
         option_hide_more.id = 'option_hide_more_'+ID;
         option_hide_more.onclick = function(){
-                var _height = Element("div_message_scroll_"+ID).style.height;
-                _height = parseInt(_height.replace("px",""));
-                var _offset = 35;
                 if (this.value == 'more_options'){
                         this.innerHTML = "<b><u>"+get_lang('Options')+"</u></b>";
                         this.value = 'hide_options';
-                        Element("div_message_scroll_"+ID).style.height = (_height - _offset)+"px";
                         Element('table_message_others_options_'+ID).style.display = '';
                         Element('tr_other_options_'+ID).style.display = '';
@@ -1310 +1312 @@
                         this.innerHTML = get_lang('Options');
                         this.value = 'more_options';
-                        Element("div_message_scroll_"+ID).style.height = (_height + _offset)+"px";
                         Element('table_message_others_options_'+ID).style.display = 'none';
                         Element('tr_other_options_'+ID).style.display = 'none';                 
                 }
+                resizeWindow();
         };
         var option_mark = document.createElement('TD');
@@ -1510 +1512 @@
         var table_message_others_options = document.createElement("TABLE");
         table_message_others_options.id = 'table_message_others_options_' + ID;
-        table_message_others_options.width =  defaultWidth - 30;
+        table_message_others_options.width = "100%";
         table_message_others_options.style.display = 'none';
         table_message_others_options.className = "table_message";
@@ -1619 +1621 @@
         }
         else {
-                to.innerHTML += draw_plugin_cc(ID,toaddress_array[ID]);
+                toAdd = toaddress_array[ID].toString().replace("<","&lt;"); 
+                toAdd = toAdd.replace(">","&gt;"); 
+                to.innerHTML += draw_plugin_cc(ID,toAdd); 
         }
         to.className = "header_message_field";
@@ -1747 +1751 @@
         tr5.appendChild(subject);
         tbody_message_others_options.appendChild(tr5);
-        if (info_msg.attachments.length > 0){
-                var tr6 = document.createElement("TR");
+        if ( info_msg.attachments && info_msg.attachments.length > 0 ){ 
+        var tr6 = document.createElement("TR");
                 tr6.className = "tr_message_header";
                 var td6 = document.createElement("TD");
@@ -1826 +1830 @@
 
 
-        // BEGIN MAKE THE SCROLL HEIGHT
-        var bar = document.getElementById("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden')
-                offset = bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight;
         var div = document.createElement("DIV");
         div.id = "div_message_scroll_"+ID;
         div.style.background = 'WHITE';
-        div.style.height = document.body.clientHeight - offset - 125;
-        content.style.height = document.body.clientHeight - offset - 90;
         div.style.overflow = "auto";
-        div.style.width = defaultWidth - (is_ie ? 5 : 0);
-        // END MAKE THE SCROLL HEIGHT
+        div.style.width = "100%"; 
         table_message_others_options.appendChild(tbody_message_others_options);
         var tr = document.createElement("TR");
@@ -1844 +1840 @@
         td.colSpan = '2';
         div.appendChild(table_message_others_options);
-        var imgTag = info_msg.body.match(/(<img[^>]*src[^=]*=['"][^'"]*["'][^>]*>)|(<td[^>]*background[^=]*=['"][^'"]*["'][^>]*>)/gi);
+        var imgTag = info_msg.body.match(/(<img[^>]*src[^>=]*=['"]?[^'">]*["']?[^>]*>)|(<[^>]*(style[^=>]*=['"][^>]*background(-image)?:[^:;>]*url\()[^>]*>)/gi);
         var newBody = info_msg.body;
         if(!info_msg.showImg && imgTag)
@@ -1859 +1855 @@
                                 for (var i = 0; i < domains.length; i++)
                                 {
+                                        if (imgTag[j].match(/cid:([\w\d]){5,}/) || imgTag[j].match(/src=\"\.\/inc\/show_embedded_attach\.php/g))  
+                                        {
+                                                forbidden = false;
+                                                continue;
+                                        }
                                         imgSource = imgTag[j].match(/=['"](http:\/\/)+[^'"\/]*/);
                                         if (imgSource && imgSource.toString().substr(5).match(domains[i]))
@@ -1894 +1895 @@
         newBody = newBody.replace("<body","<span");
         newBody = newBody.replace("<BODY","<span");
-        div.innerHTML+= "<span id='body_"+ID+"'>"+newBody+"</span><br><br>";
+        while ( ( /<span[^>]*><span[^>]*>/ig ).test( newBody ) ) 
+                newBody = newBody.replace( /(<span[^>]*>)<span[^>]*>/ig, '$1' ); 
+
+        var _body = document.createElement( 'div' ); 
+        _body.id = 'body_' + ID; 
+        _body.innerHTML = newBody; 
+
+        var _elements = _body.getElementsByTagName( '*' ); 
+        for( var i = 0; i < _elements.length; i++ ) 
+                if ( _elements[ i ].attributes && _elements[ i ].attributes.getNamedItem( 'id' ) ) 
+                        _elements[ i ].attributes.removeNamedItem( 'id' ); 
+
+        div.appendChild( _body ); 
+
+        function mailto( link ) 
+        { 
+                var mail = link.href.substr( 7 ); 
+                link.onclick = function( ) 
+                { 
+                        new_message_to( mail ); 
+                        return false; 
+                }; 
+        } 
+        var links = div.getElementsByTagName( 'a' ); 
+        for ( var i = 0; i < links.length; i++ ){ 
+                try{ 
+                        if ( links.item( i ).href.indexOf( 'mailto:' ) === 0 ){                          
+                                mailto( links.item( i ) ); 
+                        } 
+                        else{ 
+                                if ( links.item( i ).href.indexOf( 'javascript:' ) !== 0 ) 
+                                        links.item( i ).setAttribute( 'target', '_blank' ); 
+                        } 
+                }catch(e){ 
+                } 
+        }       
         //////////////////////////////////////////////////////////////////////////////////////////////////////  
         //Make the thumbs of the message.
@@ -1942 +1978 @@
         table_message.appendChild(tbody_message);
         content.appendChild(table_message);
+        resizeWindow(); 
         var msg_number = document.createElement('INPUT');
         msg_number.id = "msg_number_" + ID;
@@ -2481 +2518 @@
         tr5.appendChild(td_body);
         tbody_message.appendChild(tr5);
-// BEGIN MAKE THE SCROLL HEIGHT
-    var defaultWidth = document.body.clientWidth - (is_ie ? 200 : 195);
-        var _bar = document.getElementById("toolbar");
-        var _offset = 0;
-        if(_bar.style.visibility != 'hidden') 
-                _offset = _bar.offsetHeight ? _bar.offsetHeight :  _bar.clientHeight;           
-        var _div = document.createElement("DIV");
+        var _div = document.createElement("DIV");
         _div.id = "div_message_scroll_"+ID;
-        _div.style.height = document.body.clientHeight - _offset - 105;
-        content.style.height = document.body.clientHeight - _offset - 80;
         _div.style.overflow = "auto";
-        _div.style.width = defaultWidth;
-        // END MAKE THE SCROLL HEIGHT
+        _div.style.width = "100%"; 
 
         // Hide the contac tips and re-position the pallete color.
@@ -2512 +2540 @@
         if(!expresso_offline)
                 draw_from_field(sel_from,tr1_1);
+        resizeWindow(); 
         return ID;
 }