Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

find_key refactor

Browse Source
This commit is contained in:
int2001
2025-08-21 08:58:27 +00:00
parent 3090048250
commit 5c71d90fa3
2 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
application/controllers/Dcl.php
View File

@@ -91,7 +91,7 @@ class Dcl extends CI_Controller {
}
if ($this->user_model->authorize(2)) {
if (!($this->config->item('disable_manual_lotw'))) {
if (!($this->config->item('disable_manual_dcl'))) {
$station_profiles = $this->Stations->all_of_user($this->session->userdata('user_id'));
$sync_user_id=$this->session->userdata('user_id');
} else {
@@ -113,7 +113,6 @@ class Dcl extends CI_Controller {
foreach ($station_profiles->result() as $station_profile) {
log_message("Error",$station_profile->station_id);
// Get Certificate Data
$this->load->model('Dcl_model');
$data['station_profile'] = $station_profile;
@@ -140,28 +139,10 @@ class Dcl extends CI_Controller {
}
// Build File to save
$adif_to_save = $this->load->view('adif/data/dcl.php', $data, TRUE);
$adif_to_post = $this->load->view('adif/data/dcl.php', $data, TRUE);
// create folder to store upload file
if (!file_exists('./uploads/dcl')) {
mkdir('./uploads/dcl', 0775, true);
}
// Build Filename
$filename_for_saving = './uploads/dcl/'.preg_replace('/[^a-z0-9]+/', '-', strtolower($key_info['token']))."-".date("Y-m-d-H-i-s")."-wavelog.adif";
$fp = fopen($filename_for_saving, "w");
fwrite($fp, $adif_to_save);
fclose($fp);
//The URL that accepts the file upload.
$url = 'https://dclnext.darc.de';
//The name of the field for the uploaded file.
$uploadFieldName = 'upfile';
//The full path to the file that you want to upload
$filePath = realpath($filename_for_saving);
$url = 'http://127.0.0.1:9999'; // todo: final URL
//Initiate cURL
$ch = curl_init();
@@ -175,16 +156,9 @@ class Dcl extends CI_Controller {
//Tell cURL to return the output as a string.
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
//Use the recommended way, creating a CURLFile object.
$uploadfile = curl_file_create($filePath);
$uploadfile->setPostFilename(basename($filePath));
curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Content-Type: text/plain']);
//Setup our POST fields
$postFields = array(
$uploadFieldName => $uploadfile
);
curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
curl_setopt($ch, CURLOPT_POSTFIELDS, $adif_to_post);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
// todo: uncomment when ready

18
application/models/Dcl_model.php
View File

@@ -19,12 +19,17 @@ class Dcl_model extends CI_Model {
function find_key($callsign, $user_id) {
$this->load->model('user_options_model');
$userkeys=$this->user_options_model->get_options('dcl', array('option_name'=>'dcl_key','option_key'=>'key'), $user_id)->result();
foreach ($userkeys->Callsigns as $item) {
if (isset($item['callsign']) && strtoupper($item['callsign']) === strtoupper($callsign)) {
$key['token']=$userkeys->UserKeys->token;
$key['vt']=strtotime($item->startDate);
$key['vf']=strtotime($item->endDate ?? '2099-12-31');
return $key;
foreach ($userkeys as $raw_key) {
$skey=json_decode($raw_key->option_value, true);
if (isset($skey['Callsigns']) && is_array($skey['Callsigns'])) {
foreach ($skey['Callsigns'] as $item) {
if (isset($item['callsign']) && strtoupper($item['callsign']) === strtoupper($callsign)) {
$key['token']=$skey['UserKeys']['token'];
$key['vt']=strtotime($item['startDate']);
$key['vf']=strtotime($item['endDate'] ?? '2099-12-31');
return $key;
}
}
}
}
return '';
@@ -55,7 +60,6 @@ class Dcl_model extends CI_Model {
curl_close($ch);
if (strlen($rawdcldata)>100) {
$dcldata=json_decode($rawdcldata);
// todo: process Data from DCL (Contains valid call(s), valid date, DOK)
return $dcldata;
}
} catch (Exception $e) {