From 535c9af548bc81b1cb3bf2850f449dd7049aa29a Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Mon, 9 May 2016 19:30:38 +0200
Subject: [PATCH] #144 fixed "Character not found" warning

---
 app/main/model/basicmodel.php     |  8 +++++---
 app/main/model/charactermodel.php |  1 +
 js/app/util.js                    | 11 +++--------
 public/js/v1.0.0RC3/app/util.js   | 11 +++--------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/main/model/basicmodel.php b/app/main/model/basicmodel.php
index e1ce23c7..1c776425 100644
--- a/app/main/model/basicmodel.php
+++ b/app/main/model/basicmodel.php
@@ -600,10 +600,12 @@ abstract class BasicModel extends \DB\Cortex {
 
     /**
      * debug log function
-     * @param string $text
+     * @param $text
+     * @param string $logFile
      */
-    public static function log($text){
-        Controller\LogController::getLogger('debug')->write($text);
+    public static function log($text, $logFile = null){
+        $logFile = isset($logFile) ? $logFile : self::getF3()->get('PATHFINDER.LOGFILES.DEBUG');
+        Controller\LogController::getLogger($logFile)->write($text);
     }
 
     /**
diff --git a/app/main/model/charactermodel.php b/app/main/model/charactermodel.php
index 1ea32558..feba6f83 100644
--- a/app/main/model/charactermodel.php
+++ b/app/main/model/charactermodel.php
@@ -360,6 +360,7 @@ class CharacterModel extends BasicModel {
             $formattedHeaderData = (new Mapper\IgbHeader($headerData->values))->getData();
 
             // just for security -> check if Header Data matches THIS character
+            // in case current IGB-Character is NOT the one logged on -> don´t update log
             if(
                 isset($formattedHeaderData['character']) &&
                 $formattedHeaderData['character']['id'] == $this->_id
diff --git a/js/app/util.js b/js/app/util.js
index 972d3505..9a10e917 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -1628,15 +1628,10 @@ define([
 
         if(
             currentUserData &&
-            currentUserData.character
+            currentUserData.character &&
+            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'});
-            }
+            characterLog = currentUserData.character.log;
         }
 
         return characterLog;
diff --git a/public/js/v1.0.0RC3/app/util.js b/public/js/v1.0.0RC3/app/util.js
index 972d3505..9a10e917 100644
--- a/public/js/v1.0.0RC3/app/util.js
+++ b/public/js/v1.0.0RC3/app/util.js
@@ -1628,15 +1628,10 @@ define([
 
         if(
             currentUserData &&
-            currentUserData.character
+            currentUserData.character &&
+            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'});
-            }
+            characterLog = currentUserData.character.log;
         }
 
         return characterLog;