X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=4e16f42b64a17da624bdd5cc76ed2447a935a551;hb=6873be3aaa2b28177e7d880086479211b9ea4120;hp=7103c3715ecc234aced11a029baa43ac49b8ac4e;hpb=eb0134debd4c65ec664ca25e07b9f16edb839842;p=embedvideo%2F.git diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc index 7103c37..4e16f42 100644 --- a/ItemAddEmbedVideo.inc +++ b/ItemAddEmbedVideo.inc @@ -67,10 +67,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin { } /* Store any Parameters into some simpler, shorter, local variables */ - global $debugOutput, $useInternalFlvPlayer, $youtubeDevId; + global $debugOutput, $useInternalFlvPlayer; global $width, $height, $externalFlvPlayer, $externalFlvPlayerVars; global $flvThumbnail, $useRemoteSize, $autoStart; global $watermarkVideos, $watermarkImage, $watermarkAlignment; + global $unsupported_url; /* Find out what value our parameters should have by looking to see if they * are defined in our overrides section or default section. If they are not @@ -78,7 +79,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin { */ $debugOutput = $this->getParameter($ItemAddEmbedVideo, 'debugOutput', "false"); $useInternalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'useInternalFlvPlayer', "true"); - $youtubeDevId = $this->getParameter($ItemAddEmbedVideo, 'youtubeDevId', ""); $youtubeShowRelated = $this->getParameter($ItemAddEmbedVideo, 'youtubeShowRelated', "false"); $width = $this->getParameter($ItemAddEmbedVideo, 'width', "320"); $height = $this->getParameter($ItemAddEmbedVideo, 'height', "240"); @@ -99,7 +99,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin { print "

Variable Parameters

\n"; print "debugOutput=$debugOutput
\n"; print "useInternalFlvPlayer=$useInternalFlvPlayer
\n"; - print "youtubeDevId=$youtubeDevId
\n"; print "youtubeShowRelated=$youtubeShowRelated
\n"; print "width=$width
\n"; print "height=$height
\n"; @@ -119,48 +118,51 @@ class ItemAddEmbedVideo extends ItemAddPlugin { /* Store other string constants we'll use later */ /* youtube */ - $youtubeUrlPattern="youtube.com"; - $youtubeApiUrl="http://www.youtube.com/api2_rest"; + $youtubeUrlPattern="youtube"; + $youtubeApiUrl="http://gdata.youtube.com/feeds/api/"; $youtubeThumbnailUrl="http://img.youtube.com/vi/"; /* We can't extract the server size from youtube */ $youtubeWidth="425"; $youtubeHeight="350"; /* google */ - $googleUrlPattern="video.google.com"; + $googleUrlPattern="video.google"; $googlePlayer="http://video.google.com/googleplayer.swf"; /* We can't extract the server size from google video */ $googleWidth="400"; $googleHeight="326"; /* yahoo */ - $yahooUrlPattern="video.yahoo.com"; + $yahooUrlPattern="video.yahoo"; $yahooThumbnailUrl="http://thmg01.video.search.yahoo.com/image/"; /* metacafe */ - $metacafeUrlPattern="metacafe.com"; + $metacafeUrlPattern="metacafe"; $metacafeThumbnailUrl="http://www.metacafe.com/thumb/"; /* revver */ - $revverUrlPattern="revver.com"; + $revverUrlPattern="revver"; $revverThumbnailUrl="http://frame.revver.com/frame/120x90/"; /* dailymotion */ - $dailymotionUrlPattern="dailymotion.com"; + $dailymotionUrlPattern="dailymotion"; $dailymotionThumbnailUrl="http://www.dailymotion.com/thumbnail/160x120/video/"; /* divshare */ - $divshareUrlPattern="divshare.com"; + $divshareUrlPattern="divshare"; $divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/"; /* stickam */ - $stickamUrlPattern="stickam.com"; + $stickamUrlPattern="stickam"; $stickamThumbnailUrl="http://static.stickam.com/"; /* myspace */ - $myspaceUrlPattern="vids.myspace.com"; - $myspaceUrlPattern2="myspacetv.com"; + $myspaceUrlPattern="vids.myspace"; + $myspaceUrlPattern2="myspacetv"; $myspaceThumbnailUrl="http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID="; + + /* vimeo */ + $vimeoUrlPattern="vimeo.com"; /* Gallery2 specific paths and variables */ $urlGenerator =& $gallery->getUrlGenerator(); @@ -168,6 +170,9 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $gallery2_flv_thumbnail = "modules/embedvideo/images/G2video_thumbnail.jpg"; $gallery2_video_watermark = "modules/embedvideo/images/G2video_watermark1.png"; $gallery2_flv_player = "modules/flashvideo/lib/G2flv.swf"; + + /* Unsupported URLs */ + $unsupported_url=0; /* Store the passed URL in a shorter local variable */ $url = $form['webPage']['URL']; @@ -178,148 +183,116 @@ class ItemAddEmbedVideo extends ItemAddPlugin { ***************************** */ if(preg_match("/$youtubeUrlPattern/",$url)) { - + /* Make sure we can find a video_id in the URL */ - if(preg_match("/watch\?v=(.*)/",$url,$matches)) { + $extra_params = ""; + if(preg_match("/watch\?v=(.*?)(&\S+=\S+)/",$url,$matches)) { + $video_id = $matches[1]; + $extra_params = $matches[2]; + } else if (preg_match("/watch\?v=(.*)/",$url,$matches)) { + $video_id = $matches[1]; + } else if (preg_match("/v\/(.*)/",$url,$matches)) { $video_id = $matches[1]; } else { return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__, "Unable to extract video id from url: $url"),null,null); } - - /* If we have a valid youtube developer id, use that to get information about the video */ - /* Otherwise, just parse it directly from the HTML page */ - $dev_id = $youtubeDevId; - if(!preg_match("/\w+/",$dev_id)) { - /* No developer ID found. Proceed with direct page parsing. */ - - /* Grab the contents of the webpage used to display the video on video.google.com */ - list ($successfullyCopied, $contents, $response, $headers) = - GalleryCoreApi::fetchWebPage($url, $extraHeaders); - if (!$successfullyCopied) { - return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, - "Unable to get video information at url: $url - $response"),NULL,NULL); - } - - /* Extract the summary from the webpage contents */ - preg_match('//i', $contents, $matches); - $summary=$matches[1]; - - /* Extract the title from the webpage contents */ - preg_match('//i', $contents, $matches); - $title=$matches[1]; - /* Extract the thumbnail URL from the webpage contents */ - $thumbnail=$youtubeThumbnailUrl.$video_id."/default.jpg"; - - /* Determine if the video should autoplay or not based on the autoStart parameter */ - $autoStartStr=""; - if(!strcmp($autoStart,"true")) { - $autoStartStr="&autoplay=1"; - } else { - $autoStartStr="&autoplay=0"; - } - - /* Determine if the video should show related videos or not based on the youtubeShowRelated parameter */ - $youtubeShowRelatedStr=""; - if(!strcmp($youtubeShowRelated,"false")) { - $youtubeShowRelatedStr="&rel=0"; - } else { - $youtubeShowRelatedStr="&rel=1"; - } - - /* Format the description to hold a reference to the embedded video */ - if(preg_match('/id=\"embed_code\".+?value=\'(.+?)\'/', $contents, $matches)) { - $description=$matches[1]; - $description=preg_replace("/"/","'",$description); - $description=preg_replace("/</","<",$description); - $description=preg_replace("/>/",">",$description); - $description=preg_replace("/&/","&",$description); - $description=preg_replace("/&rel=1/",$autoStartStr.$youtubeShowRelatedStr,$description); - if(!strcmp($useRemoteSize,"false")) { - $description=preg_replace("/width='\d+'/","width='".$width."'",$description); - $description=preg_replace("/height='\d+'/","height='".$height."'",$description); - } - } else { - return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, - "Unable to extract embedded video information from url: $url"),NULL,NULL); - } - - } else { - /* We found a valid developer ID. Proceed with API calls. */ - - /* Youtube api feed */ - $feed = $youtubeApiUrl.'?method=youtube.videos.get_details'; - $feed.= "&dev_id=$dev_id&video_id=$video_id"; - - /* Get the youtube xml feed as a string data source */ - list ($successfullyCopied, $xml, $response, $headers) = - GalleryCoreApi::fetchWebPage($feed, $extraHeaders); - if (!$successfullyCopied) { - return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, - "Unable to get video information at url: $url - $response"),null,null); - } - - if(preg_match("/This video is private/",$xml)) { - return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__, - "Unable to retrieve video information from youtube.". - "You cannot embed a private youtube video: $url"),null,null); + /* If extra params were given, handle them here */ + if(strcmp($extra_params,"")) { + /* Handle the high quality format information */ + if(preg_match("/fmt=(\d+)/",$extra_params,$matches)) { + $extra_params="&ap=%2526fmt%3D".$matches[1]; } + } + + /* Youtube api feed */ + $feed = $youtubeApiUrl."videos/$video_id"; + + if(!strcmp($debugOutput,"true")) { + print "\n

Youtube URL Parsing Results

"; + print "video_id: $video_id
"; + print "extra_embed_params: $extra_params
"; + print "gdata feed: $feed
"; + print "
"; + } + + /* Get the youtube xml feed as a string data source */ + list ($successfullyCopied, $xml, $response, $headers) = + GalleryCoreApi::fetchWebPage($feed, $extraHeaders); + if (!$successfullyCopied) { + return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, + "Unable to get video information at url: $url - $response"),null,null); + } - if(!strcmp($debugOutput,"true")) { - print "\n

Youtube XML Dump

"; - print "$xml"; - print "
"; - } + if(preg_match("/This video is private/",$xml)) { + return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__, + "Unable to retrieve video information from youtube.". + "You cannot embed a private youtube video: $url"),null,null); + } - /* Extract certain information from the xml feed */ - preg_match_all("/\(.+?)\<\/title\>/smi",$xml, $title); - preg_match_all("/\(.+?)\<\/description\>/smi",$xml, $description); - preg_match_all("/\(.+?)\<\/thumbnail_url\>/smi",$xml, $thumbnail); + if(!strcmp($debugOutput,"true")) { + print "\n

Youtube XML Dump

"; + print "$xml"; + print "
"; + } - array_shift($title); - array_shift($thumbnail); - array_shift($description); + /* Extract certain information from the xml feed */ + preg_match_all("/\(.+?)\<\/media:title\>/smi",$xml, $title); + preg_match_all("/\(.+?)\<\/media:description\>/smi",$xml, $description); + preg_match_all("/\"; + print "summary: $summary
"; + print "thumbnail: $thumbnail
"; + } - /* Determine if the video should autoplay or not based on the autoStart parameter */ - $autoStartStr=""; - if(!strcmp($autoStart,"true")) { - $autoStartStr="&autoplay=1"; - } + /* Determine what our width and height should be based on our useRemoteSize parameter */ + if(!strcmp($useRemoteSize,"true")) { + $width = $youtubeWidth; + $height = $youtubeHeight; + } - /* Determine if the video should show related videos or not based on the youtubeShowRelated parameter */ - $youtubeShowRelatedStr=""; - if(!strcmp($youtubeShowRelated,"false")) { - $youtubeShowRelatedStr="&rel=0"; - } + /* Determine if the video should autoplay or not based on the autoStart parameter */ + $autoStartStr=""; + if(!strcmp($autoStart,"true")) { + $autoStartStr="&autoplay=1"; + } - /* Format the description to hold a reference to the embedded video */ - $description = ''; - $description.= ''; - $description.= ''; - $description.= ''; + /* Determine if the video should show related videos or not based on the youtubeShowRelated parameter */ + $youtubeShowRelatedStr=""; + if(!strcmp($youtubeShowRelated,"false")) { + $youtubeShowRelatedStr="&rel=0"; } + + /* Format the description to hold a reference to the embedded video */ + $description = ''; + $description.= ''; + $description.= ''; + $description.= ''; + /* ********************************** * Embed a Google Video @@ -358,10 +331,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin { } /* Extract the thumbnail URL from the webpage contents */ - preg_match('/(.+?)<\/div>/i', $contents, $matches); + preg_match('/
(.+?)<\/div>/i', $contents, $matches); $summary=$matches[1]; /* Extract the title from the webpage contents */ @@ -579,7 +553,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $thumbnail=$dailymotionThumbnailUrl.$item_id; /* Format the description to hold a reference to the embedded video */ - if(preg_match('/Embeddable Player:.+?value="(.+?)"/', $contents, $matches)) { + if(preg_match('/