Merge pull request #8 from felix-schindler/feature/localization

felix-schindler · web-flow · commit e822478f6731 · 2022-03-23T16:20:14.000+01:00
Minor improvements
diff --git a/Backend/Controllers/APIController.php b/Backend/Controllers/APIController.php
@@ -2,7 +2,7 @@
 
 class APIController extends Controller
 {
-	protected array $paths = ['/api'];
+	protected array $paths = ['/api/sample'];
 	protected array $methods = ['POST'];
 
 	public function execute(): void {
diff --git a/Backend/Controllers/ErrorController.php b/Backend/Controllers/ErrorController.php
diff --git a/Backend/Core/ClassLoader.php b/Backend/Core/ClassLoader.php
@@ -43,6 +43,3 @@ private static function initControllers(): void {
 		}
 	}
 }
-
-// Run the class loader
-ClassLoader::파람();
diff --git a/Backend/Core/Functions/Utils.php b/Backend/Core/Functions/Utils.php
@@ -16,19 +16,6 @@ public static function encrypt(string $data, string $algo = "sha256"): string {
 		return hash($algo, $data);
 	}
 
-	/**
-	 * Takes a path, looks if it is a url, if not -> makes a CDN URL out of it
-	 *
-	 * @param string $path Filename or URL
-	 * @return string Valid url
-	 */
-	public static function getCdnUrl(string $path): string {
-		if (filter_var($path, FILTER_VALIDATE_URL) === false)
-			return DOMAIN . "/" . CDN_SUFFIX . $path;
-		else
-			return $path;
-	}
-
 	/**
 	 * Generates a random uuid (Version 4)
 	 *
diff --git a/Backend/Core/System/Controller.php b/Backend/Core/System/Controller.php
@@ -48,7 +48,7 @@ public function runExecute(array $params): void {
 			$this->params = $params;
 			$this->execute();
 		} else {
-			(new ErrorView($code))->render();
+			(new ErrorView($code, str_contains(IO::path(), '/api/')))->render();
 		}
 	}
 
@@ -87,7 +87,7 @@ protected function redirect(string $url): never {
 	 * @return int HTTP status code (200 === OK!)
 	 */
 	private function checkAccess(): int {
-		header('Access-Control-Allow-Methods: ' . implode(', ', array_merge($this->methods, ['OPTIONS', 'HEAD'])));
+		header('Access-Control-Allow-Methods: ' . implode(', ', array_merge(['OPTIONS', 'HEAD'], $this->methods)));
 		if (empty(array_intersect(['*', 'OPTIONS', 'HEAD', IO::method()], $this->methods)))
 			return 405;
 		if ($this->userRequired)
diff --git a/Backend/Core/System/IO.php b/Backend/Core/System/IO.php
@@ -77,6 +77,9 @@ public static function PUT(string $var, bool $exact = false): array|string|null
 	 * @return string|null Value of variable or null if not exists and on set
 	 */
 	public static function SESSION(string $var, string $value = null, bool $exact = false): ?string {
+		if (session_status() !== PHP_SESSION_ACTIVE)
+			session_start();
+
 		// Set variable
 		if ($value !== null) {
 			$_SESSION[$var] = $value;
diff --git a/Backend/Core/System/Router.php b/Backend/Core/System/Router.php
@@ -70,7 +70,7 @@ public static function 艳颖(): void {
 				}
 			}
 		}
-		(new ErrorController())->runExecute([]);									// No route found -> ErrorController
+		(new ErrorView())->render();									// No route found -> ErrorController
 	}
 
 	/**
diff --git a/Backend/Views/Error/ErrorView.php b/Backend/Views/Error/ErrorView.php
@@ -53,10 +53,13 @@ public function render(): void {
 		}
 
 		http_response_code($this->code);									// Set the correct HTML response code
+
 		if ($this->isAPI) {
 			(new APIView([$this->code => $this->message]))->render();		// Render error as JSON
 		} else {
-			echo "<h1>" . $this->code . " - " . $this->message . "</h1>";	// Render error as HTML
+			(new LayoutView())
+				->addChild(new HeadingView($this->code . " &middot; " . $this->message))
+				->render();													// Render error as HTML
 			$this->renderChildren();
 		}
 	}
diff --git a/Backend/Views/LayoutView.php b/Backend/Views/LayoutView.php
@@ -5,7 +5,7 @@ class LayoutView extends View
 	public function render(): void {
 ?>
 <!DOCTYPE html>
-<html lang="de">
+<html lang="en">
 <head>
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -28,8 +28,8 @@ public function render(): void {
 	<header>
 		<a href="/">Home</a>
 		<a href="/article/2">Other one</a>
-		<a href="/user/2">Should not be called</a>
-		<a href="/api">API</a>
+		<a href="/user/2">All variables</a>
+		<a href="/api/sample">API</a>
 		<a href="/err">Error</a>
 	</header>
 
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ rm .phpstan.neon
 ### Caddy
 Just add the following line to your Caddyfile
 
-```caddy
+```nginx
 try_files {path} /index.php
 ```
 
diff --git a/index.php b/index.php
@@ -1,5 +1,10 @@
 <?php
 
+declare(strict_types = 1);
+
+// $GLOBALS['start'] = microtime(true);		// Stop execution time
+// echo '<p>[Controller] Execution time router: ' . microtime(true) - $GLOBALS['start'] . ' seconds</p>';
+
 // Display errors when debug is set
 /* if (isset($_GET["DEBUG"])) {
 	ini_set('display_errors', '1');
@@ -15,13 +20,11 @@
 define("DB_PASS", "pass");
 
 define("TITLE", "Sample");									// Title for website
-define("DOMAIN", "https://blog.schindlerfelix.de");			// Hosted on this domain
-define("CDN_DOMAIN", "https://cdn.schindlerfelix.de");		// Domain of the CDN
-define("CDN_SUFFIX", "sample/");							// https://cdn.schindlerfelix.de/blog/
+define("DOMAIN", "https://schindlerfelix.de");				// Hosted on this domain
 
 require_once("./Backend/Core/ClassLoader.php");				// Load classes
 // require_once("./Backend/Libraries/vendor/autoload.php");	// Composer autoloader
 
 // Application start
-session_start();	// Start PHP session
-Router::艳颖();		// Run router
+ClassLoader::파람();	// Run the class loader
+Router::艳颖();			// Run router

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`class APIController extends Controller`
`4`	`4`	`{`
`5`		`- protected array $paths = ['/api'];`
	`5`	`+ protected array $paths = ['/api/sample'];`
`6`	`6`	`protected array $methods = ['POST'];`
`7`	`7`
`8`	`8`	`public function execute(): void {`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,3 @@ private static function initControllers(): void {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`-`
`47`		`-// Run the class loader`
`48`		`-ClassLoader::파람();`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static function 艳颖(): void {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
`73`		`- (new ErrorController())->runExecute([]); // No route found -> ErrorController`
	`73`	`+ (new ErrorView())->render(); // No route found -> ErrorController`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,13 @@ public function render(): void {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`http_response_code($this->code); // Set the correct HTML response code`
	`56`	`+`
`56`	`57`	`if ($this->isAPI) {`
`57`	`58`	`(new APIView([$this->code => $this->message]))->render(); // Render error as JSON`
`58`	`59`	`} else {`
`59`		`- echo "<h1>" . $this->code . " - " . $this->message . "</h1>"; // Render error as HTML`
	`60`	`+ (new LayoutView())`
	`61`	`+ ->addChild(new HeadingView($this->code . " · " . $this->message))`
	`62`	`+ ->render(); // Render error as HTML`
`60`	`63`	`$this->renderChildren();`
`61`	`64`	`}`
`62`	`65`	`}`