goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #2725 from phl0/refactorLotw

浏览代码 
Refactor LoTW imports
这个提交包含在：
Andreas Kristiansen 2023-11-24 14:55:10 +01:00 提交者 GitHub
当前提交 3a28eb551d
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改，包括 18 次插入 和 14 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

32
application/controllers/Lotw.php
查看文件

@ -630,14 +630,22 @@ class Lotw extends CI_Controller {
$query = $this->user_model->get_all_lotw_users();
if ($query->num_rows() >= 1) {
$results='';
$result = '';
foreach ($query->result() as $user) {
if ( ($sync_user_id != null) && ($sync_user_id != $user->user_id) ) { continue; }
// Validate that LoTW credentials are not empty
// TODO: We don't actually see the error message
if ($user->user_lotw_password == '') {
$result = "You have not defined your ARRL LoTW credentials!";
continue;
}
$config['upload_path'] = './uploads/';
$file = $config['upload_path'] . 'lotwreport_download.adi';
if (file_exists($file) && ! is_writable($file)) {
$results .= "Temporary download file ".$file." is not writable. Aborting!";
$result = "Temporary download file ".$file." is not writable. Aborting!";
continue;
}
// Get credentials for LoTW
@ -649,14 +657,7 @@ class Lotw extends CI_Controller {
$q = $query->row();
$lotw_url = $q->lotw_download_url;
// Validate that LoTW credentials are not empty
// TODO: We don't actually see the error message
if ($data['user_lotw_name'] == '' || $data['user_lotw_password'] == '')
{
echo "You have not defined your ARRL LoTW credentials!";
}
$lotw_last_qsl_date = date('Y-m-d', strtotime($this->logbook_model->lotw_last_qsl_date($user->user_id)));
$lotw_last_qsl_date = date('Y-m-d', strtotime($this->logbook_model->lotw_last_qsl_date($user->user_id)));
// Build URL for LoTW report file
$lotw_url .= "?";
@ -668,19 +669,22 @@ class Lotw extends CI_Controller {
$lotw_url .= "$lotw_last_qsl_date";
if (! is_writable(dirname($file))) {
$results.= "Temporary download directory ".dirname($file)." is not writable. Aborting!";
$result = "Temporary download directory ".dirname($file)." is not writable. Aborting!";
continue;
}
file_put_contents($file, file_get_contents($lotw_url));
if (file_get_contents($file, false, null, 0, 39) != "ARRL Logbook of the World Status Report") {
$results.= "LoTW downloading failed for User ".$data['user_lotw_name']." either due to it being down or incorrect logins.";
$result = "LoTW downloading failed for User ".$data['user_lotw_name']." either due to it being down or incorrect logins.";
continue;
}
ini_set('memory_limit', '-1');
$results.= $this->loadFromFile($file, false);
$result = $this->loadFromFile($file, false);
}
return $results;
if ($result == '') {
$result = "You have not defined your ARRL LoTW credentials!";
}
return $result;
} else {
return "No LoTW User details found to carry out matches.";
}