Changeset 5083

Timestamp:

09/09/11 15:26:36 (13 years ago)

Author:

airton

Message:

Ticket #2086 - Troca do atual editor de emails do expresso

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• expressoMail1_2/inc/hook_settings.inc.php (modified) (6 diffs)
• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/abas.js (modified) (5 diffs)
• expressoMail1_2/js/draw_api.js (modified) (3 diffs)
• expressoMail1_2/js/main.js (modified) (22 diffs)
• expressoMail1_2/js/rich_text_editor.js (modified) (3 diffs)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
• expressoMail1_2/templates/default/index.tpl (modified) (1 diff)
• preferences/templates/default/index.tpl (modified) (1 diff)
• preferences/templates/default/preferences.tpl (modified) (2 diffs)

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

@@ -4235 +4235 @@
     }
 
-    function show_decript($params,$dec=0){
+    function show_decript($params){
         $source = $params['source'];
-        //error_log("source: $source\nversao: " . PHP_VERSION);
-
-        if ($dec == 0)
-        {
-            $source = str_replace(" ", "+", $source,$i);
-            if (version_compare(PHP_VERSION, '5.2.0', '>=')){
-                if(!$source = base64_decode($source,true))
-                    return "error ".$source."Espaï¿œos ".$i;
-
-            }
-            else {
-                if(!$source = base64_decode($source))
-                    return "error ".$source."Espaï¿œos ".$i;
-            }
+        //error_log("source: $source\nversao: " . PHP_VERSION, 3, '/tmp/teste.log'); 
+                        $source = str_replace(" ", "+", $source,$i); 
+                 
+                        if (version_compare(PHP_VERSION, '5.2.0', '>=')){ 
+                            if(!$source = base64_decode($source,true)) 
+                                return "error ".$source."Espaços ".$i; 
+                 
+                        } 
+                        else { 
+                            if(!$source = base64_decode($source)) 
+                                return "error ".$source."Espaços ".$i;
 
         }

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -75 +75 @@
         var edit = !!document.getElementById( "edit_signature" + i ).checked;
 
-        var value =  edit ? tinyMCE.get( "user_signature" + i ).getContent() :
+        var value =  edit ? CKEDITOR.instances["user_signature" + i ].getData() :
                             document.getElementById( "user_signature" + i ).value;
         
@@ -410 +410 @@
 
 create_select_box('What is the maximum size of embedded images?','image_size',$default,'When user send an email with image in body message, it changes the size');
+create_check_box('Use plain text editor with standard ?','plain_text_editor',''); 
 
 $default = array( 
@@ -449 +450 @@
         $vars = $GLOBALS['phpgw']->preferences->user['expressoMail'];
 
-        create_html_code("signature","<script src='../library/jquery/jquery.js' language='javascript'></script><script src='../library/tiny_mce/jquery.tinymce.js' language='javascript'></script><script src='../library/tiny_mce/tiny_mce.js' language='javascript'></script>
+create_html_code("signature","<script src='../library/jquery/jquery.js' language='javascript'></script> 
+                            <script src='../library/ckeditor/ckeditor.js' language='javascript'></script> 
+                            <script src='../library/ckeditor/adapters/jquery.js' language='javascript'></script>
         <input type='hidden' id='counter' value='0'>
         <input type='hidden' id='signatures' name='user[signatures]' value='". $vars['signatures']."'>
@@ -459 +462 @@
         <div id='_signature' name='signature' style='display: none;'>
         <div id='options_signature'>
-        <input id='edit_signature' type='checkbox' name='isEditor' onclick='changeType( \"\", this.id.replace( /[^0-9]*/gi, \"\" ) );' checked='checked'><label for='isEditor'>Editor de texto</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; titulo da assinatura&nbsp;<input type='text' id='title_signature'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='radio' id='default_signature' name='signature_default'><label>Usar como padrao</label><a href='#' onclick='javascript: return removeSignature( this );' id='remove_signature'> remover</a>
+        <input id='edit_signature' type='checkbox' name='isEditor' onclick='changeType( this, this.id.replace( /[^0-9]*/gi, \"\" ) );' checked='checked'><label for='isEditor'>Editor de texto</label>&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp; Titulo da assinatura&nbsp;<input type='text' id='title_signature'>&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;<input type='radio' id='default_signature' name='signature_default'><label>Usar como padrao</label> &nbsp;|&nbsp; <a href='#' onclick='javascript: return removeSignature( this );' id='remove_signature'> Remover</a> 
         </div><br/>
         <div id='text_signature'>
-        <textarea rows='5' cols='50' id='user_signature' class='editor'></textarea></div>
+        <textarea rows='10' cols='65' id='user_signature' class='editor'></textarea></div>
         </div>
 
@@ -473 +476 @@
         });
   
-        function changeType(value, target){
-
-            tinyMCE.execCommand( 'mceToggleEditor', false, 'user_signature' + target );
+        function changeType(obj, target){         
+                            if(obj.checked === true) 
+                               $('#user_signature' + target).ckeditor(  { toolbar:'signature'  }); 
+                            else 
+                                CKEDITOR.instances['user_signature' + target ].destroy(); 
     }
 
@@ -493 +498 @@
 
         if( !simple )
-            $( '#user_signature' + counter ).tinymce({
-                plugins : 'paste',
-                theme_advanced_toolbar_location : 'top',
-                theme_advanced_toolbar_align : 'center',
-                entities: '',
-                entity_encoding: 'raw',
-                theme: 'advanced',
-                add_form_submit_trigger : false
-            });
+                $('#user_signature' + counter).ckeditor(  { toolbar:'signature'  });
         else
             document.getElementById('edit_signature' + counter ).checked = '';

trunk/expressoMail1_2/index.php

@@ -16 +16 @@
         echo "<script type='text/javascript'>var template = '".$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set']."';</script>";
         echo "<script src='js/modal/modal.js'></script>";
+        //jquery and Editor 
+                echo "  <script src='../library/jquery/jquery.js' language='javascript'></script> 
+                        <script src='../library/ckeditor/ckeditor.js' language='javascript'></script> 
+                        <script src='../library/ckeditor/adapters/jquery.js' language='javascript'></script> 
+                        <script src='js/rich_text_editor.js' type='text/javascript'></script>"; 
+                //---------------------------// 
         echo '<link href="js/lert/lert.css" rel="stylesheet" type="text/css"/>';
         echo '<script src="js/lert/lert.js" type="text/javascript"></script>';

trunk/expressoMail1_2/js/abas.js

@@ -1 +1 @@
 var BordersArray = new Array();
 BordersArray[0] = new setBorderAttributes(0);
+var countBorders = 0; 
 
 function setBorderAttributes(ID)
@@ -56 +57 @@
                         if(Element("font_border_id_"+BordersArray[i].sequence))
                                 Element("font_border_id_"+BordersArray[i].sequence).className = 'font-menu';    
-                        var body = Element('body_'+BordersArray[i].sequence);
-                        if (body)
-                        {
-                                try
-                                {
-                                        if (Element('viewsource_rt_checkbox_' + ID).checked)
-                                        {  
-                                                connector.loadScript("rich_text_editor");
-                                                RichTextEditor.viewsource(false);
-                                        }
-                                }
-                                catch(e)
-                                {
-                                        //alert(e.message)
-                                }
-                        }
+
                 }
         }
@@ -84 +70 @@
                 c.style.display = '';
 
-        body = document.getElementById('body_'+ ID);
-        if (body){
-                try{
-                        if(ID){
-                                connector.loadScript("rich_text_editor");
-                                if(typeof(RichTextEditor) == 'undefined'){
-                                        setTimeout('alternate_border(\''+ID+'\');',500);
-                                        return false;
-                                }
-                                RichTextEditor.loadEditor(ID);
-                        }
-                        body.contentWindow.document.designMode="on";
-                }
-                catch(e){
-                        //alert(e.message);
-                }
-        }
 
         // hide the DropDrowContact, if necessary
@@ -131 +100 @@
                 document.getElementById('to_'+ID).focus();
         }
-
+        
+        RichTextEditor.setEditable(ID);
         return ID;
 }
@@ -397 +367 @@
         content.parentNode.removeChild(content);
         resizeWindow();
+        RichTextEditor.destroy( 'body_'+ID );
         return true;
 }

trunk/expressoMail1_2/js/draw_api.js

@@ -2381 +2381 @@
         var td = document.createElement("TD");
         td.colSpan = '2';
+        td.style.fontSize = '10pt'; 
+        td.style.fontFamily = 'Arial,Verdana'; 
+        td.style.verticalAlign = 'top'; 
+        td.style.height = '100%';
         div.appendChild(table_message_others_options);
         var imgTag = info_msg.body.match(/(<img[^>]*src[^>=]*=['"]?[^'">]*["']?[^>]*>)|(<[^>]*(style[^=>]*=['"][^>]*background(-image)?:[^:;>]*url\()[^>]*>)/gi);
@@ -3130 +3134 @@
         input_subject.style.width = "100%";
         input_subject.setAttribute("autocomplete","off");
+        input_subject.onkeydown = function(event){  
+                   var k;  
+                   if(window.event) k = window.event.keyCode;  
+                   else k = event.keyCode;  
+         
+                    if (k == 9)   
+                    {          
+                         RichTextEditor.focus(ID);  
+                         return false;  
+                        }   
+        } 
         td_subject.appendChild(input_subject);
         tr4.appendChild(td4);
@@ -3252 +3267 @@
                 text_plain.onclick = function ()
                 {
-                        RichTextEditor.plain( this.checked );
-                        document.getElementById( 'viewsource_rt_checkbox_' + ID ).parentNode.style.display = ( this.checked ) ? 'none' : '';
+                RichTextEditor.setPlain( this.checked, ID );
                 };
-                                //text_plain = text_plain.parentNode.appendChild(input_checkbox);
+                        
         }
 

trunk/expressoMail1_2/js/main.js

@@ -222 +222 @@
                         save_link.className = 'message_options';
                 };
-
-                var obj = document.getElementById('body_'+border_id).contentWindow.document;
-                if ( obj.addEventListener )
-                                obj.addEventListener('keypress', keypress_handler, false);
-                else if ( obj.attachEvent )
-                        obj.attachEvent('onkeypress', keypress_handler);
 
                 var subject_obj = document.getElementById('subject_'+border_id);
@@ -956 +950 @@
 
 function new_message(type, border_ID){
+                if(RichTextEditor.editorReady === false) return false; 
+                             
+            RichTextEditor.editorReady = false; 
+
+
                 if (Element('show_img_link_'+border_ID))
                 {
@@ -986 +985 @@
         if (new_border_ID == false)
         {
-                setTimeout('new_message(\''+type+'\',\''+border_ID+'\');',500);
+                RichTextEditor.editorReady = true; 
+            setTimeout('new_message(\''+type+'\',\''+border_ID+'\');',500);
                 return false;
         }
@@ -1052 +1052 @@
                 data.date_hour = Element('date_hour_' + border_ID).value;
         }
-        if(typeof(preferences.signature) == 'undefined')
-                preferences.signature = "";
-        var signature = preferences.type_signature == 'html' ? preferences.signature : preferences.signature.replace(/\n/g, "<br>");
+        var signature = RichTextEditor.getSignatureDefault();
         if(type!="new" && type!="edit")
                 data.is_local_message = (document.getElementById("is_local_"+border_ID).value=="1")?true:false;
         switch(type){
                 case "reply_without_history":
+                        RichTextEditor.replyController = true; //Seta o editor como modo reply
                         Element("to_" + new_border_ID).value = data.to;
                         title = "Re: " + data.subject;
                         Element("subject_" + new_border_ID).value = "Re: " + data.subject;                      
                         useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
-                        var body = Element("body_" + new_border_ID);
-                        body.contentWindow.document.open();
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1"){
-                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>");
-                        }
-                        else{
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
-                        }
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        //Focus
-                        if (is_ie)
-                                window.setTimeout('document.getElementById("body_'+new_border_ID+'").contentWindow.focus();', 300);
-                        else
-                                body.contentWindow.focus();
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+                        if (preferences.use_signature == "1"){  
+                                                RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature ,true) ;      
+                                        } 
                         msg_reply_from = document.createElement('input');
                         msg_reply_from.id = "msg_reply_from_" + new_border_ID;
@@ -1095 +1073 @@
                         break;
                 case "reply_with_history":
+                        RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         title = "Re: " + data.subject;
                         Element("subject_" + new_border_ID).value = "Re: " + data.subject;
@@ -1100 +1079 @@
                         useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
                         block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
-                        var body = Element("body_" + new_border_ID);
-                        body.contentWindow.document.open();
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1") {
-                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>" + block_quoted_body + "</body></html>");
-                        }
-                        else {
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+block_quoted_body+"</body></html>");
-                        }
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        //Focus
-                        if (is_ie)
-                                window.setTimeout('document.getElementById("body_'+new_border_ID+'").contentWindow.focus();', 300);
+                        if (preferences.use_signature == "1")  
+                                RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>' + block_quoted_body,true); 
                         else
-                                body.contentWindow.focus();
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+                                RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>'+ block_quoted_body,true);
                         msg_reply_from = document.createElement('input');
                         msg_reply_from.id = "msg_reply_from_" + new_border_ID;
@@ -1132 +1091 @@
                         break;
                 case "reply_to_all_without_history":
+                        RichTextEditor.replyController = true; //Seta o editor como modo reply
                         // delete user email from to_all array.
                         data.to_all = new Array();
@@ -1153 +1113 @@
                         }
                         useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
-                        var body = Element("body_" + new_border_ID);
-                        body.contentWindow.document.open();
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1") {
-                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>");
-                        }
-                        else {
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
-                        }
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        //Focus
-                        if (is_ie)
-                                window.setTimeout('document.getElementById("body_'+new_border_ID+'").contentWindow.focus();', 300);
-                        else
-                                body.contentWindow.focus();
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+                        if (preferences.use_signature == "1")  
+                                RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature,true); 
                         msg_reply_from = document.createElement('input');
                         msg_reply_from.id = "msg_reply_from_" + new_border_ID;
@@ -1185 +1123 @@
                         break;
                 case "reply_to_all_with_history":
+                        RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         // delete user email from to_all array.
                         data.to_all = new Array();
@@ -1209 +1148 @@
                         useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
                         block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
-                        var body = document.getElementById("body_" + new_border_ID);
-                        body.contentWindow.document.open();
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1") {
-                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>" + block_quoted_body + "</body></html>");
-                        }
-                        else {
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+block_quoted_body+"</body></html>");
-                        }
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        //Focus
-                        if (is_ie)
-                                window.setTimeout('document.getElementById("body_'+new_border_ID+'").contentWindow.focus();', 300);
-                        else
-                                body.contentWindow.focus();
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+                        if (preferences.use_signature == "1")  
+                                                                        RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ block_quoted_body,true); 
+                                        else                   
+                                            RichTextEditor.setInitData(new_border_ID,block_quoted_body,true);     
                         msg_reply_from = document.createElement('input');
                         msg_reply_from.id = "msg_reply_from_" + new_border_ID;
@@ -1299 +1218 @@
                                 }
                         }
-                        var body = Element("body_" + new_border_ID);
-                        body.contentWindow.document.open();
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1") {
-                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>" + make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc) + "</body></html>");
-                        }
-                        else {
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)+"</body></html>");
-                        }
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+if (preferences.use_signature == "1")   
+                                            RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 
+                                        else   
+                                            RichTextEditor.setInitData(new_border_ID,make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));   
                         Element("to_" + new_border_ID).focus();
                         break;
@@ -1339 +1243 @@
                                 Element('msg_number').value = '';
                         }
-                        var body = document.getElementById("body_" + new_border_ID);
-                        body.contentWindow.document.open();
+                        
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1") {
-                                body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>");
-                        }
-                        else {
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");
-                        }
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+                         if (preferences.use_signature == "1") 
+                                RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature);
                         Element("to_" + new_border_ID).focus();
                         break;
@@ -1418 +1306 @@
                                 }
                         }
-                        var body = Element("body_" + new_border_ID);
-                        body.contentWindow.document.open();
-                        body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>"+data.body+"</body></html>");
-                        body.contentWindow.document.close();
-                        body.contentWindow.document.designMode = "on";
-                        //Focus
-                        if (is_ie)
-                                window.setTimeout('document.getElementById("body_'+new_border_ID+'").contentWindow.focus();', 300);
-                        else
-                                body.contentWindow.focus();
-                        config_events( body.contentWindow.document, 'onkeyup', function( e )
-                        {
-                                if ( e.keyCode == 13 )
-                                {
-                                        var paragraphs = body.contentWindow.document.getElementsByTagName( 'p' );
-                                        for ( p = 0; p < paragraphs.length; p++ )
-                                                paragraphs.item( p ).style.margin = '0px';
-                                }
-                        });
+                        RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + data.body);
                         break;
                 default:
         }
 
-        // IM Module Enabled
-        if( window.parent.loadscript && loadscript.autoStatusIM )
-        {
-                config_events( body.contentWindow.document, "onkeypress", loadscript.autoStatusIM );
-        }
-
-        if ( ! expresso_offline )
-        {
-                if ( mobile_device )
-                {
-                        var text_plain = document.getElementById( 'textplain_rt_checkbox_' + new_border_ID );
-                        text_plain.click( );
-                        text_plain.parentNode.style.display = 'none';
-                }
-        }
-
-        if (preferences.auto_save_draft == 1)
-        {
-                openTab.autosave_timer[new_border_ID] = false;
-                var save_link = document.getElementById("save_message_options"+new_border_ID);
-
-                function auto_sav()
-                        {
-                                if (openTab.autosave_timer[new_border_ID])
-                                        clearTimeout(openTab.autosave_timer[new_border_ID]);
-
-                                openTab.autosave_timer[new_border_ID] = setTimeout("save_msg("+new_border_ID+")", autosave_time);
-        }
-                config_events(body.contentWindow.document,'keypress', auto_sav);
-        }
-
-        //BEGIN Tab event
-        if (preferences.use_shortcuts == '1')
-        {
-                if (is_ie)
-                {
-                        body.contentWindow.document.attachEvent('onkeydown', function(event) {if(event.keyCode==27){delete_border(new_border_ID,'false');}if(event.keyCode==9) {Element('to_'+new_border_ID).focus();Element('send_button_'+new_border_ID).focus();return false;}}, false);
-                }
-                else
-                {
-                        body.contentWindow.document.addEventListener('keypress', function(event) {if(event.keyCode==27){delete_border(new_border_ID,'false');}if(event.keyCode==9) {Element('send_button_'+new_border_ID).focus();event.preventDefault();}}, false);
-                }
-        }
-        // END Tab event
-
-        // Load default style for <PRE> tag, inside RichTextEditor.
-        RichTextEditor.loadStyle("pre","main.css");
-        RichTextEditor.Select( 'fontname' ); 
-        RichTextEditor.Select( 'fontsize' );
-
+        
         Element("border_id_" + new_border_ID).title = title;
         set_border_caption("border_id_" + new_border_ID, title);
 
-        if(!expresso_offline && preferences.use_SpellChecker != '0')
-            setupSpellChecker();
 
         return new_border_ID; //Preciso retornar o ID da nova mensagem.
@@ -1730 +1549 @@
         }
 
-        if ( document.getElementById('viewsource_rt_checkbox_' + ID).checked == true )
-                document.getElementById('viewsource_rt_checkbox_' + ID).click();
 
         var save_link = Element("save_message_options_"+ID);
@@ -1750 +1567 @@
         textArea.style.display='none';
         textArea.name = "body";
-        body = document.getElementById("body_"+ID);
-        textArea.value = ( ( mail_as_plain ) ? body.previousSibling.value : ( '<body>\r\n' + body.contentWindow.document.body.innerHTML + '\r\n</body>' ) );
+        textArea.value = RichTextEditor.getData('body_'+ID); 
         var input_folder = document.createElement("INPUT");
         input_folder.style.display='none';
@@ -1868 +1684 @@
         else
         {
+                var newImage = false;
                 openTab.imapUid[border_id] = data.msg_no;
                 openTab.imapBox[border_id] = data.folder_id;
@@ -1877 +1694 @@
 
                 // Replace the embedded images for new uids
-                var mainField = document.getElementById('body_'+border_id).contentWindow;
-                var bodyChildNodes =  mainField.document.body.childNodes;
+                var content_body  = RichTextEditor.getData('body_'+border_id);
 
                 if (is_ie)
@@ -1911 +1727 @@
                             //content_body = content_body.replace(/msg_part=-/g,'msg_part=');
                         }
-                        mainField.document.getElementsByTagName('body').item(0).innerHTML = content_body;
+                        
                     }
                 }
@@ -2001 +1817 @@
                         divFiles.appendChild(document.createElement("br"));
                     }
+                                        } 
+                                 
+                                if(RichTextEditor.newImageId !== false) 
+                                { 
+                                    var rex = new RegExp('<img id="'+RichTextEditor.newImageId+'" src="" [^\/>]*\/>', 'i'); 
+                                    var newImg = '<img src="./inc/get_archive.php?msgFolder=INBOX'+cyrus_delimiter+draftsfolder+'&msgNumber='+openTab.imapUid[border_id]+'&indexPart=0.'+(openTab.countFile[border_id])+'" />'; 
+                                    content_body = content_body.replace(rex,newImg); 
+                 
+                                    RichTextEditor.newImageID = false;                     
+                                    newImage = true; 
+                                } 
+                                 
+                                if(body_images != null || newImage === true) 
+                                {  
+                                     RichTextEditor.setData('body_'+border_id,content_body); 
                 }
 
@@ -2029 +1860 @@
                 withImage = false;
 
-        var rt_checkbox = Element('viewsource_rt_checkbox_' + border_id);
-        if (rt_checkbox == null)
-                return false;
-        if (rt_checkbox.checked == true)
-                rt_checkbox.click();
-
         var sendButton = Element("send_button_"+border_id);
         if (sendButton)
@@ -2062 +1887 @@
         textArea.style.display='none';
         textArea.name = "body";
-        body = document.getElementById("body_"+border_id);
-        if (! body)
-                return;
-        textArea.value = ( ( mail_as_plain ) ? body.previousSibling.value : ( '<body>\r\n' + body.contentWindow.document.body.innerHTML + '\r\n</body>' ) );
+        textArea.value = RichTextEditor.getData("body_"+border_id);
         var input_folder = document.createElement("INPUT");
         input_folder.style.display='none';
@@ -2138 +1960 @@
         textArea.style.display='none';
         textArea.name = "body";
-        body = document.getElementById("body_"+border_id);
-        textArea.value += '<body>\r\n';
-        textArea.value += body.contentWindow.document.body.innerHTML;
-        textArea.value += '\r\n</body>';
+        textArea.value = RichTextEditor.getData("body_"+border_id);
 
         var input_folder = document.createElement("INPUT");

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -1 +1 @@
 function cRichTextEditor(){
-        this.emwindow   = new Array;
-        this.editor = "body_1";
-        this.table = "";
-        this.id = "1";
-        this.buildEditor();
-        this.saveFlag = 0;
-        } 
-                 
-                // This code was written by Tyler Akins and has been placed in the 
-                // public domain.  It would be nice if you left this header intact. 
-                // Base64 code from Tyler Akins -- http://rumkin.com 
-                 
-                var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; 
-         
-                var ua = navigator.userAgent.toLowerCase(); 
-                if (ua.indexOf(" chrome/") >= 0 || ua.indexOf(" firefox/") >= 0 || ua.indexOf(' gecko/') >= 0) { 
-                    var StringMaker = function () { 
-                        this.str = ""; 
-                        this.length = 0; 
-                        this.append = function (s) { 
-                            this.str += s; 
-                            this.length += s.length; 
-                        } 
-                        this.prepend = function (s) { 
-                            this.str = s + this.str; 
-                            this.length += s.length; 
-                        } 
-                        this.toString = function () { 
-                            return this.str; 
-                        } 
-                    } 
-                } else { 
-                    var StringMaker = function () { 
-                                this.parts = []; 
-                        this.length = 0; 
-                        this.append = function (s) { 
-                            this.parts.push(s); 
-                            this.length += s.length; 
-                        } 
-                        this.prepend = function (s) { 
-                            this.parts.unshift(s); 
-                            this.length += s.length; 
-                        } 
-                        this.toString = function () { 
-                            return this.parts.join(''); 
-                        } 
-                    } 
-                } 
-                
-                function fromJSON( value ) 
-                { 
-                    return (new Function( "return " + decode64( value )))(); 
-                }
-
+    this.emwindow   = new Array;
+    this.editor = "body_1";
+    this.table = "";
+    this.id = "1";
+    this.saveFlag = 0;
+    this.signatures = false;
+    this.replyController = false; 
+    this.newImageId = false;
+    this.plain = new Array;
+    this.editorReady = true;
+}
+
+// This code was written by Tyler Akins and has been placed in the
+// public domain.  It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
+
+var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+var ua = navigator.userAgent.toLowerCase();
+if (ua.indexOf(" chrome/") >= 0 || ua.indexOf(" firefox/") >= 0 || ua.indexOf(' gecko/') >= 0) {
+    var StringMaker = function () {
+        this.str = "";
+        this.length = 0;
+        this.append = function (s) {
+            this.str += s;
+            this.length += s.length;
+        }
+        this.prepend = function (s) {
+            this.str = s + this.str;
+            this.length += s.length;
+        }
+        this.toString = function () {
+            return this.str;
+        }
+    }
+} else {
+    var StringMaker = function () {
+        this.parts = [];
+        this.length = 0;
+        this.append = function (s) {
+            this.parts.push(s);
+            this.length += s.length;
+        }
+        this.prepend = function (s) {
+            this.parts.unshift(s);
+            this.length += s.length;
+        }
+        this.toString = function () {
+            return this.parts.join('');
+        }
+    }
+}
+
+cRichTextEditor.prototype.fromJSON = function( value )
+{
+    return (new Function( "return " + this.decode64( value )))();
+}
+
+cRichTextEditor.prototype.decode64 = function(input) { 
+        if( typeof input === "undefined" ) return '';
+
+        var output = new StringMaker();
+        var chr1, chr2, chr3;
+        var enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+        while (i < input.length) {
+                enc1 = keyStr.indexOf(input.charAt(i++));
+                enc2 = keyStr.indexOf(input.charAt(i++));
+                enc3 = keyStr.indexOf(input.charAt(i++));
+                enc4 = keyStr.indexOf(input.charAt(i++));
+
+                chr1 = (enc1 << 2) | (enc2 >> 4);
+                chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+                chr3 = ((enc3 & 3) << 6) | enc4;
+
+                output.append(String.fromCharCode(chr1));
+
+                if (enc3 != 64) {
+                        output.append(String.fromCharCode(chr2));
+                }
+                if (enc4 != 64) {
+                        output.append(String.fromCharCode(chr3));
+                }
+        }
+
+        return output.toString();
+}
+
+
+cRichTextEditor.prototype.loadEditor = function(ID) {
+        
+        var parentDiv = document.getElementById("body_position_" + ID);
+        var pObj = "body_" + ID;
+        var textArea = document.createElement("TEXTAREA");
+        textArea.id = pObj;
+        textArea.style.height = '500';
+        textArea.style.width = '100%';
+        parentDiv.appendChild(textArea);
+        RichTextEditor.plain[ID] = false; 
+        
+        if(preferences.plain_text_editor == 1)
+          RichTextEditor.plain[ID] = true;  
+        else 
+                  RichTextEditor.active(pObj);
+}
+
+cRichTextEditor.prototype.getSignaturesOptions = function() {
+        
+        if(RichTextEditor.signatures !== false)
+            return RichTextEditor.signatures;
+                
+        var signatures = this.fromJSON( preferences.signatures );
+        var signature_types = this.fromJSON( preferences.signature_types );
+
+        for( key in signatures )
+            if( !signature_types[key] )
+                signatures[key] = signatures[key].replace( /\n/g, "<br>" );
+                 
+        RichTextEditor.signatures = signatures;
+        return signatures;
+
+}
+
+cRichTextEditor.prototype.getSignatureDefault = function() {
+         
+        if(RichTextEditor.signatures === false)
+            RichTextEditor.signatures = RichTextEditor.getSignaturesOptions(); 
+         
+        if(!RichTextEditor.signatures ||  
+           !RichTextEditor.signatures[preferences.signature_default || ""])
+        {
+          preferences.use_signature = "0"; //Desabilita o uso da assinatura
+          return '';
+        } 
+        
+        return unescape(RichTextEditor.signatures[preferences.signature_default]);
+
+}
+
+cRichTextEditor.prototype.createImage = function(){
+        if (preferences.auto_save_draft == 1)
+        {
+                        autosave_time = 200000;
+                        clearTimeout(openTab.autosave_timer[currentTab]);
+        }
+                
+        var form = document.getElementById("attachment_window");
+        
+        if (form == null){
+                form = document.createElement("DIV");
+                form.id  = "attachment_window";
+                form.style.visibility = "hidden";
+                form.style.position = "absolute";
+                form.style.background = "#eeeeee";
+                form.style.left = "0px";
+                form.style.top  = "0px"; 
+                form.style.width = "0px";
+                form.style.height = "0px";
+                document.body.appendChild(form);
+        }
+                var form_upload = Element('form_upload');
+                if (form_upload == null)
+                        form_upload = document.createElement("DIV");
+                form_upload.id = "form_upload";
+                form_upload.style.position = "absolute";
+                form_upload.style.top = "5px";
+                form_upload.style.left = "5px";
+                form_upload.name = get_lang("Upload File");
+                form_upload.style.width = "450px";
+                form_upload.style.height = "75px";
+                form_upload.innerHTML = get_lang('Select the desired image file')+':<br>'+
+                '<input name="image_at" maxlength="255" size="40" id="inputFile_img" type="file"><br>' +
+                '<input title="' + get_lang('Include') + '"  value="' + get_lang('Include') + '"' + 
+                'type="button" onclick="RichTextEditor.addInputFile();">&nbsp;' +
+                '<input title="' + get_lang('Close') + '"  value="' + get_lang('Close') + '"' +
+                ' type="button" onclick="win.close()">';
+                form.appendChild(form_upload);
                 
-                function decode64(input) { 
-                 
-                        if( typeof input === "undefined" ) return; 
-                 
-                        var output = new StringMaker(); 
-                        var chr1, chr2, chr3; 
-                        var enc1, enc2, enc3, enc4; 
-                                var i = 0; 
-                 
-                        // remove all characters that are not A-Z, a-z, 0-9, +, /, or = 
-                        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); 
-                 
-                        while (i < input.length) { 
-                                enc1 = keyStr.indexOf(input.charAt(i++)); 
-                                enc2 = keyStr.indexOf(input.charAt(i++)); 
-                                enc3 = keyStr.indexOf(input.charAt(i++)); 
-                                enc4 = keyStr.indexOf(input.charAt(i++)); 
-                 
-                                                chr1 = (enc1 << 2) | (enc2 >> 4); 
-                                chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); 
-                                chr3 = ((enc3 & 3) << 6) | enc4; 
-                 
-                                output.append(String.fromCharCode(chr1)); 
-                 
-                                if (enc3 != 64) { 
-                                        output.append(String.fromCharCode(chr2)); 
-                                } 
-                                if (enc4 != 64) { 
-                                        output.append(String.fromCharCode(chr3)); 
-                                } 
-                        } 
-                 
-                        return output.toString();
-        
-        
-}
-
-cRichTextEditor.prototype.loadEditor = function(ID) {
-        var _this = this;
-        _this.id = ID;
-        parentDiv = document.getElementById("body_position_"+this.id);
-        this.editor = "body_"+this.id;
-
-        if(this.table.parentNode)
-                this.table.parentNode.removeChild(this.table);
-        
-        if( parentDiv.firstChild )
-        {
-                if (!parentDiv.firstChild.hasChildNodes()) 
-                        parentDiv.insertBefore(this.table,parentDiv.firstChild);
-        }
-        else
-                parentDiv.appendChild(this.table);
-
-        var mail_as_plain = document.getElementById( 'textplain_rt_checkbox_' + this.id ); 
-        this.table.style.visibility = ( mail_as_plain && mail_as_plain.checked ) ? 'hidden' : 'visible'; 
-        if(!Element(this.editor))
-        {
-                this.createElementEditor(this.editor);
-        }
-        else
-        {
-                Element("viewsource_rt_checkbox_" + this.id).checked=false;
-        }
-
-        document.getElementById('fontname').selectedIndex = 1;
-        document.getElementById('fontsize').selectedIndex = 2;
-}
-
-cRichTextEditor.prototype.createElementEditor = function(pObj)
-{
-                iframe = document.createElement("IFRAME");
-                iframe.id = pObj;
-                iframe.name = pObj;
-                iframe.width = "99%";
-                iframe.height = 300;
-                iframe.setAttribute("unselectable","on");
-                iframe.setAttribute("tabIndex","1");
-
-                config_events( iframe, 'onload', function( )
-                {
-                        if ( iframe.contentWindow.document.body && iframe.contentWindow.document.body.contentEditable ) {
-
-                                if(mobile_device)
-                                        iframe.contentWindow.document.body.contentEditable = true;
-                                else
-                                        iframe.contentWindow.document.designMode = "on";
-                        } 
-                        
-                        if ( iframe.contentWindow.document.documentElement ){
-                                iframe.contentWindow.document.documentElement.style.background = '#fff';
-                                iframe.contentWindow.document.documentElement.style.fontSize = '16px';
-                        }
-                });
-
-
-                parentDiv.appendChild(iframe);
-
-                var source = document.createElement( 'input' );
-                source.id = 'viewsource_rt_checkbox_' + this.id;
-                source.type = "checkbox";
-                source.setAttribute("tabIndex","-1");
-                source.onclick = function( )
-                {
-                        RichTextEditor.viewsource(this.checked);
-                };
-                source = parentDiv.appendChild(
-                        document.createElement( 'span' ).appendChild( source ).parentNode
-                ).appendChild(
-                        document.createTextNode( get_lang( 'View HTML source' ) + '.' )
-                ).parentNode;
-                
-}
-
-cRichTextEditor.prototype.loadStyle = function(tag, css_file) {
-        var theRules = new Array();
-        var stylePRE = "";      
-        for(var s = 0; s < document.styleSheets.length; s++) {
-                if(document.styleSheets[s].href != null && 
-                                document.styleSheets[s].href.match("templates/"+template+"/"+css_file)){                        
-                        if (document.styleSheets[s].cssRules)
-                                theRules = document.styleSheets[s].cssRules;
-                        else if (document.styleSheets[s].rules)
-                                theRules = document.styleSheets[s].rules;
-                        break;
-                }
-        }
-        for(var s = 0;s < theRules.length; s++){
-                if(theRules[s].selectorText.toLowerCase() == tag.toLowerCase()){                        
-                        stylePRE = theRules[s].style;
-                        break;
-                }
-        }
-        var _body = Element(this.editor);
-        var i_doc = (document.all) ? _body.contentWindow.document: _body.contentDocument;
-        var hh1 = i_doc.getElementsByTagName('head')[0];
-        // For IE
-        if(typeof(hh1) == 'undefined'){
-                hh1 = i_doc.createElement("head");
-                i_doc.appendChild(hh1);
-        }
-        var ss1 = i_doc.createElement('style'); 
-        ss1.setAttribute("type", "text/css"); 
-        var def = tag.toLowerCase()+' {'+stylePRE.cssText+'}';
-        if (ss1.styleSheet) { 
-            ss1.styleSheet.cssText = def;
-        } else {
-            var tt1 = i_doc.createTextNode(def);
-            ss1.appendChild(tt1);
-        }
-        hh1.appendChild(ss1);
-}
-
-cRichTextEditor.prototype.viewsource = function(source) {
-        var html;
-        var mainField = document.getElementById(this.editor).contentWindow;
-        if (source) {
-                if (is_ie){
-                        connector.loadScript('html2xhtml');
-                        html = frames[this.editor].document.body;
-                        var xhtml = get_xhtml(html, 'en', 'iso-8859-1');
-                        frames[this.editor].document.body.innerText = xhtml;
-                        document.getElementById("table_richtext_toolbar").style.visibility="hidden";
-                }
-                else{
-                        html = document.createTextNode(document.getElementById(this.editor).contentWindow.document.body.innerHTML);
-                        document.getElementById(this.editor).contentWindow.document.body.innerHTML = "";
-                        html = document.getElementById(this.editor).contentWindow.document.importNode(html,false);
-                        document.getElementById(this.editor).contentWindow.document.body.appendChild(html);
-                        document.getElementById("table_richtext_toolbar").style.visibility="hidden";
-                }               
-        } else {
-                if (is_ie){
-                        var output = escape(frames[this.editor].document.body.innerText);
-                        output = output.replace("%3CP%3E%0D%0A%3CHR%3E", "%3CHR%3E");
-                        output = output.replace("%3CHR%3E%0D%0A%3C/P%3E", "%3CHR%3E");
-                        frames[this.editor].document.body.innerHTML = unescape(output);
-                        document.getElementById("table_richtext_toolbar").style.visibility="visible";  
-                }
-                else{
-                        html = document.getElementById(this.editor).contentWindow.document.body.ownerDocument.createRange();
-                        html.selectNodeContents(document.getElementById(this.editor).contentWindow.document.body);
-                        document.getElementById(this.editor).contentWindow.document.body.innerHTML = html.toString();
-                        document.getElementById("table_richtext_toolbar").style.visibility="visible";  
-                }
-        }
-}
-
-
-cRichTextEditor.prototype.plain = function(source) {
-        var html;
-        var editor = document.getElementById( this.editor );
-
-        if (source) {
-                if (is_ie){
-                        connector.loadScript('html2xhtml');
-                        html = frames[this.editor].document.body;
-                        var xhtml = get_xhtml(html, 'en', 'iso-8859-1');
-                        frames[this.editor].document.body.innerText = xhtml;
-                        document.getElementById("table_richtext_toolbar").style.visibility="hidden";
-                }
-                else{
-                        var mail_as_plain = document.getElementById( 'textplain_rt_checkbox_' + this.id );
-                                                html = document.createTextNode( editor.contentWindow.document.body.innerHTML );
-                        
-                                                html = html.nodeValue.replace( /<br\s*\/?>/mg, "\n" ).replace( /(<([^>]+)>)/ig, '' ).replace( /^[\n ]+|[\n ]+$/g, '' ); 
-                 
-                                if ( ! mobile_device && html != '' && ! ( mail_as_plain.checked = confirm( get_lang( 'The text format will be lost' ) + '.' ) ) )
-                                   return false; 
-                                                
-                                                this.table.style.visibility="hidden";
-                        editor.contentWindow.document.body.innerHTML = '';
-
-                        var textarea = document.createElement( 'textarea' );
-                        textarea.style.width = '99%';
-                        textarea.style.height = '300px';
-                        textarea.style.fontSize = '12pt';
-                        textarea.innerHTML = html;
-
-                        editor.style.width = '0px';
-                        editor.style.height = '0px';
-                        editor.style.visibility = 'hidden';
-
-                        editor.parentNode.insertBefore( textarea, editor );
-                        textarea.focus( );
-                }
-        } else {
-                if (is_ie){
-                        var output = escape(frames[this.editor].document.body.innerText);
-                        output = output.replace("%3CP%3E%0D%0A%3CHR%3E", "%3CHR%3E");
-                        output = output.replace("%3CHR%3E%0D%0A%3C/P%3E", "%3CHR%3E");
-                        frames[this.editor].document.body.innerHTML = unescape(output);
-                        document.getElementById("table_richtext_toolbar").style.visibility="visible";
-                }
-                else{
-                        editor.contentWindow.document.body.innerHTML = editor.previousSibling.value.replace( /\n/g, '<br/>' );
-                        editor.parentNode.removeChild( editor.previousSibling );
-
-                        editor.style.width = '99%';
-                        editor.style.height = '300px';
-                        editor.style.visibility = 'visible';
-                                                this.loadEditor( this.id );
-                                                
-                                                setTimeout( function( ) { editor.contentWindow.focus( ); }, 100 );
-                                        }
-                                }
-}                        
-
-
-cRichTextEditor.prototype.buildSelect = function( selectId, label, options, decode ) {  
-                 
-                    var selectBox = document.createElement("SELECT"); 
-                    selectBox.id = selectId; 
-                    selectBox.setAttribute("tabIndex","-1"); 
-                    selectBox.onchange = function () {RichTextEditor.Select( selectId );}; 
-                    selectBox.className = 'select_richtext'; 
-                    selectBox.length = 0; 
-                 
-                    selectBox.options[0] = new Option( get_lang(label), label ); 
-                 
-                    for( var key in options ) 
-                        selectBox.options[ selectBox.length ] = new Option( key, unescape( options[key] ) ); 
-                 
-                    return selectBox; 
-                }
-
-cRichTextEditor.prototype.buildEditor = function() {
-        this.table = document.createElement("TABLE");
-        this.table.id = "table_richtext_toolbar";
-        this.table.className = "richtext_toolbar";
-        this.table.width = "100%";
-        var tbody = document.createElement("TBODY");
-        var tr = document.createElement("TR");
-        var td = document.createElement("TD");
-        var div_button_rt = document.createElement("DIV");
-        
-        
-        selectBox = this.buildSelect( "fontname", 'Font', { 'Arial' : 'Arial', 
-                                                                            'Courier' : 'Courier', 
-                                                                            'Times New Roman' : 'Times' }); 
-                 
-                        div_button_rt.appendChild( selectBox ); 
-                 
-                        selectBox = this.buildSelect( "fontsize", 'Size', { '1 (8 pt)': '1', 
-                                                                            '2 (10 pt)': '2', 
-                                                                            '3 (12 pt)': '3', 
-                                                                            '4 (14 pt)': '4', 
-                                                                            '5 (18 pt)': '5', 
-                                                                            '6 (24 pt)': '6', 
-                                                                            '7 (36 pt)': '7' }); 
-                 
-                        div_button_rt.appendChild( selectBox );
-        
-        var buttons = ['bold', 'italic', 'underline', 'forecolor', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull',
-                                   'undo', 'redo', 'insertorderedlist', 'insertunorderedlist', 'outdent', 'indent', 'link', 'image', 'table', 'signature'];
-
-        for (var i=0; i<buttons.length; i++){
-                var img = document.createElement("IMG");
-                img.id = buttons[i];
-                img.className = 'imagebutton';
-                img.align = 'center';
-                img.src = './templates/'+template+'/images/'+buttons[i]+'.gif';
-                img.title = get_lang(buttons[i]);
-                img.style.cursor = 'pointer';
-
-                if (buttons[i] == 'forecolor')
-                        img.onclick = function () {RichTextEditor.show_pc('forecolor')};
-                else if (buttons[i] == 'link')
-                        img.onclick = function () {RichTextEditor.createLink();};
-                else if (buttons[i] == 'image')
-                        img.onclick = function () {RichTextEditor.createImage();};
-                else if (buttons[i] == 'table')
-                        img.onclick = function () {RichTextEditor.createTable();};
-                else
-                        img.onclick = function () {RichTextEditor.editorCommand(this.id,'');};
-                
-                img.onmouseover = function () {this.style.border="outset 2px";};
-                img.onmouseout = function () {this.style.border="solid 2px #C0C0C0";};
-                div_button_rt.appendChild(img);
-        }
-        if(preferences.use_SpellChecker != '0'){
-            selectBox=document.createElement("SELECT");
-            selectBox.id="selectLanguage";
-            selectBox.setAttribute("tabIndex","-1");
-            selectBox.setAttribute("unselectable","on");
-            selectBox.className = 'select_richtext';
-            selectBox.onchange = function () {RichTextEditor.Select("selectLanguage");};
-            var option1 = new Option(get_lang("Portuguese"),"pt_BR" );
-            option1.selected = true;
-            var option2 = new Option(get_lang("English"),'en');
-            var option3 = new Option(get_lang("Spanish"),'es');
-            if (is_ie){
-                    selectBox.add(option1);
-                    selectBox.add(option2);
-                    selectBox.add(option3);
-            }
-            else{
-                    selectBox.add(option1, null);
-                    selectBox.add(option2, null);
-                    selectBox.add(option3, null);
-            }
-            div_button_rt.appendChild(selectBox);
-
-            // spellCheck button
-            var img = document.createElement("IMG");
-            img.id = "spellCheck";
-            img.className = 'imagebutton';
-            img.align = 'center';
-            img.src = './templates/'+template+'/images/'+img.id+'.gif';
-            img.title = get_lang(img.id);
-            img.style.cursor = 'pointer';
-            img.onclick = function () {RichTextEditor.editorCommand(this.id,'');};
-            img.onmouseover = function () {this.style.border="outset 2px";};
-            img.onmouseout = function () {this.style.border="solid 2px #C0C0C0";};
-            div_button_rt.appendChild(img);
-        }
-
-        preferences.signatures = fromJSON( preferences.signatures ); 
-                        preferences.signature_types = fromJSON( preferences.signature_types ); 
-                 
-                        for( key in preferences.signatures ) 
-                            if( !preferences.signature_types[key] ) 
-                                                preferences.signatures[key] = preferences.signatures[key].replace( /\n/g, "<br>" );
-                 
-                selectBox = this.buildSelect( "inserthtml", 'Signature', preferences.signatures ); 
-                div_button_rt.appendChild( selectBox );
-
-        td.appendChild(div_button_rt);
-        tr.appendChild(td);
-        tbody.appendChild(tr);
-        this.table.appendChild(tbody);
-}
-
-cRichTextEditor.prototype.editorCommand = function(command, option) {
-        try {
-                var mainField = document.getElementById(this.editor).contentWindow;
-                mainField.focus();
-                var signature = preferences.signature; 
-            if( !preferences.signatures ) 
-                        signature = preferences.type_signature == 'html' ? preferences.signature : preferences.signature.replace(/\n/g, "<br>");
-                if (command == 'signature'){
-                        if (is_ie){
-                                var sel = document.selection;
-                                if (sel!=null)
-                                {
-                                    var rng = sel.createRange();
-                                    if (rng!=null)
-                                        rng.pasteHTML(signature);
-                                }
-                        }
-                        else{
-                                mainField.document.execCommand('inserthtml', false, signature);
-                        }
-                }
-                else if (command == 'CreateLink')
-                        mainField.document.execCommand('CreateLink', false, option);
-                else if (command == 'Table'){
-                        if (is_ie){
-                                var sel = document.selection;
-                                if (sel!=null)
-                                {
-                                    var rng = sel.createRange();
-                                    if (rng!=null)
-                                rng.pasteHTML(option);
-                                }
-                        }
-                        else 
-                                mainField.document.execCommand('inserthtml', false, option);
-                        }
-                else if (command == 'Image')
-                        mainField.document.execCommand('InsertImage', false, option);
-                else if (command == 'spellCheck' && preferences.use_SpellChecker != '0'){
-                        beginSpellCheck(); // configure
-                        spellCheck(); // run spellChecker
-                }
-                else
-                        mainField.document.execCommand(command, false, option);
-                //mainField.focus();
-    } catch (e) {/* alert(e);*/ }
-}
-
-cRichTextEditor.prototype.createLink = function(){
-        var mainField = document.getElementById(this.editor).contentWindow;
-        if (is_ie){
-                if ((mainField.document.selection.createRange().text) == ''){
-                                alert(get_lang('Chose the text you want transform in link before.')); 
+                this.showWindow(form);
+}
+cRichTextEditor.prototype.showWindow = function (div){
+
+                if(! div) {
                         return;
                 }
-        }
-        else{
-                if (mainField.window.getSelection() == ''){
-                                alert(get_lang('Chose the text you want transform in link before.')); 
-                        return;
+                
+                if(! this.emwindow[div.id]) {
+                        div.style.width  =  div.firstChild.style.width;
+                        div.style.height = div.firstChild.style.height;
+                        div.style.zIndex = "10000";                     
+                        var title = div.firstChild.name;
+                        var wHeight = div.offsetHeight + "px";
+                        var wWidth =  div.offsetWidth   + "px";
+                        div.style.width = div.offsetWidth - 5;
+
+                        win = new dJSWin({
+                                id: 'win_'+div.id,
+                                content_id: div.id,
+                                width: wWidth,
+                                height: wHeight,
+                                title_color: '#3978d6',
+                                bg_color: '#eee',
+                                title: title,
+                                title_text_color: 'white',
+                                button_x_img: '../phpgwapi/images/winclose.gif',
+                                border: true});
+                        
+                        this.emwindow[div.id] = win;
+                        win.draw();
                 }
-        }
-                var szURL = prompt(get_lang('Enter with link URL:'), 'http://'); 
-        if ((szURL != null) && (szURL != "")){
-                this.editorCommand("CreateLink", szURL);
-        }
-}
-
-// It include the image file in emails body
-// It saves and attach in drafts folder and open it
+                else
+                        win = this.emwindow[div.id];
+                win.open();     
+}
 cRichTextEditor.prototype.addInputFile = function()
 {
@@ -518 +238 @@
         }
         // End: Verify image extension.
-        var id = this.editor.substr(5); // border_id
+        var id =  currentTab;
         divFiles = document.getElementById("divFiles_"+id);
         var countDivFiles = divFiles.childNodes.length + 1;
@@ -535 +255 @@
         RichTextEditor.saveFlag = 0; // See if save function finished
         var save_link = document.getElementById("save_message_options_"+id);
+        save_link.onclick = function () {};
+        this.newImageId = new Date().getTime();
+        CKEDITOR.instances['body_'+id].insertHtml('<img id="'+this.newImageId+'" src=""/>');
         save_msg(id,true);
-        RichTextEditor.insertImgHtml(id); 
+}
+
+cRichTextEditor.prototype.execPosInstance = function(inst) {
+         
+        var editor =  CKEDITOR.instances[inst]; 
+        
+       
+        var id = inst.replace('body_','');
+        
+        editor.document.on('keydown', function(event)
+        {
+            away = false;
+            var save_link = Element("save_message_options_"+id);
+            save_link.onclick = function onclick() {openTab.toPreserve[id] = true;save_msg(id);} ;
+            save_link.className = 'message_options';
+        });
+        
+        //Adicionando atalhos de preferencias  
+//TODO: Não esta pegando o numero (keycode)
+//        if (preferences.use_shortcuts == '1')
+//        {
+//            CKEDITOR.instances[inst].document.on('keyup', function(event){
+//                    if(event.keyCode == 27){                         
+//                            delete_border(id,'false');}  //Tecla delete fechar aba          
+//            });
+//        }  
+       
+        // IM Module Enabled
+        if( window.parent.loadscript && loadscript.autoStatusIM )
+        {
+            CKEDITOR.instances[inst].document.on('keydown', function(event){
+                   loadscript.autoStatusIM;
+            });                 
+        }
+        
+        if (preferences.auto_save_draft == 1)
+        {
+            openTab.autosave_timer[id] = false;
+            var save_link = document.getElementById("save_message_options"+id);
+            CKEDITOR.instances[inst].document.on('keydown', function(event){
+               if (openTab.autosave_timer[id])
+                    clearTimeout(openTab.autosave_timer[id]);
+               openTab.autosave_timer[id] = setTimeout("save_msg("+id+")", autosave_time);
+                        
+            });  
+        }
+        /////////////////////////////////////////////////////////////////////////////////////
+        
+   
+       
+       RichTextEditor.editorReady = true;
+}
+cRichTextEditor.prototype.setPlain = function (active,id){
+      RichTextEditor.plain[id] = active;
+      if(active === true)
+      {
+            CKEDITOR.instances['body_'+id].destroy();
+            var height = document.body.scrollHeight;
+            height -= 330;
+            $('#body_'+id).height(height);
+            $('#body_'+id).keydown(function(event) {
+                away = false;
+                var save_link = Element("save_message_options_"+id);
+                save_link.onclick = function onclick() {openTab.toPreserve[id] = true;save_msg(id);} ;
+                save_link.className = 'message_options';
+            });
+
+      }   
+      else
+          RichTextEditor.active('body_'+id);
+}
+
+cRichTextEditor.prototype.getData = function (inst){  
+    var id = inst.replace('body_','');
+    
+    if(RichTextEditor.plain[id] === true)
+        return $('#'+inst).val();
+    else
+        return CKEDITOR.instances[inst].getData();
+}
+cRichTextEditor.prototype.setData = function (id,data){
+    
+     if(this.plain[id] === true)
+        $('#'+id).val(data);
+     else
+        CKEDITOR.instances[id].setData(data)
+}
+cRichTextEditor.prototype.setInitData = function (id,data,reply,recursion){
+    
+    if(recursion === undefined) recursion = 1;
+    else recursion++;    
+    
+     if(this.plain[id] === true)
+     {
+                 if($('#'+id) !== undefined)
+                        $('#'+id).val(data);
+         else
+                          setTimeout(function() {RichTextEditor.setInitData(id,data,reply,recursion); }, 500);
+         }  
+     else
+     {
+       if( RichTextEditor.editorReady === true && CKEDITOR.instances['body_'+id] !== undefined )    
+       {
+           var editor =   CKEDITOR.instances['body_'+id];   
+           editor.insertHtml('');
+           var selection = editor.getSelection();
+           if(selection !== undefined && selection !== null) var selectionRanges = selection.getRanges(); 
+
+           editor.insertHtml('<div><br type="_moz"></div>'+data);
+           
+          if(selection !== null) selection.selectRanges(selectionRanges); 
+          
+          editor.execCommand("autogrow"); //Atualiza tamanho do editor
+          
+          //Caso não for uma resposta votla o foco para o input to
+          if(reply === undefined)    
+                  setTimeout("$('#to_"+id+"').focus()",100);
+  
+       }
+       else if(recursion < 20)
+           setTimeout(function() {RichTextEditor.setInitData(id,data,reply,recursion); }, 500);
+     } 
+}
+
+cRichTextEditor.prototype.destroy = function(id)
+{
+        //Remove Instancia do editor
+        if( CKEDITOR.instances[id] !== undefined )   
+             CKEDITOR.remove(CKEDITOR.instances[id]);
+}
+cRichTextEditor.prototype.active = function(id)
+{
+   
+   //Remove Instancia do editor caso ela exista
+    if( CKEDITOR.instances[id] !== undefined )   
+         CKEDITOR.remove(CKEDITOR.instances[id]);
+     
+     $('#'+id).ckeditor( 
+          function() {RichTextEditor.execPosInstance(id)},
+          {
+              toolbar:'mail'      
+          }); 
+
+}
+cRichTextEditor.prototype.focus = function(id)
+{
+    if(RichTextEditor.plain[id]  === true)
+        $('#body_'+id).focus();
+    else
+        CKEDITOR.instances['body_'+id].focus(); 
+
+}
+//Função reseta o atributo contentEditable para resolver bug de cursor ao trocar abas 
+cRichTextEditor.prototype.setEditable = function(id) { 
+        if( CKEDITOR.instances['body_'+ id] === undefined ) return;    
+        var element = CKEDITOR.instances['body_'+ id].document.getBody(); 
+        element.removeAttribute('contentEditable'); 
+        element.setAttribute('contentEditable','true'); 
 } 
-                 
-                cRichTextEditor.prototype.insertImgHtml = function (id) 
-                { 
-                        if ( RichTextEditor.saveFlag == 0 ) 
-                        { 
-                            setTimeout( function(){ RichTextEditor.insertImgHtml(id); },1000 ); 
-                        } 
-        else
-                { 
-                    if ( RichTextEditor.saveFlag == 1 ) 
-                    { 
-                        var folderNameDraft = "INBOX" + cyrus_delimiter + draftsfolder; 
-                        this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=' + folderNameDraft + '&msg_num='+openTab.imapUid[id]+'&msg_part='+(openTab.countFile[id]+1));
-                                        openTab.toPreserve[id] = true;
-                                        save_msg(id,true);
-                                }
-}
-}
-
-
-cRichTextEditor.prototype.insertTableHtml = function (){
-        var id = this.editor.substr(5); // border_id
-        var     rows = document.getElementById('rows').value;
-        var     cols = document.getElementById('cols').value;
-        var border = document.getElementById('border').value;
-        var insertTable = '<table border="'+border+'px"><tbody>';
-        for (var i = 0; i < rows; i++){
-                insertTable += "<tr>";  
-                for (var j = 0; j < cols; j++)
-                        insertTable += "<td>&nbsp;</td>";       
-                insertTable += "</tr>";
-        }
-        insertTable += "</tbody></table>";
-        this.editorCommand('Table', insertTable);
-}
-
-cRichTextEditor.prototype.createTable = function(){
-        var form = document.getElementById("table_window");
-        if (form == null){
-                form = document.createElement("DIV");
-                form.id  = "table_window";
-                form.style.visibility = "hidden";
-                form.style.position = "absolute";
-                form.style.background = "#eeeeee";
-                form.style.left = "0px";
-                form.style.top  = "0px"; 
-                form.style.width = "0px";
-                form.style.height = "0px";
-                document.body.appendChild(form);
-        }
-                
-                var form_table = document.createElement("DIV");
-                form_table.id = "form_table";
-                form_table.style.position = "absolute";
-                form_table.style.top = "5px";
-                form_table.style.left = "5px";
-                form_table.style.width = "190px";
-                form_table.style.height = "90px";
-                form_table.name = get_lang("Insert Table");             
-                form_table.innerHTML = get_lang('Select the table size')+':<br><br><table cellspacing="0"><tbody><tr><td align="center">'+
-                                                                get_lang('Rows')+':</td><td></td><td align="center">'+get_lang('Cols')+':</td><td></td><td align="center">'+get_lang('Border')+':</td></tr>'+
-                                                                        '<tr><td align="right"><input type="text" readonly="true" id="rows" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/'+template+'/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'rows\');"></img><br><img src="templates/'+template+'/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'rows\');"></img></td>'+
-                                                                        '<td align="right"><input type="text" readonly="true" id="cols" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/'+template+'/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'cols\');"></img><br><img src="templates/'+template+'/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'cols\');"></img></td>'+
-                                                                        '<td align="right"><input type="text" readonly="true" id="border" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/'+template+'/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'border\');"></img><br><img src="templates/'+template+'/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'border\');"></img></td>'+
-                                                                        '</tr></tbody></table>'+
-                                                                        '&nbsp;&nbsp;&nbsp;<input title="'+get_lang('Close')+'"  value="' + get_lang('Close') + '" type="button" onclick="win.close()">&nbsp;'+
-                                                                        '<input title="' + get_lang('Include') + '"  value="' + get_lang('Include') + '" type="button" onclick="RichTextEditor.insertTableHtml();win.close();">';       
-                form.appendChild(form_table);
-                
-                this.showWindow(form);
-                }
-
-cRichTextEditor.prototype.incrementField = function(id_val){
-        var field_text = document.getElementById(id_val);
-        field_text.value = parseInt(field_text.value)+1;
-}
-
-cRichTextEditor.prototype.decrementField = function(id_val){
-        var field_text = document.getElementById(id_val);
-        if (parseInt(field_text.value) > 0)
-                field_text.value = parseInt(field_text.value)-1;
-}
-
-cRichTextEditor.prototype.createImage = function(){
-        if (preferences.auto_save_draft == 1){
-                        autosave_time = 200000;
-                        clearTimeout(openTab.autosave_timer[currentTab]);
-                }
-        var form = document.getElementById("attachment_window");
-        if (form == null){
-                form = document.createElement("DIV");
-                form.id  = "attachment_window";
-                form.style.visibility = "hidden";
-                form.style.position = "absolute";
-                form.style.background = "#eeeeee";
-                form.style.left = "0px";
-                form.style.top  = "0px"; 
-                form.style.width = "0px";
-                form.style.height = "0px";
-                document.body.appendChild(form);
-        }
-                var form_upload = Element('form_upload');
-                if (form_upload == null)
-                        form_upload = document.createElement("DIV");
-                form_upload.id = "form_upload";
-                form_upload.style.position = "absolute";
-                form_upload.style.top = "5px";
-                form_upload.style.left = "5px";
-                form_upload.name = get_lang("Upload File");
-                form_upload.style.width = "550px";
-                form_upload.style.height = "100px";
-                form_upload.innerHTML = get_lang('Select the desired image file')+':<br>'+
-                                                                '<input name="image_at" maxlength="255" size="40" id="inputFile_img" type="file"><br/><br/>' +
-                                                                '<input title="' + get_lang('Include') + '"  value="' + get_lang('Include') + '"' + 'type="button" onclick="RichTextEditor.addInputFile();">&nbsp;' +
-                                                                '<input title="' + get_lang('Close') + '"  value="' + get_lang('Close') + '"' +
-                                                                ' type="button" onclick="win.close()">';
-                form.appendChild(form_upload);
-                
-                this.showWindow(form);
-}
-cRichTextEditor.prototype.showWindow = function (div){
-
-                if(! div) {
-                        return;
-                }
-                
-                if(! this.emwindow[div.id]) {
-                        div.style.width  =  div.firstChild.style.width;
-                        div.style.height = div.firstChild.style.height;
-                        div.style.zIndex = "10000";                     
-                        var title = div.firstChild.name;
-                        var wHeight = div.offsetHeight + "px";
-                        var wWidth =  div.offsetWidth   + "px";
-                        div.style.width = div.offsetWidth - 5;
-
-                        win = new dJSWin({
-                                id: 'win_'+div.id,
-                                content_id: div.id,
-                                width: wWidth,
-                                height: wHeight,
-                                title_color: '#3978d6',
-                                bg_color: '#eee',
-                                title: title,
-                                title_text_color: 'white',
-                                button_x_img: '../phpgwapi/images/winclose.gif',
-                                border: true });
-                        
-                        this.emwindow[div.id] = win;
-                        win.draw();
-                }
-                else
-                        win = this.emwindow[div.id];
-                win.open();     
-}
-
-cRichTextEditor.prototype.Select = function(selectname)
-{
-        var mainField = Element(this.editor).contentWindow;
-        var cursel = document.getElementById(selectname).selectedIndex;
-
-        if (cursel != 0) {
-                var selected = document.getElementById(selectname).options[cursel].value;
-                mainField.document.execCommand(selectname, false, selected);
-                document.getElementById(selectname).selectedIndex = "Size"; //cursel;
-        }
-        mainField.focus();
-}
-
-cRichTextEditor.prototype.show_pc = function(command)
-{
-        connector.loadScript("color_palette");
-        ColorPalette.loadPalette(this.id);
-        if (ColorPalette.div.style.visibility != "visible")
-                ColorPalette.div.style.visibility="visible";
-        else
-                this.hide_pc();
-}
-
-cRichTextEditor.prototype.hide_pc = function()
-{
-        document.getElementById("palettecolor").style.visibility="hidden";
-}
-
-cRichTextEditor.prototype.getOffsetTop = function(elm) {
-  var mOffsetTop = elm.offsetTop;1
-  var mOffsetParent = elm.offsetParent;
-  while(mOffsetParent){
-    mOffsetTop += mOffsetParent.offsetTop;
-    mOffsetParent = mOffsetParent.offsetParent;
-  }
-  return mOffsetTop;
-}
-
-cRichTextEditor.prototype.getOffsetLeft = function(elm) {
-  var mOffsetLeft = elm.offsetLeft;
-  var mOffsetParent = elm.offsetParent;
-  while(mOffsetParent){
-    mOffsetLeft += mOffsetParent.offsetLeft;
-    mOffsetParent = mOffsetParent.offsetParent;
-  }
-  return mOffsetLeft;
-}
-
 //Build the Object
 RichTextEditor = new cRichTextEditor();

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -685 +685 @@
 Quick Search Contacts   expressoMail1_2 pt-br   Busca rápida de contatos 
 All Catalogs    expressoMail1_2 pt-br   Todos catálogos 
+Use plain text editor with standard ?   expressoMail1_2 pt-br   Usar editor de texto simples como padrão ?
 

trunk/expressoMail1_2/templates/default/index.tpl

@@ -132 +132 @@
 </div>
 <link href="../library/jquery/css/redmond/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css">
-                <script src='../library/jquery/jquery.js' language='javascript'></script> 
                 <script type="text/javascript" src="../library/jquery/jquery-ui.min.js"></script> 
                 <link href="templates/default/quick_search.css" rel="stylesheet" type="text/css"> 

trunk/preferences/templates/default/index.tpl

@@ -1 +1 @@
 <!-- BEGIN list -->
-<table border="0" width="75%" cellspacing="0" cellpadding="0">
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
  <tr>
   <td align="left">{tabs}</td>

trunk/preferences/templates/default/preferences.tpl

@@ -2 +2 @@
 <!-- BEGIN form -->
 <form method="POST" action="{action_url}" {validateForm}>
-<table width="75%" cellpadding=0 cellspacing=0  class="prefTable"> 
+<table width="100%" cellpadding=0 cellspacing=0  class="prefTable"> 
 <tr><td colspan="3">{tabs}</td></tr>  
   <!-- BEGIN list -->
@@ -30 +30 @@
 <!-- BEGIN row -->
  <tr id="{row_id}" bgcolor="{tr_color}" {row_visibility}>
-  <td>{row_name}</td>
-  <td>{row_value}</td>
+  <td style="width:35%">{row_name}</td> 
+  <td style="width:65%">{row_value}</td> 
  </tr>
 <!-- END row -->