kc9uhi/wavelog
3
0
Fork 1
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-27 01:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Weblate
2024-11-21 17:04:29 +00:00
parent 6056036960 b2f21db2e2
commit f30e568d86
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/Lotw.php
View File

@@ -664,7 +664,7 @@ class Lotw extends CI_Controller {
}
$config['upload_path'] = './uploads/';
$file = $config['upload_path'] . 'lotwreport_download.adi';
$file = $config['upload_path'] . 'lotwreport_download_'.$sync_user_id.'_auto.adi';
if (file_exists($file) && ! is_writable($file)) {
$result = "Temporary download file ".$file." is not writable. Aborting!";
continue;
@@ -736,7 +736,7 @@ class Lotw extends CI_Controller {
$this->load->model('logbook_model');
if (($this->input->post('lotwimport') == 'fetch') && (!($this->config->item('disable_manual_lotw')))) {
$file = $config['upload_path'] . 'lotwreport_download.adi';
$file = $config['upload_path'] . 'lotwreport_download_'.$this->session->userdata('user_id').'.adi';
// Get credentials for LoTW
$query = $this->user_model->get_by_id($this->session->userdata('user_id'));

2
application/controllers/Qrz.php
View File

@@ -345,7 +345,7 @@ class Qrz extends CI_Controller {
function mass_download_qsos($qrz_api_key = '', $lastqrz = '1900-01-01', $station_ids = '', $trusted = false) {
$config['upload_path'] = './uploads/';
$file = $config['upload_path'] . 'qrzcom_download_report.adi';
$file = $config['upload_path'] . 'qrzcom_download_report_'.md5($qrz_api_key).'.adi';
if (file_exists($file) && ! is_writable($file)) {
$result = "Temporary download file ".$file." is not writable. Aborting!";
return false;