Incremented version number

[embedvideo/.git] / ItemAddEmbedVideo.inc

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index d598ee2c1d09dd501eff2dd03430aa8a0eaa4f07..8049610d866fd38fdeae129938dea84a40d126d0 100644 (file)
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -92,7 +92,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
           $watermarkAlignment = $this->getParameter($ItemAddEmbedVideo, 'watermarkAlignment', "left");
           $wordwrapSummary = $this->getParameter($ItemAddEmbedVideo, 'wordwrapSummary', "0");
           $wordwrapDescription = $this->getParameter($ItemAddEmbedVideo, 'wordwrapDescription', "0");
-
+           $allowFullScreen = $this->getParameter($ItemAddEmbedVideo, 'allowFullScreen', "false");
+          
           /* Print our stored/set Parameters */
           if(!strcmp($debugOutput,"true")) {
             print "\n<hr>";
@@ -112,6 +113,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
             print "watermarkAlignment=$watermarkAlignment<br>\n";
             print "wordwrapSummary=$wordwrapSummary<br>\n";
             print "wordwrapDescription=$wordwrapDescription<br>\n";
+            print "allowFullScreen=$allowFullScreen<br>\n";
             print "<hr>\n";
           }
 
@@ -175,8 +177,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
           $unsupported_url=0;
           
           /* Store the passed URL in a shorter local variable */
+          /* Strip trailing whitespace in the url, this will cause problems later */
           $url = $form['webPage']['URL'];
-
+           if(preg_match("/(.*?)\s+/",$url,$matches)) {
+            $url = $matches[1];
+          }
+          
           /*
            *****************************
            * Embed a Youtube Video
@@ -283,15 +289,26 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                 $youtubeShowRelatedStr="&rel=0";
               }
 
+              /* Determine if the video should show related videos or not based on the youtubeShowRelated parameter */
+              $fullScreenStr="";
+              $fullScreenParamStr1="";
+              $fullScreenParamStr2="";
+              if(!strcmp($allowFullScreen,"true")) {
+                $fullScreenStr="&fs=1";
+                $fullScreenParamStr1="<param name=\"allowFullScreen\" value=\"true\"></param>";
+                $fullScreenParamStr2=" allowfullscreen=\"true\"";
+              }
+
               /* 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.$extra_params.'"></param>';
               $description.= '<param name="wmode" value="transparent"></param>';
+              $description.= $fullScreenParamStr1;
               $description.= '<embed src="http://www.youtube.com/v/';
-              $description.= $video_id.$extra_params.$autoStartStr.$youtubeShowRelatedStr;
+              $description.= $video_id.$extra_params.$autoStartStr.$youtubeShowRelatedStr.$fullScreenStr;
               $description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
-              $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
+              $description.= 'width="'.$width.'" height="'.$height.'"'.$fullScreenParamStr2.'></embed></object>';
 
           /*
            **********************************
@@ -331,12 +348,13 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               }
 
               /* Extract the thumbnail URL from the webpage contents */
-              preg_match('/thumbnail: \'(http:\/\/.*?\/ThumbnailServer2.+?)\'/i',
+              preg_match('/\'.+?thumbnail.+?(http:\/\/.*?\/ThumbnailServer2.+?)\'/i',
                          $contents, $matches);
               $thumbnail=$matches[1];
               $thumbnail=preg_replace("/\\\\x26/","&",$thumbnail);
               $thumbnail=preg_replace("/\\\\x3d/","=",$thumbnail);
-
+              $thumbnail=urldecode($thumbnail);
+              
               /* Determine what our width and height should be based on our useRemoteSize parameter */
               if(!strcmp($useRemoteSize,"true")) {
                 $width = $googleWidth;
@@ -553,7 +571,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               $thumbnail=$dailymotionThumbnailUrl.$item_id;
 
               /* Format the description to hold a reference to the embedded video */
-              if(preg_match('/<textarea id="video_player_embed_code_text".+?>(.+?)<\/textarea>/', $contents, $matches)) { 
+              if(preg_match('/<.+? value="(.+?)" class=".+?" id="video_player_embed_code_text" \/>/', $contents, $matches)) { 
                 $description=$matches[1];
                 $description=preg_replace("/&quot;/","'",$description);
                 $description=preg_replace("/&lt;/","<",$description);
@@ -798,18 +816,19 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               }
 
               /* Format the description to hold a reference to the embedded video */
-              $description = '<object type="application/x-shockwave-flash" width="'.$width.'" height="'.$height.'"';
-              $description.= 'data="http://www.vimeo.com/moogaloop.swf?clip_id='.$video_id;
-              $description.= '&amp;server=www.vimeo.com&amp;fullscreen=1&amp;show_title=1'.$autoStartStr;
-              $description.= '&amp;show_byline=1&amp;show_portrait=0&amp;color=">';
-              $description.= '<param name="quality" value="best" />';
+              $description = '<object width="'.$width.'" height="'.$height.'">';
               $description.= '<param name="allowfullscreen" value="true" />';
-              $description.= '<param name="scale" value="showAll" />';
-              $description.= '<param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id='.$video_id;
-              $description.= '&amp;server=www.vimeo.com&amp;fullscreen=1&amp;show_title=1'.$autoStartStr;
-              $description.= '&amp;show_byline=1&amp;show_portrait=0&amp;color=" />';
-              $description.= '</object>';
-              
+              $description.= '<param name="allowscriptaccess" value="always" />';
+              $description.= '<param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id='.$video_id;
+              $description.= '&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;'.$autoStartStr;
+              $description.= 'show_portrait=0&amp;color=&amp;fullscreen=1"/ >';
+              $description.= '<embed src="http://vimeo.com/moogaloop.swf?clip_id='.$video_id;
+              $description.= '&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;'.$autoStartStr;
+              $description.= 'show_portrait=0&amp;color=&amp;fullscreen=1"';
+              $description.= 'type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always"';
+              $description.= 'width="'.$width.'" height="'.$height.'">';
+              $description.= '</embed></object>';
+                              
           /*
            **********************************
            * Embed a remote .swf file