| callsign; ?> |
@@ -60,7 +61,14 @@
if (isset($row->qso_end_date)) {
$valid_qso_end = strtotime( $row->qso_end_date );
$new_valid_qso_end = date($this->config->item('qso_date_format'), $valid_qso_end );
- echo $new_valid_qso_end;
+ $qso_warning_date = date('Y-m-d H:i:s', strtotime($row->qso_end_date.'-30 days'));
+ if ($current_date > $row->qso_end_date) {
+ echo "".$new_valid_qso_end."";
+ } else if ($current_date <= $row->qso_end_date && $current_date > $qso_warning_date) {
+ echo "".$new_valid_qso_end."";
+ } else {
+ echo $new_valid_qso_end;
+ }
} else {
echo "n/a";
} ?>
@@ -72,20 +80,29 @@
date_expires.'-30 days'));
$valid_to = strtotime( $row->date_expires );
$new_valid_to = date($this->config->item('qso_date_format'), $valid_to );
- echo $new_valid_to; ?>
+ if ($current_date > $row->date_expires) {
+ echo "".$new_valid_to."";
+ } else if ($current_date <= $row->date_expires && $current_date > $cert_warning_date) {
+ echo "".$new_valid_to."";
+ } else {
+ echo $new_valid_to;
+ } ?>
|
-
- date_expires.'-30 days')); ?>
-
$row->date_expires) { ?>
- = __("Expired"); ?>
- date_expires && $current_date > $warning_date) { ?>
- = __("Expiring"); ?>
+ = __("Certificate expired"); ?>
+ date_expires && $current_date > $cert_warning_date) { ?>
+ = __("Certificate expiring"); ?>
- = __("Valid"); ?>
+ = __("Certificate valid"); ?>
+
+ $row->qso_end_date) { ?>
+ QSO end date exceeded
+ qso_end_date && $current_date > $qso_warning_date) { ?>
+ = __("QSO end date nearing"); ?>
|
diff --git a/application/views/qso/components/winkeysettings.php b/application/views/qso/components/winkeysettings.php
index 22241c582..9639f9902 100644
--- a/application/views/qso/components/winkeysettings.php
+++ b/application/views/qso/components/winkeysettings.php
@@ -1,80 +1,38 @@
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index ec37da3fd..a824da6e5 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -341,7 +341,7 @@ switch ($date_format) {
$power = '';
foreach ($stations->result() as $stationrow) {
?>
-
+
@@ -350,6 +350,7 @@ switch ($date_format) {
|