diff --git a/app/Config/Session.php b/app/Config/Session.php index e19e415ff..c3e116c18 100644 --- a/app/Config/Session.php +++ b/app/Config/Session.php @@ -89,7 +89,7 @@ class Session extends BaseConfig * when auto-regenerating the session ID. When set to FALSE, the data * will be later deleted by the garbage collector. */ - public bool $regenerateDestroy = false; + public bool $regenerateDestroy = true; /** * -------------------------------------------------------------------------- diff --git a/app/Models/Appconfig.php b/app/Models/Appconfig.php index 2b388cc64..32733a767 100644 --- a/app/Models/Appconfig.php +++ b/app/Models/Appconfig.php @@ -32,7 +32,7 @@ class Appconfig extends Model public function get_value(string $key, string $default = ''): string { $builder = $this->db->table('app_config'); - $query = $builder->getWhere(['key' => $key], 1, 1); + $query = $builder->getWhere(['key' => $key], 1); if($query->getNumRows() == 1) //TODO: === { diff --git a/app/Models/Employee.php b/app/Models/Employee.php index 621fa3661..247fc9381 100644 --- a/app/Models/Employee.php +++ b/app/Models/Employee.php @@ -3,6 +3,7 @@ namespace App\Models; use CodeIgniter\Database\ResultInterface; +use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\Session\Session; /** @@ -394,11 +395,11 @@ class Employee extends Person /** * Logs out a user by destroying all session data and redirect to log in */ - public function logout(): void + public function logout(): RedirectResponse { - $this->session->destroy(); + session()->destroy(); - redirect()->to('login'); + return redirect()->to('login'); } /**