mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #2845 from magicbug/dev 

Fix when doing fresh install
pull/3001/head
Peter Goodhall 2023-12-15 21:37:40 +00:00 zatwierdzone przez GitHub
rodzic 5fad712b9a 756afa1169
commit 97d1a92d11
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
13 zmienionych plików z 114 dodań i 62 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/config/migration.php
Wyświetl plik

@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
|
*/
$config['migration_version'] = 160;
$config['migration_version'] = 161;
/*
|--------------------------------------------------------------------------

2
application/libraries/AdifHelper.php
Wyświetl plik

@ -12,7 +12,7 @@ class AdifHelper {
'ANT_PATH',
'ARRL_SECT',
'AWARD_GRANTED',
'AWARD_SUMMITED', // Typo in DB!
'AWARD_SUBMITTED',
'BAND',
'BAND_RX',
'BIOGRAPHY',

30
application/migrations/161_award_submitted_typo.php 100644
Wyświetl plik

@ -0,0 +1,30 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
/**
* Class Migration_award_submitted_typo
*
* Fix typo in COL_AWARD_SUMMITED column
*/
class Migration_award_submitted_typo extends CI_Migration {
public function up()
{
$this->db->query(
'ALTER TABLE ' .
$this->db->escape_identifiers($this->config->item('table_name')) .
' CHANGE COL_AWARD_SUMMITED COL_AWARD_SUBMITTED VARCHAR(255)'
);
}
public function down()
{
$this->db->query(
'ALTER TABLE ' .
$this->db->escape_identifiers($this->config->item('table_name')) .
' CHANGE COL_AWARD_SUBMITTED COL_AWARD_SUMMITED VARCHAR(255)'
);
}
}

4
application/models/Dxcluster_model.php
Wyświetl plik

@ -25,7 +25,7 @@ class Dxcluster_model extends CI_Model {
// CURL Functions
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $dxcache_url);
curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog DXLookup');
curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog '.$this->optionslib->get_option('version').' DXLookup');
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$jsonraw = curl_exec($ch);
@ -89,7 +89,7 @@ class Dxcluster_model extends CI_Model {
// CURL Functions
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $dxcache_url);
curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog DXLookup by QRG');
curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog '.$this->optionslib->get_option('version').'DXLookup by QRG');
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$jsonraw = curl_exec($ch);

10
application/models/Logbook_model.php
Wyświetl plik

@ -2539,6 +2539,8 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$QSLBreakdown['eQSL_Received'] = 0;
$QSLBreakdown['LoTW_Sent'] = 0;
$QSLBreakdown['LoTW_Received'] = 0;
$QSLBreakdown['QRZ_Sent'] = 0;
$QSLBreakdown['QRZ_Received'] = 0;
$QSLBreakdown['QSL_Sent_today'] = 0;
$QSLBreakdown['QSL_Received_today'] = 0;
$QSLBreakdown['QSL_Requested_today'] = 0;
@ -2546,6 +2548,8 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$QSLBreakdown['eQSL_Received_today'] = 0;
$QSLBreakdown['LoTW_Sent_today'] = 0;
$QSLBreakdown['LoTW_Received_today'] = 0;
$QSLBreakdown['QRZ_Sent_today'] = 0;
$QSLBreakdown['QRZ_Received_today'] = 0;
return $QSLBreakdown;
}
@ -2557,6 +2561,8 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$QSLBreakdown['eQSL_Received'] = 0;
$QSLBreakdown['LoTW_Sent'] = 0;
$QSLBreakdown['LoTW_Received'] = 0;
$QSLBreakdown['QRZ_Sent'] = 0;
$QSLBreakdown['QRZ_Received'] = 0;
$QSLBreakdown['QSL_Sent_today'] = 0;
$QSLBreakdown['QSL_Received_today'] = 0;
$QSLBreakdown['QSL_Requested_today'] = 0;
@ -2564,6 +2570,8 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$QSLBreakdown['eQSL_Received_today'] = 0;
$QSLBreakdown['LoTW_Sent_today'] = 0;
$QSLBreakdown['LoTW_Received_today'] = 0;
$QSLBreakdown['QRZ_Sent_today'] = 0;
$QSLBreakdown['QRZ_Received_today'] = 0;
return $QSLBreakdown;
}
@ -3472,7 +3480,7 @@ function lotw_last_qsl_date($user_id) {
'COL_ANT_PATH' => $input_ant_path,
'COL_ARRL_SECT' => (!empty($record['arrl_sect'])) ? $record['arrl_sect'] : '',
'COL_AWARD_GRANTED' => (!empty($record['award_granted'])) ? $record['award_granted'] : '',
'COL_AWARD_SUMMITED' => (!empty($record['award_submitted'])) ? $record['award_submitted'] : '',
'COL_AWARD_SUBMITTED' => (!empty($record['award_submitted'])) ? $record['award_submitted'] : '',
'COL_BAND' => $band,
'COL_BAND_RX' => $band_rx,
'COL_BIOGRAPHY' => (!empty($record['biography'])) ? $record['biography'] : '',

1
application/models/User_model.php
Wyświetl plik

@ -89,6 +89,7 @@ class User_Model extends CI_Model {
function hasQrzKey($user_id) {
$this->db->where('station_profile.qrzapikey is not null');
$this->db->where('station_profile.qrzapikey != ""');
$this->db->join('station_profile', 'station_profile.user_id = '.$user_id);
$query = $this->db->get($this->config->item('auth_table'));

2
application/views/adif/data/clublog.php
Wyświetl plik

@ -1,7 +1,7 @@
Cloudlog ADIF export
<ADIF_VER:5>3.1.4
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\r\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>><?php echo $this->config->item('app_version')."\r\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->optionslib->get_option('version')); ?>><?php echo $this->optionslib->get_option('version')."\r\n"; ?>
<EOH>
<?php

2
application/views/adif/data/exportall.php
Wyświetl plik

@ -5,7 +5,7 @@
Cloudlog ADIF export
<ADIF_VER:5>3.1.4
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\r\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>><?php echo $this->config->item('app_version')."\r\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->optionslib->get_option('version')); ?>><?php echo $this->optionslib->get_option('version')."\r\n"; ?>
<EOH>
<?php

2
application/views/adif/data/exportsat.php
Wyświetl plik

@ -5,7 +5,7 @@
Cloudlog ADIF export
<ADIF_VER:5>3.1.4
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\r\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>><?php echo $this->config->item('app_version')."\r\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->optionslib->get_option('version')); ?>><?php echo $this->optionslib->get_option('version')."\r\n"; ?>
<EOH>
<?php

2
application/views/backup/exportall.php
Wyświetl plik

@ -1,7 +1,7 @@
Cloudlog ADIF export
<ADIF_VER:5>3.1.4
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>><?php echo $this->config->item('app_version')."\n"; ?>
<PROGRAMVERSION:<?php echo strlen($this->optionslib->get_option('version')); ?>><?php echo $this->optionslib->get_option('version')."\r\n"; ?>
<EOH>
<?php

10
application/views/version_dialog/index.php
Wyświetl plik

@ -39,8 +39,14 @@
if ($response !== false) {
$data = json_decode($response, true);
$current_version=$this->optionslib->get_option('version');
if ($data !== null && !empty($data)) {
$firstRelease = $data[0];
foreach ($data as $singledata) {
if ($singledata['name']==$current_version) {
$firstRelease = $singledata;
continue;
}
}
$releaseBody = isset($firstRelease['body']) ? $firstRelease['body'] : 'No release information available';
$htmlReleaseBody = htmlspecialchars($releaseBody);
@ -73,4 +79,4 @@
</div>
</div>
</div>
</div>
</div>

1
assets/js/leaflet/L.MaidenheadColouredGridMap.js
Wyświetl plik

@ -4,7 +4,6 @@
L.Maidenhead = L.LayerGroup.extend({
options: {
// Line and label color
color: 'rgba(255, 0, 0, 0.4)',

108
assets/js/sections/gridmap.js
Wyświetl plik

@ -1,3 +1,5 @@
var modalloading=false;
$('#band').change(function(){
var band = $("#band option:selected").text();
if (band != "SAT") {
@ -124,56 +126,62 @@ function plot(visitor, grid_two, grid_four, grid_six, grid_two_confirmed, grid_f
}
function spawnGridsquareModal(loc_4char) {
var ajax_data = ({
'Searchphrase': loc_4char,
'Band': $("#band").val(),
'Mode': $("#mode").val(),
'Type': 'VUCC'
})
if (type == 'activated') {
ajax_data.searchmode = 'activated';
}
$.ajax({
url: base_url + 'index.php/awards/qso_details_ajax',
type: 'post',
data: ajax_data,
success: function (html) {
BootstrapDialog.show({
title: lang_general_word_qso_data,
cssClass: 'qso-dialog',
size: BootstrapDialog.SIZE_WIDE,
nl2br: false,
message: html,
onshown: function(dialog) {
$('[data-bs-toggle="tooltip"]').tooltip();
$('.contacttable').DataTable({
"pageLength": 25,
responsive: false,
ordering: false,
"scrollY": "550px",
"scrollCollapse": true,
"paging": false,
"scrollX": true,
dom: 'Bfrtip',
buttons: [
'csv'
]
});
// change color of csv-button if dark mode is chosen
if (isDarkModeTheme()) {
$(".buttons-csv").css("color", "white");
}
},
buttons: [{
label: lang_admin_close,
action: function(dialogItself) {
dialogItself.close();
}
}]
});
}
});
if (!(modalloading)) {
var ajax_data = ({
'Searchphrase': loc_4char,
'Band': $("#band").val(),
'Mode': $("#mode").val(),
'Type': 'VUCC'
})
if (type == 'activated') {
ajax_data.searchmode = 'activated';
}
modalloading=true;
$.ajax({
url: base_url + 'index.php/awards/qso_details_ajax',
type: 'post',
data: ajax_data,
success: function (html) {
BootstrapDialog.show({
title: lang_general_word_qso_data,
cssClass: 'qso-dialog',
size: BootstrapDialog.SIZE_WIDE,
nl2br: false,
message: html,
onshown: function(dialog) {
modalloading=false;
$('[data-bs-toggle="tooltip"]').tooltip();
$('.contacttable').DataTable({
"pageLength": 25,
responsive: false,
ordering: false,
"scrollY": "550px",
"scrollCollapse": true,
"paging": false,
"scrollX": true,
dom: 'Bfrtip',
buttons: [
'csv'
]
});
// change color of csv-button if dark mode is chosen
if (isDarkModeTheme()) {
$(".buttons-csv").css("color", "white");
}
},
buttons: [{
label: lang_admin_close,
action: function(dialogItself) {
dialogItself.close();
}
}]
});
},
error: function(e) {
modalloading=false;
}
});
}
}
function clearMarkers() {