Non functional cosmetic updates

This commit is contained in:
Deon George 2023-10-04 15:49:44 +11:00
parent c7e707c143
commit 0fcb628c11
4 changed files with 11 additions and 8 deletions

View File

@ -226,7 +226,8 @@ class Message extends FTNBase
} }
// Fix for a call to pluck('date') (which is resolved via __get()), but it returns false. // 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}; return (bool)$this->{$key};
} }

View File

@ -30,7 +30,7 @@ final class FSC39 extends Packet
'dnet' => [0x16,'v',2], // Dest Net 'dnet' => [0x16,'v',2], // Dest Net
'prodcode-lo' => [0x18,'C',1], // Product Code 'prodcode-lo' => [0x18,'C',1], // Product Code
'prodrev-maj' => [0x19,'C',1], // Product Version Major '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 'ozone' => [0x22,'v',2], // Orig Zone
'dzone' => [0x24,'v',2], // Dest Zone 'dzone' => [0x24,'v',2], // Dest Zone
'reserved' => [0x26,'a2',2], // Reserved 'reserved' => [0x26,'a2',2], // Reserved

View File

@ -233,14 +233,14 @@ class Send extends Base
// If the node is marked as hold - dont send any mail. // If the node is marked as hold - dont send any mail.
if ($ao->system->hold) { 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; return FALSE;
} }
// Netmail // Netmail
if ($x=$ao->getNetmail($update)) { 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)); $this->list->push(new Mail($x,self::T_NETMAIL));
$mail = TRUE; $mail = TRUE;
@ -248,7 +248,7 @@ class Send extends Base
// Echomail // Echomail
if ($x=$ao->getEchomail($update)) { 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)); $this->list->push(new Mail($x,self::T_ECHOMAIL));
$mail = TRUE; $mail = TRUE;

View File

@ -16,10 +16,10 @@ use App\Traits\ScopeActive;
class Address extends Model class Address extends Model
{ {
private const LOGKEY = 'MA-';
use ScopeActive,SoftDeletes; use ScopeActive,SoftDeletes;
private const LOGKEY = 'MA-';
protected $with = ['zone']; protected $with = ['zone'];
// http://ftsc.org/docs/frl-1028.002 // http://ftsc.org/docs/frl-1028.002
@ -768,8 +768,10 @@ class Address extends Model
$ao = $s->system->match($this->zone)->first(); $ao = $s->system->match($this->zone)->first();
// If we dont match on the address, we cannot pack mail for that system // 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; return NULL;
}
// Get packet type // Get packet type
$type = collect(Packet::PACKET_TYPES)->get($this->system->pkt_type ?: config('fido.packet_default')); $type = collect(Packet::PACKET_TYPES)->get($this->system->pkt_type ?: config('fido.packet_default'));