Merge pull request #2669 from HB9HIL/simplefle_bug_fixing

SimpleFLE bug fixing

application/language/bulgarian/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/chinese_simplified/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/czech/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/dutch/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/english/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/finnish/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/french/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/german/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Stationsstandort nicht ausgewählt";
 $lang['qso_simplefle_error_operator'] = "'Operator' Feld ist leer";
 $lang['qso_simplefle_warning_reset'] = "Warnung! Willst du wirklich alles zurücksetzen?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO das Band und/oder der Mode fehlt!";
+$lang['qso_simplefle_warning_missing_time'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO die Zeit fehlt!";
 $lang['qso_simplefle_warning_example_data'] = "Achtung! Das Daten Feld enthält Beispiel Daten. Lösche zuerst die QSO Daten!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Bist du dir sicher, dass du diese QSO loggen und die Eingabe zurücksetzen willst?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO geloggt!";

application/language/greek/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/italian/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/polish/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/russian/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/spanish/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/swedish/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/language/turkish/qso_lang.php

@@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!";
 $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";

application/models/Bands.php

@@ -57,7 +57,7 @@ class Bands extends CI_Model {
 		$results = array();
 
 		foreach($result as $band) {
-			$results['b'.strtoupper($band->band)] = array('cw' => $band->cw, 'ssb' => $band->ssb, 'digi' => $band->data);
+			$results['b'.strtoupper($band->band)] = array('CW' => $band->cw, 'SSB' => $band->ssb, 'DIGI' => $band->data);
 		}
 
 		return $results;

application/models/Logbook_model.php

@@ -289,10 +289,10 @@ class Logbook_model extends CI_Model {
     }
 
     // Decide whether its single gridsquare or a multi which makes it vucc_grids
-    if (strpos(trim($this->input->post('locator')), ',') !== false) {
-      $data['COL_VUCC_GRIDS'] = strtoupper(trim($this->input->post('locator')));
+    if (strpos(trim(xss_clean($this->input->post('locator')) ?? ''), ',') !== false) {
+      $data['COL_VUCC_GRIDS'] = strtoupper(trim(xss_clean($this->input->post('locator')) ?? ''));
     } else {
-      $data['COL_GRIDSQUARE'] = strtoupper(trim($this->input->post('locator')));
+      $data['COL_GRIDSQUARE'] = strtoupper(trim(xss_clean($this->input->post('locator')) ?? ''));
     }
 
     // if eQSL username set, default SENT & RCVD to 'N' else leave as null

application/views/simplefle/index.php

@@ -26,6 +26,7 @@
 			var lang_qso_simplefle_error_operator = "<?php echo lang('qso_simplefle_error_operator'); ?>";
 			var lang_qso_simplefle_warning_reset = "<?php echo lang('qso_simplefle_warning_reset'); ?>";
 			var lang_qso_simplefle_warning_missing_band_mode = "<?php echo lang('qso_simplefle_warning_missing_band_mode'); ?>";
+			var lang_qso_simplefle_warning_missing_time = "<?php echo lang('qso_simplefle_warning_missing_time'); ?>";
 			var lang_qso_simplefle_warning_example_data = "<?php echo lang('qso_simplefle_warning_example_data'); ?>";
 			var lang_qso_simplefle_confirm_save_to_log = "<?php echo lang('qso_simplefle_confirm_save_to_log'); ?>";
 			var lang_qso_simplefle_success_save_to_log_header = "<?php echo lang('qso_simplefle_success_save_to_log_header'); ?>";
@@ -72,7 +73,7 @@
 						</div>
 					</div>
 					<div class="col-xs-12 col-lg-12 col-xl-6">
-						<label for="utc-time"><?php echo lang('qso_simplefle_utc_time'); ?></label>
+						<p><?php echo lang('qso_simplefle_utc_time'); ?></p>
 						<h4 class="font-weight-bold" id="utc-time"></h4>
 					</div>
 				</div>

assets/js/sections/simplefle.js

@@ -123,14 +123,14 @@ function handleInput() {
 		var rst_r = null;
 		items = row.startsWith("day ") ? [row] : row.split(" ");
 		var itemNumber = 0;
+		var freq = 0;
 		items.forEach((item) => {
 			if (item === "") {
 				return;
 			}
 			if (item.trim().match(/^day (\+)+$/)) {
 				var plusCount = item.match(/\+/g).length;
-				var originalDate = new Date(extraQsoDate);;
-				console.log(plusCount)
+				var originalDate = new Date(extraQsoDate);
 				originalDate.setDate(originalDate.getDate() + plusCount);
 				extraQsoDate = originalDate.toISOString().split("T")[0];
 			} else if (item.match(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/)) {
@@ -139,7 +139,7 @@ function handleInput() {
 				item.match(/^[0-2][0-9][0-5][0-9]$/)
 			) {
 				qsotime = item;
-			} else if (item.match(/^CW$|^SSB$|^FM$|^AM$|^PSK$|^FT8$/i)) {
+			} else if (item.match(/^CW$|^SSB$|^LSB$|^USB$|^FM$|^AM$|^PSK$|^FT8$/i)) {
 				mode = item.toUpperCase();
 			} else if (
 				item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) ||
@@ -416,15 +416,19 @@ function getBandFromFreq(freq) {
 }
 
 function getFreqFromBand(band, mode) {
-	const settingsMode = getSettingsMode(mode.toUpperCase());
-	const id = "#" + band + settingsMode;
-	if ($(id).length) {
-		return $(id).val();
-	}
+	var settingsMode = getSettingsMode(mode.toUpperCase());
+	var settingsBand = "b" + band.toUpperCase();
+	var bandData = Bands[settingsBand];
+
+	if (bandData) {
+        return bandData[settingsMode] / 1000000;
+    }
+	
+
 }
 
 function getSettingsMode(mode) {
-	if (mode === "AM" || mode === "FM" || mode === "SSB") {
+	if (mode === "AM" || mode === "FM" || mode === "SSB" || mode === "LSB" || mode === "USB") {
 		return "SSB";
 	}
 
@@ -484,6 +488,17 @@ function isBandModeEntered() {
 	return isBandModeOK;
 }
 
+function isTimeEntered() {
+	let isTimeOK = true;
+	qsoList.forEach((item) => {
+		if (item[1] === "") {
+			isTimeOK = false;
+		}
+	});
+
+	return isTimeOK;
+}
+
 function isExampleDataEntered() {
 	let isExampleData = false;
 	if (textarea.value.startsWith("*example-data*")) {
@@ -623,6 +638,17 @@ $(".js-save-to-log").click(function () {
 		});
 		return false;
 	}
+	if (false === isTimeEntered()) {
+		BootstrapDialog.alert({
+			title: lang_general_word_warning,
+			message: lang_qso_simplefle_warning_missing_time,
+			type: BootstrapDialog.TYPE_DANGER,
+			btnCancelLabel: lang_general_word_cancel,
+			btnOKLabel: lang_general_word_ok,
+			btnOKClass: "btn-warning",
+		});
+		return false;
+	}
 	if (true === isExampleDataEntered()) {
 		BootstrapDialog.alert({
 			title: lang_general_word_warning,
@@ -660,7 +686,7 @@ $(".js-save-to-log").click(function () {
 						var rst_rcvd = item[7];
 						var rst_sent = item[6];
 						var start_date = item[0];
-						var start_time = item[1][0] +item[1][1] + ":" + item[1][2] + item[1][3];
+						var start_time = item[1][0] + item[1][1] + ":" + item[1][2] + item[1][3];
 						var band = item[4];
 						var mode = item[5];
 						var freq_display = item[3] * 1000000;