Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding

[friendica.git] / src / Content / Text / BBCode.php

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 82c6f46980cbc8f5ab2f9e79e20626abb73172c4..7d1c429765337e48d374f07c223eff9c18e7d0ed 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -20,6 +20,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
+use Friendica\Model\Event;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Util\Map;
@@ -27,7 +28,6 @@ use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use League\HTMLToMarkdown\HtmlConverter;
 
-require_once "include/event.php";
 require_once "mod/proxy.php";
 
 class BBCode extends BaseObject
@@ -76,10 +76,12 @@ class BBCode extends BaseObject
 
                                        $picturedata = Image::getInfoFromURL($matches[1]);
 
-                                       if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) {
-                                               $post["image"] = $matches[1];
-                                       } else {
-                                               $post["preview"] = $matches[1];
+                                       if ($picturedata) {
+                                               if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) {
+                                                       $post["image"] = $matches[1];
+                                               } else {
+                                                       $post["preview"] = $matches[1];
+                                               }
                                        }
                                }
 
@@ -266,7 +268,7 @@ class BBCode extends BaseObject
                                                $post["text"] = str_replace($pictures[0][0], "", $body);
                                        } else {
                                                $imgdata = Image::getInfoFromURL($pictures[0][1]);
-                                               if (substr($imgdata["mime"], 0, 6) == "image/") {
+                                               if ($imgdata && substr($imgdata["mime"], 0, 6) == "image/") {
                                                        $post["type"] = "photo";
                                                        $post["image"] = $pictures[0][1];
                                                        $post["preview"] = $pictures[0][2];
@@ -1373,7 +1375,7 @@ class BBCode extends BaseObject
                // After we're finished processing the bbcode we'll
                // replace all of the event code with a reformatted version.
 
-               $ev = bbtoevent($text);
+               $ev = Event::fromBBCode($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
@@ -1811,7 +1813,7 @@ class BBCode extends BaseObject
                // start which is always required). Allow desc with a missing summary for compatibility.
 
                if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
-                       $sub = format_event_html($ev, $simple_html);
+                       $sub = Event::getHTML($ev, $simple_html);
 
                        $text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text);
                        $text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $text);