diff --git a/app/main/model/charactermodel.php b/app/main/model/charactermodel.php index c672a740..2cb360e8 100644 --- a/app/main/model/charactermodel.php +++ b/app/main/model/charactermodel.php @@ -331,10 +331,9 @@ class CharacterModel extends BasicModel { $logLocation = (bool)$logLocation; if( !$logLocation && - $logLocation !== $this->logLocation && - $this->hasLog() + $logLocation !== $this->logLocation ){ - $this->getLog()->erase(); + $this->deleteLog(); } return $logLocation; @@ -918,12 +917,8 @@ class CharacterModel extends BasicModel { } } - if( - $deleteLog && - $this->hasLog() - ){ - // delete existing log - $this->characterLog->erase(); + if($deleteLog){ + $this->deleteLog(); } return $this; diff --git a/app/main/model/connectionmodel.php b/app/main/model/connectionmodel.php index 00464e36..807d0784 100644 --- a/app/main/model/connectionmodel.php +++ b/app/main/model/connectionmodel.php @@ -400,6 +400,11 @@ class ConnectionModel extends AbstractMapTrackingModel { return $logsData; } + /** + * log new mass for this connection + * @param CharacterLogModel $characterLog + * @return $this + */ public function logMass(CharacterLogModel $characterLog){ if( !$characterLog->dry() ){ $log = $this->rel('connectionLog'); diff --git a/app/main/model/mapmodel.php b/app/main/model/mapmodel.php index 9bc1ceb4..9407254a 100644 --- a/app/main/model/mapmodel.php +++ b/app/main/model/mapmodel.php @@ -279,7 +279,7 @@ class MapModel extends AbstractMapTrackingModel { $characterData[] = $character->getData(); } $mapData->access->character = $characterData; - } elseif($this->isCorporation()){ + }elseif($this->isCorporation()){ $corporations = $this->getCorporations(); $corporationData = []; @@ -287,7 +287,7 @@ class MapModel extends AbstractMapTrackingModel { $corporationData[] = $corporation->getData(); } $mapData->access->corporation = $corporationData; - } elseif($this->isAlliance()){ + }elseif($this->isAlliance()){ $alliances = $this->getAlliances(); $allianceData = [];