more fixes for textmode

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 2df9de4763c77afe1bc55932b87284c8343f995a..e0b378f685448a2ac95142bf25649e733e267319 100755 (executable)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -12,6 +12,13 @@ function parse_url_content(&$a) {
        $text = null;
        $str_tags = '';
 
+       $textmode = false;
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $textmode = true;
+
+       if($textmode)
+       $br = (($textmode) ? "\n" : '<br /?');
+
        if(x($_GET,'binurl'))
                $url = trim(hex2bin($_GET['binurl']));
        else
@@ -27,14 +34,17 @@ function parse_url_content(&$a) {
                $arr_tags = str_getcsv($_GET['tags']);
                if(count($arr_tags)) {
                        array_walk($arr_tags,'arr_add_hashes');
-                       $str_tags = '<br />' . implode(' ',$arr_tags) . '<br />';               
+                       $str_tags = $br . implode(' ',$arr_tags) . $br;
                }
        }
 
        logger('parse_url: ' . $url);
 
 
-       $template = "<br /><a class=\"bookmark\" href=\"%s\" >%s</a>%s<br />";
+       if($textmode)
+               $template = $br . '[bookmark=%s]%s[/bookmark]%s' . $br;
+       else
+               $template = "<br /><a class=\"bookmark\" href=\"%s\" >%s</a>%s<br />";
 
 
        $arr = array('url' => $url, 'text' => '');
@@ -49,7 +59,11 @@ function parse_url_content(&$a) {
 
        if($url && $title && $text) {
 
-               $text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
+               if($textmode)
+                       $text = $br . $br . '[quote]' . $text . '[/quote]' . $br;
+               else
+                       $text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
+
                $title = str_replace(array("\r","\n"),array('',''),$title);
 
                $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags;
@@ -208,10 +222,17 @@ function parse_url_content(&$a) {
                                                                $ph->scaleImage(300);
                                                                $new_width = $ph->getWidth();
                                                                $new_height = $ph->getHeight();
-                                                               $image = '<br /><br /><img height="' . $new_height . '" width="' . $new_width . '" src="' .$image . '" alt="photo" />';
+                                                               if($textmode)
+                                                                       $image = $br . $br . '[img=' . $new_width . 'x' . $new_height . ']' . $image . '[/img]';
+                                                               else
+                                                                       $image = '<br /><br /><img height="' . $new_height . '" width="' . $new_width . '" src="' .$image . '" alt="photo" />';
+                                                       }
+                                                       else {
+                                                               if($textmode) 
+                                                                       $image = $br . $br . '[img]' . $image . '[/img]';
+                                                               else
+                                                                       $image = '<br /><br /><img src="' . $image . '" alt="photo" />';
                                                        }
-                                                       else
-                                                               $image = '<br /><br /><img src="' . $image . '" alt="photo" />';
                                                }
                                                else
                                                        $image = '';
@@ -223,11 +244,14 @@ function parse_url_content(&$a) {
        }
 
        if(strlen($text)) {
-               $text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
+               if($textmode)
+                       $text = $br .$br . '[quote]' . $text . '[/quote]' . $br ;
+               else
+                       $text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
        }
 
        if($image) {
-               $text = $image . '<br />' . $text;
+               $text = $image . $br . $text;
        }
        $title = str_replace(array("\r","\n"),array('',''),$title);
 

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index b34f2cf6b09e9339828a205fd60e2807e9cfb668..278c2135476648cc2723ac64f7420877cc45fb24 100755 (executable)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -100,7 +100,11 @@ function wall_upload_post(&$a) {
        }
 
        $basename = basename($filename);
-       echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg\" alt=\"$basename\" /></a><br /><br />";
+
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/img][/url]\n\n";
+       else
+               echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg\" alt=\"$basename\" /></a><br /><br />";
 
        killme();
        // NOTREACHED

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 79db0ec5aea614211f4dd6c368962a112c7e28fd..8dccf71ed09ed3bc11478983b70aecbc228ee86e 100755 (executable)
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -9,6 +9,33 @@ function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
                $("#jot-title-desc").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'
+            });
+                                   $("#profile-jot-submit-wrapper").show();
+                                                               {{ if $newpost }}
+                                   $("#profile-upload-wrapper").show();
+                                       $("#profile-attach-wrapper").show();
+                                   $("#profile-link-wrapper").show();
+                                       $("#profile-video-wrapper").show();
+                                   $("#profile-audio-wrapper").show();
+                                       $("#profile-location-wrapper").show();
+                                   $("#profile-nolocation-wrapper").show();
+                                       $("#profile-title-wrapper").show();
+                                       $("#profile-jot-plugin-wrapper").show();
+                                       $("#jot-preview-link").show();
+                                                               {{ endif }}   
+
+
+            if (typeof cb!="undefined") cb();
+            return;
+        }
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -132,7 +159,7 @@ function initEditor(cb) {
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -143,7 +170,7 @@ function initEditor(cb) {
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -190,7 +217,7 @@ function initEditor(cb) {
                        reply = bin2hex(reply);
                        $('#profile-rotator').show();
                        $.get('parse_url?binurl=' + reply, function(data) {
-                               tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                               addeditortext(data);
                                $('#profile-rotator').hide();
                        });
                }
@@ -199,21 +226,21 @@ function initEditor(cb) {
        function jotGetVideo() {
                reply = prompt("$utubeurl");
                if(reply && reply.length) {
-                       tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
+                       addeditortext('[youtube]' + reply + '[/youtube]');
                }
        }
 
        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]');
                }
        }
 
@@ -237,7 +264,7 @@ function initEditor(cb) {
                $.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);
                                });
@@ -260,7 +287,7 @@ function initEditor(cb) {
                        $.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();
                                });
                        });
@@ -272,6 +299,15 @@ function initEditor(cb) {
                $('#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>

diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 0d9a824f750b1c0078cb9180a95b87076bb962b7..b44ea78fddafb53a105cb5fe07192f4d7e9f5928 100755 (executable)
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -4,10 +4,38 @@
 
 var editor=false;
 var textlen = 0;
+var plaintext = '$editselect';
 
 function initEditor(cb) {
     if (editor==false) {
         $("#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'
+            });
+                                   $("#profile-jot-submit-wrapper").show();
+                                                               {{ if $newpost }}
+                                   $("#profile-upload-wrapper").show();
+                                       $("#profile-attach-wrapper").show();
+                                   $("#profile-link-wrapper").show();
+                                       $("#profile-video-wrapper").show();
+                                   $("#profile-audio-wrapper").show();
+                                       $("#profile-location-wrapper").show();
+                                   $("#profile-nolocation-wrapper").show();
+                                       $("#profile-title-wrapper").show();
+                                       $("#profile-jot-plugin-wrapper").show();
+                                       $("#jot-preview-link").show();
+                                                               {{ endif }}   
+
+
+            if (typeof cb!="undefined") cb();
+            return;
+        }
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -132,7 +160,7 @@ function initEditor(cb) {
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -143,7 +171,7 @@ function initEditor(cb) {
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -190,7 +218,7 @@ function initEditor(cb) {
                        reply = bin2hex(reply);
                        $('#profile-rotator').show();
                        $.get('parse_url?binurl=' + reply, function(data) {
-                               tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                               addeditortext(data);
                                $('#profile-rotator').hide();
                        });
                }
@@ -199,14 +227,14 @@ function initEditor(cb) {
        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]');
                }
        }
 
@@ -230,7 +258,7 @@ function initEditor(cb) {
                $.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);
                                });
@@ -253,7 +281,7 @@ function initEditor(cb) {
                        $.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();
                                });
                        });
@@ -282,6 +310,16 @@ function initEditor(cb) {
                $('#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>