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

Merge branch 'dev' into qrg

Browse Source
This commit is contained in:
HB9HIL
2024-07-05 21:53:36 +02:00
committed by GitHub
parent e6e9694daf afbe1b6ebf
commit f437bcf052
36 changed files with 4917 additions and 4208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/Awards.php
View File

@@ -800,11 +800,11 @@ class Awards extends CI_Controller {
$data['modes'] = $this->modes->active(); // Used in the view for mode select
if($this->input->method() === 'post') {
$postdata['qsl'] = $this->input->post('qsl') == 0 ? NULL: 1;
$postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1;
$postdata['eqsl'] = $this->input->post('eqsl') == 0 ? NULL: 1;
$postdata['qrz'] = $this->input->post('qrz') == 0 ? NULL: 1;
$postdata['clublog'] = $this->input->post('clublog') == 0 ? NULL: 1;
$postdata['qsl'] = 1;
$postdata['lotw'] = 1;
$postdata['eqsl'] = 0;
$postdata['qrz'] = 0;
$postdata['clublog'] = 0;
$postdata['worked'] = $this->security->xss_clean($this->input->post('worked')) ?? NULL;
$postdata['confirmed'] = $this->security->xss_clean($this->input->post('confirmed')) ?? NULL;
$postdata['notworked'] = $this->security->xss_clean($this->input->post('notworked')) ?? NULL;

30
application/controllers/Hrdlog.php
View File

@@ -83,25 +83,17 @@ class Hrdlog extends CI_Controller {
}
public function mark_hrdlog() {
// Set memory limit to unlimited to allow heavy usage
ini_set('memory_limit', '-1');
// As far as i did research, this one is ONLY Called by "Mark-QSO" at the UI
$this->load->model('hrdlog_model');
$this->load->model('stations');
$station_id = $this->security->xss_clean($this->input->post('station_profile'));
$station_id = $this->security->xss_clean($this->input->post('station_profile'));
$this->load->model('adif_data');
$this->load->model('logbook_model');
$data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $station_id);
if (isset($data['qsos'])) {
foreach ($data['qsos']->result() as $qso)
{
$this->logbook_model->mark_hrdlog_qsos_sent($qso->COL_PRIMARY_KEY);
}
}
$this->load->view('interface_assets/header', $data);
$this->load->view('hrdlog/mark_hrdlog', $data);
$this->load->view('interface_assets/footer');
$data['qsos']=[];
if ($this->stations->check_station_is_accessible($station_id)) { // Hard Exit if station_profile not accessible
$data['qsos']=$this->hrdlog_model->mass_mark_hrdlog_sent($station_id,$this->security->xss_clean($this->input->post('from')),$this->security->xss_clean($this->input->post('to')));
}
$this->load->view('interface_assets/header', $data);
$this->load->view('hrdlog/mark_hrdlog', $data);
$this->load->view('interface_assets/footer');
}
}

7
application/controllers/Logbookadvanced.php
View File

@@ -133,6 +133,8 @@ class Logbookadvanced extends CI_Controller {
'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
'eqslSent' => xss_clean($this->input->post('eqslSent')),
'eqslReceived' => xss_clean($this->input->post('eqslReceived')),
'clublogSent' => xss_clean($this->input->post('clublogSent')),
'clublogReceived' => xss_clean($this->input->post('clublogReceived')),
'qslvia' => xss_clean($this->input->post('qslvia')),
'sota' => xss_clean($this->input->post('sota')),
'pota' => xss_clean($this->input->post('pota')),
@@ -300,6 +302,8 @@ class Logbookadvanced extends CI_Controller {
'lotwReceived' => '',
'eqslSent' => '',
'eqslReceived' => '',
'clublogSent' => '',
'clublogReceived' => '',
'qslvia' => '',
'sota' => '',
'pota' => '',
@@ -342,6 +346,8 @@ class Logbookadvanced extends CI_Controller {
'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
'eqslSent' => xss_clean($this->input->post('eqslSent')),
'eqslReceived' => xss_clean($this->input->post('eqslReceived')),
'clublogSent' => xss_clean($this->input->post('clublogSent')),
'clublogReceived' => xss_clean($this->input->post('clublogReceived')),
'qslvia' => xss_clean($this->input->post('qslvia')),
'sota' => xss_clean($this->input->post('sota')),
'pota' => xss_clean($this->input->post('pota')),
@@ -491,6 +497,7 @@ class Logbookadvanced extends CI_Controller {
$json_string['qsl']['show'] = $this->input->post('qsl');
$json_string['lotw']['show'] = $this->input->post('lotw');
$json_string['eqsl']['show'] = $this->input->post('eqsl');
$json_string['clublog']['show'] = $this->input->post('clublog');
$json_string['qslmsg']['show'] = $this->input->post('qslmsg');
$json_string['dxcc']['show'] = $this->input->post('dxcc');
$json_string['state']['show'] = $this->input->post('state');

8
application/controllers/Stationsetup.php
View File

@@ -312,11 +312,19 @@ class Stationsetup extends CI_Controller {
$single->station_copylog = $this->stationcopy2html($entry->station_id);
$single->station_delete = $this->stationdelete2html($entry->station_id, $entry->station_profile_name, $entry->station_active);
$single->station_favorite = $this->stationfavorite2html($entry->station_id, $quickswitch_enabled);
$single->station_linked = $this->stationlinked2html($entry->linked);
array_push($hres,$single);
}
echo json_encode($hres);
}
private function stationlinked2html($linked) {
if ($linked == 1) {
return '<i class="fa fa-check text-success" aria-hidden="true"></i>';
}
return '<i class="fa fa-times text-danger" aria-hidden="true"></i>';
}
private function stationfavorite2html($id, $quickswitch_enabled) {
if ($quickswitch_enabled == 'false') {
return '';