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

Echomail export

Browse Source
This commit is contained in:
Deon George
2021-09-06 23:39:32 +10:00
parent 8306f4c3a3
commit dbbfe46cb9
13 changed files with 163 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Classes/File/Receive.php
View File

@@ -10,7 +10,7 @@ use Symfony\Component\HttpFoundation\File\Exception\FileException;
use App\Classes\FTN\InvalidPacketException;
use App\Classes\FTN\Packet;
use App\Jobs\PacketProcess;
use App\Jobs\MessageProcess;
use App\Models\Address;
/**
@@ -128,7 +128,7 @@ final class Receive extends Item
// Check the packet password
if ($this->ao->session('pktpass') !== $po->password) {
Log::error(sprintf('%s: ! Packet from [%s] with password [%s] is invalid (%s)',self::LOGKEY,$this->ao->ftn,$po->password));
Log::error(sprintf('%s: ! Packet from [%s] with password [%s] is invalid.',self::LOGKEY,$this->ao->ftn,$po->password));
// @todo Generate message to system advising invalid password - that message should be sent without a packet password!
break;
}
@@ -145,9 +145,9 @@ final class Receive extends Item
// Dispatch job.
if ($queue)
PacketProcess::dispatch($msg);
MessageProcess::dispatch($msg);
else
PacketProcess::dispatchSync($msg);
MessageProcess::dispatchSync($msg);
}
if ($po->errors->count()) {

7
app/Classes/File/Send.php
View File

@@ -236,6 +236,13 @@ final class Send extends Item
$this->packets->push(new Mail($x,self::I_SEND));
}
// Echomail
if ($x=$ao->getEchomail()) {
Log::debug(sprintf('%s: - Echomail(s) added for sending to [%s]',self::LOGKEY,$ao->ftn));
$this->packets->push(new Mail($x,self::I_SEND));
}
}
/**