Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions Activity

show long error message in selftest admin panel

Browse Source
This commit is contained in:
Mike Schwörer
2020-01-20 20:44:39 +01:00
parent 96494c9f55
commit cf6c496b34
9 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
www/internals/modules/selftest.php
View File

@@ -259,17 +259,21 @@ class SelfTest implements IWebsiteModule
$message = '';
$count = 0;
$i = 0;
foreach ($supdata as $d)
{
$i++;
$sxname = $xname . '-' . $i;
$url = 'https://' . $_SERVER['HTTP_HOST'] . str_replace('{0}', $d, $path);
$r = curl_http_request($url);
$count++;
if ($r['statuscode'] === $status) { $message .= "{".$xname."} succeeded" . "\n"; continue; }
if ($r['statuscode'] === $status) { $message .= " {".$sxname."} succeeded" . "\n"; continue; }
return
[
'result' => self::STATUS_ERROR,
'message' => '{'.$xname.'} failed: Request returned wrong statuscode',
'message' => '{'.$sxname.'} failed: Request returned wrong statuscode',
'long' => 'Wrong HTTP Statuscode (Expected: ['.$status.']; Found: ['.$r['statuscode'].'])' . "\n".
"URL: $url\n".
"Redirect: " . $r['redirect'] . "\n" .
@@ -282,7 +286,7 @@ class SelfTest implements IWebsiteModule
return
[
'result' => self::STATUS_OK,
'message' => "$count requests succeeded\n" . rtrim($message, "\n"),
'message' => "$count requests succeeded\n" . trim($message, "\n"),
'long' => null,
'exception' => null,
];

1
www/internals/utils.php
View File

@@ -245,7 +245,6 @@ function formatException($e)
$xdbg = str_replace('<br>', "\n", $xdbg);
$xdbg = str_replace('><', "> <", $xdbg);
$xdbg = strip_tags($xdbg);
$xdbg = htmlspecialchars($xdbg);
$r .= $xdbg . "\n";
}
return $r;