2.6.14

Author: magicbug

application/config/migration.php

@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 184;
+$config['migration_version'] = 185;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Api.php

@@ -193,8 +193,13 @@ function qso() {
 		// Decode JSON and store
 		$obj = json_decode(file_get_contents("php://input"), true);
 		if ($obj === NULL) {
-		    echo json_encode(['status' => 'failed', 'reason' => "wrong JSON"]);
-		    die();
+			// Decoding not valid try simple www-x-form-urlencoded
+		    $objTmp = file_get_contents("php://input");
+		    parse_str($objTmp, $obj);
+		    if ($obj === NULL) {
+		        echo json_encode(['status' => 'failed', 'reason' => "wrong JSON"]);
+		        die();
+		    }
 		}
 
 		if(!isset($obj['key']) || $this->api_model->authorize($obj['key']) == 0) {

application/controllers/Dashboard.php

@@ -188,6 +188,23 @@ public function index()
 		}
 	}
 
+	public function todays_qso_component() {
+		$this->load->model('user_model');
+
+		if ($this->user_model->validate_session() == 0) {
+			// User is not logged in
+		} else {
+			$this->load->model('logbook_model');
+			$this->load->model('logbooks_model');
+		}
+
+		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+
+		$data['todays_qsos'] = $this->logbook_model->todays_qsos($logbooks_locations_array);
+		$this->load->view('components/dashboard_todays_qsos', $data);
+	
+	}
+
 	public function logbook_display_component() {
 		$this->load->model('user_model');
 

application/controllers/Debug.php

@@ -64,4 +64,15 @@ private function is_really_writable($folder)
 
         return false;
     }
+  
+    public function flags() {
+
+        // load library called DxccFlag
+        $this->load->library('DxccFlag');
+
+        // Call getISO function from DxccFlag library
+        $data['flags'] = $this->dxccflag->getISO('33');
+
+        print_r($data['flags']);
+    }	
 }

application/controllers/Logbook.php

@@ -609,7 +609,7 @@ function view($id) {
 		$this->load->model('logbook_model');
 		$data['query'] = $this->logbook_model->get_qso($id);
 		$data['dxccFlag'] = $this->dxccflag->get($data['query']->result()[0]->COL_DXCC);
-
+		
         if ($this->session->userdata('user_measurement_base') == NULL) {
             $data['measurement_base'] = $this->config->item('measurement_base');
         }
@@ -896,7 +896,7 @@ function partial($id) {
 
 	function search_result($id="", $id2="") {
 		$this->load->model('user_model');
-
+		
 		if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
 
 		$fixedid = $id;
@@ -926,6 +926,7 @@ function search_result($id="", $id2="") {
 				if ($iota_search->num_rows() > 0)
 				{
 					$data['results'] = $iota_search;
+
 					$this->load->view('view_log/partial/log_ajax.php', $data);
 				} else {
 					if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null) {
@@ -988,13 +989,14 @@ function search_result($id="", $id2="") {
 						$data['callsign'] = $this->hamli->callsign($id);
 					}*/
 
-					$data['id'] = strtoupper($id);
+					$data['id'] = strtoupper($id);					
 
 					$this->load->view('search/result', $data);
 				}
 			}
 		} else {
 			$data['results'] = $query;
+			
 			$this->load->view('view_log/partial/log_ajax.php', $data);
 		}
 	}

application/language/bulgarian/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Дата/Час';
 $lang['general_word_none'] = 'Нито едно';
 $lang['general_word_name'] = 'Име';
+$lang['general_word_flag'] = 'знаме';
 $lang['general_word_location'] = 'Местоположение';
 $lang['general_word_comment'] = 'Коментар';
 $lang['general_word_general'] = 'Общи';

application/language/chinese_simplified/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = '日期/时间';
 $lang['general_word_none'] = '无';
 $lang['general_word_name'] = '名称';
+$lang['general_word_flag'] = '旗帜';
 $lang['general_word_location'] = '位置';
 $lang['general_word_comment'] = '备注';
 $lang['general_word_general'] = '通用';

application/language/czech/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Datum/čas';
 $lang['general_word_none'] = 'Žádné';
 $lang['general_word_name'] = 'Jméno';
+$lang['general_word_flag'] = 'Vlajka';
 $lang['general_word_location'] = 'Místo';
 $lang['general_word_comment'] = 'Komentář';
 $lang['general_word_general'] = 'Obecné';

application/language/dutch/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Date/Time';
 $lang['general_word_none'] = 'Geen';
 $lang['general_word_name'] = 'Naam';
+$lang['general_word_flag'] = 'Flag';
 $lang['general_word_location'] = 'Locatie';
 $lang['general_word_comment'] = 'Opmerking';
 $lang['general_word_general'] = 'Algemeen';

application/language/english/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Date/Time';
 $lang['general_word_none'] = 'None';
 $lang['general_word_name'] = 'Name';
+$lang['general_word_flag'] = 'Flag';
 $lang['general_word_location'] = 'Location';
 $lang['general_word_comment'] = 'Comment';
 $lang['general_word_general'] = 'General';

application/language/finnish/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Päivä/Aika';
 $lang['general_word_none'] = 'None';
 $lang['general_word_name'] = 'Nimi';
+$lang['general_word_flag'] = 'Lippu';
 $lang['general_word_location'] = 'Sijainti';
 $lang['general_word_comment'] = 'Kommentti';
 $lang['general_word_general'] = 'Yleinen';

application/language/french/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = "Date/Heure";
 $lang['general_word_none'] = "Aucun";
 $lang['general_word_name'] = "Nom";
+$lang['general_word_flag'] = "Drapeau";
 $lang['general_word_location'] = "Lieu";
 $lang['general_word_comment'] = "Commentaire";
 $lang['general_word_general'] = "Général";

application/language/german/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Datum/Uhrzeit';
 $lang['general_word_none'] = 'Nichts/Keine';
 $lang['general_word_name'] = 'Name';
+$lang['general_word_flag'] = 'Flagge';
 $lang['general_word_location'] = 'Standort';
 $lang['general_word_comment'] = 'Kommentar';
 $lang['general_word_general'] = 'Allgemeines';

application/language/greek/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Ημερομηνία/Ωρα';
 $lang['general_word_none'] = 'None';
 $lang['general_word_name'] = 'όνομα';
+$lang['general_word_flag'] = 'Σημαία';
 $lang['general_word_location'] = 'Τοποθεσία';
 $lang['general_word_comment'] = 'Σχόλιο';
 $lang['general_word_general'] = 'Γενικα';

application/language/italian/awards_lang.php

@@ -2,7 +2,7 @@
 
 defined('BASEPATH') OR exit('Non è consentito l\'accesso diretto allo script');
 
-$lang['awards_info_button'] = "Informazioni sull'Award'";
+$lang['awards_info_button'] = "Informazioni sull'Award";
 $lang['awards_show_worked'] = "Mostra lavorati";
 $lang['awards_show_confirmed'] = "Mostra confermati";
 $lang['awards_show_not_worked'] = "Mostra non lavorati";

application/language/italian/general_words_lang.php

@@ -27,15 +27,16 @@
 $lang['general_word_icon'] = "Icona";
 $lang['general_word_never'] = "Mai";
 
-$lang['general_word_date'] = 'Dati';
+$lang['general_word_date'] = 'Data';
 $lang['general_word_startdate'] = "Data di inizio";
 $lang['general_word_enddate'] = "Data di fine";
 $lang['general_word_time'] = 'Orario';
 $lang['general_word_time_on'] = 'Tempo attivo';
 $lang['general_word_time_off'] = 'Tempo libero';
-$lang['general_word_datetime'] = 'Dati/Orario';
+$lang['general_word_datetime'] = 'Data/Orario';
 $lang['general_word_none'] = 'Nessuno';
 $lang['general_word_name'] = 'Nome';
+$lang['general_word_flag'] = 'Bandiera';
 $lang['general_word_location'] = 'Luogo';
 $lang['general_word_comment'] = 'Commento';
 $lang['general_word_general'] = 'Generale';
@@ -89,7 +90,7 @@
 $lang['general_word_lotw_short'] = 'LoTW';
 
 $lang['general_word_details'] = 'Dettagli';
-$lang['general_word_qso_data'] = 'Dati del QSO';
+$lang['general_word_qso_data'] = 'Data del QSO';
 
 $lang['general_edit_qso'] = 'Modifica QSO';
 $lang['general_mark_qsl_rx_bureau'] = 'Segna QSL Ricevuta (Bureau)';
@@ -140,7 +141,7 @@
 $lang['gen_hamradio_radio'] = 'Radio';
 $lang['gen_hamradio_rsts'] = 'RST (I)';
 $lang['gen_hamradio_rstr'] = 'RST (R)';
-$lang['gen_hamradio_refs'] = 'Refs';
+$lang['gen_hamradio_refs'] = 'Griglia';
 $lang['gen_hamradio_myrefs'] = 'Miei Riferimenti';
 $lang['gen_hamradio_exchange_sent_short'] = 'Scambio (I)';
 $lang['gen_hamradio_exchange_rcvd_short'] = 'Scambio (R)';

application/language/italian/options_lang.php

@@ -115,7 +115,7 @@
 $lang['options_bands_deactivateall_warning'] = "Attenzione! Sei sicuro di voler disattivare tutte le bande?";
 $lang['options_bands_ssb_qrg'] = "SSB QRG";
 $lang['options_bands_ssb_qrg_hint'] = "Frequenza per SSB QRG in banda (deve essere in Hz)";
-$lang['options_bands_data_qrg'] = "DATI QRG";
+$lang['options_bands_data_qrg'] = "DATA QRG";
 $lang['options_bands_data_qrg_hint'] = "Frequenza per DATA QRG in banda (deve essere in Hz)";
 $lang['options_bands_cw_qrg'] = "CW QRG";
 $lang['options_bands_cw_qrg_hint'] = "Frequenza per CW QRG in banda (deve essere in Hz)";

application/language/italian/qso_lang.php

@@ -63,7 +63,7 @@
 $lang['qso_simplefle_station_call_location'] = "Chiamata/Luogo della stazione";
 $lang['qso_simplefle_station_call_location_hint'] = "Se operi da una nuovo Luogo, crea prima un nuovo <a href=". site_url('station') . ">Luoghi delle stazioni</a>";
 $lang['qso_simplefle_utc_time'] = "Ora UTC attuale";
-$lang['qso_simplefle_enter_the_data'] = "Inserisci i dati";
+$lang['qso_simplefle_enter_the_data'] = "Inserisci la data";
 $lang['qso_simplefle_syntax_help_close_w_sample'] = "Chiudi e carica dati di esempio";
 $lang['qso_simplefle_reload'] = "Ricarica la lista dei QSO";
 $lang['qso_simplefle_save'] = "Salva in Cloudlog";

application/language/polish/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Data/Godzina';
 $lang['general_word_none'] = 'Nic';
 $lang['general_word_name'] = 'Imie';
+$lang['general_word_flag'] = 'Flaga';
 $lang['general_word_location'] = 'Lokalizacja';
 $lang['general_word_comment'] = 'Komentarz';
 $lang['general_word_general'] = 'Główne';

application/language/russian/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Дата/Время';
 $lang['general_word_none'] = '-';
 $lang['general_word_name'] = 'Имя';
+$lang['general_word_flag'] = 'Флаг';
 $lang['general_word_location'] = 'QTH';
 $lang['general_word_comment'] = 'Комментарий';
 $lang['general_word_general'] = 'Общее';

application/language/spanish/general_words_lang.php

@@ -37,6 +37,7 @@
 $lang['general_word_datetime'] = 'Fecha/Hora';
 $lang['general_word_none'] = 'Ninguno';
 $lang['general_word_name'] = 'Nombre';
+$lang['general_word_flag'] = 'Bandera';
 $lang['general_word_location'] = 'Localización';
 $lang['general_word_comment'] = 'Comentario';
 $lang['general_word_general'] = 'General';

application/language/swedish/general_words_lang.php

@@ -38,6 +38,7 @@
 $lang['general_word_datetime'] = 'Datum/Tid';
 $lang['general_word_none'] = 'Ingen';
 $lang['general_word_name'] = 'Namn';
+$lang['general_word_flag'] = 'Flagga';
 $lang['general_word_location'] = 'QTH';
 $lang['general_word_comment'] = 'Notering';
 $lang['general_word_general'] = 'Allmänt';

application/language/turkish/general_words_lang.php

@@ -36,6 +36,7 @@
 $lang['general_word_datetime'] = 'Tarih/Saat';
 $lang['general_word_none'] = 'Hiçbiri';
 $lang['general_word_name'] = 'İsim';
+$lang['general_word_flag'] = 'Bayrak';
 $lang['general_word_location'] = 'Konum';
 $lang['general_word_comment'] = 'Yorum';
 $lang['general_word_general'] = 'Genel';