From ddfbcdb8e5c88fccadbc4a3af95d47792815ad50 Mon Sep 17 00:00:00 2001 From: "Alan J. Pippin" Date: Wed, 17 Jun 2009 20:50:07 -0600 Subject: [PATCH] Added new allowFullScreen option for youtube videos Fixed dailymotion embed video parser --- ItemAddEmbedVideo.inc | 26 ++++++++++++++++++++------ templates/EmbedVideoSiteAdmin.tpl | 3 +++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc index bbb941d..8049610 100644 --- a/ItemAddEmbedVideo.inc +++ b/ItemAddEmbedVideo.inc @@ -92,7 +92,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $watermarkAlignment = $this->getParameter($ItemAddEmbedVideo, 'watermarkAlignment', "left"); $wordwrapSummary = $this->getParameter($ItemAddEmbedVideo, 'wordwrapSummary', "0"); $wordwrapDescription = $this->getParameter($ItemAddEmbedVideo, 'wordwrapDescription', "0"); - + $allowFullScreen = $this->getParameter($ItemAddEmbedVideo, 'allowFullScreen', "false"); + /* Print our stored/set Parameters */ if(!strcmp($debugOutput,"true")) { print "\n
"; @@ -112,6 +113,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { print "watermarkAlignment=$watermarkAlignment
\n"; print "wordwrapSummary=$wordwrapSummary
\n"; print "wordwrapDescription=$wordwrapDescription
\n"; + print "allowFullScreen=$allowFullScreen
\n"; print "
\n"; } @@ -287,15 +289,26 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $youtubeShowRelatedStr="&rel=0"; } + /* Determine if the video should show related videos or not based on the youtubeShowRelated parameter */ + $fullScreenStr=""; + $fullScreenParamStr1=""; + $fullScreenParamStr2=""; + if(!strcmp($allowFullScreen,"true")) { + $fullScreenStr="&fs=1"; + $fullScreenParamStr1=""; + $fullScreenParamStr2=" allowfullscreen=\"true\""; + } + /* Format the description to hold a reference to the embedded video */ $description = ''; $description.= ''; $description.= ''; + $description.= $fullScreenParamStr1; $description.= ''; + $description.= 'width="'.$width.'" height="'.$height.'"'.$fullScreenParamStr2.'>'; /* ********************************** @@ -335,12 +348,13 @@ class ItemAddEmbedVideo extends ItemAddPlugin { } /* Extract the thumbnail URL from the webpage contents */ - preg_match('/\'(http:\/\/.*?\/ThumbnailServer2.+?)\'/i', + preg_match('/\'.+?thumbnail.+?(http:\/\/.*?\/ThumbnailServer2.+?)\'/i', $contents, $matches); $thumbnail=$matches[1]; $thumbnail=preg_replace("/\\\\x26/","&",$thumbnail); $thumbnail=preg_replace("/\\\\x3d/","=",$thumbnail); - + $thumbnail=urldecode($thumbnail); + /* Determine what our width and height should be based on our useRemoteSize parameter */ if(!strcmp($useRemoteSize,"true")) { $width = $googleWidth; @@ -557,7 +571,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $thumbnail=$dailymotionThumbnailUrl.$item_id; /* Format the description to hold a reference to the embedded video */ - if(preg_match('/