diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index ebf2692a..958db007 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -53,13 +53,13 @@ class eqsl extends CI_Controller { $record['qsl_sent'] = $config['eqsl_rcvd_mark']; } - $status = $this->logbook_model->import_check($time_on, $record['call'], $record['band']); + $status = $this->logbook_model->import_check($time_on, str_replace("0","Ø",$record['call']), $record['band']); if ($status == "Found") { - $dupe = $this->logbook_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $config['eqsl_rcvd_mark']); + $dupe = $this->logbook_model->eqsl_dupe_check($time_on, str_replace("0","Ø",$record['call']), $record['band'], $config['eqsl_rcvd_mark']); if ($dupe == false) { - $eqsl_status = $this->logbook_model->eqsl_update($time_on, $record['call'], $record['band'], $config['eqsl_rcvd_mark']); + $eqsl_status = $this->logbook_model->eqsl_update($time_on, str_replace("0","Ø",$record['call']), $record['band'], $config['eqsl_rcvd_mark']); } else { @@ -72,7 +72,7 @@ class eqsl extends CI_Controller { } $table .= ""; $table .= "".$time_on.""; - $table .= "".$record['call'].""; + $table .= "".str_replace("0","Ø",$record['call']).""; $table .= "".$record['mode'].""; $table .= "QSO Record: ".$status.""; $table .= "eQSL Record: ".$eqsl_status.""; @@ -485,7 +485,7 @@ class eqsl extends CI_Controller { } $table .= ""; $table .= "".$qsl['COL_TIME_ON'].""; - $table .= "".$qsl['COL_CALL'].""; + $table .= "".str_replace("0","Ø",$qsl['COL_CALL']).""; $table .= "".$qsl['COL_MODE'].""; $table .= "".$qsl['COL_BAND'].""; $table .= "".$status.""; @@ -514,7 +514,7 @@ class eqsl extends CI_Controller { { $table .= ""; $table .= "".$qsl['COL_TIME_ON'].""; - $table .= "".strtoupper($qsl['COL_CALL']).""; + $table .= "".str_replace("0","Ø",strtoupper($qsl['COL_CALL'])).""; $table .= "".$qsl['COL_MODE'].""; $table .= "".$qsl['COL_BAND'].""; $table .= ""; diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 1944b4a1..b7073256 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -249,7 +249,7 @@ class Logbook extends CI_Controller { { $html .= ""; $html .= "".$row->COL_TIME_ON.""; - $html .= "".$row->COL_CALL.""; + $html .= "".str_replace("0","Ø",strtoupper($row->COL_CALL)).""; $html .= "".$row->COL_RST_SENT.""; $html .= "".$row->COL_RST_RCVD.""; if($row->COL_SAT_NAME != null) { diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 157ab534..23416cd4 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -47,7 +47,7 @@ COL_PRIMARY_KEY; ?>" href="javascript:;"> - COL_CALL); ?> + COL_CALL)); ?> COL_MODE; ?> diff --git a/application/views/qso/index.php b/application/views/qso/index.php index cca254e3..306094ee 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -324,7 +324,7 @@ foreach ($query->result() as $row) { ?> '; ?> COL_TIME_ON; ?> - COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL); ?> + COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?> COL_MODE; ?> COL_RST_SENT; ?> COL_RST_RCVD; ?> diff --git a/application/views/search/result_search.php b/application/views/search/result_search.php index 964137d3..ac573b54 100644 --- a/application/views/search/result_search.php +++ b/application/views/search/result_search.php @@ -33,7 +33,7 @@ '; ?> COL_TIME_ON); echo date('d/m/y', $timestamp); ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> - COL_PRIMARY_KEY; ?>">COL_CALL); ?> + COL_PRIMARY_KEY; ?>">COL_CALL)); ?> COL_MODE; ?> COL_RST_SENT; ?> COL_STX_STRING) { ?>COL_STX_STRING;?> COL_RST_RCVD; ?> COL_SRX_STRING) { ?>COL_SRX_STRING;?> diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index 13e325e2..5c534eb3 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -29,7 +29,7 @@ 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_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL); ?> + COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?> COL_MODE; ?> COL_RST_SENT; ?> COL_STX_STRING) { ?>COL_STX_STRING;?> COL_RST_RCVD; ?> COL_SRX_STRING) { ?>COL_SRX_STRING;?> diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index c20c3103..5e66fdaf 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -2,9 +2,9 @@ num_rows() > 0) { foreach ($query->result() as $row) { ?> config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> -

QSO with COL_CALL; ?> on the COL_TIME_ON); echo date('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?>

+

QSO with COL_CALL)); ?> on the COL_TIME_ON); echo date('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?>

-

QSO with COL_CALL; ?> on the COL_TIME_ON); echo date('d/m/y', $timestamp);?>

+

QSO with COL_CALL)); ?> on the COL_TIME_ON); echo date('d/m/y', $timestamp);?>

@@ -22,7 +22,7 @@ Callsign: - COL_CALL; ?> + COL_CALL)); ?> diff --git a/application/views/widgets/qsos.php b/application/views/widgets/qsos.php index 93002e9d..c6f0f4bf 100644 --- a/application/views/widgets/qsos.php +++ b/application/views/widgets/qsos.php @@ -28,7 +28,7 @@ '; ?> COL_TIME_ON); echo date('d/m/y', $timestamp); ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> - COL_PRIMARY_KEY; ?>">COL_CALL); ?> + COL_PRIMARY_KEY; ?>">COL_CALL)); ?> COL_MODE; ?> COL_RST_SENT; ?> COL_STX_STRING) { ?>(COL_STX_STRING;?>) COL_RST_RCVD; ?> COL_SRX_STRING) { ?>(COL_SRX_STRING;?>)