- code format

This commit is contained in:
Mark Friedrich
2018-06-10 20:37:59 +02:00
parent dcc9a93d2b
commit dea920d76e
3 changed files with 11 additions and 11 deletions

View File

@@ -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;

View File

@@ -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');

View File

@@ -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 = [];