Merge pull request #2806 from phl0/fixLotwDownloadFilePermissions

Check file/dir permissions prior to LoTW download
pull/2812/head
Andreas Kristiansen 2023-12-11 12:00:02 +01:00 zatwierdzone przez GitHub
commit 3825e6e72e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 25 dodań i 4 usunięć

Wyświetl plik

@ -746,10 +746,24 @@ class Lotw extends CI_Controller {
$lotw_url .= "&qso_owncall=".$this->input->post('callsign');
}
file_put_contents($file, file_get_contents($lotw_url));
if (is_writable(dirname($file)) && (!file_exists($file) || is_writable($file))) {
file_put_contents($file, file_get_contents($lotw_url));
ini_set('memory_limit', '-1');
$this->loadFromFile($file);
ini_set('memory_limit', '-1');
$this->loadFromFile($file);
} else {
if (!is_writable(dirname($file))) {
$data['errormsg'] = 'Directory '.dirname($file).' is not writable!';
} else if (!is_writable($file)) {
$data['errormsg'] = 'File '.$file.' is not writable!';
}
$this->load->model('Stations');
$data['callsigns'] = $this->Stations->callsigns_of_user($this->session->userdata('user_id'));
$this->load->view('interface_assets/header', $data);
$this->load->view('lotw/import', $data);
$this->load->view('interface_assets/footer');
}
}
else
{

Wyświetl plik

@ -2,10 +2,17 @@
<h2><?php echo lang('lotw_title'); ?> - <?php echo lang('lotw_title_adif_import'); ?></h2>
<?php if (isset($errormsg)) { ?>
<div class="alert alert-danger" role="alert">
<?php echo $errormsg; ?>
</div>
<?php } ?>
<div class="card">
<div class="card-header"><?php echo lang('lotw_title_adif_import_options'); ?></div>
<div class="card-body">
<?php $this->load->view('layout/messages'); ?>
<?php echo form_open_multipart('lotw/import'); ?>
@ -60,4 +67,4 @@
</div>
</div>
</div>
</div>