X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=820fe6f5f2d0e0ac393698803ee5ac0388c5b92e;hb=66480d152434ae78c77e1da6ea7af66762b2f440;hp=ac7b1cf05dde317810575fc2f0820a8e02d77503;hpb=bbe9d512174553b9b410742bb82c69ffa67911f5;p=embedvideo%2F.git
diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index ac7b1cf..820fe6f 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -71,6 +71,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
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
@@ -91,7 +92,9 @@ 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");
+ $centerVideo = $this->getParameter($ItemAddEmbedVideo, 'centerVideo', "false");
+
/* Print our stored/set Parameters */
if(!strcmp($debugOutput,"true")) {
print "\n";
@@ -111,13 +114,15 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
print "watermarkAlignment=$watermarkAlignment \n";
print "wordwrapSummary=$wordwrapSummary \n";
print "wordwrapDescription=$wordwrapDescription \n";
+ print "allowFullScreen=$allowFullScreen \n";
+ print "centerVideo=$centerVideo\n";
print "\n";
}
/* Store other string constants we'll use later */
/* youtube */
- $youtubeUrlPattern="youtube.com";
+ $youtubeUrlPattern="youtube";
$youtubeApiUrl="http://gdata.youtube.com/feeds/api/";
$youtubeThumbnailUrl="http://img.youtube.com/vi/";
/* We can't extract the server size from youtube */
@@ -125,43 +130,46 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$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="www.vimeo.com";
+ $vimeoUrlPattern="vimeo.com";
+
+ /* animoto */
+ $animotoUrlPattern="animoto.com";
/* Gallery2 specific paths and variables */
$urlGenerator =& $gallery->getUrlGenerator();
@@ -169,10 +177,17 @@ 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
@@ -187,6 +202,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$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);
@@ -194,14 +211,18 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
/* If extra params were given, handle them here */
if(strcmp($extra_params,"")) {
- /* Handle the HD format information */
+ /* Handle the high quality format information */
if(preg_match("/fmt=(\d+)/",$extra_params,$matches)) {
$extra_params="&ap=%2526fmt%3D".$matches[1];
+ if(!strcmp($matches[1],"22")) {
+ //$youtubeWidth=1280;
+ //$youtubeHeight=720;
+ }
}
}
/* Youtube api feed */
- $feed = $youtubeApiUrl."videos/$video_id";
+ $feed = $youtubeApiUrl."videos/".urlencode($video_id);
if(!strcmp($debugOutput,"true")) {
print "\n
Youtube URL Parsing Results
";
@@ -277,15 +298,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.= 'width="'.$width.'" height="'.$height.'"'.$fullScreenParamStr2.'>';
/*
**********************************
@@ -325,11 +357,13 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Extract the thumbnail URL from the webpage contents */
- preg_match('/(.+?)<\/textarea>/', $contents, $matches)) {
+ if(preg_match('/<.+? value="(.+?)" class=".+?" id="video_player_embed_code_text" \/>/', $contents, $matches)) {
$description=$matches[1];
$description=preg_replace("/"/","'",$description);
$description=preg_replace("/</","<",$description);
@@ -576,7 +608,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
"Unable to extract item 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) {
@@ -625,7 +657,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
"Unable to extract item 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 */
$url=preg_replace("/&/","&",$url);
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
@@ -653,7 +685,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Format the description to hold a reference to the embedded video */
- if(preg_match('/input type.+?'.$item_id.'.+?value="(.+?)"/', $contents, $matches)) {
+ if(preg_match('/readonly value="(.+?)"/', $contents, $matches)) {
$description=$matches[1];
$description=preg_replace("/"/","'",$description);
$description=preg_replace("/</","<",$description);
@@ -683,7 +715,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
"Unable to extract video 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) {
@@ -710,12 +742,21 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
if(preg_match('/thumbnail url="(.+?)"/',$video_info, $matches)) {
$thumbnail = $matches[1];
} else {
- return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
- "Unable to extract thumbnail information from url: $url"),NULL,NULL);
+ /*
+ * Set the thumbnail to some generic jpg image,
+ * since we can't extract it from the site.
+ * If no parameter is set, set it to a default value.
+ */
+ if(preg_match("/\w+/", $flvThumbnail)) {
+ $thumbnail = $flvThumbnail;
+ } else {
+ $thumbnail = $gallery2_url.$gallery2_flv_thumbnail;
+ }
}
/* Format the description to hold a reference to the embedded video */
- if(preg_match('/(<embed src.+?\/embed>)/', $contents, $matches)) {
+ if(preg_match('/(<embed src.+?\/embed>)/', $contents, $matches) ||
+ preg_match('/(<embed src.+?\/object>)/', $contents, $matches)) {
$description=$matches[1];
$description=preg_replace("/"/","'",$description);
$description=preg_replace("/</","<",$description);
@@ -744,7 +785,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
"Unable to extract video 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) {
@@ -782,18 +823,82 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Format the description to hold a reference to the embedded video */
- $description = '';
+ $description.= '';
+ $description.= '';
+ $description.= '';
+
+ /*
+ **********************************
+ * Embed an Animoto Video
+ **********************************
+ */
+ } else if(preg_match("/$animotoUrlPattern/",$url)) {
+
+ /* Make sure we can extract a itemID */
+ if(preg_match("/\/play\/(.+)/",$url,$matches)) {
+ $item_id = $matches[1];
+ $item_id=preg_replace("/\/$/","",$item_id);
+ } else {
+ return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+ "Unable to extract item id from url: $url"),null,null);
+ }
+
+ /* Grab the contents of the webpage used to display the video */
+ 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 embed video xml page from the webpage contents */
+ if(preg_match('/type="text\/xml\+oembed" href="(.+?)"/', $contents, $matches)) {
+ $xml_url=$matches[1];
+ } else {
+ return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+ "Unable to extract xml information from url: $url"),NULL,NULL);
+ }
+
+ /* Get the xml page contents */
+ list ($successfullyCopied, $contents, $response, $headers) =
+ GalleryCoreApi::fetchWebPage($xml_url, $extraHeaders);
+ if (!$successfullyCopied) {
+ return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+ "Unable to get video information at url: $xml_url - $response"),NULL,NULL);
+ }
+
+ /* Extract the title from the webpage contents */
+ preg_match('/(.+?)<\/title>/i', $contents, $matches);
+ $title=htmlentities($matches[1], ENT_QUOTES, "UTF-8");
+ /* Extract the thumbnail from the webpage contents */
+ preg_match('/<thumbnail_url>(.+?)<\/thumbnail_url>/i', $contents, $matches);
+ $thumbnail=$matches[1];
+
+ /* Format the description to hold a reference to the embedded video */
+ if(preg_match('/<html>(.+?)<\/html>/ism', $contents, $matches)) {
+ $description=$matches[1];
+ $description=preg_replace("/"/","'",$description);
+ $description=preg_replace("/</","<",$description);
+ $description=preg_replace("/>h;/",">",$description);
+ $description=preg_replace("/\\\\\"/","\"",$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);
+ }
/*
**********************************
* Embed a remote .swf file
@@ -836,11 +941,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
/*
**********************************
- * Embed a remote .flv file
+ * Embed a remote .flv or .mp4 file
**********************************
*/
- } else if(preg_match("/.*\/(.+?)\.flv/i",$url,$matches)) {
-
+ } else if(preg_match("/.*\/(.+?)\.flv/i",$url,$matches) ||
+ preg_match("/.*\/(.+?)\.mp4/i",$url,$matches)) {
+
/* Set the title and summary to the name of the file */
$title = $matches[1];
$summary = $matches[1];
@@ -942,15 +1048,71 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description.= 'pluginspage="http://www.macromedia.com/go/getflashplayer"/>';
$description.= '</object></div>';
}
-
+
+ /*
+ **********************************
+ * Embed a generic <object ... <embed ... video
+ **********************************
+ */
+ } else {
+
+ /* Grab the contents of the webpage used to display the video */
+ 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 URL base (site name) */
+ preg_match("/(http:\/\/.+?)\//i",$url,$matches);
+ $site = $matches[1];
+ print "site: $site<br>";
+
+ /* Extract the summary from the webpage contents */
+ $summary="Unknown";
+ if(preg_match('/<meta name="description" content="(.+?)"/si', $contents, $matches)) {
+ $summary=$matches[1];
+ }
+
+ /* Extract the title from the webpage contents */
+ $title="Unknown";
+ if(preg_match('/<title>(.+?)<\/title>/i', $contents, $matches)) {
+ $title=$matches[1];
+ }
+
+ /*
+ * Set the thumbnail to some generic jpg image,
+ * since we can't extract it from a generic website.
+ * If no parameter is set, set it to a default value.
+ */
+ if(preg_match("/\w+/", $flvThumbnail)) {
+ $thumbnail = $flvThumbnail;
+ } else {
+ $thumbnail = $gallery2_url.$gallery2_flv_thumbnail;
+ }
+
+ /* Format the description to hold a reference to the embedded video */
+ if(preg_match('/(<object.+?<embed.+?<\/object>)/', $contents, $matches)) {
+ $description=$matches[1];
+ if(!strcmp($useRemoteSize,"false")) {
+ $description=preg_replace("/width=\"\d+\"/","width=\"".$width."\"",$description);
+ $description=preg_replace("/height=\"\d+\"/","height=\"".$height."\"",$description);
+ }
+ $description=preg_replace("/src=\"\//","src=\"".$site."\/",$description);
+ } else {
+ $unsupported_url=1;
+ }
+ }
+
/*
**********************************
* Unsupported URL to embed
**********************************
*/
- } else {
+ if($unsupported_url == 1) {
return array(GalleryCoreApi::error(ERROR_UNSUPPORTED_FILE_TYPE,__FILE__,__LINE__,
- "Unable to embed video from: $url"),null,null);
+ "The URL you have supplied is unsupported (check the list of supported URLs, they must match exactly). You tried to embed a video from this url: $url"),null,null);
}
@@ -996,6 +1158,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
/* Tack on the summary to the end of the description */
$description.= "<br>$description_summary";
+
+ /* Add centering tags to the description if requested */
+ if(!strcmp($centerVideo,"true")) {
+ $description = "<center>" . $description . "</center>";
+ }
/* General debug output */
if(!strcmp($debugOutput,"true")) {