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/items.php | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'include/items.php')

diff --git a/include/items.php b/include/items.php
index 8360a42ec..4862ca578 100644
--- a/include/items.php
+++ b/include/items.php
@@ -414,11 +414,7 @@ function get_atom_elements($feed,$item) {
 
 	if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) {
 
-		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
-			'[youtube]$1[/youtube]', $res['body']);
-
-		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
-			'[youtube]$1[/youtube]', $res['body']);
+		$res['body'] = html2bb_video($res['body']);
 
 		$res['body'] = oembed_html2bbcode($res['body']);
 
@@ -586,12 +582,7 @@ function get_atom_elements($feed,$item) {
 			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
 
-				$body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
-					'[youtube]$1[/youtube]', $body);
-
-		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
-			'[youtube]$1[/youtube]', $res['body']);
-
+				$body = html2bb_video($body);
 
 				$config = HTMLPurifier_Config::createDefault();
 				$config->set('Cache.DefinitionImpl', null);
@@ -629,11 +620,7 @@ function get_atom_elements($feed,$item) {
 			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
 
-				$body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
-					'[youtube]$1[/youtube]', $body);
-
-		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
-			'[youtube]$1[/youtube]', $res['body']);
+				$body = html2bb_video($body);
 
 				$config = HTMLPurifier_Config::createDefault();
 				$config->set('Cache.DefinitionImpl', null);
-- 
cgit v1.2.3