pull/3001/head 2.6.6
Peter Goodhall 2024-03-06 15:26:21 +00:00 zatwierdzone przez GitHub
commit 9273c2c610
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
32 zmienionych plików z 2773 dodań i 2428 usunięć

Wyświetl plik

@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
|
*/
$config['migration_version'] = 172;
$config['migration_version'] = 173;
/*
|--------------------------------------------------------------------------

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Режим';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Обхват';

Wyświetl plik

@ -122,6 +122,8 @@ $lang['gen_hamradio_callsign'] = '呼号';
$lang['gen_hamradio_prefix'] = "前缀";
$lang['gen_hamradio_suffix'] = "后缀";
$lang['gen_hamradio_mode'] = '模式';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_de'] = '本台呼号(De)';
$lang['gen_hamradio_dx'] = '对方呼号(Dx)';
$lang['gen_hamradio_rst_sent'] = '发送 信号报告RST';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Režim';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Odesláno';
$lang['gen_hamradio_rst_rcvd'] = 'Přijato';
$lang['gen_hamradio_band'] = 'Pásmo';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Verzonden';
$lang['gen_hamradio_rst_rcvd'] = 'Ontvangen';
$lang['gen_hamradio_band'] = 'Band';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Band';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Lähetelaji';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Annettu raportti';
$lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti';
$lang['gen_hamradio_band'] = 'Bandi';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = "De";
$lang['gen_hamradio_dx'] = "Dx";
$lang['gen_hamradio_mode'] = "Mode";
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = "Envoyé";
$lang['gen_hamradio_rst_rcvd'] = "Reçu";
$lang['gen_hamradio_band'] = "Bande";

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antennenazimut';
$lang['gen_hamradio_ant_el'] = 'Antennenelevation';
$lang['gen_hamradio_rst_sent'] = 'Gegeben';
$lang['gen_hamradio_rst_rcvd'] = 'Erhalten';
$lang['gen_hamradio_band'] = 'Band';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Τρόπος';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Απεσταλμένα';
$lang['gen_hamradio_rst_rcvd'] = 'Ελήφθη\'d';
$lang['gen_hamradio_band'] = 'Ζώνη';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Inviato';
$lang['gen_hamradio_rst_rcvd'] = 'Ricevuto';
$lang['gen_hamradio_band'] = 'Banda';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modulacja';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Wysłany';
$lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d';
$lang['gen_hamradio_band'] = 'Pasmo';

Wyświetl plik

@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Позывной';
$lang['gen_hamradio_de'] = 'от';
$lang['gen_hamradio_dx'] = 'DX';
$lang['gen_hamradio_mode'] = 'Вид модуляции';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Отправлено';
$lang['gen_hamradio_rst_rcvd'] = 'Получено';
$lang['gen_hamradio_bandgroup'] = "Bandgroup";

Wyświetl plik

@ -125,6 +125,8 @@ $lang['gen_hamradio_suffix'] = "Sufijo";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Enviado';
$lang['gen_hamradio_rst_rcvd'] = 'Recibido';
$lang['gen_hamradio_band'] = 'Banda';

Wyświetl plik

@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';

Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mod';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Gönderilen';
$lang['gen_hamradio_rst_rcvd'] = 'Alınan';
$lang['gen_hamradio_band'] = 'Bant';

Wyświetl plik

@ -2,7 +2,14 @@
class AdifHelper {
public function getAdifLine($qso) {
/**
* Generates an ADIF line for a QSO record.
*
* @param object $qso The QSO record.
* @param bool $satellite_remap Flag indicating whether to remap satellite names.
* @return string The ADIF line.
*/
public function getAdifLine($qso, $satellite_remap = false) {
$normalFields = array(
'ADDRESS',
'AGE',
@ -80,7 +87,6 @@ class AdifHelper {
'RST_SENT',
'RX_PWR',
'SAT_MODE',
'SAT_NAME',
'SFI',
'SILENT_KEY',
'SKCC',
@ -183,11 +189,23 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_GRIDSQUARE", $qso->station_gridsquare);
}
if($qso->COL_SAT_NAME) {
if($satellite_remap === true) {
$satname = $this->lotw_satellite_map($qso->COL_SAT_NAME);
if($satname) {
$line .= $this->getAdifFieldLine("SAT_NAME", $satname);
} else {
$line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
}
} else {
$line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
}
}
$line .= $this->getAdifFieldLine("MY_IOTA", $qso->station_iota);
$line .= $this->getAdifFieldLine("MY_SOTA_REF", $qso->station_sota);
$line .= $this->getAdifFieldLine("MY_POTA_REF", $qso->station_pota);
$line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq);
@ -258,4 +276,36 @@ class AdifHelper {
return "";
}
}
/*
| Function: lotw_satellite_map
| Requires: OSCAR Satellite name $satname
|
| Outputs if LoTW uses a different satellite name
|
*/
function lotw_satellite_map($satname) {
$arr = array(
"ARISS" => "ISS",
"UKUBE1" => "UKUBE-1",
"KEDR" => "ARISSAT-1",
"TO-108" => "CAS-6",
"TAURUS" => "TAURUS-1",
"AISAT1" => "AISAT-1",
'UVSQ' => "UVSQ-SAT",
'CAS-3H' => "LILACSAT-2",
'IO-117' => "GREENCUBE",
"TEVEL1" => "TEVEL-1",
"TEVEL2" => "TEVEL-2",
"TEVEL3" => "TEVEL-3",
"TEVEL4" => "TEVEL-4",
"TEVEL5" => "TEVEL-5",
"TEVEL6" => "TEVEL-6",
"TEVEL7" => "TEVEL-7",
"TEVEL8" => "TEVEL-8",
"INSPR7" => "INSPIRE-SAT 7",
);
return array_search(strtoupper($satname),$arr,true);
}
}

Wyświetl plik

@ -0,0 +1,30 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
/*
* Tag Cloudlog as 2.6.6
*/
class Migration_tag_2_6_6 extends CI_Migration {
public function up()
{
// Tag Cloudlog 2.6.3
$this->db->where('option_name', 'version');
$this->db->update('options', array('option_value' => '2.6.6'));
// Trigger Version Info Dialog
$this->db->where('option_type', 'version_dialog');
$this->db->where('option_name', 'confirmed');
$this->db->update('user_options', array('option_value' => 'false'));
}
public function down()
{
$this->db->where('option_name', 'version');
$this->db->update('options', array('option_value' => '2.6.5'));
}
}

Wyświetl plik

@ -2984,8 +2984,9 @@ class Logbook_model extends CI_Model
}
/* Used to check if the qso is already in the database */
function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null) {
$mode=$this->get_main_mode_from_mode($mode);
function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null)
{
$mode = $this->get_main_mode_from_mode($mode);
$this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND');
$this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("' . $datetime . '", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
@ -2995,8 +2996,8 @@ class Logbook_model extends CI_Model
$this->db->where('COL_BAND', $band);
$this->db->where('COL_MODE', $mode);
if(isset($station_id) && $station_id > 0) {
$this->db->where('station_id', $station_id);
if (isset($station_id) && $station_id > 0) {
$this->db->where('station_id', $station_id);
}
$query = $this->db->get($this->config->item('table_name'));
@ -3412,8 +3413,15 @@ class Logbook_model extends CI_Model
// Check if RX_PWR is "K" which N1MM+ uses to indicate 1000W
if ($record['rx_pwr'] == "K") {
$rx_pwr = 1000;
} elseif ($record['rx_pwr'] == "KW") {
$rx_pwr = 1000;
} else {
$rx_pwr = filter_var($record['rx_pwr'], FILTER_VALIDATE_FLOAT);
if (isset($record['rx_pwr']) && is_numeric($record['rx_pwr'])) {
$rx_pwr = $record['rx_pwr'];
} else {
$rx_pwr = null;
$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " RX_PWR (".$record['rx_pwr'].") is not a number<br>";
}
}
} else {
$rx_pwr = NULL;
@ -3432,13 +3440,15 @@ class Logbook_model extends CI_Model
}
if (isset($record['ant_az'])) {
$input_ant_az = filter_var($record['ant_az'], FILTER_SANITIZE_NUMBER_INT);
$input_ant_az = filter_var($record['ant_az'], FILTER_VALIDATE_FLOAT);
$input_ant_az = fmod($input_ant_az, 360);
} else {
$input_ant_az = NULL;
}
if (isset($record['ant_el'])) {
$input_ant_el = filter_var($record['ant_el'], FILTER_SANITIZE_NUMBER_INT);
$input_ant_el = filter_var($record['ant_el'], FILTER_VALIDATE_FLOAT);
$input_ant_el = fmod($input_ant_el, 90);
} else {
$input_ant_el = NULL;
}

Wyświetl plik

@ -9,5 +9,5 @@ $CI =& get_instance();
$CI->load->library('AdifHelper');
foreach ($qsos->result() as $qso) {
echo $CI->adifhelper->getAdifLine($qso);
echo $CI->adifhelper->getAdifLine($qso, $satellite_remap = true);
}

Wyświetl plik

@ -1,15 +1,15 @@
<table class="table table-striped border-top">
<table id="upcoming_dxccs_component" class="table table-striped border-top">
<tr class="titles">
<td colspan="3"><i class="fas fa-chart-bar"></i> DXPeditions (This Week)</td>
</tr>
<?php
foreach ($thisWeekRecords as $record) {
$color = $record['workedBefore'] == 1 ? '#ddffdd' : '#ffdddd';
$name = $record['workedBefore'] == 1 ? 'worked_before' : 'not_worked_before';
echo '<tr>';
echo '<td style="background-color: ' . $color . ';" width="33%">' . $record['daysLeft'] . '</td>'; // Date
echo '<td style="background-color: ' . $color . ';" width="33%">' . '<a href="#" data-bs-toggle="tooltip" data-bs-title="'.$record['6'].'">'.$record['callsign'] . '</a>'. '</td>'; // Callsign
echo '<td style="background-color: ' . $color . ';" width="33%">' . $record['2'] . '</td>'; // Country
echo '<td id="' . $name . '">' . $record['daysLeft'] . '</td>'; // Date
echo '<td id="' . $name . '">' . '<a target="_blank" href="https://dxheat.com/db/'.$record['callsign'].'" data-bs-toggle="tooltip" data-bs-title="'.$record['6'].'">'.$record['callsign'] . '</a>'. '</td>'; // Callsign
echo '<td id="' . $name . '">' . $record['2'] . '</td>'; // Country
echo '</tr>';
}
?>

Wyświetl plik

@ -34,6 +34,9 @@ body {
<div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
<div class="card-body">
<h3><?php echo lang('account_login_to_cloudlog'); ?></h3>
<?php $this->load->view('layout/messages'); ?>
<form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
<?php $this->form_validation->set_error_delimiters('', ''); ?>
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
@ -51,7 +54,6 @@ body {
<div>
<p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
</div>
<?php $this->load->view('layout/messages'); ?>
<button class="w-100 btn btn-info" type="submit"><?php echo lang('account_login'); ?> →</button>
</form>
</div>

Wyświetl plik

@ -215,6 +215,21 @@
<td><?php echo (strlen($row->COL_SAT_MODE) == 2 ? (strtoupper($row->COL_SAT_MODE[0]).'/'.strtoupper($row->COL_SAT_MODE[1])) : strtoupper($row->COL_SAT_MODE)); ?></td>
</tr>
<?php } ?>
<?php if($row->COL_ANT_AZ != null) { ?>
<tr>
<td><?php echo lang('gen_hamradio_ant_az'); ?></td>
<td><?php echo $row->COL_ANT_AZ; ?>&deg; <span style="margin-left: 2px; display: inline-block; transform: rotate(<?php echo (-45+$row->COL_ANT_AZ); ?>deg);"><i class="fas fa-location-arrow fa-xs"></i></span></td>
</tr>
<?php } ?>
<?php if($row->COL_ANT_EL != null) { ?>
<tr>
<td><?php echo lang('gen_hamradio_ant_el'); ?></td>
<td><?php echo $row->COL_ANT_EL; ?>&deg; <span style="margin-left: 2px; display: inline-block; transform: rotate(<?php echo (-$row->COL_ANT_EL); ?>deg);"><i class="fas fa-arrow-right fa-xs"></i></span></td>
</tr>
<?php } ?>
<?php if($row->name != null) { ?>
<tr>
<td><?php echo lang('general_word_country'); ?></td>

Wyświetl plik

@ -191,4 +191,17 @@ path.grid-worked {
}
.accordion-button.collapsed {
border-bottom: 1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

Wyświetl plik

@ -246,4 +246,17 @@ path.grid-worked {
}
.accordion-button.collapsed {
border-bottom: 1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

Wyświetl plik

@ -204,4 +204,15 @@ div.alert-danger {
border-bottom:1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

Wyświetl plik

@ -258,4 +258,17 @@ div.alert-danger {
}
.accordion-button.collapsed {
border-bottom:1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

Wyświetl plik

@ -783,3 +783,14 @@ label {
background-color: rgb(254 243 199) !important;
--bs-badge-color: rgb(217 119 6) !important;
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
}

Wyświetl plik

@ -194,4 +194,19 @@ div.alert-danger {
}
.accordion-body {
border: 1px solid #4e5e6c;
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
box-shadow: none !important;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd !important;
width: 33%;
color: #000;
box-shadow: none !important;
}

Wyświetl plik

@ -248,4 +248,19 @@ div.alert-danger {
}
.accordion-body {
border: 1px solid #4e5e6c;
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
box-shadow: none !important;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd !important;
width: 33%;
color: #000;
box-shadow: none !important;
}

Wyświetl plik

@ -634,5 +634,5 @@ if ($('.table-responsive .dropdown-toggle').length>0) {
}
function getDataTablesLanguageUrl() {
return "../assets/json/datatables_languages/" + lang_datatables_language + ".json";
return base_url + "/assets/json/datatables_languages/" + lang_datatables_language + ".json";
}