X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=03a54e94d31d5b2b68e911c9d0ce04c9c6f97c49;hb=c4a807484f66dda119f14d37ef4b57a8ad4a5997;hp=983ec79d041f82e00dcbb2c4968928f06d7ade98;hpb=b219b04f87d68297cc8fd849aec6a2b6df92ba39;p=embedvideo%2F.git
diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 983ec79..03a54e9 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -70,6 +70,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
global $debugOutput, $useInternalFlvPlayer, $youtubeDevId;
global $width, $height, $externalFlvPlayer, $externalFlvPlayerVars;
global $flvThumbnail, $useRemoteSize, $autoStart;
+ global $watermarkVideos, $watermarkImage;
/* 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
@@ -78,6 +79,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$debugOutput = $this->getParameter($ItemAddEmbedVideo, 'debugOutput', "false");
$useInternalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'useInternalFlvPlayer', "true");
$youtubeDevId = $this->getParameter($ItemAddEmbedVideo, 'youtubeDevId', "");
+ $youtubeShowRelated = $this->getParameter($ItemAddEmbedVideo, 'youtubeShowRelated', "false");
$width = $this->getParameter($ItemAddEmbedVideo, 'width', "320");
$height = $this->getParameter($ItemAddEmbedVideo, 'height', "240");
$externalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'externalFlvPlayer', "");
@@ -85,6 +87,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$flvThumbnail = $this->getParameter($ItemAddEmbedVideo, 'flvThumbnail', "");
$useRemoteSize = $this->getParameter($ItemAddEmbedVideo, 'useRemoteSize', "false");
$autoStart = $this->getParameter($ItemAddEmbedVideo, 'autoStart', "false");
+ $watermarkImage = $this->getParameter($ItemAddEmbedVideo, 'watermarkImage', "");
+ $watermarkVideos = $this->getParameter($ItemAddEmbedVideo, 'watermarkVideos', "false");
/* Print our stored/set Parameters */
if(!strcmp($debugOutput,"true")) {
@@ -93,6 +97,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
print "debugOutput=$debugOutput ";
print "useInternalFlvPlayer=$useInternalFlvPlayer ";
print "youtubeDevId=$youtubeDevId ";
+ print "youtubeShowRelated=$youtubeShowRelated ";
print "width=$width ";
print "height=$height ";
print "externalFlvPlayer=$externalFlvPlayer ";
@@ -100,6 +105,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
print "flvThumbnail=$flvThumbnail ";
print "useRemoteSize=$useRemoteSize ";
print "autoStart=$autoStart ";
+ print "watermarkVideos=$watermarkVideos ";
+ print "watermarkImage=$watermarkImage ";
print "
";
}
@@ -130,7 +137,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
/* Gallery2 specific paths and variables */
$urlGenerator =& $gallery->getUrlGenerator();
$gallery2_url = $urlGenerator->getCurrentUrlDir();
- $gallery2_flv_thumbnail = "modules/thumbnail/images/G2video.jpg";
+ $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";
/* Store the passed URL in a shorter local variable */
@@ -170,6 +178,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
"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);
+ }
+
if(!strcmp($debugOutput,"true")) {
print "
Youtube XML Dump
";
print "$xml";
@@ -207,14 +221,21 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
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";
@@ -242,7 +263,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Extract the summary from the webpage contents */
- preg_match('//i',
+ //print "contents: $contents ";
+ preg_match('//i',
$contents, $matches);
$summary=$matches[1];
@@ -375,7 +397,48 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
$description.= "";
$description.= " $summary";
-
+
+
+ /*
+ **********************************
+ * Embed a remote .swf file
+ **********************************
+ */
+ } else if(preg_match("/.*\/(.+?)\.swf/i",$url,$matches)) {
+
+ /* Set the title and summary to the name of the file */
+ $title = $matches[1];
+ $summary = $matches[1];
+
+ /*
+ * Set the thumbnail to some generic jpg image,
+ * since we can't extract it from the remote swf file.
+ * 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;
+ }
+
+ /*
+ * Check to make sure the URL to the remote swf file is valid
+ * (That the file exists at the URL given)
+ */
+ list ($successfullyCopied, $response, $headers) =
+ $this->fetchWebFileHeaders($url, $extraHeaders);
+ if (!$successfullyCopied) {
+ return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+ "Unable to find the video at url: $url - $response"),NULL,NULL);
+ }
+
+ /*
+ * Format the description to hold a reference to the embedded video
+ */
+
+ /* Format the description to hold a reference to the embedded video */
+ $description ='