diff --git a/CSY2028/EntryPoint.php b/CSY2028/EntryPoint.php index 1a7a754..36a062a 100644 --- a/CSY2028/EntryPoint.php +++ b/CSY2028/EntryPoint.php @@ -36,7 +36,6 @@ class EntryPoint { if ($_SERVER['REQUEST_METHOD'] == 'POST') { $functionName = $functionName . 'Submit'; } - $this->routes->checkLogin($route); $page = $this->routes->getController($controllerName, $functionName); if ($page == null) { $page = $this->routes->notFound(); diff --git a/jobs/Routes.php b/jobs/Routes.php index 96cd85a..6ed507d 100644 --- a/jobs/Routes.php +++ b/jobs/Routes.php @@ -14,6 +14,8 @@ class Routes implements \CSY2028\Routes { $controllers['portal'] = new \jobs\controllers\Portal($catsTable, $jobsTable, $appsTable); $controllers['user'] = new \jobs\controllers\User($usersTable, $catsTable); + $this->checkLogin($controllerName); + if (array_key_exists($controllerName, $controllers)) { if (\method_exists($controllers[$controllerName], $functionName)) { return $controllers[$controllerName]; @@ -32,11 +34,11 @@ class Routes implements \CSY2028\Routes { return 'jobs/home'; } - public function checkLogin($route) { + public function checkLogin($name) { $loginRoutes = []; //TODO: Add login routes - //$loginRoutes['user'] = true; - $requiresLogin = $loginRoutes[$route] ?? false; + $loginRoutes['portal'] = true; + $requiresLogin = $loginRoutes[$name] ?? false; if ($requiresLogin && !isset($_SESSION['loggedin'])) { header('location: /user/login');