X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=842dbf0b1cf4595212a5c363f790867a0689cd7c;hb=66902c7956eedba02ea54aea6ea7aa417344ffbb;hp=8487f845a62848a75750632f14b773047096dbde;hpb=2c7da5d0de29cd7010bd6a34c0b6cfb79fe24466;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php old mode 100755 new mode 100644 index 8487f845a6..842dbf0b1c --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,10 +1,12 @@ ', $s); - // Too many new lines. So deactivated the following line - // $s = str_replace("\r","\n",$s); - // Simply remove cr. - $s = str_replace("\r","",$s); + $s = str_replace("\n", " \n", $s); - //
is invalid. Replace it with the valid expression - $s = str_replace("
","
",$s); + // Replace lonely stars in lines not starting with it with literal stars + $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s); - $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); + // The parser cannot handle paragraphs correctly + $s = str_replace(array('

', '

', '

'), array('
', '
', '
'), $s); - // Escaping the hash tags - doesn't always seem to work - // $s = preg_replace('/\#([^\s\#])/','\\#$1',$s); - // This seems to work - $s = preg_replace('/\#([^\s\#])/','#$1',$s); + // Escaping the hash tags + $s = preg_replace('/\#([^\s\#])/', '#$1', $s); $s = Markdown($s); - $s = str_replace('#','#',$s); + $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/', '@[url=https://$3/u/$2]$1[/url]', $s); - $s = str_replace("\n",'
',$s); + $s = str_replace('#', '#', $s); + + $search = array(" \n", "\n "); + $replace = array("\n", "\n"); + do { + $oldtext = $s; + $s = str_replace($search, $replace, $s); + } while ($oldtext != $s); + + $s = str_replace("\n\n", '
', $s); $s = html2bbcode($s); -// $s = str_replace('*','*',$s); + + // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands + $s = str_replace('♲', html_entity_decode('♲', ENT_QUOTES, 'UTF-8'), $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?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?', "\n\t", $s[1]) . '[/code]'; -} - - - -function bb2diaspora($Text,$preserve_nl = false) { - - $ev = bbtoevent($Text); - - // Replace any html brackets with HTML Entities to prevent executing HTML or script - // Don't use strip_tags here because it breaks [url] search by replacing & with amp - - $Text = str_replace("<", "<", $Text); - $Text = str_replace(">", ">", $Text); - - // If we find any event code, turn it into an event. - // After we're finished processing the bbcode we'll - // replace all of the event code with a reformatted version. + $a = get_app(); + $OriginalText = $Text; - if($preserve_nl) - $Text = str_replace(array("\n","\r"), array('',''),$Text); + // Since Diaspora is creating a summary for links, this function removes them before posting + if ($fordiaspora) + $Text = bb_remove_share_information($Text); - // Set up the parameters for a URL search string + /** + * Transform #tags, strip off the [url] and replace spaces with underscore + */ $URLSearchString = "^\[\]"; - // Set up the parameters for a MAIL search string - $MAILSearchString = $URLSearchString; - - // Perform URL Search - - // [img]pathtoimage[/img] - - // the following was added on 10-January-2012 due to an inability of Diaspora's - // new javascript markdown processor to handle links with images as the link "text" - // It is not optimal and may be removed if this ability is restored in the future - - $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism", - '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text); - - $Text = preg_replace("/\[bookmark\]([$URLSearchString]*)\[\/bookmark\]/ism", '[$1]($1)', $Text); - $Text = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[$2]($1)', $Text); - - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text); - $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text); - - - $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text); - $Text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text); - - // Perform MAIL Search - $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text); - $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '[$2](mailto:$1)', $Text); - - $Text = str_replace('*', '\\*', $Text); - $Text = str_replace('_', '\\_', $Text); - - $Text = str_replace('`','\\`', $Text); - - // Check for bold text - $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'**$1**',$Text); + $Text = preg_replace_callback("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i", create_function('$match', + 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' + ), $Text); - // Check for Italics text - $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'_$1_',$Text); + // Converting images with size parameters to simple images. Markdown doesn't know it. + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); - // Check for Underline text -// $Text = preg_replace("(\[u\](.*?)\[\/u\])is",'$1',$Text); + // Convert it to HTML - don't try oembed + if ($fordiaspora) { + $Text = bbcode($Text, $preserve_nl, false, 3); - // Check for strike-through text -// $Text = preg_replace("(\[s\](.*?)\[\/s\])is",'$1',$Text); + // Add all tags that maybe were removed + if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) { + $tagline = ""; + foreach($tags[2] as $tag) { + $tag = html_entity_decode($tag, ENT_QUOTES, 'UTF-8'); + if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), "#".$tag)) + $tagline .= "#".$tag." "; + } + $Text = $Text." ".$tagline; + } - // Check for over-line text -// $Text = preg_replace("(\[o\](.*?)\[\/o\])is",'$1',$Text); + } else + $Text = bbcode($Text, $preserve_nl, false, 4); - // Check for colored text -// $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","$2",$Text); + // mask some special HTML chars from conversation to markdown + $Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); - // Check for sized text -// $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","$2",$Text); + // If a link is followed by a quote then there should be a newline before it + // Maybe we should make this newline at every time before a quote. + $Text = str_replace(array("

"), array("
"), $Text); - // Check for list text -// $Text = preg_replace("/\[list\](.*?)\[\/list\]/is", '' ,$Text); -// $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/is", '' ,$Text); -// $Text = preg_replace("/\[list=i\](.*?)\[\/list\]/s",'' ,$Text); -// $Text = preg_replace("/\[list=I\](.*?)\[\/list\]/s", '' ,$Text); -// $Text = preg_replace("/\[list=a\](.*?)\[\/list\]/s", '' ,$Text); -// $Text = preg_replace("/\[list=A\](.*?)\[\/list\]/s", '' ,$Text); -// $Text = preg_replace("/\[li\](.*?)\[\/li\]/s", '
  • $1
    • ' ,$Text); + $stamp1 = microtime(true); -// $Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '$1' ,$Text); -// $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '$1' ,$Text); -// $Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '$1
    ' ,$Text); + // Now convert HTML to Markdown + $Text = new HTML_To_Markdown($Text); -// $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/s", '$1
    ' ,$Text); -// $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/s", '$1
    ' ,$Text); + // unmask the special chars back to HTML + $Text = str_replace(array('&_lt_;','&_gt_;','&_amp_;'),array('<','>','&'),$Text); - -// $Text = str_replace("[*]", "
  • ", $Text); + $a->save_timestamp($stamp1, "parser"); - // Check for font change text -// $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","$2",$Text); + // Libertree has a problem with escaped hashtags. + $Text = str_replace(array('\#'), array('#'), $Text); + // Remove any leading or trailing whitespace, as this will mess up + // the Diaspora signature verification and cause the item to disappear + $Text = trim($Text); - $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text); - - // Check for [code] text - $Text = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/is","\t$2\n", $Text); - - - - - // Declare the format for [quote] layout - // $QuoteLayout = '
    $1
    '; - // Check for [quote] text - $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is",">$1\n\n", $Text); - - // Images - - // html5 video and audio - - $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); - - $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); - -// $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '', $Text); - - // [img=widthxheight]image source[/img] -// $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '', $Text); - - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", 'http://www.youtube.com/watch?v=$1', $Text); - - $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); - $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); - $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text); - - - $Text = str_replace('[nosmile]','',$Text); - - // oembed tag - // $Text = oembed_bbcode2html($Text); - - // If we found an event earlier, strip out all the event code and replace with a reformatted version. - - if(x($ev,'desc') && x($ev,'start')) { - - $sub = format_event_diaspora($ev); - - $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/is",$sub,$Text); - $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/is",'',$Text); - $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/is",'',$Text); - $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/is",'',$Text); - $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text); - } - - $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); - - $Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text); - call_hooks('bb2diaspora',$Text); return $Text; } -function format_event_diaspora($ev) { +function unescape_underscores_in_links($m) { + $y = str_replace('\\_','_', $m[2]); + return('[' . $m[1] . '](' . $y . ')'); +} - $a = get_app(); +function format_event_diaspora($ev) { if(! ((is_array($ev)) && count($ev))) return ''; @@ -239,25 +151,25 @@ function format_event_diaspora($ev) { $o = 'Friendica event notification:' . "\n"; - $o .= '**' . bb2diaspora($ev['desc']) . '**' . "\n"; + $o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) . '**' . "\n"; $o .= t('Starts:') . ' ' . '[' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', + . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['start'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', + : day_translate(datetime_convert('UTC', 'UTC', $ev['start'] , $bd_format))) - . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; + . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; if(! $ev['nofinish']) - $o .= t('Finishes:') . ' ' . '[' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', + $o .= t('Finishes:') . ' ' . '[' + . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', + : day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format ))) - . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; + . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; if(strlen($ev['location'])) - $o .= t('Location:') . bb2diaspora($ev['location']) + $o .= t('Location:') . bb2diaspora($ev['location']) . "\n"; $o .= "\n";