From a01ba07434bcf742fc54f7a79232c34783e9edac Mon Sep 17 00:00:00 2001
From: Iqbal <iqbalkhowarizmi@ymail.com>
Date: Sat, 7 Oct 2017 12:32:57 +0700
Subject: [PATCH] Fixed routing problems.
---
src/app.php | 13 ++++++++++++-
src/route.php | 5 ++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/app.php b/src/app.php
index 86dad5f..8cf86b8 100644
--- a/src/app.php
+++ b/src/app.php
@@ -18,7 +18,6 @@ class DagoJek {
$instance = new DagoJek();
}
- include_once 'model/User.php';
$instance->includeAllController();
return $instance;
@@ -54,6 +53,7 @@ class DagoJek {
public function Start() {
$base_url = $this->getCurrentUri();
+ $base_url = $this->trimIndexDotPHP($base_url);
if (array_key_exists ($base_url, $this->routingTable)) {
$this->routingTable[$base_url]();
} else {
@@ -61,5 +61,16 @@ class DagoJek {
die ("404 Page not Found");
}
}
+
+ private function trimIndexDotPHP($string) {
+ $unnecessaryChars = "/index.php";
+
+ if (strpos($string, $unnecessaryChars) === 0) {
+ $result = substr($string, strlen($unnecessaryChars));
+ return $result;
+ } else {
+ return $string;
+ }
+ }
}
diff --git a/src/route.php b/src/route.php
index 07fb832..3c7f12a 100644
--- a/src/route.php
+++ b/src/route.php
@@ -6,7 +6,10 @@ $AppInstance = Dagojek::Instance();
$AppInstance->addRoute("/", 'MainController::LoginHandler');
$AppInstance->addRoute("/login", 'MainController::LoginHandler');
-$AppInstance->addRoute("/register", 'MainController::DefaultHandler');
+
+$AppInstance->addRoute("/register", 'RegisterController::RegisterHandler');
+$AppInstance->addRoute("/register/validate/username",'RegisterController::UsernameValidationHandler');
+$AppInstance->addRoute("/register/validate/email",'RegisterController::EmailValidationHandler');
$AppInstance->addRoute("/main/profil", 'ProfilController::ProfilHandler');
$AppInstance->addRoute("/main/profil/edit", 'ProfilController::EditHandler');
--
GitLab