Skip to content

Commit d12d991

Browse files
phl0phl0
authored
Merge pull request wavelog#2669 from phl0/fixUserOptionMissing
Fix user option missing
2 parents 21c8e94 + 471f7f1 commit d12d991

20 files changed

+160
-87
lines changed

‎application/controllers/Awards.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ function __construct()
2020
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
2121

2222
$map_custom = json_decode($this->optionslib->get_map_custom());
23-
$this->user_map_color_qso = $map_custom->qso->color;
24-
$this->user_map_color_qsoconfirm = $map_custom->qsoconfirm->color;
23+
$this->user_map_color_qso = $map_custom->qso->color ?? '';
24+
$this->user_map_color_qsoconfirm = $map_custom->qsoconfirm->color ?? '';
2525
$this->user_map_color_unworked = $map_custom->unworked->color ?? '';
2626
}
2727

‎application/views/user/edit.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@
548548
</div>
549549
<div class="mb-3 col-md-3">
550550
<div class="icon_selectBox" data-boxcontent="qso">
551-
<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
552-
<div class="form-select icon_overSelect"><?php echo "<i class='".$user_map_qso_icon."'></i>"; ?></div>
551+
<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon ?? "fas fa-dot-circle"; ?>">
552+
<div class="form-select icon_overSelect"><?php echo "<i class='".($user_map_qso_icon ?? "fas fa-dot-circle")."'></i>"; ?></div>
553553
</div>
554554
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
555555
<?php foreach($map_icon_select['qso'] as $val) {
@@ -558,7 +558,7 @@
558558
</div>
559559
</div>
560560
<div class="mb-3 col-md-2">
561-
<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" />
561+
<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" />
562562
</div>
563563
</div>
564564
<div class="row"> <!-- QSO (confirmed) -->
@@ -568,8 +568,8 @@
568568
</div>
569569
<div class="mb-3 col-md-3">
570570
<div class="icon_selectBox" data-boxcontent="qsoconfirm">
571-
<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
572-
<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon=="0")?__("No"):("<i class='".$user_map_qsoconfirm_icon."'></i>")); ?></div>
571+
<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon ?? "0"; ?>">
572+
<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>
573573
</div>
574574
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
575575
<?php foreach($map_icon_select['qsoconfirm'] as $val) {
@@ -578,7 +578,7 @@
578578
</div>
579579
</div>
580580
<div class="md-3 col-md-2">
581-
<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" />
581+
<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" />
582582
</div>
583583
</div>
584584
<div class="row"> <!-- Unworked (zones) color -->
@@ -589,7 +589,7 @@
589589
<div class="mb-3 col-md-3">
590590
</div>
591591
<div class="md-3 col-md-2">
592-
<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" />
592+
<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" />
593593
</div>
594594
</div>
595595
<div class="row">

‎assets/js/leaflet/L.MaidenheadColoured.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ L.Maidenhead = L.LayerGroup.extend({
88
// Line and label color
99
workedColor: user_map_custom?.qso?.color
1010
? hexToRgba(user_map_custom.qso.color, 0.5)
11-
: 'rgba(255, 0, 0, 0.4)',
11+
: 'rgba(229, 165, 10, 0.5)',
1212

1313
confirmedColor: user_map_custom?.qsoconfirm?.color
1414
? hexToRgba(user_map_custom.qsoconfirm.color, 0.5)
15-
: 'rgba(144,238,144, 0.5)',
15+
: 'rgba(144, 238, 144, 0.5)',
1616

17-
color: 'rgba(255, 0, 0, 0.4)',
17+
color: 'rgba(204, 55, 45, 0.5)',
1818

1919
// Redraw on move or moveend
2020
redraw: 'move'

‎assets/js/leaflet/L.MaidenheadColouredGridMap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ L.Maidenhead = L.LayerGroup.extend({
1010

1111
workedColor: user_map_custom?.qso?.color
1212
? hexToRgba(user_map_custom.qso.color, 0.5)
13-
: 'rgba(255, 0, 0, 0.5)',
13+
: 'rgba(229, 165, 10, 0.5)',
1414

1515
confirmedColor: user_map_custom?.qsoconfirm?.color
1616
? hexToRgba(user_map_custom.qsoconfirm.color, 0.5)

‎assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ L.Maidenhead = L.LayerGroup.extend({
1111

1212
workedColor: user_map_custom?.qso?.color
1313
? hexToRgba(user_map_custom.qso.color, 0.5)
14-
: 'rgba(255, 251, 0, 0.5)',
14+
: 'rgba(229, 165, 10, 0.5)',
1515

1616
confirmedColor: user_map_custom?.qsoconfirm?.color
1717
? hexToRgba(user_map_custom.qsoconfirm.color, 0.5)
18-
: 'rgba(144,238,144, 0.5)',
18+
: 'rgba(144, 238, 144, 0.5)',
1919
unworkedColor : user_map_custom?.unworked?.color
2020
? hexToRgba(user_map_custom.unworked.color, 0.5)
21-
: 'rgba(255, 0, 0, 0.5)',
21+
: 'rgba(204, 55, 45, 0.5)',
2222

2323
// Redraw on move or moveend
2424
redraw: 'move'

‎assets/js/leaflet/leafembed.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var map;
22
var plotlayers=[];
3-
var iconsList={'qso':{'color':'#FF0000','icon':'fas fa-dot-circle'}};
3+
var iconsList={'qso':{'color':'#E5A50A','icon':'fas fa-dot-circle'}};
44

55
var stationIcon = L.divIcon({className:'cspot_station'});
66
var qsoIcon = L.divIcon({className:'cspot_qso'}); //default (fas fa-dot-circle red)

‎assets/js/sections/award_pl_polska.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,18 @@ var isLoading = false; // Prevent duplicate API calls
3434
var isModalLoading = false; // Prevent duplicate modal opens
3535

3636
// Use user-customizable map colors (same as RAC and other awards)
37-
var confirmedColor = user_map_custom.qsoconfirm.color;
38-
var workedColor = user_map_custom.qso.color;
39-
var unworkedColor = (typeof(user_map_custom.unworked) !== 'undefined') ? user_map_custom.unworked.color : 'red';
37+
let confirmedColor = 'rgba(144,238,144)';
38+
if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
39+
confirmedColor = user_map_custom.qsoconfirm.color;
40+
}
41+
let workedColor = 'rgba(229, 165, 10)';
42+
if (typeof(user_map_custom.qso) !== 'undefined') {
43+
workedColor = user_map_custom.qso.color;
44+
}
45+
let unworkedColor = 'rgba(204, 55, 45)';
46+
if (typeof(user_map_custom.unworked) !== 'undefined') {
47+
unworkedColor = user_map_custom.unworked.color;
48+
}
4049

4150
function showMapSpinner() {
4251
var mapContainer = $('#polska-map');

‎assets/js/sections/cqmap.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ var geojson;
44
var map;
55
var info;
66

7-
let confirmedColor = user_map_custom.qsoconfirm.color;
8-
let workedColor = user_map_custom.qso.color;
9-
let unworkedColor = '';
7+
let confirmedColor = 'rgba(144,238,144)';
8+
if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
9+
confirmedColor = user_map_custom.qsoconfirm.color;
10+
}
11+
let workedColor = 'rgba(229, 165, 10)';
12+
if (typeof(user_map_custom.qso) !== 'undefined') {
13+
workedColor = user_map_custom.qso.color;
14+
}
15+
let unworkedColor = 'rgba(204, 55, 45)';
1016
if (typeof(user_map_custom.unworked) !== 'undefined') {
11-
unworkedColor = user_map_custom.unworked.color;
12-
} else {
13-
unworkedColor = 'red';
17+
unworkedColor = user_map_custom.unworked.color;
1418
}
1519

1620
document.addEventListener("DOMContentLoaded", function() {

‎assets/js/sections/dxccmap.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
let confirmedColor = user_map_custom.qsoconfirm.color;
2-
let workedColor = user_map_custom.qso.color;
3-
let unworkedColor = '';
1+
let confirmedColor = 'rgba(144,238,144)';
2+
if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
3+
confirmedColor = user_map_custom.qsoconfirm.color;
4+
}
5+
let workedColor = 'rgba(229, 165, 10)';
6+
if (typeof(user_map_custom.qso) !== 'undefined') {
7+
workedColor = user_map_custom.qso.color;
8+
}
9+
let unworkedColor = 'rgba(204, 55, 45)';
410
if (typeof(user_map_custom.unworked) !== 'undefined') {
511
unworkedColor = user_map_custom.unworked.color;
6-
} else {
7-
unworkedColor = 'red';
812
}
913

1014
document.addEventListener("DOMContentLoaded", function() {

‎assets/js/sections/ffma.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@ let grid_four = '';
33
let grid_four_lotw = '';
44
let grid_four_paper = '';
55

6-
let confirmedColor = user_map_custom.qsoconfirm.color;
6+
let confirmedColor = 'rgba(144,238,144)';
7+
if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
8+
confirmedColor = user_map_custom.qsoconfirm.color;
9+
}
10+
let workedColor = 'rgba(229, 165, 10)';
11+
if (typeof(user_map_custom.qso) !== 'undefined') {
12+
workedColor = user_map_custom.qso.color;
13+
}
714
// Take station color for paper QSLs here
8-
let paperColor = user_map_custom.station.color
9-
let workedColor = user_map_custom.qso.color;
15+
let paperColor = 'rgba(204, 55, 45)';
16+
if (typeof(user_map_custom.station) !== 'undefined') {
17+
paperColor = user_map_custom.station.color;
18+
}
1019

1120
function gridPlot(form) {
1221
$(".ld-ext-right-plot").addClass('running');

0 commit comments

Comments
 (0)