Check for duplicate echomails, validate system password

This commit is contained in:
Deon George
2021-08-19 00:20:34 +10:00
parent 6af466605a
commit bcf3297fdb
5 changed files with 47 additions and 9 deletions

View File

@@ -264,13 +264,10 @@ class Message extends FTNBase
case 'tp': return Arr::get($this->point,'dst');
case 'fftn':
case 'tftn':
return parent::__get($key);
case 'fftn_o':
return Address::findFTN($this->fftn);
case 'tftn':
case 'tftn_o':
return Address::findFTN($this->tftn);
return parent::__get($key);
case 'date':
return Carbon::createFromFormat('d M y H:i:s O',
@@ -604,7 +601,7 @@ class Message extends FTNBase
$ftn = Address::parseFTN($matches[1]);
// We'll double check our FTN
if ($this->isNetmail() && ($ftn['n'] !== $this->fn) || ($ftn['f'] !== $this->ff)) {
if ($this->isNetmail() && (($ftn['n'] !== $this->fn) || ($ftn['f'] !== $this->ff))) {
Log::error(sprintf('FTN [%s] doesnt match message header',$matches[1]),['ftn'=>$ftn,'fn'=>$this->fn,'ff'=>$this->ff]);
}