diff --git a/application/controllers/Clublog.php b/application/controllers/Clublog.php index d39676d8..4a3a691e 100644 --- a/application/controllers/Clublog.php +++ b/application/controllers/Clublog.php @@ -12,11 +12,23 @@ class Clublog extends CI_Controller { } // Upload ADIF to Clublog - public function upload() { + public function upload($username) { $this->load->helper('file'); $this->load->model('logbook_model'); - + + $this->load->model('clublog_model'); + + $clublog_info = $this->clublog_model->get_clublog_auth_info($username); + + if(!isset($clublog_info['user_name'])) { + echo "Username unknown"; + exit; + } + + + print_r($clublog_info); + $data['qsos'] = $this->logbook_model->get_clublog_qsos(); // Create ADIF File of contacts not uploaded to Clublog diff --git a/application/models/Clublog.php b/application/models/Clublog.php deleted file mode 100644 index bb3da0af..00000000 --- a/application/models/Clublog.php +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/application/models/Clublog_model.php b/application/models/Clublog_model.php new file mode 100644 index 00000000..83d3ad83 --- /dev/null +++ b/application/models/Clublog_model.php @@ -0,0 +1,18 @@ +db->select('user_name, user_clublog_name, user_clublog_password, user_clublog_callsign'); + $this->db->where('user_name', $username); + $query = $this->db->get($this->config->item('auth_table')); + return $row = $query->row_array(); + } +} + +?> \ No newline at end of file