mirror/php-rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-07-30 21:30:14 +02:00
Code Issues Releases Wiki Activity

feat: improve error/exception ui (#3690)

Browse Source
This commit is contained in:
Dag
2023-09-23 18:54:14 +02:00
committed by GitHub
parent cb6c931b1f
commit b3b0736761
9 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AuthenticationMiddleware.php
View File

@@ -44,6 +44,8 @@ final class AuthenticationMiddleware
{
http_response_code(401);
header('WWW-Authenticate: Basic realm="RSS-Bridge"');
return render('access-denied.html.php');
return render(__DIR__ . '/../templates/error.html.php', [
'message' => 'Please authenticate in order to access this instance!',
]);
}
}

4
lib/RssBridge.php
View File

@@ -22,7 +22,7 @@ final class RssBridge
set_exception_handler(function (\Throwable $e) {
self::$logger->error('Uncaught Exception', ['e' => $e]);
http_response_code(500);
print render(__DIR__ . '/../templates/error.html.php', ['e' => $e]);
print render(__DIR__ . '/../templates/exception.html.php', ['e' => $e]);
exit(1);
});
@@ -117,7 +117,7 @@ final class RssBridge
} catch (\Throwable $e) {
self::$logger->error('Exception in RssBridge::main()', ['e' => $e]);
http_response_code(500);
print render(__DIR__ . '/../templates/error.html.php', ['e' => $e]);
print render(__DIR__ . '/../templates/exception.html.php', ['e' => $e]);
}
}

5
lib/html.php
View File

@@ -34,8 +34,9 @@ function render(string $template, array $context = []): string
}
/**
* Render template as absolute path or relative to templates folder.
* Do not pass user input in $template
* Render php template with context
*
* DO NOT PASS USER INPUT IN $template or $context
*/
function render_template(string $template, array $context = []): string
{

6
lib/http.php
View File

@@ -115,8 +115,8 @@ final class CurlHttpClient implements HttpClient
$attempts = 0;
while (true) {
$attempts++;
$data = curl_exec($ch);
if ($data !== false) {
$body = curl_exec($ch);
if ($body !== false) {
// The network call was successful, so break out of the loop
break;
}
@@ -136,7 +136,7 @@ final class CurlHttpClient implements HttpClient
$statusCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
curl_close($ch);
return new Response($data, $statusCode, $responseHeaders);
return new Response($body, $statusCode, $responseHeaders);
}
}