Compare commits
No commits in common. "b891abb611db1d613c33f979d45dba4cfd32a881" and "d3a9e36bb7b2a0e3c3b9ffbf7b88a577eaf90688" have entirely different histories.
b891abb611
...
d3a9e36bb7
@ -201,7 +201,7 @@ class Send extends Base
|
|||||||
|
|
||||||
// Files
|
// Files
|
||||||
if (($x=$ao->filesWaiting())->count()) {
|
if (($x=$ao->filesWaiting())->count()) {
|
||||||
Log::info(sprintf('%s:- [%d] Files(s) added for sending to [%s]',self::LOGKEY,$x->count(),$ao->ftn));
|
Log::debug(sprintf('%s:- [%d] Files(s) added for sending to [%s]',self::LOGKEY,$x->count(),$ao->ftn));
|
||||||
|
|
||||||
// Add Files
|
// Add Files
|
||||||
foreach ($x as $fo) {
|
foreach ($x as $fo) {
|
||||||
|
@ -49,8 +49,8 @@ class MailList extends Command
|
|||||||
return [
|
return [
|
||||||
'id'=>$item->id,
|
'id'=>$item->id,
|
||||||
'msgid'=>$item->msgid,
|
'msgid'=>$item->msgid,
|
||||||
'from'=>sprintf('%s (%s)',$item->from,$item->fftn->ftn3d),
|
'from'=>$item->from,
|
||||||
'to'=>sprintf('%s (%s)',$item->to,$item->tftn->ftn3d),
|
'to'=>$item->to,
|
||||||
'subject'=>$item->subject,
|
'subject'=>$item->subject,
|
||||||
];
|
];
|
||||||
}));
|
}));
|
||||||
|
@ -1135,8 +1135,8 @@ class Address extends Model
|
|||||||
*/
|
*/
|
||||||
public function getNetmail(): ?Packet
|
public function getNetmail(): ?Packet
|
||||||
{
|
{
|
||||||
if ($count=($num=$this->netmailAlertWaiting())->count()) {
|
if (($num=$this->netmailAlertWaiting())->count()) {
|
||||||
Log::info(sprintf('%s:= Packaging [%d] netmail alerts to [%s]',self::LOGKEY,$count,$this->ftn));
|
Log::debug(sprintf('%s:= Packaging [%d] netmail alerts to [%s]',self::LOGKEY,$num->count(),$this->ftn));
|
||||||
|
|
||||||
$msgs = $num->get();
|
$msgs = $num->get();
|
||||||
|
|
||||||
@ -1160,11 +1160,11 @@ class Address extends Model
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($count=($num=$this->netmailWaiting())->count()) {
|
if (($num=$this->netmailWaiting())->count()) {
|
||||||
Log::info(sprintf('%s:= Got [%d] netmails for [%s] for sending',self::LOGKEY,$count,$this->ftn));
|
Log::debug(sprintf('%s:= Got [%d] netmails for [%s] for sending',self::LOGKEY,$num->count(),$this->ftn));
|
||||||
|
|
||||||
// Limit to max messages
|
// Limit to max messages
|
||||||
if ($count > $this->system->pkt_msgs)
|
if ($num->count() > $this->system->pkt_msgs)
|
||||||
Log::alert(sprintf('%s:= Only sending [%d] netmails for [%s]',self::LOGKEY,$this->system->pkt_msgs,$this->ftn));
|
Log::alert(sprintf('%s:= Only sending [%d] netmails for [%s]',self::LOGKEY,$this->system->pkt_msgs,$this->ftn));
|
||||||
|
|
||||||
return $this->system->packet($this)->mail($num->take($this->system->pkt_msgs)->get());
|
return $this->system->packet($this)->mail($num->take($this->system->pkt_msgs)->get());
|
||||||
|
@ -59,7 +59,7 @@ class NetmailHubNoUser extends Netmails
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$msg->addText("This hub is not attended, so no user will be able to read your message. You may like to try and contact them another way.\r\r");
|
$msg->addText("This hub is not attended, so no user will be able to read your message (the hub is unattended). You may like to try and contact them another way.\r\r");
|
||||||
|
|
||||||
$msg->addText($this->message_path($this->mo));
|
$msg->addText($this->message_path($this->mo));
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
<td>{{ $oo->system->sysop }}</td>
|
<td>{{ $oo->system->sysop }}</td>
|
||||||
<td>{{ $oo->system->location }}</td>
|
<td>{{ $oo->system->location }}</td>
|
||||||
<td>{{ $oo->system->last_session ? $oo->system->last_session->format('Y-m-d H:i') : '-' }}</td>
|
<td>{{ $oo->system->last_session ? $oo->system->last_session->format('Y-m-d H:i') : '-' }}</td>
|
||||||
<td>{{ $oo->system->akas->where('zone_id',$oo->zone_id)->pluck('ftn4d')->join(', ') }}</td>
|
<td>{{ $oo->system->addresses->where('zone_id',$oo->zone_id)->pluck('ftn4d')->join(', ') }}</td>
|
||||||
<td>{{ $oo->system->zt_id }}</td>
|
<td>{{ $oo->system->zt_id }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
Loading…
Reference in New Issue
Block a user