From e529b2dca3f627c7ca1453d6884bdb88adf90aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <pubgit@mikescher.com>
Date: Mon, 20 Jan 2020 18:58:26 +0100
Subject: [PATCH] and more selftest fixes... ... ... ... ...

---
 www/internals/modules/selftest.php | 10 ++++++----
 www/pages/api.php                  |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/internals/modules/selftest.php b/www/internals/modules/selftest.php
index fe0b8fb..0bbb0f9 100644
--- a/www/internals/modules/selftest.php
+++ b/www/internals/modules/selftest.php
@@ -133,8 +133,8 @@ class SelfTest implements IWebsiteModule
 		$this->addMethodPathStatus(     "api::default::aoc-ajax-5",    200, "/api/html::panel_aoc_calendar?year=2019&nav=true&linkheader=false&ajax=true&frameid=x");
 		$this->addMethodPathStatus(     "api::default::aoc-ajax-6",    200, "/api/html::panel_aoc_calendar?year=2019&nav=true&linkheader=true&ajax=false&frameid=x");
 		$this->addMethodPathStatus(     "api::default::aoc-ajax-7",    200, "/api/html::panel_aoc_calendar?year=2019&nav=false&linkheader=false&ajax=false&frameid=x");
-		$this->addMethodPathStatus(     "api::default::404-1",         404, '/api/update/no_prog_xx');
-		$this->addMethodPathStatus(     "api::default::404-2",         404, '/api/asdf::notfound');
+		$this->addMethodPathStatus(     "api::default::api-404-1",     404, '/api/update/no_prog_xx');
+		$this->addMethodPathStatus(     "api::default::api-404-2",     404, '/api/asdf::notfound');
 
 		$this->addMethodPathStatus(     "api::highscore::listgames-1",   200, "/highscores/list.php");
 		$this->addMethodPathStatus(     "api::highscore::listgames-2",   200, "/highscores/list");
@@ -593,13 +593,15 @@ class SelfTest implements IWebsiteModule
 							'exception' => null,
 						];
 					}
-					if ($r['redirect'] !== $url2)
+					if (rtrim($r['redirect'], "/\t \n#") !== rtrim($url2, "/\t \n#"))
 					{
 						return
 						[
 							'result' => self::STATUS_ERROR,
 							'message' => '{'.$xname.'} failed: Request returned wrong redirect',
-							'long' => 'Wrong Redirect URL (Expected: ['.$url2.']; Found: ['.$r['redirect'].'])' . "\n" .
+							'long' => "Wrong Redirect URL\n" .
+								      'Expected: "'.$url2.'"' . "\n" .
+								      'Found: "'.$r['redirect'].'")' . "\n" .
 								      "Response:\n" . $r['output'] . "\n" .
 								      "Redirect:\n" . $r['redirect'] . "\n".
 								      "Error [" . $r['errnum'] . "]:\n" . $r['errstr'],
diff --git a/www/pages/api.php b/www/pages/api.php
index c25dff6..9a7ebe7 100644
--- a/www/pages/api.php
+++ b/www/pages/api.php
@@ -41,6 +41,8 @@ $cmd = strtolower($ROUTE->parameter['cmd']);
 
 if (!array_key_exists($cmd, $API_COMMANDS))
 {
+	ob_clean();
+	print("<div style=\"white-space: pre;font-family: monospace;\">\n");
 	print("                                                    \n");
 	print("                                                    \n");
 	print("                 ...                                \n");
@@ -66,8 +68,11 @@ if (!array_key_exists($cmd, $API_COMMANDS))
 	print("     ::::::`:::::;'  /  /   `#                      \n");
 	print("                                                    \n");
 	print("                                                    \n");
+	print("</div>\n");
+	print("Wrong command.");
+	$reaper = ob_get_clean();
 
-	$FRAME_OPTIONS->forceResult(400, 'Wrong command.');
+	$FRAME_OPTIONS->forceResult(404, $reaper);
 	return;
 }