X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=d598ee2c1d09dd501eff2dd03430aa8a0eaa4f07;hb=46e1538c4e6375a1cc5b5a84c339777df1dc69a0;hp=81b5951486c1d97f4002c382bfdcbd0c8eef924e;hpb=4a4f36d3d395d88a19c33a457ec1daeec54cbeb8;p=embedvideo%2F.git

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 81b5951..d598ee2 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -34,7 +34,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
    * @see ItemAddPlugin::handleRequest
    */
  function handleRequest($form, &$item) {
-   global $gallery;
+   global $gallery, $url;
     
    $status = $error = array();
    
@@ -67,9 +67,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   }
 	   
 	   /* Store any Parameters into some simpler, shorter, local variables */
-	   global $debugOutput, $useInternalFlvPlayer, $youtubeDevId;
+	   global $debugOutput, $useInternalFlvPlayer;
 	   global $width, $height, $externalFlvPlayer, $externalFlvPlayerVars;
 	   global $flvThumbnail, $useRemoteSize, $autoStart;
+	   global $watermarkVideos, $watermarkImage, $watermarkAlignment;
+	   global $unsupported_url;
 
 	   /* 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
@@ -77,7 +79,6 @@ 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");
@@ -86,54 +87,92 @@ 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");
+	   $watermarkAlignment = $this->getParameter($ItemAddEmbedVideo, 'watermarkAlignment', "left");
+	   $wordwrapSummary = $this->getParameter($ItemAddEmbedVideo, 'wordwrapSummary', "0");
+	   $wordwrapDescription = $this->getParameter($ItemAddEmbedVideo, 'wordwrapDescription', "0");
 
 	   /* Print our stored/set Parameters */
 	   if(!strcmp($debugOutput,"true")) {
-	     print "<hr>";
-	     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>";
-	     print "externalFlvPlayerVars=$externalFlvPlayerVars<br>";
-	     print "flvThumbnail=$flvThumbnail<br>";
-	     print "useRemoteSize=$useRemoteSize<br>";
-	     print "autoStart=$autoStart<br>";
-	     print "<hr>";
+	     print "\n<hr>";
+	     print "<h2>Variable Parameters</h2>\n";
+	     print "debugOutput=$debugOutput<br>\n";
+	     print "useInternalFlvPlayer=$useInternalFlvPlayer<br>\n";
+	     print "youtubeShowRelated=$youtubeShowRelated<br>\n";
+	     print "width=$width<br>\n";
+	     print "height=$height<br>\n";
+	     print "externalFlvPlayer=$externalFlvPlayer<br>\n";
+	     print "externalFlvPlayerVars=$externalFlvPlayerVars<br>\n";
+	     print "flvThumbnail=$flvThumbnail<br>\n";
+	     print "useRemoteSize=$useRemoteSize<br>\n";
+	     print "autoStart=$autoStart<br>\n";
+	     print "watermarkVideos=$watermarkVideos<br>\n";
+	     print "watermarkImage=$watermarkImage<br>\n";
+	     print "watermarkAlignment=$watermarkAlignment<br>\n";
+	     print "wordwrapSummary=$wordwrapSummary<br>\n";
+	     print "wordwrapDescription=$wordwrapDescription<br>\n";
+	     print "<hr>\n";
 	   }
 
 	   /* Store other string constants we'll use later */
 	  
 	   /* youtube */
-	   $youtubeUrlPattern="youtube.com";
-	   $youtubeApiUrl="http://www.youtube.com/api2_rest";
+	   $youtubeUrlPattern="youtube";
+	   $youtubeApiUrl="http://gdata.youtube.com/feeds/api/";
+	   $youtubeThumbnailUrl="http://img.youtube.com/vi/";
 	   /* We can't extract the server size from youtube */
 	   $youtubeWidth="425";
 	   $youtubeHeight="350";
 
 	   /* google */
-	   $googleUrlPattern="video.google.com";
+	   $googleUrlPattern="video.google";
 	   $googlePlayer="http://video.google.com/googleplayer.swf";
 	   /* We can't extract the server size from google video */
 	   $googleWidth="400";
 	   $googleHeight="326";
 	   
 	   /* yahoo */
-	   $yahooUrlPattern="video.yahoo.com";
+	   $yahooUrlPattern="video.yahoo";
 	   $yahooThumbnailUrl="http://thmg01.video.search.yahoo.com/image/";
 	   
 	   /* metacafe */
-	   $metacafeUrlPattern="metacafe.com";
+	   $metacafeUrlPattern="metacafe";
 	   $metacafeThumbnailUrl="http://www.metacafe.com/thumb/";
+
+	   /* revver */
+	   $revverUrlPattern="revver";
+	   $revverThumbnailUrl="http://frame.revver.com/frame/120x90/";
+
+	   /* dailymotion */
+	   $dailymotionUrlPattern="dailymotion";
+	   $dailymotionThumbnailUrl="http://www.dailymotion.com/thumbnail/160x120/video/";
+
+	   /* divshare */
+	   $divshareUrlPattern="divshare";
+	   $divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/";
+
+	   /* stickam */
+	   $stickamUrlPattern="stickam";
+	   $stickamThumbnailUrl="http://static.stickam.com/";
+
+	   /* myspace */
+	   $myspaceUrlPattern="vids.myspace";
+	   $myspaceUrlPattern2="myspacetv";
+	   $myspaceThumbnailUrl="http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID=";
+
+	   /* vimeo */
+	   $vimeoUrlPattern="vimeo.com";
 	   
 	   /* 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";
+
+	   /* Unsupported URLs */
+	   $unsupported_url=0;
 	   
 	   /* Store the passed URL in a shorter local variable */
 	   $url = $form['webPage']['URL'];
@@ -144,94 +183,115 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	    *****************************
 	    */
 	   if(preg_match("/$youtubeUrlPattern/",$url)) {
-
+	     
  	       /* Make sure we can find a video_id in the URL */
-	       if(preg_match("/watch\?v=(.*)/",$url,$matches)) {
+  	       $extra_params = "";
+	       if(preg_match("/watch\?v=(.*?)(&\S+=\S+)/",$url,$matches)) {
+		   $video_id = $matches[1];
+		   $extra_params = $matches[2];
+	       } else if (preg_match("/watch\?v=(.*)/",$url,$matches)) {
+		   $video_id = $matches[1];
+	       } else if (preg_match("/v\/(.*)/",$url,$matches)) {
 		   $video_id = $matches[1];
 	       } else {
 		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
 				"Unable to extract video id from url: $url"),null,null);
 	       }
-	       
-	       /* Make sure we have a valid youtube developer id */
-	       $dev_id = $youtubeDevId;
-	       if(!preg_match("/\w+/",$dev_id)) {
-		   return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED,__FILE__,__LINE__,
-				"Invalid/missing YouTube developer ID: $dev_id"),null,null);
+
+	       /* If extra params were given, handle them here */
+	       if(strcmp($extra_params,"")) {
+		 /* Handle the high quality format information */
+		 if(preg_match("/fmt=(\d+)/",$extra_params,$matches)) {
+		   $extra_params="&ap=%2526fmt%3D".$matches[1];
+		 }
 	       }
-	       
+	       	       
 	       /* Youtube api feed */
-	       $feed = $youtubeApiUrl.'?method=youtube.videos.get_details';
-	       $feed.= "&dev_id=$dev_id&video_id=$video_id";
-	       
+	       $feed = $youtubeApiUrl."videos/$video_id";
+
+	       if(!strcmp($debugOutput,"true")) {
+		   print "\n<h2>Youtube URL Parsing Results</h2>";
+ 		   print "video_id: $video_id<br>";
+		   print "extra_embed_params: $extra_params<br>";
+		   print "gdata feed: $feed<br>";
+                   print "<hr>";
+	       }
+
 	       /* Get the youtube xml feed as a string data source */
 	       list ($successfullyCopied, $xml, $response, $headers) =
 		 GalleryCoreApi::fetchWebPage($feed, $extraHeaders);
 	       if (!$successfullyCopied) {
-		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
-				"Unable to get video information at url: $url - $response"),null,null);
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+						    "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);
+						    "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 "\n<h2>Youtube XML Dump</h2>";
 		 print "$xml";
 		 print "<hr>";
 	       }
-	       
+		 
 	       /* Extract certain information from the xml feed */
-	       preg_match_all("/\<title\>(.+?)\<\/title\>/smi",$xml, $title);
-	       preg_match_all("/\<description\>(.+?)\<\/description\>/smi",$xml, $description);
-	       preg_match_all("/\<thumbnail_url\>(.+?)\<\/thumbnail_url\>/smi",$xml, $thumbnail);
-	       
+	       preg_match_all("/\<media:title.+?\>(.+?)\<\/media:title\>/smi",$xml, $title);
+	       preg_match_all("/\<media:description.+?\>(.+?)\<\/media:description\>/smi",$xml, $description);
+	       preg_match_all("/\<media:thumbnail url='(.+?)'/smi",$xml, $thumbnail);
+		 
 	       array_shift($title);
 	       array_shift($thumbnail);
 	       array_shift($description);
-	  
+
 	       /* Replace html characters. More can be added but this seems to work */
 	       for($i=0;$i<count($description[0]);$i++){	  
-		   $description[0][$i] = preg_replace("/&#60;/","<",$description[0][$i]);
-		   $description[0][$i] = html_entity_decode($description[0][$i],ENT_QUOTES);	  
+		 $description[0][$i] = preg_replace("/&#60;/","<",$description[0][$i]);
+		 $description[0][$i] = html_entity_decode($description[0][$i],ENT_QUOTES);	  
 	       }
-
+		 
 	       /* Store the information found in some local variables */
 	       $title = $title[0][0];
 	       $summary = $description[0][0];
-	       $thumbnail = $thumbnail[0][0];
+		 
+	       /* The last thumbnail match we make will always be the highest resolution */
+	       $thumbnail = $thumbnail[0][sizeof($thumbnail[0])-1];
 
+	       if(!strcmp($debugOutput,"true")) {
+		 print "title: $title<br>";
+		 print "summary: $summary<br>";
+		 print "thumbnail: $thumbnail<br>";
+	       }
+		 
 	       /* 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";
 	       }
-
+		 
 	       /* 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.= 'value="http://www.youtube.com/v/'.$video_id.$extra_params.'"></param>';
 	       $description.= '<param name="wmode" value="transparent"></param>';
 	       $description.= '<embed src="http://www.youtube.com/v/';
-	       $description.= $video_id.$autoStartStr.$youtubeShowRelatedStr;
+	       $description.= $video_id.$extra_params.$autoStartStr.$youtubeShowRelatedStr;
 	       $description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
 	       $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
-	       $description.= "<br>$summary";
 
 	   /*
 	    **********************************
@@ -257,7 +317,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];
 
@@ -270,10 +331,11 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       }
 
 	       /* Extract the thumbnail URL from the webpage contents */
-	       preg_match('/<img src="(http:\/\/video\.google\.com\/ThumbnailServer2.+?)" /i',
+	       preg_match('/thumbnail: \'(http:\/\/.*?\/ThumbnailServer2.+?)\'/i',
 			  $contents, $matches);
 	       $thumbnail=$matches[1];
-	       $thumbnail=preg_replace("/offsetms=0/","offsetms=0",$thumbnail);
+	       $thumbnail=preg_replace("/\\\\x26/","&",$thumbnail);
+	       $thumbnail=preg_replace("/\\\\x3d/","=",$thumbnail);
 
 	       /* Determine what our width and height should be based on our useRemoteSize parameter */
 	       if(!strcmp($useRemoteSize,"true")) {
@@ -293,7 +355,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       $description.= 'type="application/x-shockwave-flash" ';
 	       $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> ';
 	       $description.= '</embed>';
-	       $description.= "<br>$summary";
 
 	   /*
 	    **********************************
@@ -311,7 +372,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 				"Unable to extract vid id from url: $url"),null,null);
 	       }
 
-	       /* Grab the contents of the webpage used to display the video on video.google.com */
+	       /* Grab the contents of the webpage used to display the video */
 	       list ($successfullyCopied, $contents, $response, $headers) =
 		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
 	       if (!$successfullyCopied) {
@@ -335,13 +396,16 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       $thumbnail=$yahooThumbnailUrl.$vid_id."_01";
 
 	       /* Format the description to hold a reference to the embedded video */
-	       preg_match('/(<embed src.+?<\/embed>)/', $contents, $matches);
-	       $description=$matches[1];
-	       if(!strcmp($useRemoteSize,"false")) {
-		 $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
-		 $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+	       if(preg_match('/(<embed src.+?<\/embed>)/', $contents, $matches)) { 
+		 $description=$matches[1];
+		 if(!strcmp($useRemoteSize,"false")) {
+		   $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
+		   $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+		 }
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
 	       }
-	       $description.= "<br>$summary";
 
 	   /*
 	    **********************************
@@ -358,7 +422,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 				"Unable to extract item id from url: $url"),null,null);
 	       }
 
-	       /* Grab the contents of the webpage used to display the video on video.google.com */
+	       /* Grab the contents of the webpage used to display the video */
 	       list ($successfullyCopied, $contents, $response, $headers) =
 		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
 	       if (!$successfullyCopied) {
@@ -378,21 +442,375 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       $thumbnail=$metacafeThumbnailUrl.$item_id.".jpg";
 
 	       /* Format the description to hold a reference to the embedded video */
-	       preg_match('/(embed src.+?\/embed)/', $contents, $matches);
-	       $description="<".$matches[1];
-	       $description=preg_replace("/&quot;/","'",$description);
-	       if(!strcmp($useRemoteSize,"false")) {
-		 $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
-		 $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+	       if(preg_match('/(embed src.+?\/embed)/', $contents, $matches)) { 
+		 $description="<".$matches[1];
+		 $description=preg_replace("/&quot;/","'",$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>";
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
 	       }
-	       if(!strcmp($autoStart,"true")) {
-		 $description=preg_replace("/\.swf/",".swf?playerVars=autoPlay=yes",$description);
+
+           /*
+	    **********************************
+	    * Embed a Revver Video
+	    **********************************
+	    * TODO: The autoStart parameter doesn't work with the yahoo video player
+            */
+	   } else if(preg_match("/$revverUrlPattern/",$url)) {
+
+	       /* Make sure we can extract a itemID */
+	       if(preg_match("/\/watch\/(.+)/",$url,$matches)) {
+		   $item_id = $matches[1];
+		   $item_id=preg_replace("/\/$/","",$item_id);
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract item id from url: $url"),null,null);
+	       }
+
+	       /* Grab the contents of the webpage used to display the video */
+	       list ($successfullyCopied, $contents, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+
+	       /* Extract the summary from the webpage contents */
+	       if(preg_match('/"video_description">(.+?)<\/p>/i', $contents, $matches)) {
+		 $summary=$matches[1];
+	       }
+	       if(preg_match('/"video_description">(.+)/i', $contents, $matches)) {
+		 $summary=$matches[1];
+	       }
+
+	       /* Extract the title from the webpage contents */
+	       preg_match('/digg_title = \'(.+?)\'/i', $contents, $matches);
+	       $title=$matches[1];
+	       
+	       /* Build the thumbnail URL from the item_id */
+	       $thumbnail=$revverThumbnailUrl.$item_id.".jpg";
+
+	       /* Format the description to hold a reference to the embedded video */
+	       if(preg_match('/<input class.+?(script src.+?\/script)/', $contents, $matches)) {
+		 $description="<".$matches[1];
+		 if(!strcmp($useRemoteSize,"false")) {
+		   $description=preg_replace("/width:\d+/","width:".$width,$description);
+		   $description=preg_replace("/height:\d+/","height:".$height,$description);
+		 }
+		 if(!strcmp($autoStart,"true")) {
+		   preg_match('/(height:\d+)/',$description,$matches);
+		   $height=$matches[1];
+		   $description=preg_replace("/$height/",$height.";autoplay:true",$description);
+		 }
+		 $description.= ">";
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
+	       }
+	    
+	   /*
+	    **********************************
+	    * Embed a DailyMotion Video
+	    **********************************
+            * TODO: The autoStart parameter doesn't work with the yahoo video player
+            */
+	   } else if(preg_match("/$dailymotionUrlPattern/",$url)) {
+	     
+	       /* Make sure we can extract a itemID */
+	       if(preg_match("/\/video\/(.+)/",$url,$matches)) {
+		   $item_id = $matches[1];
+		   $item_id=preg_replace("/\/$/","",$item_id);
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract item id from url: $url"),null,null);
+	       }
+
+	       /* Grab the contents of the webpage used to display the video */
+	       list ($successfullyCopied, $contents, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+
+	       /* Extract the summary from the webpage contents */
+	       preg_match('/<div class="description\s+foreground">(.+?)<\/div>/i', $contents, $matches);
+	       $summary=$matches[1];
+
+	       /* Extract the title from the webpage contents */
+	       preg_match('/<meta name="title" content="Dailymotion : (.+?)" \/>/i', $contents, $matches);
+	       $title=htmlentities($matches[1], ENT_QUOTES, "UTF-8");
+	       
+	       /* Build the thumbnail URL from the item_id */
+	       $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)) { 
+		 $description=$matches[1];
+		 $description=preg_replace("/&quot;/","'",$description);
+		 $description=preg_replace("/&lt;/","<",$description);
+		 $description=preg_replace("/&gt;/",">",$description);
+		 if(!strcmp($useRemoteSize,"false")) {
+		   $description=preg_replace("/width=\"\d+\"/","width=\"".$width."\"",$description);
+		   $description=preg_replace("/height=\"\d+\"/","height=\"".$height."\"",$description);
+		 }
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
+	       }
+	       
+	   /*
+	    **********************************
+	    * Embed a DivShare Video
+	    **********************************
+            */
+	   } else if(preg_match("/$divshareUrlPattern/",$url)) {
+	     
+	       /* Make sure we can extract a itemID */
+	       if(preg_match("/\/download\/(.+)/",$url,$matches)) {
+		   $item_id = $matches[1];
+		   $item_id=preg_replace("/\/$/","",$item_id);
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract item id from url: $url"),null,null);
+	       }
+
+	       /* Grab the contents of the webpage used to display the video */
+	       list ($successfullyCopied, $contents, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+
+	       /* Extract the summary from the webpage contents */
+	       //preg_match('/<meta name="description" content="(.+?)" \/>/i', $contents, $matches);
+	       //$summary=$matches[1];
+	       // Right now, the description is a plug for divshare, nothing user specific about it
+	       $summary="";
+
+	       /* Extract the title from the webpage contents */
+	       preg_match('/<title>(.+?) - Divshare<\/title>/i', $contents, $matches);
+	       $title=$matches[1];
+	       
+	       /* Build the thumbnail URL from the item_id */
+	       $thumbnail=$divshareThumbnailUrl.$item_id;
+
+	       /* Format the description to hold a reference to the embedded video */
+	       if(preg_match('/(<embed src.+?<\/embed>)/', $contents, $matches)) { 
+		 $description=$matches[1];
+		 if(!strcmp($useRemoteSize,"false")) {
+		   $description=preg_replace("/width=\"\d+\"/","width=\"".$width."\"",$description);
+		   $description=preg_replace("/height=\"\d+\"/","height=\"".$height."\"",$description);
+		 }
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
+	       }
+
+	   /*
+	    **********************************
+	    * Embed a StickAm Video
+	    **********************************
+            */
+	   } else if(preg_match("/$stickamUrlPattern/",$url)) {
+
+	       /* Make sure we can extract a itemID */
+	       if(preg_match("/mId=(.+)/",$url,$matches)) {
+		   $item_id = $matches[1];
+		   $item_id=preg_replace("/\/$/","",$item_id);
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract item id from url: $url"),null,null);
+	       }
+
+	       /* Grab the contents of the webpage used to display the video */
+	       $url=preg_replace("/&amp;/","&",$url);
+	       list ($successfullyCopied, $contents, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+
+	       /* Extract the summary from the webpage contents */
+	       preg_match('/<meta name="description" content="(.+?)"\/>/i', $contents, $matches);
+	       $summary=$matches[1];
+
+	       /* Extract the title from the webpage contents */
+	       preg_match('/<meta name="title" content="(.+?)">/i', $contents, $matches);
+	       $title=$matches[1];	       
+	       
+	       /* Build the thumbnail URL from the item_id */
+	       if(preg_match('/movieName=(.+?)&userId=/i', $contents, $matches)) { 
+		 $thumbnail_url=$matches[1];
+		 $thumbnail_url=preg_replace("/%2F/","/",$thumbnail_url);
+		 $thumbnail=$stickamThumbnailUrl.$thumbnail_url.".jpg";
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract thumbnail from url: $url"),NULL,NULL);
+	       }
+
+	       /* Format the description to hold a reference to the embedded video */
+	       if(preg_match('/readonly value="(.+?)"/', $contents, $matches)) { 
+		 $description=$matches[1];
+		 $description=preg_replace("/&quot;/","'",$description);
+		 $description=preg_replace("/&lt;/","<",$description);
+		 $description=preg_replace("/&gt;/",">",$description);
+		 if(!strcmp($useRemoteSize,"false")) {
+		   $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
+		   $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+		 }
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
+	       }
+	     
+	   /*
+	    **********************************
+	    * Embed a Myspace Video
+	    **********************************
+            */
+	   } else if(preg_match("/($myspaceUrlPattern|$myspaceUrlPattern2)/",$url)) {
+
+	       /* Make sure we can extract a itemID */
+	       if(preg_match("/videoid=(.+)/i",$url,$matches)) {
+		   $video_id = $matches[1];
+		   $video_id=preg_replace("/\/$/","",$video_id);
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract video id from url: $url"),null,null);
+	       }
+
+	       /* Grab the contents of the webpage used to display the video */
+	       list ($successfullyCopied, $contents, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+
+	       /* Extract the summary from the webpage contents */
+	       preg_match('/class="description" id="vid_description">(.+?)<\/div>/i', $contents, $matches);
+	       $summary=$matches[1];
+
+	       /* Extract the title from the webpage contents */
+	       preg_match('/<h1>(.+?)<\/h1>/i', $contents, $matches);
+	       $title=$matches[1];	       
+	       
+	       /* Build the thumbnail URL from the item_id */
+	       $video_info_url=$myspaceThumbnailUrl.$video_id;
+	       list ($successfullyCopied, $video_info, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($video_info_url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+	       if(preg_match('/thumbnail url="(.+?)"/',$video_info, $matches)) {
+		 $thumbnail = $matches[1];
+	       } else {
+		  /*
+		   * Set the thumbnail to some generic jpg image,
+		   * since we can't extract it from the site.
+		   * 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;
+		 }
+	       }
+
+	       /* Format the description to hold a reference to the embedded video */
+	       if(preg_match('/(&lt;embed src.+?\/embed&gt;)/', $contents, $matches) ||
+		  preg_match('/(&lt;embed src.+?\/object&gt;)/', $contents, $matches)) { 
+		 $description=$matches[1];
+		 $description=preg_replace("/&quot;/","'",$description);
+		 $description=preg_replace("/&lt;/","<",$description);
+		 $description=preg_replace("/&gt;/",">",$description);
+		 if(!strcmp($useRemoteSize,"false")) {
+		   $description=preg_replace("/width='\d+'/","width='".$width."'",$description);
+		   $description=preg_replace("/height='\d+'/","height='".$height."'",$description);
+		 }
+	       } else {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract embedded video information from url: $url"),NULL,NULL);
+	       }
+
+	   /*
+	    **********************************
+	    * Embed a Vimeo Video
+	    **********************************
+            */
+	   } else if(preg_match("/$vimeoUrlPattern/",$url)) {
+
+	       /* Make sure we can extract a docID */
+	       if(preg_match("/$vimeoUrlPattern\/(.*)/",$url,$matches)) {
+		   $video_id = $matches[1];
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract video id from url: $url"),null,null);
+	       }
+
+	       /* Grab the contents of the webpage used to display the video */
+	       list ($successfullyCopied, $contents, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to get video information at url: $url - $response"),NULL,NULL);
+	       }
+
+	       /* Extract the summary from the webpage contents */
+	       preg_match('/<meta name="description" content="(.+?)"/i',
+			  $contents, $matches);
+	       $summary=$matches[1];
+
+	       /* Extract the title from the webpage contents */
+	       preg_match('/<meta name="title" content="(.+?)"/i',
+			  $contents, $matches);
+	       $title=$matches[1];
+
+	       /* Extract the thumbnail URL from the webpage contents */
+	       preg_match('/"videothumbnail" href="(.+?)"/i',
+			  $contents, $matches);
+	       $thumbnail=$matches[1];
+
+	       /* Determine what our width and height should be based on our useRemoteSize parameter */
+	       if(!strcmp($useRemoteSize,"true")) {
+		 preg_match('/id="vimeo_player_'.$video_id.'".+?style="width:(\d+)px;height:(\d+)px;"/i',
+			    $contents, $matches);
+		 $width = $matches[1];
+		 $height = $matches[2];
 	       }
-	       $description.= "</embed>";
-	       $description.= "<br>$summary";
 
+	       /* Determine if the video should autoplay or not based on the autoStart parameter */
+	       $autoStartStr="";
+	       if(!strcmp($autoStart,"true")) {
+		 $autoStartStr="&amp;autoplay=1";
+	       }
 
-	      /*
+	       /* 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.= '<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>';
+	       
+	   /*
 	    **********************************
 	    * Embed a remote .swf file
 	    **********************************
@@ -434,11 +852,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       
 	   /*
 	    **********************************
-	    * Embed a remote .flv file
+	    * Embed a remote .flv or .mp4 file
 	    **********************************
             */
-	   } else if(preg_match("/.*\/(.+?)\.flv/i",$url,$matches)) {
-
+	   } else if(preg_match("/.*\/(.+?)\.flv/i",$url,$matches) ||
+		     preg_match("/.*\/(.+?)\.mp4/i",$url,$matches)) {
+	     
 	       /* Set the title and summary to the name of the file */
 	       $title = $matches[1];
 	       $summary = $matches[1];
@@ -540,15 +959,71 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 		   $description.= 'pluginspage="http://www.macromedia.com/go/getflashplayer"/>';
 		   $description.= '</object></div>';
 	       }
-	       
+
+	   /*
+	    **********************************
+	    * Embed a generic <object ... <embed ... video
+	    **********************************
+            */ 
+	   } else {
+
+	     /* Grab the contents of the webpage used to display the video */
+	     list ($successfullyCopied, $contents, $response, $headers) =
+	       GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	     if (!$successfullyCopied) {
+	       return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+						  "Unable to get video information at url: $url - $response"),NULL,NULL);
+	     }
+
+	     /* Extract the URL base (site name) */
+	     preg_match("/(http:\/\/.+?)\//i",$url,$matches);
+	     $site = $matches[1];
+	     print "site: $site<br>";
+	     
+	     /* Extract the summary from the webpage contents */
+	     $summary="Unknown";
+	     if(preg_match('/<meta name="description" content="(.+?)"/si', $contents, $matches)) {
+	       $summary=$matches[1];
+	     }
+
+	     /* Extract the title from the webpage contents */
+	     $title="Unknown";
+	     if(preg_match('/<title>(.+?)<\/title>/i', $contents, $matches)) {
+	       $title=$matches[1];
+	     }
+
+	     /*
+	      * Set the thumbnail to some generic jpg image,
+	      * since we can't extract it from a generic website.
+	      * 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;
+	     }
+
+	     /* Format the description to hold a reference to the embedded video */
+	     if(preg_match('/(<object.+?<embed.+?<\/object>)/', $contents, $matches)) { 
+	       $description=$matches[1];
+	       if(!strcmp($useRemoteSize,"false")) {
+		 $description=preg_replace("/width=\"\d+\"/","width=\"".$width."\"",$description);
+		 $description=preg_replace("/height=\"\d+\"/","height=\"".$height."\"",$description);
+	       }
+	       $description=preg_replace("/src=\"\//","src=\"".$site."\/",$description);
+	     } else {
+	       $unsupported_url=1;
+	     }
+	   }
+	   
 	  /*
 	   **********************************
 	   * Unsupported URL to embed
 	   **********************************
            */   
-	   } else {
+	   if($unsupported_url == 1) {
 	       return array(GalleryCoreApi::error(ERROR_UNSUPPORTED_FILE_TYPE,__FILE__,__LINE__,
-			    "Unable to embed video from: $url"),null,null);
+			    "The URL you have supplied is unsupported (check the list of supported URLs, they must match exactly). You tried to embed a video from this url: $url"),null,null);
 	   }
 	   
 
@@ -580,19 +1055,34 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   $fileName = preg_replace("/'/","",$fileName);
 	   $fileName = preg_replace("/\"/","",$fileName);
 	   $fileName = preg_replace("/&#\d+;/","",$fileName);
+
+	   /* Wordwrap the description or summary as appropriate */
+	   $description_summary = $summary;
+
+	   if(strcmp($wordwrapSummary,"0")) {
+	     $summary = wordwrap($summary,$wordwrapSummary,"<br>",FALSE);
+	   }
+
+	   if(strcmp($wordwrapDescription,"0")) {
+	     $description_summary = wordwrap($description_summary,$wordwrapDescription,"<br>",FALSE);
+	   }
+	   
+	   /* Tack on the summary to the end of the description */
+	   $description.= "<br>$description_summary";
 	   
 	   /* General debug output */
 	   if(!strcmp($debugOutput,"true")) {
-	       print "<h2>Item Parameters</h2>";
-	       print "url: $url <br>";
-  	       print "title: $title <br>";
-	       print "thumbnailUrl: <img src=\"".$thumbnail."\">\n</a>".$summary."</p>";
-	       print "description: <p>$description</p>";
-	       print "thumbnail: $tmpFile <br>";
-	       print "mimeType: $mimeType <br>";
-	       print "fileName: $fileName <br>";
-	       print "width: $width <br>";
-	       print "height: $height <br>";
+	       print "\n<h2>Item Parameters</h2>\n";
+	       print "url: $url <br>\n";
+  	       print "title: $title <br>\n";
+	       print "thumbnailUrl: $thumbnail <br><img src=\"".$thumbnail."\"> <br>\n";
+	       print "summary: <p>$summary</p>\n";
+	       print "description: <p>$description</p>\n";
+	       print "thumbnail: $tmpFile <br>\n";
+	       print "mimeType: $mimeType <br>\n";
+	       print "fileName: $fileName <br>\n";
+	       print "width: $width <br>\n";
+	       print "height: $height <br>\n";
 	       print "<hr>";
 	   }
 
@@ -624,6 +1114,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 		   // 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;
@@ -634,9 +1128,135 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       }
 	   }
 	   if(!strcmp($debugOutput,"true")) {
-	       print "<h2>Thumbnail Resize</h2>";
-	       print "$debugString";
+	       print "\n<h2>Thumbnail Resize</h2>\n";
+	       print "$debugString\n";
+	       print "<hr>\n";
+	   }
+
+	   /* Watermark the video thumbnail image if indicated by our parameter */
+	   if(!strcmp($watermarkVideos,"true")) {
+	     
+	     /*
+	      * If no watermarkImage parameter is set, set it to a default value.
+	      */
+	     if(preg_match("/\w+/", $watermarkImage)) {
+	       $watermarkImage = $watermarkImage;
+	     } else {
+	       $watermarkImage = $gallery2_url.$gallery2_video_watermark;
+	     }
+	     
+	     /* Get the watermark Image Extension */
+	     preg_match('/\.(...)$/', $watermarkImage, $matches);
+	     $watermarkExt=$matches[1];
+	     
+	     /*
+	      * Check to make sure the URL to the watermark image file is valid
+	      * (That the file exists at the URL given). Skip this part if it is a local path.
+	      */
+	     if(!preg_match("/^\//", $watermarkImage)) {
+	       list ($successfullyCopied, $response, $headers) =
+		 $this->fetchWebFileHeaders($watermarkImage, $extraHeaders);
+	       if (!$successfullyCopied) {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to find the watermark image at url: $watermarkImage - $response"),NULL,NULL);
+	       }
+	     
+	       /* Download the watermark image to a local file */
+	       $tmpDir = $gallery->getConfig('data.gallery.tmp');
+	       $watermark = $platform->tempnam($tmpDir, 'wmk_img_');
+	       $watermark.= "." . $watermarkExt;
+	       list ($successfullyCopied, $response, $headers) =
+		 GalleryCoreApi::fetchWebFile($watermarkImage, $watermark, $extraHeaders);
+	       if (!$successfullyCopied) {
+		 return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
+			"Unable to copy watermark image from url: $watermarkImage - $response"),null,null);
+	       }
+	     } else {
+	       $tmpDir = $gallery->getConfig('data.gallery.tmp');
+	       $watermark = $platform->tempnam($tmpDir, 'wmk_img_');
+	       $watermark.= "." . $watermarkExt;
+	       if(!$platform->copy($watermarkImage, $watermark)) {
+		 return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
+			"Unable to copy watermark image from path: $watermarkImage"),null,null);
+	       }
+	     }
+	     
+	     /* See if there is a toolkit installed that can perform a composite operation */
+	     list ($ret, $toolkit) = GalleryCoreApi::getToolkitByOperation($mimeType, 'composite');
+	     if ($ret) {
+	       return array($ret->wrap(__FILE__, __LINE__,
+		      "Unable to locate a toolkit module to perform the 'composite' watermark operation"), null);
+	     }
+
+	     /* Make sure we can access the toolkit found */
+	     if (!isset($toolkit)) {
+	       return array(GalleryStatus::error(ERROR_PERMISSION_DENIED, __FILE__, __LINE__,
+		      "Unable to access the toolkit module to perform the 'composite' watermark operation"), null);
+	     }
+	     
+	     /* Get the image dimensions of the thumbnail */
+	     $image_data = @getimagesize($newTmpFile);
+	     if(!$image_data) {
+	       return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
+		      "Unable to retrieve thumbnail dimensions for: $tmpFile"),null,null);
+	     }
+	     $thumbnailWidth = $image_data[0];
+	     $thumbnailHeight = $image_data[1];
+
+	     /* Get the image dimensions of the watermark */
+	     $image_data = @getimagesize($watermark);
+	     if(!$image_data) {
+	       return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
+		      "Unable to retrieve watermark dimensions for: $tmpFile"),null,null);
+	     }
+	     $watermarkWidth = $image_data[0];
+	     $watermarkHeight = $image_data[1];
+
+	     /* Obtain the mimeType of the watermark */
+	     list ($ret, $watermarkMimeType) = GalleryCoreApi::getMimeType($watermark);
+
+	     /* Remove the gallery base path from the watermark image path */
+	     /* This has to be done to satisfy the argument requirement for the toolkit operation */
+	     $dataDir = $gallery->getConfig('data.gallery.base');
+	     $dataDir=preg_replace("/\//","\\/",$dataDir);
+	     if(preg_match("/$dataDir(.*)/", $watermark, $matches)) { 
+	       $watermark = $matches[1];
+	     }
+	     
+	     /* General debug output */
+	     if(!strcmp($debugOutput,"true")) {
+	       print "\n<h2>Watermark Operation</h2>\n";
+	       print "watermarkImage: $watermarkImage <br>\n";
+	       print "watermarkTmpImage: $watermark <br>\n";
+	       print "watermarkMimeType: $watermarkMimeType <br>\n";
+	       print "watermarkWidth: $watermarkWidth <br>\n";
+	       print "watermarkHeight: $watermarkHeight <br>\n";
+	       print "watermarkedWidth: $thumbnailWidth <br>\n";
+	       print "watermarkedHeight: $thumbnailHeight <br>\n";
+	     }
+
+	     /* Apply the watermark image to the thumbnail */
+	     $tmpFile = $platform->tempnam($tmpDir, 'wmk_');
+	     list ($ret, $mimeType) = $toolkit->performOperation(
+								 $mimeType, 'composite', $newTmpFile, $tmpFile,
+								 array($watermark, $watermarkMimeType,
+								       $watermarkWidth, $watermarkHeight,
+								       $watermarkAlignment, 0, 0));
+	     
+	     /* Check the return code of the composite operation */
+ 	     if ($ret) {
+	       return array($ret->wrap(__FILE__, __LINE__,
+				       "Unable to apply watermark to the video thumbnail image"), null);
+	     }
+
+	     if(!strcmp($debugOutput,"true")) {
+	       print "\nwatermarked Image: $tmpFile <br>";
 	       print "<hr>";
+	     }
+		       
+	     /* Update the path of our thumbnail to point to the new watermarked thumbnail instead */
+	     $newTmpFile = $tmpFile;
+	     
 	   }
 	   
 	   /* Make the gallery2 call to add this item to the album */
@@ -657,7 +1277,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 					   'warnings' => array());
 
 	   if(!strcmp($debugOutput,"true")) {
-	       print "<br><br><h2>Video Successfully Added to your Gallery Album</h2><br><br><hr>";
+	       print "\n<br><br><h2>Video Successfully Added to your Gallery Album</h2><br><br><hr>";
 	   }
        }
        
@@ -698,7 +1318,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
      global $gallery;
      
      $requestMethod='GET';
-
+     $requestBody='';
+     
      /* Convert illegal characters */
      $url = str_replace(' ', '%20', $url);