Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #952

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Dev #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
065f2f3
fix invalid format
dbarzin Nov 11, 2024
1c7e9b1
layout
dbarzin Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/Console/Commands/CertificateExpiracy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,12 @@ public function handle()
Log::debug('CertificateExpiracy - ' . $cert->name . ' never notified.');
$cert->last_notification = now();
$cert->save();
} elseif ($cert->last_notification > now()->addDays(-intval(config('mercator-config.cert.expire-delay')))) {
Log::debug('CertificateExpiracy - ' . $cert->name . ' already notified.');
} elseif (
Carbon::createFromFormat(config('panel.date_format') . ' ' . config('panel.time_format'), $cert->last_notification)
->lessThan(
now()->addDays(-intval(config('mercator-config.cert.expire-delay'))))
) {
Log::debug('CertificateExpiracy - ' . $cert->name . ' already notified on ' . $cert->last_notification);
$certificates->forget($key);
} else {
// must be notified
Expand Down
2 changes: 1 addition & 1 deletion resources/views/admin/processes/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="card-body">
<div class="form-group">
<label class="required" for="name">{{ trans('cruds.process.fields.name') }}</label>
<input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', '') }}" required>
<input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', '') }}" maxlength=32 required>
@if($errors->has('name'))
<div class="invalid-feedback">
{{ $errors->first('name') }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/admin/processes/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="card-body">
<div class="form-group">
<label class="required" for="name">{{ trans('cruds.process.fields.name') }}</label>
<input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', $process->name) }}" required>
<input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', $process->name) }}" maxlength=32 required>
@if($errors->has('name'))
<div class="invalid-feedback">
{{ $errors->first('name') }}
Expand Down
Loading