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

Fix message processing when tag/tear lines dont start with double \r
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 41s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m54s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Details

Browse Source
This commit is contained in:
Deon George 2024-05-30 20:14:50 +10:00
parent 2590c2de71
commit 27fe3cd223
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,10 +734,10 @@ class Message extends FTNBase
$ptr_content_start = 0; $ptr_content_start = 0;
// See if we have a tagline // See if we have a tagline
if ($ptr_content_end=strrpos($content,"\r\r... ",$ptr_content_start)) { if ($ptr_content_end=strrpos($content,"\r... ",$ptr_content_start)) {
$o->msg = substr($content,$ptr_content_start,$ptr_content_end); $o->msg = substr($content,$ptr_content_start,$ptr_content_end+1);
$ptr_content_start = $ptr_content_end+6;
$ptr_content_start = $ptr_content_end+5;
$ptr_content_end = strpos($content,"\r",$ptr_content_start); $ptr_content_end = strpos($content,"\r",$ptr_content_start);
// If there is no terminating "\r", then that's it // If there is no terminating "\r", then that's it
@ -752,11 +752,11 @@ class Message extends FTNBase
} }
// See if we have a tearline // See if we have a tearline
if ($ptr_content_end=strrpos($content,"\r\r--- ",$ptr_content_start)) { if ($ptr_content_end=strrpos($content,"\r--- ",$ptr_content_start)) {
if (! $ptr_content_start) if (! $ptr_content_start)
$o->msg = substr($content,$ptr_content_start,$ptr_content_end); $o->msg = substr($content,$ptr_content_start,$ptr_content_end+1);
$ptr_content_start = $ptr_content_end+6;
$ptr_content_start = $ptr_content_end+5;
$ptr_content_end = strpos($content,"\r",$ptr_content_start); $ptr_content_end = strpos($content,"\r",$ptr_content_start);
// If there is no terminating "\r", then that's it // If there is no terminating "\r", then that's it