diff --git a/application/config/config.php b/application/config/config.php index 3a3356ac..064ccfd0 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -16,7 +16,7 @@ $config['app_name'] = "Cloudlog"; $config['app_version'] = "0.1"; $config['directory'] = "logbook"; -$config['callbook'] = "qrz"; // Options are qrz or callbytxt +$config['callbook'] = "callbytxt"; // Options are qrz or callbytxt /* |-------------------------------------------------------------------------- diff --git a/application/controllers/logbook.php b/application/controllers/logbook.php index 167c6015..ec570ab8 100644 --- a/application/controllers/logbook.php +++ b/application/controllers/logbook.php @@ -152,7 +152,7 @@ class Logbook extends CI_Controller { // Lookup using Callbytxt $this->load->library('callbytxt'); - $callbook = $this->callbytxt->callsign($qra); + $callbook = $this->callbytxt->callsign($callsign); echo $callbook['city']; } @@ -200,7 +200,7 @@ class Logbook extends CI_Controller { // Lookup using Callbytxt $this->load->library('callbytxt'); - $callbook = $this->callbytxt->callsign($qra); + $callbook = $this->callbytxt->callsign($callsign); echo $callbook['name']; } diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index c506958a..4d9d10d5 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -5,13 +5,11 @@ class Welcome extends CI_Controller { public function index() { - $this->load->library('qrz'); - - $qrz_session_key = $this->qrz->set_session($this->config->item('qrz_username'), $this->config->item('qrz_password')); + $this->load->library('callbytxt'); - echo $this->session->userdata('qrz_session_key'); - - $data['callsign'] = $this->qrz->search("m3php", $this->session->userdata('qrz_session_key')); + $callbook = $this->callbytxt->callsign('m3php'); + + print_r($callbook); } } diff --git a/application/libraries/qrz.php b/application/libraries/qrz.php index 06019a42..952253de 100644 --- a/application/libraries/qrz.php +++ b/application/libraries/qrz.php @@ -80,7 +80,6 @@ class Qrz { $data['long'] = (string) $xml->Callsign->lon; $data['iota'] = (string) $xml->Callsign->iota; - return $data; } }