aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-14 16:45:33 -0800
committerzotlabs <mike@macgirvin.com>2018-01-14 16:45:33 -0800
commitf0faa7f9b06481200c21459f9c53db457b7941b3 (patch)
tree26b62db515a80f34d863b8ea05cdb71b199bb03a
parent75285fd452147aba7d2edf938d63c158384095b5 (diff)
downloadvolse-hubzilla-f0faa7f9b06481200c21459f9c53db457b7941b3.tar.gz
volse-hubzilla-f0faa7f9b06481200c21459f9c53db457b7941b3.tar.bz2
volse-hubzilla-f0faa7f9b06481200c21459f9c53db457b7941b3.zip
support tables in markdown posts/comments (but not table alignment); and do not support iframes from html source.
-rw-r--r--include/html2bbcode.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index f67231847..4166299db 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -188,13 +188,14 @@ 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(), "[table]", "[/table]");
- //node2bbcode($doc, 'th', array(), "[th]", "[/th]");
- //node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
- //node2bbcode($doc, 'td', array(), "[td]", "[/td]");
+// 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[h1]", "[/h1]\n");
node2bbcode($doc, 'h2', array(), "\n\n[h2]", "[/h2]\n");
@@ -211,7 +212,7 @@ function html2bbcode($message)
node2bbcode($doc, 'video', array('src'=>'/(.+)/'), '[video]$1', '[/video]');
node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
- node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
+// node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
node2bbcode($doc, 'code', array(), '[code]', '[/code]');