Merge pull request #5 from exodus4d/develop

OGB fixes
exodus4d · Sep 1, 2015 · 2fe5fde · 2fe5fde
2 parents ed9edd8 + ae60b41
commit 2fe5fde
Show file tree

Hide file tree

Showing 16 changed files with 247 additions and 118 deletions.
diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php
@@ -531,7 +531,6 @@ public function updateUserData($f3){
                         if( !is_null($map) ){
                             $return->mapUserData[] = $map->getUserData();
 
-
                             // request signature data for a system if user has map access!
                             if( $map->id === $requestSystemData->mapId ){
                                 $system = $map->getSystem( $requestSystemData->systemId );
@@ -558,6 +557,7 @@ public function updateUserData($f3){
             // get current user data -> this should not be cached because each user has different personal data
             // even if they have multiple characters using the same map!
             $return->userData = $user->getData();
+
         }else{
             // user logged off
             $return->error[] = $this->getUserLoggedOffError();

diff --git a/app/main/controller/mailcontroller.php b/app/main/controller/mailcontroller.php
@@ -33,9 +33,12 @@ public function __construct(){
      */
     public function sendRegistrationKey($to, $msg){
 
-        $this->set('To', '"<' . $to . '>');
-        $this->set('From', '"PATHFINDER" <' . Controller::getEnvironmentData('SMTP_FROM') . '>');
-        $this->set('Subject', 'PATHFINDERR - Registration Key');
+        $this->set('To', '<' . $to . '>');
+        $this->set('From', 'Pathfinder <' . Controller::getEnvironmentData('SMTP_FROM') . '>');
+        $this->set('Subject', 'Registration Key');
+        $this->set('Error-To', '<' . Controller::getEnvironmentData('SMTP_ERROR') . '>');
+        $this->set('MIME-Version', '1.0');
+        $this->set('Content-Type', 'text/html; charset=ISO-8859-1');
         $status = $this->send($msg);
 
         return $status;

diff --git a/app/main/model/usermodel.php b/app/main/model/usermodel.php
@@ -83,7 +83,7 @@ public function getData(){
         // set active character with log data
         $activeUserCharacter = $this->getActiveUserCharacter();
         if($activeUserCharacter){
-            $userData->character = $activeUserCharacter->getData();
+            $userData->character = $activeUserCharacter->getData(true);
         }
 
         return $userData;
@@ -450,11 +450,35 @@ public function updateCharacterLog($ttl = 0){
                 if( $character->dry() ){
                     // this can happen if a valid user plays the game with a not registered character
                     // whose API is not registered -> save new character or update character data
+                    $corporationId = array_key_exists('corpid', $apiController->values) ? $apiController->values['corpid'] : null;
+                    $allianceId = array_key_exists('allianceid', $apiController->values) ? $apiController->values['allianceid'] : null;
+
+                    // check if corp exists
+                    if( !is_null($corporationId) ){
+                        $corporation = self::getNew('CorporationModel');
+                        $corporation->getById( (int)$corporationId );
+                        if( $corporation->dry() ){
+                            $corporation->id = $corporationId;
+                            $corporation->name = $apiController->values['corpname'];
+                            $corporation->save();
+                        }
+                    }
+
+                    // check if ally exists
+                    if( !is_null($allianceId) ){
+                        $alliance = self::getNew('AllianceModel');
+                        $alliance->getById( (int)$allianceId );
+                        if( $alliance->dry() ){
+                            $alliance->id = $allianceId;
+                            $alliance->name = $apiController->values['alliancename'];
+                            $alliance->save();
+                        }
+                    }
 
                     $character->id = (int) $apiController->values['charid'];
                     $character->name = $apiController->values['charname'];
-                    $character->corporationId = array_key_exists('corpid', $apiController->values) ? $apiController->values['corpid'] : null;
-                    $character->allianceId = array_key_exists('allianceid', $apiController->values) ? $apiController->values['allianceid'] : null;
+                    $character->corporationId = $corporationId;
+                    $character->allianceId = $allianceId;
                     $character->save();
                 }
 

diff --git a/build_js/app/landingpage.js b/build_js/app/landingpage.js
diff --git a/build_js/app/landingpage.js.map b/build_js/app/landingpage.js.map
diff --git a/build_js/app/mappage.js b/build_js/app/mappage.js
diff --git a/build_js/app/mappage.js.map b/build_js/app/mappage.js.map
diff --git a/build_js/build.txt b/build_js/build.txt
@@ -7,6 +7,7 @@ app/config/system_effect.js
 app/config/signature_type.js
 lib/bootstrap.min.js
 lib/bootbox.min.js
+app/ccp.js
 lib/velocity.min.js
 lib/velocity.ui.min.js
 lib/jquery.mCustomScrollbar.concat.min.js
@@ -20,7 +21,6 @@ app/util.js
 lib/mustache.min.js
 app/render.js
 app/logging.js
-app/ccp.js
 lib/requirejs/text.js
 text!img/logo.svg!strip
 text!templates/modules/header.html
@@ -68,6 +68,7 @@ app/config/system_effect.js
 app/config/signature_type.js
 lib/bootstrap.min.js
 lib/bootbox.min.js
+app/ccp.js
 lib/velocity.min.js
 lib/velocity.ui.min.js
 lib/jquery.mCustomScrollbar.concat.min.js
@@ -80,7 +81,6 @@ lib/bootstrap2-toggle.min.js
 app/util.js
 lib/mustache.min.js
 app/render.js
-app/ccp.js
 lib/blueimp-helper.js
 lib/blueimp-gallery.js
 lib/EasePack.min.js

diff --git a/js/app/map/contextmenu.js b/js/app/map/contextmenu.js
@@ -11,6 +11,12 @@ define([
 
     $.fn.contextMenu = function (settings) {
 
+        // animation
+        var animationInType = CCP.isInGameBrowser() ? 'fadeIn' : 'transition.flipXIn';
+        var animationInDuration = CCP.isInGameBrowser() ? 0 : 150;
+        var animationOutType = CCP.isInGameBrowser() ? 'fadeOut' : 'transition.flipXOut';
+        var animationOutDuration = CCP.isInGameBrowser() ? 0 : 150;
+
         return this.each(function () {
 
             // Open context menu
@@ -44,8 +50,8 @@ define([
                     position: 'absolute',
                     left: getLeftLocation(originalEvent),
                     top: getTopLocation(originalEvent)
-                }).velocity('transition.flipXIn', {
-                    duration: CCP.isInGameBrowser() ? 0 : 150,
+                }).velocity(animationInType, {
+                    duration: animationInDuration,
                     complete: function(){
                         // set context menu "click" observer
                         $(this).off('click').one('click', {component: component, position:{x: getLeftLocation(originalEvent), y: getTopLocation(originalEvent)}}, function (e) {
@@ -66,8 +72,8 @@ define([
 
                 //make sure menu closes on any click
                 $(document).one('click.closeContextmenu', function () {
-                    $('.dropdown-menu[role="menu"]').velocity('transition.flipXOut', {
-                        duration: CCP.isInGameBrowser() ? 0 : 150
+                    $('.dropdown-menu[role="menu"]').velocity(animationOutType, {
+                        duration: animationOutDuration
                     });
                 });
 

diff --git a/js/app/map/map.js b/js/app/map/map.js
@@ -2926,8 +2926,8 @@ define([
                 userCount: 0                        // active user in a map
             };
 
-            // check if user is currently in "this" system
-            var currentUserIsHere = false;
+            // check if current user was found on the map
+            var currentUserOnMap = false;
 
             // get all systems
             var systems = mapElement.find('.' + config.systemClass);
@@ -2941,6 +2941,9 @@ define([
 
                 var tempUserData = null;
 
+                // check if user is currently in "this" system
+                var currentUserIsHere = false;
+
                 var j = userData.data.systems.length;
 
                 // search backwards to avoid decrement the counter after splice()
@@ -2960,14 +2963,16 @@ define([
                 }
 
                 // the current user can only be in a single system -------------------------------------------------------
-                if( !currentUserIsHere){
+                if( !currentUserOnMap){
 
                     if(
                         currentCharacterLog &&
                         currentCharacterLog.system &&
                         currentCharacterLog.system.id === systemId
                     ){
                         currentUserIsHere = true;
+                        currentUserOnMap = true;
+
                         // set current location data for header update
                         headerUpdateData.currentSystemId =  $(system).data('id');
                         headerUpdateData.currentSystemName = currentCharacterLog.system.name;
@@ -3008,50 +3013,43 @@ define([
             // current user was not found on any map system -> add new system to map where the user is in ----------------
             // this is restricted to IGB-usage! CharacterLog data is always set through the IGB
             // ->this prevent adding the same system multiple times, if a user if online with the IGB AND OOG
-
             if(
                 CCP.isInGameBrowser() === true &&
-                currentUserIsHere === false &&
+                currentUserOnMap === false &&
                 currentCharacterLog &&
                 mapTracking
             ){
 
-                // check if the system where the character is in exists on this map
-                if(currentUserIsHere === false){
-                    // add new system to the map
-
-                    var requestData = {
-                        systemData: {
-                            systemId: currentCharacterLog.system.id
-                        },
-                        mapData: {
-                            id: userData.config.id
-                        }
-                    };
-
-
-                    // check if a system jump is detected previous system !== current system
-                    // and add a connection to the previous system as well
-                    // hint: if a user just logged on -> there is no active system cached
-                    var sourceSystem = false;
-                    if(
-                        activeSystemCache &&
-                        activeSystemCache.data('systemId') !== currentCharacterLog.system.id
-                    ){
+                // add new system to the map
 
-                        // draw new connection
-                        sourceSystem = activeSystemCache;
-                        // calculate new system coordinates
-                        requestData.systemData.position = calculateNewSystemPosition(sourceSystem);
+                var requestData = {
+                    systemData: {
+                        systemId: currentCharacterLog.system.id
+                    },
+                    mapData: {
+                        id: userData.config.id
                     }
+                };
 
-                    mapElement.getMapOverlay('timer').startMapUpdateCounter();
-
-                    saveSystem(map, requestData, sourceSystem, false);
+                // check if a system jump is detected previous system !== current system
+                // and add a connection to the previous system as well
+                // hint: if a user just logged on -> there is no active system cached
+                var sourceSystem = false;
+                if(
+                    activeSystemCache &&
+                    activeSystemCache.data('systemId') !== currentCharacterLog.system.id
+                ){
 
+                    // draw new connection
+                    sourceSystem = activeSystemCache;
+                    // calculate new system coordinates
+                    requestData.systemData.position = calculateNewSystemPosition(sourceSystem);
                 }
-            }
 
+                mapElement.getMapOverlay('timer').startMapUpdateCounter();
+
+                saveSystem(map, requestData, sourceSystem, false);
+            }
 
             // trigger document event -> update header
             $(document).trigger('pf:updateHeaderMapData', headerUpdateData);

diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js
@@ -740,8 +740,7 @@ define([
         // jump to "next" editable field on save
         var openNextEditDialogOnSave = function(fields){
             fields.on('save', function(e, a){
-                console.log(e);
-                console.log(a)
+
                 var currentField = $(this);
 
                 setTimeout(function() {

diff --git a/js/app/util.js b/js/app/util.js
@@ -7,6 +7,7 @@ define([
     'config/system_effect',
     'config/signature_type',
     'bootbox',
+    'app/ccp',
     'velocity',
     'velocityUI',
     'customScrollbar',
@@ -16,7 +17,7 @@ define([
     'hoverIntent',
     'bootstrapConfirmation',
     'bootstrapToggle'
-], function($, Init, SystemEffect, SignatureType, bootbox) {
+], function($, Init, SystemEffect, SignatureType, bootbox, CCP) {
 
     'use strict';
 
@@ -548,7 +549,7 @@ define([
      */
     var showVersionInfo = function(){
         var versionNumber = $('body').data('version');
-        console.info('PATHFINDER', versionNumber);
+        console.info('PATHFINDER ' + versionNumber);
     };
 
     /**
@@ -1320,14 +1321,20 @@ define([
     var getCurrentCharacterLog = function(){
 
         var characterLog = false;
+
         var currentUserData = getCurrentUserData();
 
         if(
             currentUserData &&
-            currentUserData.character &&
-            currentUserData.character.log
+            currentUserData.character
         ){
-            characterLog = currentUserData.character.log;
+            if(currentUserData.character.log){
+                characterLog = currentUserData.character.log;
+            }else if(CCP.isInGameBrowser() === true){
+                // if user is IGB online and log data is missing
+                // -> character API information not found!
+                showNotify({title: 'Character not found', text: 'Enter API information', type: 'error'});
+            }
         }
 
         return characterLog;

diff --git a/public/css/pathfinder.css b/public/css/pathfinder.css
diff --git a/public/img/logo_alpha.png b/public/img/logo_alpha.png