Public_Tools/wavelog
3
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-24 11:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84 from int2001/empty_fixes

Browse Source
This commit is contained in:
HB9HIL
2024-01-12 09:28:43 +01:00
committed by GitHub
parent cd11dc1e1f 7ba5b7c258
commit 43ffdc461a
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/Activators_model.php
View File

@@ -111,7 +111,7 @@ class Activators_model extends CI_Model
$max = $row->count;
}
return $max;
return ($max ?? 0);
}
}

5
application/models/Logbooks_model.php
View File

@@ -252,9 +252,8 @@ class Logbooks_model extends CI_Model {
}
return $relationships_array;
}
else{
return array();
} else{
return array(-1); // Put some default-Value here, if no relation found
}
}

6
application/views/interface_assets/footer.php
View File

@@ -1015,11 +1015,11 @@ $($('#callsign')).on('keypress',function(e) {
$station_profile = $this->stations->profile($active_station_id);
$active_station_info = $station_profile->row();
if (strpos($active_station_info->station_gridsquare, ',') !== false) {
if (strpos(($active_station_info->station_gridsquare ?? ''), ',') !== false) {
$gridsquareArray = explode(',', $active_station_info->station_gridsquare);
$user_gridsquare = $gridsquareArray[0];
} else {
$user_gridsquare = $active_station_info->station_gridsquare;
$user_gridsquare = ($active_station_info->station_gridsquare ?? '');
}
?>
@@ -1031,7 +1031,7 @@ $($('#callsign')).on('keypress',function(e) {
url: base_url + 'index.php/logbook/qralatlngjson',
type: 'post',
data: {
<?php if ($active_station_info->station_gridsquare != "") { ?>
<?php if (($active_station_info->station_gridsquare ?? '') != "") { ?>
qra: '<?php echo $user_gridsquare; ?>',
<?php } else if (null !== $this->config->item('locator')) { ?>
qra: '<?php echo $this->config->item('locator'); ?>',