X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fhtml2bbcode.php;h=189ba91f19c847e673844367c10c9a02054da19b;hb=e6463c8af6af247c9555bf2677a6aa75a4721d62;hp=d2699460e31a43ace5fdcd60b8dd9f5c6d7b3d4c;hpb=58ac6bde098ce2b28d851767b5aaf7d9095d6a44;p=friendica.git
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index d2699460e3..189ba91f19 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -1,11 +1,14 @@
query("//".$node);
- foreach ($list as $child)
- $child->parentNode->removeChild($child);
-}}
+function _replace_code_cb($m){
+ return "".str_replace("\n","
\n",$m[1]). "
";
+}
function html2bbcode($message)
{
$message = str_replace("\r", "", $message);
+ $message = preg_replace_callback("|
([^<]*)
|ism", "_replace_code_cb", $message);
+
$message = str_replace(array(
"",
- "
"),
+ "",
+ ),
array(
"",
- ""),
+ "",
+ ),
$message);
// remove namespaces
@@ -109,12 +111,12 @@ function html2bbcode($message)
@$doc->loadHTML($message);
- deletenode($doc, 'style');
- deletenode($doc, 'head');
- deletenode($doc, 'title');
- deletenode($doc, 'meta');
- deletenode($doc, 'xml');
- deletenode($doc, 'removeme');
+ xml::deleteNode($doc, 'style');
+ xml::deleteNode($doc, 'head');
+ xml::deleteNode($doc, 'title');
+ xml::deleteNode($doc, 'meta');
+ xml::deleteNode($doc, 'xml');
+ xml::deleteNode($doc, 'removeme');
$xpath = new DomXPath($doc);
$list = $xpath->query("//pre");
@@ -187,6 +189,7 @@ function html2bbcode($message)
node2bbcode($doc, 'span', array(), "", "");
node2bbcode($doc, 'pre', array(), "", "");
+
node2bbcode($doc, 'div', array(), "\r", "\r");
node2bbcode($doc, 'p', array(), "\n", "\n");
@@ -230,6 +233,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();