Changeset 17488 for extensions

Timestamp:

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

Author:

mistic100

Message:

compatibility with Lightbox

Location:

extensions/gvideo

Files:

• admin/add.php (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)
• include/gvideo.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (3 diffs)

extensions/gvideo/admin/add.php

@@ -40 +40 @@
       'comment' => pwg_db_real_escape_string($video['description']),
       'author' => pwg_db_real_escape_string($video['author']),
+      'is_gvideo' => 1,
       );
     

extensions/gvideo/include/functions.inc.php

@@ -193 +193 @@
   
   return $video;
+}
+
+/**
+ * test if a download method is available
+ * @return: bool
+ */
+if (!function_exists('test_remote_download'))
+{
+  function test_remote_download()
+  {
+    return function_exists('curl_init') || ini_get('allow_url_fopen');
+  }
 }
 
@@ -224 +236 @@
       
       curl_setopt($ch, CURLOPT_URL, $src);
-      curl_setopt($ch, CURLOPT_HEADER, 0);
+      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)');
@@ -243 +255 @@
       }
       
-      if (($out = curl_exec($ch)) === false)
+      $out = curl_exec($ch);
+      curl_close($ch);
+      
+      if ($out === false)
       {
         return 'file_error';
       }
-      
-      curl_close($ch);
-      
-      if (!$return)
+      else if (!$return)
       {
         fclose($newf);

extensions/gvideo/include/gvideo.inc.php

@@ -7 +7 @@
 function gvideo_element_content($content, $element_info)
 {
+  if (!$element_info['is_gvideo'])
+  {
+    return $content;
+  }
+  
   global $page, $picture, $template, $conf;
+  
+  $conf['gvideo'] = unserialize($conf['gvideo']);
+  
+  remove_event_handler('render_element_content', 'default_picture_content', EVENT_HANDLER_PRIORITY_NEUTRAL);
   
   $query = '
@@ -14 +23 @@
   WHERE picture_id = '.$element_info['id'].'
 ;';
-  $result = pwg_query($query);
+  $video = pwg_db_fetch_assoc(pwg_query($query));
   
-  if (!pwg_db_num_rows($result))
-  {
-    return $content;
-  }
-  
-  remove_event_handler('render_element_content', 'default_picture_content', EVENT_HANDLER_PRIORITY_NEUTRAL);
-  
-  $conf['gvideo'] = unserialize($conf['gvideo']);
-  
-  $video = pwg_db_fetch_assoc($result);  
   if (empty($video['width']))
   {

extensions/gvideo/maintain.inc.php

@@ -51 +51 @@
   pwg_query($query);
   
+  pwg_query('ALTER TABLE `' . IMAGES_TABLE . '` ADD `is_gvideo` TINYINT(1) NOT NULL DEFAULT 0;');
+  
   if (isset($conf['PY_GVideo']))
   {
@@ -80 +82 @@
     {      
       pwg_query('ALTER TABLE '.gvideo_table.' ADD `url` VARCHAR(255) DEFAULT NULL;');
+    }
+    
+    $result = pwg_query('SHOW COLUMNS FROM '.IMAGES_TABLE.' LIKE "is_gvideo";');
+    if (!pwg_db_num_rows($result))
+    {      
+      pwg_query('ALTER TABLE `' . IMAGES_TABLE . '` ADD `is_gvideo` TINYINT(1) NOT NULL DEFAULT 0;');
+      
+      $query = '
+UPDATE '.IMAGES_TABLE.'
+  SET is_gvideo = 1
+  WHERE id IN(
+    SELECT picture_id FROM '.gvideo_table.'
+    )
+;';
+      pwg_query($query);
     }
   }
@@ -89 +106 @@
   pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "gvideo" LIMIT 1;');
   pwg_query('DROP TABLE `'.gvideo_table.'`;');
+  pwg_query('ALTER TABLE `' . IMAGES_TABLE . '` DROP `is_gvideo`;');
 }