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

When MSGID has domain but no point

Browse Source
This commit is contained in:
Deon George 2021-08-22 16:55:39 +10:00
parent 071b817194
commit 1ae73e80c2
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -742,7 +742,7 @@ class Message extends FTNBase
// MSGID should be the basis of the source, we'll overrite our src from origin if we have it // MSGID should be the basis of the source, we'll overrite our src from origin if we have it
$m = []; $m = [];
if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) { if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) {
$this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : '')); $this->src = Address::parseFTN($m[1].((isset($m[2]) && $m[2] != '') ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : ''));
} }
// Parse SEEN-BY // Parse SEEN-BY

8
app/Console/Commands/StartServer.php
View File

@ -28,13 +28,6 @@ class StartServer extends Command
*/ */
protected $description = 'Start Server'; protected $description = 'Start Server';
public function __construct()
{
parent::__construct();
Log::info(sprintf('%s:+ Server Starting (%d)',self::LOGKEY,getmypid()));
}
/** /**
* Execute the console command. * Execute the console command.
* *
@ -43,6 +36,7 @@ class StartServer extends Command
*/ */
public function handle() public function handle()
{ {
Log::info(sprintf('%s:+ Server Starting (%d)',self::LOGKEY,getmypid()));
$o = Setup::findOrFail(config('app.id')); $o = Setup::findOrFail(config('app.id'));
$start = collect(); $start = collect();