From: Alan Jack Pippin <ajp@pippin.(none)>
Date: Thu, 30 Aug 2007 15:13:00 +0000 (-0600)
Subject: Added new youtubeShowRelated parameter
X-Git-Tag: 1_1_1~22
X-Git-Url: http://git.pippins.net/%7Bdone_action%7D?a=commitdiff_plain;h=5a9743847ef6ce2a1270ee88719bbfb84c17cff6;p=embedvideo%2F.git

Added new youtubeShowRelated parameter
Added support for .swf file types
Improved thumbnail resizing logic
---

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 983ec79..f7ab013 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', "");
@@ -93,6 +94,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	     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";
 
@@ -375,7 +390,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 +617,21 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 			 }
 		       }
 		   }
-		   $debugString.="Resizing thumbnail image to $thumbnailSize: $tmpFile -> $newTmpFile <br>";
+		   
+		   // Obtainin 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);
+		   $ratio = $image_data[0] / $image_data[1];
+		   $debugString.="Using ratio from original thumbnail of $ratio. ";
+		   $thumbnailSize=150;
+		   $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")) {
diff --git a/module.inc b/module.inc
index fc6e90f..0f6e5d2 100644
--- a/module.inc
+++ b/module.inc
@@ -77,7 +77,7 @@ class EmbedVideoModule extends GalleryModule {
 
         if (!isset($params['embedvideodefaultVariables'])) {
             $ret = $this->setParameter('embedvideodefaultVariables',
-		   'height=240|width=320|useInternalFlvPlayer=true|useRemoteSize=false');
+		   'height=240|width=320|useInternalFlvPlayer=true|useRemoteSize=false|youtubeShowRelated=false');
             if ($ret) {
                 return $ret;
             }
diff --git a/templates/EmbedVideoSiteAdmin.tpl b/templates/EmbedVideoSiteAdmin.tpl
index a0609cd..8d5f2e9 100644
--- a/templates/EmbedVideoSiteAdmin.tpl
+++ b/templates/EmbedVideoSiteAdmin.tpl
@@ -115,7 +115,7 @@
     <tr class="gbEven"><td>useInternalFlvPlayer</td><td>true/false</td>
       <td>{g->text text="instructs the module to use Gallery's built-in flv player when embedding links to .flv files"}</td></tr>
 
-    <tr class="gbEven"><td>externalFlvPlayer</td><td>URL to external flv player (.swf)</td>
+    <tr class="gbOdd"><td>externalFlvPlayer</td><td>URL to external flv player (.swf)</td>
       <td>{g->text text="instructs the module to use an external flv player when embedding links to .flv files"}</td></tr>
 
     <tr class="gbEven"><td>externalFlvPlayerVars</td><td>flashvars= options for external flash player</td>
@@ -124,19 +124,22 @@
     <tr class="gbOdd"><td>youtubeDevId</td><td>xxxxxxxxxxx</td>
       <td>{g->text text="specify the youtube Developer ID used when this plugin makes API calls to youtube"}</td></tr>
 
-    <tr class="gbEven"><td>useRemoteSize</td><td>true/false</td>
+    <tr class="gbEven"><td>youtubeShowRelated</td><td>true/false</td>
+      <td>{g->text text="specify whether you want to show the related video links in the youtube embedded player"}</td></tr>
+
+    <tr class="gbOdd"><td>useRemoteSize</td><td>true/false</td>
       <td>{g->text text="use the remote video size instead of the width and height specified here"}</td></tr>
 
     <tr class="gbEven"><td>autoStart</td><td>true/false</td>
       <td>{g->text text="specify if the embedded video players should autostart the videos or not"}</td></tr>
 
-    <tr class="gbEven"><td>width</td><td>320</td>
+    <tr class="gbOdd"><td>width</td><td>320</td>
       <td>{g->text text="specify the width dimension of the embedded video player"}</td></tr>
 
     <tr class="gbEven"><td>height</td><td>240</td>
       <td>{g->text text="specify the height dimension of the embedded video player"}</td></tr>
 
-    <tr class="gbEven"><td>debugOutput</td><td>true/false</td>
+    <tr class="gbOdd"><td>debugOutput</td><td>true/false</td>
       <td>{g->text text="turn on module debug output"}</td></tr>
 
     <tr class="gbEven"><td>flvThumbnail</td><td>URL path</td>
diff --git a/templates/ItemAddEmbedVideo.tpl b/templates/ItemAddEmbedVideo.tpl
index 7f10a0f..33d8634 100644
--- a/templates/ItemAddEmbedVideo.tpl
+++ b/templates/ItemAddEmbedVideo.tpl
@@ -27,6 +27,7 @@
     <br>
     <b><u>Supported File Types:</u></b><br>
     <b>FlashVideo (.flv):</b> http://aaa.bbb.ccc/video.flv<br>
+    <b>FlashVideo (.swf):</b> http://aaa.bbb.ccc/video.swf<br>
     <br>
 
   </div>