X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;ds=sidebyside;f=ItemAddEmbedVideo.inc;h=c0d355dc927a11fa18e5b6bb49a3a3486b5ccd32;hb=12aedded878face3b4c06f1d0886f9f4fd1b96bc;hp=457ad724a52fd6ae6920873c550f05d11c5f7b0c;hpb=6adbc488a2f3fb1001f4dd8497f047fb31e911b4;p=embedvideo%2F.git
diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 457ad72..c0d355d 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -38,7 +38,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
if (isset($form['action']['addEmbedVideoPage'])) {
$platform =& $gallery->getPlatform();
-
+
+ if (empty($extraHeaders)) {
+ $extraHeaders = array('Referer' => str_replace('&', '&', $url));
+ }
+
if(isset($form['webPage']['URL'])) {
/* Load any stored/set Parameters */
@@ -75,9 +79,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$googlePlayer="http://video.google.com/googleplayer.swf";
/* Gallery2 specific paths and variables */
- $gallery2_url = "http://www.pippins.net/gallery2";
- $gallery2_flv_thumbnail = "/modules/thumbnail/images/G2video.jpg";
- $gallery2_flv_player = "/modules/flashvideo/lib/G2flv.swf";
+ $urlGenerator =& $gallery->getUrlGenerator();
+ $gallery2_url = $urlGenerator->getCurrentUrlDir();
+ $gallery2_flv_thumbnail = "modules/thumbnail/images/G2video.jpg";
+ $gallery2_flv_player = "modules/flashvideo/lib/G2flv.swf";
/* Store the passed URL in a shorter local variable */
$url = $form['webPage']['URL'];
@@ -109,7 +114,13 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$feed.= "&dev_id=$dev_id&video_id=$video_id";
/* Get the youtube xml feed as a string data source */
- $xml = _getFeed($feed);
+ 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"),null,null);
+ }
+
if($debugOutput) {
print "$xml";
@@ -161,7 +172,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Grab the contents of the webpage used to display the video on video.google.com */
- $contents=file_get_contents($url);
+ 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"),null,null);
+ }
/* Extract the summary from the webpage contents */
preg_match('//i',
@@ -183,7 +199,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description = '';
$description.= "
$summary";
@@ -213,9 +229,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
* Check to make sure the URL to the remote flv file is valid
* (That the file exists at the URL given)
*/
- if (empty($extraHeaders)) {
- $extraHeaders = array('Referer' => str_replace('&', '&', $url));
- }
list ($successfullyCopied, $response, $headers) =
GalleryCoreApi::fetchWebPage($url, $extraHeaders);
if (!$successfullyCopied) {
@@ -326,9 +339,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Fetch the thumbnail and save it to a local file */
- if (empty($extraHeaders)) {
- $extraHeaders = array('Referer' => str_replace('&', '&', $url));
- }
list ($successfullyCopied, $response, $headers) =
GalleryCoreApi::fetchWebFile($thumbnail, $tmpFile, $extraHeaders);
if (!$successfullyCopied) {
@@ -411,24 +421,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
return array(null, $module->translate('Embed Video'));
}
-
-
- /**
- * ItemAddEmbedVideo::_getFeed
- */
- function _getFeed($feed) {
-
- /* Open and return Feed with cURL for parsing */
- $ch = curl_init();
- $timeout = 0;
- curl_setopt ($ch, CURLOPT_URL, $feed);
- curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
- $xml = curl_exec($ch);
- curl_close($ch);
-
- return $xml;
- }
}
?>