X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=0e277a490427e598fda49ef8a32c2473ca12118b;hb=64b39254630e685dc3a8b6c9f2b8bda3b27e88f6;hp=03a54e94d31d5b2b68e911c9d0ce04c9c6f97c49;hpb=b65625759caa70c8905f63b87a36e59951ed24fd;p=embedvideo%2F.git

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 03a54e9..0e277a4 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();
    
@@ -70,7 +70,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   global $debugOutput, $useInternalFlvPlayer, $youtubeDevId;
 	   global $width, $height, $externalFlvPlayer, $externalFlvPlayerVars;
 	   global $flvThumbnail, $useRemoteSize, $autoStart;
-	   global $watermarkVideos, $watermarkImage;
+	   global $watermarkVideos, $watermarkImage, $watermarkAlignment;
 
 	   /* 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
@@ -89,25 +89,31 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   $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 "watermarkVideos=$watermarkVideos<br>";
-	     print "watermarkImage=$watermarkImage<br>";
-	     print "<hr>";
+	     print "\n<hr>";
+	     print "<h2>Variable Parameters</h2>\n";
+	     print "debugOutput=$debugOutput<br>\n";
+	     print "useInternalFlvPlayer=$useInternalFlvPlayer<br>\n";
+	     print "youtubeDevId=$youtubeDevId<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 */
@@ -115,6 +121,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   /* youtube */
 	   $youtubeUrlPattern="youtube.com";
 	   $youtubeApiUrl="http://www.youtube.com/api2_rest";
+	   $youtubeThumbnailUrl="http://img.youtube.com/vi/";
 	   /* We can't extract the server size from youtube */
 	   $youtubeWidth="425";
 	   $youtubeHeight="350";
@@ -133,6 +140,30 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	   /* metacafe */
 	   $metacafeUrlPattern="metacafe.com";
 	   $metacafeThumbnailUrl="http://www.metacafe.com/thumb/";
+
+	   /* revver */
+	   $revverUrlPattern="revver.com";
+	   $revverThumbnailUrl="http://frame.revver.com/frame/120x90/";
+
+	   /* dailymotion */
+	   $dailymotionUrlPattern="dailymotion.com";
+	   $dailymotionThumbnailUrl="http://www.dailymotion.com/thumbnail/160x120/video/";
+
+	   /* divshare */
+	   $divshareUrlPattern="divshare.com";
+	   $divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/";
+
+	   /* stickam */
+	   $stickamUrlPattern="stickam.com";
+	   $stickamThumbnailUrl="http://static.stickam.com/";
+
+	   /* myspace */
+	   $myspaceUrlPattern="vids.myspace.com";
+	   $myspaceUrlPattern2="myspacetv.com";
+	   $myspaceThumbnailUrl="http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID=";
+
+	   /* vimeo */
+	   $vimeoUrlPattern="www.vimeo.com";
 	   
 	   /* Gallery2 specific paths and variables */
 	   $urlGenerator =& $gallery->getUrlGenerator();
@@ -150,95 +181,168 @@ 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 {
 		   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);
-	       }
-	       
-	       /* Youtube api feed */
-	       $feed = $youtubeApiUrl.'?method=youtube.videos.get_details';
-	       $feed.= "&dev_id=$dev_id&video_id=$video_id";
-	       
-	       /* 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);
-	       }
 
-	       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 extra params were given, handle them here */
+	       if(strcmp($extra_params,"")) {
+		 /* Handle the HD format information */
+		 if(preg_match("/fmt=(\d+)/",$extra_params,$matches)) {
+		   $extra_params="&ap=%2526fmt%3D".$matches[1];
+		 }
 	       }
 	       
 	       if(!strcmp($debugOutput,"true")) {
-		 print "<h2>Youtube XML Dump</h2>";
-		 print "$xml";
-		 print "<hr>";
+		   print "<h2>URL Parsing Results</h2>";
+ 		   print "video_id: $video_id<br>";
+		   print "extra_embed_params: $extra_params<br>";
+                   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);
+	       /* If we have a valid youtube developer id, use that to get information about the video */
+	       /* Otherwise, just parse it directly from the HTML page */
+	       $dev_id = $youtubeDevId;
+	       if(!preg_match("/\w+/",$dev_id)) {
+		 /* No developer ID found. Proceed with direct page parsing. */
+
+		 /* Grab the contents of the webpage used to display the video on video.google.com */
+		 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);
+		 }
 	       
-	       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++){	  
+		 /* 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 */
+		 $thumbnail=$youtubeThumbnailUrl.$video_id."/default.jpg";
+		 
+		 /* Determine if the video should autoplay or not based on the autoStart parameter */
+		 $autoStartStr="";
+		 if(!strcmp($autoStart,"true")) {
+		   $autoStartStr="&autoplay=1";
+		 } else {
+		   $autoStartStr="&autoplay=0";
+		 }
+		 
+		 /* Determine if the video should show related videos or not based on the youtubeShowRelated parameter */
+		 $youtubeShowRelatedStr="";
+		 if(!strcmp($youtubeShowRelated,"false")) {
+		   $youtubeShowRelatedStr="&rel=0";
+		 } else {
+		   $youtubeShowRelatedStr="&rel=1";
+		 }
+		 	       
+		 /* Format the description to hold a reference to the embedded video */
+		 if(preg_match('/id=\"embed_code\".+?value=\'(.+?)\'/', $contents, $matches)) {
+		   $description=$matches[1];
+		   $description=preg_replace("/&quot;/","'",$description);
+		   $description=preg_replace("/&lt;/","<",$description);
+		   $description=preg_replace("/&gt;/",">",$description);
+		   $description=preg_replace("/&amp;/","&",$description);
+		   $description=preg_replace("/$video_id/",$video_id.$autoStartStr.$youtubeShowRelatedStr,$description);
+		   $description=preg_replace("/$video_id/",$video_id.$extra_params,$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);
+		 }
+		 
+	       } else {
+		 /* We found a valid developer ID. Proceed with API calls. */
+	      	       
+		 /* Youtube api feed */
+		 $feed = $youtubeApiUrl.'?method=youtube.videos.get_details';
+		 $feed.= "&dev_id=$dev_id&video_id=$video_id";
+		 
+		 /* 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);
+		 }
+		 
+		 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 "\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);
+		 
+		 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);	  
+		 }
+		 
+		 /* Store the information found in some local variables */
+		 $title = $title[0][0];
+		 $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";
+		 }
+		 
+		 /* 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.$extra_params.'"></param>';
+		 $description.= '<param name="wmode" value="transparent"></param>';
+		 $description.= '<embed src="http://www.youtube.com/v/';
+		 $description.= $video_id.$extra_params.$autoStartStr.$youtubeShowRelatedStr;
+		 $description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
+		 $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
 	       }
-
-	       /* Store the information found in some local variables */
-	       $title = $title[0][0];
-	       $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";
-	       }
-
-	       /* 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/';
-	       $description.= $video_id.$autoStartStr.$youtubeShowRelatedStr;
-	       $description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
-	       $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
-	       $description.= "<br>$summary";
-
 	   /*
 	    **********************************
 	    * Embed a Google Video
@@ -300,7 +404,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       $description.= 'type="application/x-shockwave-flash" ';
 	       $description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> ';
 	       $description.= '</embed>';
-	       $description.= "<br>$summary";
 
 	   /*
 	    **********************************
@@ -342,13 +445,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";
 
 	   /*
 	    **********************************
@@ -385,21 +491,366 @@ 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 on video.google.com */
+	       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);
 	       }
-	       $description.= "</embed>";
-	       $description.= "<br>$summary";
 
+	       /* 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 on video.google.com */
+	       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 on video.google.com */
+	       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 on video.google.com */
+	       $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('/input type.+?'.$item_id.'.+?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 on video.google.com */
+	       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 {
+		 return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+			"Unable to extract thumbnail information from url: $url"),NULL,NULL);
+	       }
+
+	       /* Format the description to hold a reference to the embedded video */
+	       if(preg_match('/(&lt;embed src.+?\/embed&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 on video.google.com */
+	       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];
+	       }
+
+	       /* 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
 	    **********************************
@@ -587,19 +1038,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>";
 	   }
 
@@ -645,9 +1111,9 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	       }
 	   }
 	   if(!strcmp($debugOutput,"true")) {
-	       print "<h2>Thumbnail Resize</h2>";
-	       print "$debugString";
-	       print "<hr>";
+	       print "\n<h2>Thumbnail Resize</h2>\n";
+	       print "$debugString\n";
+	       print "<hr>\n";
 	   }
 
 	   /* Watermark the video thumbnail image if indicated by our parameter */
@@ -661,31 +1127,41 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	     } 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)
+	      * (That the file exists at the URL given). Skip this part if it is a local path.
 	      */
-	     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);
-	     }
+	     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);
+	       /* 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 */
@@ -726,19 +1202,20 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	     /* This has to be done to satisfy the argument requirement for the toolkit operation */
 	     $dataDir = $gallery->getConfig('data.gallery.base');
 	     $dataDir=preg_replace("/\//","\\/",$dataDir);
-	     preg_match("/$dataDir(.*)/", $watermark, $matches);
-	     $watermark = $matches[1];
+	     if(preg_match("/$dataDir(.*)/", $watermark, $matches)) { 
+	       $watermark = $matches[1];
+	     }
 	     
 	     /* General debug output */
 	     if(!strcmp($debugOutput,"true")) {
-	       print "<h2>Watermark Operation</h2>";
-	       print "watermarkImage: $watermarkImage <br>";
-	       print "watermarkTmpImage: $watermark <br>";
-	       print "watermarkMimeType: $watermarkMimeType <br>";
-	       print "watermarkWidth: $watermarkWidth <br>";
-	       print "watermarkHeight: $watermarkHeight <br>";
-	       print "watermarkedWidth: $thumbnailWidth <br>";
-	       print "watermarkedHeight: $thumbnailHeight <br>";
+	       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 */
@@ -747,7 +1224,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 								 $mimeType, 'composite', $newTmpFile, $tmpFile,
 								 array($watermark, $watermarkMimeType,
 								       $watermarkWidth, $watermarkHeight,
-								       'bottom-left', 0, 0));
+								       $watermarkAlignment, 0, 0));
 	     
 	     /* Check the return code of the composite operation */
  	     if ($ret) {
@@ -756,7 +1233,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
 	     }
 
 	     if(!strcmp($debugOutput,"true")) {
-	       print "watermarked Image: $tmpFile <br>";
+	       print "\nwatermarked Image: $tmpFile <br>";
 	       print "<hr>";
 	     }
 		       
@@ -783,7 +1260,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>";
 	   }
        }
        
@@ -824,7 +1301,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
      global $gallery;
      
      $requestMethod='GET';
-
+     $requestBody='';
+     
      /* Convert illegal characters */
      $url = str_replace(' ', '%20', $url);