diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index a5b2d896e..b6ff000be 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -79,14 +79,14 @@ public function index() $QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array); $data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent']; - $data['total_qsl_recv'] = $QSLStatsBreakdownArray['QSL_Received']; + $data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received']; $data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested']; $data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent']; - $data['total_eqsl_recv'] = $QSLStatsBreakdownArray['eQSL_Received']; + $data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received']; $data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent']; - $data['total_lotw_recv'] = $QSLStatsBreakdownArray['LoTW_Received']; + $data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received']; $data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array); diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php index 35ed11986..f751637bf 100644 --- a/application/controllers/Visitor.php +++ b/application/controllers/Visitor.php @@ -93,14 +93,14 @@ public function index($public_slug = NULL) $QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array); $data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent']; - $data['total_qsl_recv'] = $QSLStatsBreakdownArray['QSL_Received']; + $data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received']; $data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested']; $data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent']; - $data['total_eqsl_recv'] = $QSLStatsBreakdownArray['eQSL_Received']; + $data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received']; $data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent']; - $data['total_lotw_recv'] = $QSLStatsBreakdownArray['LoTW_Received']; + $data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received']; $data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array); diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index f065b9c3d..45dcf9c75 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -64,7 +64,7 @@ $lang['gen_hamradio_callsign'] = 'Инициал'; $lang['gen_hamradio_mode'] = 'Режим'; $lang['gen_hamradio_rst_sent'] = 'Sent'; -$lang['gen_hamradio_rst_recv'] = 'Recv\'d'; +$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d'; $lang['gen_hamradio_band'] = 'Обхват'; $lang['gen_hamradio_band_rx'] = 'Обхват (RX)'; $lang['gen_hamradio_frequency'] = 'Честота'; @@ -73,7 +73,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Локатор'; $lang['gen_hamradio_transmit_power'] = 'Мощност на предавателя (W)'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index c69c99423..33889c416 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -64,7 +64,7 @@ $lang['gen_hamradio_callsign'] = '呼号'; $lang['gen_hamradio_mode'] = '模式'; $lang['gen_hamradio_rst_sent'] = '发'; -$lang['gen_hamradio_rst_recv'] = '收'; +$lang['gen_hamradio_rst_rcvd'] = '收'; $lang['gen_hamradio_band'] = '频段'; $lang['gen_hamradio_band_rx'] = '频段 (RX)'; $lang['gen_hamradio_frequency'] = '频率'; @@ -73,7 +73,7 @@ $lang['gen_hamradio_rsts'] = '信号报告 (发)'; $lang['gen_hamradio_rstr'] = '信号报告 (收)'; $lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)'; -$lang['gen_hamradio_exchange_recv_short'] = '信号交换 (收)'; +$lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = '定位器'; $lang['gen_hamradio_transmit_power'] = '发射功率 (W)'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index c167485e1..57f8bbd47 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -60,7 +60,7 @@ $lang['gen_hamradio_callsign'] = 'Značka'; $lang['gen_hamradio_mode'] = 'Mód'; $lang['gen_hamradio_rst_sent'] = 'Odesláno'; -$lang['gen_hamradio_rst_recv'] = 'Přijato'; +$lang['gen_hamradio_rst_rcvd'] = 'Přijato'; $lang['gen_hamradio_band'] = 'Pásmo'; $lang['gen_hamradio_band_rx'] = 'Pásmo (RX)'; $lang['gen_hamradio_frequency'] = 'Kmitočet'; @@ -69,7 +69,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Lokátor'; $lang['gen_hamradio_transmit_power'] = 'Výkon (W)'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index de484ed09..c79a26593 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -51,7 +51,7 @@ $lang['gen_hamradio_callsign'] = 'Roepletters'; $lang['gen_hamradio_mode'] = 'Mode'; $lang['gen_hamradio_rst_sent'] = 'Verzonden'; -$lang['gen_hamradio_rst_recv'] = 'Ontvangen'; +$lang['gen_hamradio_rst_rcvd'] = 'Ontvangen'; $lang['gen_hamradio_band'] = 'Band'; $lang['gen_hamradio_band_rx'] = 'Band (RX)'; $lang['gen_hamradio_frequency'] = 'Frequentie'; @@ -60,7 +60,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Verz (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Ontv (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Ontv (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Vermogen (W)'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index da383fb97..3a221be39 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -72,7 +72,7 @@ $lang['gen_hamradio_callsign'] = 'Callsign'; $lang['gen_hamradio_mode'] = 'Mode'; $lang['gen_hamradio_rst_sent'] = 'Sent'; -$lang['gen_hamradio_rst_recv'] = 'Recv\'d'; +$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d'; $lang['gen_hamradio_band'] = 'Band'; $lang['gen_hamradio_band_rx'] = 'Band (RX)'; $lang['gen_hamradio_frequency'] = 'Frequency'; @@ -81,7 +81,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Transmit Power (W)'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 6db94de0c..3879c20cc 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -64,7 +64,7 @@ $lang['gen_hamradio_callsign'] = 'Kutsumerkki'; $lang['gen_hamradio_mode'] = 'Lähetelaji'; $lang['gen_hamradio_rst_sent'] = 'Annettu raportti'; -$lang['gen_hamradio_rst_recv'] = 'Saatu raportti'; +$lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti'; $lang['gen_hamradio_band'] = 'Bandi'; $lang['gen_hamradio_band_rx'] = 'Bandi (RX)'; $lang['gen_hamradio_frequency'] = 'Taajuus'; @@ -73,7 +73,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Lokaattori'; $lang['gen_hamradio_transmit_power'] = 'Lähetysteho (W)'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 191c607a0..f04e7b9fa 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -60,7 +60,7 @@ $lang['gen_hamradio_callsign'] = 'Indicatif'; $lang['gen_hamradio_mode'] = 'Mode'; $lang['gen_hamradio_rst_sent'] = 'Envoyé'; -$lang['gen_hamradio_rst_recv'] = 'Reçu'; +$lang['gen_hamradio_rst_rcvd'] = 'Reçu'; $lang['gen_hamradio_band'] = 'Bande'; $lang['gen_hamradio_band_rx'] = 'Bande (RX)'; $lang['gen_hamradio_frequency'] = 'Frequence'; @@ -69,7 +69,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Puissance Emission (W)'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index c57c4a55a..5e76a4c8f 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -71,7 +71,7 @@ $lang['gen_hamradio_callsign'] = 'Rufzeichen'; $lang['gen_hamradio_mode'] = 'Mode'; $lang['gen_hamradio_rst_sent'] = 'Gegeben'; -$lang['gen_hamradio_rst_recv'] = 'Erhalten'; +$lang['gen_hamradio_rst_rcvd'] = 'Erhalten'; $lang['gen_hamradio_band'] = 'Band'; $lang['gen_hamradio_band_rx'] = 'Band (RX)'; $lang['gen_hamradio_frequency'] = 'Frequenz'; @@ -80,7 +80,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Sendeleistung (W)'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index ef2de4f21..b579c1399 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -72,7 +72,7 @@ $lang['gen_hamradio_callsign'] = 'Nominativo'; $lang['gen_hamradio_mode'] = 'Modo'; $lang['gen_hamradio_rst_sent'] = 'Inviato'; -$lang['gen_hamradio_rst_recv'] = 'Ricevuto'; +$lang['gen_hamradio_rst_rcvd'] = 'Ricevuto'; $lang['gen_hamradio_band'] = 'Banda'; $lang['gen_hamradio_band_rx'] = 'Banda (RX)'; $lang['gen_hamradio_frequency'] = 'Frequenza'; @@ -81,7 +81,7 @@ $lang['gen_hamradio_rsts'] = 'RST (I)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Scambio (I)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Scambio (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Scambio (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Locatore'; $lang['gen_hamradio_transmit_power'] = 'Potenza di Trasmissione (W)'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 68feda42c..d5c6c1ffa 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -66,7 +66,7 @@ $lang['gen_hamradio_callsign'] = 'Znak'; $lang['gen_hamradio_mode'] = 'Modulacja'; $lang['gen_hamradio_rst_sent'] = 'Wysłany'; -$lang['gen_hamradio_rst_recv'] = 'Odebrany\'d'; +$lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d'; $lang['gen_hamradio_band'] = 'Pasmo'; $lang['gen_hamradio_band_rx'] = 'Pasmo (RX)'; $lang['gen_hamradio_frequency'] = 'Częstotliwość'; @@ -75,7 +75,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Wymiana (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Wymiana (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Wymiana (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Lokator'; $lang['gen_hamradio_transmit_power'] = 'Moc nadajnika (W)'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 2d9f47d58..383e5aa9b 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -64,7 +64,7 @@ $lang['gen_hamradio_callsign'] = 'Indicativo'; $lang['gen_hamradio_mode'] = 'Modo'; $lang['gen_hamradio_rst_sent'] = 'Enviado'; -$lang['gen_hamradio_rst_recv'] = 'Recibido'; +$lang['gen_hamradio_rst_rcvd'] = 'Recibido'; $lang['gen_hamradio_band'] = 'Banda'; $lang['gen_hamradio_band_rx'] = 'Banda (Recepción)'; $lang['gen_hamradio_frequency'] = 'Frecuencia'; @@ -73,7 +73,7 @@ $lang['gen_hamradio_rsts'] = 'RST (Enviada)'; $lang['gen_hamradio_rstr'] = 'RST (Recibida)'; $lang['gen_hamradio_exchange_sent_short'] = 'Intercambio (Env)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Intercambio (Recib)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Intercambio (Recib)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Localizador'; $lang['gen_hamradio_transmit_power'] = 'Potencia de transmisión (W)'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 39df357cb..e8e76ce45 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -72,7 +72,7 @@ $lang['gen_hamradio_callsign'] = 'Signal'; $lang['gen_hamradio_mode'] = 'Mode'; $lang['gen_hamradio_rst_sent'] = 'Skickat'; -$lang['gen_hamradio_rst_recv'] = 'Mottagen\'d'; +$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d'; $lang['gen_hamradio_band'] = 'Band'; $lang['gen_hamradio_band_rx'] = 'Band (RX)'; $lang['gen_hamradio_frequency'] = 'Frekvens'; @@ -81,7 +81,7 @@ $lang['gen_hamradio_rsts'] = 'RST (S)'; $lang['gen_hamradio_rstr'] = 'RST (R)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Lokator'; $lang['gen_hamradio_transmit_power'] = 'Effekt (W)'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index b0beb4c07..33f303a78 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -71,7 +71,7 @@ $lang['gen_hamradio_callsign'] = 'Çagrı kodu'; $lang['gen_hamradio_mode'] = 'Mod'; $lang['gen_hamradio_rst_sent'] = 'Gönderilen'; -$lang['gen_hamradio_rst_recv'] = 'Alınan'; +$lang['gen_hamradio_rst_rcvd'] = 'Alınan'; $lang['gen_hamradio_band'] = 'Bant'; $lang['gen_hamradio_band_rx'] = 'Bant (RX)'; $lang['gen_hamradio_frequency'] = 'Frekans'; @@ -80,7 +80,7 @@ $lang['gen_hamradio_rsts'] = 'RST (G)'; $lang['gen_hamradio_rstr'] = 'RST (A)'; $lang['gen_hamradio_exchange_sent_short'] = 'Exch (G)'; -$lang['gen_hamradio_exchange_recv_short'] = 'Exch (A)'; +$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (A)'; $lang['gen_hamradio_qsl'] = 'QSL'; $lang['gen_hamradio_locator'] = 'Konum kodu'; $lang['gen_hamradio_transmit_power'] = 'Yayın Gücü (W)'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 546cbe612..eefd50ed1 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -18,7 +18,7 @@ function create_qso() { // Contest exchange, need to separate between serial and other type of exchange if($this->input->post('exchangetype')) { - $srx_string = $this->input->post('exch_recv') == '' ? null : $this->input->post('exch_recv'); + $srx_string = $this->input->post('exch_rcvd') == '' ? null : $this->input->post('exch_rcvd'); $stx_string = $this->input->post('exch_sent') == '' ? null : $this->input->post('exch_sent'); $srx = $this->input->post('exch_serial_r') == '' ? null : $this->input->post('exch_serial_r'); $stx = $this->input->post('exch_serial_s') == '' ? null : $this->input->post('exch_serial_s'); @@ -93,7 +93,7 @@ function create_qso() { } if($this->input->post('copyexchangetodok')) { - $darc_dok = $this->input->post('exch_recv'); + $darc_dok = $this->input->post('exch_rcvd'); } else { $darc_dok = $this->input->post('darc_dok'); } @@ -104,10 +104,10 @@ function create_qso() { $qsl_sent = 'N'; } - if ($this->input->post('qsl_recv')) { - $qsl_recv = $this->input->post('qsl_recv'); + if ($this->input->post('qsl_rcvd')) { + $qsl_rcvd = $this->input->post('qsl_rcvd'); } else { - $qsl_recv = 'N'; + $qsl_rcvd = 'N'; } if ($qsl_sent == 'N') { @@ -116,7 +116,7 @@ function create_qso() { $qslsdate = date('Y-m-d H:i:s'); } - if ($qsl_recv == 'N') { + if ($qsl_rcvd == 'N') { $qslrdate = null; } else { $qslrdate = date('Y-m-d H:i:s'); @@ -132,7 +132,7 @@ function create_qso() { 'COL_FREQ' => $this->parse_frequency($this->input->post('freq_display')), 'COL_MODE' => $mode, 'COL_SUBMODE' => $submode, - 'COL_RST_RCVD' => $this->input->post('rst_recv'), + 'COL_RST_RCVD' => $this->input->post('rst_rcvd'), 'COL_RST_SENT' => $this->input->post('rst_sent'), 'COL_NAME' => $this->input->post('name'), 'COL_COMMENT' => $this->input->post('comment'), @@ -142,9 +142,9 @@ function create_qso() { 'COL_QSLSDATE' => $qslsdate, 'COL_QSLRDATE' => $qslrdate, 'COL_QSL_SENT' => $qsl_sent, - 'COL_QSL_RCVD' => $qsl_recv, + 'COL_QSL_RCVD' => $qsl_rcvd, 'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'), - 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), + 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'), 'COL_QSL_VIA' => $this->input->post('qsl_via'), 'COL_QSLMSG' => $this->input->post('qslmsg'), 'COL_OPERATOR' => $this->session->userdata('user_callsign'), @@ -606,10 +606,10 @@ function edit() { $qsl_sent = 'N'; } - if ($this->input->post('qsl_recv')) { - $qsl_recv = $this->input->post('qsl_recv'); + if ($this->input->post('qsl_rcvd')) { + $qsl_rcvd = $this->input->post('qsl_rcvd'); } else { - $qsl_recv = 'N'; + $qsl_rcvd = 'N'; } if ($this->input->post('eqsl_sent')) { @@ -618,10 +618,10 @@ function edit() { $eqsl_sent = 'N'; } - if ($this->input->post('eqsl_recv')) { - $eqsl_recv = $this->input->post('eqsl_recv'); + if ($this->input->post('eqsl_rcvd')) { + $eqsl_rcvd = $this->input->post('eqsl_rcvd'); } else { - $eqsl_recv = 'N'; + $eqsl_rcvd = 'N'; } if ($this->input->post('lotw_sent')) { @@ -630,10 +630,10 @@ function edit() { $lotw_sent = 'N'; } - if ($this->input->post('lotw_recv')) { - $lotw_recv = $this->input->post('lotw_recv'); + if ($this->input->post('lotw_rcvd')) { + $lotw_rcvd = $this->input->post('lotw_rcvd'); } else { - $lotw_recv = 'N'; + $lotw_rcvd = 'N'; } if ($qsl_sent == 'N') { @@ -644,9 +644,9 @@ function edit() { $qslsdate = $qso->COL_QSLSDATE; } - if ($qsl_recv == 'N') { + if ($qsl_rcvd == 'N') { $qslrdate = null; - } elseif (!$qso->COL_QSLRDATE || $qso->COL_QSL_RCVD != $qsl_recv) { + } elseif (!$qso->COL_QSLRDATE || $qso->COL_QSL_RCVD != $qsl_rcvd) { $qslrdate = date('Y-m-d H:i:s'); } else { $qslrdate = $qso->COL_QSLRDATE; @@ -660,9 +660,9 @@ function edit() { $eqslsdate = $qso->COL_EQSL_QSLSDATE; } - if ($eqsl_recv == 'N') { + if ($eqsl_rcvd == 'N') { $eqslrdate = null; - } elseif (!$qso->COL_EQSL_QSLRDATE || $qso->COL_EQSL_QSL_RCVD != $eqsl_recv) { + } elseif (!$qso->COL_EQSL_QSLRDATE || $qso->COL_EQSL_QSL_RCVD != $eqsl_rcvd) { $eqslrdate = date('Y-m-d H:i:s'); } else { $eqslrdate = $qso->COL_EQSL_QSLRDATE; @@ -676,9 +676,9 @@ function edit() { $lotwsdate = $qso->COL_LOTW_QSLSDATE; } - if ($lotw_recv == 'N') { + if ($lotw_rcvd == 'N') { $lotwrdate = null; - } elseif (!$qso->COL_LOTW_QSLRDATE || $qso->COL_LOTW_QSL_RCVD != $lotw_recv) { + } elseif (!$qso->COL_LOTW_QSLRDATE || $qso->COL_LOTW_QSL_RCVD != $lotw_rcvd) { $lotwrdate = date('Y-m-d H:i:s'); } else { $lotwrdate = $qso->COL_LOTW_QSLRDATE; @@ -693,7 +693,7 @@ function edit() { 'COL_FREQ' => $this->parse_frequency($this->input->post('freq')), 'COL_MODE' => $mode, 'COL_SUBMODE' => $submode, - 'COL_RST_RCVD' => $this->input->post('rst_recv'), + 'COL_RST_RCVD' => $this->input->post('rst_rcvd'), 'COL_RST_SENT' => $this->input->post('rst_sent'), 'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))), 'COL_VUCC_GRIDS' => strtoupper(trim($this->input->post('vucc_grids'))), @@ -708,18 +708,18 @@ function edit() { 'COL_QSLSDATE' => $qslsdate, 'COL_QSLRDATE' => $qslrdate, 'COL_QSL_SENT' => $qsl_sent, - 'COL_QSL_RCVD' => $qsl_recv, + 'COL_QSL_RCVD' => $qsl_rcvd, 'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'), - 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), + 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'), 'COL_EQSL_QSLSDATE' => $eqslsdate, 'COL_EQSL_QSLRDATE' => $eqslrdate, 'COL_EQSL_QSL_SENT' => $this->input->post('eqsl_sent'), - 'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_recv'), + 'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_rcvd'), 'COL_QSLMSG' => $this->input->post('qslmsg'), 'COL_LOTW_QSLSDATE' => $lotwsdate, 'COL_LOTW_QSLRDATE' => $lotwrdate, 'COL_LOTW_QSL_SENT' => $this->input->post('lotw_sent'), - 'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'), + 'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_rcvd'), 'COL_IOTA' => $this->input->post('iota_ref'), 'COL_SOTA_REF' => $this->input->post('sota_ref'), 'COL_WWFF_REF' => $this->input->post('wwff_ref'), @@ -1743,7 +1743,7 @@ function total_qsl_requested() { } /* Return total number of QSL Cards received */ - function total_qsl_recv() { + function total_qsl_rcvd() { $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -1793,7 +1793,7 @@ function total_eqsl_sent() { } /* Return total number of eQSL Cards received */ - function total_eqsl_recv() { + function total_eqsl_rcvd() { $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -1843,7 +1843,7 @@ function total_lotw_sent() { } /* Return total number of LotW received */ - function total_lotw_recv() { + function total_lotw_rcvd() { $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index 8e7a5a89e..150886f98 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -122,8 +122,8 @@
- - + +
- - + +
@@ -433,7 +433,7 @@
- @@ -446,7 +446,7 @@
- @@ -474,7 +474,7 @@
- @@ -511,7 +511,7 @@
- diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 9cdb213d7..f849b1c3c 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -115,8 +115,8 @@
- - + +
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index b456b99c9..ade2a8e74 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -183,7 +183,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_recv != 0 || $total_qsl_requested != 0)) { ?> + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?> @@ -196,7 +196,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + @@ -206,7 +206,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
lang->line('general_word_qslcards'); ?>
lang->line('general_word_received'); ?>
- config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_recv != 0)) { ?> + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?> @@ -219,12 +219,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - +
lang->line('general_word_eqslcards'); ?>
lang->line('general_word_received'); ?>
- config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_recv != 0)) { ?> + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?> @@ -237,7 +237,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - +
lang->line('general_word_lotw'); ?>
lang->line('general_word_received'); ?>
diff --git a/assets/css/general.css b/assets/css/general.css index d75433f21..ee7e57061 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -115,7 +115,7 @@ thead > tr > td { text-transform: uppercase; } -.card-body #exch_recv { +.card-body #exch_rcvd { text-transform: uppercase; } diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js index 0a0701a65..6f9af9fb6 100644 --- a/assets/js/sections/contesting.js +++ b/assets/js/sections/contesting.js @@ -16,7 +16,7 @@ function reset_contest_session() { $("#exch_serial_s").val("1"); $("#exch_serial_r").val(""); $('#exch_sent').val(""); - $('#exch_recv').val(""); + $('#exch_rcvd').val(""); $("#exch_gridsquare_r").val(""); $("#exch_gridsquare_s").val(""); @@ -80,7 +80,7 @@ $(function () { // We don't want spaces to be written in exchange $(function () { - $('#exch_recv').on('keypress', function (e) { + $('#exch_rcvd').on('keypress', function (e) { if (e.which == 32) { return false; } @@ -96,7 +96,7 @@ document.onkeyup = function (e) { } else if ((e.keyCode == 10 || e.keyCode == 13) && (e.ctrlKey || e.metaKey)) { logQso(); // Enter in sent exchange logs QSO - } else if ((e.which == 13) && ($(document.activeElement).attr("id") == "exch_recv")) { + } else if ((e.which == 13) && ($(document.activeElement).attr("id") == "exch_rcvd")) { logQso(); } else if (e.which == 27) { reset_log_fields(); @@ -105,9 +105,9 @@ document.onkeyup = function (e) { var exchangetype = $("#exchangetype").val(); if (exchangetype == 'Exchange') { if ($(document.activeElement).attr("id") == "callsign") { - $("#exch_recv").focus(); + $("#exch_rcvd").focus(); return false; - } else if ($(document.activeElement).attr("id") == "exch_recv") { + } else if ($(document.activeElement).attr("id") == "exch_rcvd") { $("#callsign").focus(); return false; } @@ -126,9 +126,9 @@ document.onkeyup = function (e) { $("#exch_serial_r").focus(); return false; } else if ($(document.activeElement).attr("id") == "exch_serial_r") { - $("#exch_recv").focus(); + $("#exch_rcvd").focus(); return false; - } else if ($(document.activeElement).attr("id") == "exch_recv") { + } else if ($(document.activeElement).attr("id") == "exch_rcvd") { $("#callsign").focus(); return false; } @@ -222,7 +222,7 @@ function reset_log_fields() { $('.callsign-suggestions').text(""); $('#callsign').val(""); $('#comment').val(""); - $('#exch_recv').val(""); + $('#exch_rcvd').val(""); $('#exch_serial_r').val(""); $('#exch_gridsquare_r').val(""); $("#callsign").focus(); @@ -354,9 +354,9 @@ function logQso() { $("#band").val(), $("#mode").val(), $("#rst_sent").val(), - $("#rst_recv").val(), + $("#rst_rcvd").val(), $("#exch_sent").val(), - $("#exch_recv").val(), + $("#exch_rcvd").val(), $("#exch_serial_s").val(), $("#exch_serial_r").val(), gridsquare, @@ -382,7 +382,7 @@ function logQso() { $('#callsign').val(""); $('#comment').val(""); - $('#exch_recv').val(""); + $('#exch_rcvd').val(""); $('#exch_gridsquare_r').val(""); $('#exch_serial_r').val(""); var exchangetype = $("#exchangetype").val(); @@ -394,7 +394,7 @@ function logQso() { // Store contest session localStorage.setItem("contestid", $("#contestname").val()); localStorage.setItem("exchangetype", $("#exchangetype").val()); - localStorage.setItem("exchangereceived", $("#exch_recv").val()); + localStorage.setItem("exchangereceived", $("#exch_rcvd").val()); localStorage.setItem("exchangesent", $("#exch_sent").val()); localStorage.setItem("serialreceived", $("#exch_serial_r").val()); localStorage.setItem("serialsent", $("#exch_serial_s").val()); @@ -429,7 +429,7 @@ function restoreContestSession() { var exchangereceived = localStorage.getItem("exchangereceived"); if (exchangereceived != null) { - $("#exch_recv").val(exchangereceived); + $("#exch_rcvd").val(exchangereceived); } var exchangesent = localStorage.getItem("exchangesent");