Error pages for HTTP status code 403 and 404 moved to another location (preparations for the next commits in which the system directory will be moved to a non-public directory).

6 files changed, 18 insertions, 9 deletions

diff --git a/.ht-nginx b/.ht-nginx
index 9d3053f..010f488 100644
--- a/.ht-nginx
+++ b/.ht-nginx
@@ -12,8 +12,8 @@
 #===============================================================================
 # Error documents
 #===============================================================================
-error_page 403 /system/403.php;
-error_page 404 /system/404.php;
+error_page 403 /403.php;
+error_page 404 /404.php;
 
 #===============================================================================
 # Forbidden directories
diff --git a/.htaccess b/.htaccess
index 2a87ccc..950f985 100644
--- a/.htaccess
+++ b/.htaccess
@@ -17,8 +17,8 @@ RewriteEngine On
 #===============================================================================
 # ErrorDocument handler
 #===============================================================================
-ErrorDocument 403 /system/403.php
-ErrorDocument 404 /system/404.php
+ErrorDocument 403 /403.php
+ErrorDocument 404 /404.php
 
 #===============================================================================
 # Forbidden directories
diff --git a/system/403.php b/403.php
index 04f1568..7b6a168 100644
--- a/system/403.php
+++ b/403.php
@@ -3,10 +3,15 @@
 # INCLUDE: Main configuration
 #===============================================================================
 if(!defined('ROOT')) {
-	require_once '../core/application.php';
+	require_once 'core/application.php';
 }
 
 #===============================================================================
+# Send HTTP status code
+#===============================================================================
+http_response_code(403);
+
+#===============================================================================
 # TRY: Template\Exception
 #===============================================================================
 try {
diff --git a/system/404.php b/404.php
index 53ec9bd..be2ca1b 100644
--- a/system/404.php
+++ b/404.php
@@ -3,10 +3,15 @@
 # INCLUDE: Main configuration
 #===============================================================================
 if(!defined('ROOT')) {
-	require_once '../core/application.php';
+	require_once 'core/application.php';
 }
 
 #===============================================================================
+# Send HTTP status code
+#===============================================================================
+http_response_code(404);
+
+#===============================================================================
 # TRY: Template\Exception
 #===============================================================================
 try {
diff --git a/core/namespace/Application.php b/core/namespace/Application.php
index a43871e..329d56d 100644
--- a/core/namespace/Application.php
+++ b/core/namespace/Application.php
@@ -141,7 +141,7 @@ class Application {
 	#===============================================================================
 	public static function exit($code = 500) {
 		http_response_code($code);
-		$code === 404 AND require_once(ROOT."system/404.php");
+		$code === 404 AND require_once ROOT.'404.php';
 		exit();
 	}
 }
diff --git a/core/namespace/Router.php b/core/namespace/Router.php
index ad46033..f0e7e2a 100644
--- a/core/namespace/Router.php
+++ b/core/namespace/Router.php
@@ -57,8 +57,7 @@ class Router {
 		}
 
 		if($route_found === FALSE) {
-			http_response_code(404);
-			require_once 'system/404.php';
+			require_once ROOT.'404.php';
 		}
 	}
 }