diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index 9cf3a7c2..2d868c50 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -101,9 +101,9 @@ class Dashboard extends CI_Controller { } if($row->COL_SAT_NAME != null) { - echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; + echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; } else { - echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; + echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; } $count++; @@ -121,7 +121,7 @@ class Dashboard extends CI_Controller { if($count != 1) { echo ","; } - echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; + echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; $count++; } } @@ -146,7 +146,7 @@ class Dashboard extends CI_Controller { //print_r($row); if($row->COL_GRIDSQUARE != null) { $stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE); - echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},"; + echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},"; } else { $query = $this->db->query(' SELECT * @@ -157,7 +157,7 @@ class Dashboard extends CI_Controller { '); foreach ($query->result() as $dxcc) { - echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},"; + echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},"; } } diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 4bc95d0f..d7a78199 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -365,9 +365,9 @@ class Logbook extends CI_Controller { } if($row->COL_SAT_NAME != null) { - echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; + echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; } else { - echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; + echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; } $count++; @@ -385,7 +385,7 @@ class Logbook extends CI_Controller { if($count != 1) { echo ","; } - echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; + echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; $count++; } } @@ -697,4 +697,4 @@ class Logbook extends CI_Controller { } -} +} \ No newline at end of file