Compare commits
No commits in common. "d036c7e70470201141e38bab450f9038e5140acc" and "f912e81ee6205fcf9bf676921ad120d409083008" have entirely different histories.
d036c7e704
...
f912e81ee6
@ -28,13 +28,7 @@ class CompressedString implements CastsAttributes
|
|||||||
? stream_get_contents($value)
|
? stream_get_contents($value)
|
||||||
: $value;
|
: $value;
|
||||||
|
|
||||||
// If we get an error decompressing, it might not be zstd (or its already been done)
|
return $value ? zstd_uncompress(base64_decode($value)) : '';
|
||||||
try {
|
|
||||||
return $value ? zstd_uncompress(base64_decode($value)) : '';
|
|
||||||
|
|
||||||
} catch (\ErrorException $e) {
|
|
||||||
return $value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -116,12 +116,8 @@ class MessageProcess implements ShouldQueue
|
|||||||
$o->cost = $this->msg->cost;
|
$o->cost = $this->msg->cost;
|
||||||
$o->msgid = $this->msg->msgid;
|
$o->msgid = $this->msg->msgid;
|
||||||
|
|
||||||
$o->tagline = $this->msg->tagline;
|
|
||||||
$o->tearline = $this->msg->tearline;
|
|
||||||
$o->origin = $this->msg->origin;
|
|
||||||
|
|
||||||
$o->subject = $this->msg->subject;
|
$o->subject = $this->msg->subject;
|
||||||
$o->msg = $this->msg->message_src."\r";
|
$o->msg = $this->msg->message;
|
||||||
|
|
||||||
foreach ($this->msg->via as $v)
|
foreach ($this->msg->via as $v)
|
||||||
$o->msg .= sprintf("\01Via %s\r",$v);
|
$o->msg .= sprintf("\01Via %s\r",$v);
|
||||||
@ -376,10 +372,6 @@ class MessageProcess implements ShouldQueue
|
|||||||
$o->msgid = $this->msg->msgid;
|
$o->msgid = $this->msg->msgid;
|
||||||
$o->replyid = $this->msg->replyid;
|
$o->replyid = $this->msg->replyid;
|
||||||
|
|
||||||
$o->tagline = $this->msg->tagline;
|
|
||||||
$o->tearline = $this->msg->tearline;
|
|
||||||
$o->origin = $this->msg->origin;
|
|
||||||
|
|
||||||
$o->msg = $this->msg->message_src."\r";
|
$o->msg = $this->msg->message_src."\r";
|
||||||
$o->msg_src = $this->msg->message_src;
|
$o->msg_src = $this->msg->message_src;
|
||||||
$o->msg_crc = md5($this->msg->message);
|
$o->msg_crc = md5($this->msg->message);
|
||||||
|
5
public/css/fixes.css
vendored
5
public/css/fixes.css
vendored
@ -133,9 +133,4 @@ h1>small.success:after {
|
|||||||
.titledbox {
|
.titledbox {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
}
|
|
||||||
|
|
||||||
/* Enable smaller text in h1, but not tiny as used at the float-end */
|
|
||||||
h1 > small:not(.float-end) {
|
|
||||||
font-size: 50% !important;
|
|
||||||
}
|
}
|
@ -6,7 +6,7 @@
|
|||||||
@section('content')
|
@section('content')
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<h1>Echomail <small>[{{ $o->msgid ?: '-' }}]</small> <small class="float-end">#{{ $o->id }}</small></h1>
|
<h1>Echomail [{{ $o->msgid ?: '-' }}] <small class="float-end">#{{ $o->id }}</small></h1>
|
||||||
|
|
||||||
@include('widgets.message',['msg'=>$o])
|
@include('widgets.message',['msg'=>$o])
|
||||||
</div>
|
</div>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
@section('content')
|
@section('content')
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<h1>Netmail <small>[{{ $o->msgid ?: '-' }}]</small> <small class="float-end">#{{ $o->id }}</small></h1>
|
<h1>Netmail [{{ $o->msgid ?: '-' }}] <small class="float-end">#{{ $o->id }}</small></h1>
|
||||||
|
|
||||||
@include('widgets.message',['msg'=>$o])
|
@include('widgets.message',['msg'=>$o])
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user