basic support for plaintext editor configuration (disable tinymce), currently only...

diff --git a/include/conversation.php b/include/conversation.php
index 20c7b2a511bc12256f07132af40f49e6ff4b37f9..6defefc731ee111be17ccf0aafe1465255992934 100755 (executable)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -838,98 +838,102 @@ function status_editor($a,$x, $notes_cid = 0) {
                
        $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
-               $tpl = get_markup_template('jot-header.tpl');
-       
-               $a->page['htmlhead'] .= replace_macros($tpl, array(
-                       '$newpost' => 'true',
-                       '$baseurl' => $a->get_baseurl(),
-                       '$geotag' => $geotag,
-                       '$nickname' => $x['nickname'],
-                       '$ispublic' => t('Visible to <strong>everybody</strong>'),
-                       '$linkurl' => t('Please enter a link URL:'),
-                       '$vidurl' => t("Please enter a video link/URL:"),
-                       '$audurl' => t("Please enter an audio link/URL:"),
-                       '$term' => t('Tag term:'),
-                       '$whereareu' => t('Where are you right now?'),
-                       '$title' => t('Enter a title for this item') 
-               ));
-
-
-               $tpl = get_markup_template("jot.tpl");
-               
-               $jotplugins = '';
-               $jotnets = '';
+       $plaintext = false;
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $plaintext = true;
 
-               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       $tpl = get_markup_template('jot-header.tpl');
+       
+       $a->page['htmlhead'] .= replace_macros($tpl, array(
+               '$newpost' => 'true',
+               '$baseurl' => $a->get_baseurl(),
+               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+               '$geotag' => $geotag,
+               '$nickname' => $x['nickname'],
+               '$ispublic' => t('Visible to <strong>everybody</strong>'),
+               '$linkurl' => t('Please enter a link URL:'),
+               '$vidurl' => t("Please enter a video link/URL:"),
+               '$audurl' => t("Please enter an audio link/URL:"),
+               '$term' => t('Tag term:'),
+               '$whereareu' => t('Where are you right now?'),
+               '$title' => t('Enter a title for this item') 
+       ));
 
-               $mail_enabled = false;
-               $pubmail_enabled = false;
 
-               if(($x['is_owner']) && (! $mail_disabled)) {
-                       $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
-                               intval(local_user())
-                       );
-                       if(count($r)) {
-                               $mail_enabled = true;
-                               if(intval($r[0]['pubmail']))
-                                       $pubmail_enabled = true;
-                       }
+       $tpl = get_markup_template("jot.tpl");
+               
+       $jotplugins = '';
+       $jotnets = '';
+
+       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+       $mail_enabled = false;
+       $pubmail_enabled = false;
+
+       if(($x['is_owner']) && (! $mail_disabled)) {
+               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+                       intval(local_user())
+               );
+               if(count($r)) {
+                       $mail_enabled = true;
+                       if(intval($r[0]['pubmail']))
+                               $pubmail_enabled = true;
                }
+       }
 
-               if($mail_enabled) {
-              $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
-               . t("Post to Email") . '</div>';
-               }
+       if($mail_enabled) {
+               $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
+       }
 
-               call_hooks('jot_tool', $jotplugins);
-               call_hooks('jot_networks', $jotnets);
-
-               if($notes_cid)
-                       $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
-
-               $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));        
-
-               $o .= replace_macros($tpl,array(
-                       '$return_path' => $a->cmd,
-                       '$action' => 'item',
-                       '$share' => (($x['button']) ? $x['button'] : t('Share')),
-                       '$upload' => t('Upload photo'),
-                       '$shortupload' => t('upload photo'),
-                       '$attach' => t('Attach file'),
-                       '$shortattach' => t('attach file'),
-                       '$weblink' => t('Insert web link'),
-                       '$shortweblink' => t('web link'),
-                       '$video' => t('Insert video link'),
-                       '$shortvideo' => t('video link'),
-                       '$audio' => t('Insert audio link'),
-                       '$shortaudio' => t('audio link'),
-                       '$setloc' => t('Set your location'),
-                       '$shortsetloc' => t('set location'),
-                       '$noloc' => t('Clear browser location'),
-                       '$shortnoloc' => t('clear location'),
-                       '$title' => "",
-                       '$placeholdertitle' => t('Set title'),
-                       '$wait' => t('Please wait'),
-                       '$permset' => t('Permission settings'),
-                       '$shortpermset' => t('permissions'),
-                       '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
-                       '$content' => '',
-                       '$post_id' => '',
-                       '$baseurl' => $a->get_baseurl(),
-                       '$defloc' => $x['default_location'],
-                       '$visitor' => $x['visitor'],
-                       '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
-                       '$emailcc' => t('CC: email addresses'),
-                       '$public' => t('Public post'),
-                       '$jotnets' => $jotnets,
-                       '$emtitle' => t('Example: bob@example.com, mary@example.com'),
-                       '$lockstate' => $x['lockstate'],
-                       '$acl' => $x['acl'],
-                       '$bang' => $x['bang'],
-                       '$profile_uid' => $x['profile_uid'],
-                       '$preview' => t('Preview'),
-               ));
+       call_hooks('jot_tool', $jotplugins);
+       call_hooks('jot_networks', $jotnets);
+
+       if($notes_cid)
+               $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
+
+       $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));        
+
+       $o .= replace_macros($tpl,array(
+               '$return_path' => $a->cmd,
+               '$action' => 'item',
+               '$share' => (($x['button']) ? $x['button'] : t('Share')),
+               '$upload' => t('Upload photo'),
+               '$shortupload' => t('upload photo'),
+               '$attach' => t('Attach file'),
+               '$shortattach' => t('attach file'),
+               '$weblink' => t('Insert web link'),
+               '$shortweblink' => t('web link'),
+               '$video' => t('Insert video link'),
+               '$shortvideo' => t('video link'),
+               '$audio' => t('Insert audio link'),
+               '$shortaudio' => t('audio link'),
+               '$setloc' => t('Set your location'),
+               '$shortsetloc' => t('set location'),
+               '$noloc' => t('Clear browser location'),
+               '$shortnoloc' => t('clear location'),
+               '$title' => "",
+               '$placeholdertitle' => t('Set title'),
+               '$wait' => t('Please wait'),
+               '$permset' => t('Permission settings'),
+               '$shortpermset' => t('permissions'),
+               '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
+               '$content' => '',
+               '$post_id' => '',
+               '$baseurl' => $a->get_baseurl(),
+               '$defloc' => $x['default_location'],
+               '$visitor' => $x['visitor'],
+               '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
+               '$emailcc' => t('CC: email addresses'),
+               '$public' => t('Public post'),
+               '$jotnets' => $jotnets,
+               '$emtitle' => t('Example: bob@example.com, mary@example.com'),
+               '$lockstate' => $x['lockstate'],
+               '$acl' => $x['acl'],
+               '$bang' => $x['bang'],
+               '$profile_uid' => $x['profile_uid'],
+               '$preview' => t('Preview'),
+       ));
 
        return $o;
 }

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index d998e977a40ab3852d60cbe26c371ea6bd3efae5..22b4349166f1129bb939b1a36e8df4e24006ba2d 100755 (executable)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -3,14 +3,27 @@
 
 var editor=false;
 var textlen = 0;
+var plaintext = '$editselect';
 
 function initEditor(cb){
        if (editor==false){
-               $("#profile-jot-text-loading").show();  
+               $("#profile-jot-text-loading").show();
+               if(plaintext == 'none') {
+                       $("#profile-jot-text-loading").hide();
+                       $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+                       $(".jothidden").show();
+                       editor = true;
+                       $("a#jot-perms-icon").fancybox({
+                               'transitionIn' : 'elastic',
+                               'transitionOut' : 'elastic'
+                       }); 
+                       if (typeof cb!="undefined") cb();
+                       return;
+               }       
                tinyMCE.init({
                        theme : "advanced",
                        mode : "specific_textareas",
-                       editor_selector: /(profile-jot-text|prvmail-text)/,
+                       editor_selector: $editselect,
                        auto_focus: "profile-jot-text",
                        plugins : "bbcode,paste,autoresize",
                        theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
@@ -123,7 +136,7 @@ function enableOnUser(){
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -134,7 +147,7 @@ function enableOnUser(){
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -167,7 +180,7 @@ function enableOnUser(){
                        reply = bin2hex(reply);
                        $('#profile-rotator').show();
                        $.get('parse_url?binurl=' + reply, function(data) {
-                               tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                               addeditortext(data);
                                $('#profile-rotator').hide();
                        });
                }
@@ -176,14 +189,14 @@ function enableOnUser(){
        function jotVideoURL() {
                reply = prompt("$vidurl");
                if(reply && reply.length) {
-                       tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+                       addeditortext('[video]' + reply + '[/video]');
                }
        }
 
        function jotAudioURL() {
                reply = prompt("$audurl");
                if(reply && reply.length) {
-                       tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+                       addeditortext('[audio]' + reply + '[/audio]');
                }
        }
 
@@ -200,7 +213,7 @@ function enableOnUser(){
                $.get('share/' + id, function(data) {
                        if (!editor) $("#profile-jot-text").val("");
                        initEditor(function(){
-                               tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                               addeditortext(data);
                                $('#like-rotator-' + id).hide();
                                $(window).scrollTop(0);
                        });
@@ -224,7 +237,7 @@ function enableOnUser(){
                        $.get('parse_url?binurl=' + reply, function(data) {
                                if (!editor) $("#profile-jot-text").val("");
                                initEditor(function(){
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                                       addeditortext(data);
                                        $('#profile-rotator').hide();
                                });
                        });
@@ -253,6 +266,15 @@ function enableOnUser(){
                $('#profile-nolocation-wrapper').hide();
        }
 
+       function addeditortext(data) {
+               if(plaintext == 'none') {
+                       var currentText = $("#profile-jot-text").val();
+                       $("#profile-jot-text").val(currentText + data);
+               }
+               else
+                       tinyMCE.execCommand('mceInsertRawHTML',false,data);
+       }       
+
        $geotag
 
 </script>