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

updates controller/api/map.php to get maps from all logged in characters

Browse Source
This commit is contained in:
soneill
2021-07-27 22:14:37 +12:00
parent ccdb9b7f6c
commit 46967e8934
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Controller/Api/Map.php
View File

@@ -467,7 +467,17 @@ class Map extends Controller\AccessController {
$activeCharacter = $this->getCharacter();
$characterData = $activeCharacter->getData(true);
$maps = $activeCharacter->getMaps();
$sessionCharacterIds = array_column($this->getF3()->get(User::SESSION_KEY_CHARACTERS), 'ID');
$maps = [];
$mapIds = [];
foreach($activeCharacter->getAll($sessionCharacterIds) as $character){
foreach($character->getMaps() as $map){
if(!in_array($map->_id, $mapIds)){
array_push($maps, $map);
array_push($mapIds, $map->_id);
}
}
}
// some character data is not required (in WebSocket) -> unset() and keep return small
if(isset($characterData->corporation->rights)){
@@ -521,7 +531,17 @@ class Map extends Controller\AccessController {
$return->mapData = [];
$mapIdsChanged = [];
$maps = $character->getMaps();
$sessionCharacterIds = array_column($this->getF3()->get(User::SESSION_KEY_CHARACTERS), 'ID');
$maps = [];
$mapIds = [];
foreach($character->getAll($sessionCharacterIds) as $char){
foreach($char->getMaps() as $map){
if(!in_array($map->_id, $mapIds)){
array_push($maps, $map);
array_push($mapIds, $map->_id);
}
}
}
if(!empty($mapsData) && !empty($maps)){
// loop all $mapsData that should be saved