diff --git a/application/config/config.sample.php b/application/config/config.sample.php index 0a168739..fd619c4b 100644 --- a/application/config/config.sample.php +++ b/application/config/config.sample.php @@ -74,12 +74,9 @@ $config['hamqth_password'] = ""; $config['use_auth'] = true; $config['auth_table'] = "users"; -$config['auth_mode'] = "0"; +$config['auth_mode'] = "3"; -$config['auth_level'][0] = "Anonymous"; -$config['auth_level'][1] = "Viewer"; -$config['auth_level'][2] = "Editor"; -$config['auth_level'][3] = "API User"; +$config['auth_level'][3] = "Operator"; $config['auth_level'][99] = "Administrator"; /* diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 072abac3..cb051dc9 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -17,15 +17,13 @@ class Logbook extends CI_Controller { function index() { - $this->load->model('user_model'); - if(!$this->user_model->authorize($this->config->item('auth_mode'))) { - if($this->user_model->validate_session()) { - $this->user_model->clear_session(); - show_error('Access denied
Click here to log in as another user', 403); - } else { - redirect('user/login'); - } - } + + // Check if users logged in + $this->load->model('user_model'); + if($this->user_model->validate_session() == 0) { + // user is not logged in + redirect('user/login'); + } $this->load->model('logbook_model'); diff --git a/install/config/config.php b/install/config/config.php index 934e0d63..9016abf6 100644 --- a/install/config/config.php +++ b/install/config/config.php @@ -74,12 +74,9 @@ $config['hamqth_password'] = ""; $config['use_auth'] = true; $config['auth_table'] = "users"; -$config['auth_mode'] = "0"; +$config['auth_mode'] = "3"; -$config['auth_level'][0] = "Anonymous"; -$config['auth_level'][1] = "Viewer"; -$config['auth_level'][2] = "Editor"; -$config['auth_level'][3] = "API User"; +$config['auth_level'][3] = "Operator"; $config['auth_level'][99] = "Administrator"; /*