Improve GPS uploader

Author: xbgmsharp

admin/admin_gps.php

@@ -48,7 +48,7 @@
     if (count($uploaded_errors) == 0) {
         $file_path = pwg_db_real_escape_string($upload_file['destination']);
         $category = pwg_db_real_escape_string($_POST['category']);
-        $query="INSERT INTO ".$prefixeTable."gps ( `category_id`, `path` ) VALUES ('$category', '$file_path');";
+        $query="INSERT INTO ".$prefixeTable."osm_gps ( `category_id`, `path` ) VALUES ('$category', '$file_path');";
         pwg_query($query);
         array_push($page['infos'], l10n('File uploaded and synchronized'));
     } else {
@@ -58,7 +58,7 @@
 }
 
 function gps_upload_file($uploaded_file) {
-    $uploaded_galleries_dir = PHPWG_ROOT_PATH.'galleries/gps/';
+    $uploaded_galleries_dir = PHPWG_ROOT_PATH.'_data/i/galleries/gps/';
     $uploaded_file_tmp = $uploaded_file['tmp_name'];
     $uploaded_file_name = preg_replace('/[^a-zA-Z0-9s.]/', '_', $uploaded_file['name']);
     $uploaded_file_destination = $uploaded_galleries_dir . $uploaded_file_name;

include/functions_map.php

@@ -56,9 +56,9 @@ function osm_get_gps($page)
     global $prefixeTable;
     if (isset($page['category'])) {
         $category = $page['category']['id'];
-        $query = "SELECT `path` FROM ".$prefixeTable."gps AS g INNER JOIN ".CATEGORIES_TABLE." AS c ON g.category_id = c.id WHERE FIND_IN_SET(".$category.", c.uppercats);";
+        $query = "SELECT `path` FROM ".$prefixeTable."osm_gps AS g INNER JOIN ".CATEGORIES_TABLE." AS c ON g.category_id = c.id WHERE FIND_IN_SET(".$category.", c.uppercats);";
     } else {
-        $query = "SELECT `path` FROM ".$prefixeTable."gps;";
+        $query = "SELECT `path` FROM ".$prefixeTable."osm_gps;";
     }
     return array_from_query($query, 'path');
 }

maintain.inc.php

@@ -99,14 +99,19 @@ function plugin_install()
 
 	$q = 'UPDATE '.CONFIG_TABLE.' SET `comment` = "Configuration settings for piwigo-openstreetmap plugin" WHERE `param` = "osm_conf";';
 	pwg_query( $q );
-	$q = "CREATE TABLE IF NOT EXISTS ".$prefixeTable."gps (
+
+	// Create DB for GPX entries
+	$q = "CREATE TABLE IF NOT EXISTS ".$prefixeTable."osm_gps (
 		`id` int(11) NOT NULL auto_increment,
 		`category_id` smallint(5) unsigned NOT NULL,
 		`path` varchar(255) NOT NULL,
 	 	PRIMARY KEY  (`id`)
 	) DEFAULT CHARACTER SET ".DB_CHARSET." COLLATE utf8_general_ci;";
 	pwg_query( $q );
 
+	// Create album for GPX entries
+	mkdir (PHPWG_ROOT_PATH.'_data/i/galleries/gps/' );
+
 	// Create world map link
 	$dir_name = basename( dirname(__FILE__) );
 	$c = <<<EOF