Changeset 20804

Timestamp:

Feb 18, 2013, 12:20:10 PM (11 years ago)

Author:

mistic100

Message:

• add support for semi-private Vimeo videos
• escape tags
• compatible with safe_mode=On
• deactivate autosize

Location:

extensions/gvideo

Files:

• admin/add.php (modified) (5 diffs)
• admin/photo.php (modified) (1 diff)
• admin/template/add.tpl (modified) (1 diff)
• include/functions.inc.php (modified) (12 diffs)
• include/gvideo.inc.php (modified) (3 diffs)
• include/install.inc.php (modified) (4 diffs)
• main.inc.php (modified) (4 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/gvideo/admin/add.php

@@ -7 +7 @@
 if (isset($_POST['add_video']))
 {
+  $_POST['url'] = trim($_POST['url']);
   // check inputs
   if (empty($_POST['url']))
@@ -12 +13 @@
     array_push($page['errors'], l10n('Please fill the video URL'));
   }
-  if ( !empty($_POST['url']) and ($video = parse_video_url($_POST['url'], isset($_POST['safe_mode']))) === false )
+  else if ( ($video = parse_video_url($_POST['url'], isset($_POST['safe_mode']))) === false )
   {
     if (isset($_POST['safe_mode']))
@@ -28 +29 @@
   if (count($page['errors']) == 0)
   {
-    // download thumbnail
-    $thumb_ext = empty($video['thumbnail']) ? 'jpg' : get_extension($video['thumbnail']);
-    $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.$thumb_ext;
-    $thumb_source = $conf['data_location'].$thumb_name;
-    if ( empty($video['thumbnail']) or download_remote_file($video['thumbnail'], $thumb_source) !== true )
-    {
-      $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';
-      copy(GVIDEO_PATH.'mimetypes/'.$video['type'].'.jpg', $thumb_source);
-    }
-    
-    if (isset($_POST['add_film_frame']))
-    {
-      add_film_frame($thumb_source);
-    }
-    
-    // add image and update infos
-    $image_id = add_uploaded_file($thumb_source, $thumb_name, array($_POST['category']));
-    
-    $updates = array(
-      'name' => pwg_db_real_escape_string($video['title']),
-      'author' => pwg_db_real_escape_string($video['author']),
-      'is_gvideo' => 1,
-      );
-      
-    if ( $_POST['sync_description'] and !empty($video['description']) )
-    {
-      $updates['comment'] = pwg_db_real_escape_string($video['description']);
-    }
-    if ( $_POST['sync_tags'] and !empty($video['tags']) )
-    {
-      set_tags(get_tag_ids(implode(',', $video['tags'])), $image_id);
-    }
-    
-    single_update(
-      IMAGES_TABLE,
-      $updates,
-      array('id' => $image_id),
-      true
-      );
-    
-    // register video
     if ($_POST['size_common'] == 'true')
     {
@@ -82 +42 @@
       $_POST['autoplay'] = '';
     }
+    $_POST['add_film_frame'] = isset($_POST['add_film_frame']);
     
-    $insert = array(
-      'picture_id' => $image_id,
-      'url' => $video['url'],
-      'type' => $video['type'],
-      'video_id' => $video['video_id'],
-      'width' => $_POST['width'],
-      'height' => $_POST['height'],
-      'autoplay' => $_POST['autoplay'],
-      );
-      
-    single_insert(
-      GVIDEO_TABLE,
-      $insert
-      );
-      
+    
+    $image_id = add_video($video, $_POST);
+    
+    
     $query = '
 SELECT id, name, permalink
@@ -137 +87 @@
   get_ini_size('post_max_filesize', false);
   
+if (!isset($_POST['safe_mode']))
+{
+  $_POST['safe_mode'] = !test_remote_download();
+}
+
 // template
 $template->assign(array(

extensions/gvideo/admin/photo.php

@@ -100 +100 @@
       $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.$thumb_ext;
       $thumb_source = $conf['data_location'].$thumb_name;
-      if ( empty($video['thumbnail']) or download_remote_file($video['thumbnail'], $thumb_source) !== true )
+      if ( empty($video['thumbnail']) or gvideo_download_remote_file($video['thumbnail'], $thumb_source) !== true )
       {
         $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';

extensions/gvideo/admin/template/add.tpl

@@ -43 +43 @@
     <li>
       <span class="property">{'Thumbnail'|@translate}</span>
-      <label><input type="checkbox" name="add_film_frame" value="true"> {'Add film effect'|@translate} </label>
+      <label><input type="checkbox" name="add_film_frame" value="true" {if $POST.add_film_frame}checked="checked"{/if}> {'Add film effect'|@translate} </label>
       <a class="showInfo" title="<img src='{$GVIDEO_PATH}admin/template/example-frame.jpg'>">i</a>
     </li>

extensions/gvideo/include/functions.inc.php

@@ -26 +26 @@
     case 'youtube':
     {
-      $video['type'] = 'youtube';
-
       parse_str($url['query'], $url['query']);
       if (empty($url['query']['v'])) return false;
@@ -36 +34 @@
     case 'youtu': // youtu.be (short-url service)
     {
+      $video['type'] = 'youtube';
+      
       if (empty($video['video_id']))
       {
-        $video['type'] = 'youtube';
-        
         $url['path'] = explode('/', $url['path']);
         $video['video_id'] = $url['path'][1];
@@ -48 +46 @@
       if (!$safe_mode)
       {
-        $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['video_id'].'?v=2&alt=json';
-        $json = download_remote_file($api_url, true);
-        if ($json === false or $json == 'file_error') return false;
+        $fields = 'entry(id,author,media:group(media:title(text()),media:description(text()),media:thumbnail(@url),media:keywords))';
+        $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['video_id'].'?v=2&alt=json&fields='.$fields;
+        $json = gvideo_download_remote_file($api_url, true);
+        
+        if ($json===false || $json=='file_error') return false;
         
         $json = json_decode($json, true);
         $video = array_merge($video, array(
-          'title' => $json['entry']['title']['$t'],
+          'title' => $json['entry']['media$group']['media$title']['$t'],
           'description' => $json['entry']['media$group']['media$description']['$t'],
-          'thumbnail' => $json['entry']['media$group']['media$thumbnail'][2]['url'],
+          'thumbnail' => $json['entry']['media$group']['media$thumbnail'][0]['url'],
           'author' => $json['entry']['author'][0]['name']['$t'],
           ));
+        if (!empty($json['entry']['media$group']['media$keywords']['$t']))
+        {
+          $video['tags'] = $json['entry']['media$group']['media$keywords']['$t'];
+        }
       }
       else
@@ -80 +84 @@
       if (!$safe_mode)
       {
-        $api_url = 'http://vimeo.com/api/v2/video/'.$video['video_id'].'.json';
-        $json = download_remote_file($api_url, true);
-        if ($json === false or $json == 'file_error') return false;
-        
-        $json = json_decode($json, true);
-        $video = array_merge($video, array(
-          'title' => $json[0]['title'],
-          'description' => $json[0]['description'],
-          'thumbnail' => $json[0]['thumbnail_large'],
-          'author' => $json[0]['user_name'],
-          'tags' => array_map('trim', explode(',', $json[0]['tags'])),
-          ));
+        // simple API for public videos
+        $api_url_1 = 'http://vimeo.com/api/v2/video/'.$video['video_id'].'.json';
+        $json = gvideo_download_remote_file($api_url_1, true);
+        
+        if ($json!==false && $json!='file_error' && trim($json)!=$video['video_id'].' not found.')
+        {
+          $json = json_decode($json, true);
+          $video = array_merge($video, array(
+            'title' => $json[0]['title'],
+            'description' => $json[0]['description'],
+            'thumbnail' => $json[0]['thumbnail_large'],
+            'author' => $json[0]['user_name'],
+            'tags' => $json[0]['tags'],
+            ));
+        }
+        else
+        {
+          // oEmbed API, for private videos, doesn't return keywords
+          $api_url_2 = 'http://vimeo.com/api/oembed.json?url='.rawurlencode($video['url']);
+          $json = gvideo_download_remote_file($api_url_2, true);
+          
+          if ($json===false || $json=='file_error') return false;
+          
+          $json = json_decode($json, true);
+          $video = array_merge($video, array(
+            'title' => $json['title'],
+            'description' => $json['description'],
+            'thumbnail' => $json['thumbnail_url'],
+            'author' => $json['author_name'],
+            ));
+        }
       }
       else
@@ -115 +138 @@
       {
         $api_url = 'https://api.dailymotion.com/video/'.$video['video_id'].'?fields=description,thumbnail_large_url,title,owner.username,tags'; // DM doesn't accept non secure connection
-        $json = download_remote_file($api_url, true);
-        if ($json === false or $json == 'file_error') return false;
+        $json = gvideo_download_remote_file($api_url, true);
+        
+        if ($json===false || $json=='file_error') return false;
         
         $json = json_decode($json, true);
@@ -126 +150 @@
           'thumbnail' => $json['thumbnail_large_url'],
           'author' => $json['owner.username'],
-          'tags' => $json['tags'],
+          'tags' => implode(',', $json['tags']),
           ));
       }
@@ -143 +167 @@
       
       // no safe_mode for wat.tv
-      $html = download_remote_file($source_url, true);
-      if ($html === false or $html == 'file_error') return false;
+      $html = gvideo_download_remote_file($source_url, true);
+      
+      if ($html===false || $html=='file_error') return false;
       
       preg_match('#<meta property="og:video" content="http://www.wat.tv/swf2/([^"/>]+)" />#', $html, $matches);
@@ -164 +189 @@
       
       preg_match_all('#<meta property="video:tag" content="([^">]+)" />#', $html, $matches);
-      $video['tags'] = $matches[1];
+      $video['tags'] = implode(',',  $matches[1]);
       break;
     }
@@ -180 +205 @@
       if (!$safe_mode)
       {
-        $html = download_remote_file($source_url, true);
-        if ($html === false or $html == 'file_error') return false;
+        $html = gvideo_download_remote_file($source_url, true);
+        
+        if ($html===false || $html=='file_error') return false;
         
         preg_match('#<meta property="og:title" content="([^">]*)" />#', $html, $matches);
@@ -196 +222 @@
         
         preg_match('#<meta name="keywords" content="([^">]+)" />#', $html, $matches);
-        $video['tags'] = array_map('trim', explode(',', $matches[1]));
+        $video['tags'] = $matches[1];
       }
       else
@@ -211 +237 @@
   
   return $video;
+}
+
+/**
+ * @params:
+ *  $video (from parse_video_url)
+ *  $config :
+ *    - category, integer
+ *    - add_film_frame, boolean
+ *    - sync_description, boolean
+ *    - sync_tags, boolean
+ *    - with, integer
+ *    - height, integer
+ *    - autoplay, integer (0-1)
+ */
+function add_video($video, $config)
+{
+  global $page, $conf;
+  
+  $query = '
+SELECT picture_id
+  FROM '.GVIDEO_TABLE.'
+  WHERE type = "'.$video['type'].'"
+    AND video_id = "'.$video['video_id'].'"
+;';
+  $result = pwg_query($query);
+  
+  if (pwg_db_num_rows($result))
+  {
+    $page['warnings'][] = l10n('This video was already registered');
+    list($image_id) = pwg_db_fetch_row($result);
+    return $image_id;
+  }
+  
+  include_once(PHPWG_ROOT_PATH . 'admin/include/functions_upload.inc.php');
+  
+  // download thumbnail
+  $thumb_ext = empty($video['thumbnail']) ? 'jpg' : get_extension($video['thumbnail']);
+  $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.$thumb_ext;
+  $thumb_source = $conf['data_location'].$thumb_name;
+  if ( empty($video['thumbnail']) or gvideo_download_remote_file($video['thumbnail'], $thumb_source) !== true )
+  {
+    $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';
+    copy(GVIDEO_PATH.'mimetypes/'.$video['type'].'.jpg', $thumb_source);
+  }
+  
+  if ($config['add_film_frame'])
+  {
+    add_film_frame($thumb_source);
+  }
+  
+  // add image and update infos
+  $image_id = add_uploaded_file($thumb_source, $thumb_name, array($config['category']));
+  
+  $updates = array(
+    'name' => pwg_db_real_escape_string($video['title']),
+    'author' => pwg_db_real_escape_string($video['author']),
+    'is_gvideo' => 1,
+    );
+    
+  if ( $config['sync_description'] and !empty($video['description']) )
+  {
+    $updates['comment'] = pwg_db_real_escape_string($video['description']);
+  }
+  
+  if ( $config['sync_tags'] and !empty($video['tags']) )
+  {
+    $tags = pwg_db_real_escape_string($video['tags']);
+    set_tags(get_tag_ids($tags), $image_id);
+  }
+  
+  single_update(
+    IMAGES_TABLE,
+    $updates,
+    array('id' => $image_id),
+    true
+    );
+  
+  // register video
+  if ( !preg_match('#^([0-9]*)$#', $config['width']) or !preg_match('#^([0-9]*)$#', $config['height']) )
+  {
+    $config['width'] = $config['height'] = '';
+  }
+  if ( $config['autoplay']!='0' and $config['autoplay']!='1' )
+  {
+    $config['autoplay'] = '';
+  }
+  
+  $insert = array(
+    'picture_id' => $image_id,
+    'url' => $video['url'],
+    'type' => $video['type'],
+    'video_id' => $video['video_id'],
+    'width' => $config['width'],
+    'height' => $config['height'],
+    'autoplay' => $config['autoplay'],
+    );
+    
+  single_insert(
+    GVIDEO_TABLE,
+    $insert
+    );
+    
+  return $image_id;
 }
 
@@ -233 +362 @@
  * @param: mixed destination file (if true, file content is returned)
  */
-if (!function_exists('download_remote_file'))
+function gvideo_download_remote_file($src, $dest, $headers=array())
 {
-  function download_remote_file($src, $dest)
-  {
-    if (empty($src))
+  if (empty($src))
+  {
+    return false;
+  }
+  
+  $return = ($dest === true) ? true : false;
+  
+  array_push($headers, 'Accept-language: en');
+  
+  /* curl */
+  if (function_exists('curl_init'))
+  {
+    if (!$return)
+    {
+      $newf = fopen($dest, "wb");
+    }
+    $ch = curl_init();
+    
+    curl_setopt($ch, CURLOPT_URL, $src);
+    curl_setopt($ch, CURLOPT_HEADER, false);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)');
+    curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+    if (!ini_get('safe_mode'))
+    {
+      curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+      curl_setopt($ch, CURLOPT_MAXREDIRS, 1);
+    }
+    if (strpos($src, 'https://') !== false)
+    {
+      curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+      curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+    }
+    if (!$return)
+    {
+      curl_setopt($ch, CURLOPT_FILE, $newf);
+    }
+    else
+    {
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    }
+    
+    $out = curl_exec($ch);
+    curl_close($ch);
+    
+    if ($out === false)
+    {
+      return 'file_error';
+    }
+    else if (!$return)
+    {
+      fclose($newf);
+      return true;
+    }
+    else
+    {
+      return $out;
+    }
+  }
+  /* file get content */
+  else if (ini_get('allow_url_fopen'))
+  {
+    if (strpos($src, 'https://') !== false and !extension_loaded('openssl'))
     {
       return false;
     }
     
-    $return = ($dest === true) ? true : false;
-    
-    /* curl */
-    if (function_exists('curl_init'))
-    {
-      if (!$return)
-      {
-        $newf = fopen($dest, "wb");
-      }
-      $ch = curl_init();
-      
-      curl_setopt($ch, CURLOPT_URL, $src);
-      curl_setopt($ch, CURLOPT_HEADER, false);
-      curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept-language: en"));
-      curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)');
-      if (!ini_get('safe_mode'))
-      {
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_MAXREDIRS, 1);
-      }
-      if (strpos($src, 'https://') !== false)
-      {
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-      }
-      if (!$return)
-      {
-        curl_setopt($ch, CURLOPT_FILE, $newf);
-      }
-      else
-      {
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-      }
-      
-      $out = curl_exec($ch);
-      curl_close($ch);
-      
-      if ($out === false)
-      {
-        return 'file_error';
-      }
-      else if (!$return)
-      {
-        fclose($newf);
-        return true;
-      }
-      else
-      {
-        return $out;
-      }
-    }
-    /* file get content */
-    else if (ini_get('allow_url_fopen'))
-    {
-      if (strpos($src, 'https://') !== false and !extension_loaded('openssl'))
-      {
-        return false;
-      }
-      
-      $opts = array(
-        'http' => array(
-          'method' => "GET",
-          'user_agent' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)',
-          'header' => "Accept-language: en",
-        )
-      );
-
-      $context = stream_context_create($opts);
-      
-      if (($file = file_get_contents($src, false, $context)) === false)
-      {
-        return 'file_error';
-      }
-      
-      if (!$return)
-      {
-        file_put_contents($dest, $file);
-        return true;
-      }
-      else
-      {
-        return $file;
-      }
-    }
-    
-    return false;
-  }
+    $opts = array(
+      'http' => array(
+        'method' => "GET",
+        'user_agent' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)',
+        'header' => implode("\r\n", $headers),
+      )
+    );
+
+    $context = stream_context_create($opts);
+    
+    if (($file = file_get_contents($src, false, $context)) === false)
+    {
+      return 'file_error';
+    }
+    
+    if (!$return)
+    {
+      file_put_contents($dest, $file);
+      return true;
+    }
+    else
+    {
+      return $file;
+    }
+  }
+  
+  return false;
 }
 

extensions/gvideo/include/gvideo.inc.php

@@ -13 +13 @@
   
     // remove autosize
-    global $pwg_loaded_plugins, $autosize_controler;
+    global $pwg_loaded_plugins, $autosize_ctrl;
     
-    if ( isset($pwg_loaded_plugins['Autosize']) and isset($autosize_controler) )
+    if ( isset($pwg_loaded_plugins['Autosize']) and isset($autosize_ctrl) )
     {
-      remove_event_handler('render_element_content', array(&$autosize_controler, 'init'), EVENT_HANDLER_PRIORITY_NEUTRAL);
-      remove_event_handler('render_element_content', array(&$autosize_controler, 'autosize_calcContent'), 40); 
-      remove_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_script_1'), EVENT_HANDLER_PRIORITY_NEUTRAL);
-      remove_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_script_2'), EVENT_HANDLER_PRIORITY_NEUTRAL);
-      remove_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_script_3'), EVENT_HANDLER_PRIORITY_NEUTRAL);
-      remove_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_affiche'), EVENT_HANDLER_PRIORITY_NEUTRAL+21);
+      remove_event_handler('render_element_content', array(&$autosize_ctrl, 'autosize_calcContent'), EVENT_HANDLER_PRIORITY_NEUTRAL-11, 2); 
+      remove_event_handler('render_element_content', array(&$autosize_ctrl, 'init_1'), EVENT_HANDLER_PRIORITY_NEUTRAL-9, 2); 
+      remove_event_handler('render_element_content', array(&$autosize_ctrl, 'init'), EVENT_HANDLER_PRIORITY_NEUTRAL-1, 2);
+      remove_event_handler('render_element_content', array(&$autosize_ctrl, 'init2'), EVENT_HANDLER_PRIORITY_NEUTRAL+1, 2);
+      remove_event_handler('loc_after_page_header', array(&$autosize_ctrl, 'cl_autosize_script_1'));
+      remove_event_handler('loc_after_page_header', array(&$autosize_ctrl, 'cl_autosize_script_2'));
+      remove_event_handler('loc_after_page_header', array(&$autosize_ctrl, 'cl_autosize_script_3'));
+      remove_event_handler('loc_after_page_header', array(&$autosize_ctrl, 'cl_autosize_affiche'), EVENT_HANDLER_PRIORITY_NEUTRAL+21);
     }
   }
@@ -46 +48 @@
   }
   
+  // remove some actions
+  $template->assign('U_SLIDESHOW_START', null);
+  $template->assign('U_METADATA', null);
+  $template->append('current', array('U_DOWNLOAD' => null), true);
   
   $query = '
@@ -88 +94 @@
   }
 
-  $template->set_filename('gvideo_content', dirname(__FILE__).'/../template/video_'.$video['type'].'.tpl');
+  $template->set_filename('gvideo_content', realpath(GVIDEO_PATH . 'template/video_'.$video['type'].'.tpl'));
   return $template->parse('gvideo_content', true);
 }

extensions/gvideo/include/install.inc.php

@@ -5 +5 @@
 
 // defined here only because it's more convenient
-define('gvideo_path', PHPWG_PLUGINS_PATH . 'gvideo/');
+define('gvideo_path', PHPWG_PLUGINS_PATH . GVIDEO_ID . '/');
 define('gvideo_table', $prefixeTable.'image_video');
 
@@ -93 +93 @@
   }
   
-  // remove old configuration and upgrade video files
+  // remove old configuration
   if (isset($conf['PY_GVideo']))
   {
     pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "PY_GVideo" LIMIT 1;');
     unset($conf['PY_GVideo']);
-  
-    gvideo_update_24();
-  }
+  }
+  
+  // updade video files
+  gvideo_update_24();
 }
 
@@ -216 +217 @@
     // update path and rename the file
     $img['new_path'] = $real_path.$thumb_name;
-    rename($img['path'], $img['new_path']);
+    rename($img['path'], $img['new_path']); // why ? what's the purpose of this line ?
     array_push($images_updates, array(
       'id' => $img['id'],
@@ -257 +258 @@
     );
 }
+
+?>

extensions/gvideo/main.inc.php

@@ -3 +3 @@
 Plugin Name: Embedded Videos
 Version: auto
-Description: Add videos from Dailymotion, Youtube, Vimeo, Wideo, videobb and Wat.
+Description: Add videos from Dailymotion, Youtube, Vimeo, Wideo and Wat.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=136
 Author: Mistic & P@t
@@ -13 +13 @@
 global $prefixeTable;
 
-define('GVIDEO_PATH',    PHPWG_PLUGINS_PATH . 'gvideo/');
-define('GVIDEO_ADMIN',   get_root_url() . 'admin.php?page=plugin-gvideo');
+defined('GVIDEO_ID') or define('GVIDEO_ID', basename(dirname(__FILE__)));
+define('GVIDEO_PATH',    PHPWG_PLUGINS_PATH . GVIDEO_ID . '/');
+define('GVIDEO_ADMIN',   get_root_url() . 'admin.php?page=plugin-' . GVIDEO_ID);
 define('GVIDEO_TABLE',   $prefixeTable.'image_video');
 define('GVIDEO_VERSION', 'auto');
@@ -42 +43 @@
   if (
     GVIDEO_VERSION == 'auto' or
-    $pwg_loaded_plugins['gvideo']['version'] == 'auto' or
-    version_compare($pwg_loaded_plugins['gvideo']['version'], GVIDEO_VERSION, '<')
+    $pwg_loaded_plugins[GVIDEO_ID]['version'] == 'auto' or
+    version_compare($pwg_loaded_plugins[GVIDEO_ID]['version'], GVIDEO_VERSION, '<')
   )
   {
@@ -49 +50 @@
     gvideo_install();
     
-    if ( $pwg_loaded_plugins['gvideo']['version'] != 'auto' and GVIDEO_VERSION !='auto' )
+    if ( $pwg_loaded_plugins[GVIDEO_ID]['version'] != 'auto' and GVIDEO_VERSION !='auto' )
     {
       $query = '
 UPDATE '. PLUGINS_TABLE .'
 SET version = "'. GVIDEO_VERSION .'"
-WHERE id = "gvideo"';
+WHERE id = "'. GVIDEO_ID .'"';
       pwg_query($query);
       
-      $pwg_loaded_plugins['gvideo']['version'] = GVIDEO_VERSION;
+      $pwg_loaded_plugins[GVIDEO_ID]['version'] = GVIDEO_VERSION;
       
       if (defined('IN_ADMIN'))

extensions/gvideo/maintain.inc.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-include_once(PHPWG_PLUGINS_PATH . 'gvideo/include/install.inc.php');
+defined('GVIDEO_ID') or define('GVIDEO_ID', basename(dirname(__FILE__)));
+include_once(PHPWG_PLUGINS_PATH . GVIDEO_ID . '/include/install.inc.php');
+
 
 /* install */