aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-08 20:19:23 -0700
committerredmatrix <git@macgirvin.com>2016-05-08 20:19:23 -0700
commitb6e0d8dee02b1ecbb1396b9b973e11b92cd3b35b (patch)
treee621d573fdda7f05c09b5e061b3f5c88a769d498 /include/bbcode.php
parent2a14c7112834d4127f78ce177534045efe3c34a1 (diff)
downloadvolse-hubzilla-b6e0d8dee02b1ecbb1396b9b973e11b92cd3b35b.tar.gz
volse-hubzilla-b6e0d8dee02b1ecbb1396b9b973e11b92cd3b35b.tar.bz2
volse-hubzilla-b6e0d8dee02b1ecbb1396b9b973e11b92cd3b35b.zip
clean up some cruft
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php46
1 files changed, 0 insertions, 46 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 7a7ea8ce6..fd2d2f97a 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -492,18 +492,6 @@ function bb_observer($Text) {
function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) {
- $a = get_app();
-
- // Move all spaces out of the tags
- // ....Uhm why?
- // This is basically doing a trim() on the stuff in between tags, but it messes up
- // carefully crafted bbcode and especially other pre-formatted code.
- // Commenting out until we come up with a use case where it's needed. Then let's try and
- // special case rather than a heavy-handed approach like this.
-
-// $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
-// $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
-
// Hide all [noparse] contained bbtags by spacefying them
if (strpos($Text,'[noparse]') !== false) {
$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
@@ -834,9 +822,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
}
-
-
-
// Declare the format for [quote] layout
$QuoteLayout = '<blockquote>$1</blockquote>';
@@ -978,37 +963,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
}
}
- // Youtube extensions
-// if (strpos($Text,'[youtube]') !== false) {
-// if ($tryoembed) {
-// $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
-// $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
-// $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
-// }
-// $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
-// $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
-// $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
-
-// if ($tryoembed)
-// $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . App::$videowidth . '" height="' . App::$videoheight . '" src="http://www.youtube.com/embed/$1" frameborder="0"></iframe>', $Text);
-// else
-// $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
-// }
-// if (strpos($Text,'[vimeo]') !== false) {
-// if ($tryoembed) {
-// $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text);
-// $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text);
-// }
-
-// $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text);
-// $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text);
-
-// if ($tryoembed)
-// $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . App::$videowidth . '" height="' . App::$videoheight . '" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
-// else
-// $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
-// }
-
// oembed tag
$Text = oembed_bbcode2html($Text);