diff --git a/application/config/config.php b/application/config/config.php index 1b15e921..17c7a4c0 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -295,7 +295,7 @@ $config['encryption_key'] = 'flossie1234555541'; | */ $config['sess_cookie_name'] = 'ci_cloudlog'; -$config['sess_expiration'] = 7200; +$config['sess_expiration'] = 0; $config['sess_expire_on_close'] = FALSE; $config['sess_encrypt_cookie'] = FALSE; $config['sess_use_database'] = FALSE; diff --git a/application/controllers/api.php b/application/controllers/api.php index 5a2ccc71..944066d1 100644 --- a/application/controllers/api.php +++ b/application/controllers/api.php @@ -10,9 +10,9 @@ class API extends CI_Controller { function search_callsign($callsign) { - $this->db->select('COL_PRIMARY_KEY, COL_CALL, COL_MODE, COL_BAND, COL_COUNTRY, COL_FREQ, COL_GRIDSQUARE, COL_RST_RCVD, COL_RST_SENT, COL_SAT_MODE, COL_SAT_NAME, COL_TIME_ON'); - $this->db->select("DATE_FORMAT(COL_TIME_ON, '%H:%i') AS time_on", FALSE ); - $this->db->select("DATE_FORMAT(COL_TIME_ON, '%d/%c/%Y') AS date_on", FALSE ); + $this->db->select('COL_PRIMARY_KEY, COL_CALL, COL_MODE, COL_BAND, COL_COUNTRY, COL_FREQ, COL_GRIDSQUARE, COL_RST_RCVD, COL_RST_SENT, COL_SAT_MODE, COL_SAT_NAME'); + //$this->db->select("DATE_FORMAT(COL_TIME_ON, '%H:%i') AS time_on", FALSE ); + //$this->db->select("DATE_FORMAT(COL_TIME_ON, '%d/%c/%Y') AS date_on", FALSE ); $this->db->like('COL_CALL', $callsign); $this->db->or_like('COL_GRIDSQUARE', $callsign); $query = $this->db->get($this->config->item('table_name')); @@ -22,10 +22,15 @@ class API extends CI_Controller { foreach ($query->result() as $result) { - $results [] = $result; + $results[] = $result; } - echo json_encode($results); + header('Content-type: application/json'); + + //$arr = array ('a'=>1,'b'=>2,'c'=>3,'d'=>4,'e'=>5); + echo $_GET['jsoncallback'].'('.json_encode($results).')'; //assign resulting code to $_GET['jsoncallback]. + + //echo json_encode($results); } diff --git a/install/config/config.php b/install/config/config.php index bf33763b..0754a2db 100644 --- a/install/config/config.php +++ b/install/config/config.php @@ -295,7 +295,7 @@ $config['encryption_key'] = 'flossie1234555541'; | */ $config['sess_cookie_name'] = 'ci_cloudlog'; -$config['sess_expiration'] = 7200; +$config['sess_expiration'] = 0; $config['sess_expire_on_close'] = FALSE; $config['sess_encrypt_cookie'] = FALSE; $config['sess_use_database'] = FALSE;