diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 59a6a86e..f10b301b 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -126,11 +126,14 @@ class Logbook extends CI_Controller { "bearing" => "", "workedBefore" => false, "lotw_member" => $lotw_member, + "image" => "", ]; $return['dxcc'] = $this->dxcheck($callsign); $return['partial'] = $this->partial($callsign); + $callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); + // Do we have local data for the Callsign? if($this->logbook_model->call_name($callsign) != null) { @@ -148,6 +151,15 @@ class Logbook extends CI_Controller { $return['callsign_state'] = $this->logbook_model->call_state($callsign); $return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id); $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode); + if (isset($callbook)) { + if ($callbook['image'] == "") { + $return['image'] = "n/a"; + } else { + $return['image'] = $callbook['image']; + } + } else { + $return['image'] = "n/a"; + } if ($return['callsign_qra'] != "") { $return['latlng'] = $this->qralatlng($return['callsign_qra']); @@ -157,7 +169,7 @@ class Logbook extends CI_Controller { return; } - $callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); + //$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); if (isset($callbook)) { @@ -167,6 +179,11 @@ class Logbook extends CI_Controller { $return['callsign_iota'] = $callbook['iota']; $return['callsign_state'] = $callbook['state']; $return['callsign_us_county'] = $callbook['us_county']; + if ($callbook['image'] == "") { + $return['image'] = "n/a"; + } else { + $return['image'] = $callbook['image']; + } if(isset($callbook['qslmgr'])) { $return['qsl_manager'] = $callbook['qslmgr']; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 944f0d2a..cede1158 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -6,6 +6,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['qso_title_qso_map'] = 'QSO Map'; $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_pervious_contacts'] = 'Previous Contacts'; +$lang['qso_title_image'] = 'Image'; // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Give power value in Watts. Include only numbers in the input.'; diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php index d1a26f30..1e0289d4 100755 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -88,6 +88,7 @@ class Qrz { $data['long'] = (string)$xml->Callsign->lon; $data['iota'] = (string)$xml->Callsign->iota; $data['qslmgr'] = (string)$xml->Callsign->qslmgr; + $data['image'] = (string)$xml->Callsign->image; if ($xml->Callsign->country == "United States") { $data['state'] = (string)$xml->Callsign->state; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 096def04..951a3cf4 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -521,6 +521,15 @@
+ +