Fixed a few bugs I introduced this morning when converting hard coded text to variables.

[embedvideo/.git] / ItemAddEmbedVideo.inc

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 457ad724a52fd6ae6920873c550f05d11c5f7b0c..eb15456ed6b424d1af018305f614d35a0195962e 100644 (file)
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -75,9 +75,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
           $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";
+          $urlGenerator =& $gallery->getUrlGenerator();
+          $gallery2_url = $urlGenerator->getCurrentUrlDir();
+          $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'];
@@ -109,7 +110,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               $feed.= "&dev_id=$dev_id&video_id=$video_id";
               
               /* Get the youtube xml feed as a string data source */
-              $xml = _getFeed($feed);  
+              $xml = $this->_getFeed($feed);   
 
               if($debugOutput) {
                 print "$xml";
@@ -161,7 +162,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               }
 
               /* Grab the contents of the webpage used to display the video on video.google.com */
-              $contents=file_get_contents($url);
+              //$contents=file_get_contents($url);
+              $contents = $this->_getFeed($url);
 
               /* Extract the summary from the webpage contents */
               preg_match('/<meta content="(.+?)\. \w+ \d+, \d+.*" name="description">/i',
@@ -183,7 +185,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               $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.= 'src="'.$googlePlayer.'?docId='.$doc_id.'"> ';
               $description.= '</embed>';
               $description.= "<br>$summary";