Merge pull request #8 from eneioarzew/v0.2.1

V0.2.1
astralicht · May 9, 2021 · 04cdb16 · 04cdb16
2 parents b394b14 + a0e2695
commit 04cdb16
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 
 # Egg Framework
-*A lightweight PHP framework for quick project creation by Julac Ontina.*
+*A lightweight PHP framework for quick project creation.*
 
 # Installation
 **Install using Composer**

diff --git a/chalaza b/chalaza
@@ -63,6 +63,7 @@ class $controllerClassName"."Controller {
 		fclose($view);
 
 		$file = fopen("routes.php", "a");
+		fwrite($file, "\n".'$ROUTE["'.$viewFolderName.'"] = "'.$viewFolderName.'/index";');
 		fwrite($file, "\n".'$ROUTE["'.$viewFolderName.'/index"] = "'.$viewFolderName.'/index";');
 		fclose($file);
 
@@ -293,6 +294,6 @@ if(isset($argv[1])) {
 	}
 }
 else{
-	echo "\n\033[33m Chalaza \033[0m v1.0";
-	echo "\nby Julac Ontina\n\n";
+	echo "\n\033[33m Chalaza";
+	echo "\n\033[0m by EneioArzew\n\n";
 }
diff --git a/index.php b/index.php
@@ -6,69 +6,69 @@
 include_once 'config.php';
 include_once 'routes.php';
 
+function showErrorPage()
+{
+	$instance = new Error404Controller();
+	include_once $instance->index();
+}
+
 $original_URI = $_SERVER['REQUEST_URI'];
 $exploded_URI = explode("/", $original_URI);
 $json_string = file_get_contents("php://input");
-$URI_offset = 2;
-
-if ($ENVIRONMENT === "LOCAL") {
-	foreach (range(0, $URI_offset - 1) as $i) {
-		array_shift($exploded_URI);
-	}
+$URI_offset = ['LOCAL' => 2, 'PRODUCTION' => 1];
+$offset = $URI_offset[$ENVIRONMENT];
 
-	$final_URI = implode("/", $exploded_URI);
-	$URI_length = 0;
+foreach (range(0, $offset - 1) as $i) {
+	array_shift($exploded_URI);
+}
 
-	if (implode("", $exploded_URI) !== "") {
-		$URI_length = count($exploded_URI);
-	}
+$final_URI = implode("/", $exploded_URI);
+$URI_length = 0;
 
-	if ($URI_length === 0) {
-		$route = $ROUTE['/'];
-		$route = explode('/', $route);
-		$controller = $route[0];
-		$function = $route[1];
+if (implode("", $exploded_URI) !== "") {
+	$URI_length = count($exploded_URI);
+}
 
-		header("Location: $controller/$function");
-	} else {
-		$controller = $exploded_URI[0];
-		$function = $exploded_URI[1];
+if ($URI_length === 0) {
+	$route = $ROUTE['/'];
+	$route = explode('/', $route);
+	$controller = $route[0];
+	$function = $route[1];
+
+	header("Location: $controller/$function");
+} else {
+	$obj = json_decode($json_string, true);
+	$URI_route = $ROUTE[$final_URI];
+	if (isset($URI_route)) {
+		$URI_route = explode('/', $URI_route);
+		$controller = $URI_route[0];
+		$function = $URI_route[1];
 		$data = $exploded_URI[2];
 
+		if (!$exploded_URI[1]) {
+			header("Location: $controller/$function");
+		}
+
 		$controller[0] = strtoupper($controller[0]);
 		$controller .= "Controller";
-
 		$instance = new $controller();
 
-		$obj = json_decode($json_string, true);
-
-		if (isset($ROUTE[$final_URI])) {
-			if ($obj) {
-				$response = $instance->$function($obj);
+		if ($obj) {
+			$response = $instance->$function($obj);
+			if ($response !== null) {
 				echo json_encode($response);
-			} else {
-				$response = $instance->$function($data);
+			} else if ($response === null) {
+				echo json_encode(["body" => null]);
+			}
+		} else {
+			$response = $instance->$function($data);
+			if ($response !== null) {
+				include_once $response;
+			} else if ($response === null) {
+				showErrorPage();
 			}
 		}
-
-		if ($response !== null) {
-			include_once $response;
-		}
-	}
-} else if ($ENVIRONMENT === "PRODUCTION") {
-	$URI_offset = 1;
-
-	foreach (range(0, $URI_offset - 1) as $i) {
-		array_shift($exploded_URI);
+	} else {
+		showErrorPage();
 	}
-
-	$final_URI = implode("/", $exploded_URI);
-	$URI_length = 0;
-}
-
-function showErrorPage()
-{
-	$instance = new Error404Controller();
-	include_once $instance->index();
-	die;
 }