X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=ac7b1cf05dde317810575fc2f0820a8e02d77503;hb=bbe9d512174553b9b410742bb82c69ffa67911f5;hp=46e290b2904cce8df84ef9154ef40e36cc34e1d4;hpb=3feb31a7ea3788264c4fe4dbd30e531a4c5960fd;p=embedvideo%2F.git diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc index 46e290b..ac7b1cf 100644 --- a/ItemAddEmbedVideo.inc +++ b/ItemAddEmbedVideo.inc @@ -34,7 +34,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { * @see ItemAddPlugin::handleRequest */ function handleRequest($form, &$item) { - global $gallery; + global $gallery, $url; $status = $error = array(); @@ -67,7 +67,7 @@ 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; @@ -78,7 +78,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"); @@ -90,6 +89,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $watermarkImage = $this->getParameter($ItemAddEmbedVideo, 'watermarkImage', ""); $watermarkVideos = $this->getParameter($ItemAddEmbedVideo, 'watermarkVideos', "false"); $watermarkAlignment = $this->getParameter($ItemAddEmbedVideo, 'watermarkAlignment', "left"); + $wordwrapSummary = $this->getParameter($ItemAddEmbedVideo, 'wordwrapSummary', "0"); + $wordwrapDescription = $this->getParameter($ItemAddEmbedVideo, 'wordwrapDescription', "0"); /* Print our stored/set Parameters */ if(!strcmp($debugOutput,"true")) { @@ -97,7 +98,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"; @@ -109,6 +109,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin { print "watermarkVideos=$watermarkVideos
\n"; print "watermarkImage=$watermarkImage
\n"; print "watermarkAlignment=$watermarkAlignment
\n"; + print "wordwrapSummary=$wordwrapSummary
\n"; + print "wordwrapDescription=$wordwrapDescription
\n"; print "
\n"; } @@ -116,7 +118,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { /* youtube */ $youtubeUrlPattern="youtube.com"; - $youtubeApiUrl="http://www.youtube.com/api2_rest"; + $youtubeApiUrl="http://gdata.youtube.com/feeds/api/"; $youtubeThumbnailUrl="http://img.youtube.com/vi/"; /* We can't extract the server size from youtube */ $youtubeWidth="425"; @@ -157,6 +159,9 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $myspaceUrlPattern="vids.myspace.com"; $myspaceUrlPattern2="myspacetv.com"; $myspaceThumbnailUrl="http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID="; + + /* vimeo */ + $vimeoUrlPattern="www.vimeo.com"; /* Gallery2 specific paths and variables */ $urlGenerator =& $gallery->getUrlGenerator(); @@ -174,150 +179,114 @@ 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 { 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); - } - $description.= "
$summary"; - } 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 HD 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.= ''; - $description.= "
$summary"; + /* 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 @@ -379,7 +348,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $description.= 'type="application/x-shockwave-flash" '; $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> '; $description.= ''; - $description.= "
$summary"; /* ********************************** @@ -427,7 +395,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $description=preg_replace("/width='\d+'/","width='".$width."'",$description); $description=preg_replace("/height='\d+'/","height='".$height."'",$description); } - $description.= "
$summary"; } else { return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, "Unable to extract embedded video information from url: $url"),NULL,NULL); @@ -479,7 +446,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $description=preg_replace("/\.swf/",".swf?playerVars=autoPlay=yes",$description); } $description.= ""; - $description.= "
$summary"; } else { return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, "Unable to extract embedded video information from url: $url"),NULL,NULL); @@ -538,7 +504,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $description=preg_replace("/$height/",$height.";autoplay:true",$description); } $description.= ">"; - $description.= "
$summary"; } else { return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__, "Unable to extract embedded video information from url: $url"),NULL,NULL); @@ -570,18 +535,18 @@ class ItemAddEmbedVideo extends ItemAddPlugin { } /* Extract the summary from the webpage contents */ - preg_match('//i', $contents, $matches); + preg_match('/
(.+?)<\/div>/i', $contents, $matches); $summary=$matches[1]; /* Extract the title from the webpage contents */ preg_match('//i', $contents, $matches); - $title=$matches[1]; + $title=htmlentities($matches[1], ENT_QUOTES, "UTF-8"); /* Build the thumbnail URL from the item_id */ $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('/