X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=bbb941d3a6562f6d652a62af5ef336cd66f8f6a4;hb=ebec4ad4f9051c9101dfb1ff331ea5a1a1832094;hp=7ef877ed842a6e270f241eb722ba105c0764ed13;hpb=1528ab8803b189ef5118fe23c11dc93bd2b37954;p=embedvideo%2F.git diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc index 7ef877e..bbb941d 100644 --- a/ItemAddEmbedVideo.inc +++ b/ItemAddEmbedVideo.inc @@ -118,7 +118,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { /* 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 */ @@ -126,43 +126,43 @@ 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"; /* Gallery2 specific paths and variables */ $urlGenerator =& $gallery->getUrlGenerator(); @@ -175,8 +175,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin { $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 @@ -331,7 +335,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { } /* Extract the thumbnail URL from the webpage contents */ - preg_match('/thumbnail: \'(http:\/\/.*?\/ThumbnailServer2.+?)\'/i', + preg_match('/\'(http:\/\/.*?\/ThumbnailServer2.+?)\'/i', $contents, $matches); $thumbnail=$matches[1]; $thumbnail=preg_replace("/\\\\x26/","&",$thumbnail); @@ -372,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) { @@ -422,7 +426,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) { @@ -475,7 +479,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) { @@ -533,7 +537,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) { @@ -583,7 +587,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) { @@ -632,7 +636,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); @@ -660,7 +664,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); @@ -690,7 +694,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) { @@ -760,7 +764,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) { @@ -798,18 +802,19 @@ class ItemAddEmbedVideo extends ItemAddPlugin { } /* Format the description to hold a reference to the embedded video */ - $description = ''; $description.= ''; - $description.= ''; - $description.= ''; - $description.= ''; - + $description.= ''; + $description.= ''; + $description.= ''; + $description.= ''; + /* ********************************** * Embed a remote .swf file @@ -1023,7 +1028,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin { */ 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); }