diff --git a/application/config/cloudlog.php b/application/config/cloudlog.php index 4a62c27e..5364c6c8 100644 --- a/application/config/cloudlog.php +++ b/application/config/cloudlog.php @@ -88,3 +88,24 @@ $config['public_search'] = FALSE; */ $config['callsign_tags'] = TRUE; + +/* +|-------------------------------------------------------------------------- +| Date Format +|-------------------------------------------------------------------------- +| +| QSO Date format allows you to change the frontend display date to something +| that suits your region or operating style better. +| +| It uses the php date format so see https://www.php.net/manual/en/function.date.php +| for information on the layout. +| +| Example +| d/m/y = day/month/year +| Y/m/d = 2020/02/21 +| +| Default is: d/m/y +| +*/ + +$config['qso_date_format'] = "d/m/y"; diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 5c50a805..e86f999e 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -388,7 +388,7 @@ class Logbook extends CI_Controller { foreach ($query->result() as $row) { $html .= ""; - $html .= "".date('d/m/y H:i',strtotime($row->COL_TIME_ON)).""; + $html .= "".date($this->config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)).""; $html .= "".str_replace("0","Ø",strtoupper($row->COL_CALL)).""; $html .= "".$row->COL_RST_SENT.""; $html .= "".$row->COL_RST_RCVD.""; diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 4362693b..97d0e522 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -44,10 +44,11 @@ - result() as $row) { ?> '; ?> - COL_TIME_ON); echo date('d/m/y', $timestamp); ?> + COL_TIME_ON); echo date($this->config->item('qso_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); ?> diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 5160e81b..62128f6e 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -338,7 +338,7 @@ result() as $row) { ?> '; ?> - COL_TIME_ON)); ?> + config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)); ?> COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?> COL_MODE; ?> COL_RST_SENT; ?> diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index bf6ae3a7..b1d55d9c 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -26,7 +26,7 @@ result() as $row) { ?> '; ?> - COL_TIME_ON); echo date('d/m/y', $timestamp); ?> + COL_TIME_ON); echo date($this->config->item('qso_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); ?> diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 981253e7..72d6ba03 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -14,9 +14,9 @@ Date/Time: 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('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?> + COL_TIME_ON); echo date($this->config->item('qso_date_format'), $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?> - COL_TIME_ON); echo date('d/m/y', $timestamp); ?> + COL_TIME_ON); echo date($this->config->item('qso_date_format'), $timestamp); ?>