From 0fad5765507d167a3ee9df8cbdb7cbba76091138 Mon Sep 17 00:00:00 2001 From: objecttothis Date: Mon, 30 Jan 2023 13:15:43 +0400 Subject: [PATCH] Correct redirect() calls to CI4 format --- app/Controllers/Login.php | 13 +++++++------ app/Controllers/Secure_Controller.php | 2 +- app/Models/Employee.php | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php index 52970ef8b..57ccd003c 100644 --- a/app/Controllers/Login.php +++ b/app/Controllers/Login.php @@ -26,19 +26,20 @@ class Login extends BaseController 'latest_version' => $migration->is_latest(), 'application_version' => $migration->get_current_version() ]; -//TODO: Validation isn't working. #3595 -// if(strtolower($this->request->getMethod()) != 'post') -// { - echo view('login', $data); -// } + if($this->request->getMethod() != 'post') + { + echo view('login', $data); + } + +//TODO: Validation isn't working. #3595 // if(!$this->validate(['username' => 'required|login_check'])) // { // echo view('login', ['validation' => $this->validator->getErrors()]); // } } - return redirect('home'); +// return redirect()->to('home'); } /* public function login_check(string $username): bool diff --git a/app/Controllers/Secure_Controller.php b/app/Controllers/Secure_Controller.php index 42db9688c..0202439fb 100644 --- a/app/Controllers/Secure_Controller.php +++ b/app/Controllers/Secure_Controller.php @@ -26,7 +26,7 @@ class Secure_Controller extends BaseController if(!$this->employee->is_logged_in()) { - redirect('login'); + redirect()->to('login'); } $logged_in_employee_info = $this->employee->get_logged_in_employee_info(); diff --git a/app/Models/Employee.php b/app/Models/Employee.php index 7c14798f6..062f2a4a5 100644 --- a/app/Models/Employee.php +++ b/app/Models/Employee.php @@ -400,7 +400,7 @@ class Employee extends Person { $this->session->destroy(); - redirect('login'); + redirect()->to('login'); } /**