Changeset 3341 for extensions/charlies_content

Timestamp:

May 24, 2009, 9:33:51 AM (15 years ago)

Author:

vdigital

Message:

+ 2.0.d (Called lumenation bypass)some url were generated in https

Location:

extensions/charlies_content

Files:

• charlies.inc.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)

extensions/charlies_content/charlies.inc.php

@@ -23 +23 @@
   $path = $picture['element_path'];
   $url = $picture['element_url'];
-  if ( substr($url,0,4)!='http' and substr($url,0,1)!='/' )
+  if ( !url_is_remote($url) )
   {
     set_make_full_url();
-    $url = get_element_url( $picture );;
+    $url = get_element_url( $picture );
     unset_make_full_url();
   }
-
+        // If needed NO_https can easily be set in your config_local thru LocalFiles Editor
+  if (isset($conf['NO_https']) and $conf['NO_https'] and strncasecmp($url, 'https://', 8) == 0 ) 
+          $url = 'http://' . substr($url, 8);
+                
         if (!isset($conf['video_default_width']))       $conf['video_default_width'] = $charlie['video_default_width']; 
         if (!isset($conf['video_default_height']))      $conf['video_default_height'] = $charlie['video_default_height'];

extensions/charlies_content/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: Charlies content
-Version: 2.0.c
+Version: 2.0.d
 Description: Charlies content is a global solution for none picture files.
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=119
@@ -21 +21 @@
 
 /** History ***************
+  2009-05-24 2.0.d (Called lumenation bypass)
+                   some url were generated with https://
   2009-04-13 2.0.c 
                    Flipflip proposal to exclude GETID3 for some extends
@@ -55 +57 @@
 define('CHARLIES_DIR' , basename(dirname(__FILE__)));
 define('CHARLIES_PATH' , PHPWG_PLUGINS_PATH . CHARLIES_DIR . '/');
-define('CHARLIES_VER' , '2.0.c');
+define('CHARLIES_VER' , '2.0.d');
 $x = @file_get_contents( $conf['local_data_dir'].'/plugins/'.basename(dirname(__FILE__)).'.dat');
 if ($x!==false) $charlie = unserialize($x);