Changeset 10915

Timestamp:

May 17, 2011, 8:25:00 PM (13 years ago)

Author:

grum

Message:

fix bug:2304

Location:

extensions/GMaps

Files:

• gmaps_ajax.php (modified) (3 diffs)
• gmaps_install.class.inc.php (modified) (4 diffs)
• gmaps_version.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/GMaps/gmaps_ajax.php

@@ -872 +872 @@
         }
 
-        $file=GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file;
+        $file=GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY.$file;
 
         if(file_exists($file)) unlink($file);
@@ -878 +878 @@
         {
           $currentInfo=$this->ajax_gmaps_admin_kmlFilesGetFile($id, false);
-          if(file_exists(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file'])) unlink(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file']);
+          if(file_exists(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file'])) unlink(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file']);
         }
 
@@ -1009 +1009 @@
       if($result)
       {
-        if($file!='' and file_exists(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file))
-        {
-          unlink(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file);
+        if($file!='' and file_exists(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY.$file))
+        {
+          unlink(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY.$file);
         }
         return('ok');

extensions/GMaps/gmaps_install.class.inc.php

@@ -42 +42 @@
     public function install()
     {
-      if(!file_exists(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY))
+      if(!file_exists(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY))
       {
-        mkdir(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true);
+        mkdir(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true);
       }
 
@@ -123 +123 @@
     public function uninstall()
     {
-      GPCCore::rmDir(dirname(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY));
+      GPCCore::rmDir(dirname(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY));
       $this->deleteConfig();
       $this->tablef->drop();
@@ -176 +176 @@
     private function updateFrom_010000()
     {
-      if(!file_exists(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY))
-          mkdir(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true);
+      if(!file_exists(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY))
+          mkdir(GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true);
 
       $directory=scandir(GMAPS_PATH.'kml/');
@@ -185 +185 @@
         if(preg_match('/.*(?:\.kml|\.kmz)$/i', $file))
         {
-          rename(GMAPS_PATH.'kml/'.$file, GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY.$file);
+          rename(GMAPS_PATH.'kml/'.$file, GPCCore::getPiwigoSystemPath().'/'.PWG_LOCAL_DIR.self::KML_DIRECTORY.$file);
         }
       }

extensions/GMaps/gmaps_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('GMAPS_VERSION',  '1.3.0');
-  define('GMAPS_VERSION2', '01.03.00');
+  define('GMAPS_VERSION',  '1.3.1');
+  define('GMAPS_VERSION2', '01.03.01');
   define('GMAPS_GPC_NEEDED', '3.5.1');
   define('GMAPS_AMD_NEEDED', '0.6.0'); //advanced metadata plugin is needed

extensions/GMaps/main.inc.php

@@ -98 +98 @@
 |         |            |     object
 |         |            |
+| 1.3.1   | 2011-05-17 | * mantis bug:2304
+|         |            |   . Impossible to upload kml file
 |         |            |
 |         |            |