Add Config Toggle to Show Confirmations in Visitor Map

application/config/migration.php

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

application/controllers/Options.php

@@ -531,4 +531,41 @@ function public_diary_save() {
 		}
 	}
 
+	// Display the /public_map_show_confirmations options page
+	function public_map_show_confirmations() {
+
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_public_map_show_confirmations');
+
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('options/public_map_show_confirmations');
+		$this->load->view('interface_assets/footer');
+	}
+
+	// Save the public map confirmations option
+	function public_map_show_confirmations_save() {
+
+		$data['page_title'] = $this->lang->line('options_cloudlog_options');
+		$data['sub_heading'] = $this->lang->line('options_public_map_show_confirmations');
+
+		$this->load->helper(array('form', 'url'));
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('public_map_show_confirmations', 'Public Map Confirmations', 'required');
+
+		if ($this->form_validation->run() == FALSE) {
+			$this->load->view('interface_assets/header', $data);
+			$this->load->view('options/public_map_show_confirmations');
+			$this->load->view('interface_assets/footer');
+		} else {
+			$update = $this->optionslib->update('public_map_show_confirmations', $this->input->post('public_map_show_confirmations'), 'yes');
+			if($update == TRUE) {
+				$this->session->set_flashdata('success', $this->lang->line('options_public_map_show_confirmations_settings_saved'));
+			}
+
+			redirect('/options/public_map_show_confirmations');
+		}
+	}
+
 }

application/controllers/Visitor.php

@@ -203,7 +203,8 @@ public function map() {
 
 		$qsos = $this->logbook_model->get_qsos('18', $offset, $logbooks_locations_array);
 		// [PLOT] ADD plot //
-		$plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result());
+		$hide_conf = $this->optionslib->get_option('public_map_show_confirmations') != "1";
+		$plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result(), $hide_conf);
 
 		header('Content-Type: application/json; charset=utf-8');
 		echo json_encode($plot_array);
@@ -309,8 +310,10 @@ public function satellites()
 		$array_confirmed_grid_4char = array();
 		$array_confirmed_grid_6char = array();
 
+		$show_conf = $this->optionslib->get_option('public_map_show_confirmations') == "1" ? 'true' : 'false';
+
 		// Get initial data for "All" bands
-		$query = $this->gridmap_model->get_band_confirmed($default_band, $default_mode, 'false', 'false', 'false', 'false', $default_sat, $logbooks_locations_array);
+		$query = $this->gridmap_model->get_band_confirmed($default_band, $default_mode, $show_conf, $show_conf, $show_conf, $show_conf, $default_sat, $logbooks_locations_array);
 
 		if ($query && $query->num_rows() > 0)
 		{
@@ -395,7 +398,7 @@ public function satellites()
 		}
 
 		// Confirmed VUCC Squares  
-		$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($default_band, $default_mode, 'false', 'false', 'false', 'false', $default_sat, $logbooks_locations_array);
+		$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($default_band, $default_mode, $show_conf, $show_conf, $show_conf, $show_conf, $default_sat, $logbooks_locations_array);
 
 		if ($query_vucc && $query_vucc->num_rows() > 0)
 		{
@@ -544,8 +547,11 @@ public function getGridsjs()
 		$array_grid_4char_confirmed = array();
 		$array_grid_6char_confirmed = array();
 
-		// For public visitor, we don't show QSL confirmations, so set all to false
-		$query = $this->gridmap_model->get_band_confirmed($band, $mode, 'false', 'false', 'false', 'false', $sat, $logbooks_locations_array);
+		// See satellites() — the public_map_show_confirmations option governs
+		// whether confirmed grids are disclosed on the public map.
+		$show_conf = $this->optionslib->get_option('public_map_show_confirmations') == "1" ? 'true' : 'false';
+
+		$query = $this->gridmap_model->get_band_confirmed($band, $mode, $show_conf, $show_conf, $show_conf, $show_conf, $sat, $logbooks_locations_array);
 
 		if ($query && $query->num_rows() > 0) {
 			foreach ($query->result() as $row) 	{
@@ -617,7 +623,7 @@ public function getGridsjs()
 		}
 
 		// // Confirmed Squares
-		$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($band, $mode, 'false', 'false', 'false', 'false', $sat, $logbooks_locations_array);
+		$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $show_conf, $show_conf, $show_conf, $show_conf, $sat, $logbooks_locations_array);
 
 		if ($query_vucc && $query_vucc->num_rows() > 0) {
 			foreach ($query_vucc->result() as $row) 			{

application/language/english/options_lang.php

@@ -114,6 +114,10 @@
 $lang['options_public_station_diary_enabled'] = 'Public Station Diary';
 $lang['options_public_station_diary_enabled_hint'] = 'Enable or disable the ability for users to create public station diary entries. When disabled, all diary entries remain private regardless of individual settings.';
 $lang['options_public_station_diary_settings_saved'] = 'Public Station Diary settings have been saved successfully.';
+$lang['options_public_map_show_confirmations'] = 'Public Map Confirmations';
+$lang['options_public_map_show_confirmations_enabled'] = 'Show Confirmations on Public Maps';
+$lang['options_public_map_show_confirmations_hint'] = 'Enable or disable the ability for visitors to view which QSOs are confirmed on public visitor maps.';
+$lang['options_public_map_show_confirmations_settings_saved'] = 'Public Map Confirmations settings have been saved successfully.';
 $lang['options_enabled'] = 'Enabled';
 $lang['options_disabled'] = 'Disabled';
 

application/migrations/267_add_public_map_show_confirmations_option.php

@@ -0,0 +1,28 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Migration_Add_public_map_show_confirmations_option extends CI_Migration {
+
+    public function up()
+    {
+        $this->db->where('option_name', 'public_map_show_confirmations');
+        $query = $this->db->get('options');
+
+        if ($query->num_rows() == 0) {
+            $data = array(
+                'option_name' => 'public_map_show_confirmations',
+                'option_value' => '0',
+                'autoload' => 'yes'
+            );
+            $this->db->insert('options', $data);
+        }
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'public_map_show_confirmations');
+        $this->db->delete('options');
+    }
+
+}

application/views/options/public_map_show_confirmations.php

@@ -0,0 +1,38 @@
+<div class="container settings">
+
+	<div class="row">
+		<!-- Nav Start -->
+		<?php $this->load->view('options/sidebar') ?>
+		<!-- Nav End -->
+
+		<!-- Content -->
+		<div class="col-md-9">
+            <div class="card">
+                <div class="card-header"><h2><i class="fas fa-map"></i> <?php echo $page_title; ?> - <?php echo $sub_heading; ?></h2></div>
+
+                <div class="card-body">
+                    <?php if($this->session->flashdata('success')) { ?>
+                        <div class="alert alert-success">
+                            <?php echo $this->session->flashdata('success'); ?>
+                        </div>
+                    <?php } ?>
+
+                    <?php echo form_open('options/public_map_show_confirmations_save'); ?>
+
+                    <div class="mb-3">
+                        <label for="publicMapShowConfirmations"><?php echo lang('options_public_map_show_confirmations_enabled'); ?></label>
+                        <select class="form-select" id="publicMapShowConfirmations" name="public_map_show_confirmations" aria-describedby="publicMapShowConfirmationsHelp" required>
+                            <option value='1' <?php if($this->optionslib->get_option('public_map_show_confirmations') == "1" || $this->optionslib->get_option('public_map_show_confirmations') == "true") { echo "selected=\"selected\""; } ?>><?php echo lang('options_enabled'); ?></option>
+                            <option value='0' <?php if($this->optionslib->get_option('public_map_show_confirmations') != "1" && $this->optionslib->get_option('public_map_show_confirmations') != "true") { echo "selected=\"selected\""; } ?>><?php echo lang('options_disabled'); ?></option>
+                        </select>
+                        <small id="publicMapShowConfirmationsHelp" class="form-text text-muted"><?php echo lang('options_public_map_show_confirmations_hint'); ?></small>
+                    </div>
+
+                    <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                    </form>
+                </div>
+            </div>
+		</div>
+	</div>
+
+</div>

application/views/options/sidebar.php

@@ -45,6 +45,11 @@
 					<i class="fas fa-book"></i> <?php echo lang('options_public_station_diary'); ?>
 				</a>
 			</li>
+			<li class="list-group-item <?php echo ($current_page == 'public_map_show_confirmations') ? 'active' : ''; ?>">
+				<a class="nav-link" href="<?php echo site_url('options/public_map_show_confirmations'); ?>">
+					<i class="fas fa-map"></i> <?php echo lang('options_public_map_show_confirmations'); ?>
+				</a>
+			</li>
 		</ul>
 	</div>
 </div>