diff --git a/app/main/controller/api/user.php b/app/main/controller/api/user.php index 7b44ed80..5b2d6431 100644 --- a/app/main/controller/api/user.php +++ b/app/main/controller/api/user.php @@ -58,8 +58,7 @@ class User extends Controller\Controller{ [ 'ID' => $character->_id, 'NAME' => $character->name, - 'TIME' => (new \DateTime('now', $timezone))->getTimestamp(), - 'UPDATE_RETRY' => 0 + 'TIME' => (new \DateTime('now', $timezone))->getTimestamp() ] ]; diff --git a/app/main/controller/controller.php b/app/main/controller/controller.php index 8e9c6797..beb5557d 100644 --- a/app/main/controller/controller.php +++ b/app/main/controller/controller.php @@ -949,9 +949,9 @@ class Controller { * get a Logger object by Hive key * -> set in pathfinder.ini * @param string $type - * @return \Log|null + * @return \Log */ - static function getLogger($type){ + static function getLogger($type = 'DEBUG') : \Log { return LogController::getLogger($type); } diff --git a/app/main/model/charactermodel.php b/app/main/model/charactermodel.php index 8b7810d5..a33c63a2 100644 --- a/app/main/model/charactermodel.php +++ b/app/main/model/charactermodel.php @@ -580,9 +580,9 @@ class CharacterModel extends BasicModel { /** * checks whether this character is authorized to log in * -> check corp/ally whitelist config (pathfinder.ini) - * @return bool + * @return string */ - public function isAuthorized(){ + public function isAuthorized() : string { $authStatus = 'UNKNOWN'; // check whether character is banned or temp kicked @@ -923,35 +923,8 @@ class CharacterModel extends BasicModel { $deleteLog = true; } - //in case of failure (invalid API response) increase or reset "retry counter" - if( $user = $this->getUser() ){ - // Session data does not exists in CLI mode (Cronjob) - if( $sessionCharacterData = $user->getSessionCharacterData($this->id, false) ){ - $updateRetry = (int)$sessionCharacterData['UPDATE_RETRY']; - $newRetry = $updateRetry; - if($invalidResponse){ - $newRetry++; - - if($newRetry >= 3){ - // no proper character log data (3 fails in a row)) - $newRetry = 0; - $deleteLog = true; - } - }else{ - // reset retry counter - $newRetry = 0; - } - - if($updateRetry !== $newRetry){ - // update retry counter - $sessionCharacterData['UPDATE_RETRY'] = $newRetry; - $sessionCharacters = self::mergeSessionCharacterData([$sessionCharacterData]); - self::getF3()->set(User::SESSION_KEY_CHARACTERS, $sessionCharacters); - } - } - } - if($deleteLog){ + self::log('DELETE LOG!'); $this->deleteLog(); }