- part 1/2 WIP added WebSocket extension, #420

- part 1/2 added "secure routes" to route finder module, #311
This commit is contained in:
Exodus4D
2017-01-05 22:15:12 +01:00
parent f927395484
commit 4e0533c7fe
12 changed files with 556 additions and 83 deletions

View File

@@ -273,6 +273,9 @@ class System extends Controller\AccessController {
$newSystemModel->getById( $systemModel->id, 0);
$newSystemModel->clearCacheData();
$newSystemData = $newSystemModel->getData();
// broadcast map changes
$this->broadcastMapData($newSystemModel->mapId);
}
}
@@ -408,29 +411,41 @@ class System extends Controller\AccessController {
* @param \Base $f3
*/
public function delete(\Base $f3){
$mapId = (int)$f3->get('POST.mapId');
$systemIds = (array)$f3->get('POST.systemIds');
$activeCharacter = $this->getCharacter();
/**
* @var Model\SystemModel $system
*/
$system = Model\BasicModel::getNew('SystemModel');
foreach($systemIds as $systemId){
$system->getById($systemId);
if( $system->hasAccess($activeCharacter) ){
// check whether system should be deleted OR set "inactive"
if(
empty($system->alias) &&
empty($system->description)
){
$system->erase();
}else{
// keep data -> set "inactive"
$system->setActive(false);
$system->save();
if($mapId){
$activeCharacter = $this->getCharacter();
/**
* @var Model\MapModel $map
*/
$map = Model\BasicModel::getNew('MapModel');
$map->getById($mapId);
if( $map->hasAccess($activeCharacter) ){
foreach($systemIds as $systemId){
if( $system = $map->getSystemById($systemId) ){
// check whether system should be deleted OR set "inactive"
if(
empty($system->alias) &&
empty($system->description)
){
$system->erase();
}else{
// keep data -> set "inactive"
$system->setActive(false);
$system->save();
}
$system->reset();
}
}
$system->reset();
// broadcast map changes
$this->broadcastMapData($map);
}
}
echo json_encode([]);