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

Compare commits

base: bbs:da7bfcc4e207d38612201df69ef8cbe42e37b1da
Branches Tags
bbs:master
bbs:bbs
..
compare: bbs:248733c15e74d78047aa22788fb750968f886e87
Branches Tags
bbs:master
bbs:bbs

1 Commits
da7bfcc4e2 ... 248733c15e

Author SHA1 Message Date
Deon George
248733c15e Fix missed Notification using old Message::class
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 38s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m42s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Details
2024-05-21 21:41:23 +10:00
2 changed files with 13 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -307,10 +307,10 @@ class Message extends FTNBase
switch ($key) { switch ($key) {
// From Addresses // From Addresses
case 'fz': return (int)Arr::get($this->src,'z'); case 'fz': return Arr::get($this->src,'z');
case 'fn': return (int)($x=$this->src) ? Arr::get($x,'n') : Arr::get($this->header,'onet'); case 'fn': return ($x=$this->src) ? Arr::get($x,'n') : Arr::get($this->header,'onet');
case 'ff': return (int)($x=$this->src) ? Arr::get($x,'f') : Arr::get($this->header,'onode'); case 'ff': return ($x=$this->src) ? Arr::get($x,'f') : Arr::get($this->header,'onode');
case 'fp': return (int)$this->mo->kludges->get('FMPT:') ?: Arr::get($this->src,'p',Arr::get($this->header,'opoint',0)); case 'fp': return $this->mo->kludges->get('FMPT:') ?: Arr::get($this->src,'p',Arr::get($this->header,'opoint',0));
case 'fd': return Arr::get($this->src,'d'); case 'fd': return Arr::get($this->src,'d');
case 'fzone': case 'fzone':
@ -341,10 +341,10 @@ class Message extends FTNBase
// To Addresses // To Addresses
// Echomail doesnt have a zone, so we'll use the source zone // Echomail doesnt have a zone, so we'll use the source zone
case 'tz': return (int)Arr::get($this->isEchomail() ? $this->src : $this->dst,'z'); case 'tz': return Arr::get($this->isEchomail() ? $this->src : $this->dst,'z');
case 'tn': return (int)Arr::get($this->header,'dnet'); case 'tn': return Arr::get($this->header,'dnet');
case 'tf': return (int)Arr::get($this->header,'dnode'); case 'tf': return Arr::get($this->header,'dnode');
case 'tp': return (int)$this->mo->kludges->get('TOPT:') ?: Arr::get($this->header,'dpoint',0); case 'tp': return $this->mo->kludges->get('TOPT:') ?: Arr::get($this->header,'dpoint',0);
case 'tzone': case 'tzone':
// Use the zone if this class was called with it. // Use the zone if this class was called with it.
@ -360,7 +360,6 @@ class Message extends FTNBase
return Zone::where('zone_id',$this->tz) return Zone::where('zone_id',$this->tz)
->where('default',TRUE) ->where('default',TRUE)
->single(); ->single();
case 'tdomain': case 'tdomain':
// We'll use the zone's domain if this method class was called with a zone // We'll use the zone's domain if this method class was called with a zone
if ($this->zone && (($this->zone->domain->name === Arr::get($this->dst,'d')) || ! Arr::get($this->dst,'d'))) if ($this->zone && (($this->zone->domain->name === Arr::get($this->dst,'d')) || ! Arr::get($this->dst,'d')))

9
app/Notifications/Netmails/EchomailBadAddress.php
View File

@ -5,8 +5,9 @@ namespace App\Notifications\Netmails;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use App\Classes\FTN\Message;
use App\Notifications\Netmails; use App\Notifications\Netmails;
use App\Models\{Echomail,Netmail}; use App\Models\Netmail;
use App\Traits\{MessagePath,PageTemplate}; use App\Traits\{MessagePath,PageTemplate};
class EchomailBadAddress extends Netmails class EchomailBadAddress extends Netmails
@ -15,14 +16,14 @@ class EchomailBadAddress extends Netmails
private const LOGKEY = 'NBA'; private const LOGKEY = 'NBA';
private Echomail $mo; private Netmail $mo;
/** /**
* Send a sysop a message if they give us a message with a bad address in it. * Send a sysop a message if they give us a message with a bad address in it.
* *
* @param Echomail $mo * @param Netmail $mo
*/ */
public function __construct(Echomail $mo) public function __construct(Netmail $mo)
{ {
parent::__construct(); parent::__construct();