From d6042fc98aca84280cd79ad3a12f8d16a33664cc Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 29 Aug 2024 10:23:05 +0000 Subject: [PATCH] Catch empty dates --- application/views/dashboard/index.php | 4 ++-- application/views/search/search_result_ajax.php | 4 ++-- application/views/view_log/partial/log_ajax.php | 4 ++-- src/QSLManager/QSO.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index e49ba5ef6..bd4893f90 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -178,9 +178,9 @@ function echo_table_col($row, $name) { ?> - COL_TIME_ON); echo date($custom_date_format, $timestamp); ?> + COL_TIME_ON ?? '1970-01-01 00:00:00'); echo date($custom_date_format, $timestamp); ?> config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - COL_TIME_ON); echo date('H:i', $timestamp); ?> + COL_TIME_ON ?? '1970-01-01 00:00:00'); echo date('H:i', $timestamp); ?> diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index e81a82db7..f961bccbb 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -144,9 +144,9 @@ $ci =& get_instance(); } ?> COL_PRIMARY_KEY .'">'; ?> - COL_TIME_ON); echo date($custom_date_format, $timestamp); ?> + COL_TIME_ON ?? '1970-01-01 00:00:00'); echo date($custom_date_format, $timestamp); ?> config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - COL_TIME_ON); echo date('H:i', $timestamp); ?> + COL_TIME_ON ?? '1970-01-01 00:00:00'); echo date('H:i', $timestamp); ?> COL_CALL)); ?> diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index e729096cc..cb06b0661 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -104,9 +104,9 @@ function echo_table_col($row, $name) { $custom_date_format = $this->config->item('qso_date_format'); } echo ''; ?> - COL_TIME_ON); echo date($custom_date_format, $timestamp); ?> + COL_TIME_ON ?? '1970-01-01 00:00:00'); echo date($custom_date_format, $timestamp); ?> config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - COL_TIME_ON); echo date('H:i', $timestamp); ?> + COL_TIME_ON ?? '1970-01-01 00:00:00'); echo date('H:i', $timestamp); ?> COL_CALL)); ?> diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 3e524dead..813804423 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -144,7 +144,7 @@ class QSO // Get Default date format from /config/wavelog.php $custom_date_format = $CI->config->item('qso_date_format'); } - $this->qsoDateTime = date($custom_date_format . " H:i", strtotime($data['COL_TIME_ON'])); + $this->qsoDateTime = date($custom_date_format . " H:i", strtotime($data['COL_TIME_ON'] ?? '1970-01-01 00:00:00')); $this->de = $data['station_callsign']; $this->dx = $data['COL_CALL'];