remove "smilie" expansion for Diaspora logo

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 6f0ab3d28f04be900c913c4f5c2c953024d733fd..8487f845a62848a75750632f14b773047096dbde 100755 (executable)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -14,8 +14,8 @@ require_once('include/html2bbcode.php');
 function diaspora2bb($s) {
 
        // for testing purposes: Collect raw markdown articles
-       $file = tempnam("/tmp/", "markdown");
-       file_put_contents($file, $s);
+       // $file = tempnam("/tmp/friendica/", "markdown");
+       // file_put_contents($file, $s);
 
        $s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
 
@@ -24,6 +24,9 @@ function diaspora2bb($s) {
        // Simply remove cr.
        $s = str_replace("\r","",$s);
 
+       // <br/> is invalid. Replace it with the valid expression
+       $s = str_replace("<br/>","<br />",$s);
+
        $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
 
        // Escaping the hash tags - doesn't always seem to work
@@ -40,52 +43,24 @@ function diaspora2bb($s) {
        $s = html2bbcode($s);
 //     $s = str_replace('&#42;','*',$s);
 
+       // Convert everything that looks like a link to a link
+       $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
 
+       //$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$s);
        $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s);
        $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s);
        $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s);
        $s = preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]',$s);
-       $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url]$2$3$4[/url]',$s);
        // remove duplicate adjacent code tags
        $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
 
        // Don't show link to full picture (until it is fixed)
-       $s = scale_diaspora_images($s, false);
+       $s = scale_external_images($s, false);
 
        return $s;
 }
 
 
-function scale_diaspora_images($s,$include_link = true) {
-
-       $matches = null;
-       $c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
-       if($c) {
-               require_once('include/Photo.php');
-               foreach($matches as $mtch) {
-                       logger('scale_diaspora_image: ' . $mtch[1]);
-                       $i = fetch_url($mtch[1]);
-                       if($i) {
-                               $ph = new Photo($i);
-                               if($ph->is_valid()) {
-                                       if($ph->getWidth() > 600 || $ph->getHeight() > 600) {
-                                               $ph->scaleImage(600);
-                                               $new_width = $ph->getWidth();
-                                               $new_height = $ph->getHeight();
-                                               logger('scale_diaspora_image: ' . $new_width . 'w ' . $new_height . 'h' . 'match: ' . $mtch[0], LOGGER_DEBUG);
-                                               $s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
-                                                       . "\n" . (($include_link) 
-                                                               ? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n"
-                                                               : ''),$s);
-                                               logger('scale_diaspora_image: new string: ' . $s, LOGGER_DEBUG);
-                                       }
-                               }
-                       }
-               }
-       }
-       return $s;
-}
-
 function stripdcode_br_cb($s) {
        return '[code]' . str_replace('<br />', "\n\t", $s[1]) . '[/code]';
 }