Changeset 17487

Timestamp:

Aug 9, 2012, 2:12:07 PM (12 years ago)

Author:

mistic100

Message:

compatibility with Embedded Videos

Location:

extensions/lightbox

Files:

• functions.inc.php (modified) (1 diff)
• get_content.php (modified) (4 diffs)

extensions/lightbox/functions.inc.php

@@ -4 +4 @@
 function get_lightbox_url($picture)
 {
-  global $conf, $py_addext;
-
+  global $conf, $pwg_loaded_plugins;
+  
   $ext = get_extension($picture['file']);
-  if (in_array($ext, $conf['picture_ext']))
+  if (!empty($pwg_loaded_plugins['gvideo']) and $picture['is_gvideo'])
+  {
+    return get_root_url().'plugins/lightbox/get_content.php?imgid='.$picture['id'];
+  }
+  else if (in_array($ext, $conf['picture_ext']))
   {
     return DerivativeImage::url(IMG_LARGE, new SrcImage($picture));
   }
-  elseif (isset($py_addext) and in_array($ext, $py_addext))
-  {
-    return get_root_url().'plugins/lightbox/get_content.php?imgid='.$picture['id'];
-  }
+  
   return false;
 }

extensions/lightbox/get_content.php

@@ -1 +1 @@
 <?php
+// Embedded Videos
 
 define('PHPWG_ROOT_PATH','../../');
@@ -9 +10 @@
 if (!isset($_GET['imgid']) or !is_numeric($_GET['imgid']))
 {
-  die;
+  exit;
+}
+
+if (empty($pwg_loaded_plugins['gvideo']) or !function_exists('gvideo_element_content'))
+{
+  exit;
 }
 
@@ -16 +22 @@
 $query = '
 SELECT *
-  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id
+  FROM '.IMAGES_TABLE.' 
+    INNER JOIN '.IMAGE_CATEGORY_TABLE.' 
+    ON id=image_id
   WHERE id='.$image_id
         . get_sql_condition_FandF(
@@ -24 +32 @@
   LIMIT 1';
 
-$picture['current'] = mysql_fetch_assoc( pwg_query($query) );
+$picture = mysql_fetch_assoc( pwg_query($query) );
 
-if (empty($picture['current']))
+if (empty($picture) or !$picture['is_gvideo'])
 {
-  die;
+  exit;
 }
 
-// PY Gvideo
-if (!empty($py_addext) and in_array(get_extension($picture['current']['path']), $py_addext))
-{
-  $extension = strtolower(get_extension($picture['current']['path']));
-  $picture['current']['path'] = get_element_url($picture['current']);
-  include(GVIDEO_PATH.'gvideo.php');
-  echo $content;  
-}
+echo gvideo_element_content(null, $picture);
 
 ?>