Fix echoarea name is converted to UC, add netmail VIA lines for outgoing netmail

This commit is contained in:
Deon George
2022-02-16 23:01:55 +11:00
parent 12a40a79fb
commit daba4a78d3
4 changed files with 24 additions and 17 deletions

View File

@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Validator as ValidatorResult;
use App\Classes\FTN as FTNBase;
use App\Models\{Address,Domain,Zone};
use App\Models\{Address,Domain,Setup,Zone};
use App\Rules\{TwoByteInteger,TwoByteIntegerWithZero};
use App\Traits\EncodeUTF8;
@@ -412,7 +412,7 @@ class Message extends FTNBase
$return .= sprintf("\01%s%s\r",$v,$x);
}
$return .= $this->message."\r";
$return .= $this->message;
if ($this->tagline)
$return .= sprintf("... %s\r",$this->tagline);
if ($this->tearline)
@@ -421,12 +421,12 @@ class Message extends FTNBase
$return .= sprintf(" * Origin: %s\r",$this->origin);
} else {
$return .= $this->message."\r";
$return .= $this->message;
}
if ($this->isNetmail()) {
foreach ($this->via as $v)
$return .= sprintf("\01Via %s\r",$v);
foreach ($this->via as $via)
$return .= sprintf("\01Via %s\r",$via);
} else {
// Seenby & PATH - FSC-0068