From 0f6ba82f92862755c3f9a21c3e102d83de1d4ea9 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 14 Nov 2012 01:16:17 +0000
Subject: [PATCH] Fixes QRZ API session time outs

---
 application/config/config.php       |  2 +-
 application/controllers/welcome.php | 23 ++++++-----------------
 application/libraries/qrz.php       |  9 ++++++---
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/application/config/config.php b/application/config/config.php
index 064ccfd0..3a3356ac 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'] = "callbytxt"; // Options are qrz or callbytxt
+$config['callbook'] = "qrz"; // Options are qrz or callbytxt
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 322bacf2..c506958a 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -5,24 +5,13 @@ class Welcome extends CI_Controller {
 
 	public function index()
 	{
-		//$this->load->view('welcome_message');
+		$this->load->library('qrz');
+
+		$qrz_session_key = $this->qrz->set_session($this->config->item('qrz_username'), $this->config->item('qrz_password'));
 		
-		
-		// URL to the XML Source
-		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.$password.';agent=cloudlog';
-		
-		// CURL Functions
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $xml_feed_url);
-		curl_setopt($ch, CURLOPT_HEADER, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		$xml = curl_exec($ch);
-		curl_close($ch);
-		
-		// Create XML object
-		$xml = simplexml_load_string($xml);
-		
-		print_r($xml);
+		echo $this->session->userdata('qrz_session_key');
+
+		$data['callsign'] = $this->qrz->search("m3php", $this->session->userdata('qrz_session_key'));
 
 	}
 }
diff --git a/application/libraries/qrz.php b/application/libraries/qrz.php
index 796ebda3..06019a42 100644
--- a/application/libraries/qrz.php
+++ b/application/libraries/qrz.php
@@ -30,6 +30,8 @@ class Qrz {
 	// Set Session Key session.
 	public function set_session($username, $password) {
 	
+		$ci = & get_instance();
+		
 		// URL to the XML Source
 		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.$password.';agent=cloudlog';
 		
@@ -45,8 +47,8 @@ class Qrz {
 		$xml = simplexml_load_string($xml);
 		
 		$key = (string) $xml->Session->Key;
-
-		$this->session->set_userdata('qrz_session_key', $key);
+	
+		$ci->session->set_userdata('qrz_session_key', $key);
 		
 		return true;
 	}
@@ -77,7 +79,8 @@ class Qrz {
 		$data['lat'] = (string) $xml->Callsign->lat;
 		$data['long'] = (string) $xml->Callsign->lon;
 		$data['iota'] = (string) $xml->Callsign->iota;
-			
+		
+		
 		return $data;
 	}
 }