aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-15 03:41:28 -0700
committerFriendika <info@friendika.com>2011-06-15 03:41:28 -0700
commit7601ce7de747dcffdb63be027ed8b8327e0b6e41 (patch)
treea040c246b2b4a5086235163a121e9b5bf601c67e
parentcee63c7a0d5362e255551d0a8c3dfa667322f8b1 (diff)
downloadvolse-hubzilla-7601ce7de747dcffdb63be027ed8b8327e0b6e41.tar.gz
volse-hubzilla-7601ce7de747dcffdb63be027ed8b8327e0b6e41.tar.bz2
volse-hubzilla-7601ce7de747dcffdb63be027ed8b8327e0b6e41.zip
iframes
-rw-r--r--include/bbcode.php1
-rw-r--r--include/html2bbcode.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index a44838c24..40f4935fb 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -97,6 +97,7 @@ function bbcode($Text,$preserve_nl = false) {
$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
+ $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
// [img=widthxheight]image source[/img]
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '<img src="$3" style="height:{$2}px; width:{$1}px;" >', $Text);
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 734282d95..d4e8cce66 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -35,6 +35,7 @@ function html2bbcode($s) {
'/\<blockquote\>(.*?)\<\/blockquote\>/is',
'/\<video(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/video\>/is',
'/\<audio(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/audio\>/is',
+ '/\<iframe(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/iframe\>/is',
);
@@ -60,6 +61,7 @@ function html2bbcode($s) {
'[quote]$1[/quote]',
'[video]$1[/video]',
'[audio]$1[/audio]',
+ '[iframe]$1[/iframe]',
);
// Replace $htmltags in $text with $bbtags