some testbubble stuff

[friendica.git] / include / html2bbcode.php

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 1b4b5e99ab7eb006638a92edc9e33d630ef18612..32a90d7d631cfcaee36fcdddb5b33990036830a8 100755 (executable)
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -10,7 +10,7 @@ Originally made for the syncom project: http://wiki.piratenpartei.de/Syncom
 function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb)
 {
        do {
-               $done = node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb);
+               $done = node2bbcodesub($doc, $oldnode, $attributes, $startbb, $endbb);
        } while ($done);
 }
 
@@ -187,9 +187,13 @@ function html2bbcode($message)
 
        node2bbcode($doc, 'hr', array(), "[hr]", "");
 
-       node2bbcode($doc, 'table', array(), "", "");
-       node2bbcode($doc, 'tr', array(), "\n", "");
-       node2bbcode($doc, 'td', array(), "\t", "");
+       //node2bbcode($doc, 'table', array(), "", "");
+       //node2bbcode($doc, 'tr', array(), "\n", "");
+       //node2bbcode($doc, 'td', array(), "\t", "");
+       node2bbcode($doc, 'table', array(), "[table]", "[/table]");
+       node2bbcode($doc, 'th', array(), "[th]", "[/th]");
+       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");
@@ -200,7 +204,7 @@ function html2bbcode($message)
 
        node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
 
-       node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img$2x$3]$1', '[/img]');
+       node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img=$2x$3]$1', '[/img]');
        node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');
 
 
@@ -208,7 +212,7 @@ function html2bbcode($message)
        node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
        node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
-       node2bbcode($doc, 'code', array(), '[code]$1', '[/code]');
+       node2bbcode($doc, 'code', array(), '[code]', '[/code]');
 
        $message = $doc->saveHTML();
 
@@ -246,27 +250,30 @@ function html2bbcode($message)
                $message = str_replace("\n\n\n", "\n\n", $message);
        } while ($oldmessage != $message);
 
-       $message = str_replace(array(
+       do {
+               $oldmessage = $message;
+               $message = str_replace(array(
                                        "[/size]\n\n",
-                                       "\n\n[hr]\n",
-                                       "\n[hr]\n\n",
-                                       "\n\n[list",
-                                       "[/list]\n\n",
-                                       "\n[/list]",
+                                       "\n[hr]",
+                                       "[hr]\n",
+                                       "\n[list",
+                                       "[/list]\n",
+                                       "\n[/",
                                        "[list]\n",
                                        "[list=1]\n",
-                                       "\n\n[*]"),
+                                       "\n[*]"),
                                array(
                                        "[/size]\n",
-                                       "\n[hr]\n",
-                                       "\n[hr]\n",
-                                       "\n[list",
-                                       "[/list]\n",
+                                       "[hr]",
+                                       "[hr]",
+                                       "[list",
                                        "[/list]",
+                                       "[/",
                                        "[list]",
                                        "[list=1]",
-                                       "\n[*]"),
+                                       "[*]"),
                                $message);
+       } while ($message != $oldmessage);
 
        $message = str_replace(array('[b][b]', '[/b][/b]', '[i][i]', '[/i][/i]'),
                array('[b]', '[/b]', '[i]', '[/i]'), $message);