Added new autoStart parameter. Added new useRemoteSize parameter.

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index e5eecd1552acde47caac0a76b47401ee4c5086a8..28d4a809bee049b1e6a63813bc8aa235a9aed917 100644 (file)
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -66,27 +66,37 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
           /* Store any Parameters into some simpler, shorter, local variables */
           global $debugOutput, $useInternalFlvPlayer, $youtubeDevId;
           global $width, $height, $externalFlvPlayer, $externalFlvPlayerVars;
-          global $flvThumbnail;
-
-          $debugOutput = $this->getParameter($ItemAddEmbedVideo, 'debugOutput');
-          $useInternalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'useInternalFlvPlayer');
-          $youtubeDevId = $this->getParameter($ItemAddEmbedVideo, 'youtubeDevId');
-          $width = $this->getParameter($ItemAddEmbedVideo, 'width');
-          $height = $this->getParameter($ItemAddEmbedVideo, 'height');
-          $externalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'externalFlvPlayer');
-          $externalFlvPlayerVars = $this->getParameter($ItemAddEmbedVideo, 'externalFlvPlayerVars');
-          $flvThumbnail = $this->getParameter($ItemAddEmbedVideo, 'flvThumbnail');
+          global $flvThumbnail, $useRemoteSize, $autoStart;
 
+          /* 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
+            * defined in either of these 2 places, pass in a default value to set them to
+           */
+          $debugOutput = $this->getParameter($ItemAddEmbedVideo, 'debugOutput', "false");
+          $useInternalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'useInternalFlvPlayer', "true");
+          $youtubeDevId = $this->getParameter($ItemAddEmbedVideo, 'youtubeDevId', "");
+          $width = $this->getParameter($ItemAddEmbedVideo, 'width', "320");
+          $height = $this->getParameter($ItemAddEmbedVideo, 'height', "240");
+          $externalFlvPlayer = $this->getParameter($ItemAddEmbedVideo, 'externalFlvPlayer', "");
+          $externalFlvPlayerVars = $this->getParameter($ItemAddEmbedVideo, 'externalFlvPlayerVars', "");
+          $flvThumbnail = $this->getParameter($ItemAddEmbedVideo, 'flvThumbnail', "");
+          $useRemoteSize = $this->getParameter($ItemAddEmbedVideo, 'useRemoteSize', "false");
+          $autoStart = $this->getParameter($ItemAddEmbedVideo, 'autoStart', "false");
+          
           /* Store other string constants we'll use later */
          
           /* youtube */
           $youtubeUrlPattern="youtube.com";
           $youtubeApiUrl="http://www.youtube.com/api2_rest";
+          $youtubeWidth="425";
+          $youtubeHeight="350";
 
           /* google */
           $googleUrlPattern="video.google.com";
           $googlePlayer="http://video.google.com/googleplayer.swf";
-
+          $googleWidth="400";
+          $googleHeight="326";
+          
           /* yahoo */
           $yahooUrlPattern="video.yahoo.com";
           $yahooThumbnailUrl="http://thmg01.video.search.yahoo.com/image/";
@@ -138,7 +148,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                                "Unable to get video information at url: $url - $response"),null,null);
               }
 
-
               if(!strcmp($debugOutput,"true")) {
                 print "$xml";
               }
@@ -163,12 +172,24 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               $summary = $description[0][0];
               $thumbnail = $thumbnail[0][0];
 
+              /* Determine what our width and height should be based on our useRemoteSize parameter */
+              if(!strcmp($useRemoteSize,"true")) {
+                $width = $youtubeWidth;
+                $height = $youtubeHeight;
+              }
+              
+              /* Determine if the video should autoplay or not based on the autoStart parameter */
+              $autoStartStr="";
+              if(!strcmp($autoStart,"true")) {
+                $autoStartStr="&autoplay=1";
+              }
+              
               /* 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.'" ';
+              $description.= '<embed src="http://www.youtube.com/v/'.$video_id.$autoStartStr.'" ';
               $description.= 'type="application/x-shockwave-flash" wmode="transparent" ';
               $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
               $description.= "<br>$summary";
@@ -215,11 +236,23 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               $thumbnail=$matches[1];
               $thumbnail=preg_replace("/offsetms=0/","offsetms=0",$thumbnail);
 
+              /* Determine what our width and height should be based on our useRemoteSize parameter */
+              if(!strcmp($useRemoteSize,"true")) {
+                $width = $googleWidth;
+                $height = $googleHeight;
+              }
+
+              /* Determine if the video should autoplay or not based on the autoStart parameter */
+              $autoStartStr="";
+              if(!strcmp($autoStart,"true")) {
+                $autoStartStr="&autoplay=1";
+              }
+
               /* Format the description to hold a reference to the embedded video */
-              $description = '<embed FlashVars="autoPlay=true" ';
+              $description = '<embed FlashVars=';
               $description.= 'style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" ';
               $description.= 'type="application/x-shockwave-flash" ';
-              $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.'"> ';
+              $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'"> ';
               $description.= '</embed>';
               $description.= "<br>$summary";
 
@@ -227,6 +260,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
            **********************************
            * Embed a Yahoo Video
            **********************************
+            * TODO: The autoStart parameter doesn't work with the yahoo video player
             */
           } else if(preg_match("/$yahooUrlPattern/",$url)) {
 
@@ -264,8 +298,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               /* Format the description to hold a reference to the embedded video */
               preg_match('/(<embed src.+?<\/embed>)/', $contents, $matches);
               $description=$matches[1];
-              $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
-              $description=preg_replace("/height='\d+'/","height='".$height."'",$description);        
+              if(!strcmp($useRemoteSize,"false")) {
+                $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
+                $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+              }
               $description.= "<br>$summary";
 
           /*
@@ -306,8 +342,13 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               preg_match('/(embed src.+?\/embed)/', $contents, $matches);
               $description="<".$matches[1];
               $description=preg_replace("/&quot;/","'",$description);
-              $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
-              $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+              if(!strcmp($useRemoteSize,"false")) {
+                $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
+                $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+              }
+              if(!strcmp($autoStart,"true")) {
+                $description=preg_replace("/\.swf/",".swf?playerVars=autoPlay=yes",$description);
+              }
               $description.= "</embed>";
               $description.= "<br>$summary";
         
@@ -372,7 +413,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 
                   if(!preg_match("/\w+/",$externalFlvPlayerVars)) {
                       /* Format the flashvars for the internal G2 flv player */
-                      $description.= '&showdigits=true&autostart=false&showfsbutton=true&';
+                      $description.= '&showdigits=true&autostart='.$autoStart.'&showfsbutton=true&';
                       $description.= '&repeat=false&lightcolor=0x9999FF';
                       $description.= '&backcolor=0x888888&frontcolor=0x000000"';
                   } else {
@@ -401,7 +442,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                   $description.= '<param name="movie" value="'.$gallery2_url.$gallery2_flv_player.'"/>';
                   $description.= '<param name="FlashVars" value="flvUrl='.$url;
                   $description.= '&Width='.$width.'&Height='.$height.'&title='.$title;
-                  $description.= '&allowDl=true&thumbUrl='.$thumbnail;
+                  $description.= '&allowDl=true&thumbUrl='.$thumbnail.'&autoStart='.$autoStart;
                   $description.= '&langDownload=Download&langLarge=Large&langNormal=Normal"/>';
                   $description.= '<param name="quality" value="high"/>';
                   $description.= '<param name="scale" value="noscale"/>';
@@ -411,7 +452,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                   $description.= '<embed src="'.$gallery2_url.$gallery2_flv_player.'" ';
                   $description.= 'flashvars="flvUrl='.$url;
                   $description.= '&Width='.$width.'&Height='.$height.'&title='.$title;
-                  $description.= '&allowDl=true&thumbUrl='.$thumbnail;
+                  $description.= '&allowDl=true&thumbUrl='.$thumbnail.'&autoStart='.$autoStart;
                   $description.= '&langDownload=Download&langLarge=Large&langNormal=Normal" ';
                   $description.= 'type="application/x-shockwave-flash" ';
                   $description.= 'width="100%" height="100%" quality="high" scale="noscale" salign="lt" ';
@@ -501,19 +542,25 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 
  /**
   * A simple function to resolve the value of a parameter from
-  * the default or override value if it exists.
+  * the default or override value if it exists, or set it
+  * to the default passed as an argument.
   */
- function getParameter($params, $name) {
+ function getParameter($params, $name, $default="") {
    if(isset($params['override'][$name])) {
+     /* print "override $name = ".$params['override'][$name]."<br>"; */
      return($params['override'][$name]);
-   } else {
+   } else if(isset($params['default'][$name])) {
+     /* print "default $name = ".$params['default'][$name] ."<br>"; */
      return($params['default'][$name]);
+   } else {
+     /* print "$name = $default <br>"; */
+     return($default);
    }
  }
 
  /**
   * A simple function to get the headers only (no body) for a given URL
-  *
+  * This was taken from GalleryCoreApi::requestWebPage
   */
  function fetchWebFileHeaders($url, $requestHeaders=array()) {
      global $gallery;

diff --git a/module.inc b/module.inc
index 8a9f40d9593a03b162b9c1d3ff3a34a30334245c..eb03f50eec423bca540cc9288ecc2e0a59a5ca03 100644 (file)
--- 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');
+                  'height=240|width=320|useInternalFlvPlayer=true|useRemoteSize=false');
             if ($ret) {
                 return $ret;
             }

diff --git a/templates/EmbedVideoSiteAdmin.tpl b/templates/EmbedVideoSiteAdmin.tpl
index 6a7c96751122f4cf2e6a35aea10cbcf6c5d9e632..a0609cdfdd9dcf971eef7d757a021fd5dd5e437c 100644 (file)
--- a/templates/EmbedVideoSiteAdmin.tpl
+++ b/templates/EmbedVideoSiteAdmin.tpl
@@ -124,6 +124,12 @@
     <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>
+      <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>
       <td>{g->text text="specify the width dimension of the embedded video player"}</td></tr>