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

Security update enabling update_nn to edit system details

Browse Source
This commit is contained in:
Deon George
2024-05-21 19:50:57 +10:00
parent ab2e288f06
commit aaec5f8f4a
5 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
resources/views/system/widget/system.blade.php
View File

@@ -1,9 +1,9 @@
@php
use App\Classes\FTN\Packet;
use App\Models\{Mailer,User};
use App\Classes\FTN\Packet;
use App\Models\{Mailer,User};
@endphp
<!-- $o = System::class -->
<!-- $o=System::class -->
<div class="row">
<div class="col-xl-9 col-12">
@can('admin',$o)
@@ -46,7 +46,7 @@
<label for="name" class="form-label">BBS Name</label>
<div class="input-group has-validation">
<span class="input-group-text"><i class="bi bi-pc"></i></span>
<input type="text" class="form-control @error('name') is-invalid @enderror" id="name" placeholder="Name" name="name" value="{{ old('name',$o->name) }}" required @cannot('update',$o)readonly @endcannot autofocus>
<input type="text" class="form-control @error('name') is-invalid @enderror" id="name" placeholder="Name" name="name" value="{{ old('name',$o->name) }}" required @cannot($action,$o)readonly @endcannot autofocus>
<span id="search-icon" style="width: 0;"><i style="border-radius: 50%;" class="spinner-border spinner-border-sm text-dark d-none"></i></span>
<div id="system_search_results"></div>
<span class="invalid-feedback" role="alert">
@@ -227,7 +227,7 @@
<div class="row">
<!-- Active -->
<div class="col-6">
@can('update',$o)
@can($action,$o)
<label for="active" class="form-label">Active</label>
<div class="input-group">
<div class="btn-group" role="group">
@@ -245,7 +245,7 @@
<div class="row">
<!-- Hold -->
<div class="col-6">
@can('update',$o)
@can('admin',$o)
<label for="hold" class="form-label">Hold Mail <i class="bi bi-info-circle" title="Dont give the node any mail regardless of poll mode"></i></label>
<div class="input-group">
<div class="btn-group" role="group">
@@ -263,7 +263,7 @@
<div class="row">
<!-- Poll Mode -->
<div class="col-12">
@can('update',$o)
@can($action,$o)
<label for="pollmode" class="form-label">Poll Mode <i class="bi bi-info-circle" title="Poll node when mail available, poll on a schedule or hold mail for collection"></i></label>
<div class="input-group has-validation">
<div class="btn-group @error('pollmode') is-invalid @enderror" role="group">
@@ -287,11 +287,18 @@
</div>
<div class="row">
<!-- @todo This is only relevant for uplinks, so hide it if this system isnt an uplink -->
<div class="col-12 @if((old('pollmode') === "0") || is_null($o->pollmode))d-none @endif" id="heartbeat_option">
@can('admin',$o)
<div class="row p-0">
<div class="col-6">
<div class="col-12">
<div class="row p-0">
<div class="col-6">
<label for="autohold" class="form-label">Auto Hold</label>
<div class="input-group">
<button id="autohold" @class(['btn','btn-danger'=>$o->autohold,'btn-success'=>(! $o->autohold)])><i @class(['bi-toggle-on'=>$o->autohold,'bi-toggle-off'=>(! $o->autohold)])></i></button>
</div>
</div>
<!-- @todo This is only relevant for uplinks, so hide it if this system isnt an uplink -->
@can('admin',$o)
<div class="col-6 @if((old('pollmode') === "0") || is_null($o->pollmode))d-none @endif" id="heartbeat_option">
<label for="heartbeat" class="form-label">Heartbeat <i class="bi bi-info-circle" title="Attempt contact after last seen"></i></label>
<div class="input-group has-validation">
<span class="input-group-text"><i class="bi bi-hourglass-bottom"></i></span>
@@ -303,18 +310,15 @@
</span>
</div>
</div>
@endcan
<div class="col-6">
<label for="passkey" class="form-label">Auto Hold</label>
<button id="autohold" @class(['btn','btn-danger'=>$o->autohold,'btn-success'=>(! $o->autohold)])><i @class(['bi-toggle-on'=>$o->autohold,'bi-toggle-off'=>(! $o->autohold)])></i></button>
</div>
</div>
@endcan
@if (! is_null($o->pollmode))
</div>
@if(! is_null($o->pollmode))
<div class="row">
<div class="col-12 bg-secondary rounded p-2 small">
@if($job = $o->poll())
@if($job=$o->poll())
<div class="row p-0">
<div class="col-4 text-dark">
@if($job->attempts)Last: @else Scheduled: @endif
@@ -333,7 +337,7 @@
</div>
</div>
@if ($job->attempts)
@if($job->attempts)
<div class="row">
<div class="col-4 text-dark">
Next:
@@ -363,7 +367,7 @@
</div>
</div>
@if ($o->heartbeat)
@if($o->heartbeat)
<div class="row">
<div class="col-4 text-dark">
Next Heartbeat:
@@ -381,7 +385,7 @@
</div>
<div class="col-8">
<strong class="highlight">
@if ($job) Queued
@if($job) Queued
@elseif ($o->autohold)Auto Hold
@else
@switch($o->pollmode)
@@ -416,7 +420,7 @@
@if($o->exists)
@can($action,$o)
<a href="{{ url('system') }}" class="btn btn-danger">Cancel</a>
<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
<button type="submit" name="submit" class="btn btn-success float-end">@if($o->exists)Save @else Add @endif</button>
@else
<input type="hidden" name="system_id" value="{{ $o->id }}">
<span><small><strong>NOTE:</strong> You'll be able to update these details after registration is completed.</small></span>
@@ -449,7 +453,6 @@
})
$('#poll_hold').on('click',function() {
$('#heartbeat_option').addClass('d-none');
console.log('hold');
})
$("#autohold").on('click',function(item) {
var that = $(this)