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

Compare commits

base: bbs:2735df5d7b906dd8c1cd9a05f6b0a3fa0c888e72
Branches Tags
bbs:master
bbs:bbs
..
compare: bbs:67377a20120b3f14231b4f80b97bc6347c132489
Branches Tags
bbs:master
bbs:bbs

No commits in common. "2735df5d7b906dd8c1cd9a05f6b0a3fa0c888e72" and "67377a20120b3f14231b4f80b97bc6347c132489" have entirely different histories.
2735df5d7b ... 67377a2012

5 changed files with 49 additions and 67 deletions
Show Stats Expand all files Collapse all files

20
resources/views/system/addedit.blade.php
View File

@ -258,12 +258,8 @@ use App\Models\Address;
<div id="collapse_echoarea" class="accordion-collapse collapse {{ ($flash=='echoarea') ? 'show' : '' }}" aria-labelledby="echoarea" data-bs-parent="#accordion_homepage"> <div id="collapse_echoarea" class="accordion-collapse collapse {{ ($flash=='echoarea') ? 'show' : '' }}" aria-labelledby="echoarea" data-bs-parent="#accordion_homepage">
<div class="accordion-body"> <div class="accordion-body">
@if ($o->sessions->count()) <p>This system can subscribe to the following echoareas:</p>
<p>This system can subscribe to the following echoareas:</p> @include('system.widget.form-echoarea')
@include('system.widget.form-echoarea')
@else
<p>No session details exist for this system, so Echoareas are unavailable.</p>
@endif
</div> </div>
</div> </div>
</div> </div>
@ -276,12 +272,8 @@ use App\Models\Address;
<div id="collapse_filearea" class="accordion-collapse collapse {{ ($flash=='filearea') ? 'show' : '' }}" aria-labelledby="filearea" data-bs-parent="#accordion_homepage"> <div id="collapse_filearea" class="accordion-collapse collapse {{ ($flash=='filearea') ? 'show' : '' }}" aria-labelledby="filearea" data-bs-parent="#accordion_homepage">
<div class="accordion-body"> <div class="accordion-body">
@if ($o->sessions->count()) <p>This system can subscribe to the following fileareas:</p>
<p>This system can subscribe to the following fileareas:</p> @include('system.widget.form-filearea')
@include('system.widget.form-filearea')
@else
<p>No session details exist for this system, so Fileareas are unavailable.</p>
@endif
</div> </div>
</div> </div>
</div> </div>
@ -514,8 +506,8 @@ use App\Models\Address;
<tbody> <tbody>
@foreach ($x as $oo) @foreach ($x as $oo)
<tr> <tr>
<td @class(['packet'=>$oo->recv_pkt])>{{ $oo->recv_pkt ?: '-' }}</td> <td class="packet">{{ $oo->recv_pkt }}</td>
<td>{{ $oo->recv_at ?: '-' }}</td> <td>{{ $oo->recv_at }}</td>
<td class="text-end">{{ $oo->count }}</td> <td class="text-end">{{ $oo->count }}</td>
</tr> </tr>
@endforeach @endforeach

40
resources/views/system/widget/echoarea.blade.php
View File

@ -1,28 +1,24 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@if($echoareas->count()) <table class="table monotable" id="echoareas">
<table class="table monotable" id="echoareas"> <thead>
<thead> <tr>
<tr> <th>Subscribed</th>
<th>Subscribed</th> <th>Echoarea</th>
<th>Echoarea</th> <th>Description</th>
<th>Description</th> </tr>
</tr> </thead>
</thead>
<tbody> <tbody>
@foreach ($echoareas as $oo) @foreach ($echoareas as $oo)
<tr> <tr>
<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->echoareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td> <td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->echoareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
<td>{{ $oo->name }}</td> <td>{{ $oo->name }}</td>
<td>{{ $oo->description }}</td> <td>{{ $oo->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@else
<p>No echoareas available for this sytem. Check node security and/or echoarea security.</p>
@endif
</div> </div>
</div> </div>

40
resources/views/system/widget/filearea.blade.php
View File

@ -1,28 +1,24 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@if($fileareas->count()) <table class="table monotable" id="fileareas">
<table class="table monotable" id="fileareas"> <thead>
<thead> <tr>
<tr> <th>Subscribed</th>
<th>Subscribed</th> <th>Filearea</th>
<th>Filearea</th> <th>Description</th>
<th>Description</th> </tr>
</tr> </thead>
</thead>
<tbody> <tbody>
@foreach ($fileareas as $oo) @foreach ($fileareas as $oo)
<tr> <tr>
<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->fileareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td> <td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->fileareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
<td>{{ $oo->name }}</td> <td>{{ $oo->name }}</td>
<td>{{ $oo->description }}</td> <td>{{ $oo->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@else
<p>No fileareas available for this sytem. Check node security and/or filearea security.</p>
@endif
</div> </div>
</div> </div>

14
resources/views/widgets/packet.blade.php
View File

@ -18,13 +18,11 @@
<td>{{ $oo->fftn->ftn }}</td> <td>{{ $oo->fftn->ftn }}</td>
<td>{{ $oo->tftn->ftn }}</td> <td>{{ $oo->tftn->ftn }}</td>
<td> <td>
<a href="{{ url('netmail/view',['id'=>$oo->id]) }}"> @if ($oo->msgid)
@if ($oo->msgid) {{ $oo->msgid }}
{{ $oo->msgid }} @else
@else <small>[{{ $oo->id }}]</small>
<small>[{{ $oo->id }}]</small> @endif
@endif
</a>
</td> </td>
<td>{{ $oo->datetime }}</td> <td>{{ $oo->datetime }}</td>
</tr> </tr>
@ -51,7 +49,7 @@
@foreach ($em as $oo) @foreach ($em as $oo)
<tr> <tr>
<td>{{ $oo->fftn->ftn }}</td> <td>{{ $oo->fftn->ftn }}</td>
<td><a href="{{ url('echomail/view',['id'=>$oo->id]) }}">{{ $oo->msgid }}</a></td> <td>{{ $oo->msgid }}</td>
<td>{{ $oo->echoarea->name }}</td> <td>{{ $oo->echoarea->name }}</td>
<td>{{ $oo->datetime }}</td> <td>{{ $oo->datetime }}</td>
</tr> </tr>

2
routes/web.php
View File

@ -131,7 +131,7 @@ Route::middleware(['auth','verified','activeuser'])->group(function () {
Route::match(['get','post'],'link',[UserController::class,'link']); Route::match(['get','post'],'link',[UserController::class,'link']);
Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents']) Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents'])
->where('o','[0-9]+') ->where('o','[0-9]+')
->where('packet','[0-9a-zA-Z]+'); ->where('packet','[[:xdigit:]]+');
Route::match(['get','post'],'user/system/register',[SystemController::class,'register']); Route::match(['get','post'],'user/system/register',[SystemController::class,'register']);
Route::match(['post'],'user/system/link',[SystemController::class,'system_link']); Route::match(['post'],'user/system/link',[SystemController::class,'system_link']);