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 pull request #2837 from AndreasK79/use_dxcc_class

Browse Source
This commit is contained in:
Andreas Kristiansen
2026-01-27 17:56:31 +01:00
committed by GitHub
parent 6b7fa89412 74167dee39
commit 1b3bf90180
8 changed files with 551 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/Logbook.php
View File

@@ -1,5 +1,8 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
use Wavelog\Dxcc\Dxcc;
require_once APPPATH . '../src/Dxcc/Dxcc.php';
class Logbook extends CI_Controller {
@@ -689,7 +692,7 @@ class Logbook extends CI_Controller {
$data['primary_subdivision'] = $this->subdivisions->get_primary_subdivision_name($data['query']->result()[0]->COL_DXCC);
$data['secondary_subdivision'] = $this->subdivisions->get_secondary_subdivision_name($data['query']->result()[0]->COL_DXCC);
$data['max_upload'] = ini_get('upload_max_filesize');
}
}
$this->load->view('interface_assets/mini_header', $data);
$this->load->view('view_log/qso');
$this->load->view('interface_assets/footer');
@@ -1205,11 +1208,12 @@ class Logbook extends CI_Controller {
$this->load->model('user_model');
if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
$this->load->model("logbook_model");
if ($date == ''){
$date = date("Y-m-d");
}
$ans = $this->logbook_model->dxcc_lookup($call, $date);
$dxccobj = new Dxcc($date);
$ans = $dxccobj->dxcc_lookup($call, $date);
return $ans;
}