From: Alan Jack Pippin <ajp@pippin.(none)>
Date: Mon, 11 Jun 2007 16:52:05 +0000 (-0600)
Subject: Cleaned up code to follow Galler2 coding guidelines
X-Git-Tag: 1_0_4~17
X-Git-Url: http://git.pippins.net/.%24link.?a=commitdiff_plain;h=6adbc488a2f3fb1001f4dd8497f047fb31e911b4;p=embedvideo%2F.git

Cleaned up code to follow Galler2 coding guidelines
---

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 8b5b299..457ad72 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -30,326 +30,405 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
   /**
    * @see ItemAddPlugin::handleRequest
    */
-  function handleRequest($form, &$item) {
-    global $gallery;
-    
-    $status = $error = array();
+ function handleRequest($form, &$item) {
+   global $gallery;
     
-    if (isset($form['action']['addEmbedVideoPage'])) {
-      
-      $platform =& $gallery->getPlatform();
+   $status = $error = array();
+   
+   if (isset($form['action']['addEmbedVideoPage'])) {
+     
+       $platform =& $gallery->getPlatform();
       
-      if(isset($form['webPage']['URL'])) {
+       if(isset($form['webPage']['URL'])) {
+	 
+	   /* Load any stored/set Parameters */
+	   list ($ret, $params) =
+	     GalleryCoreApi::fetchAllPluginParameters('module', 'embedvideo');
+	   if ($ret) {
+	       return array($ret, null, null);
+	   }
+	   foreach (array('default', 'override') as $type) {
+	       $ItemAddUploadApplet[$type] = array();
+	       if (!empty($params['embedvideo' . $type . 'Variables'])) {
+		   $variablesArray = explode('|', $params['embedvideo' . $type . 'Variables']);
+		   foreach ($variablesArray as $variable) {
+		       list ($name, $value) = explode('=', $variable);
+		       $ItemAddEmbedVideo[$type][$name] = $value;
+		   }
+	       }
+	   }
+	   
+	   /* Store any Parameters into some simpler, shorter, local variables */
+	   $debugOutput = $ItemAddEmbedVideo['default']['debugOutput'];
+	   $useInternalFlvPlayer = $ItemAddEmbedVideo['default']['useInternalFlvPlayer'];
+	   $youtubeDevId = $ItemAddEmbedVideo['default']['youtubeDevId'];
+	   $width=$ItemAddEmbedVideo['default']['width'];
+	   $height=$ItemAddEmbedVideo['default']['height'];
+	   $externalFlvPlayer = $ItemAddEmbedVideo['default']['externalFlvPlayer'];
+	   $externalFlvPlayerVars = $ItemAddEmbedVideo['default']['externalFlvPlayerVars'];
+	   $flvThumbnail = $ItemAddEmbedVideo['default']['flvThumbnail'];
 
-	$url = $form['webPage']['URL'];
+	   /* Store other string constants we'll use later */
+	   $youtubeUrlPattern="www.youtube.com";
+	   $youtubeApiUrl="http://www.youtube.com/api2_rest";
+	   $googleUrlPattern="video.google.com";
+	   $googlePlayer="http://video.google.com/googleplayer.swf";
+	   
+	   /* Gallery2 specific paths and variables */
+	   $gallery2_url = "http://www.pippins.net/gallery2";
+	   $gallery2_flv_thumbnail = "/modules/thumbnail/images/G2video.jpg";
+	   $gallery2_flv_player = "/modules/flashvideo/lib/G2flv.swf";
+	   
+	   /* Store the passed URL in a shorter local variable */
+	   $url = $form['webPage']['URL'];
 
-	// Load any stored/set Parameters
-	list ($ret, $params) =
-	  GalleryCoreApi::fetchAllPluginParameters('module', 'embedvideo');
-	if ($ret) {
-	  return array($ret, null, null);
-	}
-	foreach (array('default', 'override') as $type) {
-	  $ItemAddUploadApplet[$type] = array();
-	  if (!empty($params['embedvideo' . $type . 'Variables'])) {
-	    $variablesArray = explode('|', $params['embedvideo' . $type . 'Variables']);
-	    foreach ($variablesArray as $variable) {
-	      list ($name, $value) = explode('=', $variable);
-	      $ItemAddEmbedVideo[$type][$name] = $value;
-	    }
-	  }
-	}
-	
-	// Store any Parameters into some simpler, shorter, local variables
-	$debug=0;
-	$use_internal_flv_player = $ItemAddEmbedVideo['default']['useInternalFlvPlayer'];
-	$youtube_dev_id = $ItemAddEmbedVideo['default']['youtubeDevId'];
-	$width=$ItemAddEmbedVideo['default']['width'];
-	$height=$ItemAddEmbedVideo['default']['height'];
-	$external_flv_player = $ItemAddEmbedVideo['default']['externalFlvPlayer'];
-	$external_flv_player_vars = $ItemAddEmbedVideo['default']['externalFlvPlayerVars'];
+	   /*
+	    *****************************
+	    * Embed a Youtube Video
+	    *****************************
+	    */
+	   if(preg_match("/$youtubeUrlPattern/",$url)) {
 
-	///////////////////////////////
-	// Embed a Youtube Video
-	///////////////////////////////
-	if(preg_match("/www.youtube.com/",$url)) {
+ 	       /* Make sure we can find a video_id in the URL */
+	       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 */
+	       $xml = _getFeed($feed);	
 
-	  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);
-	  }
+	       if($debugOutput) {
+		 print "$xml";
+	       }
+	       
+	       /* 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);
 	  
-	  // Youtube Developer ID
-	  $dev_id = $youtube_dev_id;
-	  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 = "http://www.youtube.com/api2_rest?method=youtube.videos.get_details&dev_id=$dev_id&video_id=$video_id";
-	  
-	  //get the feed as a string data source
-	  $xml = get_feed($feed);	
+	       /* 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);	  
+	       }
 
-	  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 me across the board. 
-	  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);	  
-	  }
-	  
-	  $title = $title[0][0];
-	  $summary = $description[0][0];
-	  $thumbnail = $thumbnail[0][0];
-	  
-	  $description = '<object width="'.$width.'" height="'.$height.'">';
-	  $description.= '<param name="movie" value="http://www.youtube.com/v/'.$video_id.'"></param>';
-	  $description.= '<param name="wmode" value="transparent"></param>';
-	  $description.= '<embed src="http://www.youtube.com/v/'.$video_id.'" ';
-	  $description.= 'type="application/x-shockwave-flash" wmode="transparent" ';
-	  $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
-	  $description.= "<br>$summary";
-	}
-	   
-	   
-	///////////////////////////////////
-	// Embed a Google Video
-	///////////////////////////////////
-	else if(preg_match("/video.google.com/",$url)) {
-	     
-	  if(preg_match("/docid=(.*)/",$url,$matches)) {
-	    $doc_id = $matches[1];
-	  } else {
-	    return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
-					       "Unable to extract doc id from url: $url"),null,null);
-	  }
-	  
-	  $link="$url";
-	  $contents=file_get_contents($link);
-	  preg_match('/<meta content="(.+?)\. \w+ \d+, \d+.*" name="description">/i', $contents, $matches);
-	  $summary=$matches[1];
-	  preg_match('/<title>(.+?)\s+- Google Video<\/title>/i', $contents, $matches);
-	  $title=$matches[1];
-	  preg_match('/<img src="(http:\/\/video\.google\.com\/ThumbnailServer2.+?)" /i', $contents, $matches);
-	  $thumbnail=$matches[1];
-	  $thumbnail=preg_replace("/offsetms=0/","offsetms=0",$thumbnail);
-	  
-	  $description = '<embed FlashVars="autoPlay=true" ';
-	  $description.= 'style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" ';
-	  $description.= 'type="application/x-shockwave-flash" ';
-	  $description.= 'src="http://video.google.com/googleplayer.swf?docId='.$doc_id.'"> ';
-	  $description.= '</embed>';
-	  $description.= "<br>$summary";
-	 
-	}
+	       /* Store the information found in some local variables */
+	       $title = $title[0][0];
+	       $summary = $description[0][0];
+	       $thumbnail = $thumbnail[0][0];
 
-	///////////////////////////
-	// Embed a remote .flv file
-       	///////////////////////////
-	else if(preg_match("/.*\/(.+?)\.flv/i",$url,$matches)) {
-	  $title = $matches[1];
-	  $summary = $matches[1];
-	  $thumbnail = 'http://www.pippins.net/images/flv_thumb.jpg';
+	       /* Format the description to hold a reference to the embedded video */
+	       $description = '<object width="'.$width.'" height="'.$height.'">';
+	       $description.= '<param name="movie" ';
+	       $description.= 'value="http://www.youtube.com/v/'.$video_id.'"></param>';
+	       $description.= '<param name="wmode" value="transparent"></param>';
+	       $description.= '<embed src="http://www.youtube.com/v/'.$video_id.'" ';
+	       $description.= 'type="application/x-shockwave-flash" wmode="transparent" ';
+	       $description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
+	       $description.= "<br>$summary";
 
-	  if (empty($extraHeaders)) {
-	    $extraHeaders = array('Referer' => str_replace('&amp;', '&', $url));
-	  }
+	   /*
+	    **********************************
+	    * Embed a Google Video
+	    **********************************
+            */
+	   } else if(preg_match("/$googleUrlPattern/",$url)) {
 
-	  list ($successfullyCopied, $response, $headers) =
-	    GalleryCoreApi::fetchWebPage($url, $extraHeaders);
-	  if (!$successfullyCopied) {
-	    return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
-					       "Unable to locate a video at url: $url"),null,null);
-	  }
-	  
-	  // External FLV player
-	  if(!$use_internal_flv_player) {
+	       /* Make sure we can extract a docID */
+	       if(preg_match("/docid=(.*)/",$url,$matches)) {
+		   $doc_id = $matches[1];
+	       } else {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
+				"Unable to extract doc id from url: $url"),null,null);
+	       }
 
-	    if(!preg_match("/\w+/",$external_flv_player)) {
-	      return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED,__FILE__,__LINE__,
-					       "Invalid/missing external player parameter"),null,null);
-	    }
-	    
-	    $description ='<embed src="'.$external_flv_player.'" ';
-	    $description.= 'width="'.$width.'" height="'.$height.'" bgcolor="#C0C0C0" allowfullscreen="true" ';
-	    $description.= 'type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" ';
-	    $description.= 'flashvars="file='.$url.'&fullscreenpage='.$thumbnail.'&linktarget=_Blank&image='.$thumbnail;
+	       /* Grab the contents of the webpage used to display the video on video.google.com */
+	       $contents=file_get_contents($url);
 
-	    if(!preg_match("/\w+/",$external_flv_player_vars)) {
-	      $description.= '&showdigits=true&autostart=false&showfsbutton=true&';
-	      $description.= '&repeat=false&lightcolor=0x9999FF&backcolor=0x888888&frontcolor=0x000000"';
-	    } else {
-	      $description.= '&'.$external_flv_player_vars;
-	    }
-	    $description.=  ' />&nbsp;</p>';
-	  }
-	  
-	  // Internal FLV player
-	  else { 
-	    $description = '<script type="text/javascript">'."\n";
-	    $description.= '// <![CDATA['."\n";
-	    $description.= 'function divResize(id, nw, nh) {'."\n";
-	    $description.= 'var obj = document.getElementById(id);'."\n";
-	    $description.= 'obj.style.width = nw + "px";'."\n";
-	    $description.= 'obj.style.height = nh + "px";'."\n";
-	    $description.= '}'."\n";
-	    $description.= '// ]]>'."\n";
-	    $description.= '</script>'."\n";
-	    $description.= '<div id="flashvideo" style="align:left;width:525px;height:392px">'."\n";
-	    $description.= '<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000"';
-	    $description.= 'codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0"';
-	    $description.= 'width="100%" height="100%" id="IFid1" class="ImageFrame_image">';
-	    $description.= '<param name="movie" value="http://www.pippins.net/gallery2/modules/flashvideo/lib/G2flv.swf"/>';
-	    $description.= '<param name="FlashVars" value="flvUrl='.$url.'&Width='.$width.'&Height='.$height.'&title='.$title;
-	    $description.= '&allowDl=true&thumbUrl='.$thumbnail.'&langDownload=Download&langLarge=Large&langNormal=Normal"/>';
-	    $description.= '<param name="quality" value="high"/>';
-	    $description.= '<param name="scale" value="noscale"/>';
-	    $description.= '<param name="salign" value="lt"/>';
-	    $description.= '<param name="wmode" value="transparent"/>';
-	    $description.= '<param name="allowScriptAccess" value="always"/>';
-	    $description.= '<embed src="http://www.pippins.net/gallery2/modules/flashvideo/lib/G2flv.swf" flashvars="flvUrl='.$url;
-	    $description.= '&Width='.$width.'&Height='.$height.'&title='.$title.'&allowDl=true&thumbUrl='.$thumbnail;
-	    $description.= '&langDownload=Download&langLarge=Large&langNormal=Normal" type="application/x-shockwave-flash" ';
-	    $description.= 'width="100%" height="100%" quality="high" scale="noscale" salign="lt" ';
-	    $description.= 'wmode="transparent" allowScriptAccess="always" ';
-	    $description.= 'pluginspage="http://www.macromedia.com/go/getflashplayer"/>';
-	    $description.= '</object></div>';
-	  }
-	}
-	
-       	////////////////////////////
-	// Unsupported URL to embed
-       	////////////////////////////
-	else {
-	  return array(GalleryCoreApi::error(ERROR_UNSUPPORTED_FILE_TYPE,__FILE__,__LINE__,
-					       "Unable to embed video from: $url"),null,null);
-	}
+	       /* Extract the summary from the webpage contents */
+	       preg_match('/<meta content="(.+?)\. \w+ \d+, \d+.*" name="description">/i',
+			  $contents, $matches);
+	       $summary=$matches[1];
 
-	
-	////////////////////////////
-	// Add the video to Gallery
-       	////////////////////////////
-	
-	// Get a local tmp file to save the thumbnail to
-	$tmpDir = $gallery->getConfig('data.gallery.tmp');
-	$tmpFile = $platform->tempnam($tmpDir, 'add');
-	$tmpFile.= ".jpg";
+	       /* Extract the title from the webpage contents */
+	       preg_match('/<title>(.+?)\s+- Google Video<\/title>/i',
+			  $contents, $matches);
+	       $title=$matches[1];
 
-	if($debug) {
-	  print "thumbnail: $thumbnail <br>";
-	}
-	
-	// Fetch the thumbnail and save it to a local file
-	if (empty($extraHeaders)) {
-	  $extraHeaders = array('Referer' => str_replace('&amp;', '&', $url));
-	}
+	       /* Extract the thumbnail URL from the webpage contents */
+	       preg_match('/<img src="(http:\/\/video\.google\.com\/ThumbnailServer2.+?)" /i',
+			  $contents, $matches);
+	       $thumbnail=$matches[1];
+	       $thumbnail=preg_replace("/offsetms=0/","offsetms=0",$thumbnail);
 
-	list ($successfullyCopied, $response, $headers) =
-	  GalleryCoreApi::fetchWebFile($thumbnail, $tmpFile, $extraHeaders);
-	if (!$successfullyCopied) {
-	  return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
-					       "Unable to copy thumbnail from url: $url"),null,null);
-	}
+	       /* Format the description to hold a reference to the embedded video */
+	       $description = '<embed FlashVars="autoPlay=true" ';
+	       $description.= 'style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" ';
+	       $description.= 'type="application/x-shockwave-flash" ';
+	       $description.= 'src="'.$googlePlayer.'"?docId='.$doc_id.'"> ';
+	       $description.= '</embed>';
+	       $description.= "<br>$summary";
+	 
+	   /*
+	    **********************************
+	    * Embed a remote .flv file
+	    **********************************
+            */
+	   } else if(preg_match("/.*\/(.+?)\.flv/i",$url,$matches)) {
 
-	// Obtain the mimeType of the thumbnail
-	list ($ret, $mimeType) = GalleryCoreApi::getMimeType($tmpFile);
+	       /* Set the title and summary to the name of the file */
+	       $title = $matches[1];
+	       $summary = $matches[1];
+	       
+	       /*
+                * Set the thumbnail to some generic jpg image,
+	        * since we can't extract it from the remote flv file.
+	        * If no parameter is set, set it to a default value.
+                */
+	       if(preg_match("/\w+/", $flvThumbnail)) {
+		 $thumbnail = $flvThumbnail;
+	       } else {
+		 $thumbnail = $gallery2_url.$gallery2_flv_thumbnail;
+	       }
 
-	// Set the filename for the item we want to add
-	$fileName = $title;
-	$fileName = preg_replace("/\s+/","_",$fileName);
-	$fileName = preg_replace("/'/","",$fileName);
-	$fileName = preg_replace("/\"/","",$fileName);
-	$fileName = preg_replace("/&#\d+;/","",$fileName);
-	
-	// DEBUG OUTPUT
-	if($debug) {
-	  print "<p><a href=\"".$title."\" target=\"_blank\">\n<img src=\"".$thumbnail."\">\n</a>".$summary."</p>";
-	  print "<p>$description</p>";
-	  print "thumbnail: $tmpFile <br>";
-	  print "mimeType: $mimeType <br>";
-	  print "fileName: $fileName <br>";
-	}
-	
-	list ($ret, $newItem) = GalleryCoreApi::addItemToAlbum($tmpFile,
-							       $fileName,
-							       $title,
-							       $summary,
-							       $description,
-							       $mimeType,
-							       $item->getId());
-	
-	if ($ret) {
-	  return array($ret, null, null);
-	}
-	
-	$status['addedFiles'][] = array('fileName' => $url,
-					'id' => $newItem->getId(),
-					'warnings' => array());
-      }
-      @$platform->unlink($tmpFile);
-    }
-    
-    return array(null, $error, $status);
-  }
+	       /*
+                * Check to make sure the URL to the remote flv file is valid
+	        * (That the file exists at the URL given)
+                */
+	       if (empty($extraHeaders)) {
+		   $extraHeaders = array('Referer' => str_replace('&amp;', '&', $url));
+	       }
+	       list ($successfullyCopied, $response, $headers) =
+		 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
+	       if (!$successfullyCopied) {
+		   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+				"Unable to locate a video at url: $url"),null,null);
+	       }					    
+	       
+	       /*
+                * Format the description to hold a reference to the embedded video
+		* This reference will be embedded using the G2 internal player,
+	        * or an external player if provided by the user.
+                */
+	       if(!$useInternalFlvPlayer) {
 
-/**
- * @see ItemAdd:loadTemplate
- */
-function loadTemplate(&$template, &$form, $item) {
-  global $gallery;
-  
-  if ($form['formName'] != 'ItemAddEmbedVideo') {
-    /* First time around, load the form with item data */
-    $form['webPage'] = '';
-    $form['formName'] = 'ItemAddEmbedVideo';
-  }
-      
-  $session =& $gallery->getSession();
-  
-  $template->setVariable('ItemAddEmbedVideo', $ItemAddEmbedVideo);
-  
-  return array(null,
-	       'modules/embedvideo/templates/ItemAddEmbedVideo.tpl',
-	       'modules_embedvideo');
-}
+		   /*
+                    * The user has indicated they want to use an external flv player
+		    * Make sure one is defined!
+                    */
+		   if(!preg_match("/\w+/",$externalFlvPlayer)) {
+		       return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED,__FILE__,__LINE__,
+				   "Invalid/missing external player parameter"),null,null);
+		   }
 
-/**
- * @see ItemAddPlugin::getTitle
- */
- function getTitle() {
-   list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'embedvideo');
-   if ($ret) {
-     return array($ret, null);
+		   /* Format the description to hold a reference to the embedded video */
+		   $description ='<embed src="'.$externalFlvPlayer.'" ';
+		   $description.= 'width="'.$width.'" height="'.$height.'" ';
+		   $description.= 'bgcolor="#C0C0C0" allowfullscreen="true" ';
+		   $description.= 'type="application/x-shockwave-flash" ';
+		   $description.= 'pluginspage="http://www.macromedia.com/go/getflashplayer" ';
+		   $description.= 'flashvars="file='.$url;
+		   $description.= '&fullscreenpage='.$thumbnail;
+		   $description.= '&linktarget=_Blank&image='.$thumbnail;
+
+		   if(!preg_match("/\w+/",$externalFlvPlayerVars)) {
+		       /* Format the flashvars for the internal G2 flv player */
+		       $description.= '&showdigits=true&autostart=false&showfsbutton=true&';
+  		       $description.= '&repeat=false&lightcolor=0x9999FF';
+		       $description.= '&backcolor=0x888888&frontcolor=0x000000"';
+		   } else {
+		       /* Format the flashvars for the external G2 flv player */
+		       $description.= '&'.$externalFlvPlayerVars;
+		   }
+		   $description.=  ' />&nbsp;</p>';
+	       
+	       /* Internal FLV player */
+	       } else {
+		   /* Format the description to hold a reference to the embedded video */
+		   $macromedia_url = "http://download.macromedia.com/pub/shockwave/cabs/flash/";
+		   $description = '<script type="text/javascript">'."\n";
+		   $description.= '// <![CDATA['."\n";
+		   $description.= 'function divResize(id, nw, nh) {'."\n";
+		   $description.= 'var obj = document.getElementById(id);'."\n";
+		   $description.= 'obj.style.width = nw + "px";'."\n";
+		   $description.= 'obj.style.height = nh + "px";'."\n";
+		   $description.= '}'."\n";
+		   $description.= '// ]]>'."\n";
+		   $description.= '</script>'."\n";
+		   $description.= '<div id="flashvideo" style="align:left;width:525px;height:392px">'."\n";
+		   $description.= '<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000"';
+		   $description.= 'codebase="'.$macromedia_url.'swflash.cab#version=8,0,0,0"';
+		   $description.= 'width="100%" height="100%" id="IFid1" class="ImageFrame_image">';
+		   $description.= '<param name="movie" value="'.$gallery2_url.$gallery2_flv_player.'"/>';
+		   $description.= '<param name="FlashVars" value="flvUrl='.$url;
+		   $description.= '&Width='.$width.'&Height='.$height.'&title='.$title;
+		   $description.= '&allowDl=true&thumbUrl='.$thumbnail;
+		   $description.= '&langDownload=Download&langLarge=Large&langNormal=Normal"/>';
+		   $description.= '<param name="quality" value="high"/>';
+		   $description.= '<param name="scale" value="noscale"/>';
+		   $description.= '<param name="salign" value="lt"/>';
+		   $description.= '<param name="wmode" value="transparent"/>';
+		   $description.= '<param name="allowScriptAccess" value="always"/>';
+		   $description.= '<embed src="'.$gallery2_url.$gallery2_flv_player.'" ';
+		   $description.= 'flashvars="flvUrl='.$url;
+		   $description.= '&Width='.$width.'&Height='.$height.'&title='.$title;
+		   $description.= '&allowDl=true&thumbUrl='.$thumbnail;
+		   $description.= '&langDownload=Download&langLarge=Large&langNormal=Normal" ';
+		   $description.= 'type="application/x-shockwave-flash" ';
+		   $description.= 'width="100%" height="100%" quality="high" scale="noscale" salign="lt" ';
+		   $description.= 'wmode="transparent" allowScriptAccess="always" ';
+		   $description.= 'pluginspage="http://www.macromedia.com/go/getflashplayer"/>';
+		   $description.= '</object></div>';
+	       }
+	       
+	  /*
+	   **********************************
+	   * Unsupported URL to embed
+	   **********************************
+           */   
+	   } else {
+	       return array(GalleryCoreApi::error(ERROR_UNSUPPORTED_FILE_TYPE,__FILE__,__LINE__,
+			    "Unable to embed video from: $url"),null,null);
+	   }
+	   
+
+	   /*
+	   **********************************
+	   * Add the video to Gallery
+	   **********************************
+           */
+	   
+	   /* Get a local tmp file to save the thumbnail URL to */
+	   $tmpDir = $gallery->getConfig('data.gallery.tmp');
+	   $tmpFile = $platform->tempnam($tmpDir, 'add');
+	   $tmpFile.= ".jpg";
+	   
+	   if($debugOutput) {
+	       print "thumbnail: $thumbnail <br>";
+	   }
+	   
+	   /* Fetch the thumbnail and save it to a local file */
+	   if (empty($extraHeaders)) {
+	       $extraHeaders = array('Referer' => str_replace('&amp;', '&', $url));
+	   }
+  	   list ($successfullyCopied, $response, $headers) =
+	     GalleryCoreApi::fetchWebFile($thumbnail, $tmpFile, $extraHeaders);
+	   if (!$successfullyCopied) {
+	       return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
+			    "Unable to copy thumbnail from url: $url"),null,null);
+	   }
+	   
+	   /* Obtain the mimeType of the thumbnail */
+	   list ($ret, $mimeType) = GalleryCoreApi::getMimeType($tmpFile);
+	   
+	   /* Set the filename for the item we want to add */
+	   $fileName = $title;
+	   $fileName = preg_replace("/\s+/","_",$fileName);
+	   $fileName = preg_replace("/'/","",$fileName);
+	   $fileName = preg_replace("/\"/","",$fileName);
+	   $fileName = preg_replace("/&#\d+;/","",$fileName);
+	   
+	   /* General debug output */
+	   if($debugOutput) {
+  	       print "<p><a href=\"".$title."\" target=\"_blank\">";
+	       print "<img src=\"".$thumbnail."\">\n</a>".$summary."</p>";
+	       print "<p>$description</p>";
+	       print "thumbnail: $tmpFile <br>";
+	       print "mimeType: $mimeType <br>";
+	       print "fileName: $fileName <br>";
+	   }
+
+	   /* Make the gallery2 call to add this item to the album */
+	   list ($ret, $newItem) = GalleryCoreApi::addItemToAlbum($tmpFile,
+								  $fileName,
+								  $title,
+								  $summary,
+								  $description,
+								  $mimeType,
+								  $item->getId());
+	   
+	   if ($ret) {
+	       return array($ret, null, null);
+	   }
+	   
+	   $status['addedFiles'][] = array('fileName' => $url,
+					   'id' => $newItem->getId(),
+					   'warnings' => array());
+       }
+       @$platform->unlink($tmpFile);
    }
    
-   return array(null, $module->translate('Embed Video'));
+   return array(null, $error, $status);
+ }
+
+ /**
+  * @see ItemAdd:loadTemplate
+  */
+ function loadTemplate(&$template, &$form, $item) {
+    global $gallery;
+    
+    if ($form['formName'] != 'ItemAddEmbedVideo') {
+        /* First time around, load the form with item data */
+        $form['webPage'] = '';
+	$form['formName'] = 'ItemAddEmbedVideo';
+    }
+    
+    $session =& $gallery->getSession();
+    
+    $template->setVariable('ItemAddEmbedVideo', $ItemAddEmbedVideo);
+    
+    return array(null,
+		 'modules/embedvideo/templates/ItemAddEmbedVideo.tpl',
+		 'modules_embedvideo');
+ }
+ 
+ /**
+  * @see ItemAddPlugin::getTitle
+  */
+ function getTitle() {
+    list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'embedvideo');
+    if ($ret) {
+        return array($ret, null);
+    }
+    
+    return array(null, $module->translate('Embed Video'));
  }
-}
 
 
-function get_feed($feed){
-  
-  //Open and return Feed with cURL for parsing
-  $ch = curl_init();
-  $timeout = 0;
-  curl_setopt ($ch, CURLOPT_URL, $feed);
-  curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-  curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-  $xml = curl_exec($ch);
-  curl_close($ch);
+ /**
+  * ItemAddEmbedVideo::_getFeed
+  */
+ function _getFeed($feed) {
   
-  return $xml;
-  
-}
-	
+     /* Open and return Feed with cURL for parsing */
+    $ch = curl_init();
+    $timeout = 0;
+    curl_setopt ($ch, CURLOPT_URL, $feed);
+    curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+    $xml = curl_exec($ch);
+    curl_close($ch);
+    
+    return $xml;    
+ }
+ 
+}	
 ?>
diff --git a/templates/EmbedVideoSiteAdmin.tpl b/templates/EmbedVideoSiteAdmin.tpl
index 74df8d2..c580ed5 100644
--- a/templates/EmbedVideoSiteAdmin.tpl
+++ b/templates/EmbedVideoSiteAdmin.tpl
@@ -1,5 +1,5 @@
 {*
- * $Revision: 15342 $
+ * $Revision: 1 $
  * If you want to customize this file, do not edit it directly since future upgrades
  * may overwrite it.  Instead, copy it into a new directory called "local" and edit that
  * version.  Gallery will look for that file first and use it if it exists.
@@ -130,6 +130,12 @@
     <tr class="gbEven"><td>height</td><td>240</td>
       <td>{g->text text="specify the height dimension of the embedded video player"}</td></tr>
 
+    <tr class="gbEven"><td>debugOutput</td><td>true|false</td>
+      <td>{g->text text="turn on module debug output"}</td></tr>
+
+    <tr class="gbEven"><td>flvThumbnail</td><td>URL path</td>
+      <td>{g->text text="URL path to a jpg to use as a thumbnail for all directly linked/embedded flv files."}</td></tr>
+
   </table>
 
 </div>
diff --git a/templates/ItemAddEmbedVideo.tpl b/templates/ItemAddEmbedVideo.tpl
index 4c2c7ac..2180a76 100644
--- a/templates/ItemAddEmbedVideo.tpl
+++ b/templates/ItemAddEmbedVideo.tpl
@@ -1,5 +1,5 @@
 {*
- * $Revision: 15342 $
+ * $Revision: 1 $
  * If you want to customize this file, do not edit it directly since future upgrades
  * may overwrite it.  Instead, copy it into a new directory called "local" and edit that
  * version.  Gallery will look for that file first and use it if it exists.