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

Some messages have the origin in the middle of the message - change strpos to strrpos

Browse Source
This commit is contained in:
Deon George 2021-11-29 21:12:44 +11:00
parent a00534794e
commit f1780e61ea
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,7 +701,7 @@ class Message extends FTNBase
} }
// Anything after the origin line is also kludge data. // Anything after the origin line is also kludge data.
if ($originpos = strpos($kl,"\r * Origin: ")) { if ($originpos = strrpos($kl,"\r * Origin: ")) {
if (! $this->message) { if (! $this->message) {
$this->message .= substr($kl,$retpos+1,$originpos-$retpos-1); $this->message .= substr($kl,$retpos+1,$originpos-$retpos-1);
$this->parseOrigin(substr($kl,$originpos+1)); $this->parseOrigin(substr($kl,$originpos+1));

1
app/Models/Echomail.php
View File

@ -37,6 +37,7 @@ final class Echomail extends Model implements Packet
{ {
parent::boot(); parent::boot();
// @todo if the message is updated with new SEEN-BY's from another route, we'll delete the pending export for systems (if there is one)
static::created(function($model) { static::created(function($model) {
if (! $model->echoarea_id) { if (! $model->echoarea_id) {
Log::alert(sprintf('%s:- Message has no echo area, no exporting',self::LOGKEY,$model->id)); Log::alert(sprintf('%s:- Message has no echo area, no exporting',self::LOGKEY,$model->id));