- improved _auto-connections_ for _podded_ pilots, closed #752, closed #355, closed #259, closed #235

This commit is contained in:
Mark Friedrich
2019-04-19 16:31:36 +02:00
parent 51b3fd41f0
commit e0fb6f19f5
8 changed files with 145 additions and 87 deletions

View File

@@ -384,13 +384,11 @@ class Controller {
* @return array
* @throws \Exception
*/
public function getSessionCharacterData(){
public function getSessionCharacterData() : array {
$data = [];
if($user = $this->getUser()){
$header = self::getRequestHeaders();
$requestedCharacterId = (int)$header['Pf-Character'];
if( !$this->getF3()->get('AJAX') ){
$requestedCharacterId = (int)$_COOKIE['old_char_id'];
if(!$requestedCharacterId){
@@ -398,7 +396,6 @@ class Controller {
if((int)$tempCharacterData['ID'] > 0){
$requestedCharacterId = (int)$tempCharacterData['ID'];
}
}
}