From 6deae923b4fe77a53d81d31c42aa018bda1ddc15 Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Tue, 17 May 2016 18:58:11 +0200 Subject: [PATCH] - closed #153 added character verification check for getAll(); Signatures Ajax endpoint --- app/main/controller/api/map.php | 1 - app/main/controller/api/signature.php | 36 ++++++++++++++++----------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php index 4866e43f..be714422 100644 --- a/app/main/controller/api/map.php +++ b/app/main/controller/api/map.php @@ -174,7 +174,6 @@ class Map extends Controller\AccessController { $activeCharacter = $this->getCharacter(); if($activeCharacter){ - $user = $activeCharacter->getUser(); /** * @var $map Model\MapModel diff --git a/app/main/controller/api/signature.php b/app/main/controller/api/signature.php index d7de9dd4..343b6522 100644 --- a/app/main/controller/api/signature.php +++ b/app/main/controller/api/signature.php @@ -7,10 +7,11 @@ */ namespace Controller\Api; +use Controller; use Model; -class Signature extends \Controller\AccessController{ +class Signature extends Controller\AccessController{ /** * event handler @@ -24,24 +25,31 @@ class Signature extends \Controller\AccessController{ /** * get signature data for systems - * @param $f3 + * -> return value of this is limited to a "SINGLE" system + * @param \Base $f3 */ public function getAll($f3){ $signatureData = []; - $systemIds = $f3->get('POST.systemIds'); - $activeCharacter = $this->getCharacter(); + $systemIds = (array)$f3->get('POST.systemIds'); - /** - * @var Model\SystemModel $system - */ - $system = Model\BasicModel::getNew('SystemModel'); - foreach($systemIds as $systemId){ - $system->getById($systemId); + if( !empty($systemIds) ){ + $activeCharacter = $this->getCharacter(); - if(!$system->dry()){ - // check access - if( $system->hasAccess($activeCharacter) ){ - $signatureData = $system->getSignaturesData(); + if($activeCharacter){ + /** + * @var Model\SystemModel $system + */ + $system = Model\BasicModel::getNew('SystemModel'); + foreach($systemIds as $systemId){ + $system->getById($systemId); + if( + !$system->dry() && + $system->hasAccess($activeCharacter) + ){ + $signatureData = $system->getSignaturesData(); + } + + $system->reset(); } } }