From 557a7d0cec31a36d12898429c479c71671833dfd Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 11 Oct 2011 18:24:37 -0700
Subject: stuff  - background the external network notifications (Facebook,
 Twitter, Statusnet)  - add vimeo support  - consolidate editor video options
 (insert video, regardless of source)  - add "Connector Settings" page purely
 for configuring connectors  - moved mailbox settings to Connectors  - Move
 the "Connect/Follow" dialogue out of "find people" and move to top.  - Add
 "Find People" dialogue  - minor theme edits on duepuntozero and testbubble to
 make all this stuff work  - A bit of theming on duepunto notifications to
 eliminate the gigantic Diaspora profile photos.

---
 include/bbcode.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/bbcode.php')

diff --git a/include/bbcode.php b/include/bbcode.php
index 9abc7c439..b33be686e 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -141,6 +141,9 @@ function bbcode($Text,$preserve_nl = false) {
 		$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $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); 
+	$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="425" height="350" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
 
 //	$Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
-- 
cgit v1.2.3