dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixing, new map info dialog

Browse Source
This commit is contained in:
Exodus4D
2015-08-25 23:04:47 +02:00
parent e3591e5d05
commit 52957d1ac8
70 changed files with 3320 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/controller/api/Map.php
View File

@@ -517,9 +517,9 @@ class Map extends \Controller\AccessController {
// IMPORTANT for now -> just update a single map (save performance)
$mapIds = array_slice($mapIds, 0, 1);
// the maps are cached per map (this must be changed if multiple maps
// the userMasData is cached per map (this must be changed if multiple maps
// will be allowed in future...
$tempId = $mapIds[0];
$tempId = (int)$mapIds[0];
$cacheKey = 'user_data_' . $tempId . '_' . $requestSystemData->systemId;
if( $f3->exists($cacheKey) === false ){

17
app/main/controller/api/User.php
View File

@@ -40,7 +40,7 @@ class User extends Controller\Controller{
$user->updateApiData();
// route user to map app
$return->reroute = $f3->get('BASE') . $f3->alias('map');
$return->reroute = self::getEnvironmentData('URL') . $f3->alias('map');
}
echo json_encode($return);
@@ -57,7 +57,7 @@ class User extends Controller\Controller{
// try to verify user
$user = $this->_verifyUser($userName, $password);
if($user !== false){
if( !is_null($user)){
// user is verified -> ready for login
// set Session login
@@ -244,7 +244,6 @@ class User extends Controller\Controller{
if($user === false){
// new user registration
$user = $mapType = Model\BasicModel::getNew('UserModel');
$loginAfterSave = true;
// set username
@@ -320,12 +319,8 @@ class User extends Controller\Controller{
$api->userId = $user;
}
$api->keyId = $keyId;
$api->vCode = $settingsData['vCode'][$i];
// -----
$api->save();
$characterCount = $api->updateCharacters();
@@ -369,7 +364,7 @@ class User extends Controller\Controller{
$this->logUserIn( $user->name, $settingsData['password'] );
// return reroute path
$return->reroute = $this->f3->get('BASE') . $this->f3->alias('map');
$return->reroute = self::getEnvironmentData('URL') . $this->f3->alias('map');
}
// get fresh updated user object
@@ -382,9 +377,13 @@ class User extends Controller\Controller{
$validationError->field = $e->getField();
$validationError->message = $e->getMessage();
$return->error[] = $validationError;
}catch(Exception\RegistrationException $e){
$registrationError = (object) [];
$registrationError->type = 'error';
$registrationError->message = $e->getMessage();
$return->error[] = $registrationError;
}
// return new/updated user data
$return->userData = $newUserData;