From 064c843119576c1345a61a531dfaa1076a54f3f0 Mon Sep 17 00:00:00 2001
From: Michael <icarus@dabo.de>
Date: Sun, 19 Feb 2012 21:07:45 +0100
Subject: Handling nested bbcodes. Some small design changes in html2bbcode.
 Change in poller.php is just for testing purposes.

---
 include/html2bbcode.php | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'include/html2bbcode.php')

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 1b4b5e99a..4297ff2f9 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -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");
@@ -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[hr]",
+					"[hr]\n",
+					"\n[list",
+					"[/list]\n",
 					"\n[/list]",
 					"[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]",
 					"[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);
-- 
cgit v1.2.3