Merge pull request #2669 from phl0/fixUserOptionMissing

Fix user option missing

application/controllers/Awards.php

@@ -20,8 +20,8 @@ class Awards extends CI_Controller {
 		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
 
 		$map_custom = json_decode($this->optionslib->get_map_custom());
-		$this->user_map_color_qso = $map_custom->qso->color;
-		$this->user_map_color_qsoconfirm = $map_custom->qsoconfirm->color;
+		$this->user_map_color_qso = $map_custom->qso->color ?? '';
+		$this->user_map_color_qsoconfirm = $map_custom->qsoconfirm->color ?? '';
 		$this->user_map_color_unworked = $map_custom->unworked->color ?? '';
 	}
 

application/views/user/edit.php

@@ -548,8 +548,8 @@
 										</div>
 										<div class="mb-3 col-md-3">
 											<div class="icon_selectBox" data-boxcontent="qso">
-												<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
-												<div class="form-select icon_overSelect"><?php echo "<i class='".$user_map_qso_icon."'></i>"; ?></div>
+												<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon ?? "fas fa-dot-circle"; ?>">
+												<div class="form-select icon_overSelect"><?php echo "<i class='".($user_map_qso_icon ?? "fas fa-dot-circle")."'></i>"; ?></div>
 											</div>
 											<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
 												<?php foreach($map_icon_select['qso'] as $val) {
@@ -558,7 +558,7 @@
 											</div>
 										</div>
 										<div class="mb-3 col-md-2">
-											<input type="color" class="form-control user_icon_color" name="user_map_qso_color" id="user_map_qso_color" value="<?php echo $user_map_qso_color; ?>" style="padding:initial;" data-icon="qso" />
+											<input type="color" class="form-control user_icon_color" name="user_map_qso_color" id="user_map_qso_color" value="<?php echo $user_map_qso_color ?? "#E5A50A"; ?>" style="padding:initial;" data-icon="qso" />
 										</div>
 									</div>
 									<div class="row"> <!-- QSO (confirmed) -->
@@ -568,8 +568,8 @@
 										</div>
 										<div class="mb-3 col-md-3">
 											<div class="icon_selectBox" data-boxcontent="qsoconfirm">
-												<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
-												<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon=="0")?__("No"):("<i class='".$user_map_qsoconfirm_icon."'></i>")); ?></div>
+												<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon ?? "0"; ?>">
+												<div class="form-select icon_overSelect"><?php echo ((!isset($user_map_qsoconfirm_icon) || $user_map_qsoconfirm_icon=="0")?__("No"):("<i class='".($user_map_qsoconfirm_icon ?? "")."'></i>")); ?></div>
 											</div>
 											<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
 												<?php foreach($map_icon_select['qsoconfirm'] as $val) {
@@ -578,7 +578,7 @@
 											</div>
 										</div>
 										<div class="md-3 col-md-2">
-											<input type="color" class="form-control user_icon_color" name="user_map_qsoconfirm_color" id="user_map_qsoconfirm_color" value="<?php echo $user_map_qsoconfirm_color; ?>" style="padding:initial;<?php echo ($user_map_qsoconfirm_icon=="0")?'display:none;':''; ?>" data-icon="qsoconfirm" />
+											<input type="color" class="form-control user_icon_color" name="user_map_qsoconfirm_color" id="user_map_qsoconfirm_color" value="<?php echo $user_map_qsoconfirm_color ?? "#90EE90"; ?>" style="padding:initial;<?php echo (!isset($user_map_qsoconfirm_icon) || $user_map_qsoconfirm_icon=="0")?'display:none;':''; ?>" data-icon="qsoconfirm" />
 										</div>
 									</div>
 									<div class="row"> <!-- Unworked (zones) color -->
@@ -589,7 +589,7 @@
 										<div class="mb-3 col-md-3">
 										</div>
 										<div class="md-3 col-md-2">
-											<input type="color" class="form-control user_icon_color" name="user_map_unworked_color" id="user_map_unworked_color" value="<?php echo $user_map_unworked_color ?? 'red'; ?>" style="padding:initial;" data-icon="unworked" />
+											<input type="color" class="form-control user_icon_color" name="user_map_unworked_color" id="user_map_unworked_color" value="<?php echo $user_map_unworked_color ?? "#CC372D"; ?>" style="padding:initial;" data-icon="unworked" />
 										</div>
 									</div>
 									<div class="row">

assets/js/leaflet/L.MaidenheadColoured.js

@@ -8,13 +8,13 @@ L.Maidenhead = L.LayerGroup.extend({
 		// Line and label color
 		workedColor: user_map_custom?.qso?.color
 			? hexToRgba(user_map_custom.qso.color, 0.5)
-			: 'rgba(255, 0, 0, 0.4)',
+			: 'rgba(229, 165, 10, 0.5)',
 
 		confirmedColor: user_map_custom?.qsoconfirm?.color
 			? hexToRgba(user_map_custom.qsoconfirm.color, 0.5)
-			: 'rgba(144,238,144, 0.5)',
+			: 'rgba(144, 238, 144, 0.5)',
 
-		color: 'rgba(255, 0, 0, 0.4)',
+		color: 'rgba(204, 55, 45, 0.5)',
 
 		// Redraw on move or moveend
 		redraw: 'move'

assets/js/leaflet/L.MaidenheadColouredGridMap.js

@@ -10,7 +10,7 @@ L.Maidenhead = L.LayerGroup.extend({
 
 		workedColor: user_map_custom?.qso?.color
 			? hexToRgba(user_map_custom.qso.color, 0.5)
-			: 'rgba(255, 0, 0, 0.5)',
+			: 'rgba(229, 165, 10, 0.5)',
 
 		confirmedColor: user_map_custom?.qsoconfirm?.color
 			? hexToRgba(user_map_custom.qsoconfirm.color, 0.5)

assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js

@@ -11,14 +11,14 @@ L.Maidenhead = L.LayerGroup.extend({
 
 		workedColor: user_map_custom?.qso?.color
 			? hexToRgba(user_map_custom.qso.color, 0.5)
-			: 'rgba(255, 251, 0, 0.5)',
+			: 'rgba(229, 165, 10, 0.5)',
 
 		confirmedColor: user_map_custom?.qsoconfirm?.color
 			? hexToRgba(user_map_custom.qsoconfirm.color, 0.5)
-			: 'rgba(144,238,144, 0.5)',
+			: 'rgba(144, 238, 144, 0.5)',
 		unworkedColor : user_map_custom?.unworked?.color
 			? hexToRgba(user_map_custom.unworked.color, 0.5)
-			: 'rgba(255, 0, 0, 0.5)',
+			: 'rgba(204, 55, 45, 0.5)',
 
 		// Redraw on move or moveend
 		redraw: 'move'

assets/js/leaflet/leafembed.js

@@ -1,6 +1,6 @@
 var map;
 var plotlayers=[];
-var iconsList={'qso':{'color':'#FF0000','icon':'fas fa-dot-circle'}};
+var iconsList={'qso':{'color':'#E5A50A','icon':'fas fa-dot-circle'}};
 
 var stationIcon = L.divIcon({className:'cspot_station'});
 var qsoIcon = L.divIcon({className:'cspot_qso'}); //default (fas fa-dot-circle red)

assets/js/sections/award_pl_polska.js

@@ -34,9 +34,18 @@ var isLoading = false;     // Prevent duplicate API calls
 var isModalLoading = false; // Prevent duplicate modal opens
 
 // Use user-customizable map colors (same as RAC and other awards)
-var confirmedColor = user_map_custom.qsoconfirm.color;
-var workedColor = user_map_custom.qso.color;
-var unworkedColor = (typeof(user_map_custom.unworked) !== 'undefined') ? user_map_custom.unworked.color : 'red';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+    confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+    workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
+if (typeof(user_map_custom.unworked) !== 'undefined') {
+    unworkedColor = user_map_custom.unworked.color;
+}
 
 function showMapSpinner() {
     var mapContainer = $('#polska-map');

assets/js/sections/cqmap.js

@@ -4,13 +4,17 @@ var geojson;
 var map;
 var info;
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+    confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+    workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+    unworkedColor = user_map_custom.unworked.color;
 }
 
 document.addEventListener("DOMContentLoaded", function() {

assets/js/sections/dxccmap.js

@@ -1,10 +1,14 @@
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
 	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
 }
 
 document.addEventListener("DOMContentLoaded", function() {

assets/js/sections/ffma.js

@@ -3,10 +3,19 @@ let grid_four = '';
 let grid_four_lotw = '';
 let grid_four_paper = '';
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
 // Take station color for paper QSLs here
-let paperColor = user_map_custom.station.color
-let workedColor = user_map_custom.qso.color;
+let paperColor = 'rgba(204, 55, 45)';
+if (typeof(user_map_custom.station) !== 'undefined') {
+	paperColor = user_map_custom.station.color;
+}
 
 function gridPlot(form) {
     $(".ld-ext-right-plot").addClass('running');

assets/js/sections/gridmap.js

@@ -1,7 +1,13 @@
 var modalloading=false;
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
 
 document.addEventListener("DOMContentLoaded", function() {
   document.querySelectorAll('.dropdown').forEach(dd => {

assets/js/sections/gridmaster.js

@@ -3,10 +3,19 @@ let grid_four = '';
 let grid_four_lotw = '';
 let grid_four_paper = '';
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
 // Take station color for paper QSLs here
-let paperColor = user_map_custom.station.color
-let workedColor = user_map_custom.qso.color;
+let paperColor = 'rgba(204, 55, 45)';
+if (typeof(user_map_custom.station) !== 'undefined') {
+   paperColor = user_map_custom.station.color;
+}
 
 function gridPlot(form, dxcc) {
     $(".ld-ext-right-plot").addClass('running');

assets/js/sections/helvetiamap.js

@@ -5,13 +5,17 @@ let map;
 let info;
 let clickmarkers = [];
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 const states = 'AG,AI,AR,BE,BL,BS,FR,GE,GL,GR,JU,LU,NE,NW,OW,SG,SH,SO,SZ,TG,TI,UR,VD,VS,ZG,ZH';

assets/js/sections/iotamap.js

@@ -1,10 +1,14 @@
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 var osmUrl = $('#iotamapjs').attr("tileUrl");

assets/js/sections/itumap.js

@@ -4,13 +4,17 @@ let geojson;
 let map;
 let info;
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 function load_itu_map() {

assets/js/sections/jccmap.js

@@ -1,11 +1,15 @@
 let osmUrl = tileUrl;
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 function load_jcc_map() {

assets/js/sections/racmap.js

@@ -5,13 +5,17 @@ let map;
 let info;
 let clickmarkers = [];
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 const states = 'AB,BC,MB,NB,NL,NT,NS,NU,ON,PE,QC,SK,YT';

assets/js/sections/wajamap.js

@@ -5,13 +5,17 @@ let map;
 let info;
 let clickmarkers = [];
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 const states = '01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47';

assets/js/sections/wapmap.js

@@ -5,13 +5,17 @@ var map;
 var info;
 var clickmarkers = [];
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 const states = 'DR,FL,FR,GD,GR,LB,NB,NH,OV,UT,ZH,ZL';

assets/js/sections/wasmap.js

@@ -5,13 +5,17 @@ let map;
 let info;
 let clickmarkers = [];
 
-let confirmedColor = user_map_custom.qsoconfirm.color;
-let workedColor = user_map_custom.qso.color;
-let unworkedColor = '';
+let confirmedColor = 'rgba(144,238,144)';
+if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
+      confirmedColor = user_map_custom.qsoconfirm.color;
+}
+let workedColor = 'rgba(229, 165, 10)';
+if (typeof(user_map_custom.qso) !== 'undefined') {
+      workedColor = user_map_custom.qso.color;
+}
+let unworkedColor = 'rgba(204, 55, 45)';
 if (typeof(user_map_custom.unworked) !== 'undefined') {
-	unworkedColor = user_map_custom.unworked.color;
-} else {
-	unworkedColor = 'red';
+   unworkedColor = user_map_custom.unworked.color;
 }
 
 const states =  'AK,AL,AR,AZ,CA,CO,CT,DE,FL,GA,HI,IA,ID,IL,IN,KS,KY,LA,MA,MD,ME,MI,MN,MO,MS,MT,NC,ND,NE,NH,NJ,NM,NV,NY,OH,OK,OR,PA,RI,SC,SD,TN,TX,UT,VA,VT,WA,WI,WV,WY';