Loosened URL pattern matching, dropping "www." and ".com" expectations.
Fixed stickam video embedding parser.
Realized new vimeo webpage format makes them impossible to embed now.
/* Store other string constants we'll use later */
/* youtube */
/* 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 */
$youtubeApiUrl="http://gdata.youtube.com/feeds/api/";
$youtubeThumbnailUrl="http://img.youtube.com/vi/";
/* We can't extract the server size from youtube */
$youtubeHeight="350";
/* google */
$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 */
$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 */
$yahooThumbnailUrl="http://thmg01.video.search.yahoo.com/image/";
/* metacafe */
- $metacafeUrlPattern="metacafe.com";
+ $metacafeUrlPattern="metacafe";
$metacafeThumbnailUrl="http://www.metacafe.com/thumb/";
/* revver */
$metacafeThumbnailUrl="http://www.metacafe.com/thumb/";
/* revver */
- $revverUrlPattern="revver.com";
+ $revverUrlPattern="revver";
$revverThumbnailUrl="http://frame.revver.com/frame/120x90/";
/* dailymotion */
$revverThumbnailUrl="http://frame.revver.com/frame/120x90/";
/* dailymotion */
- $dailymotionUrlPattern="dailymotion.com";
+ $dailymotionUrlPattern="dailymotion";
$dailymotionThumbnailUrl="http://www.dailymotion.com/thumbnail/160x120/video/";
/* divshare */
$dailymotionThumbnailUrl="http://www.dailymotion.com/thumbnail/160x120/video/";
/* divshare */
- $divshareUrlPattern="divshare.com";
+ $divshareUrlPattern="divshare";
$divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/";
/* stickam */
$divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/";
/* stickam */
- $stickamUrlPattern="stickam.com";
+ $stickamUrlPattern="stickam";
$stickamThumbnailUrl="http://static.stickam.com/";
/* myspace */
$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 */
$myspaceThumbnailUrl="http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID=";
/* vimeo */
"Unable to extract vid id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
"Unable to extract item id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
"Unable to extract item id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
"Unable to extract item id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
"Unable to extract item id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
"Unable to extract item id from url: $url"),null,null);
}
"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);
$url=preg_replace("/&/","&",$url);
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
}
/* Format the description to hold a reference to the embedded video */
}
/* 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);
$description=$matches[1];
$description=preg_replace("/"/","'",$description);
$description=preg_replace("/</","<",$description);
"Unable to extract video id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
"Unable to extract video id from url: $url"),null,null);
}
"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) {
list ($successfullyCopied, $contents, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
*/
if($unsupported_url == 1) {
return array(GalleryCoreApi::error(ERROR_UNSUPPORTED_FILE_TYPE,__FILE__,__LINE__,
*/
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);
$this->setId('embedvideo');
$this->setName($gallery->i18n('Embed Video'));
$this->setDescription($gallery->i18n('Add embedded videos from the web'));
$this->setId('embedvideo');
$this->setName($gallery->i18n('Embed Video'));
$this->setDescription($gallery->i18n('Add embedded videos from the web'));
- $this->setVersion('1.1.1');
+ $this->setVersion('1.1.2');
$this->setGroup('import', $gallery->i18n('Import'));
$this->setCallbacks('getSiteAdminViews');
$this->setRequiredCoreApi(array(7, 3));
$this->setGroup('import', $gallery->i18n('Import'));
$this->setCallbacks('getSiteAdminViews');
$this->setRequiredCoreApi(array(7, 3));
<b>Stickam:</b> http://www.stickham.com/editMediaComment.do?method=load&mId=xxxxxxxxx<br>
<b>Myspace1:</b> http://vids.myspace.com/index.cfm?fuseaction=vids.individual&VideoID=xxxxxxxx<br>
<b>Myspace2:</b> http://myspacetv.com/index.cfm?fuseaction=vids.individual&videoid=xxxxxxxx<br>
<b>Stickam:</b> http://www.stickham.com/editMediaComment.do?method=load&mId=xxxxxxxxx<br>
<b>Myspace1:</b> http://vids.myspace.com/index.cfm?fuseaction=vids.individual&VideoID=xxxxxxxx<br>
<b>Myspace2:</b> http://myspacetv.com/index.cfm?fuseaction=vids.individual&videoid=xxxxxxxx<br>
- <b>Vimeo:</b> http://www.vimeo.com/xxxxxx<br>
<b>Generic:</b> Any webpage with an '<object ... <embed ...' style video on its page<br>
<br>
<b><u>Supported File Types:</u></b><br>
<b>Generic:</b> Any webpage with an '<object ... <embed ...' style video on its page<br>
<br>
<b><u>Supported File Types:</u></b><br>