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

[LBA] Added custom mapping icons

Browse Source
This commit is contained in:
Andreas
2024-02-07 10:55:35 +01:00
parent d886d595da
commit bb54f8bde4
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/controllers/Logbookadvanced.php
View File

@@ -338,14 +338,13 @@ class Logbookadvanced extends CI_Controller {
$measurement_base = $this->session->userdata('user_measurement_base');
}
$CI =& get_instance();
// Get Date format
if($CI->session->userdata('user_date_format')) {
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $CI->session->userdata('user_date_format');
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/wavelog.php
$custom_date_format = $CI->config->item('qso_date_format');
$custom_date_format = $this->config->item('qso_date_format');
}
switch ($measurement_base) {
@@ -400,6 +399,7 @@ class Logbookadvanced extends CI_Controller {
$data['mycallsign'] = $qso['station_callsign'];
$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
$data['satname'] = $qso['COL_SAT_NAME'];
$data['confirmed'] = ((($qso['COL_EQSL_QSL_RCVD'] == 'Y') || ($qso['COL_LOTW_QSL_RCVD'] == 'Y') || ($qso['COL_QSL_RCVD'] == 'Y')) == true ? true : false);
return $data;
}
@@ -424,6 +424,7 @@ class Logbookadvanced extends CI_Controller {
$data['mycallsign'] = $qso['station_callsign'];
$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
$data['satname'] = $qso['COL_SAT_NAME'];
$data['confirmed'] = ((($qso['COL_EQSL_QSL_RCVD'] == 'Y') || ($qso['COL_LOTW_QSL_RCVD'] == 'Y') || ($qso['COL_QSL_RCVD'] == 'Y')) == true ? true : false);
return $data;
}