SN/T: don't cut off the body to avoid broken bbcode

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index c4100e88e509b667a16db8274ac75a5905010770..fe5e7ad3a2497696b9ceae41a28d2e40f6f40207 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -2,7 +2,7 @@
 /**
  * Name: StatusNet Connector
  * Description: Relay public postings to a connected StatusNet account
- * Version: 1.0.4
+ * Version: 1.0.5
  * Author: Tobias Diekershoff <http://diekershoff.homeunix.net/friendika/profile/tobias>
  */
  
@@ -433,14 +433,14 @@ function statusnet_post_hook(&$a,&$b) {
                 // we can later send to StatusNet. This way we can "gain" some 
                 // information during shortening of potential links but do not 
                 // shorten all the links in a 200000 character long essay.
-                if (! $b['title']=='') {
-                    $tmp = $b['title'] . ' : '. $b['body'];
-                    $tmp = substr($tmp, 0, 4*$max_char);
-                } else {
-                    $tmp = substr($b['body'], 0, 3*$max_char);
-                }
+//                if (! $b['title']=='') {
+//                    $tmp = $b['title'] . ' : '. $b['body'];
+//                    $tmp = substr($tmp, 0, 4*$max_char);
+//                } else {
+//                    $tmp = substr($b['body'], 0, 3*$max_char);
+//                }
                 // if [url=bla][img]blub.png[/img][/url] get blub.png
-                $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
+                $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $b['body']);
                 // preserve links to images, videos and audios
                 $tmp = preg_replace( '/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism', '$3', $tmp);
                 $tmp = preg_replace( '/\[\\/?img(\\s+.*?\]|\])/i', '', $tmp);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 32b4980f55a2df4ebba7486150a29b1cc9729d5f..b6d1c4efac9f96b33a42e489ea92df098eea670f 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -2,7 +2,7 @@
 /**
  * Name: Twitter Connector
  * Description: Relay public postings to a connected Twitter account
- * Version: 1.0.3
+ * Version: 1.0.4
  * Author: Tobias Diekershoff <http://diekershoff.homeunix.net/friendika/profile/tobias>
  */
 
@@ -299,14 +299,14 @@ function twitter_post_hook(&$a,&$b) {
                 // we can later send to Twitter. This way we can "gain" some 
                 // information during shortening of potential links but do not 
                 // shorten all the links in a 200000 character long essay.
-                if (! $b['title']=='') {
-                    $tmp = $b['title'] . ' : '. $b['body'];
-                    $tmp = substr($tmp, 0, 4*$max_char);
-                } else {
-                    $tmp = substr($b['body'], 0, 3*$max_char);
-                }
+//                if (! $b['title']=='') {
+//                    $tmp = $b['title'] . ' : '. $b['body'];
+//                    $tmp = substr($tmp, 0, 4*$max_char);
+//                } else {
+//                    $tmp = substr($b['body'], 0, 3*$max_char);
+//                }
                 // if [url=bla][img]blub.png[/img][/url] get blub.png
-                $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
+                $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $b['body']);
                 // preserve links to images, videos and audios
                 $tmp = preg_replace( '/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism', '$3', $tmp);
                 $tmp = preg_replace( '/\[\\/?img(\\s+.*?\]|\])/i', '', $tmp);