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 #447 from phl0/ciLoads

Browse Source 
[WIP] Remove extra CI loads in Clublog (and debug log messages)
This commit is contained in:
Florian (DF2ET)
2024-06-07 12:53:18 +02:00
committed by GitHub
parent 0dbfc478e0 12e4841b47
commit 322a054c6d
14 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/Awards.php
View File

@@ -528,9 +528,8 @@ class Awards extends CI_Controller {
'assets/js/sections/cqmap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/cqmap.js"))
];
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('cq');
$this->load->model('modes');
@@ -1320,9 +1319,8 @@ class Awards extends CI_Controller {
This displays the CQ Zone map and requires the $band_type and $mode_type
*/
public function cq_map() {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('cq');

1
application/controllers/Cfdexport.php
View File

@@ -34,7 +34,6 @@ class Cfdexport extends CI_Controller {
$fromdate = xss_clean($this->input->post('from'));
$todate = xss_clean($this->input->post('to'));
$this->load->library('frequency');
// Get QSOs with Valid QRAs
$qsos = $this->logbook_model->cfd_get_all_qsos($fromdate, $todate);
$output=strtoupper($this->session->userdata('user_callsign'))."\n";

5
application/controllers/Logbook.php
View File

@@ -1316,12 +1316,11 @@ class Logbook extends CI_Controller {
function part_table_col($row, $name) {
$ret='';
$ci =& get_instance();
switch($name) {
case 'Mode': $ret.= '<td>'; $ret.= $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
case 'RSTS': $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '</span>';} if ($row->COL_STX_STRING) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';} $ret.= '</td>'; break;
case 'RSTR': $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '</span>';} if ($row->COL_SRX_STRING) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';} $ret.= '</td>'; break;
case 'Country': $ret.= '<td>' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
case 'Country': $ret.= '<td>' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' <span class="badge text-bg-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
case 'IOTA': $ret.= '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': $ret.= '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
case 'WWFF': $ret.= '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;
@@ -1329,7 +1328,7 @@ class Logbook extends CI_Controller {
case 'Grid': $ret.= '<td>' . $this->part_QrbCalcLink($row->COL_MY_GRIDSQUARE, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE) . '</td>'; break;
case 'Distance': $ret.= '<td>' . (($row->COL_DISTANCE ?? '' != '') ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
case 'Band': $ret.= '<td>'; if($row->COL_SAT_NAME != null) { $ret.= '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { $ret.= strtolower($row->COL_BAND); } $ret.= '</td>'; break;
case 'Frequency': $ret.= '<td>'; if($row->COL_SAT_NAME != null) { $ret.= '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { $ret.= $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= '</td>'; break;
case 'Frequency': $ret.= '<td>'; if($row->COL_SAT_NAME != null) { $ret.= '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { $ret.= $this->frequency->hz_to_mhz($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= '</td>'; break;
case 'State': $ret.= '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator': $ret.= '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
}

5
application/controllers/Oqrs.php
View File

@@ -92,9 +92,8 @@ class Oqrs extends CI_Controller {
public function requests() {
$data['page_title'] = "OQRS Requests";
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
if ($logbooks_locations_array) {
$location_list = "'".implode("','",$logbooks_locations_array)."'";

1
application/controllers/Qso.php
View File

@@ -432,7 +432,6 @@ class QSO extends CI_Controller {
function band_to_freq($band, $mode) {
if ($band != null and $band != 'null') {
$this->load->library('frequency');
echo $this->frequency->convert_band($band, $mode);
}

7
application/controllers/Sattimers.php
View File

@@ -43,11 +43,10 @@ class Sattimers extends CI_Controller {
$data['page_title'] = "Satellite Timers";
$CI =& get_instance();
if($CI->session->userdata('user_date_format')) {
$data['custom_date_format'] = $CI->session->userdata('user_date_format');
if($this->session->userdata('user_date_format')) {
$data['custom_date_format'] = $this->session->userdata('user_date_format');
} else {
$data['custom_date_format'] = $CI->config->item('qso_date_format');
$data['custom_date_format'] = $this->config->item('qso_date_format');
}
switch ($data['custom_date_format']) {

1
application/models/Clublog_model.php
View File

@@ -26,6 +26,7 @@ class Clublog_model extends CI_Model
error_reporting(E_ALL);
$this->load->helper('file');
$this->load->library('AdifHelper');
$station_profiles = $this->all_with_count($clean_userid);

1
application/models/Logbook_model.php
View File

@@ -3440,7 +3440,6 @@ function lotw_last_qsl_date($user_id) {
return($returner);
}
$this->load->library('frequency');
$my_error = "";
// Join date+time

1
application/models/Logbookadvanced_model.php
View File

@@ -541,7 +541,6 @@ class Logbookadvanced_model extends CI_Model {
", " . $this->config->item('table_name').".COL_FREQ_RX = ?" .
" WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?";
$this->load->library('frequency');
$frequencyBand = $this->frequency->defaultFrequencies[$value]['CW'];
$frequencyBandRx = $bandrx == '' ? null : $this->frequency->defaultFrequencies[$bandrx]['CW'];

4
application/views/adif/data/clublog.php
View File

@@ -5,9 +5,7 @@ Wavelog ADIF export
<EOH>
<?php
$CI =& get_instance();
$CI->load->library('AdifHelper');
foreach ($qsos->result() as $qso) {
echo $CI->adifhelper->getAdifLine($qso);
echo $this->adifhelper->getAdifLine($qso);
}

1
application/views/dashboard/index.php
View File

@@ -36,7 +36,6 @@ function echo_table_col($row, $name) {
case 'Distance': echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break;
case 'Frequency':
$ci->load->library('frequency');
echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;

1
application/views/qso/components/previous_contacts.php
View File

@@ -67,7 +67,6 @@ function echo_table_col($row, $name) {
case 'Distance': echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break;
case 'Frequency':
$ci->load->library('frequency');
echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;

2
application/views/view_log/partial/log_ajax.php
View File

@@ -36,10 +36,8 @@ function echo_table_col($row, $name) {
echo '<td>' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . '</td>'; break;
case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
case 'Band':
$ci->load->library('frequency');
echo '<td>'; if($row->COL_SAT_NAME ?? '' != '') { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank"><span data-bs-toggle="tooltip" title="'.($row->COL_BAND ?? '').'">'.$row->COL_SAT_NAME.'</span></a></td>'; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' <span data-bs-toggle="tooltip" title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ ?? 0).'">'. strtolower($row->COL_BAND ?? '').'</span>'; } else { echo strtolower($row->COL_BAND ?? ''); } } echo '</td>'; break;
case 'Frequency':
$ci->load->library('frequency');
echo '<td>'; if($row->COL_SAT_NAME ?? '' != '') { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE ?? '') . '</td>'; break;
case 'Operator':echo '<td>' . ($row->COL_OPERATOR ?? '') . '</td>'; break;

1
application/views/visitor/index.php
View File

@@ -105,7 +105,6 @@ function echo_table_col($row, $name)
echo '</td>';
break;
case 'Frequency':
$CI->load->library('frequency');
echo '<td>';
if ($row->COL_FREQ != null) {
echo $CI->frequency->hz_to_mhz($row->COL_FREQ);