Merge lp:~quam-plures-core/quam-plures/youtube-iframe into lp:quam-plures

[Yabs]

Users can now paste iframe embed code

¥

[Kimberly (kimberly-netweb360)]

Tested and working; thanks.

[EdB (edb)]

downloading but probably won't be able to test for a while :(

[Yabs (yabs)]

No worries, I'm not exactly over endowed with coding time for QP myself ;)

¥

[Yabs (yabs)]

Ooops, sorry Kimberly I missed your comment :-S

Thanks for testing :D

¥

[EdB (edb)]

Sorry for the delay, but finally tested and approving and will merge into core tomorrow (just in case anyone else wants to wait till the last minute), but I did notice a funky thing that I'll bring up in the forums. If I can find the thread :(

review: Approve

=== modified file 'qp_plugins/video_plugin/video_modules/_youtube.vp.php'
--- qp_plugins/video_plugin/video_modules/_youtube.vp.php	2010-06-14 15:22:51 +0000
+++ qp_plugins/video_plugin/video_modules/_youtube.vp.php	2011-04-24 11:30:55 +0000
@@ -4,7 +4,7 @@
  *
  * Quam Plures - {@link http://quamplures.net/}
  * Released under GNU GPL License - {@link http://quamplures.net/license.html}
- * @copyright (c) 2010 by the Quam Plures developers - {@link http://quamplures.net/}
+ * @copyright (c) 2010 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
  *
  * @package plugins
  * @subpackage video
@@ -77,14 +77,20 @@
 		 *
 		 * Sample url :
 		 * http://www.youtube.com/watch?v=xGQJuALzNGo&feature=featured
+		 *
+		 * Sample iframe
+		 * <iframe title="YouTube video player" width="640" height="390" src="http://www.youtube.com/embed/Hzgzim5m7oU" frameborder="0" allowfullscreen></iframe>
 		 */
 		$r = <<<JAVASCRIPT
 var regex = new RegExp( '^.+?width="([0-9]+?)" height="([0-9]+?)".+?youtube\.com\/v\/(.+?)&.+?$', 'i' );
 var regexUrl = new RegExp( '^.+?youtube.com\/.+?v=(.+?)(&.+?)?$' );
+var regexIframe = new RegExp( '^.+?width="([0-9]+?)" height="([0-9]+?)".+?youtube\.com\/embed\/(.+?)".+?$', 'i' );
 if( vid_code.match( regex ) ) {
 	return '[video:youtube:'+vid_code.replace( regex, '$3 w:$1 h:$2' )+']';
 } else if( vid_code.match( regexUrl ) ) {
 	return '[video:youtube:'+vid_code.replace( regexUrl, '$1' )+']';
+} else if( vid_code.match( regexIframe ) ) {
+	return '[video:youtube:'+vid_code.replace( regexIframe, '$3 w:$1 h:$2' )+']';
 } else {
 	return false;
 }