bug #324 - tinymce used for mail even if editplain being used.

diff --git a/mod/message.php b/mod/message.php
index 4b494e906f5be8df0f0e8747d6b7d41d9997f678..91db5baef1514a8d0d7bc881db0a5dce43ed50df 100755 (executable)
--- a/mod/message.php
+++ b/mod/message.php
@@ -129,10 +129,16 @@ function message_content(&$a) {
                
                $o .= $header;
                
+               $plaintext = false;
+               if(intval(get_pconfig(local_user(),'system','plaintext')))
+                       $plaintext = true;
+
+
                $tpl = get_markup_template('msg-header.tpl');
 
                $a->page['htmlhead'] .= replace_macros($tpl, array(
                        '$baseurl' => $a->get_baseurl(),
+                       '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
                ));

diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index a74154c19c60c154fc2cdf4615da3f817244fb8d..b5c78345a318f4b570172db08edb3d82fa1f1237 100755 (executable)
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -2,55 +2,38 @@
 <script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
-tinyMCE.init({
-       theme : "advanced",
-       mode : "specific_textareas",
-       editor_selector: /(profile-jot-text|prvmail-text)/,
-       plugins : "bbcode,paste",
-       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-       theme_advanced_buttons2 : "",
-       theme_advanced_buttons3 : "",
-       theme_advanced_toolbar_location : "top",
-       theme_advanced_toolbar_align : "center",
-       theme_advanced_blockformats : "blockquote,code",
-       paste_text_sticky : true,
-       entity_encoding : "raw",
-       add_unload_trigger : false,
-       remove_linebreaks : false,
-       force_p_newlines : false,
-       force_br_newlines : true,
-       forced_root_block : '',
-       convert_urls: false,
-       content_css: "$baseurl/view/custom_tinymce.css",
-            //Character count
-       theme_advanced_path : false,
-       setup : function(ed) {
-               ed.onKeyUp.add(function(ed, e) {
-                       var txt = tinyMCE.activeEditor.getContent();
-                       var text = txt.length;
-                       if(txt.length <= 140) {
-                               $('#character-counter').removeClass('red');
-                               $('#character-counter').removeClass('orange');
-                               $('#character-counter').addClass('grey');
-                       }
-                       if((txt.length > 140) && (txt .length <= 420)) {
-                               $('#character-counter').removeClass('grey');
-                               $('#character-counter').removeClass('red');
-                               $('#character-counter').addClass('orange');
-                       }
-                       if(txt.length > 420) {
-                               $('#character-counter').removeClass('grey');
-                               $('#character-counter').removeClass('orange');
-                               $('#character-counter').addClass('red');
-                       }
-                       $('#character-counter').text(text);
-       });
+var plaintext = '$editselect';
 
-               ed.onInit.add(function(ed) {
-                       ed.pasteAsPlainText = true;
-               });
-       }
-});
+if(plaintext != 'none') {
+       tinyMCE.init({
+               theme : "advanced",
+               mode : "specific_textareas",
+               editor_selector: /(profile-jot-text|prvmail-text)/,
+               plugins : "bbcode,paste",
+               theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+               theme_advanced_buttons2 : "",
+               theme_advanced_buttons3 : "",
+               theme_advanced_toolbar_location : "top",
+               theme_advanced_toolbar_align : "center",
+               theme_advanced_blockformats : "blockquote,code",
+               paste_text_sticky : true,
+               entity_encoding : "raw",
+               add_unload_trigger : false,
+               remove_linebreaks : false,
+               force_p_newlines : false,
+               force_br_newlines : true,
+               forced_root_block : '',
+               convert_urls: false,
+               content_css: "$baseurl/view/custom_tinymce.css",
+                    //Character count
+               theme_advanced_path : false,
+               setup : function(ed) {
+                       ed.onInit.add(function(ed) {
+                               ed.pasteAsPlainText = true;
+                       });
+               }
+       });
+}
 
 </script>
 <script type="text/javascript" src="js/ajaxupload.js" ></script>