From c9dafe3b4e835a215caf1fada142610379e0d4ef Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 6 Apr 2017 23:33:12 -0400 Subject: [PATCH 1/4] Move HTML to Markdown library to Composer --- composer.json | 1 + composer.lock | 66 +- library/html-to-markdown/.gitignore | 3 - library/html-to-markdown/.travis.yml | 6 - library/html-to-markdown/HTML_To_Markdown.php | 598 ------------------ library/html-to-markdown/README.md | 138 ---- library/html-to-markdown/circle.yml | 4 - library/html-to-markdown/composer.json | 25 - vendor/bin/html-to-markdown | 17 + vendor/bin/html-to-markdown.bat | 4 + vendor/composer/autoload_classmap.php | 23 + vendor/composer/autoload_psr4.php | 1 + vendor/composer/autoload_static.php | 31 + vendor/composer/installed.json | 66 ++ vendor/league/html-to-markdown/CHANGELOG.md | 214 +++++++ vendor/league/html-to-markdown/CONDUCT.md | 22 + .../league}/html-to-markdown/LICENSE | 4 +- vendor/league/html-to-markdown/README.md | 196 ++++++ .../html-to-markdown/bin/html-to-markdown | 108 ++++ vendor/league/html-to-markdown/composer.json | 48 ++ .../html-to-markdown/src/Configuration.php | 60 ++ .../src/ConfigurationAwareInterface.php | 11 + .../src/Converter/BlockquoteConverter.php | 44 ++ .../src/Converter/CodeConverter.php | 62 ++ .../src/Converter/CommentConverter.php | 26 + .../src/Converter/ConverterInterface.php | 20 + .../src/Converter/DefaultConverter.php | 50 ++ .../src/Converter/DivConverter.php | 45 ++ .../src/Converter/EmphasisConverter.php | 57 ++ .../src/Converter/HardBreakConverter.php | 41 ++ .../src/Converter/HeaderConverter.php | 78 +++ .../src/Converter/HorizontalRuleConverter.php | 26 + .../src/Converter/ImageConverter.php | 35 + .../src/Converter/LinkConverter.php | 52 ++ .../src/Converter/ListBlockConverter.php | 26 + .../src/Converter/ListItemConverter.php | 47 ++ .../src/Converter/ParagraphConverter.php | 124 ++++ .../src/Converter/PreformattedConverter.php | 59 ++ .../src/Converter/TextConverter.php | 46 ++ .../league/html-to-markdown/src/Element.php | 257 ++++++++ .../html-to-markdown/src/ElementInterface.php | 80 +++ .../html-to-markdown/src/Environment.php | 104 +++ .../html-to-markdown/src/HtmlConverter.php | 231 +++++++ 43 files changed, 2380 insertions(+), 776 deletions(-) delete mode 100644 library/html-to-markdown/.gitignore delete mode 100644 library/html-to-markdown/.travis.yml delete mode 100644 library/html-to-markdown/HTML_To_Markdown.php delete mode 100644 library/html-to-markdown/README.md delete mode 100644 library/html-to-markdown/circle.yml delete mode 100644 library/html-to-markdown/composer.json create mode 100644 vendor/bin/html-to-markdown create mode 100644 vendor/bin/html-to-markdown.bat create mode 100644 vendor/league/html-to-markdown/CHANGELOG.md create mode 100644 vendor/league/html-to-markdown/CONDUCT.md rename {library => vendor/league}/html-to-markdown/LICENSE (93%) create mode 100644 vendor/league/html-to-markdown/README.md create mode 100644 vendor/league/html-to-markdown/bin/html-to-markdown create mode 100644 vendor/league/html-to-markdown/composer.json create mode 100644 vendor/league/html-to-markdown/src/Configuration.php create mode 100644 vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php create mode 100644 vendor/league/html-to-markdown/src/Converter/BlockquoteConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/CodeConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/CommentConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/ConverterInterface.php create mode 100644 vendor/league/html-to-markdown/src/Converter/DefaultConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/DivConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/HeaderConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/ImageConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/LinkConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/ListItemConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php create mode 100644 vendor/league/html-to-markdown/src/Converter/TextConverter.php create mode 100644 vendor/league/html-to-markdown/src/Element.php create mode 100644 vendor/league/html-to-markdown/src/ElementInterface.php create mode 100644 vendor/league/html-to-markdown/src/Environment.php create mode 100644 vendor/league/html-to-markdown/src/HtmlConverter.php diff --git a/composer.json b/composer.json index f2aeaa8eb..8b4a630d3 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "require": { "ezyang/htmlpurifier": "~4.7.0", "mobiledetect/mobiledetectlib": "2.8.*", + "league/html-to-markdown": "~4.4.1", "pear-pear.php.net/Text_Highlighter": "*" }, "repositories": [ diff --git a/composer.lock b/composer.lock index b35d1ca12..b46614f6e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "4d3a9e742e7ad746fb7206f3b5aff5af", + "content-hash": "802372ddf124ef949e80dd8dc1d38797", "packages": [ { "name": "ezyang/htmlpurifier", @@ -50,6 +50,70 @@ ], "time": "2015-08-05T01:03:42+00:00" }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ], + "time": "2017-03-16T00:45:59+00:00" + }, { "name": "mobiledetect/mobiledetectlib", "version": "2.8.25", diff --git a/library/html-to-markdown/.gitignore b/library/html-to-markdown/.gitignore deleted file mode 100644 index aa429a9a1..000000000 --- a/library/html-to-markdown/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -~* -vendor -composer.lock \ No newline at end of file diff --git a/library/html-to-markdown/.travis.yml b/library/html-to-markdown/.travis.yml deleted file mode 100644 index 48b3e64a4..000000000 --- a/library/html-to-markdown/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: php -php: - - "5.5" - - "5.4" - - "5.3" -script: phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php \ No newline at end of file diff --git a/library/html-to-markdown/HTML_To_Markdown.php b/library/html-to-markdown/HTML_To_Markdown.php deleted file mode 100644 index 109780edd..000000000 --- a/library/html-to-markdown/HTML_To_Markdown.php +++ /dev/null @@ -1,598 +0,0 @@ - - * @link https://github.com/nickcernis/html2markdown/ Latest version on GitHub. - * @link http://twitter.com/nickcernis Nick on twitter. - * @license http://www.opensource.org/licenses/mit-license.php MIT - */ -class HTML_To_Markdown -{ - /** - * @var DOMDocument The root of the document tree that holds our HTML. - */ - private $document; - - /** - * @var string|boolean The Markdown version of the original HTML, or false if conversion failed - */ - private $output; - - /** - * @var array Class-wide options users can override. - */ - private $options = array( - 'header_style' => 'setext', // Set to "atx" to output H1 and H2 headers as # Header1 and ## Header2 - 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML - 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output. - 'bold_style' => '**', // Set to '__' if you prefer the underlined style - 'italic_style' => '*', // Set to '_' if you prefer the underlined style - 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: "meta style script" - ); - - - /** - * Constructor - * - * Set up a new DOMDocument from the supplied HTML, convert it to Markdown, and store it in $this->$output. - * - * @param string $html The HTML to convert to Markdown. - * @param array $overrides [optional] List of style and error display overrides. - */ - public function __construct($html = null, $overrides = null) - { - if ($overrides) - $this->options = array_merge($this->options, $overrides); - - if ($html) - $this->convert($html); - } - - - /** - * Setter for conversion options - * - * @param $name - * @param $value - */ - public function set_option($name, $value) - { - $this->options[$name] = $value; - } - - - /** - * Convert - * - * Loads HTML and passes to get_markdown() - * - * @param $html - * @return string The Markdown version of the html - */ - public function convert($html) - { - $html = preg_replace('~>\s+<~', '><', $html); // Strip white space between tags to prevent creation of empty #text nodes - - $this->document = new DOMDocument(); - - if ($this->options['suppress_errors']) - libxml_use_internal_errors(true); // Suppress conversion errors (from http://bit.ly/pCCRSX ) - - $this->document->loadHTML('' . $html); // Hack to load utf-8 HTML (from http://bit.ly/pVDyCt ) - $this->document->encoding = 'UTF-8'; - - if ($this->options['suppress_errors']) - libxml_clear_errors(); - - return $this->get_markdown($html); - } - - - /** - * Is Child Of? - * - * Is the node a child of the given parent tag? - * - * @param $parent_name string|array The name of the parent node(s) to search for e.g. 'code' or array('pre', 'code') - * @param $node - * @return bool - */ - private static function is_child_of($parent_name, $node) - { - for ($p = $node->parentNode; $p != false; $p = $p->parentNode) { - if (is_null($p)) - return false; - - if ( is_array($parent_name) && in_array($p->nodeName, $parent_name) ) - return true; - - if ($p->nodeName == $parent_name) - return true; - } - return false; - } - - - /** - * Convert Children - * - * Recursive function to drill into the DOM and convert each node into Markdown from the inside out. - * - * Finds children of each node and convert those to #text nodes containing their Markdown equivalent, - * starting with the innermost element and working up to the outermost element. - * - * @param $node - */ - private function convert_children($node) - { - // Don't convert HTML code inside and 
 blocks to Markdown - that should stay as HTML
-        if (self::is_child_of(array('pre', 'code'), $node))
-            return;
-
-        // If the node has children, convert those to Markdown first
-        if ($node->hasChildNodes()) {
-            $length = $node->childNodes->length;
-
-            for ($i = 0; $i < $length; $i++) {
-                $child = $node->childNodes->item($i);
-                $this->convert_children($child);
-            }
-        }
-
-        // Now that child nodes have been converted, convert the original node
-        $markdown = $this->convert_to_markdown($node);
-
-        // Create a DOM text node containing the Markdown equivalent of the original node
-        $markdown_node = $this->document->createTextNode($markdown);
-
-        // Replace the old $node e.g. "
Title
" with the new $markdown_node e.g. "### Title"
-        $node->parentNode->replaceChild($markdown_node, $node);
-    }
-
-
-    /**
-     * Get Markdown
-     *
-     * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and
-     * returns the resulting converted document as a string in Markdown format.
-     *
-     * @return string|boolean The converted HTML as Markdown, or false if conversion failed
-     */
-    private function get_markdown()
-    {
-        // Work on the entire DOM tree (including head and body)
-        $input = $this->document->getElementsByTagName("html")->item(0);
-
-        if (!$input)
-            return false;
-
-        // Convert all children of this root element. The DOMDocument stored in $this->doc will
-        // then consist of #text nodes, each containing a Markdown version of the original node
-        // that it replaced.
-        $this->convert_children($input);
-
-        // Sanitize and return the body contents as a string.
-        $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string
-        $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8');
-        $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like &nbsp; http://www.php.net/manual/en/function.htmlentities.php#99984
-        $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration
-        $unwanted = array('', '', '', '', '', '', '', '
');
-        $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags
-        $markdown = trim($markdown, "\n\r\0\x0B");
-
-        $this->output = $markdown;
-
-        return $markdown;
-    }
-
-
-    /**
-     * Convert to Markdown
-     *
-     * Converts an individual node into a #text node containing a string of its Markdown equivalent.
-     *
-     * Example: An 
 node with text content of "Title" becomes a text node with content of "### Title"
-     *
-     * @param $node
-     * @return string The converted HTML as Markdown
-     */
-    private function convert_to_markdown($node)
-    {
-        $tag = $node->nodeName; // the type of element, e.g. h1
-        $value = $node->nodeValue; // the value of that element, e.g. The Title
-        
-        // Strip nodes named in remove_nodes
-        $tags_to_remove = explode(' ', $this->options['remove_nodes']);
-        if ( in_array($tag, $tags_to_remove) )
-            return false;
-
-        switch ($tag) {
-            case "p":
-                $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : '';
-                break;
-            case "pre":
-                $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL;
-                break;
-            case "h1":
-            case "h2":
-                $markdown = $this->convert_header($tag, $node);
-                break;
-            case "h3":
-                $markdown = "### " . $value . PHP_EOL . PHP_EOL;
-                break;
-            case "h4":
-                $markdown = "#### " . $value . PHP_EOL . PHP_EOL;
-                break;
-            case "h5":
-                $markdown = "##### " . $value . PHP_EOL . PHP_EOL;
-                break;
-            case "h6":
-                $markdown = "###### " . $value . PHP_EOL . PHP_EOL;
-                break;
-            case "em":
-            case "i":
-            case "strong":
-            case "b":
-                $markdown = $this->convert_emphasis($tag, $value);
-                break;
-            case "hr":
-                $markdown = "- - - - - -" . PHP_EOL . PHP_EOL;
-                break;
-            case "br":
-                $markdown = "  " . PHP_EOL;
-                break;
-            case "blockquote":
-                $markdown = $this->convert_blockquote($node);
-                break;
-            case "code":
-                $markdown = $this->convert_code($node);
-                break;
-            case "ol":
-            case "ul":
-                $markdown = $value . PHP_EOL;
-                break;
-            case "li":
-                $markdown = $this->convert_list($node);
-                break;
-            case "img":
-                $markdown = $this->convert_image($node);
-                break;
-            case "a":
-                $markdown = $this->convert_anchor($node);
-                break;
-            case "#text":
-                $markdown = preg_replace('~\s+~', ' ', $value);
-                $markdown = preg_replace('~^#~', '\\\\#', $markdown);
-                break;
-            case "#comment":
-                $markdown = '';
-                break;
-            case "div":
-                $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N());
-                break;
-            default:
-                // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents,
-                // such as  nodes on their own. C14N() canonicalizes the node to a string.
-                // See: http://www.php.net/manual/en/domnode.c14n.php
-                $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N());
-        }
-
-        return $markdown;
-    }
-
-
-    /**
-     * Convert Header
-     *
-     * Converts h1 and h2 headers to Markdown-style headers in setext style,
-     * matching the number of underscores with the length of the title.
-     *
-     * e.g.     Header 1    Header Two
-     *          ========    ----------
-     *
-     * Returns atx headers instead if $this->options['header_style'] is "atx"
-     *
-     * e.g.    # Header 1   ## Header Two
-     *
-     * @param string $level The header level, including the "h". e.g. h1
-     * @param string $node The node to convert.
-     * @return string The Markdown version of the header.
-     */
-    private function convert_header($level, $node)
-    {
-        $content = $node->nodeValue;
-
-        if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") {
-            $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content);
-            $underline = ($level == "h1") ? "=" : "-";
-            $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style
-        } else {
-            $prefix = ($level == "h1") ? "# " : "## ";
-            $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style
-        }
-
-        return $markdown;
-    }
-
-
-    /**
-     * Converts inline styles
-     * This function is used to render strong and em tags
-     * 
-     * eg bold text becomes **bold text** or __bold text__
-     * 
-     * @param string $tag
-     * @param string $value
-     * @return string
-     */
-     private function convert_emphasis($tag, $value)
-     {
-        if ($tag == 'i' || $tag == 'em') {
-            $markdown = $this->options['italic_style'] . $value . $this->options['italic_style'];
-        } else {
-            $markdown = $this->options['bold_style'] . $value . $this->options['bold_style'];
-        }
-        
-        return $markdown;
-     }
-
-
-    /**
-     * Convert Image
-     *
-     * Converts  tags to Markdown.
-     *
-     * e.g.     alt text
-     * becomes  ![alt text](/path/img.jpg "Title")
-     *
-     * @param $node
-     * @return string
-     */
-    private function convert_image($node)
-    {
-        $src = $node->getAttribute('src');
-        $alt = $node->getAttribute('alt');
-        $title = $node->getAttribute('title');
-
-        if ($title != "") {
-            $markdown = '![' . $alt . '](' . $src . ' "' . $title . '")'; // No newlines added.  should be in a block-level element.
-        } else {
-            $markdown = '![' . $alt . '](' . $src . ')';
-        }
-
-        return $markdown;
-    }
-
-
-    /**
-     * Convert Anchor
-     *
-     * Converts  tags to Markdown.
-     *
-     * e.g.     Modern Nerd
-     * becomes  [Modern Nerd](http://modernnerd.net "Title")
-     *
-     * @param $node
-     * @return string
-     */
-    private function convert_anchor($node)
-    {
-        $href = $node->getAttribute('href');
-        $title = $node->getAttribute('title');
-        $text = $node->nodeValue;
-
-        if ($title != "") {
-            $markdown = '[' . $text . '](' . $href . ' "' . $title . '")';
-        } else {
-            $markdown = '[' . $text . '](' . $href . ')';
-        }
-
-        if (! $href)
-            $markdown = html_entity_decode($node->C14N());
-
-        // Append a space if the node after this one is also an anchor
-        $next_node_name = $this->get_next_node_name($node);
-
-        if ($next_node_name == 'a')
-            $markdown = $markdown . ' ';
-
-        return $markdown;
-    }
-
-
-    /**
-     * Convert List
-     *
-     * Converts ', $Text);
-	//$Text = str_replace('
','', $Text);
-	//$Text = str_replace('
  • ','
  • ', $Text);
-	//	$Text = str_replace('

    ', '', $Text);
+	//$Text = str_replace('

    • ', '', $Text);
+	//$Text = str_replace('
  • ', '
  • ', $Text);
+	//$Text = str_replace('
    

From b0accf4d4c674799ae210fce012dd0f31834717e Mon Sep 17 00:00:00 2001
From: Hypolite Petovan 
Date: Thu, 6 Apr 2017 23:49:56 -0400
Subject: [PATCH 3/4] Fix code blocks to Diaspora

- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use   instead of  for Diaspora inline code blocks
---
 include/bb2diaspora.php | 40 +++++++++++++++++++++++++++++++---
 include/bbcode.php      | 48 ++++++++++++++++++++++++++++++-----------
 2 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 5a60cd945..cef293c76 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -105,8 +105,18 @@ function diaspora_mentions($match) {
 	return $mention;
 }
 
-function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
-
+/**
+ * @brief Converts a BBCode text into Markdown
+ *
+ * This function converts a BBCode item body to be sent to Markdown-enabled
+ * 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) {
 	$a = get_app();
 
 	$OriginalText = $Text;
@@ -129,6 +139,18 @@ 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()
+	$codeblocks = [];
+	$Text = preg_replace_callback('#\[code(?:=([^\]]*))?\](?=\n)(.*?)\[\/code\]#is',
+		function ($matches) use (&$codeblocks) {
+			$return = '#codeblock-' . count($codeblocks) . '#';
+
+            $prefix = '````' . $matches[1] . PHP_EOL;
+			$codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+			return $return;
+		}
+	, $Text);
+
 	// Convert it to HTML - don't try oembed
 	if ($fordiaspora) {
 		$Text = bbcode($Text, $preserve_nl, false, 3);
@@ -158,7 +180,8 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 	$stamp1 = microtime(true);
 
 	// Now convert HTML to Markdown
-	$Text = new HTML_To_Markdown($Text);
+	$converter = new HtmlConverter();
+	$Text = $converter->convert($Text);
 
 	// unmask the special chars back to HTML
 	$Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('<', '>', '&'), $Text);
@@ -177,6 +200,17 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 		$Text = preg_replace_callback("/([@]\[(.*?)\])\(([$URLSearchString]*?)\)/ism", 'diaspora_mentions', $Text);
 	}
 
+	// Restore code blocks
+	$Text = preg_replace_callback('/#codeblock-([0-9]+)#/iU',
+		function ($matches) use ($codeblocks) {
+            $return = '';
+            if (isset($codeblocks[intval($matches[1])])) {
+                $return = $codeblocks[$matches[1]];
+            }
+			return $return;
+		}
+	, $Text);
+
 	call_hooks('bb2diaspora',$Text);
 
 	return $Text;
diff --git a/include/bbcode.php b/include/bbcode.php
index f73f586d3..fd380edc9 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -159,13 +159,6 @@ function stripcode_br_cb($s) {
 	return '[code]' . str_replace('
    ', '', $s[1]) . '[/code]';
 }
 
-function bb_onelinecode_cb($match) {
-	if (strpos($match[1],"
    ")===false){
-		return "".$match[1]."";
-	}
-	return "".$match[1]."";
-}
-
 function tryoembed($match) {
 	$url = $match[1];
 
@@ -729,9 +722,31 @@ function bb_highlight($match) {
 	return $match[0];
 }
 
-	// BBcode 2 HTML was written by WAY2WEB.net
-	// extended to work with Mistpark/Friendica - Mike Macgirvin
-
+/**
+ * @brief Converts a BBCode message to HTML message
+ *
+ * BBcode 2 HTML was written by WAY2WEB.net
+ * extended to work with Mistpark/Friendica - Mike Macgirvin
+ *
+ * Simple HTML values meaning:
+ * - 0: Friendica display
+ * - 1: Unused
+ * - 2: Used for Facebook, Google+, Windows Phone push, Friendica API
+ * - 3: Used before converting to Markdown in bb2diaspora.php
+ * - 4: Used for WordPress, Libertree (before Markdown), pump.io and tumblr
+ * - 5: Unused
+ * - 6: Used for Appnet
+ * - 7: Used for dfrn, OStatus
+ * - 8: Used for WP backlink text setting
+ *
+ * @staticvar array $allowed_src_protocols
+ * @param string $Text
+ * @param bool $preserve_nl
+ * @param bool $tryoembed
+ * @param int $simplehtml
+ * @param bool $forplaintext
+ * @return string
+ */
 function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) {
 
 	$a = get_app();
@@ -1158,8 +1173,17 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	}
 
 
-	//replace oneliner  with 
-	$Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", 'bb_onelinecode_cb', $Text);
+	// Replace inline code blocks
+	$Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism",
+		function ($match) use ($simplehtml) {
+			$return = '' . $match[1] . '';
+			// Use  for Diaspora inline code blocks
+			if ($simplehtml === 3) {
+				$return = '' . $match[1] . '';
+			}
+			return $return;
+		}
+	, $Text);
 
 	// Unhide all [noparse] contained bbtags unspacefying them
 	// and triming the [noparse] tag.

From 47a6f6b726f1716fa5d78b2008652aade9e5e8a7 Mon Sep 17 00:00:00 2001
From: Michael 
Date: Fri, 7 Apr 2017 21:34:06 +0000
Subject: [PATCH 4/4] Issue 3300: The temp path creation couldn't create a
 subdirectory with the hostname

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 084bca112..1d8a9e7f7 100644
--- a/boot.php
+++ b/boot.php
@@ -2472,7 +2472,7 @@ function get_temppath() {
 	// Check if it is usable
 	if (($temppath != "") AND App::directory_usable($temppath)) {
 		// To avoid any interferences with other systems we create our own directory
-		$new_temppath .= "/".$a->get_hostname();
+		$new_temppath = $temppath."/".$a->get_hostname();
 		if (!is_dir($new_temppath)) {
 			/// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
 			mkdir($new_temppath);