Changeset 27560 for extensions/Force_HTTPS/maintain.inc.php

Timestamp:

Mar 5, 2014, 9:52:06 AM (10 years ago)

Author:

bonhommedeneige

Message:

Version 1.3.0 - Piwigo 2.6 compatibility

File:

• extensions/Force_HTTPS/maintain.inc.php (modified) (6 diffs)

extensions/Force_HTTPS/maintain.inc.php

@@ -6 +6 @@
 *
 * Created   :   02.05.2013
-* Updated   :   03.05.2013
+* Updated   :   05.03.2014
 * Author    :   bonhommedeneige
 *
@@ -26 +26 @@
 /**
 Changelog :
+ 1.3.0 (05.03.2014) : Renamed deltree function to force_https_deltree to avoid multiple declarations of
+                      function accross multiple plugins. Piwigo 2.6 compatibility
  1.2.0 (05.05.2013) : No change
  1.1.0 (04.05.2013) : Added HSTS security settings
@@ -33 +35 @@
 
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-define('FORCE_HTTPS_PATH' , PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+if (!defined('FORCE_HTTPS_PATH')) define('FORCE_HTTPS_PATH' , PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
 
 function plugin_install()
@@ -54 +56 @@
         if (is_dir(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'piwigo-force-https'))
         {
-                deltree(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'piwigo-force-https');
+                force_https_deltree(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'piwigo-force-https');
         }
         $q = 'DELETE FROM '.CONFIG_TABLE.' WHERE param LIKE "fhp_%" LIMIT 6;';
@@ -70 +72 @@
 }
 
-function deltree($path)
+function force_https_deltree($path)
 {
         if (is_dir($path))
@@ -82 +84 @@
                                 if (is_dir($pathfile))
                                 {
-                                        deltree($pathfile);
+                                        force_https_deltree($pathfile);
                                 }
                                 else