[QSO] Fixes #557 Where /P wasn't handled properly

magicbug · Jan 29, 2021 · b8d2032 · b8d2032
1 parent b69c8e9
commit b8d2032
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
@@ -67,6 +67,9 @@ function json($callsign, $type, $band, $mode)
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
 
+		// Convert - in Callsign to / Used for URL processing
+		$callsign = str_replace("-","/",$callsign);
+
 		// Check if callsign is an LOTW User
 			$lotw_member = "";
 			$lotw_file_name = "./updates/lotw_users.csv";

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
@@ -31,7 +31,7 @@
     <script src="<?php echo base_url() ;?>assets/js/sections/notes.js"></script>
 <?php } ?>
 
-    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datatables.min.js"></script>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datatables.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/dataTables.buttons.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/buttons.html5.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url();?>assets/js/selectize.js"></script>
@@ -781,8 +781,12 @@ function changebadge(entityname) {
               var json_mode = $("#mode").val();
             }
 
+            var find_callsign = $(this).val().toUpperCase();
 
-            $.getJSON('logbook/json/' + $(this).val().toUpperCase() + '/' + sat_type + '/' + json_band + '/' + json_mode, function(result)
+            find_callsign.replace(/\//g, "-");
+
+            // Replace / in a callsign with - to stop urls breaking
+            $.getJSON('logbook/json/' + find_callsign.replace(/\//g, "-") + '/' + sat_type + '/' + json_band + '/' + json_mode, function(result)
             {
               //$('#country').val(result); lotw_info
               if(result.dxcc.entity != undefined) {