From 5b4aa3658d7563dd45b2c22a29530c88cb78dc14 Mon Sep 17 00:00:00 2001
From: HB9HIL <80885850+HB9HIL@users.noreply.github.com>
Date: Sat, 13 Apr 2024 00:20:39 +0200
Subject: [PATCH 1/9] open github in a new tab

---
 application/views/visitor/layout/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php
index 63b9e74bd..c89e9c6d4 100644
--- a/application/views/visitor/layout/header.php
+++ b/application/views/visitor/layout/header.php
@@ -78,7 +78,7 @@
 		<ul class="navbar-nav ms-auto">
 			<?php if($this->optionslib->get_option('public_github_button') != "false") { ?>  <!--  != false  causes to set it on per default -->
 				<li class="nav-item">
-					<a class="btn btn-secondary" href="https://github.com/wavelog/wavelog">Visit Wavelog on Github</a>
+					<a class="btn btn-secondary" href="https://github.com/wavelog/wavelog" target="_blank">Visit Wavelog on Github</a>
 				</li>
 			<?php } ?>
 			<?php if ($this->uri->segment(1) != "oqrs") { ?>

From 1c9b6b1dcdb8a7577ce1e957dfb88419a447a743 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Sun, 14 Apr 2024 06:03:17 +0000
Subject: [PATCH 2/9] Removed (unnecessary) radio_display_status from
 visitor-slug

---
 application/controllers/Visitor.php | 12 ------------
 application/views/visitor/index.php |  2 --
 2 files changed, 14 deletions(-)

diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index fe87b3f35..a893cee51 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -14,9 +14,6 @@ class Visitor extends CI_Controller {
 		elseif($method == "map") {
             $this->map($method);
         }
-        elseif($method == "radio_display_component") {
-            $this->radio_display_component($method);
-        }
         elseif($method == "satellites") {
             $this->satellites($method);
         }
@@ -81,8 +78,6 @@ class Visitor extends CI_Controller {
 
                 $this->load->model('cat');
 
-                $data['radio_status'] = $this->cat->recent_status();
-
                 // Store info
                 $data['todays_qsos'] = $this->logbook_model->todays_qsos($logbooks_locations_array);
                 $data['total_qsos'] = $this->logbook_model->total_qsos($logbooks_locations_array);
@@ -133,13 +128,6 @@ class Visitor extends CI_Controller {
         }
 	}
 
-	public function radio_display_component() {
-		$this->load->model('cat');
-
-		$data['radio_status'] = $this->cat->recent_status();
-		$this->load->view('components/radio_display_table', $data);
-	}
-
     public function map() {
 		$this->load->model('logbook_model');
 
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index d1679e93c..379d5e938 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -115,8 +115,6 @@ function echo_table_col($row, $name) {
   <div class="col-sm-4">
   	<div class="table-responsive">
 
-	  	<div id="radio_display" hx-get="<?php echo site_url('visitor/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
-
 
     	<table class="table table-striped">
 			<tr class="titles">

From cfee470d1c4879b4e5d5957d2aceefba94010c69 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Sun, 14 Apr 2024 06:09:36 +0000
Subject: [PATCH 3/9] Removed loading of htmx-lib from Visitor-slug as well

---
 application/views/visitor/layout/footer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php
index ced853ac0..3b37372db 100644
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -8,7 +8,6 @@
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/darkmodehelpers.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/easyprint.js"></script>
-<script src="<?php echo base_url(); ?>assets/js/htmx.min.js"></script>
 
 <script type="text/javascript">
   /*

From bb689ae045ad86bfa6a89a08fa27af1bcc1470d2 Mon Sep 17 00:00:00 2001
From: Christoph Kottke <dg0tm@darc.de>
Date: Sat, 13 Apr 2024 12:36:25 +0200
Subject: [PATCH 4/9] [installer] PreCheck Tab fixes

---
 install/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/index.php b/install/index.php
index e9c6aa135..e83069a01 100644
--- a/install/index.php
+++ b/install/index.php
@@ -281,7 +281,7 @@ global $wavelog_url;
 													<?php
 													$maxUploadFileSize = ini_get('upload_max_filesize');
 													$maxUploadFileSizeBytes = (int)($maxUploadFileSize) * (1024 * 1024); // convert to bytes
-													if ($maxUploadFileSizeBytes > ($max_upload_file_size * 1024 * 1024)) { // compare with given value in bytes
+													if ($maxUploadFileSizeBytes >= ($max_upload_file_size * 1024 * 1024)) { // compare with given value in bytes
 													?>
 														<span class="badge text-bg-success"><?php echo $maxUploadFileSize; ?></span>
 													<?php } else {
@@ -300,7 +300,7 @@ global $wavelog_url;
 													<?php
 													$maxUploadFileSize = ini_get('post_max_size');
 													$maxUploadFileSizeBytes = (int)($maxUploadFileSize) * (1024 * 1024); // convert to bytes
-													if ($maxUploadFileSizeBytes > ($post_max_size * 1024 * 1024)) { // compare with given value in bytes
+													if ($maxUploadFileSizeBytes >= ($post_max_size * 1024 * 1024)) { // compare with given value in bytes
 													?>
 														<span class="badge text-bg-success"><?php echo $maxUploadFileSize; ?></span>
 													<?php } else {

From 5beb7f2d146135924f1190772fe2a74081a7fe4e Mon Sep 17 00:00:00 2001
From: Christoph Kottke <dg0tm@darc.de>
Date: Sun, 14 Apr 2024 10:30:53 +0200
Subject: [PATCH 5/9] [installer] Database Tap fixes

---
 install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/index.php b/install/index.php
index e83069a01..8c072371e 100644
--- a/install/index.php
+++ b/install/index.php
@@ -438,7 +438,7 @@ global $wavelog_url;
 											<div class="col">
 												<div class="mb-3">
 													<label for="db_hostname" class="form-label">Hostname or IP<i id="callbook_tooltip" data-bs-toggle="tooltip" data-bs-placement="top" title="Directory Hint" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="Usually 'localhost'. Optional with '...:[port]'. Default Port: 3306"></i></label>
-													<input type="text" id="db_hostname" value="localhost" class="form-control" name="db_hostname" />
+													<input type="text" id="db_hostname" placeholder="localhost" class="form-control" name="db_hostname" />
 												</div>
 											</div>
 											<div class="col">

From 9f97c2df4d3cf8eb5f10e34406ec20c0c2cb9ed1 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Sun, 14 Apr 2024 11:06:26 +0000
Subject: [PATCH 6/9] Fixed Dashboard-CAT

---
 application/views/dashboard/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index b77c53d8f..6d5f501bf 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -191,7 +191,7 @@ function echo_table_col($row, $name) {
   	<div class="table-responsive">
 
 
-		<div id="radio_display" hx-get="<?php echo site_url('visitor/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
+		<div id="radio_display" hx-get="<?php echo site_url('dashboard/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
 		
     	<table class="table table-striped border-top">
 			<tr class="titles">

From 3d0121df173abd207bc110c8aef9388741417026 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 14 Apr 2024 14:09:52 +0200
Subject: [PATCH 7/9] [Exportmap] Defaults if icons are not set in user_options

---
 application/controllers/Visitor.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index a893cee51..57b6cb35d 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -507,12 +507,28 @@ class Visitor extends CI_Controller {
 
 		$this->load->model('user_options_model');
 
-		$result=$this->user_options_model->get_options('map_custom', null, $userid);
-		$jsonout=[];
+		$result = $this->user_options_model->get_options('map_custom', null, $userid);
+		$jsonout = [];
 		foreach($result->result() as $options) {
 			if ($options->option_name=='icon') $jsonout[$options->option_key]=json_decode($options->option_value,true);
 				else $jsonout[$options->option_name.'_'.$options->option_key]=$options->option_value;
 		}
+
+		if (count($jsonout) == 0) {
+			$jsonout['qso'] = array(
+				"icon" => "fas fa-dot-circle",
+				"color" => "#ff0000"
+			);
+			$jsonout['qsoconfirm'] = array(
+				"icon" => "fas fa-dot-circle",
+				"color" => "#00aa00"
+			);
+			$jsonout['station'] = array(
+				"icon" => "fas fa-broadcast-tower",
+				"color" => "#0000ff"
+			);
+		}
+
 		$jsonout['gridsquare_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'gridsquare_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;
 		$jsonout['path_lines'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'path_lines','option_key'=>$slug), $userid)->row()->option_value ?? true;
 		$jsonout['cqzone_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'cqzone_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;

From 367654efab705132d4dbde751909cdfad6e5256e Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 14 Apr 2024 14:54:35 +0200
Subject: [PATCH 8/9] [Exportmap] Added lastqso

---
 application/controllers/Visitor.php  | 14 ++++++--
 application/models/Visitor_model.php | 48 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 application/models/Visitor_model.php

diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index a893cee51..c08e2b407 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -409,6 +409,16 @@ class Visitor extends CI_Controller {
 
 	public function exportmap() {
 		$slug = $this->security->xss_clean($this->uri->segment(3));
+		$lastqso = $this->security->xss_clean($this->uri->segment(4));
+
+		if ($lastqso === "lastqso") {
+			$this->load->model('visitor_model');
+			$result = $this->visitor_model->getlastqsodate($slug)->row();
+			header('Content-Type: application/json');
+			echo json_encode($result->lastqso);
+			return;
+		}
+
         $data['slug'] = $slug;
 
 		$data['page_title'] = "Export Map";
@@ -418,7 +428,7 @@ class Visitor extends CI_Controller {
 	}
 
 	public function mapqsos() {
-		$this->load->model('logbook_model');
+		$this->load->model('visitor_model');
 
 		$this->load->library('qra');
 
@@ -441,7 +451,7 @@ class Visitor extends CI_Controller {
             show_404('Unknown Public Page.');
         }
 
-		$qsos = $this->logbook_model->get_qsos($qsocount, null, $logbooks_locations_array, $band);
+		$qsos = $this->visitor_model->get_qsos($qsocount, $logbooks_locations_array, $band);
 		$userid = $this->stationsetup_model->public_slug_exists_userid($slug);
 		$user_default_confirmation = $this->get_user_default_confirmation($userid);
 
diff --git a/application/models/Visitor_model.php b/application/models/Visitor_model.php
new file mode 100644
index 000000000..6a833a327
--- /dev/null
+++ b/application/models/Visitor_model.php
@@ -0,0 +1,48 @@
+<?php
+
+class Visitor_model extends CI_Model {
+
+	function get_qsos($num, $StationLocationsArray, $band = '') {
+		$this->db->select($this->config->item('table_name').'.*, station_profile.*');
+		$this->db->from($this->config->item('table_name'));
+
+		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+
+		if ($band != '') {
+			if ($band == 'SAT') {
+				$this->db->where($this->config->item('table_name').'.col_prop_mode', 'SAT');
+			} else {
+				$this->db->where($this->config->item('table_name').'.col_prop_mode !="SAT"');
+				$this->db->where($this->config->item('table_name').'.col_band', $band);
+			}
+		}
+
+		$this->db->where_in($this->config->item('table_name').'.station_id', $StationLocationsArray);
+		$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
+
+		$this->db->limit($num);
+
+		return $this->db->get();
+	}
+
+	function getlastqsodate ($slug) {
+		$this->load->model('stationsetup_model');
+        $logbook_id = $this->stationsetup_model->public_slug_exists_logbook_id($slug);
+		$userid = $this->stationsetup_model->public_slug_exists_userid($slug);
+		$band = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'band','option_key'=>$slug), $userid)->row()->option_value ?? '';
+
+		$sql = "select max(col_time_on) lastqso from " . $this->config->item('table_name') .
+		" join station_profile on station_profile.station_id = " . $this->config->item('table_name') . ".station_id where 1 = 1";
+
+		if ($band != '') {
+			if ($band == 'SAT') {
+				$sql .= " and " . $this->config->item('table_name') . ".col_prop_mode = 'SAT'";
+			} else {
+				$sql .= " and " . $this->config->item('table_name') . ".col_prop_mode != 'SAT'";
+				$sql .= " and " . $this->config->item('table_name') . ".col_band = '". $band . "'";
+			}
+		}
+
+		return $this->db->query($sql);
+	}
+}

From 949290d93a22f41ee32bae0716f54ab5c2cb8866 Mon Sep 17 00:00:00 2001
From: "Joerg (DJ7NT)" <int2001@users.noreply.github.com>
Date: Sun, 14 Apr 2024 15:21:56 +0200
Subject: [PATCH 9/9] Return named-object instead of string

---
 application/controllers/Visitor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index c08e2b407..810f631c6 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -415,7 +415,7 @@ class Visitor extends CI_Controller {
 			$this->load->model('visitor_model');
 			$result = $this->visitor_model->getlastqsodate($slug)->row();
 			header('Content-Type: application/json');
-			echo json_encode($result->lastqso);
+			echo json_encode($result);
 			return;
 		}