adjusted requiredLogin functionality
This commit is contained in:
parent
ef25225091
commit
9537aa5ad5
|
|
@ -36,7 +36,6 @@ class EntryPoint {
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||||
$functionName = $functionName . 'Submit';
|
$functionName = $functionName . 'Submit';
|
||||||
}
|
}
|
||||||
$this->routes->checkLogin($route);
|
|
||||||
$page = $this->routes->getController($controllerName, $functionName);
|
$page = $this->routes->getController($controllerName, $functionName);
|
||||||
if ($page == null) {
|
if ($page == null) {
|
||||||
$page = $this->routes->notFound();
|
$page = $this->routes->notFound();
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ class Routes implements \CSY2028\Routes {
|
||||||
$controllers['portal'] = new \jobs\controllers\Portal($catsTable, $jobsTable, $appsTable);
|
$controllers['portal'] = new \jobs\controllers\Portal($catsTable, $jobsTable, $appsTable);
|
||||||
$controllers['user'] = new \jobs\controllers\User($usersTable, $catsTable);
|
$controllers['user'] = new \jobs\controllers\User($usersTable, $catsTable);
|
||||||
|
|
||||||
|
$this->checkLogin($controllerName);
|
||||||
|
|
||||||
if (array_key_exists($controllerName, $controllers)) {
|
if (array_key_exists($controllerName, $controllers)) {
|
||||||
if (\method_exists($controllers[$controllerName], $functionName)) {
|
if (\method_exists($controllers[$controllerName], $functionName)) {
|
||||||
return $controllers[$controllerName];
|
return $controllers[$controllerName];
|
||||||
|
|
@ -32,11 +34,11 @@ class Routes implements \CSY2028\Routes {
|
||||||
return 'jobs/home';
|
return 'jobs/home';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function checkLogin($route) {
|
public function checkLogin($name) {
|
||||||
$loginRoutes = [];
|
$loginRoutes = [];
|
||||||
//TODO: Add login routes
|
//TODO: Add login routes
|
||||||
//$loginRoutes['user'] = true;
|
$loginRoutes['portal'] = true;
|
||||||
$requiresLogin = $loginRoutes[$route] ?? false;
|
$requiresLogin = $loginRoutes[$name] ?? false;
|
||||||
|
|
||||||
if ($requiresLogin && !isset($_SESSION['loggedin'])) {
|
if ($requiresLogin && !isset($_SESSION['loggedin'])) {
|
||||||
header('location: /user/login');
|
header('location: /user/login');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue