Merge pull request #2172 from tobiasd/20151212-frosticons

[friendica.git] / include / html2bbcode.php

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 6e9532c92f5bf462461b600facc085b5489f2e97..28e251aee4e82425a0fd0c88574558c43f701dd7 100644 (file)
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -16,7 +16,7 @@ function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb)
 
 function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
 {
-       $savestart = str_replace('$', '%', $startbb);
+       $savestart = str_replace('$', '\x01', $startbb);
        $replace = false;
 
        $xpath = new DomXPath($doc);
@@ -37,7 +37,7 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
 
                foreach ($attributes as $attribute => $value) {
 
-                       $startbb = str_replace('%'.++$i, '$1', $startbb);
+                       $startbb = str_replace('\x01'.++$i, '$1', $startbb);
 
                        if (strpos('*'.$startbb, '$1') > 0) {
 
@@ -76,28 +76,34 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
        return($replace);
 }
 
+if(!function_exists('deletenode')) {
 function deletenode(&$doc, $node)
 {
        $xpath = new DomXPath($doc);
        $list = $xpath->query("//".$node);
        foreach ($list as $child)
                $child->parentNode->removeChild($child);
+}}
+
+function _replace_code_cb($m){
+       return "<code>".str_replace("\n","<br>\n",$m[1]). "</code>";
 }
 
 function html2bbcode($message)
 {
 
-       //$file = tempnam("/tmp/", "html");
-       //file_put_contents($file, $message);
-
        $message = str_replace("\r", "", $message);
 
+       $message = preg_replace_callback("|<pre><code>([^<]*)</code></pre>|ism", "_replace_code_cb", $message);
+
        $message = str_replace(array(
                                        "<li><p>",
-                                       "</p></li>"),
+                                       "</p></li>",
+                               ),
                                array(
                                        "<li>",
-                                       "</li>"),
+                                       "</li>",
+                               ),
                                $message);
 
        // remove namespaces
@@ -189,6 +195,7 @@ function html2bbcode($message)
 
        node2bbcode($doc, 'span', array(), "", "");
        node2bbcode($doc, 'pre', array(), "", "");
+
        node2bbcode($doc, 'div', array(), "\r", "\r");
        node2bbcode($doc, 'p', array(), "\n", "\n");
 
@@ -206,12 +213,19 @@ function html2bbcode($message)
        //node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
        //node2bbcode($doc, 'td', array(), "[td]", "[/td]");
 
-       node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
-       node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
-       node2bbcode($doc, 'h3', array(), "\n\n[size=large][b]", "[/b][/size]\n");
-       node2bbcode($doc, 'h4', array(), "\n\n[size=medium][b]", "[/b][/size]\n");
-       node2bbcode($doc, 'h5', array(), "\n\n[size=small][b]", "[/b][/size]\n");
-       node2bbcode($doc, 'h6', array(), "\n\n[size=x-small][b]", "[/b][/size]\n");
+       //node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
+       //node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
+       //node2bbcode($doc, 'h3', array(), "\n\n[size=large][b]", "[/b][/size]\n");
+       //node2bbcode($doc, 'h4', array(), "\n\n[size=medium][b]", "[/b][/size]\n");
+       //node2bbcode($doc, 'h5', array(), "\n\n[size=small][b]", "[/b][/size]\n");
+       //node2bbcode($doc, 'h6', array(), "\n\n[size=x-small][b]", "[/b][/size]\n");
+
+       node2bbcode($doc, 'h1', array(), "\n\n[h1]", "[/h1]\n");
+       node2bbcode($doc, 'h2', array(), "\n\n[h2]", "[/h2]\n");
+       node2bbcode($doc, 'h3', array(), "\n\n[h3]", "[/h3]\n");
+       node2bbcode($doc, 'h4', array(), "\n\n[h4]", "[/h4]\n");
+       node2bbcode($doc, 'h5', array(), "\n\n[h5]", "[/h5]\n");
+       node2bbcode($doc, 'h6', array(), "\n\n[h6]", "[/h6]\n");
 
        node2bbcode($doc, 'a', array('href'=>'/mailto:(.+)/'), '[mail=$1]', '[/mail]');
        node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
@@ -225,6 +239,7 @@ function html2bbcode($message)
        node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
        node2bbcode($doc, 'code', array(), '[code]', '[/code]');
+    node2bbcode($doc, 'key', array(), '[code]', '[/code]');
 
        $message = $doc->saveHTML();