Version 2.4.8

README.md

@@ -46,6 +46,6 @@ Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K
 
 Cloudlog is supported by Patreon and donations via PayPal, thanks to the following people:
 
-Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic, Tom (M0LTE), smurphboy, Lars (SM0TGU), Theo (PD9DP), Stefan (SM0RGM). Peter (G0ABI), Lou (KI5FTY), Michael (DG3NAB), Dragan (4O4A), minorsecond, Emily (W7AYQ), Steve (M0SKM), Rob (M0VFC), Doug (WA6L).
+Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic, Tom (M0LTE), smurphboy, Lars (SM0TGU), Theo (PD9DP), Stefan (SM0RGM). Peter (G0ABI), Lou (KI5FTY), Michael (DG3NAB), Dragan (4O4A), minorsecond, Emily (W7AYQ), Steve (M0SKM), Rob (M0VFC), Doug (WA6L), Petr (OK1PKR), Fabian (HB9HI).
 
 If you'd like to donate to Cloudlog to help allow @magicbug spend less time doing commercial work and more time coding Cloudlog then you can donate via [PayPal](https://paypal.me/PGoodhall), [Github Sponsor](https://github.com/sponsors/magicbug) or become a [Patreon](https://www.patreon.com/2m0sql) 

application/config/migration.php

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

application/controllers/Eqsl.php

@@ -277,13 +277,13 @@ function generateResultTable($custom_date_format, $rows) {
 		return $table;
 	}
 
-	// Build out the ADIF info string according to specs http://eqsl.cc/qslcard/ADIFContentSpecs.cfm
+	// Build out the ADIF info string according to specs https://eqsl.cc/qslcard/ADIFContentSpecs.cfm
 	function generateAdif($qsl, $data) {
 		$COL_QSO_DATE = date('Ymd',strtotime($qsl['COL_TIME_ON']));
 		$COL_TIME_ON = date('Hi',strtotime($qsl['COL_TIME_ON']));
 
 		# Set up the single record file
-		$adif = "http://www.eqsl.cc/qslcard/importADIF.cfm?";
+		$adif = "https://www.eqsl.cc/qslcard/importADIF.cfm?";
 		$adif .= "ADIFData=CloudlogUpload%20";
 
 		/* Handy reference of escaping chars

application/controllers/Logbook.php

@@ -235,7 +235,8 @@ function jsonlookupgrid($gridsquare, $type, $band, $mode) {
 		if($type == "SAT") {
 			$this->db->where('COL_PROP_MODE', 'SAT');
 		} else {
-			$this->db->where('COL_MODE', $this->logbook_model->get_main_mode_from_mode($mode));
+			$CI->load->model('logbook_model');
+			$this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode));
 			$this->db->where('COL_BAND', $band);
 			$this->db->where('COL_PROP_MODE !=','SAT');
 

application/controllers/Logbookadvanced.php

@@ -233,4 +233,175 @@ public function qslSlideshow() {
         $data['qslimages'] = $this->logbookadvanced_model->getQslsForQsoIds($cleanids);
         $this->load->view('logbookadvanced/qslcarousel', $data);
 	}
+
+	public function mapSelectedQsos() {
+		$this->load->model('logbookadvanced_model');
+
+		$searchCriteria = array(
+			'user_id' => (int)$this->session->userdata('user_id'),
+			'dateFrom' => '',
+			'dateTo' => '',
+			'de' => '',
+			'dx' => '',
+			'mode' => '',
+			'band' => '',
+			'qslSent' => '',
+			'qslReceived' => '',
+			'iota' => '',
+			'dxcc' => '',
+			'propmode' => '',
+			'gridsquare' => '',
+			'state' => '',
+			'cqzone' => '',
+			'qsoresults' => count($this->input->post('ids')),
+			'sats' => '',
+			'lotwSent' => '',
+			'lotwReceived' => '',
+			'eqslSent' => '',
+			'eqslReceived' => '',
+			'qslvia' => '',
+			'sota' => '',
+			'pota' => '',
+			'wwff' => '',
+			'qslimages' => '',
+			'ids' => xss_clean($this->input->post('ids'))
+		);
+
+		$result = $this->logbookadvanced_model->searchDb($searchCriteria);
+		$this->prepareMappedQSos($result);
+	}
+
+	public function mapQsos() {
+        $this->load->model('logbookadvanced_model');
+
+		$searchCriteria = array(
+			'user_id' => (int)$this->session->userdata('user_id'),
+			'dateFrom' => xss_clean($this->input->post('dateFrom')),
+			'dateTo' => xss_clean($this->input->post('dateTo')),
+			'de' => xss_clean($this->input->post('de')),
+			'dx' => xss_clean($this->input->post('dx')),
+			'mode' => xss_clean($this->input->post('mode')),
+			'band' => xss_clean($this->input->post('band')),
+			'qslSent' => xss_clean($this->input->post('qslSent')),
+			'qslReceived' => xss_clean($this->input->post('qslReceived')),
+			'iota' => xss_clean($this->input->post('iota')),
+			'dxcc' => xss_clean($this->input->post('dxcc')),
+			'propmode' => xss_clean($this->input->post('propmode')),
+			'gridsquare' => xss_clean($this->input->post('gridsquare')),
+			'state' => xss_clean($this->input->post('state')),
+			'cqzone' => xss_clean($this->input->post('cqzone')),
+			'qsoresults' => xss_clean($this->input->post('qsoresults')),
+			'sats' => xss_clean($this->input->post('sats')),
+			'lotwSent' => xss_clean($this->input->post('lotwSent')),
+			'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
+			'eqslSent' => xss_clean($this->input->post('eqslSent')),
+			'eqslReceived' => xss_clean($this->input->post('eqslReceived')),
+			'qslvia' => xss_clean($this->input->post('qslvia')),
+			'sota' => xss_clean($this->input->post('sota')),
+			'pota' => xss_clean($this->input->post('pota')),
+			'wwff' => xss_clean($this->input->post('wwff')),
+			'qslimages' => xss_clean($this->input->post('qslimages')),
+		);
+
+		$result = $this->logbookadvanced_model->searchDb($searchCriteria);
+		$this->prepareMappedQSos($result);
+	}
+
+	public function prepareMappedQSos($qsos) {
+		if ($this->session->userdata('user_measurement_base') == NULL) {
+			$measurement_base = $this->config->item('measurement_base');
+		}
+		else {
+			$measurement_base = $this->session->userdata('user_measurement_base');
+		}
+
+		$CI =& get_instance();
+		// Get Date format
+		if($CI->session->userdata('user_date_format')) {
+			// If Logged in and session exists
+			$custom_date_format = $CI->session->userdata('user_date_format');
+		} else {
+			// Get Default date format from /config/cloudlog.php
+			$custom_date_format = $CI->config->item('qso_date_format');
+		}
+
+		switch ($measurement_base) {
+			case 'M':
+				$var_dist = " miles";
+				break;
+			case 'N':
+				$var_dist = " nautic miles";
+				break;
+			case 'K':
+				$var_dist = " kilometers";
+				break;
+		}
+
+		$mappedcoordinates = array();
+		foreach ($qsos as $qso) {
+			if (!empty($qso['COL_MY_GRIDSQUARE']) || !empty($qso['COL_MY_VUCC_GRIDS'])) {
+				if (!empty($qso['COL_GRIDSQUARE'])  || !empty($qso['COL_VUCC_GRIDS'])) {
+					$mappedcoordinates[] = $this->calculate($qso, ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], ($qso['COL_GRIDSQUARE'] ?? '') == '' ? $qso['COL_VUCC_GRIDS'] : $qso['COL_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format);
+				} else {
+					if (!empty($qso['lat'])  || !empty($qso['long'])) {
+						$mappedcoordinates[] = $this->calculateCoordinates($qso, $qso['lat'], $qso['long'], ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format);
+					}
+				}
+			}
+		}
+
+		header("Content-Type: application/json");
+		print json_encode($mappedcoordinates);
+	}
+
+	public function calculate($qso, $locator1, $locator2, $measurement_base, $var_dist, $custom_date_format) {
+		$this->load->library('Qra');
+
+		$data['distance'] = $this->qra->distance($locator1, $locator2, $measurement_base) . $var_dist;
+		$data['bearing'] = $this->qra->get_bearing($locator1, $locator2) . "º";
+		$latlng1 = $this->qra->qra2latlong($locator1);
+		$latlng2 = $this->qra->qra2latlong($locator2);
+		$latlng1[0] = number_format((float)$latlng1[0], 3, '.', '');;
+		$latlng1[1] = number_format((float)$latlng1[1], 3, '.', '');;
+		$latlng2[0] = number_format((float)$latlng2[0], 3, '.', '');;
+		$latlng2[1] = number_format((float)$latlng2[1], 3, '.', '');;
+
+		$data['latlng1'] = $latlng1;
+		$data['latlng2'] = $latlng2;
+
+		$data['callsign'] = $qso['COL_CALL'];
+		$data['band'] = $qso['COL_BAND'];
+		$data['mode'] = $qso['COL_MODE'];
+		$data['gridsquare'] = $locator2;
+		$data['mygridsquare'] = $locator1;
+		$data['mycallsign'] = $qso['station_callsign'];
+		$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
+		$data['satname'] = $qso['COL_SAT_NAME'];
+
+		return $data;
+	}
+
+	public function calculateCoordinates($qso, $lat, $long, $mygrid, $measurement_base, $var_dist, $custom_date_format) {
+		$this->load->library('Qra');
+
+		$latlng1 = $this->qra->qra2latlong($mygrid);
+		$latlng2[0] = $lat;
+		$latlng2[1] = $long;
+		$latlng1[0] = number_format((float)$latlng1[0], 3, '.', '');;
+		$latlng1[1] = number_format((float)$latlng1[1], 3, '.', '');;
+		$latlng2[0] = number_format((float)$latlng2[0], 3, '.', '');;
+		$latlng2[1] = number_format((float)$latlng2[1], 3, '.', '');;
+
+		$data['latlng1'] = $latlng1;
+		$data['latlng2'] = $latlng2;
+		$data['callsign'] = $qso['COL_CALL'];
+		$data['band'] = $qso['COL_BAND'];
+		$data['mode'] = $qso['COL_MODE'];
+		$data['mygridsquare'] = $mygrid;
+		$data['mycallsign'] = $qso['station_callsign'];
+		$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
+		$data['satname'] = $qso['COL_SAT_NAME'];
+
+		return $data;
+	}
 }

application/controllers/Logbooks.php

@@ -132,7 +132,7 @@ public function publicslug_validate() {
 	public function save_publicsearch() {
 		$this->load->model('logbooks_model');
 			$returndata = $this->logbooks_model->save_public_search($this->input->post('public_search'), $this->input->post('logbook_id'));
-			echo "<div class=\"alert alert-success\" role=\"alert\">Public Search Setttings Saved</div>";
+			echo "<div class=\"alert alert-success\" role=\"alert\">Public Search Settings Saved</div>";
 	}
 
 	public function save_publicslug() {

application/controllers/Qslprint.php

@@ -114,8 +114,8 @@ public function exportcsv()
 		foreach ($myData->result() as $qso) {
 			fputcsv($file,
 				array($qso->STATION_CALLSIGN,
-				str_replace("0", "Ø", $qso->COL_CALL),
-				$qso->COL_QSL_VIA!=""?"Via ".str_replace("0", "Ø", $qso->COL_QSL_VIA):"",
+				$qso->COL_CALL,
+				$qso->COL_QSL_VIA!=""?"via ".$qso->COL_QSL_VIA:"",
 				$qso->COL_TIME_ON,
 				$qso->COL_MODE,
 				$qso->COL_FREQ,

application/controllers/Qso.php

@@ -78,6 +78,7 @@ public function index()
 				'prop_mode' => $this->input->post('prop_mode'),
 				'radio' => $this->input->post('radio'),
 				'station_profile_id' => $this->input->post('station_profile'),
+				'operator_callsign' => $this->input->post('operator_callsign'),
 				'transmit_power' => $this->input->post('transmit_power')
 			);
 			// ];

application/controllers/User_options.php

@@ -0,0 +1,52 @@
+<?php
+
+class User_Options extends CI_Controller {
+
+	function __construct() {
+		parent::__construct();
+		$this->load->model('user_model');
+		$this->load->model('user_options_model');
+		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
+	}
+
+	public function add_edit_fav() {
+		$obj = json_decode(file_get_contents("php://input"), true);
+		foreach($obj as $option_key => $option_value) {
+			$obj[$option_key]=$this->security->xss_clean($option_value);
+		}
+		if ($obj['sat_name'] ?? '' != '') {
+			$option_name=$obj['sat_name'].'/'.$obj['mode'];
+		} else {
+			$option_name=$obj['band'].'/'.$obj['mode'];
+		}
+		$this->user_options_model->set_option('Favourite',$option_name, $obj);
+		$jsonout['success']=1;
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function get_fav() {
+		$result=$this->user_options_model->get_options('Favourite');
+		$jsonout=[];
+		foreach($result->result() as $options) {
+			$jsonout[$options->option_name][$options->option_key]=$options->option_value;
+		}
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function del_fav() {
+		$result=$this->user_options_model->get_options('Favourite');
+		$obj = json_decode(file_get_contents("php://input"), true);
+		if ($obj['option_name'] ?? '' != '') {
+			$option_name=$this->security->xss_clean($obj['option_name']);
+			$this->user_options_model->del_option('Favourite',$option_name);	
+		}
+		$jsonout['success']=1;
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+}
+
+
+?>

application/language/czech/account_lang.php

@@ -35,10 +35,10 @@
 $lang['account_date_format'] = 'Formát data';
 $lang['account_measurement_preferences'] = 'Nastavení měření';
 $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Vyberte, jak chcete, aby byla data zobrazena při přihlášení do vašeho účtu.';
-$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.'
+$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.';
 
 $lang['account_main_menu'] = 'Hlavní menu';
-$lang['account_show_notes_in_the_main_menu'] = 'Zobrazovat poznámky v hlavním menu.'
+$lang['account_show_notes_in_the_main_menu'] = 'Zobrazovat poznámky v hlavním menu.';
 
 $lang['account_main_menu'] = 'Hlavní menu';
 $lang['account_show_notes_in_the_main_menu'] = 'Zobrazovat poznámky v hlavním menu.';
@@ -48,14 +48,14 @@
 $lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'Automatické vyhledávání lokátoru a jména pro SOTA vrchol.';
 $lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'Automatické vyhledávání lokátoru a jména pro WWFF referenci.';
 $lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'Automatické vyhledávání lokátoru a jména pro POTA park.';
-$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Pokud je nastaveno, jméno a lokátor jsou získány z API a vyplněny do umístění a lokátoru.'
+$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Pokud je nastaveno, jméno a lokátor jsou získány z API a vyplněny do umístění a lokátoru.';
 
 $lang['account_previous_qsl_type'] = 'Předchozí typ QSL';
 $lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Vyberte typ QSL k zobrazení v sekci předchozích QSOs.';
 
 $lang['account_qrzcom_hamqthcom_images'] = 'Obrázky qrz.com/hamqth.com';
 $lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Zobrazit profilový obrázek partnera z QSO záznamu z profilu qrz.com/hamqth.com v sekci protokolu QSO.';
-$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Prosím, nastavte své přihlašovací údaje pro qrz.com/hamqth.com v obecném konfiguračním souboru.'
+$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Prosím, nastavte své přihlašovací údaje pro qrz.com/hamqth.com v obecném konfiguračním souboru.';
 
 $lang['account_amsat_status_upload'] = 'Nahrávání stavu AMSAT';
 $lang['account_upload_status_of_sat_qsos_to'] = 'Nahrávání stavu SAT QSOs na';

application/language/english/lotw_lang.php

@@ -58,4 +58,5 @@
 $lang['lotw_cert_expired'] = 'At least one of your LoTW certificates is expired!';
 
 // Lotw User
-$lang['lotw_user'] = 'This station uses LoTW. The last upload was';
+$lang['lotw_user'] = 'This station uses LoTW.';
+$lang['lotw_last_upload'] = 'Last upload';

application/language/english/qso_lang.php

@@ -32,3 +32,5 @@
 // QSO Details
 
 $lang['qso_details'] = 'QSO Details';
+$lang['fav_add'] = 'Add Band/Mode to Favs';
+$lang['qso_operator_callsign'] = 'Operator Callsign';

application/language/german/lotw_lang.php

@@ -58,4 +58,5 @@
 $lang['lotw_cert_expired'] = 'Mindestens eines deiner LoTW-Zertifikate ist abgelaufen!';
 
 // Lotw User
-$lang['lotw_user'] = 'Diese Station nutzt LoTW. Der letzte Upload war am';
+$lang['lotw_user'] = 'Diese Station nutzt LoTW.';
+$lang['lotw_last_upload'] = 'Letzter Upload';

application/language/german/qso_lang.php

@@ -32,3 +32,6 @@
 // QSO Details
 
 $lang['qso_details'] = 'QSO Details';
+
+$lang['fav_add'] = 'Band/Mode zu Favoriten hinzufügen';
+$lang['qso_operator_callsign']='Operator Rufzeichen';

application/libraries/EqslImporter.php

@@ -111,7 +111,7 @@ public function fetch($password) {
 							foreach ($matches[2] as $match) {
 								// Look for the link that has the .adi file, and download it to $file
 								if (substr($match, -4, 4) == ".adi") {
-									file_put_contents($this->adif_file, file_get_contents("http://eqsl.cc/qslcard/" . $match));
+									file_put_contents($this->adif_file, file_get_contents("https://eqsl.cc/qslcard/" . $match));
 									return $this->import();
 								}
 							}