\n";
+ print "debugOutput=$debugOutput \n";
+ print "useInternalFlvPlayer=$useInternalFlvPlayer \n";
+ print "youtubeShowRelated=$youtubeShowRelated \n";
+ print "width=$width \n";
+ print "height=$height \n";
+ print "externalFlvPlayer=$externalFlvPlayer \n";
+ print "externalFlvPlayerVars=$externalFlvPlayerVars \n";
+ print "flvThumbnail=$flvThumbnail \n";
+ print "useRemoteSize=$useRemoteSize \n";
+ print "autoStart=$autoStart \n";
+ print "watermarkVideos=$watermarkVideos \n";
+ print "watermarkImage=$watermarkImage \n";
+ print "watermarkAlignment=$watermarkAlignment \n";
+ print "wordwrapSummary=$wordwrapSummary \n";
+ print "wordwrapDescription=$wordwrapDescription \n";
+ print "\n";
}
/* 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";
+ $revverThumbnailUrl="http://frame.revver.com/frame/120x90/";
+
+ /* dailymotion */
+ $dailymotionUrlPattern="dailymotion";
+ $dailymotionThumbnailUrl="http://www.dailymotion.com/thumbnail/160x120/video/";
+
+ /* divshare */
+ $divshareUrlPattern="divshare";
+ $divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/";
+
+ /* stickam */
+ $stickamUrlPattern="stickam";
+ $stickamThumbnailUrl="http://static.stickam.com/";
+
+ /* myspace */
+ $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();
@@ -140,104 +170,132 @@ 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 */
+ /* Strip trailing whitespace in the url, this will cause problems later */
$url = $form['webPage']['URL'];
-
+ if(preg_match("/(.*?)\s+/",$url,$matches)) {
+ $url = $matches[1];
+ }
+
/*
*****************************
* Embed a Youtube Video
*****************************
*/
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);
}
-
- /* Make sure we have a valid youtube developer id */
- $dev_id = $youtubeDevId;
- if(!preg_match("/\w+/",$dev_id)) {
- return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED,__FILE__,__LINE__,
- "Invalid/missing YouTube developer ID: $dev_id"),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.'?method=youtube.videos.get_details';
- $feed.= "&dev_id=$dev_id&video_id=$video_id";
-
+ $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);
+ 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);
+ "Unable to retrieve video information from youtube.".
+ "You cannot embed a private youtube video: $url"),null,null);
}
-
+
if(!strcmp($debugOutput,"true")) {
- print "
Youtube XML Dump
";
+ print "\n
Youtube XML Dump
";
print "$xml";
print "";
}
-
+
/* 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);
-
+ 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 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 autoplay or not based on the autoStart parameter */
$autoStartStr="";
if(!strcmp($autoStart,"true")) {
$autoStartStr="&autoplay=1";
}
-
+
/* 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.= " $summary";
/*
**********************************
@@ -277,10 +335,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Extract the thumbnail URL from the webpage contents */
- preg_match('/ ';
$description.= '';
- $description.= " $summary";
/*
**********************************
@@ -318,7 +376,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
"Unable to extract vid id from url: $url"),null,null);
}
- /* Grab the contents of the webpage used to display the video on video.google.com */
+ /* Grab the contents of the webpage used to display the video */
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
@@ -342,13 +400,16 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$thumbnail=$yahooThumbnailUrl.$vid_id."_01";
/* Format the description to hold a reference to the embedded video */
- preg_match('/(