mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Merge pull request #2885 from HB9HIL/club_direct
implement config option to directly log into a club
This commit is contained in:
@@ -688,7 +688,7 @@ class User_Model extends CI_Model {
|
||||
$u = $this->get($username);
|
||||
if($u->num_rows() != 0) {
|
||||
// direct login to clubstations are not allowed
|
||||
if ($u->row()->clubstation == 1) {
|
||||
if ($u->row()->clubstation == 1 && !($this->config->item('club_direct') ?? false)) {
|
||||
$uid = $u->row()->user_id;
|
||||
log_message('debug', "User ID: [$uid] Login rejected because of a external clubstation login attempt.");
|
||||
return 2;
|
||||
|
||||
@@ -4,12 +4,6 @@ $(document).ready(function () {
|
||||
saveOperator();
|
||||
}
|
||||
});
|
||||
|
||||
setTimeout(function () {
|
||||
if (localStorage.getItem('operator_callsign')) {
|
||||
$('#operator_callsign').val(localStorage.getItem('operator_callsign'));
|
||||
}
|
||||
}, 200);
|
||||
});
|
||||
|
||||
function displayOperatorDialog() {
|
||||
@@ -56,6 +50,4 @@ function saveOperator() {
|
||||
} else {
|
||||
operatorInput.addClass("is-invalid");
|
||||
}
|
||||
|
||||
localStorage.setItem('operator_callsign', operatorCallsign);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user