";
echo "" . $row->radio . " ";
+ $this->load->model('user_model');
+ if ($this->session->userdata('clubstation') == 1 && clubaccess_check(9)) {
+ $operator = $this->user_model->get_by_id($row->operator)->row();
+ if ($operator) {
+ echo "" . $operator->user_callsign . " ";
+ } else {
+ echo "" . __("UNKNOWN") . " ";
+ }
+ }
+
if (empty($row->frequency) || $row->frequency == "0") {
echo "- / - ";
} elseif (empty($row->frequency_rx) || $row->frequency_rx == "0") {
@@ -93,14 +100,16 @@ class Radio extends CI_Controller {
echo '' . __("Set as default radio") . '
';
- } else {
- if ($defaul_user_radio !== $row->id) {
+ if ($this->session->userdata('clubstation') != 1) {
+ $defaul_user_radio = $this->user_options_model->get_options('cat', array('option_name' => 'default_radio'))->row()->option_value ?? NULL;
+ if (!$defaul_user_radio) {
echo '' . __("Set as default radio") . '
';
} else {
- echo '' . __("Default (click to release)") . '
';
+ if ($defaul_user_radio !== $row->id) {
+ echo '' . __("Set as default radio") . '
';
+ } else {
+ echo '' . __("Default (click to release)") . '
';
+ }
}
}
echo " " . __("Edit") . " '.$this->input->post('user_name').' already in use!';
+ $data['username_error'] = sprintf(__("Username %s already in use!"), '' . $this->input->post('user_name') . ' ');
break;
case EEMAILEXISTS:
- $data['email_error'] = 'E-mail address '.$this->input->post('user_email').' already in use!';
+ $data['email_error'] = sprintf(__("E-mail %s already in use!"), '' . $this->input->post('user_email') . ' ');
break;
case EPASSWORDINVALID:
- $data['password_error'] = 'Invalid password!';
+ $data['password_error'] = __("Invalid Password!");
break;
// All okay, return to user screen
case OK:
- $this->session->set_flashdata('notice', 'User '.$this->input->post('user_name').' added');
+ $this->session->set_flashdata('notice', sprintf(__("User %s added!"), '' . $this->input->post('user_name') . ' '));
redirect('user');
return;
}
@@ -194,8 +271,8 @@ class User extends CI_Controller {
$data['user_email'] = $this->input->post('user_email');
$data['user_password'] = $this->input->post('user_password');
$data['user_type'] = $this->input->post('user_type');
- $data['user_firstname'] = $this->input->post('user_firstname');
- $data['user_lastname'] = $this->input->post('user_lastname');
+ $data['user_firstname'] = $this->input->post('user_firstname') ?? '';
+ $data['user_lastname'] = $this->input->post('user_lastname') ?? '';
$data['user_callsign'] = $this->input->post('user_callsign');
$data['user_locator'] = $this->input->post('user_locator');
$data['user_measurement_base'] = $this->input->post('user_measurement_base');
@@ -221,7 +298,7 @@ class User extends CI_Controller {
$data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter');
$data['user_language'] = $this->input->post('user_language');
$this->load->view('user/edit', $data);
- $this->load->view('interface_assets/footer');
+ $this->load->view('interface_assets/footer', $footerData);
}
}
@@ -250,12 +327,18 @@ class User extends CI_Controller {
$this->form_validation->set_rules('user_locator', 'Locator', 'callback_check_locator');
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
- $data['user_form_action'] = site_url('user/edit')."/".$this->uri->segment(3);;
+ $data['user_form_action'] = site_url('user/edit')."/".$this->uri->segment(3);
+ $data['clubstation'] = ($query->row()->clubstation == 1) ? true : false;
$data['bands'] = $this->bands->get_user_bands();
// Get themes list
$data['themes'] = $this->user_model->getThemes();
+ $footerData = [];
+ $footerData['scripts'] = [
+ 'assets/js/sections/user.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/user.js")),
+ ];
+
// Get timezones
$data['timezones'] = $this->user_model->timezones();
@@ -640,7 +723,7 @@ class User extends CI_Controller {
$this->load->view('interface_assets/header', $data);
$this->load->view('user/edit', $data);
- $this->load->view('interface_assets/footer');
+ $this->load->view('interface_assets/footer', $footerData);
} else {
unset($data);
switch($this->user_model->edit($this->input->post())) {
@@ -790,6 +873,14 @@ class User extends CI_Controller {
}
function login($firstlogin = false) {
+
+ // Due the fact there was a new session generated, we need to get flash messages from a temporary cookie
+ $tmpdata = json_decode($this->input->cookie(config_item('cookie_prefix') . 'tmp_msg') ?? '') ?? false;
+ if ($tmpdata) {
+ $this->session->set_flashdata($tmpdata[0], $tmpdata[1]);
+ $this->input->set_cookie('tmp_msg', '', -3600, '');
+ }
+
// Check our version and run any migrations
if (!$this->load->is_loaded('Migration')) {
$this->load->library('Migration');
@@ -814,7 +905,7 @@ class User extends CI_Controller {
$data['user'] = $query->row();
// Read the cookie keep_login and allow the login
- if ($this->input->cookie(config_item('cookie_prefix') . 'keep_login')) {
+ if ($this->input->cookie(config_item('cookie_prefix') . 'keep_login') || $this->input->cookie(config_item('cookie_prefix') . 're_login')) {
try {
@@ -823,7 +914,7 @@ class User extends CI_Controller {
}
// process the incoming string
- $incoming_string = $this->input->cookie(config_item('cookie_prefix') . 'keep_login');
+ $incoming_string = $this->input->cookie(config_item('cookie_prefix') . 'keep_login') ?? $this->input->cookie(config_item('cookie_prefix') . 're_login');
$i_str_parts_a = explode(base64_encode($this->config->item('base_url')), $incoming_string);
$uid = base64_decode($i_str_parts_a[1]);
$a = $i_str_parts_a[0];
@@ -836,6 +927,13 @@ class User extends CI_Controller {
$user = $this->user_model->get_by_id($uid)->row();
$user_type = $user->user_type;
+ // direct login to clubstations are not allowed, especially not with a keeplogin cookie
+ if ($user->clubstation == 1) {
+ log_message('debug', "User ID: [$uid] Login rejected because of a external clubstation login attempt with a modified cookie. Attack?");
+ $this->session->set_flashdata('error', __("This is not allowed!"));
+ redirect('user/login');
+ }
+
// compare both strings the hard way and log in if they match
if ($this->user_model->check_keep_hash($a, $b)) {
@@ -845,7 +943,8 @@ class User extends CI_Controller {
// if everything is fine we can log in the user
$this->user_model->update_session($uid);
$this->user_model->set_last_seen($uid);
- log_message('debug', "User ID: [$uid] logged in successfully with 'Keep Login'.");
+ log_message('info', "User ID: [$uid] logged in successfully with 'Keep Login'.");
+ $this->input->set_cookie('re_login', '', -3600, ''); // delete re_login cookie in case this was a re-login from a clubstation or impersonated user
redirect('dashboard');
} else {
@@ -855,6 +954,7 @@ class User extends CI_Controller {
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', -3600, '');
+ $this->input->set_cookie('re_login', '', -3600, '');
redirect('user/login');
}
@@ -864,6 +964,7 @@ class User extends CI_Controller {
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', -3600, '');
+ $this->input->set_cookie('re_login', '', -3600, '');
$this->session->set_flashdata('error', __("Login failed. Try again."));
redirect('user/login');
}
@@ -873,6 +974,7 @@ class User extends CI_Controller {
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', -3600, '');
+ $this->input->set_cookie('re_login', '', -3600, '');
$this->session->set_flashdata('error', __("Login failed. Try again."));
redirect('user/login');
@@ -888,7 +990,8 @@ class User extends CI_Controller {
$this->load->view('interface_assets/footer');
} else {
- if($this->user_model->login() == 1) {
+ $login_attempt = $this->user_model->login();
+ if($login_attempt === 1) {
$this->user_model->update_session($data['user']->user_id);
$cookie= array(
@@ -916,7 +1019,10 @@ class User extends CI_Controller {
}
$this->user_model->set_last_seen($data['user']->user_id);
redirect('dashboard');
-
+
+ } else if ($login_attempt === 2) {
+ $this->session->set_flashdata('warning', __("You can't login to a clubstation directly. Use your personal account instead."));
+ redirect('user/login');
} else {
if(ENVIRONMENT == 'maintenance') {
$this->session->set_flashdata('notice', __("Sorry. This instance is currently in maintenance mode. If this message appears unexpectedly or keeps showing up, please contact an administrator. Only administrators are currently allowed to log in."));
@@ -929,17 +1035,25 @@ class User extends CI_Controller {
}
}
- function logout() {
+ function logout($custom_message = null, $hard_logout = true) {
$this->load->model('user_model');
$user_name = $this->session->userdata('user_name');
// Delete keep_login cookie
- $this->input->set_cookie('keep_login', '', -3600, '');
+ if ($hard_logout) {
+ $this->input->set_cookie('re_login', '', -3600, '');
+ $this->input->set_cookie('keep_login', '', -3600, '');
+ }
$this->user_model->clear_session();
-
- $this->session->set_flashdata('notice', sprintf(__("User %s logged out."), $user_name));
+
+ if ($custom_message != null && is_array($custom_message)) {
+ $this->input->set_cookie('tmp_msg', json_encode([$custom_message[0], $custom_message[1]]), 10, '');
+ } else {
+ $this->input->set_cookie('tmp_msg', json_encode(['notice', sprintf(__("User %s logged out."), $user_name)]), 10, '');
+ }
+
redirect('user/login');
}
@@ -1185,13 +1299,15 @@ class User extends CI_Controller {
// Check if impersonating is disabled in the config
if ($this->config->item('disable_impersonate')) {
- show_404();
+ $this->session->set_flashdata('error', sprintf(__("You currently can't impersonate another user. You need to set %s to %s in your config.php!"), "'disable_impersonate'", "'false'"));
+ redirect('dashboard');
}
// Load the encryption library
if (!$this->load->is_loaded('encryption')) {
$this->load->library('encryption');
}
+
// Load the user model
$this->load->model('user_model');
@@ -1241,13 +1357,38 @@ class User extends CI_Controller {
redirect('dashboard');
}
- // before we can impersonate a user, we need to make sure the current user is an admin
- // TODO: authorize from additional datatable 'impersonators' to allow other user types to impersonate
+ // before we can impersonate a user, we need to make sure the current user is allowed to do so
+ $clubswitch = $this->input->post('clubswitch', TRUE) ?? '';
+ $custom_sessiondata = [];
$source_user = $this->user_model->get_by_id($source_uid)->row();
- if(!$source_user || !$this->user_model->authorize(99)) {
- $this->session->set_flashdata('error', __("You're not allowed to do that!"));
- redirect('dashboard');
+ if ($clubswitch == 1) {
+ $this->load->model('club_model');
+ if (!$this->club_model->club_authorize(3, $target_uid, $source_uid) || !$this->user_model->authorize(3)) {
+ $this->session->set_flashdata('error', __("You're not allowed to do that!"));
+ redirect('dashboard');
+ } else {
+ $targetclub = array_filter($this->session->userdata('available_clubstations'), function($club) use ($target_uid) {
+ return $club->user_id == $target_uid;
+ });
+ $p_level = !empty($targetclub) ? reset($targetclub)->p_level : null;
+ if ($p_level != null) {
+ $custom_sessiondata['p_level'] = $p_level;
+ } else {
+ $this->session->set_flashdata('error', __("Could not determine the correct permission level for the clubstation. Try again after re-login."));
+ redirect('dashboard');
+ }
+ }
+ } else {
+ if(!$source_user || !$this->user_model->authorize(99)) {
+ $this->session->set_flashdata('error', __("You're not allowed to do that!"));
+ redirect('dashboard');
+ } else {
+ $custom_sessiondata['p_level'] = 99; // if the user is an admin he also should have full rights in the clubstations
+ }
}
+ $custom_sessiondata['src_call'] = $source_user->user_callsign;
+ $custom_sessiondata['src_user_type'] = $source_user->user_type;
+ $custom_sessiondata['src_hash'] = $this->input->post('hash', TRUE) ?? '';
/**
* Impersonate the user
@@ -1255,9 +1396,87 @@ class User extends CI_Controller {
// Update the session with the new user_id
// TODO: Find a solution for sessiondata 'radio', so a user would be able to use e.g. his own radio while impersonating another user
// Due the fact that the user is now impersonating another user, he can't use his default radio anymore
- $this->user_model->update_session($target_uid, null, $impersonate = true);
+ $this->session->set_userdata('source_uid', $source_uid);
+ $this->user_model->update_session($target_uid, null, true, $custom_sessiondata);
// Redirect to the dashboard, the user should now be logged in as the other user
redirect('dashboard');
}
+
+ public function stop_impersonate_modal() {
+ // Load the user model
+ $this->load->model('user_model');
+ if(!$this->user_model->authorize(3)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
+
+ $this->load->view('user/modals/stop_impersonate_modal');
+ }
+
+ public function stop_impersonate() {
+ // Load the user model
+ $this->load->model('user_model');
+
+ // there is no source_uid, there is probably something fishy going on. So we clear the session at this point
+ $source_uid = $this->session->userdata('source_uid') ?? false;
+ $post_chk = $this->input->post('stopImpersonate', TRUE) ?? false;
+ if (!$source_uid || $post_chk != 1) {
+ $this->logout(['error', __("Ups.. Something went wrong. Try to log back in.")]);
+ exit;
+ }
+
+ // is the current user a clubstation we need to check if the source user was allowed to impersonate the clubstation
+ $club = $this->user_model->get_by_id($this->session->userdata('user_id'))->row();
+ $current_is_club = $club->clubstation == 1 ? true : false;
+ $source_user = $this->user_model->get_by_id($source_uid)->row();
+
+ if ($current_is_club) {
+ $this->load->model('club_model');
+ if (!$this->club_model->club_authorize(3, $this->session->userdata('user_id'), $source_uid)) {
+ $this->logout(['error', __("Ups.. Something went wrong. Try to log back in.")]);
+ exit;
+ }
+ } else {
+ // if the current user is not a clubstation, we need to check if the source user was allowed to impersonate the current user (has to be an admin)
+ if($source_user->user_type != 99) {
+ $this->logout(['error', __("Ups.. Something went wrong. Try to log back in.")]);
+ exit;
+ }
+ }
+
+ // Validate the impersonate hash
+ $this->load->library('encryption');
+ $raw_hash = $this->encryption->decrypt($this->session->userdata('cd_src_hash') ?? false);
+ if (!$raw_hash) {
+ $this->logout(['error', __("Ups.. Something went wrong. Try to log back in.")]);
+ exit;
+ }
+ $hash_parts = explode('/', $raw_hash);
+ $src_in_hash = $hash_parts[0];
+ $tgt_in_hash = $hash_parts[1];
+ $timestamp = $hash_parts[2];
+ if ($src_in_hash != $source_uid || $tgt_in_hash != $this->session->userdata('user_id')) {
+ $this->logout(['error', __("Ups.. Something went wrong. Try to log back in.")]);
+ exit;
+ }
+
+ // The timestamp can't be older then 2 hours
+ if (time() - $timestamp > 7200) {
+ $this->logout(['notice', __("The ability to return quickly has been disabled after the security hash expired. Please log in again.")]);
+ exit;
+ }
+
+ // Create a keep login cookie which will be used to log back in as the source user
+ $encrypted_string = $this->user_model->keep_cookie_hash($source_uid);
+ $cookie = array(
+ 'name' => 're_login', // we use a different cookie name to avoid conflicts with the regular keep_login cookie
+ 'value' => $encrypted_string,
+ 'expire' => 20, // seconds should be enough
+ 'secure' => FALSE,
+ 'httponly' => TRUE
+ );
+ $this->input->set_cookie($cookie);
+
+ // log out on the regular way
+ $msg = ['notice', sprintf(__("You have been logged out of the clubstation %s. Welcome back, %s, to your personal account!"), $club->user_callsign, $source_user->user_callsign)];
+ $this->logout($msg, false);
+ }
}
diff --git a/application/controllers/Webadif.php b/application/controllers/Webadif.php
index dc1d1bcf0..989693cc0 100644
--- a/application/controllers/Webadif.php
+++ b/application/controllers/Webadif.php
@@ -87,6 +87,9 @@ class Webadif extends CI_Controller {
* Used for displaying the uid for manually selecting log for upload to webADIF consumer
*/
public function export() {
+ $this->load->model('user_model');
+ if(!$this->user_model->authorize(2) || !clubaccess_check(9)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
+
$this->load->model('stations');
$data['page_title'] = __("QO-100 Dx Club Upload");
diff --git a/application/helpers/club_helper.php b/application/helpers/club_helper.php
new file mode 100644
index 000000000..780800b98
--- /dev/null
+++ b/application/helpers/club_helper.php
@@ -0,0 +1,49 @@
+load->is_loaded('session')) {
+ $CI->load->library('session');
+ }
+
+ $clubmode = $CI->config->item('special_callsign') ?? false;
+ $clubstation = $CI->session->userdata('clubstation') ?? 0;
+
+ if ($clubmode && $clubstation == 1) {
+ // check if the user has the required level
+ if ($CI->session->userdata('cd_p_level') >= $required_level) {
+ if ($qso_id != 0) {
+ // check if the QSO belongs to the user
+ $CI->load->model('logbook_model');
+ $qso = $CI->logbook_model->get_qso($qso_id)->row();
+ if ($qso->COL_OPERATOR == $CI->session->userdata('operator_callsign') || $CI->session->userdata('cd_p_level') >= 9) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return true;
+ }
+ } else {
+ return false;
+ }
+ } else {
+ // return always true if the special callsign mode is disabled, so there is no change in behaviour
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/migrations/233_clubstations.php b/application/migrations/233_clubstations.php
new file mode 100644
index 000000000..5690d7c39
--- /dev/null
+++ b/application/migrations/233_clubstations.php
@@ -0,0 +1,64 @@
+add_column_if_not_exists('users', 'clubstation', 'TINYINT(1) DEFAULT 0 AFTER user_type');
+ $this->add_column_if_not_exists('users', 'created_at', 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP');
+ $this->add_column_if_not_exists('users', 'modified_at', 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
+
+ // Create a new table for the club permissions
+ if (!$this->db->table_exists('club_permissions')) {
+ try {
+ $this->db->query("CREATE TABLE `club_permissions` (
+ id INT(6) UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+ club_id INT(6) UNSIGNED NOT NULL,
+ user_id INT(6) UNSIGNED NOT NULL,
+ p_level INT(2) UNSIGNED NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ modified_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE RESTRICT,
+ UNIQUE (user_id, club_id)
+ );");
+ } catch (Exception $e) {
+ log_message('error', 'Mig 230 - Error creating table "club_permissions": ' . $e->getMessage());
+ }
+ }
+
+ // Add 'created_by' column to 'api' table
+ $this->add_column_if_not_exists('api', 'created_by', 'INT(6) NOT NULL DEFAULT 0');
+ $this->db->query("UPDATE `api` SET created_by = user_id;");
+ $this->db->query("ALTER TABLE `api` MODIFY created_by INT(6) NOT NULL;");
+
+ // Add 'created_at' column to 'api' table
+ $this->add_column_if_not_exists('api', 'created_at', 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP');
+
+ // Add 'operator' column to 'cat' table
+ $this->add_column_if_not_exists('cat', 'operator', 'INT(6) NOT NULL DEFAULT 0');
+ $this->db->query("UPDATE `cat` SET operator = user_id;");
+ $this->db->query("ALTER TABLE `cat` MODIFY operator INT(6) NOT NULL;");
+ }
+
+ public function down() {
+ // Due the risk of data loss we can't drop any new created columns or tables
+ // But we can drop some of the timestamp columns
+ $this->db->query("ALTER TABLE `users` DROP COLUMN created_at;");
+ $this->db->query("ALTER TABLE `users` DROP COLUMN modified_at;");
+ $this->db->query("ALTER TABLE `api` DROP COLUMN created_at;");
+ }
+
+ private function add_column_if_not_exists($table, $column, $definition) {
+ $col_check = $this->db->query("SHOW COLUMNS FROM `$table` LIKE '$column';")->num_rows() > 0;
+ if (!$col_check) {
+ try {
+ $this->db->query("ALTER TABLE `$table` ADD COLUMN $column $definition;");
+ log_message('info', "Mig 230 - Column '$column' added to table '$table'.");
+ } catch (Exception $e) {
+ log_message('error', "Mig 230 - Error adding column '$column' to table '$table': " . $e->getMessage());
+ }
+ } else {
+ log_message('info', "Mig 230 - Column '$column' already exists in table '$table', skipping ALTER TABLE.");
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/models/Api_model.php b/application/models/Api_model.php
index 1677ab9e7..7881ac8c1 100644
--- a/application/models/Api_model.php
+++ b/application/models/Api_model.php
@@ -8,299 +8,137 @@
class API_Model extends CI_Model {
- // GET API Keys
- function keys() {
- $this->db->where('user_id', $this->session->userdata('user_id'));
- return $this->db->get('api');
- }
+ // GET API Keys
+ function keys() {
+ $binding = [];
+ $user_id = $this->session->userdata('user_id');
+ $clubstation = $this->session->userdata('clubstation');
+ $impersonate = $this->session->userdata('impersonate');
- function CountKeysWithNoUserID() {
- $this->db->where('user_id =', NULL);
+ if ($clubstation == 1 && $impersonate == 1) {
+ $sql = "SELECT api.*, users.user_callsign
+ FROM api
+ JOIN users ON api.created_by = users.user_id
+ WHERE api.user_id = ?";
+ $binding[] = $user_id;
+
+ if (!clubaccess_check(9)) {
+ $sql .= " AND api.created_by = ?";
+ $binding[] = $this->session->userdata('source_uid');
+ }
+ } else {
+ $sql = "SELECT * FROM api WHERE user_id = ?";
+ $binding[] = $user_id;
+ }
+
+ return $this->db->query($sql, $binding);
+ }
+
+ function key_description($key) {
+ $this->db->where('user_id', $this->session->userdata('user_id'));
+ $this->db->where('key', $key);
$query = $this->db->get('api');
- return $query->num_rows();
- }
-
- function key_description($key) {
- $this->db->where('user_id', $this->session->userdata('user_id'));
- $this->db->where('key', $key);
- $query = $this->db->get('api');
-
- return $query->result_array()[0];
- }
+ return $query->result_array()[0];
+ }
function key_userid($key) {
- $this->db->where('key', $key);
- $query = $this->db->get('api');
+ $this->db->where('key', $key);
+ $query = $this->db->get('api');
- return $query->result_array()[0]['user_id'];
- }
+ return $query->result_array()[0]['user_id'];
+ }
- function update_key_description($key, $description) {
+ function key_created_by($key) {
+ $this->db->where('key', $key);
+ $query = $this->db->get('api');
- $data = array(
- 'description' => xss_clean($description),
+ return $query->result_array()[0]['created_by'];
+ }
+
+ function update_key_description($key, $description) {
+
+ $data = array(
+ 'description' => xss_clean($description),
);
$this->db->where('key', xss_clean($key));
$this->db->where('user_id', $this->session->userdata('user_id'));
$this->db->update('api', xss_clean($data));
-
- }
+ }
- function delete_key($key) {
+ function delete_key($key) {
$this->db->where('user_id', $this->session->userdata('user_id'));
- $this->db->where('key', xss_clean($key));
+ $this->db->where('key', xss_clean($key));
$this->db->delete('api');
- }
- // Generate API Key
- function generate_key($rights) {
+ }
- // Expects either rw (Read, Write) or r (read only)
+ // Generate API Key
+ function generate_key($rights, $creator = NULL) {
- // Generate Unique Key
- $data['key'] = uniqid("wl");
+ // Generate Unique Key
+ $data['key'] = "wl" . substr(md5(uniqid(rand(), true)), 19);
+ $data['rights'] = $rights;
- $data['rights'] = $rights;
-
- // Set API key to active
- $data['status'] = "active";
+ // Set API key to active
+ $data['status'] = "active";
$data['user_id'] = $this->session->userdata('user_id');
+ $data['created_by'] = $creator != NULL ? $creator : $this->session->userdata('user_id');
- $this->db->insert('api', $data);
- }
-
- function access($key) {
-
- // No key = no access, mate
- if(!$key) {
- return $status = "No Key Found";
- }
-
- // Check that the key is valid
- $this->db->where('key', $key);
- $query = $this->db->get('api');
-
- if ($query->num_rows() > 0)
- {
- foreach ($query->result() as $row)
- {
- if($row->status == "active") {
- return $status = $row->rights;
- } else {
- return $status = "Key Disabled";
- }
- }
- } else {
- return $status = "No Key Found";
- }
- }
-
- function authorize($key) {
- $r = $this->access($key);
- if($r == "rw") {
- return 2;
- } else if($r == "r") {
- return 1;
- } else {
- return 0;
- }
- }
-
- function update_last_used($key) {
- $this->db->set('last_used', 'NOW()', FALSE);
- $this->db->where('key', xss_clean($key));
- $this->db->update('api');
-
- // Also update last_seen in user table
- $user_id = $this->key_userid($key);
-
- $this->load->model('user_model');
- $this->user_model->set_last_seen($user_id);
- }
-
- // FUNCTION: string name(string $column)
- // Converts a MySQL column name to a more friendly name
- function name($col)
- {
- if($this->_columnName[$col])
- {
- return $this->_columnName[$col]['Name'];
+ if ($this->db->insert('api', $data)) {
+ return true;
+ } else {
+ return false;
}
- else
- {
+ }
+
+ function access($key) {
+
+ // No key = no access, mate
+ if (!$key) {
+ return $status = "No Key Found";
+ }
+
+ // Check that the key is valid
+ $this->db->where('key', $key);
+ $query = $this->db->get('api');
+
+ if ($query->num_rows() > 0) {
+ foreach ($query->result() as $row) {
+ if ($row->status == "active") {
+ return $status = $row->rights;
+ } else {
+ return $status = "Key Disabled";
+ }
+ }
+ } else {
+ return $status = "No Key Found";
+ }
+ }
+
+ function authorize($key) {
+ $r = $this->access($key);
+ if ($r == "rw") {
+ return 2;
+ } else if ($r == "r") {
+ return 1;
+ } else {
return 0;
}
}
- // FUNCTION: string description(string $column)
- // Returns the description for a MySQL column name
- function description($col)
- {
- if($this->_columnName[$col])
- {
- if($this->_columnName[$col]['Description'] != "")
- {
- return $this->_columnName[$col]['Description'];
- }
- else
- {
- return "No description available";
- }
- }
- else
- {
- return 0;
- }
+ function update_last_used($key) {
+ $this->db->set('last_used', 'NOW()', FALSE);
+ $this->db->where('key', xss_clean($key));
+ $this->db->update('api');
+
+ // Also update last_seen in user table
+ $user_id = $this->key_userid($key);
+
+ $this->load->model('user_model');
+ $this->user_model->set_last_seen($user_id);
}
-
- // FUNCTION: string name(string $name)
- // Converts a friendly name to a MySQL column name
- function column($name)
- {
- while ($column = current($this->_columnName))
- {
- if($this->_columnName[key($this->_columnName)]['Name'] == $name)
- {
- $a = key($this->_columnName);
- reset($this->_columnName);
- return $a;
- }
- next($this->_columnName);
- }
-
- reset($this->_columnName);
- return 0;
- }
-
-
- // ARRAY: $_columnName
- // An array matching MySQL column names to friendly names, descriptions and types
- private $_columnName = array(
- 'COL_PRIMARY_KEY' => array('Name' => 'ID', 'Description' => 'Unique QSO ID', 'Type' => 'I'),
- 'COL_ADDRESS' => array('Name' => 'Address', 'Description' => 'Operator\'s address', 'Type' => 'S'),
- 'COL_AGE' => array('Name' => 'Age', 'Description' => 'Operator\'s age', 'Type' => 'I'),
- 'COL_A_INDEX' => array('Name' => 'AIndex', 'Description' => 'Solar A Index', 'Type' => 'I'),
- 'COL_ANT_AZ' => array('Name' => 'AntennaAzimuth', 'Description' => 'Antenna azimuth', 'Type' => 'I'),
- 'COL_ANT_EL' => array('Name' => 'AntennaElevation', 'Description' => 'Antenna elevation', 'Type' => 'I'),
- 'COL_ANT_PATH' => array('Name' => 'AntennaPath', 'Description' => 'Antenna path', 'Type' => ''),
- 'COL_ARRL_SECT' => array('Name' => 'ARRLSection', 'Description' => 'ARRL Section', 'Type' => ''),
- 'COL_BAND' => array('Name' => 'Band', 'Description' => 'Band', 'Type' => ''),
- 'COL_BAND_RX' => array('Name' => 'BandRX', 'Description' => '', 'Type' => ''),
- 'COL_BIOGRAPHY' => array('Name' => 'Biography', 'Description' => '', 'Type' => ''),
- 'COL_CALL' => array('Name' => 'Call', 'Description' => '', 'Type' => ''),
- 'COL_CHECK' => array('Name' => 'UNK_CHECK', 'Description' => '', 'Type' => ''),
- 'COL_CLASS' => array('Name' => 'Class', 'Description' => '', 'Type' => ''),
- 'COL_CNTY' => array('Name' => 'County', 'Description' => '', 'Type' => ''),
- 'COL_COMMENT' => array('Name' => 'Comment', 'Description' => '', 'Type' => ''),
- 'COL_CONT' => array('Name' => 'Continent', 'Description' => '', 'Type' => ''),
- 'COL_CONTACTED_OP' => array('Name' => 'UNK_CONTACTED_OP', 'Description' => '', 'Type' => ''),
- 'COL_CONTEST_ID' => array('Name' => 'ContestID', 'Description' => '', 'Type' => ''),
- 'COL_COUNTRY' => array('Name' => 'Country', 'Description' => '', 'Type' => ''),
- 'COL_CQZ' => array('Name' => 'CQZone', 'Description' => '', 'Type' => ''),
- 'COL_DARC_DOK' => array('Name' => 'DOK', 'Description' => '', 'Type' => ''),
- 'COL_DISTANCE' => array('Name' => 'Distance', 'Description' => '', 'Type' => ''),
- 'COL_DXCC' => array('Name' => 'DXCC', 'Description' => '', 'Type' => ''),
- 'COL_EMAIL' => array('Name' => 'EMail', 'Description' => '', 'Type' => ''),
- 'COL_EQ_CALL' => array('Name' => 'UNK_EQ_CALL', 'Description' => '', 'Type' => ''),
- 'COL_EQSL_QSLRDATE' => array('Name' => 'EQSLRecievedDate', 'Description' => '', 'Type' => ''),
- 'COL_EQSL_QSLSDATE' => array('Name' => 'EQSLSentDate', 'Description' => '', 'Type' => ''),
- 'COL_EQSL_QSL_RCVD' => array('Name' => 'EQSLRecieved', 'Description' => '', 'Type' => ''),
- 'COL_EQSL_QSL_SENT' => array('Name' => 'EQSLSent', 'Description' => '', 'Type' => ''),
- 'COL_EQSL_STATUS' => array('Name' => 'EQSLStatus', 'Description' => '', 'Type' => ''),
- 'COL_FORCE_INIT' => array('Name' => 'UNK_FORCE_INIT', 'Description' => '', 'Type' => ''),
- 'COL_FREQ' => array('Name' => 'Frequency', 'Description' => '', 'Type' => ''),
- 'COL_FREQ_RX' => array('Name' => 'FrequencyRX', 'Description' => '', 'Type' => ''),
- 'COL_GRIDSQUARE' => array('Name' => 'Locator', 'Description' => '', 'Type' => ''),
- 'COL_HEADING' => array('Name' => 'Heading', 'Description' => '', 'Type' => ''),
- 'COL_IOTA' => array('Name' => 'IOTA', 'Description' => '', 'Type' => ''),
- 'COL_ITUZ' => array('Name' => 'ITUZone', 'Description' => '', 'Type' => ''),
- 'COL_K_INDEX' => array('Name' => 'KIndex', 'Description' => '', 'Type' => ''),
- 'COL_LAT' => array('Name' => 'Latitude', 'Description' => '', 'Type' => ''),
- 'COL_LON' => array('Name' => 'Longitude', 'Description' => '', 'Type' => ''),
- 'COL_LOTW_QSLRDATE' => array('Name' => 'LOTWRecievedDate', 'Description' => '', 'Type' => ''),
- 'COL_LOTW_QSLSDATE' => array('Name' => 'LOTWSentDate', 'Description' => '', 'Type' => ''),
- 'COL_LOTW_QSL_RCVD' => array('Name' => 'LOTWRecieved', 'Description' => '', 'Type' => ''),
- 'COL_LOTW_QSL_SENT' => array('Name' => 'LOTWSent', 'Description' => '', 'Type' => ''),
- 'COL_LOTW_STATUS' => array('Name' => 'LOTWStatus', 'Description' => '', 'Type' => ''),
- 'COL_MAX_BURSTS' => array('Name' => 'MaxBursts', 'Description' => '', 'Type' => ''),
- 'COL_MODE' => array('Name' => 'Mode', 'Description' => '', 'Type' => ''),
- 'COL_MS_SHOWER' => array('Name' => 'MSShower', 'Description' => '', 'Type' => ''),
- 'COL_MY_CITY' => array('Name' => 'MyCity', 'Description' => '', 'Type' => ''),
- 'COL_MY_CNTY' => array('Name' => 'MyCounty', 'Description' => '', 'Type' => ''),
- 'COL_MY_COUNTRY' => array('Name' => 'MyCountry', 'Description' => '', 'Type' => ''),
- 'COL_MY_CQ_ZONE' => array('Name' => 'MyCQZone', 'Description' => '', 'Type' => ''),
- 'COL_MY_GRIDSQUARE' => array('Name' => 'MyLocator', 'Description' => '', 'Type' => ''),
- 'COL_MY_IOTA' => array('Name' => 'MyIOTA', 'Description' => '', 'Type' => ''),
- 'COL_MY_ITU_ZONE' => array('Name' => 'MyITUZone', 'Description' => '', 'Type' => ''),
- 'COL_MY_LAT' => array('Name' => 'MyLatitude', 'Description' => '', 'Type' => ''),
- 'COL_MY_LON' => array('Name' => 'MyLongitude', 'Description' => '', 'Type' => ''),
- 'COL_MY_NAME' => array('Name' => 'MyName', 'Description' => '', 'Type' => ''),
- 'COL_MY_POSTAL_CODE' => array('Name' => 'MyPostalCode', 'Description' => '', 'Type' => ''),
- 'COL_MY_RIG' => array('Name' => 'MyRig', 'Description' => '', 'Type' => ''),
- 'COL_MY_SIG' => array('Name' => 'MySig', 'Description' => '', 'Type' => ''),
- 'COL_MY_SIG_INFO' => array('Name' => 'MySigInfo', 'Description' => '', 'Type' => ''),
- 'COL_MY_STATE' => array('Name' => 'MyState', 'Description' => '', 'Type' => ''),
- 'COL_MY_STREET' => array('Name' => 'MyStreet', 'Description' => '', 'Type' => ''),
- 'COL_NAME' => array('Name' => 'Name', 'Description' => '', 'Type' => ''),
- 'COL_NOTES' => array('Name' => 'Notes', 'Description' => '', 'Type' => ''),
- 'COL_NR_BURSTS' => array('Name' => 'NumBursts', 'Description' => '', 'Type' => ''),
- 'COL_NR_PINGS' => array('Name' => 'NumPings', 'Description' => '', 'Type' => ''),
- 'COL_OPERATOR' => array('Name' => 'Operator', 'Description' => '', 'Type' => ''),
- 'COL_OWNER_CALLSIGN' => array('Name' => 'OwnerCallsign', 'Description' => '', 'Type' => ''),
- 'COL_PFX' => array('Name' => 'Prefix', 'Description' => '', 'Type' => ''),
- 'COL_PRECEDENCE' => array('Name' => 'Precedence', 'Description' => '', 'Type' => ''),
- 'COL_PROP_MODE' => array('Name' => 'PropMode', 'Description' => '', 'Type' => ''),
- 'COL_PUBLIC_KEY' => array('Name' => 'PublicKey', 'Description' => '', 'Type' => ''),
- 'COL_QSLMSG' => array('Name' => 'QSLMessage', 'Description' => '', 'Type' => ''),
- 'COL_QSLRDATE' => array('Name' => 'QSLRecievedDate', 'Description' => '', 'Type' => ''),
- 'COL_QSLSDATE' => array('Name' => 'QSLSentDate', 'Description' => '', 'Type' => ''),
- 'COL_QSL_RCVD' => array('Name' => 'QSLRecieved', 'Description' => '', 'Type' => ''),
- 'COL_QSL_RCVD_VIA' => array('Name' => 'QSLRecievedVia', 'Description' => '', 'Type' => ''),
- 'COL_QSL_SENT' => array('Name' => 'QSLSent', 'Description' => '', 'Type' => ''),
- 'COL_QSL_SENT_VIA' => array('Name' => 'QSLSentVia', 'Description' => '', 'Type' => ''),
- 'COL_QSL_VIA' => array('Name' => 'QSLVia', 'Description' => '', 'Type' => ''),
- 'COL_QSO_COMPLETE' => array('Name' => 'QSOComplete', 'Description' => '', 'Type' => ''),
- 'COL_QSO_RANDOM' => array('Name' => 'QSORandom', 'Description' => '', 'Type' => ''),
- 'COL_QTH' => array('Name' => 'QTH', 'Description' => '', 'Type' => ''),
- 'COL_RIG' => array('Name' => 'Rig', 'Description' => '', 'Type' => ''),
- 'COL_RST_RCVD' => array('Name' => 'ReportRecieved', 'Description' => '', 'Type' => ''),
- 'COL_RST_SENT' => array('Name' => 'ReportSent', 'Description' => '', 'Type' => ''),
- 'COL_RX_PWR' => array('Name' => 'RXPower', 'Description' => '', 'Type' => ''),
- 'COL_SAT_MODE' => array('Name' => 'SatMode', 'Description' => '', 'Type' => ''),
- 'COL_SAT_NAME' => array('Name' => 'SatName', 'Description' => '', 'Type' => ''),
- 'COL_SFI' => array('Name' => 'SFI', 'Description' => '', 'Type' => ''),
- 'COL_SIG' => array('Name' => 'Sig', 'Description' => '', 'Type' => ''),
- 'COL_SIG_INFO' => array('Name' => 'SigInfo', 'Description' => '', 'Type' => ''),
- 'COL_SRX' => array('Name' => 'UNK_SRX', 'Description' => '', 'Type' => ''),
- 'COL_STX' => array('Name' => 'UNK_STX', 'Description' => '', 'Type' => ''),
- 'COL_SRX_STRING' => array('Name' => 'UNK_SRX_STRING', 'Description' => '', 'Type' => ''),
- 'COL_STX_STRING' => array('Name' => 'UNK_STX_STRING', 'Description' => '', 'Type' => ''),
- 'COL_STATE' => array('Name' => 'State', 'Description' => '', 'Type' => ''),
- 'COL_STATION_CALLSIGN' => array('Name' => 'StationCall', 'Description' => '', 'Type' => ''),
- 'COL_SWL' => array('Name' => 'SWL', 'Description' => '', 'Type' => ''),
- 'COL_TEN_TEN' => array('Name' => 'TenTen', 'Description' => '', 'Type' => ''),
- 'COL_TIME_OFF' => array('Name' => 'TimeOff', 'Description' => '', 'Type' => ''),
- 'COL_TIME_ON' => array('Name' => 'TimeOn', 'Description' => '', 'Type' => ''),
- 'COL_TX_PWR' => array('Name' => 'TXPower', 'Description' => '', 'Type' => ''),
- 'COL_WEB' => array('Name' => 'Website', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_0' => array('Name' => 'UNK_USER_DEFINED_0', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_1' => array('Name' => 'UNK_USER_DEFINED_1', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_2' => array('Name' => 'UNK_USER_DEFINED_2', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_3' => array('Name' => 'UNK_USER_DEFINED_3', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_4' => array('Name' => 'UNK_USER_DEFINED_4', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_5' => array('Name' => 'UNK_USER_DEFINED_5', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_6' => array('Name' => 'UNK_USER_DEFINED_6', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_7' => array('Name' => 'UNK_USER_DEFINED_7', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_8' => array('Name' => 'UNK_USER_DEFINED_8', 'Description' => '', 'Type' => ''),
- 'COL_USER_DEFINED_9' => array('Name' => 'UNK_USER_DEFINED_9', 'Description' => '', 'Type' => ''),
- 'COL_CREDIT_GRANTED' => array('Name' => 'UNK_CREDIT_GRANTED', 'Description' => '', 'Type' => ''),
- 'COL_CREDIT_SUBMITTED' => array('Name' => 'UNK_CREDIT_SUBMITTED', 'Description' => '', 'Type' => ''),
- );
-
}
-
-?>
diff --git a/application/models/Cat.php b/application/models/Cat.php
index efde42f69..c7bfc3ea7 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -2,7 +2,7 @@
class Cat extends CI_Model {
- function update($result, $user_id) {
+ function update($result, $user_id, $operator) {
$timestamp = gmdate("Y-m-d H:i:s");
@@ -16,6 +16,7 @@
}
$this->db->where('radio', $result['radio']);
+ $this->db->where('operator', $operator);
$this->db->where('user_id', $user_id);
$query = $this->db->get('cat');
@@ -74,6 +75,7 @@
// Add a new record
$data['radio'] = $result['radio'];
$data['user_id'] = $user_id;
+ $data['operator'] = $operator;
$this->db->insert('cat', $data);
}
@@ -82,6 +84,9 @@
function status() {
//$this->db->where('radio', $result['radio']);
$this->db->where('user_id', $this->session->userdata('user_id'));
+ if ($this->session->userdata('clubstation') == 1 && !clubaccess_check(9)) {
+ $this->db->where('operator', $this->session->userdata('source_uid'));
+ }
$query = $this->db->get('cat');
return $query;
@@ -89,6 +94,9 @@
function recent_status() {
$this->db->where('user_id', $this->session->userdata('user_id'));
+ if ($this->session->userdata('clubstation') == 1 && !clubaccess_check(9)) {
+ $this->db->where('operator', $this->session->userdata('source_uid'));
+ }
$this->db->where("timestamp > date_sub(UTC_TIMESTAMP(), interval 15 minute)", NULL, FALSE);
$query = $this->db->get('cat');
@@ -96,22 +104,39 @@
}
/* Return list of radios */
- function radios() {
+ function radios($only_operator = false) {
$this->db->select('id, radio');
$this->db->where('user_id', $this->session->userdata('user_id'));
+ if ($only_operator || ($this->session->userdata('clubstation') == 1 && !clubaccess_check(9))) {
+ $this->db->where('operator', $this->session->userdata('source_uid'));
+ }
$query = $this->db->get('cat');
return $query;
}
function radio_status($id) {
+ $binding = [];
$sql = 'SELECT * FROM `cat` WHERE id = ? AND user_id = ?';
- return $this->db->query($sql, array($id, $this->session->userdata('user_id')));
+ $binding[] = $id;
+ $binding[] = $this->session->userdata('user_id');
+ if ($this->session->userdata('clubstation') == 1 && !clubaccess_check(9)) {
+ $sql .= ' AND operator = ?';
+ $binding[] = $this->session->userdata('source_uid');
+ }
+ return $this->db->query($sql, $binding);
}
function last_updated() {
- $sql = 'SELECT * FROM cat WHERE user_id = ? ORDER BY timestamp DESC LIMIT 1';
- return $this->db->query($sql, $this->session->userdata('user_id'));
+ $binding = [];
+ $sql = 'SELECT * FROM cat WHERE user_id = ?';
+ $binding[] = $this->session->userdata('user_id');
+ if ($this->session->userdata('clubstation') == 1 && !clubaccess_check(9)) {
+ $sql .= ' AND operator = ?';
+ $binding[] = $this->session->userdata('source_uid');
+ }
+ $sql .= ' ORDER BY timestamp DESC LIMIT 1';
+ return $this->db->query($sql, $binding);
}
function delete($id) {
diff --git a/application/models/Club_model.php b/application/models/Club_model.php
new file mode 100644
index 000000000..663e86680
--- /dev/null
+++ b/application/models/Club_model.php
@@ -0,0 +1,205 @@
+session->set_flashdata('error', __("Invalid Club ID!"));
+ redirect('dashboard');
+ }
+
+ // admin is always allowed
+ $this->load->model('user_model');
+ if ($user_id != NULL) {
+ if ($this->user_model->get_by_id($user_id)->row()->user_type == 99) {
+ return true;
+ }
+ }
+
+ if ($user_id == NULL || !is_numeric($user_id)) {
+ $user_id = $this->session->userdata('user_id');
+ } else {
+ $user_id = xss_clean($user_id);
+ }
+
+ // Now we can check the database for permissions
+ $binding = [];
+ $sql = 'SELECT * FROM `club_permissions` WHERE user_id = ? AND club_id = ? AND p_level >= ?';
+ $binding[] = $user_id;
+ $binding[] = $club_id;
+ $binding[] = $level;
+
+ $query = $this->db->query($sql, $binding);
+
+ if ($query->num_rows() > 0) {
+ return true;
+ } else {
+ $this->session->set_flashdata('error', __("You're not allowed to do that!"));
+ redirect('dashboard');
+ }
+
+ return false;
+ }
+
+ /**
+ * Get Permissionlevel for User in Club
+ *
+ * @param int $club_id
+ * @param int $user_id
+ *
+ * @return int
+ */
+ function get_permission($club_id, $user_id) {
+
+ if ($club_id == 0 || !is_numeric($club_id)) {
+ $this->session->set_flashdata('error', __("Invalid Club ID!"));
+ redirect('dashboard');
+ }
+
+ if ($user_id == 0 || !is_numeric($user_id)) {
+ $this->session->set_flashdata('error', __("Invalid User ID!"));
+ redirect('dashboard');
+ }
+
+ $binding = [];
+ $sql = 'SELECT p_level FROM `club_permissions` WHERE user_id = ? AND club_id = ?';
+ $binding[] = $user_id;
+ $binding[] = $club_id;
+
+ $query = $this->db->query($sql, $binding);
+
+ if ($query->num_rows() > 0) {
+ return $query->row()->p_level;
+ } else {
+ return 0;
+ }
+ }
+
+ /**
+ * Get Club Members
+ *
+ * @param int $club_id
+ *
+ * @return array
+ */
+ function get_club_members($club_id) {
+
+ $sql = 'SELECT users.user_id, users.user_type, users.user_callsign, users.user_name, users.user_firstname, users.user_lastname, users.user_email, club_permissions.p_level
+ FROM club_permissions
+ JOIN users ON club_permissions.user_id = users.user_id
+ WHERE club_permissions.club_id = ?;';
+
+ $members = $this->db->query($sql, [$club_id])->result();
+
+ return $members;
+ }
+
+ /**
+ * Get available Clubstations per User
+ *
+ * @param int $user_id
+ *
+ * @return array
+ */
+ function get_clubstations($user_id) {
+
+ $sql = 'SELECT users.user_id, users.user_callsign, club_permissions.p_level
+ FROM club_permissions
+ JOIN users ON club_permissions.club_id = users.user_id
+ WHERE club_permissions.user_id = ?;';
+
+ $clubs = $this->db->query($sql, [$user_id])->result();
+
+ return $clubs;
+ }
+
+ /**
+ *
+ * Add Club Member
+ *
+ * @param int $club_id
+ * @param int $user_id
+ * @param int $p_level
+ *
+ * @return boolean
+ */
+ function alter_member($club_id, $user_id, $p_level) {
+
+ if ($club_id == 0 || !is_numeric($club_id)) {
+ $this->session->set_flashdata('error', __("Invalid Club ID!"));
+ redirect('dashboard');
+ }
+
+ if ($user_id == 0 || !is_numeric($user_id)) {
+ $this->session->set_flashdata('error', __("Invalid User ID!"));
+ redirect('dashboard');
+ }
+
+ if ($p_level == 0 || !is_numeric($p_level)) {
+ $this->session->set_flashdata('error', __("Invalid Permission Level!"));
+ redirect('dashboard');
+ }
+
+ $binding = [];
+ $sql = "INSERT INTO club_permissions (club_id, user_id, p_level)
+ VALUES (?, ?, ?)
+ ON DUPLICATE KEY UPDATE p_level = VALUES(p_level)";
+ $binding[] = $club_id;
+ $binding[] = $user_id;
+ $binding[] = $p_level;
+
+ if ($this->db->query($sql, $binding)) {
+ return true;
+ } else {
+ $this->session->set_flashdata('error', __("Error adding Club Member!"));
+ redirect('club/permissions/' . $club_id);
+ }
+ }
+
+ /**
+ *
+ * Delete Club Member
+ *
+ * @param int $club_id
+ * @param int $user_id
+ *
+ * @return boolean
+ */
+ function delete_member($club_id, $user_id) {
+
+ if ($club_id == 0 || !is_numeric($club_id)) {
+ $this->session->set_flashdata('error', __("Invalid Club ID!"));
+ redirect('dashboard');
+ }
+
+ if ($user_id == 0 || !is_numeric($user_id)) {
+ $this->session->set_flashdata('error', __("Invalid User ID!"));
+ redirect('dashboard');
+ }
+
+ try {
+ $this->db->query('DELETE FROM club_permissions WHERE club_id = ? AND user_id = ?', [$club_id, $user_id]);
+ $this->db->query('DELETE FROM api WHERE user_id = ? AND created_by = ?', [$club_id, $user_id]);
+ $this->db->query('DELETE FROM cat WHERE user_id = ? AND operator = ?', [$club_id, $user_id]);
+ return true;
+ } catch (Exception $e) {
+ log_message('error', 'Error deleting Club Member: ' . $e->getMessage());
+ return false;
+ }
+ }
+}
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index b0de59489..538bb6c9f 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -1490,7 +1490,7 @@ class Logbook_model extends CI_Model {
'COL_ANT_EL' => $this->input->post('ant_el') != '' ? $this->input->post('ant_el') : null,
'station_id' => $stationId,
'COL_STATION_CALLSIGN' => $stationCallsign,
- 'COL_OPERATOR' => $this->input->post('operator_callsign'),
+ 'COL_OPERATOR' => $this->input->post('operator_callsign') ?? $qso->COL_OPERATOR,
'COL_STATE' => $this->input->post('input_state_edit'),
'COL_CNTY' => $uscounty,
'COL_MY_IOTA' => $iotaRef,
@@ -4293,7 +4293,7 @@ class Logbook_model extends CI_Model {
if ($operatorName != false) {
- $operatorName = $this->session->userdata('user_callsign');
+ $operatorName = $this->session->userdata('operator_callsign');
} else {
$operatorName = (!empty($record['operator'])) ? $record['operator'] : '';
}
diff --git a/application/models/Staticmap_model.php b/application/models/Staticmap_model.php
index a4c82e859..e5aba5011 100644
--- a/application/models/Staticmap_model.php
+++ b/application/models/Staticmap_model.php
@@ -641,7 +641,7 @@ class Staticmap_model extends CI_Model {
$cacheDir = $cachepath . "staticmap_images/";
if (!is_dir($cacheDir)) {
- log_message('debug', "Cache directory '" . $cacheDir . "' does not exist. Therefore no static map images to remove...");
+ log_message('info', "Cache directory '" . $cacheDir . "' does not exist. Therefore no static map images to remove...");
return true;
}
@@ -660,7 +660,7 @@ class Staticmap_model extends CI_Model {
foreach ($linked_logbooks as $logbook_id) {
$slug = $this->stationsetup_model->get_slug($logbook_id);
if ($slug == false) {
- log_message('debug', "No slug found for logbook ID " . $logbook_id . ". Continue...");
+ log_message('info', "No slug found for logbook ID " . $logbook_id . ". Continue...");
continue;
}
diff --git a/application/models/User_model.php b/application/models/User_model.php
index fcd20a176..b2207c5d2 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -154,6 +154,29 @@ class User_Model extends CI_Model {
}
}
+ // FUNCTION: array search_users($query)
+ // Search for users by parts of their callsign
+ function search_users($query, $clubstations = false) {
+ if (strlen($query) < 2) {
+ return false;
+ }
+ $this->db->select('user_id, user_callsign, user_firstname, user_lastname');
+ if (!$clubstations) {
+ $this->db->where('clubstation', 0);
+ }
+
+ $this->db->group_start();
+ $this->db->like('user_callsign', $query);
+ $this->db->or_like('user_firstname', $query);
+ $this->db->or_like('user_lastname', $query);
+ $this->db->group_end();
+
+ $this->db->limit(100);
+
+ $r = $this->db->get($this->config->item('auth_table'));
+ return $r;
+ }
+
// FUNCTION: bool add($username, $password, $email, $type)
// Add a user
function add($username, $password, $email, $type, $firstname, $lastname, $callsign, $locator, $timezone,
@@ -164,7 +187,7 @@ class User_Model extends CI_Model {
$user_language, $user_hamsat_key, $user_hamsat_workable_only, $user_iota_to_qso_tab, $user_sota_to_qso_tab,
$user_wwff_to_qso_tab, $user_pota_to_qso_tab, $user_sig_to_qso_tab, $user_dok_to_qso_tab,
$user_lotw_name, $user_lotw_password, $user_eqsl_name, $user_eqsl_password, $user_clublog_name, $user_clublog_password,
- $user_winkey) {
+ $user_winkey, $clubstation = 0) {
// Check that the user isn't already used
if(!$this->exists($username)) {
$data = array(
@@ -172,10 +195,10 @@ class User_Model extends CI_Model {
'user_password' => $this->_hash($password),
'user_email' => xss_clean($email),
'user_type' => xss_clean($type),
- 'user_firstname' => xss_clean($firstname),
- 'user_lastname' => xss_clean($lastname),
- 'user_callsign' => xss_clean($callsign),
- 'user_locator' => xss_clean($locator),
+ 'user_firstname' => xss_clean($firstname) ?? '',
+ 'user_lastname' => xss_clean($lastname) ?? '',
+ 'user_callsign' => strtoupper(xss_clean($callsign)),
+ 'user_locator' => strtoupper(xss_clean($locator)),
'user_timezone' => xss_clean($timezone),
'user_measurement_base' => xss_clean($measurement),
'user_date_format' => xss_clean($user_date_format),
@@ -206,7 +229,8 @@ class User_Model extends CI_Model {
'user_eqsl_password' => xss_clean($user_eqsl_password),
'user_clublog_name' => xss_clean($user_clublog_name),
'user_clublog_password' => xss_clean($user_clublog_password),
- 'winkey' => xss_clean($user_winkey)
+ 'winkey' => xss_clean($user_winkey),
+ 'clubstation' => $clubstation,
);
// Check the password is valid
@@ -254,8 +278,8 @@ class User_Model extends CI_Model {
$data = array(
'user_name' => xss_clean($fields['user_name']),
'user_email' => xss_clean($fields['user_email']),
- 'user_callsign' => xss_clean($fields['user_callsign']),
- 'user_locator' => xss_clean($fields['user_locator']),
+ 'user_callsign' => strtoupper(xss_clean($fields['user_callsign'])),
+ 'user_locator' => strtoupper(xss_clean($fields['user_locator'])),
'user_firstname' => xss_clean($fields['user_firstname']),
'user_lastname' => xss_clean($fields['user_lastname']),
'user_timezone' => xss_clean($fields['user_timezone']),
@@ -388,7 +412,8 @@ class User_Model extends CI_Model {
}
// Delete QSOs from $this->config->item('table_name')
$this->db->query("DELETE FROM bandxuser WHERE userid = ?",$user_id);
- $this->db->query("DELETE FROM api WHERE user_id = ?",$user_id);
+ $this->db->query("DELETE FROM api WHERE user_id = ? OR created_by = ?", [$user_id, $user_id]);
+ $this->db->query("DELETE FROM club_permissions WHERE user_id = ? OR club_id = ?", [$user_id, $user_id]);
$this->db->query("DELETE FROM cat WHERE user_id = ?",$user_id);
$this->db->query("DELETE FROM lotw_certs WHERE user_id = ?",$user_id);
$this->db->query("DELETE FROM notes WHERE user_id = ?",$user_id);
@@ -397,7 +422,7 @@ class User_Model extends CI_Model {
$this->db->query("DELETE FROM queries WHERE userid = ?",$user_id);
$this->db->query("DELETE FROM station_profile WHERE user_id = ?",$user_id);
$this->db->query("DELETE FROM station_logbooks WHERE user_id = ?",$user_id);
- $this->db->query("delete from user_options where user_id=?",$user_id);
+ $this->db->query("DELETE FROM user_options WHERE user_id=?",$user_id);
$this->db->query("DELETE FROM ".$this->config->item('auth_table')." WHERE user_id = ?",$user_id);
return 1;
} else {
@@ -428,7 +453,7 @@ class User_Model extends CI_Model {
// FUNCTION: void update_session()
// Updates a user's login session after they've logged in
// TODO: This should return bool TRUE/FALSE or 0/1
- function update_session($id, $u = null, $impersonate = false) {
+ function update_session($id, $u = null, $impersonate = false, $custom_data = null) {
if ($u == null) {
$u = $this->get_by_id($id);
@@ -475,8 +500,14 @@ class User_Model extends CI_Model {
'isWinkeyEnabled' => $u->row()->winkey,
'hasQrzKey' => $this->hasQrzKey($u->row()->user_id),
'impersonate' => $this->session->userdata('impersonate') ?? false,
+ 'clubstation' => $u->row()->clubstation,
+ 'source_uid' => $this->session->userdata('source_uid') ?? ''
);
+ if ($this->config->item('special_callsign')) {
+ $userdata['available_clubstations'] = $this->get_clubstations($u->row()->user_id) ?? 'none';
+ }
+
foreach (array_keys($this->frequency->defaultFrequencies) as $band) {
$qrg_unit = $this->session->userdata("qrgunit_$band") ?? ($this->user_options_model->get_options('frequency', array('option_name' => 'unit', 'option_key' => $band), $u->row()->user_id)->row()->option_value ?? '');
if ($qrg_unit !== '') {
@@ -486,8 +517,25 @@ class User_Model extends CI_Model {
}
}
+ // Restore custom data in impersonation mode
+ foreach ($this->session->userdata() as $key => $value) {
+ if (substr($key, 0, 3) == 'cd_') {
+ $userdata[$key] = $value;
+ }
+ }
+
+ // Overrides
if ($impersonate) {
$userdata['impersonate'] = true;
+ $userdata['available_clubstations'] = $this->get_clubstations($u->row()->user_id);
+ }
+ if ($userdata['clubstation'] == 1) {
+ $userdata['available_clubstations'] = 'none';
+ }
+ if (isset($custom_data)) {
+ foreach ($custom_data as $key => $value) {
+ $userdata['cd_' . $key] = $value;
+ }
}
$this->session->set_userdata($userdata);
@@ -502,6 +550,7 @@ class User_Model extends CI_Model {
{
$user_id = $this->session->userdata('user_id');
$user_type = $this->session->userdata('user_type');
+ $src_user_type = $this->session->userdata('cd_src_user_type');
$user_hash = $this->session->userdata('user_hash');
$impersonate = $this->session->userdata('impersonate');
@@ -515,7 +564,7 @@ class User_Model extends CI_Model {
return 0;
}
} else { // handle the maintenance mode and kick out user on page reload if not an admin
- if($user_type == '99' || $impersonate === true) {
+ if($user_type == '99' || $src_user_type === '99') {
if($this->_auth($user_id."-".$user_type, $user_hash)) {
// Freshen the session
$this->update_session($user_id, $u);
@@ -538,8 +587,14 @@ class User_Model extends CI_Model {
// Authenticate a user against the users table
function authenticate($username, $password) {
$u = $this->get($username);
- if($u->num_rows() != 0)
- {
+ if($u->num_rows() != 0) {
+ // direct login to clubstations are not allowed
+ if ($u->row()->clubstation == 1) {
+ $uid = $u->row()->user_id;
+ log_message('debug', "User ID: [$uid] Login rejected because of a external clubstation login attempt.");
+ return 2;
+ }
+
if($this->_auth($password, $u->row()->user_password)) {
if (ENVIRONMENT != "maintenance") {
return 1;
@@ -582,7 +637,7 @@ class User_Model extends CI_Model {
$this->set_last_seen($u->row()->user_id);
}
- return 1;
+ return 1;
} else {
return 0;
}
@@ -590,22 +645,43 @@ class User_Model extends CI_Model {
// FUNCTION: object users()
// Returns a list of users with additional counts
- function users() {
- $this->db->select('(SELECT COUNT(*) FROM station_profile WHERE user_id = users.user_id) as stationcount');
- $this->db->select('(SELECT COUNT(*) FROM station_logbooks WHERE user_id = users.user_id) as logbookcount');
- $this->db->select('(SELECT COUNT(*) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id from station_profile WHERE user_id = users.user_id)) as qsocount');
- $this->db->select('
- (SELECT COUNT(*) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id FROM station_profile WHERE user_id = users.user_id)) as qsocount,
- (SELECT MAX(COL_TIME_ON) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id FROM station_profile WHERE user_id = users.user_id)) as lastqso
- ');
- $this->db->select('users.*');
- $this->db->from('users');
-
- $result = $this->db->get();
-
+ function users($club = '') {
+ $sql=" SELECT COUNT(distinct sp.station_id) AS stationcount, count(distinct sl.logbook_id) AS logbookcount, count(distinct log.col_primary_key) AS qsocount,
+ MAX(COL_TIME_ON) AS lastqso,
+ u.*
+ FROM users u
+ LEFT OUTER JOIN station_profile sp ON (sp.user_id = u.user_id)
+ LEFT OUTER JOIN station_logbooks sl ON (sl.user_id = u.user_id)
+ LEFT OUTER JOIN ". $this->config->item('table_name') ." log on (log.station_id=sp.station_id)";
+ if ($this->config->item('special_callsign')) {
+ if ($club == 'is_club') {
+ $sql.=' WHERE clubstation=1';
+ } else {
+ $sql.=' WHERE clubstation!=1';
+ }
+ }
+ $sql.=" GROUP BY u.user_id";
+ $result = $this->db->query($sql);
+ if ($this->config->item('special_callsign')) {
+ if ($club == 'is_club') {
+ foreach ($result->result() as &$row) {
+ $row->lastoperator=$this->get_last_op($row->user_id,$row->lastqso);
+ }
+ } else {
+ foreach ($result->result() as &$row) {
+ $row->lastoperator='';
+ }
+ }
+ }
return $result;
}
+ function get_last_op($userid,$lastqso) {
+ $sql="SELECT log.COL_OPERATOR FROM ". $this->config->item('table_name') ." log INNER JOIN station_profile sp ON (log.station_id=sp.station_id) where sp.user_id=? AND col_time_on=? ORDER BY col_time_on DESC LIMIT 1";
+ $resu=$this->db->query($sql,array($userid,$lastqso));
+ return $resu->result()[0]->COL_OPERATOR ?? '';
+ }
+
// FUNCTION: array timezones()
// Returns a list of timezones
function timezones() {
@@ -741,6 +817,38 @@ class User_Model extends CI_Model {
}
}
+ function get_clubstations($user_id) {
+ $this->load->model('club_model');
+ $clubstations = $this->club_model->get_clubstations($user_id);
+
+ return $clubstations;
+ }
+
+ function convert($user_id, $clubstation) {
+ $clubstation_value = ($clubstation == true) ? 1 : 0;
+
+ $sql = "UPDATE users SET clubstation = ? WHERE user_id = ?;";
+
+ $this->db->trans_start();
+
+ if (!$this->db->query($sql, [$clubstation_value, $user_id])) {
+ $this->db->trans_rollback();
+ return false;
+ }
+
+ if ($clubstation) {
+ $delete_sql = "DELETE FROM club_permissions WHERE club_id = ?;";
+ if (!$this->db->query($delete_sql, [$user_id])) {
+ $this->db->trans_rollback();
+ return false;
+ }
+ }
+
+ $this->db->trans_complete();
+
+ return $this->db->trans_status();
+ }
+
}
?>
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index cbb3864c8..750509b4c 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -66,6 +66,22 @@
} ?>>station_callsign; ?> (station_profile_name; ?>)
+ config->item('special_callsign') && $club_operators != false) {
+ $show_operator_question = false; ?>
+
+
+
+ user_callsign == $this->session->userdata('cd_src_call')) {
+ echo ' selected="selected"';
+ } ?>>
+ user_callsign; ?>
+
+
+
+
diff --git a/application/views/api/help.php b/application/views/api/help.php
deleted file mode 100644
index f303562c2..000000000
--- a/application/views/api/help.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-session->flashdata('notice')) { ?>
-
- session->flashdata('notice'); ?>
-
-
-
-
-
-
-
-
-
-
-
" onClick='copyApiUrl()'>
-
-
- num_rows() > 0) { ?>
-
-
-
-
-
-
-
- result() as $row) { ?>
-
- key; ?> " onclick='copyApiKey("key; ?>")'> description; ?>
- last_used; ?>
-
- rights == "rw") {
- echo "" . __("Read & Write") . " ";
- } elseif($row->rights == "r") {
- echo "" . __("Read-Only") . " ";
- } else {
- echo "" . __("Unknown") . " ";
- }
-
- ?>
-
-
- status); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/views/api/index.php b/application/views/api/index.php
new file mode 100644
index 000000000..c29a6e2c1
--- /dev/null
+++ b/application/views/api/index.php
@@ -0,0 +1,97 @@
+
+
+ load->view('layout/messages'); ?>
+
+
+
+
+
+
+
+
" onClick='copyApiUrl()'>
+
+
+
+
+
+ num_rows() > 0) { ?>
+
+
+
+
+
+
+
+ result() as $row) { ?>
+
+ user_callsign !== $this->session->userdata('cd_src_call')) {
+ $api_key = substr($row->key, 0, 2) . str_repeat('*', strlen($row->key) - 6) . substr($row->key, -4);
+ $masked = true;
+ } else {
+ $api_key = $row->key;
+ $masked = false;
+ } ?>
+
+ " onclick='copyApiKey("")'>
+
+
+ description; ?>
+ last_used; ?>
+
+ user_callsign; ?>
+
+
+ rights == "rw") {
+ echo "" . __("Read & Write") . " ";
+ } elseif ($row->rights == "r") {
+ echo "" . __("Read-Only") . " ";
+ } else {
+ echo "" . __("Unknown") . " ";
+ } ?>
+
+ status); ?>
+
+ ').'"');
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/club/clubswitch_modal.php b/application/views/club/clubswitch_modal.php
new file mode 100644
index 000000000..6b1dacd75
--- /dev/null
+++ b/application/views/club/clubswitch_modal.php
@@ -0,0 +1,20 @@
+
\ No newline at end of file
diff --git a/application/views/club/permissions.php b/application/views/club/permissions.php
new file mode 100644
index 000000000..c20123e77
--- /dev/null
+++ b/application/views/club/permissions.php
@@ -0,0 +1,342 @@
+
+
+
user_callsign); ?>
+
+
+ load->view('layout/messages'); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ user_firstname; ?>
+ user_lastname; ?>
+ user_callsign; ?>
+ user_name; ?>
+ user_email . '">' . $member->user_email . ''; ?>
+
+ p_level == 3) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index df791b7c3..71a65e5ac 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -142,7 +142,7 @@ function getDistance($distance) {
- optionslib->get_option('dashboard_banner') != "false") { ?>
+ optionslib->get_option('dashboard_banner') != "false" && $this->session->userdata('clubstation') == 0) { ?>
= 1) { ?>
session->userdata('user_id') != null) {
-config->item('special_callsign') == true && $this->uri->segment(1) == "dashboard") { ?>
+config->item('special_callsign') && $this->uri->segment(1) == "dashboard" && $this->session->userdata('clubstation') == 1) { ?>
+
-
-
-
+
-
+
+
+ session->userdata('clubstation') == '1' && $this->session->userdata('impersonate') == '1') { ?>
+
@@ -117,10 +120,12 @@
+
+
@@ -369,15 +374,23 @@
-
+ session->userdata('clubstation') == 1) {
+ echo '' . str_replace("0","Ø", strtoupper($this->session->userdata('user_callsign'))) . ' '
+ . ' '
+ . sprintf(_pgettext("Operator: Callsign", "Op: %s"), str_replace("0","Ø", strtoupper($this->session->userdata('operator_callsign'))))
+ . ' ';
+ } else {
+ echo '
-
+
+
+
+
+ session->userdata('impersonate') == 1) { ?>
+
+ session->userdata('cd_src_call') ?? ''); ?>" onclick="stopImpersonate_modal()">
+
+
+
+ if (($quickswitch_enabled ?? '') == 'true') { ?>
-
+
+
+
- session->flashdata('notice')) { ?>
-
-
- session->flashdata('notice'); ?>
-
-
-
-
-
-
+ load->view('layout/messages'); ?>