From 0b6bb4deb76e792637143d3a19f9bfca5128507a Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Wed, 11 Nov 2015 20:34:05 +0100
Subject: [PATCH] fixed map im/export bug

---
 app/main/controller/api/map.php | 23 +++++++++++++----------
 app/pathfinder.ini              |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php
index cfd3f4c8..7a42f357 100644
--- a/app/main/controller/api/map.php
+++ b/app/main/controller/api/map.php
@@ -175,8 +175,8 @@ class Map extends \Controller\AccessController {
                             isset($mapData['data']['systems']) &&
                             isset($mapData['data']['connections'])
                         ){
-                            if(isset($mapData['id'])){
-                                unset($mapData['id']);
+                            if(isset($mapData['config']['id'])){
+                                unset($mapData['config']['id']);
                             }
 
                             $map->setData($mapData['config']);
@@ -189,18 +189,21 @@ class Map extends \Controller\AccessController {
 
                             foreach($mapData['data']['systems'] as $systemData){
                                 if(isset($systemData['id'])){
+                                    $oldId = (int)$systemData['id'];
                                     unset($systemData['id']);
-                                }
-                                $system->setData($systemData);
-                                $system->mapId = $map;
-                                $system->createdCharacterId = $activeCharacter->characterId;
-                                $system->updatedCharacterId = $activeCharacter->characterId;
-                                $system->save();
 
-                                $tempSystemIdMapping[$systemData['id']] = $system->id;
-                                $system->reset();
+                                    $system->setData($systemData);
+                                    $system->mapId = $map;
+                                    $system->createdCharacterId = $activeCharacter->characterId;
+                                    $system->updatedCharacterId = $activeCharacter->characterId;
+                                    $system->save();
+
+                                    $tempSystemIdMapping[$oldId] = $system->id;
+                                    $system->reset();
+                                }
                             }
 
+
                             foreach($mapData['data']['connections'] as $connectionData){
                                 // check if source and target IDs match with new system ID
                                 if(
diff --git a/app/pathfinder.ini b/app/pathfinder.ini
index df0fdf59..ecd4b4fa 100644
--- a/app/pathfinder.ini
+++ b/app/pathfinder.ini
@@ -39,7 +39,7 @@ DB_PASS =
 
 ; EVE-Online CCP Database export
 DB_CCP_DNS = mysql:host=localhost;port=3306;dbname=
-DB_CCP_NAME = eve_parallax
+DB_CCP_NAME = eve_parallax_min
 DB_CCP_USER = root
 DB_CCP_PASS =