From 0fcb628c1107fbf8018f9e03281b87603ca46721 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 4 Oct 2023 15:49:44 +1100 Subject: [PATCH] Non functional cosmetic updates --- app/Classes/FTN/Message.php | 3 ++- app/Classes/FTN/Packet/FSC39.php | 2 +- app/Classes/File/Send.php | 6 +++--- app/Models/Address.php | 8 +++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php index 19a9015..b731b82 100644 --- a/app/Classes/FTN/Message.php +++ b/app/Classes/FTN/Message.php @@ -226,7 +226,8 @@ class Message extends FTNBase } // Fix for a call to pluck('date') (which is resolved via __get()), but it returns false. - public function __isset($key) { + public function __isset($key) + { return (bool)$this->{$key}; } diff --git a/app/Classes/FTN/Packet/FSC39.php b/app/Classes/FTN/Packet/FSC39.php index 3aea8c7..5fb2d36 100644 --- a/app/Classes/FTN/Packet/FSC39.php +++ b/app/Classes/FTN/Packet/FSC39.php @@ -30,7 +30,7 @@ final class FSC39 extends Packet 'dnet' => [0x16,'v',2], // Dest Net 'prodcode-lo' => [0x18,'C',1], // Product Code 'prodrev-maj' => [0x19,'C',1], // Product Version Major - 'password' => [0x1a,'a8',8], // Packet Password + 'password' => [0x1a,'a8',8], // Packet Password - http://ftsc.org/docs/fsc-0039.004 packet passwords are A-Z,0-9 'ozone' => [0x22,'v',2], // Orig Zone 'dzone' => [0x24,'v',2], // Dest Zone 'reserved' => [0x26,'a2',2], // Reserved diff --git a/app/Classes/File/Send.php b/app/Classes/File/Send.php index 0e2e3f5..ad23179 100644 --- a/app/Classes/File/Send.php +++ b/app/Classes/File/Send.php @@ -233,14 +233,14 @@ class Send extends Base // If the node is marked as hold - dont send any mail. if ($ao->system->hold) { - Log::info(sprintf('%s: - System [%d] is marked as hold - not checking for mail.',self::LOGKEY,$ao->system_id)); + Log::info(sprintf('%s:- System [%d] is marked as hold - not checking for mail.',self::LOGKEY,$ao->system_id)); return FALSE; } // Netmail if ($x=$ao->getNetmail($update)) { - Log::debug(sprintf('%s: - Netmail(s) added for sending to [%s]',self::LOGKEY,$ao->ftn)); + Log::debug(sprintf('%s:- Netmail(s) added for sending to [%s]',self::LOGKEY,$ao->ftn)); $this->list->push(new Mail($x,self::T_NETMAIL)); $mail = TRUE; @@ -248,7 +248,7 @@ class Send extends Base // Echomail if ($x=$ao->getEchomail($update)) { - Log::debug(sprintf('%s: - Echomail(s) added for sending to [%s]',self::LOGKEY,$ao->ftn)); + Log::debug(sprintf('%s:- Echomail(s) added for sending to [%s]',self::LOGKEY,$ao->ftn)); $this->list->push(new Mail($x,self::T_ECHOMAIL)); $mail = TRUE; diff --git a/app/Models/Address.php b/app/Models/Address.php index 58a957a..bb377c1 100644 --- a/app/Models/Address.php +++ b/app/Models/Address.php @@ -16,10 +16,10 @@ use App\Traits\ScopeActive; class Address extends Model { - private const LOGKEY = 'MA-'; - use ScopeActive,SoftDeletes; + private const LOGKEY = 'MA-'; + protected $with = ['zone']; // http://ftsc.org/docs/frl-1028.002 @@ -768,8 +768,10 @@ class Address extends Model $ao = $s->system->match($this->zone)->first(); // If we dont match on the address, we cannot pack mail for that system - if (! $ao) + if (! $ao) { + Log::alert(sprintf('%s:! We didnt match an address in zone [%d] for [%s]',self::LOGKEY,$this->zone->zone_id,$this->ftn)); return NULL; + } // Get packet type $type = collect(Packet::PACKET_TYPES)->get($this->system->pkt_type ?: config('fido.packet_default'));