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

Fix passthrough netmail.

Browse Source
This commit is contained in:
Deon George
2022-02-19 16:33:14 +11:00
parent daba4a78d3
commit 6db16712ee
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,9 +252,9 @@ class Message extends FTNBase
// To Addresses
// Echomail doesnt have a zone, so we'll use the source zone
case 'tz': return Arr::get($this->echoarea ? $this->src : $this->dst,'z');
case 'tn': return $this->echoarea ? Arr::get($this->header,'dnet') : Arr::get($this->dst,'n');
case 'tf': return $this->echoarea ? Arr::get($this->header,'dnode') : Arr::get($this->dst,'f');
case 'tp': return Arr::get($this->dst,'p');
case 'tn': return Arr::get($this->header,'dnet');
case 'tf': return Arr::get($this->header,'dnode');
case 'tp': return Arr::get($this->dst,'p'); // @todo this wont work for netmails, since dst is not set for in transit messages
case 'fftn':
case 'fftn_o':
@@ -757,7 +757,11 @@ class Message extends FTNBase
// The message is the rest?
} elseif (strlen($kl) > $retpos+1) {
$this->message .= substr($kl,$retpos+1);
// Since netmail doesnt have an origin - our source:
$this->message .= substr($message, 0, $msgpos);
$this->message_src = substr($kl,$retpos+1);
$kl = substr($kl,0,$retpos);
}