Merge remote-tracking branch 'upstream/dev' into qslprint_language

application/controllers/Logbook.php

@@ -136,14 +136,18 @@ class Logbook extends CI_Controller {
 
 		$return['dxcc'] = $this->dxcheck($callsign);
 		$split_callsign=explode('/',$callsign);
-		if (isset($split_callsign[1]) && ($split_callsign[1] != "")) {	// Do we have "/" in Call?
+		if (count($split_callsign)==1) {				// case F0ABC --> return cel 0 //
-			if (strlen($split_callsign[1])>3) {			// Last Element longer than 3 chars? Take that as call
+			$lookupcall = $split_callsign[0];
+		} else if (count($split_callsign)==3) {			// case EA/F0ABC/P --> return cel 1 //
+			$lookupcall = $split_callsign[1];
+		} else {										// case F0ABC/P --> return cel 0 OR  case EA/FOABC --> retunr 1  (normaly not exist) //
+			if (in_array(strtoupper($split_callsign[1]), array('P','M','MM','QRP','0','1','2','3','4','5','6','7','8','9'))) {
+				$lookupcall = $split_callsign[0];
+			} else if (strlen($split_callsign[1])>3) {	// Last Element longer than 3 chars? Take that as call
 				$lookupcall = $split_callsign[1];
-			} else {						// Last Element up to 3 Chars? Take first element as Call
+			} else {									// Last Element up to 3 Chars? Take first element as Call
 				$lookupcall = $split_callsign[0];
 			}
-		} else {
-			$lookupcall=$callsign;
 		}
 
 		$return['partial'] = $this->partial($lookupcall);
@@ -257,7 +261,7 @@ class Logbook extends CI_Controller {
 		return false;
 	}
 
-function worked_grid_before($gridsquare, $type, $band, $mode)
+	function worked_grid_before($gridsquare, $type, $band, $mode)
 	{
 		if (strlen($gridsquare) < 4)
 			return false;
@@ -707,7 +711,11 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
 			$this->db->where_in('station_profile.station_id', $logbooks_locations_array);
 			$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
 
-			$this->db->like($this->config->item('table_name').'.COL_CALL', $id);
+			$this->db->where($this->config->item('table_name').'.COL_CALL', $id);
+			$this->db->or_like($this->config->item('table_name').'.COL_CALL', '/'.$id,'before');
+			$this->db->or_like($this->config->item('table_name').'.COL_CALL', $id.'/','after');
+			$this->db->or_like($this->config->item('table_name').'.COL_CALL', '/'.$id.'/');
+
 			$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc");
 			$this->db->limit(5);
 
@@ -985,7 +993,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
 						if($data['callsign']['error'] == "Session does not exist or expired") {
 							$hamqth_session_key = $this->hamqth->session($this->config->item('hamqth_username'), $this->config->item('hamqth_password'));
 							$this->session->set_userdata('hamqth_session_key', $hamqth_session_key);
-							$data['callsign'] = $this->hamqth->search($callsign, $this->session->userdata('hamqth_session_key'));
+							$data['callsign'] = $this->hamqth->search($id, $this->session->userdata('hamqth_session_key'));
 						}
 						if (isset($data['callsign']['gridsquare'])) {
 							$CI = &get_instance();

application/models/User_options_model.php

@@ -25,9 +25,9 @@ class User_options_model extends CI_Model {
 						ON DUPLICATE KEY UPDATE option_value = ?';
 				foreach ($option_array as $option_key => $option_value) {
 					$this->db->query($sql, array($user_id, $option_type, $option_name, $option_key, $option_value, $option_value));
-					return true;
 				}
 			}
+			return true;
 		} else {
 			log_message('error','set_option_at_all_users() failed because users table is empty');
 		}

application/views/awards/sig/index.php

@@ -15,7 +15,7 @@
         <!-- End of Award Info Box -->
 
 <?php if ($sig_types) { ?>
-    <table style="width:100%" class="table-sm table tabledxcc table-bordered table-hover table-striped table-condensed text-center">
+    <table style="width:100%" class="table-sm table table-bordered table-hover table-striped table-condensed text-center">
 
 	<tr>
 		<td>Award Type</td>

application/views/interface_assets/footer.php

@@ -30,7 +30,6 @@
 </script>
 <!-- General JS Files used across Cloudlog -->
 <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-<script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/bootstrap.bundle.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.js"></script>
@@ -1146,7 +1145,7 @@ $(document).on('keypress',function(e) {
 
       if ( ! manual ) {
         $(function($) {
-           resetTimers();
+           resetTimers(0);
         });
       }
     });
@@ -1183,7 +1182,7 @@ $(document).on('keypress',function(e) {
 	  if (e.key === "Escape") { // escape key maps to keycode `27`
 		  reset_fields();
 		  if ( ! manual ) {
-		     resetTimers()
+		     resetTimers(0)
 		  }
 		  $('#callsign').val("");
 		  $("#callsign").focus();

application/views/logbookadvanced/index.php

@@ -10,6 +10,10 @@ if (!isset($options)) {
    $options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"},\"pota\":{\"show\":\"true\"},\"operator\":{\"show\":\"true\"}}";
 }
 echo "var user_options = $options;";
+if (!isset($options->pota)) {
+        echo "\nvar o_template = { pota: {show: 'true'}};";
+        echo "\nuser_options={...user_options, ...o_template}";
+}
 if (!isset($options->operator)) {
 	echo "\nvar o_template = { operator: {show: 'true'}};";
 	echo "\nuser_options={...user_options, ...o_template}";

application/views/qso/edit_ajax.php

@@ -19,7 +19,6 @@
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
 
     <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-    <script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
 </head>

application/views/qso/index.php

@@ -5,7 +5,7 @@
   <div class="col-sm-5">
     <div class="card">
 
-    <form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos" autocomplete="off" onReset="resetTimers();">
+    <form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos" autocomplete="off" onReset="resetTimers(<?php echo $_GET['manual']; ?>);">
 
       <div class="card-header">
         <ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right"  id="myTab" role="tablist">

application/views/visitor/layout/footer.php

@@ -1,6 +1,5 @@
 <!-- General JS Files used across Cloudlog -->
 <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-<script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/bootstrap.bundle.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.js"></script>

assets/css/darkly/overrides.css

@@ -11,7 +11,7 @@
 	--bs-table-hover-color: #fff;
 }
 
-.table > tbody > odd {
+.table > tbody > odd, .tabledxcc > tbody, .tablecq > tbody, #doktable > tbody, .tableiota > tbody, .tablewas > tbody, #qsoList > tbody {
 	--bs-table-accent-bg: #303030;
 }
 

assets/css/general.css

@@ -602,13 +602,6 @@ div#station_logbooks_linked_table_paginate {
 	position: absolute;
 }
 
-table.dataTable thead th,
-table.dataTable thead td,
-table.dataTable tfoot th,
-table.dataTable tfoot td {
-	text-align: center !important;
-}
-
 .red {
 	color: var(--red);
 }

assets/js/sections/qso.js

@@ -522,10 +522,12 @@ function reset_fields() {
 	$('.dxccsummary').remove();
 }
 
-function resetTimers() {
+function resetTimers(manual) {
-	handleStart = setInterval(function() { getUTCTimeStamp($('.input_start_time')); }, 500);
+	if (typeof manual !== 'undefined' && manual != 1) {
-	handleEnd = setInterval(function() { getUTCTimeStamp($('.input_end_time')); }, 500);
+		handleStart = setInterval(function() { getUTCTimeStamp($('.input_start_time')); }, 500);
-	handleDate = setInterval(function() { getUTCDateStamp($('.input_date')); }, 1000);
+		handleEnd = setInterval(function() { getUTCTimeStamp($('.input_end_time')); }, 500);
+		handleDate = setInterval(function() { getUTCDateStamp($('.input_date')); }, 1000);
+	}
 }
 
 $("#callsign").focusout(function() {