bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Minor debug packet cosmetic changes, Remove database/ items in docker build, Node address validation changes

Browse Source
This commit is contained in:
Deon George
2021-07-17 17:15:00 +10:00
parent 1fa566b26c
commit 066154f310
6 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Classes/FTN/Message.php
View File

@@ -249,10 +249,11 @@ class Message extends FTNBase
case 'date':
return Carbon::createFromFormat('d M y H:i:s O',
sprintf('%s %s',chop(Arr::get($this->header,$key)),(is_null($x=$this->kludge->get('tzutc')) || ($x < 0)) ? $x : '+'.$x));
sprintf('%s %s',chop(Arr::get($this->header,$key)),(! is_null($x=$this->kludge->get('tzutc')) && ($x < 0)) ? $x : '+'.($x ?: '0000')));
case 'flags':
case 'cost': return Arr::get($this->header,$key);
case 'cost':
return Arr::get($this->header,$key);
case 'message':
case 'subject':
@@ -461,24 +462,32 @@ class Message extends FTNBase
* s - this bit is supported by SEAdog only
* + - this bit is not zeroed before packeting
*/
/*
public function flags(int $flags): array
public function flags(): Collection
{
return [
'private' => $this->isFlagSet($flags,self::FLAG_PRIVATE),
'crash' => $this->isFlagSet($flags,self::FLAG_CRASH),
'recd' => $this->isFlagSet($flags,self::FLAG_RECD),
'sent' => $this->isFlagSet($flags,self::FLAG_SENT),
'killsent' => $this->isFlagSet($flags,self::FLAG_KILLSENT),
'local' => $this->isFlagSet($flags,self::FLAG_LOCAL),
];
return collect([
'private' => $this->isFlagSet(self::FLAG_PRIVATE),
'crash' => $this->isFlagSet(self::FLAG_CRASH),
'recd' => $this->isFlagSet(self::FLAG_RECD),
'sent' => $this->isFlagSet(self::FLAG_SENT),
'fileattach' => $this->isFlagSet(self::FLAG_FILEATTACH),
'intransit' => $this->isFlagSet(self::FLAG_INTRANSIT),
'orphan' => $this->isFlagSet(self::FLAG_ORPHAN),
'killsent' => $this->isFlagSet(self::FLAG_KILLSENT),
'local' => $this->isFlagSet(self::FLAG_LOCAL),
'hold' => $this->isFlagSet(self::FLAG_HOLD),
'unused-10' => $this->isFlagSet(self::FLAG_UNUSED_10),
'filereq' => $this->isFlagSet(self::FLAG_FREQ),
'receipt-req' => $this->isFlagSet(self::FLAG_RETRECEIPT),
'receipt' => $this->isFlagSet(self::FLAG_ISRETRECEIPT),
'audit' => $this->isFlagSet(self::FLAG_AUDITREQ),
'fileupdate' => $this->isFlagSet(self::FLAG_FILEUPDATEREQ),
]);
}
private function isFlagSet($value,$flag): bool
private function isFlagSet($flag): bool
{
return (($value & $flag) == $flag);
return ($this->flags & $flag);
}
*/
/**
* Process the data after the ORIGIN