Fix some UTF8 output when doing a search. Convert filename desc to CP437 when displaying files in a file area
This commit is contained in:
parent
2132b4564c
commit
afb8ad9d17
@ -10,7 +10,7 @@ use Illuminate\Support\Facades\DB;
|
|||||||
use Illuminate\Support\Facades\Gate;
|
use Illuminate\Support\Facades\Gate;
|
||||||
|
|
||||||
use App\Classes\File;
|
use App\Classes\File;
|
||||||
use App\Classes\FTN\Packet;
|
use App\Classes\FTN\{Message,Packet};
|
||||||
use App\Http\Requests\SetupRequest;
|
use App\Http\Requests\SetupRequest;
|
||||||
use App\Models\File as FileModel;
|
use App\Models\File as FileModel;
|
||||||
use App\Models\{Address,Echomail,Netmail,Setup,System};
|
use App\Models\{Address,Echomail,Netmail,Setup,System};
|
||||||
@ -169,7 +169,7 @@ class HomeController extends Controller
|
|||||||
->orWhere('replyid','like','%'.$request->query('term').'%')
|
->orWhere('replyid','like','%'.$request->query('term').'%')
|
||||||
->get() as $o)
|
->get() as $o)
|
||||||
{
|
{
|
||||||
$result->push(['id'=>$o->id,'name'=>sprintf('%s (%s)',$o->from,$o->fftn->ftn3d),'value'=>url('echomail/view',[$o->id]),'category'=>'Echomail']);
|
$result->push(['id'=>$o->id,'name'=>sprintf('%s (%s)',Message::tr($o->from),$o->fftn->ftn3d),'value'=>url('echomail/view',[$o->id]),'category'=>'Echomail']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Look for Netmail
|
// Look for Netmail
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<!-- $o=Filearea::class -->
|
<!-- $o=Filearea::class -->
|
||||||
@use(App\Models\Domain)
|
@use(App\Models\Domain)
|
||||||
|
@use(App\Classes\FTN\Message)
|
||||||
@extends('layouts.app')
|
@extends('layouts.app')
|
||||||
|
|
||||||
@section('htmlheader_title')
|
@section('htmlheader_title')
|
||||||
@ -177,7 +178,7 @@
|
|||||||
<td>{{ $oo->name }}</td>
|
<td>{{ $oo->name }}</td>
|
||||||
<td class="text-end">{{ number_format($oo->size) }}</td>
|
<td class="text-end">{{ number_format($oo->size) }}</td>
|
||||||
<td>{{ $oo->datetime->format('Y-m-d H:i:s') }}</td>
|
<td>{{ $oo->datetime->format('Y-m-d H:i:s') }}</td>
|
||||||
<td><small>{{ $oo->desc }}</small></td>
|
<td><small>{!! Message::tr($oo->desc) !!}</small></td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</tbody>
|
</tbody>
|
||||||
|
Loading…
Reference in New Issue
Block a user