Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index d5fa8642ad4961b0dda0193345921439582d3899..bea15e3d4c20093128d1aa484841e865ed93d23b 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,16 +1,17 @@
 <?php
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
-use Friendica\Util\Network;
+use Friendica\Util\DateTimeFormat;
 use League\HTMLToMarkdown\HtmlConverter;
 
 require_once 'include/event.php';
 require_once 'include/html2bbcode.php';
-require_once 'include/bbcode.php';
 
 /**
  * @brief Callback function to replace a Diaspora style mention in a mention for Friendica
@@ -74,16 +75,16 @@ function diaspora2bb($s) {
        $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 = bb_tag_preg_replace('/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
-       $s = bb_tag_preg_replace('/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism'   , '[youtube]$1[/youtube]', 'url', $s);
-       $s = bb_tag_preg_replace('/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism'        , '[vimeo]$2[/vimeo]'    , 'url', $s);
-       $s = bb_tag_preg_replace('/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism'              , '[vimeo]$1[/vimeo]'    , 'url', $s);
+       $s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
+       $s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism'   , '[youtube]$1[/youtube]', 'url', $s);
+       $s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism'        , '[vimeo]$2[/vimeo]'    , 'url', $s);
+       $s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism'              , '[vimeo]$1[/vimeo]'    , '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 = Network::scaleExternalImages($s, false);
+       $s = BBCode::scaleExternalImages($s, false);
 
        return $s;
 }
@@ -117,18 +118,17 @@ function diaspora_mentions($match) {
  * systems like Diaspora and Libertree
  *
  * @param string $Text
- * @param bool $preserve_nl Effects unclear, unused in Friendica
  * @param bool $fordiaspora Diaspora requires more changes than Libertree
  * @return string
  */
-function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
+function bb2diaspora($Text, $fordiaspora = true) {
        $a = get_app();
 
        $OriginalText = $Text;
 
        // Since Diaspora is creating a summary for links, this function removes them before posting
        if ($fordiaspora) {
-               $Text = bb_remove_share_information($Text);
+               $Text = BBCode::removeShareInformation($Text);
        }
 
        /**
@@ -144,7 +144,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
        // 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);
 
-       // Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
+       // Extracting multi-line code blocks before the whitespace processing/code highlighter in BBCode::convert()
        $codeblocks = [];
 
        $Text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
@@ -162,7 +162,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 
        // Convert it to HTML - don't try oembed
        if ($fordiaspora) {
-               $Text = bbcode($Text, $preserve_nl, false, 3);
+               $Text = BBCode::convert($Text, false, 3);
 
                // Add all tags that maybe were removed
                if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $OriginalText, $tags)) {
@@ -176,7 +176,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
                        $Text = $Text." ".$tagline;
                }
        } else {
-               $Text = bbcode($Text, $preserve_nl, false, 4);
+               $Text = BBCode::convert($Text, false, 4);
        }
 
        // mask some special HTML chars from conversation to markdown
@@ -241,20 +241,17 @@ function format_event_diaspora($ev) {
 
        $o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) .  '**' . "\n";
 
-       $o .= L10n::t('Starts:') . ' ' . '['
-               . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
-                       $ev['start'] , $bd_format ))
-                       :  day_translate(datetime_convert('UTC', 'UTC',
-                       $ev['start'] , $bd_format)))
-               .  '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
+       // @todo What. Is. Going. On. With. This. Useless. Ternary. Operator? - mrpetovan
+       $o .= L10n::t('Starts:') . ' ' . '[' . day_translate(
+                       $ev['adjust'] ? DateTimeFormat::utc($ev['start'], $bd_format) : DateTimeFormat::utc($ev['start'], $bd_format)
+               )
+               .  '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(DateTimeFormat::utc($ev['start'])) . ")\n";
 
        if (! $ev['nofinish']) {
-               $o .= L10n::t('Finishes:') . ' ' . '['
-                       . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
-                               $ev['finish'] , $bd_format ))
-                               :  day_translate(datetime_convert('UTC', 'UTC',
-                               $ev['finish'] , $bd_format )))
-                       . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
+               $o .= L10n::t('Finishes:') . ' ' . '[' . day_translate(
+                               $ev['adjust'] ? DateTimeFormat::utc($ev['finish'], $bd_format) : DateTimeFormat::utc($ev['finish'], $bd_format)
+                       )
+                       . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(DateTimeFormat::utc($ev['finish'])) . ")\n";
        }
 
        if (strlen($ev['location'])) {