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

Merge pull request #2035 from hugosilvaparagramanet/feature/export-to-qo-100-dx-club

浏览代码 
Basic QO-100 Dx Club API integration
这个提交包含在：
Peter Goodhall 2023-03-20 14:53:41 +00:00 提交者 GitHub
当前提交 c1d2a98da8
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 12 个文件被更改，包括 705 次插入 和 80 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/config/migration.php
查看文件

@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 114;
$config['migration_version'] = 115;
/*
|--------------------------------------------------------------------------

161
application/controllers/Webadif.php 普通文件
查看文件

@ -0,0 +1,161 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/* Controller to interact with the webADIF API */
class Webadif extends CI_Controller {
/*
* Upload QSO to webADIF
* When called from the url cloudlog/webadif/upload, the function loops through all station_id's with a webADIF
* api key defined.
* All QSOs not previously uploaded, will then be uploaded, one at a time
*/
public function upload()
{
$this->setOptions();
$this->load->model('logbook_model');
$station_ids = $this->logbook_model->get_station_id_with_webadif_api();
if ($station_ids) {
foreach ($station_ids as $station) {
$webadif_api_key = $station->webadifapikey;
$webadif_api_url = $station->webadifapiurl;
if ($this->mass_upload_qsos($station->station_id, $webadif_api_key, $webadif_api_url)) {
echo "QSOs have been uploaded to QO-100 Dx Club.";
log_message('info', 'QSOs have been uploaded to QO-100 Dx Club.');
} else {
echo "No QSOs found for upload.";
log_message('info', 'No QSOs found for upload.');
}
}
} else {
echo "No station profiles with a QO-100 Dx Club API Key found.";
log_message('error', "No station profiles with a QO-100 Dx Club API Key found.");
}
}
function setOptions() {
$this->config->load('config');
ini_set('memory_limit', '-1');
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
}
/*
* Function gets all QSOs from given station_id, that are not previously uploaded to webADIF consumer.
* Adif is build for each qso, and then uploaded, one at a time
*/
function mass_upload_qsos($station_id, $webadif_api_key, $webadif_api_url) {
$i = 0;
$data['qsos'] = $this->logbook_model->get_webadif_qsos($station_id);
$errormessages=array();
$CI =& get_instance();
$CI->load->library('AdifHelper');
if ($data['qsos']) {
foreach ($data['qsos']->result() as $qso) {
$adif = $CI->adifhelper->getAdifLine($qso);
$result = $this->logbook_model->push_qso_to_webadif($webadif_api_url, $webadif_api_key, $adif);
if ($result) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY);
$i++;
} else {
$errorMessage = 'QO-100 Dx Club upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
log_message('error', $errorMessage);
$errormessages[] = $errorMessage;
}
}
$result=[];
$result['status'] = 'OK';
$result['count'] = $i;
$result['errormessages'] = $errormessages;
return $result;
} else {
$result=[];
$result['status'] = 'Error';
$result['count'] = $i;
$result['errormessages'] = $errormessages;
return $result;
}
}
/*
* Used for displaying the uid for manually selecting log for upload to webADIF consumer
*/
public function export() {
$this->load->model('stations');
$data['page_title'] = "QO-100 Dx Club Upload";
$data['station_profiles'] = $this->stations->stations_with_webadif_api_key();
$data['station_profile'] = $this->stations->stations_with_webadif_api_key();
$this->load->view('interface_assets/header', $data);
$this->load->view('webadif/export');
$this->load->view('interface_assets/footer');
}
/*
* Used for ajax-function when selecting log for upload to webADIF consumer
*/
public function upload_station() {
$this->setOptions();
$this->load->model('stations');
$postData = $this->input->post();
$this->load->model('logbook_model');
$result = $this->logbook_model->exists_webadif_api_key($postData['station_id']);
$webadif_api_key = $result->webadifapikey;
$webadif_api_url = $result->webadifapiurl;
header('Content-type: application/json');
$result = $this->mass_upload_qsos($postData['station_id'], $webadif_api_key, $webadif_api_url);
if ($result['status'] == 'OK') {
$stationinfo = $this->stations->stations_with_webadif_api_key();
$info = $stationinfo->result();
$data['status'] = 'OK';
$data['info'] = $info;
$data['infomessage'] = $result['count'] . " QSOs are now uploaded to QO-100 Dx Club";
$data['errormessages'] = $result['errormessages'];
echo json_encode($data);
} else {
$data['status'] = 'Error';
$data['info'] = 'Error: No QSOs found to upload.';
$data['errormessages'] = $result['errormessages'];
echo json_encode($data);
}
}
public function mark_webadif() {
// Set memory limit to unlimited to allow heavy usage
ini_set('memory_limit', '-1');
$data['page_title'] = "QO-100 Dx Club Upload";
$station_id = $this->security->xss_clean($this->input->post('station_profile'));
$from = $this->security->xss_clean($this->input->post('from'));
$to = $this->security->xss_clean($this->input->post('to'));
$this->load->model('logbook_model');
$data['qsos'] = $this->logbook_model->get_webadif_qsos(
$station_id,
$from,
$to
);
if ($data['qsos']!==null) {
foreach ($data['qsos']->result() as $qso) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY);
}
}
$this->load->view('interface_assets/header', $data);
$this->load->view('webadif/mark_webadif', $data);
$this->load->view('interface_assets/footer');
}
}

58
application/migrations/115_add_webadif_api_export.php 普通文件
查看文件

@ -0,0 +1,58 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
class Migration_add_webadif_api_export extends CI_Migration {
public function up()
{
if (!$this->db->field_exists('webadifapikey', 'station_profile')) {
$fields = array(
'webadifapikey varchar(50) DEFAULT NULL'
);
$this->dbforge->add_column('station_profile', $fields);
}
if (!$this->db->field_exists('webadifapiurl', 'station_profile')) {
$fields = array(
'webadifapiurl varchar(256) DEFAULT NULL'
);
$this->dbforge->add_column('station_profile', $fields);
}
if (!$this->db->field_exists('webadifrealtime', 'station_profile')) {
$fields = array(
'webadifrealtime bool DEFAULT FALSE'
);
$this->dbforge->add_column('station_profile', $fields);
}
if (!$this->db->table_exists('webadif')) {
$this->dbforge->add_field(array(
'id' => array(
'type' => 'INT',
'auto_increment' => TRUE
),
'qso_id' => array(
'type' => 'int',
),
'upload_date' => array(
'type' => 'datetime',
),
));
$this->dbforge->add_key('id', TRUE);
$this->dbforge->add_key(array('qso_id','upload_date'), FALSE);
$this->dbforge->create_table('webadif');
}
}
public function down()
{
$this->dbforge->drop_column('station_profile', 'webadifapikey');
$this->dbforge->drop_column('station_profile', 'webadifapiurl');
$this->dbforge->drop_column('station_profile', 'webadifrealtime');
$this->dbforge->drop_table('webadif');
}
}

249
application/models/Logbook_model.php
查看文件

@ -481,6 +481,25 @@ class Logbook_model extends CI_Model {
$this->mark_qrz_qsos_sent($last_id);
}
}
$result = $this->exists_webadif_api_key($data['station_id']);
// Push qso to webadif if apikey is set, and realtime upload is enabled, and we're not importing an adif-file
if (isset($result->webadifapikey) && $result->webadifrealtime == 1) {
$CI =& get_instance();
$CI->load->library('AdifHelper');
$qso = $this->get_qso($last_id)->result();
$adif = $CI->adifhelper->getAdifLine($qso[0]);
$result = $this->push_qso_to_webadif(
$result->webadifapiurl,
$result->webadifapikey,
$adif
);
if ($result) {
$this->mark_webadif_qsos_sent($last_id);
}
}
}
}
@ -503,6 +522,25 @@ class Logbook_model extends CI_Model {
}
}
/*
* Function checks if a WebADIF API Key exists in the table with the given station id
*/
function exists_webadif_api_key($station_id) {
$sql = 'select webadifapikey, webadifapiurl, webadifrealtime from station_profile
where station_id = ' . $station_id;
$query = $this->db->query($sql);
$result = $query->row();
if ($result) {
return $result;
}
else {
return false;
}
}
/*
* Function uploads a QSO to QRZ with the API given.
* $adif contains a line with the QSO in the ADIF format. QSO ends with an <EOR>
@ -545,6 +583,36 @@ class Logbook_model extends CI_Model {
curl_close($ch);
}
/*
* Function uploads a QSO to WebADIF consumer with the API given.
* $adif contains a line with the QSO in the ADIF format.
*/
function push_qso_to_webadif($url, $apikey, $adif) : bool{
$headers = array(
'Content-Type: text/plain',
'X-API-Key: ' . $apikey
);
if (substr($url, -1) !== "/") {
$url .= "/";
}
$ch = curl_init( $url . "qso");
curl_setopt( $ch, CURLOPT_POST, true);
curl_setopt( $ch, CURLOPT_POSTFIELDS, (string)$adif);
curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
curl_setopt( $ch, CURLOPT_HEADER, 0);
curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers);
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true);
$content = curl_exec($ch); // TODO: better error handling
$errors = curl_error($ch);
$response = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
return $response === 200;
}
/*
* Function marks QSOs as uploaded to QRZ.
* $primarykey is the unique id for that QSO in the logbook
@ -562,6 +630,22 @@ class Logbook_model extends CI_Model {
return true;
}
/*
* Function marks QSOs as uploaded to WebADIF.
* $primarykey is the unique id for that QSO in the logbook
*/
function mark_webadif_qsos_sent($primarykey)
{
$data = array(
'upload_date' => date("Y-m-d H:i:s", strtotime("now")),
'qso_id' => $primarykey,
);
$this->db->insert('webadif', $data);
return true;
}
function upload_amsat_status($data) {
$sat_name = '';
if ($data['COL_SAT_NAME'] == 'AO-7') {
@ -1038,34 +1122,34 @@ class Logbook_model extends CI_Model {
return $this->db->get($this->config->item('table_name'));
}
// Set Paper to received
function paperqsl_update($qso_id, $method) {
$data = array(
'COL_QSLRDATE' => date('Y-m-d H:i:s'),
'COL_QSL_RCVD' => 'Y',
'COL_QSL_RCVD_VIA' => $method
);
$this->db->where('COL_PRIMARY_KEY', $qso_id);
$this->db->update($this->config->item('table_name'), $data);
}
// Set Paper to sent
function paperqsl_update_sent($qso_id, $method) {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => 'Y',
'COL_QSL_SENT_VIA' => $method
);
$this->db->where('COL_PRIMARY_KEY', $qso_id);
$this->db->update($this->config->item('table_name'), $data);
}
@ -1191,6 +1275,47 @@ class Logbook_model extends CI_Model {
return $query;
}
/*
* Function returns the QSOs from the logbook, which have not been either marked as uploaded to webADIF
*/
function get_webadif_qsos($station_id,$from, $to){
$sql = "
SELECT qsos.*, station_profile.*
FROM %s qsos
INNER JOIN station_profile ON qsos.station_id = station_profile.station_id
LEFT JOIN webadif ON qsos.COL_PRIMARY_KEY = webadif.qso_id
WHERE qsos.station_id = %d
AND webadif.upload_date IS NULL
";
$sql = sprintf(
$sql,
$this->config->item('table_name'),
$station_id
);
if ($from) {
$from = DateTime::createFromFormat('d/m/Y', $from);
$from = $from->format('Y-m-d');
$sql.=" AND qsos.COL_TIME_ON >= %s";
$sql=sprintf(
$sql,
$this->db->escape($from)
);
}
if ($to) {
$to = DateTime::createFromFormat('d/m/Y', $to);
$to = $to->format('Y-m-d');
$sql.=" AND qsos.COL_TIME_ON <= %s";
$sql=sprintf(
$sql,
$this->db->escape($to)
);
}
return $this->db->query($sql);
}
/*
* Function returns all the station_id's with QRZ API Key's
*/
@ -1210,6 +1335,26 @@ class Logbook_model extends CI_Model {
}
}
/*
* Function returns all the station_id's with QRZ API Key's
*/
function get_station_id_with_webadif_api() {
$sql = "
SELECT station_id, webadifapikey, webadifapiurl
FROM station_profile
WHERE COALESCE(webadifapikey, '') <> ''
AND COALESCE(webadifapiurl, '') <> ''
";
$query = $this->db->query($sql);
$result = $query->result();
if ($result) {
return $result;
} else {
return null;
}
}
function get_last_qsos($num, $StationLocationsArray = null) {
if($StationLocationsArray == null) {
@ -1219,10 +1364,10 @@ class Logbook_model extends CI_Model {
} else {
$logbooks_locations_array = $StationLocationsArray;
}
if ($logbooks_locations_array) {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = "SELECT * FROM ( select * from " . $this->config->item('table_name'). "
WHERE station_id IN(". $location_list .")
order by col_time_on desc, col_primary_key desc
@ -1233,12 +1378,12 @@ class Logbook_model extends CI_Model {
order by col_time_on desc, col_primary_key desc";
$query = $this->db->query($sql);
return $query;
} else {
return null;
}
}
/* Get all QSOs with a valid grid for use in the KML export */
@ -1390,7 +1535,7 @@ class Logbook_model extends CI_Model {
} else {
return null;
}
}
/* Return QSOs over a period of days */
@ -1465,7 +1610,7 @@ class Logbook_model extends CI_Model {
// Return QSOs made during the current month
function month_qsos($StationLocationsArray = null) {
if($StationLocationsArray == null) {
if($StationLocationsArray == null) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -1617,17 +1762,17 @@ class Logbook_model extends CI_Model {
if ($searchCriteria['mode'] !== '') {
$this->db->group_start();
$this->db->where('COL_MODE', $searchCriteria['mode']);
$this->db->where('COL_MODE', $searchCriteria['mode']);
$this->db->or_where('COL_SUBMODE', $searchCriteria['mode']);
$this->db->group_end();
}
if ($searchCriteria['band'] !== '') {
if($searchCriteria['band'] != "SAT") {
$this->db->where('COL_BAND', $searchCriteria['band']);
$this->db->where('COL_PROP_MODE != "SAT"');
$this->db->where('COL_BAND', $searchCriteria['band']);
$this->db->where('COL_PROP_MODE != "SAT"');
} else {
$this->db->where('COL_PROP_MODE', 'SAT');
$this->db->where('COL_PROP_MODE', 'SAT');
}
}
@ -1746,7 +1891,7 @@ class Logbook_model extends CI_Model {
}
function get_QSLStats($StationLocationsArray = null) {
if($StationLocationsArray == null) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
@ -1872,7 +2017,7 @@ class Logbook_model extends CI_Model {
$query = $this->db->get($this->config->item('table_name'));
$row = $query->row();
if($row == null) {
return 0;
} else {
@ -1995,7 +2140,7 @@ class Logbook_model extends CI_Model {
$this->db->where('COL_COUNTRY !=', 'Invalid');
$this->db->where('COL_DXCC >', '0');
$query = $this->db->get($this->config->item('table_name'));
return $query->num_rows();
} else {
return 0;
@ -2028,7 +2173,7 @@ class Logbook_model extends CI_Model {
/* Return total number of countries confirmed with along with qsl types confirmed */
function total_countries_confirmed($StationLocationsArray = null) {
if($StationLocationsArray == null) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
@ -2040,7 +2185,7 @@ class Logbook_model extends CI_Model {
if(!empty($logbooks_locations_array)) {
$this->db->select('COUNT(DISTINCT COL_COUNTRY) as Countries_Worked,
COUNT(DISTINCT IF(COL_QSL_RCVD = "Y", COL_COUNTRY, NULL)) as Countries_Worked_QSL,
COUNT(DISTINCT IF(COL_EQSL_QSL_RCVD = "Y", COL_COUNTRY, NULL)) as Countries_Worked_EQSL,
COUNT(DISTINCT IF(COL_EQSL_QSL_RCVD = "Y", COL_COUNTRY, NULL)) as Countries_Worked_EQSL,
COUNT(DISTINCT IF(COL_LOTW_QSL_RCVD = "Y", COL_COUNTRY, NULL)) as Countries_Worked_LOTW');
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_COUNTRY !=', 'Invalid');
@ -2346,7 +2491,7 @@ class Logbook_model extends CI_Model {
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->where("coalesce(station_profile.eqslqthnickname, '') <> ''");
$this->db->where($this->config->item('table_name').'.COL_CALL !=', '');
$this->db->group_start();
$this->db->group_start();
$this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT is null');
$this->db->or_where($this->config->item('table_name').'.COL_EQSL_QSL_SENT', '');
$this->db->or_where($this->config->item('table_name').'.COL_EQSL_QSL_SENT', 'R');
@ -2858,11 +3003,11 @@ class Logbook_model extends CI_Model {
'COL_WWFF_REF' => (!empty($record['wwff_ref'])) ? $record['wwff_ref'] : '',
'COL_POTA_REF' => (!empty($record['pota_ref'])) ? $record['pota_ref'] : '',
'COL_SRX' => (!empty($record['srx'])) ? (int)$record['srx'] : null,
//convert to integer to make sure no invalid entries are imported
//convert to integer to make sure no invalid entries are imported
'COL_SRX_STRING' => (!empty($record['srx_string'])) ? $record['srx_string'] : '',
'COL_STATE' => (!empty($record['state'])) ? strtoupper($record['state']) : '',
'COL_STATION_CALLSIGN' => (!empty($record['station_callsign'])) ? $record['station_callsign'] : '',
//convert to integer to make sure no invalid entries are imported
//convert to integer to make sure no invalid entries are imported
'COL_STX' => (!empty($record['stx'])) ? (int)$record['stx'] : null,
'COL_STX_STRING' => (!empty($record['stx_string'])) ? $record['stx_string'] : '',
'COL_SUBMODE' => $input_submode,
@ -2971,14 +3116,14 @@ class Logbook_model extends CI_Model {
$callsign = $matches[3][0];
$suffix = $matches[5][0];
if ($prefix) {
$prefix = substr($prefix, 0, -1); # Remove the / at the end
$prefix = substr($prefix, 0, -1); # Remove the / at the end
}
if ($suffix) {
$suffix = substr($suffix, 1); # Remove the / at the beginning
};
if (preg_match($csadditions, $suffix)) {
if ($prefix) {
$call = $prefix;
$call = $prefix;
} else {
$call = $callsign;
}
@ -3052,7 +3197,7 @@ class Logbook_model extends CI_Model {
$call = "3D2/C"; # will match with Conway
} elseif (preg_match('/(^LZ\/)|(\/LZ[1-9]?$)/', $call)) { # LZ/ is LZ0 by DXCC but this is VP8h
$call = "LZ";
} elseif (preg_match('/(^KG4)[A-Z09]{2}/', $call)) {
} elseif (preg_match('/(^KG4)[A-Z09]{2}/', $call)) {
$call = "KG4";
} elseif (preg_match('/(^KG4)[A-Z09]{1}/', $call)) {
$call = "K";
@ -3062,14 +3207,14 @@ class Logbook_model extends CI_Model {
$callsign = $matches[3][0];
$suffix = $matches[5][0];
if ($prefix) {
$prefix = substr($prefix, 0, -1); # Remove the / at the end
$prefix = substr($prefix, 0, -1); # Remove the / at the end
}
if ($suffix) {
$suffix = substr($suffix, 1); # Remove the / at the beginning
};
if (preg_match($csadditions, $suffix)) {
if ($prefix) {
$call = $prefix;
$call = $prefix;
} else {
$call = $callsign;
}
@ -3120,38 +3265,38 @@ class Logbook_model extends CI_Model {
$a = '';
$b = '';
$c = '';
$lidadditions = '/^QRP$|^LGT$/';
$csadditions = '/^P$|^R$|^A$|^M$|^LH$/';
$noneadditions = '/^MM$|^AM$/';
# First check if the call is in the proper format, A/B/C where A and C
# are optional (prefix of guest country and P, MM, AM etc) and B is the
# callsign. Only letters, figures and "/" is accepted, no further check if the
# callsign "makes sense".
# 23.Apr.06: Added another "/X" to the regex, for calls like RV0AL/0/P
# as used by RDA-DXpeditions....
if (preg_match_all('/^((\d|[A-Z])+\/)?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?$/', $testcall, $matches)) {
# Now $1 holds A (incl /), $3 holds the callsign B and $5 has C
# We save them to $a, $b and $c respectively to ensure they won't get
# We save them to $a, $b and $c respectively to ensure they won't get
# lost in further Regex evaluations.
$a = $matches[1][0];
$b = $matches[3][0];
$c = $matches[5][0];
if ($a) {
$a = substr($a, 0, -1); # Remove the / at the end
$a = substr($a, 0, -1); # Remove the / at the end
}
if ($c) {
$c = substr($c, 1); # Remove the / at the beginning
};
# In some cases when there is no part A but B and C, and C is longer than 2
# letters, it happens that $a and $b get the values that $b and $c should
# have. This often happens with liddish callsign-additions like /QRP and
# /LGT, but also with calls like DJ1YFK/KP5. ~/.yfklog has a line called
# /LGT, but also with calls like DJ1YFK/KP5. ~/.yfklog has a line called
# "lidadditions", which has QRP and LGT as defaults. This sorts out half of
# the problem, but not calls like DJ1YFK/KH5. This is tested in a second
# try: $a looks like a call (.\d[A-Z]) and $b doesn't (.\d), they are
@ -3167,32 +3312,32 @@ class Logbook_model extends CI_Model {
$a = $temp;
}
}
# *** Added later *** The check didn't make sure that the callsign
# contains a letter. there are letter-only callsigns like RAEM, but not
# figure-only calls.
# figure-only calls.
if (preg_match('/^[0-9]+$/', $b)) { # Callsign only consists of numbers. Bad!
return null; # exit, undef
}
# Depending on these values we have to determine the prefix.
# Following cases are possible:
#
# 1. $a and $c undef --> only callsign, subcases
# 1.1 $b contains a number -> everything from start to number
# 1.2 $b contains no number -> first two letters plus 0
# 1.2 $b contains no number -> first two letters plus 0
# 2. $a undef, subcases:
# 2.1 $c is only a number -> $a with changed number
# 2.2 $c is /P,/M,/MM,/AM -> 1.
# 2.2 $c is /P,/M,/MM,/AM -> 1.
# 2.3 $c is something else and will be interpreted as a Prefix
# 3. $a is defined, will be taken as PFX, regardless of $c
# 3. $a is defined, will be taken as PFX, regardless of $c
if (($a == null) && ($c == null)) { # Case 1
if (preg_match('/\d/', $b)) { # Case 1.1, contains number
preg_match('/(.+\d)[A-Z]*/', $b, $matches); # Prefix is all but the last
$prefix = $matches[1]; # Letters
} else { # Case 1.2, no number
} else { # Case 1.2, no number
$prefix = substr($b, 0, 2) . "0"; # first two + 0
}
} elseif (($a == null) && (isset($c))) { # Case 2, CALL/X
@ -3204,12 +3349,12 @@ class Logbook_model extends CI_Model {
# like N66A/7 -> N7 this brings the wrong result of N67, but I
# think that's rather irrelevant cos such calls rarely appear
# and if they do, it's very unlikely for them to have a number
# attached. You can still edit it by hand anyway..
# attached. You can still edit it by hand anyway..
if (preg_match('/^([A-Z]\d)\d$/', $matches[1])) { # e.g. A45 $c = 0
$prefix = $matches[1] . $c; # -> A40
} else { # Otherwise cut all numbers
preg_match('/(.*[A-Z])\d+/', $matches[1], $match); # Prefix w/o number in $1
$prefix = $match[1] . $c; # Add attached number
$prefix = $match[1] . $c; # Add attached number
}
} elseif (preg_match($csadditions, $c)) {
preg_match('/(.+\d)[A-Z]*/', $b, $matches); # Known attachment -> like Case 1.1
@ -3241,7 +3386,7 @@ class Logbook_model extends CI_Model {
# case, the superfluous part will be cropped. Since this, however, changes the
# DXCC of the prefix, this will NOT happen when invoked from with an
# extra parameter $_[1]; this will happen when invoking it from &dxcc.
if (preg_match('/(\w+\d)[A-Z]+\d/', $prefix, $matches) && $i == null) {
$prefix = $matches[1][0];
}

53
application/models/Stations.php
查看文件

@ -81,10 +81,13 @@ class Stations extends CI_Model {
'oqrs' => xss_clean($this->input->post('oqrs', true)),
'oqrs_email' => xss_clean($this->input->post('oqrsemail', true)),
'oqrs_text' => xss_clean($this->input->post('oqrstext', true)),
'webadifapikey' => xss_clean($this->input->post('webadifapikey', true)),
'webadifapiurl' => 'https://qo100dx.club/api',
'webadifrealtime' => xss_clean($this->input->post('webadifrealtime', true)),
);
// Insert Records
$this->db->insert('station_profile', $data);
$this->db->insert('station_profile', $data);
}
function edit() {
@ -111,11 +114,14 @@ class Stations extends CI_Model {
'oqrs' => xss_clean($this->input->post('oqrs', true)),
'oqrs_email' => xss_clean($this->input->post('oqrsemail', true)),
'oqrs_text' => xss_clean($this->input->post('oqrstext', true)),
'webadifapikey' => xss_clean($this->input->post('webadifapikey', true)),
'webadifapiurl' => 'https://qo100dx.club/api',
'webadifrealtime' => xss_clean($this->input->post('webadifrealtime', true)),
);
$this->db->where('user_id', $this->session->userdata('user_id'));
$this->db->where('station_id', xss_clean($this->input->post('station_id', true)));
$this->db->update('station_profile', $data);
$this->db->update('station_profile', $data);
}
function delete($id) {
@ -132,7 +138,7 @@ class Stations extends CI_Model {
$this->db->delete($this->config->item('table_name'));
// Delete Station Profile
$this->db->delete('station_profile', array('station_id' => $clean_id));
$this->db->delete('station_profile', array('station_id' => $clean_id));
}
function deletelog($id) {
@ -145,7 +151,7 @@ class Stations extends CI_Model {
$data = array(
'user_id' => $this->session->userdata('user_id'),
);
$this->db->where('station_id', $id);
$this->db->update('station_profile', $data);
}
@ -160,7 +166,7 @@ class Stations extends CI_Model {
$data = array(
'user_id' => $id,
);
$this->db->update('station_profile', $data);
}
@ -192,7 +198,7 @@ class Stations extends CI_Model {
$this->db->where('user_id', $this->session->userdata('user_id'));
$this->db->update('station_profile', $current_default);
// Deselect current default
// Deselect current default
$newdefault = array(
'station_active' => 1,
);
@ -215,7 +221,7 @@ class Stations extends CI_Model {
return "0";
}
}
public function find_gridsquare() {
$this->db->where('user_id', $this->session->userdata('user_id'));
$this->db->where('station_active', 1);
@ -262,7 +268,7 @@ class Stations extends CI_Model {
);
$this->db->where('COL_STATION_CALLSIGN', $row->station_callsign);
if($row->station_iota != "") {
$this->db->where('COL_MY_IOTA', $row->station_iota);
}
@ -307,7 +313,7 @@ class Stations extends CI_Model {
return 1;
} else {
return 0;
}
}
}
function stations_with_qrz_api_key() {
@ -339,6 +345,35 @@ class Stations extends CI_Model {
return $query;
}
function stations_with_webadif_api_key() {
$sql="
SELECT station_profile.station_id, station_profile.station_profile_name, station_profile.station_callsign, notc.c notcount, totc.c totcount
FROM station_profile
INNER JOIN (
SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c
FROM %s qsos
LEFT JOIN webadif ON qsos.COL_PRIMARY_KEY = webadif.qso_id
WHERE webadif.qso_id IS NULL
GROUP BY qsos.station_id
) notc ON station_profile.station_id = notc.station_id
INNER JOIN (
SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c
FROM %s qsos
GROUP BY qsos.station_id
) totc ON station_profile.station_id = totc.station_id
WHERE COALESCE(station_profile.webadifapikey, '') <> ''
AND COALESCE(station_profile.webadifapiurl, '') <> ''
AND station_profile.user_id = %d
";
$sql=sprintf(
$sql,
$this->config->item('table_name'),
$this->config->item('table_name'),
$this->session->userdata('user_id')
);
return $this->db->query($sql);
}
/*
* Function: are_eqsl_nicks_defined
* Description: Returns number of station profiles with eqslnicknames

35
application/views/interface_assets/footer.php
查看文件

@ -71,7 +71,7 @@ function load_was_map() {
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/continents.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "adif" || $this->uri->segment(1) == "qrz") { ?>
<?php if ($this->uri->segment(1) == "adif" || $this->uri->segment(1) == "qrz" || $this->uri->segment(1) == "webadif") { ?>
<!-- Javascript used for ADIF Import and Export Areas -->
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/tempusdominus-bootstrap-4.min.js"></script>
@ -113,7 +113,7 @@ function load_was_map() {
console.log("'clicked");
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(showPosition);
} else {
} else {
console.log('Geolocation is not supported by this browser.');
}
}
@ -374,7 +374,7 @@ $(function () {
$(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The stored query has been deleted!</div>');
$("#query_" + id).remove(); // removes query from table in dialog
$("#querydropdown option[value='" + id + "']").remove(); // removes query from dropdown
if ($("#querydropdown option").length == 0) {
if ($("#querydropdown option").length == 0) {
$("#btn-edit").remove();
$('.querydropdownform').remove();
};
@ -560,7 +560,7 @@ function newpath(latlng1, latlng2, locator1, locator2) {
var osmUrl='<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
var redIcon = L.icon({
iconUrl: icon_dot_url,
@ -613,7 +613,7 @@ function showActivatorsMap(call, count, grids) {
var osmUrl='<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
map.addLayer(osm);
}
@ -741,13 +741,13 @@ function showActivatorsMap(call, count, grids) {
});
$(function () {
// hold onto the drop down menu
// hold onto the drop down menu
var dropdownMenu;
// and when you show it, move it to the body
// and when you show it, move it to the body
$(window).on('show.bs.dropdown', function (e) {
// grab the menu
// grab the menu
dropdownMenu = $(e.target).find('.dropdown-menu');
// detach it and append it to the body
@ -764,7 +764,7 @@ function showActivatorsMap(call, count, grids) {
});
});
// and when you hide it, reattach the drop down, and hide it normally
// and when you hide it, reattach the drop down, and hide it normally
$(window).on('hide.bs.dropdown', function (e) {
$(e.target).append(dropdownMenu.detach());
dropdownMenu.hide();
@ -893,7 +893,7 @@ $(document).on('keypress',function(e) {
<?php if ($this->uri->segment(1) == "qso") { ?>
<script src="<?php echo base_url() ;?>assets/js/sections/qso.js"></script>
<?php
<?php
$this->load->model('stations');
$active_station_id = $this->stations->find_active();
@ -1600,6 +1600,9 @@ $(document).ready(function(){
<?php if ($this->uri->segment(1) == "qrz") { ?>
<script src="<?php echo base_url(); ?>assets/js/sections/qrzlogbook.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "webadif") { ?>
<script src="<?php echo base_url(); ?>assets/js/sections/webadif.js"></script>
<?php } ?>
<script>
function displayQso(id) {
@ -1627,7 +1630,7 @@ $(document).ready(function(){
attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
}).addTo(mymap);
var printer = L.easyPrint({
tileLayer: tiles,
sizeModes: ['Current'],
@ -1849,7 +1852,7 @@ $(document).ready(function(){
<?php } ?>
<script>
function selectize_usa_county() {
var baseURL= "<?php echo base_url();?>";
$('#stationCntyInputEdit').selectize({
@ -2048,7 +2051,7 @@ $(document).ready(function(){
<script src="<?php echo base_url(); ?>assets/js/sections/timeplot.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "qsl") {
<?php if ($this->uri->segment(1) == "qsl") {
// Get Date format
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
@ -2069,7 +2072,7 @@ $(document).ready(function(){
case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
case 'M d, y': $usethisformat = 'MMM D, YY';break;
}
?>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
@ -2085,8 +2088,8 @@ $(document).ready(function(){
"scrollX": true,
"order": [ 2, 'desc' ],
});
</script>
<?php } ?>

6
application/views/interface_assets/header.php
查看文件

@ -40,7 +40,7 @@
<?php if ($this->uri->segment(1) == "adif" || (isset($hasDatePicker) && $hasDatePicker)) { ?>
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
<?php } ?>
<?php if (file_exists(APPPATH.'../assets/css/custom.css')) { echo '<link rel="stylesheet" href="'.base_url().'assets/css/custom.css">'; } ?>
<link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
@ -215,7 +215,7 @@
<a class="dropdown-item" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> Account</a>
<a class="dropdown-item" href="<?php echo site_url('logbooks');?>" title="Manage station logbooks"><i class="fas fa-home"></i> Station Logbooks</a>
<a class="dropdown-item" href="<?php echo site_url('station');?>" title="Manage station locations"><i class="fas fa-home"></i> Station Locations</a>
<a class="dropdown-item" href="<?php echo site_url('band');?>" title="Manage Bands"><i class="fas fa-cog"></i> Bands</a>
@ -257,6 +257,8 @@ $oqrs_requests = $CI->oqrs_model->oqrs_requests($location_list);
<a class="dropdown-item" href="<?php echo site_url('qrz/export');?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> QRZ Logbook</a>
<a class="dropdown-item" href="<?php echo site_url('webadif/export');?>" title="Upload to webADIF"><i class="fas fa-sync"></i> QO-100 Dx Club Upload</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('api/help');?>" title="Manage API keys"><i class="fas fa-key"></i> API Keys</a>

15
application/views/station_profile/create.php
查看文件

@ -241,6 +241,21 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-6">
<label for="webadifApiKey"> QO-100 Dx Club API Key </label>
<input type="text" class="form-control" name="webadifapikey" id="webadifApiKey" aria-describedby="webadifApiKeyHelp">
<small id="webadifApiKeyHelp" class="form-text text-muted">Create your API key on <a href="https://qo100dx.club" target="_blank">your QO-100 Dx Club's profile page</a></small>
</div>
<div class="form-group col-sm-6">
<label for="webadifrealtime">QO-100 Dx Club Realtime Upload</label>
<select class="custom-select" id="webadifrealtime" name="webadifrealtime">
<option value="1">Yes</option>
<option value="0" selected>No</option>
</select>
</div>
</div>
<div class="form-group">
<label for="oqrs">OQRS Enabled</label>
<select class="custom-select" id="oqrs" name="oqrs">

21
application/views/station_profile/edit.php
查看文件

@ -356,6 +356,27 @@
</div>
</div>
<div class="row">
<div class="col-md">
<div class="card">
<h5 class="card-header">QO-100 Dx Club</h5>
<div class="card-body">
<div class="form-group">
<label for="webadifApiKey">QO-100 Dx Club API Key</label>
<input type="text" class="form-control" name="webadifapikey" id="webadifApiKey" aria-describedby="webadifApiKeyHelp" value="<?php if(set_value('webadifapikey') != "") { echo set_value('webadifapikey'); } else { echo $my_station_profile->webadifapikey; } ?>">
<small id="webadifApiKeyHelp" class="form-text text-muted">Create your API key on <a href="https://qo100dx.club" target="_blank">your QO-100 Dx Club's profile page</a></small>
</div>
<div class="form-group">
<label for="webadifrealtime">QO-100 Dx Club Realtime Upload</label>
<select class="custom-select" id="webadifrealtime" name="webadifrealtime">
<option value="1" <?php if ($my_station_profile->webadifrealtime == 1) { echo " selected =\"selected\""; } ?>>Yes</option>
<option value="0" <?php if ($my_station_profile->webadifrealtime == 0) { echo " selected =\"selected\""; } ?>>No</option>
</select>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md">
<div class="card">

93
application/views/webadif/export.php 普通文件
查看文件

@ -0,0 +1,93 @@
<div class="container adif">
<h2><?php echo $page_title; ?></h2>
<div class="card">
<div class="card-header">
<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="export-tab" data-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
</li>
<li class="nav-item">
<a class="nav-link" id="mark-tab" data-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
</li>
</ul>
</div>
<div class="card-body">
<div class="tab-content">
<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
<p>Here you can see and upload all QSOs which have not been previously uploaded to QO-100 Dx Club.</p>
<p>You need to set a QO-100 Dx Club API key in your station profile. Only station profiles with an API Key are displayed.</p>
<p><span class="badge badge-warning">Warning</span>This might take a while as QSO uploads are processed sequentially.</p>
<?php
if ($station_profile->result()) {
echo '
<table class="table table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>Profile name</td>
<td>Station callsign</td>
<td>Total QSOs not uploaded</td>
<td>Total QSOs uploaded</td>
<td>Actions</td>
</thead>
<tbody>';
foreach ($station_profile->result() as $station) { // Fills the table with the data
echo '<tr>';
echo '<td>' . $station->station_profile_name . '</td>';
echo '<td>' . $station->station_callsign . '</td>';
echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
echo '<td><button id="webadifUpload" type="button" name="webadifUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportWebADIF('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
echo '</tr>';
}
echo '</tfoot></table>';
}
else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
?>
</div>
<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
<form class="form" action="<?php echo site_url('webadif/mark_webadif'); ?>" method="post" enctype="multipart/form-data">
<select name="station_profile" class="custom-select mb-4 mr-sm-4" style="width: 30%;">
<option value="0">Select Station Location</option>
<?php foreach ($station_profiles->result() as $station) { ?>
<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
<?php } ?>
</select>
<p><span class="badge badge-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
<p class="card-text">From date:</p>
<div class="row">
<div class="input-group date col-md-3" id="datetimepicker5" data-target-input="nearest">
<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
<div class="input-group-append" data-target="#datetimepicker5" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
</div>
<p class="card-text">To date:</p>
<div class="row">
<div class="input-group date col-md-3" id="datetimepicker6" data-target-input="nearest">
<input name="to" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
<div class="input-group-append" data-target="#datetimepicker6" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
</div>
<br>
<button type="button" id="markWebAdifAsExported" class="btn-sm btn-primary" value="Export">Mark QSOs as exported to QO-100 Dx Club</button>
</form>
</div>
</div>
</div>
</div>
</div>

22
application/views/webadif/mark_webadif.php 普通文件
查看文件

@ -0,0 +1,22 @@
<div class="container">
<br>
<?php if($this->session->flashdata('message')) { ?>
<!-- Display Message -->
<div class="alert-message error">
<p><?php echo $this->session->flashdata('message'); ?></p>
</div>
<?php } ?>
<div class="card">
<div class="card-header">
QSOs marked
</div>
<div class="card-body">
<h3 class="card-title">Yay, it's done!</h3>
<p class="card-text">The QSOs are marked as exported to QO-100 Dx Club.</p>
</div>
</div>
</div>

70
assets/js/sections/webadif.js 普通文件
查看文件

@ -0,0 +1,70 @@
$(function () {
$('#datetimepicker5').datetimepicker({
format: 'DD/MM/YYYY',
});
});
$(function () {
$('#datetimepicker6').datetimepicker({
format: 'DD/MM/YYYY',
});
});
$(document).ready(function(){
$('#markWebAdifAsExported').click(function(e){
let form = $(this).closest('form');
let station = form.find('select[name=station_profile]');
if (station.val() == 0) {
station.addClass('is-invalid');
}else{
form.submit();
}
})
});
function ExportWebADIF(station_id) {
if ($(".alert").length > 0) {
$(".alert").remove();
}
if ($(".errormessages").length > 0) {
$(".errormessages").remove();
}
$(".ld-ext-right").addClass('running');
$(".ld-ext-right").prop('disabled', true);
$.ajax({
url: base_url + 'index.php/webadif/upload_station',
type: 'post',
data: {'station_id': station_id},
success: function (data) {
$(".ld-ext-right").removeClass('running');
$(".ld-ext-right").prop('disabled', false);
if (data.status == 'OK') {
$.each(data.info, function(index, value){
$('#notcount'+value.station_id).html(value.notcount);
$('#totcount'+value.station_id).html(value.totcount);
});
$(".card-body").append('<div class="alert alert-success" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.infomessage + '</div>');
}
else {
$(".card-body").append('<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.info + '</div>');
}
if (data.errormessages.length > 0) {
$(".card-body").append('' +
'<div class="errormessages"><p>\n' +
' <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' +
' Show error messages\n' +
' </button>\n' +
' </p>\n' +
' <div class="collapse" id="collapseExample">\n' +
' <div class="card card-body"><div class="errors"></div>\n' +
' </div>\n' +
' </div></div>');
$.each(data.errormessages, function(index, value) {
$(".errors").append('<li>' + value);
});
}
}
});
}