diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index fe5e7ad3a..469b3ab89 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -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']; + if (! $b['title']=='') { + $tmp = $b['title'] . ' : '. $b['body']; // $tmp = substr($tmp, 0, 4*$max_char); -// } else { -// $tmp = substr($b['body'], 0, 3*$max_char); -// } + } else { + $tmp = $b['body']; // 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', $b['body']); + $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp); // 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 b6d1c4efa..978cc039f 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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']; + if (! $b['title']=='') { + $tmp = $b['title'] . ' : '. $b['body']; // $tmp = substr($tmp, 0, 4*$max_char); -// } else { -// $tmp = substr($b['body'], 0, 3*$max_char); -// } + } else { + $tmp = $b['body']; // 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', $b['body']); + $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp); // 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);