X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=3a1fa7967e7cda4195a2e7fb54057d346917c8a5;hb=c715f7d9dc80bca025984c9150c02ccc4bbdce80;hp=57f9132dd8c519364f894d6949b493747a642520;hpb=0bdf2fca593cfb8b6832bf3491f6db1f175fceef;p=embedvideo%2F.git

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 57f9132..3a1fa79 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -78,6 +78,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', "");
@@ -89,10 +90,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   /* Print our stored/set Parameters */
 	   if(!strcmp($debugOutput,"true")) {
 	     print "<hr>";
-	     print "<h2>Parameters</h2>";
+	     print "<h2>Variable Parameters</h2>";
 	     print "debugOutput=$debugOutput<br>";
 	     print "useInternalFlvPlayer=$useInternalFlvPlayer<br>";
 	     print "youtubeDevId=$youtubeDevId<br>";
+	     print "youtubeShowRelated=$youtubeShowRelated<br>";
 	     print "width=$width<br>";
 	     print "height=$height<br>";
 	     print "externalFlvPlayer=$externalFlvPlayer<br>";
@@ -170,6 +172,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 "<h2>Youtube XML Dump</h2>";
 		 print "$xml";
@@ -207,14 +215,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 = '<object width="'.$width.'" height="'.$height.'">';
 	       $description.= '<param name="movie" ';
 	       $description.= 'value="http://www.youtube.com/v/'.$video_id.'"></param>';
 	       $description.= '<param name="wmode" value="transparent"></param>';
-	       $description.= '<embed src="http://www.youtube.com/v/'.$video_id.$autoStartStr.'" ';
-	       $description.= 'type="application/x-shockwave-flash" wmode="transparent" ';
+	       $description.= '<embed src="http://www.youtube.com/v/';
+	       $description.= $video_id.$autoStartStr.$youtubeShowRelatedStr;
+	       $description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
 	       $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
 	       $description.= "<br>$summary";
 
@@ -242,7 +257,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       }
 
 	       /* Extract the summary from the webpage contents */
-	       preg_match('/<meta content="(.+?)\. \w+ \d+, \d+.*" name="description">/i',
+	       //print "contents: $contents <br>";
+	       preg_match('/<meta name="description" content="(.+?)\. \w+ \d+, \d+.*">/i',
 			  $contents, $matches);
 	       $summary=$matches[1];
 
@@ -273,10 +289,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       }
 
 	       /* Format the description to hold a reference to the embedded video */
-	       $description = '<embed FlashVars=';
+	       $description = '<embed ';
 	       $description.= 'style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" ';
 	       $description.= 'type="application/x-shockwave-flash" ';
-	       $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'"> ';
+	       $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> ';
 	       $description.= '</embed>';
 	       $description.= "<br>$summary";
 
@@ -375,7 +391,48 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       }
 	       $description.= "</embed>";
 	       $description.= "<br>$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 ='<embed src="'.$url.'">';
+	       
 	   /*
 	    **********************************
 	    * Embed a remote .flv file
@@ -561,9 +618,24 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 			 }
 		       }
 		   }
-		   $debugString.="Resizing thumbnail image to $thumbnailSize: $tmpFile -> $newTmpFile <br>";
+		   
+		   // Obtain the width and height of the original thumbnail, finding out it's ratio,
+		   // and using that ratio when determining the width of the video below.
+		   // Example: youtube: 130x97 google: 160x120 metacafe: 90x76 yahoo: 100x70
+		   // Set the thumbnailHeight to the current thumbnailSize
+		   // Set the thumbnailWidth to the appropriate size based on the thumbnailHeight * ratio
+		   $image_data = @getimagesize($tmpFile);
+		   if(!$image_data) {
+		     return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
+			    "Unable to retrieve thumbnail dimensions for: $tmpFile"),null,null);
+		   }
+		   $ratio = $image_data[0] / $image_data[1];
+		   $debugString.="Using ratio from original thumbnail of $ratio. ";
+		   $thumbnailHeight=$thumbnailSize;
+		   $thumbnailWidth=round($thumbnailHeight * $ratio);
+		   $debugString.="Resizing thumbnail image to $thumbnailWidth x $thumbnailHeight: $tmpFile -> $newTmpFile <br>";
 		   $toolkit->performOperation($mimeType, 'resize', $tmpFile, $newTmpFile,
-					      array($thumbnailSize,$thumbnailSize));
+					      array($thumbnailWidth,$thumbnailHeight));
 	       }
 	   }
 	   if(!strcmp($debugOutput,"true")) {