From cf3ce2cea42f2b6101a782aed316425a0f6362df Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sat, 24 Nov 2012 20:10:25 +0000
Subject: [PATCH] Fixed hamio class to return callbook data correctly

---
 application/libraries/hamio.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/application/libraries/hamio.php b/application/libraries/hamio.php
index ff86971a..6fc174b0 100644
--- a/application/libraries/hamio.php
+++ b/application/libraries/hamio.php
@@ -13,16 +13,25 @@ class Hamio {
     
     $json = @file_get_contents($jsonurl,0,null,null);
     $json_output = json_decode($json);
-
+    
+    //print_r($json_output->$callsign);
+    
+    
+    
     if(isset($json_output)) {
-      $data['callsign'] = strtoupper($callsign);
-      $data['name'] = $json_output->first_name;
-      $data['gridsquare'] = $json_output->gridsquare;
-      $data['city'] = ucfirst(strtolower(($json_output->city)));
-      $data['lat'] = ucfirst($json_output->latitude);
-      $data['long'] = ucfirst($json_output->longitude);
+    
+      foreach ($json_output as $name => $callsign) {
       
-      return $data;
+        $data['callsign'] = (string) strtoupper($name);
+        $data['name'] = $callsign->first_name;
+        $data['gridsquare'] = $callsign->gridsquare;
+        $data['city'] = ucfirst(strtolower(($callsign->city)));
+        $data['lat'] = ucfirst($callsign->latitude);
+        $data['long'] = ucfirst($callsign->longitude);
+        
+        return $data;
+    }
+   
     }
   }
 }