patches for youtube's change in link and embed formats, please test

diff --git a/include/bbcode.php b/include/bbcode.php
index 89a14988a26709663a65043c329b6fca63847d00..195fc91819ed1e8625c0d02b91dae2eb5742ab53 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -94,7 +94,11 @@ function bbcode($Text,$preserve_nl = false) {
 
        // Youtube extensions
         $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$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);
+        $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
+
+       $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" allowfullscreen></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);
 
        // oembed tag
        $Text = oembed_bbcode2html($Text);

diff --git a/include/items.php b/include/items.php
index 8c2c78696c57fba346fdf7b9b9da950920602f79..3170b93842696b2259422f6240b25fefd8cb1221 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -354,6 +354,9 @@ function get_atom_elements($feed,$item) {
                $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'] = oembed_html2bbcode($res['body']);
 
                $config = HTMLPurifier_Config::createDefault();
@@ -521,6 +524,10 @@ function get_atom_elements($feed,$item) {
                                $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']);
+
+
                                $config = HTMLPurifier_Config::createDefault();
                                $config->set('Cache.DefinitionImpl', null);
 
@@ -560,6 +567,9 @@ function get_atom_elements($feed,$item) {
                                $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']);
+
                                $config = HTMLPurifier_Config::createDefault();
                                $config->set('Cache.DefinitionImpl', null);
 

diff --git a/mod/update_network.php b/mod/update_network.php
index f9914abc284f21be913c0fadc01a5a1047546792..36de0722a9dcace04bb1e527a3ab977792da348b 100644 (file)
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -26,6 +26,8 @@ function update_network_content(&$a) {
         $text = preg_replace($pattern, $replace, $text);
         $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
         $text = preg_replace($pattern, $replace, $text);
+        $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+        $text = preg_replace($pattern, $replace, $text);
 
 
         echo str_replace("\t",'       ',$text);

diff --git a/mod/update_profile.php b/mod/update_profile.php
index 40ee33325bc262c90246071927fbf9ea0ee425aa..c4884b30f545eb3378dd6514ec6336157bfd119a 100644 (file)
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -45,6 +45,8 @@ function update_profile_content(&$a) {
        $text = preg_replace($pattern, $replace, $text);
        $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
        $text = preg_replace($pattern, $replace, $text);
+    $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+    $text = preg_replace($pattern, $replace, $text);
 
        /**
         * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well