Add Temporal::utc() shorthand to Temporal::convert()

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index daa8c5e0488cd5e6cff72136247c73a74de23b02..52031aa72acc9a25aabe6b87a7ecbdf85d7b4891 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,14 +1,16 @@
 <?php
 
-use Friendica\App;
+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\Temporal;
 use League\HTMLToMarkdown\HtmlConverter;
 
 require_once 'include/event.php';
-require_once 'library/markdown.php';
 require_once 'include/html2bbcode.php';
 require_once 'include/bbcode.php';
 
@@ -53,12 +55,12 @@ function diaspora2bb($s) {
        $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);
 
        // The parser cannot handle paragraphs correctly
-       $s = str_replace(array('</p>', '<p>', '<p dir="ltr">'), array('<br>', '<br>', '<br>'), $s);
+       $s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);
 
        // Escaping the hash tags
        $s = preg_replace('/\#([^\s\#])/', '&#35;$1', $s);
 
-       $s = Markdown($s);
+       $s = Markdown::convert($s);
 
        $regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
        $s = preg_replace_callback($regexp, 'diaspora_mention2bb', $s);
@@ -83,7 +85,7 @@ function diaspora2bb($s) {
        $s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s);
 
        // Don't show link to full picture (until it is fixed)
-       $s = scale_external_images($s, false);
+       $s = BBCode::scaleExternalImages($s, false);
 
        return $s;
 }
@@ -180,11 +182,11 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
        }
 
        // mask some special HTML chars from conversation to markdown
-       $Text = str_replace(array('&lt;', '&gt;', '&amp;'), array('&_lt_;', '&_gt_;', '&_amp_;'), $Text);
+       $Text = str_replace(['&lt;', '&gt;', '&amp;'], ['&_lt_;', '&_gt_;', '&_amp_;'], $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("</a><blockquote>"), array("</a><br><blockquote>"), $Text);
+       $Text = str_replace(["</a><blockquote>"], ["</a><br><blockquote>"], $Text);
 
        $stamp1 = microtime(true);
 
@@ -193,12 +195,12 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
        $Text = $converter->convert($Text);
 
        // unmask the special chars back to HTML
-       $Text = str_replace(array('&\_lt\_;', '&\_gt\_;', '&\_amp\_;'), array('&lt;', '&gt;', '&amp;'), $Text);
+       $Text = str_replace(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['&lt;', '&gt;', '&amp;'], $Text);
 
        $a->save_timestamp($stamp1, "parser");
 
        // Libertree has a problem with escaped hashtags.
-       $Text = str_replace(array('\#'), array('#'), $Text);
+       $Text = str_replace(['\#'], ['#'], $Text);
 
        // Remove any leading or trailing whitespace, as this will mess up
        // the Diaspora signature verification and cause the item to disappear
@@ -220,7 +222,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
                }
        , $Text);
 
-       call_hooks('bb2diaspora',$Text);
+       Addon::callHooks('bb2diaspora',$Text);
 
        return $Text;
 }
@@ -235,30 +237,29 @@ function format_event_diaspora($ev) {
                return '';
        }
 
-       $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
+       $bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
        $o = 'Friendica event notification:' . "\n";
 
        $o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) .  '**' . "\n";
 
-       $o .= 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:') . ' ' . '['
+               . (($ev['adjust']) ? day_translate(Temporal::utc($ev['start'], $bd_format))
+                       :  day_translate(Temporal::convert($ev['start'], $bd_format))
+               )
+               .  '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(Temporal::utc($ev['start'])) . ")\n";
 
        if (! $ev['nofinish']) {
-               $o .= 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:') . ' ' . '['
+                       . (($ev['adjust']) ? day_translate(Temporal::utc($ev['finish'], $bd_format))
+                               :  day_translate(Temporal::utc($ev['finish'], $bd_format))
+                       )
+                       . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(Temporal::utc($ev['finish'])) . ")\n";
        }
 
        if (strlen($ev['location'])) {
-               $o .= t('Location:') . bb2diaspora($ev['location'])
+               $o .= L10n::t('Location:') . bb2diaspora($ev['location'])
                        . "\n";
        }