mirror of
https://github.com/RSS-Bridge/rss-bridge.git
synced 2024-11-24 02:16:08 +03:00
refactor/fix: css organization and error rendering (#3117)
* fix: php notice * refactor/feat: merge HtmlFormat.css into style.css Also improve ux of error rendering. * fix: center-align footer text
This commit is contained in:
Dag
GitHub
parent
1b45a53402
commit
23f8c81646
15 changed files with 445 additions and 568 deletions
|
|
@ -163,14 +163,15 @@ class DisplayAction implements ActionInterface
|
|||
// Create "new" error message every 24 hours
|
||||
$request['_error_time'] = urlencode((int)(time() / 86400));
|
||||
|
||||
// todo: I don't think this _error_time in the title is useful. It's confusing.
|
||||
$itemTitle = sprintf('Bridge returned error %s! (%s)', $e->getCode(), $request['_error_time']);
|
||||
$item->setTitle($itemTitle);
|
||||
$item->setURI(get_current_url());
|
||||
$item->setTimestamp(time());
|
||||
|
||||
// todo: consider giving more helpful error messages
|
||||
$content = render_template(__DIR__ . '/../templates/bridge-error.html.php', [
|
||||
'message' => create_sane_exception_message($e),
|
||||
'trace' => trace_from_exception($e),
|
||||
'error' => render_template(__DIR__ . '/../templates/error.html.php', ['e' => $e]),
|
||||
'searchUrl' => self::createGithubSearchUrl($bridge),
|
||||
'issueUrl' => self::createGithubIssueUrl($bridge, $e, create_sane_exception_message($e)),
|
||||
'maintainer' => $bridge->getMaintainer(),
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ final class FrontpageAction implements ActionInterface
|
|||
</script>
|
||||
</head>
|
||||
<body onload="rssbridge_list_search()">
|
||||
<div class="container">
|
||||
EOD;
|
||||
}
|
||||
|
||||
|
|
@ -146,6 +147,7 @@ EOD;
|
|||
{$inactive}
|
||||
{$admininfo}
|
||||
</section>
|
||||
</div>
|
||||
</body></html>
|
||||
EOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ TEXT;
|
|||
|
||||
foreach ($feeds as $feed) {
|
||||
// Fetch all items from the feed
|
||||
// todo: consider wrapping this in a try..catch to not let a single feed break the entire bridge?
|
||||
$this->collectExpandableDatas($feed);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -120,11 +120,14 @@ class NovayaGazetaEuropeBridge extends BridgeAbstract
|
|||
case 'text/quote':
|
||||
return "<figure><blockquote>{$datum->data}</blockquote></figure><br>";
|
||||
case 'embed/native':
|
||||
$desc = $datum->link;
|
||||
if (property_exists($datum, 'caption')) {
|
||||
$desc = $datum->caption;
|
||||
if (isset($datum->link)) {
|
||||
$desc = $datum->link;
|
||||
if (isset($datum->caption)) {
|
||||
$desc = $datum->caption;
|
||||
}
|
||||
return sprintf('<p><a href="%s">%s</a></p>', $datum->link, $desc);
|
||||
}
|
||||
return "<p><a link=\"{$datum->link}\">{$desc}</a></p>";
|
||||
return '';
|
||||
case 'text/framed':
|
||||
$res = '';
|
||||
if (property_exists($datum, 'typeDisplay')) {
|
||||
|
|
|
|||
|
|
@ -29,26 +29,31 @@ final class Logger
|
|||
private static function log(string $level, string $message, array $context = []): void
|
||||
{
|
||||
if (isset($context['e'])) {
|
||||
$context['message'] = create_sane_exception_message($context['e']);
|
||||
$context['code'] = $context['e']->getCode();
|
||||
$context['url'] = get_current_url();
|
||||
$context['trace'] = trace_to_call_points(trace_from_exception($context['e']));
|
||||
/** @var \Throwable $e */
|
||||
$e = $context['e'];
|
||||
unset($context['e']);
|
||||
// Don't log these records
|
||||
$context['type'] = get_class($e);
|
||||
$context['code'] = $e->getCode();
|
||||
$context['message'] = $e->getMessage();
|
||||
$context['file'] = trim_path_prefix($e->getFile());
|
||||
$context['line'] = $e->getLine();
|
||||
$context['url'] = get_current_url();
|
||||
$context['trace'] = trace_to_call_points(trace_from_exception($e));
|
||||
// Don't log these exceptions
|
||||
$ignoredExceptions = [
|
||||
'Exception Exception: You must specify a format',
|
||||
'Exception InvalidArgumentException: Format name invalid',
|
||||
'Exception InvalidArgumentException: Unknown format given',
|
||||
'Exception InvalidArgumentException: Bridge name invalid',
|
||||
'Exception Exception: Invalid action',
|
||||
'Exception Exception: twitter: No results for this query',
|
||||
'You must specify a format',
|
||||
'Format name invalid',
|
||||
'Unknown format given',
|
||||
'Bridge name invalid',
|
||||
'Invalid action',
|
||||
'twitter: No results for this query',
|
||||
// telegram
|
||||
'Exception Exception: Unable to find channel. The channel is non-existing or non-public',
|
||||
'Unable to find channel. The channel is non-existing or non-public',
|
||||
// fb
|
||||
'Exception Exception: This group is not public! RSS-Bridge only supports public groups!',
|
||||
'This group is not public! RSS-Bridge only supports public groups!',
|
||||
];
|
||||
foreach ($ignoredExceptions as $ignoredException) {
|
||||
if (str_starts_with($context['message'], $ignoredException)) {
|
||||
if (str_starts_with($e->getMessage(), $ignoredException)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,10 +16,7 @@ final class RssBridge
|
|||
} catch (\Throwable $e) {
|
||||
Logger::error('Exception in main', ['e' => $e]);
|
||||
http_response_code(500);
|
||||
print render(__DIR__ . '/../templates/error.html.php', [
|
||||
'message' => create_sane_exception_message($e),
|
||||
'trace' => trace_from_exception($e),
|
||||
]);
|
||||
print render(__DIR__ . '/../templates/error.html.php', ['e' => $e]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ function frame_to_call_point(array $frame): string
|
|||
/**
|
||||
* Trim path prefix for privacy/security reasons
|
||||
*
|
||||
* Example: "/var/www/rss-bridge/index.php" => "index.php"
|
||||
* Example: "/home/davidsf/rss-bridge/index.php" => "index.php"
|
||||
*/
|
||||
function trim_path_prefix(string $filePath): string
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,145 +0,0 @@
|
|||
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
outline: 0;
|
||||
font-size: 100%;
|
||||
font: inherit;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
/* HTML5 display-role reset for older browsers */
|
||||
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
|
||||
display: block;
|
||||
}
|
||||
/* Let's go for the actual style */
|
||||
body {
|
||||
background-color: #f0f0f0;
|
||||
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
|
||||
}
|
||||
a, a:link, a:visited {
|
||||
color: #2196F3;
|
||||
text-decoration: none;
|
||||
}
|
||||
a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
img {
|
||||
max-width: 100%;
|
||||
}
|
||||
/* Section */
|
||||
section {
|
||||
background-color: #FFFFFF;
|
||||
width: 60%;
|
||||
margin: 30px auto;
|
||||
padding: 15px 15px;
|
||||
box-shadow: 0 6px 15px rgba(0, 0, 0, 0.09);
|
||||
border-radius: 4px;
|
||||
}
|
||||
section > h2 {
|
||||
font-size: 200%;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
}
|
||||
h1.pagetitle {
|
||||
margin: 40px 0 20px;
|
||||
font-size: 300%;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
color: #2196F3;
|
||||
}
|
||||
h1.pagetitle > a {
|
||||
color: #2196F3;
|
||||
}
|
||||
a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link, a.itemtitle:visited {
|
||||
color: #2196F3;
|
||||
}
|
||||
.buttons {
|
||||
text-align: center;
|
||||
}
|
||||
section > div.content, section > div.attachments {
|
||||
padding: 10px;
|
||||
}
|
||||
section h1, section h2, section h3, section b, section strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
section i, section em {
|
||||
font-style: italic;
|
||||
}
|
||||
section p:not(:last-child) {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
section li {
|
||||
margin-left: 1em;
|
||||
}
|
||||
section > div.attachments > li.enclosure {
|
||||
list-style-type: circle;
|
||||
list-style-position: inside;
|
||||
}
|
||||
section > time, section > p.author {
|
||||
color: #888;
|
||||
font-size: 80%;
|
||||
padding: 10px;
|
||||
}
|
||||
button {
|
||||
line-height: 1.9em;
|
||||
color: #FFF;
|
||||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
padding: 6px 12px;
|
||||
margin: 12px auto 0px;
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
background: #2196F3 none repeat scroll 0% 0%;
|
||||
cursor: pointer;
|
||||
width: 200px;
|
||||
}
|
||||
button:hover {
|
||||
background: #49afff;
|
||||
}
|
||||
button.highlight {
|
||||
background: #ff6600;
|
||||
}
|
||||
button.highlight:hover {
|
||||
background: #ff8a3b;
|
||||
}
|
||||
|
||||
|
||||
@media screen and (max-width: 767px) {
|
||||
|
||||
section {
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
|
||||
}
|
||||
|
||||
button {
|
||||
display: inline-block;
|
||||
width: 40%;
|
||||
padding: 5px auto;
|
||||
margin: 3px auto 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Dark theme, will automatically be set for those that have dark mode on their OS. */
|
||||
@media (prefers-color-scheme: dark){
|
||||
|
||||
* {
|
||||
scrollbar-color: #202324 #454a4d;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: #202325;
|
||||
color: #e8e6e3;
|
||||
}
|
||||
|
||||
a, a:link, a:visited {
|
||||
color: #0A6AB6;
|
||||
}
|
||||
|
||||
/* Section */
|
||||
section {
|
||||
background-color: #181A1B;
|
||||
}
|
||||
|
||||
}
|
||||
537
static/style.css
537
static/style.css
|
|
@ -1,105 +1,110 @@
|
|||
html {
|
||||
box-sizing: border-box;
|
||||
font-size: 16px;
|
||||
box-sizing: border-box;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
*, *:before, *:after {
|
||||
box-sizing: inherit;
|
||||
box-sizing: inherit;
|
||||
}
|
||||
|
||||
body, h1, h2, h3, h4, h5, h6, p, ol, ul {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
ol, ul {
|
||||
list-style: none;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
|
||||
/* HTML5 display-role reset for older browsers */
|
||||
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
|
||||
display: block;
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Adjust parameters for browsers that don't support the grid layout */
|
||||
|
||||
.parameters label:before {
|
||||
content: " ";
|
||||
display: block;
|
||||
content: " ";
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Let's go for the actual style */
|
||||
body {
|
||||
background-color: #f0f0f0;
|
||||
font-family: sans-serif;
|
||||
background-color: #f0f0f0;
|
||||
font-family: sans-serif;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
a, a:link, a:visited {
|
||||
color: #2196F3;
|
||||
text-decoration: none;
|
||||
color: #2196F3;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
text-decoration: underline;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
h1,h2 {
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
p {
|
||||
margin-bottom: 10px;
|
||||
h5 {
|
||||
margin: 20px;
|
||||
font-weight: bold;
|
||||
display: none;
|
||||
}
|
||||
/* Header */
|
||||
|
||||
p {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
/* Header */
|
||||
header {
|
||||
margin-top: 40px;
|
||||
text-align: center;
|
||||
color: #1182DB;
|
||||
margin-top: 40px;
|
||||
padding: 15px;
|
||||
color: #1182DB;
|
||||
}
|
||||
|
||||
header > div.logo {
|
||||
background-image: url(logo_600px.png);
|
||||
width: 599px;
|
||||
height: 177px;
|
||||
margin: auto;
|
||||
background-image: url(logo_600px.png);
|
||||
width: 599px;
|
||||
height: 177px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
header > section.warning {
|
||||
width: 40%;
|
||||
background-color: #ffc600;
|
||||
color: #5f5f5f;
|
||||
background-color: #ffc600;
|
||||
color: #5f5f5f;
|
||||
}
|
||||
|
||||
header > section.critical-warning {
|
||||
width: 40%;
|
||||
background-color: #cf3e3e;
|
||||
font-weight: bold;
|
||||
color: white;
|
||||
background-color: #cf3e3e;
|
||||
font-weight: bold;
|
||||
color: white;
|
||||
}
|
||||
|
||||
select,
|
||||
input[type="text"],
|
||||
input[type="number"] {
|
||||
background-color: white;
|
||||
color: #404552;
|
||||
border: 1px solid #dedede;
|
||||
margin-left: 8px;
|
||||
margin-bottom: 10px;
|
||||
padding: 5px 10px;
|
||||
background-color: white;
|
||||
color: #404552;
|
||||
border: 1px solid #dedede;
|
||||
margin-left: 8px;
|
||||
margin-bottom: 10px;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
||||
select:focus,
|
||||
input[type="text"]:focus,
|
||||
input[type="number"]:focus {
|
||||
outline: none;
|
||||
border-color: #888;
|
||||
outline: none;
|
||||
border-color: #888;
|
||||
}
|
||||
|
||||
input:focus::-webkit-input-placeholder { opacity: 0; }
|
||||
|
|
@ -109,344 +114,336 @@ input:focus:-moz-placeholder { opacity: 0; }
|
|||
input:focus:-ms-input-placeholder { opacity: 0; }
|
||||
|
||||
.searchbar {
|
||||
width: 40%;
|
||||
margin: 40px auto 100px;
|
||||
width: 60%;
|
||||
text-align: center;
|
||||
margin: 0 auto 50px;
|
||||
}
|
||||
|
||||
.searchbar input[type="text"] {
|
||||
width: 90%;
|
||||
margin: auto;
|
||||
font-size: 1.1em;
|
||||
text-align: center;
|
||||
margin-bottom: 10px;
|
||||
width: 90%;
|
||||
font-size: 1.1em;
|
||||
text-align: center;
|
||||
margin: auto auto 10px;
|
||||
}
|
||||
|
||||
.searchbar input[type="text"]::placeholder {
|
||||
text-align: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.searchbar > h3 {
|
||||
font-size: 200%;
|
||||
font-weight: bold;
|
||||
color: #1182DB;
|
||||
margin-bottom: 10px;
|
||||
font-size: 200%;
|
||||
font-weight: bold;
|
||||
color: #1182DB;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 60%;
|
||||
margin: 30px auto;
|
||||
}
|
||||
|
||||
/* Section */
|
||||
section {
|
||||
background-color: #FFFFFF;
|
||||
width: 60%;
|
||||
margin: 30px auto;
|
||||
padding: 15px 15px;
|
||||
text-align: center;
|
||||
box-shadow: 0 6px 15px rgba(0, 0, 0, 0.09);
|
||||
border-radius: 4px;
|
||||
margin-bottom: 10px;
|
||||
background-color: #FFFFFF;
|
||||
padding: 15px;
|
||||
box-shadow: 0 6px 15px rgba(0, 0, 0, 0.09);
|
||||
border-radius: 4px;
|
||||
}
|
||||
section > time,
|
||||
section > p.author {
|
||||
color: #888;
|
||||
font-size: 80%;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
section.footer {
|
||||
opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
section.footer:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
section.footer .version {
|
||||
font-size: 80%;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
section > h2 {
|
||||
font-size: 200%;
|
||||
font-weight: bold;
|
||||
font-size: 200%;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
}
|
||||
section li {
|
||||
margin-left: 1em;
|
||||
}
|
||||
.bridge-card {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* Buttons */
|
||||
button {
|
||||
line-height: 1.9em;
|
||||
color: #FFF;
|
||||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
padding: 6px 12px;
|
||||
margin: 12px auto 0px;
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
background: #2196F3 none repeat scroll 0% 0%;
|
||||
cursor: pointer;
|
||||
width: calc(20% - 4px);
|
||||
}
|
||||
|
||||
button.small {
|
||||
width: auto;
|
||||
line-height: 1.2em;
|
||||
width: auto;
|
||||
line-height: 1.2em;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: #49afff;
|
||||
background: #49afff;
|
||||
}
|
||||
|
||||
.description {
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
h5 {
|
||||
margin: 20px;
|
||||
font-weight: bold;
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-bottom: 6px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
.parameters label::first-letter {
|
||||
text-transform: capitalize;
|
||||
text-transform: capitalize;
|
||||
}
|
||||
|
||||
.parameters label::after {
|
||||
content: ' :';
|
||||
content: ' :';
|
||||
}
|
||||
|
||||
.info {
|
||||
cursor: help;
|
||||
opacity: 0.5;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
line-height: 22px;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
background-image: radial-gradient(#49afff, #1182DB);
|
||||
-webkit-border-radius: 16px;
|
||||
-moz-border-radius: 16px;
|
||||
border-radius: 16px;
|
||||
cursor: pointer;
|
||||
opacity: 0.5;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
line-height: 22px;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
background-image: radial-gradient(#49afff, #1182DB);
|
||||
-webkit-border-radius: 16px;
|
||||
-moz-border-radius: 16px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
.info:hover {
|
||||
opacity: 1;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
@supports (display: grid) {
|
||||
|
||||
.parameters {
|
||||
display: grid;
|
||||
padding: 12px 0;
|
||||
grid-template-columns: 40% max-content 24px;
|
||||
grid-column-gap: 10px;
|
||||
grid-row-gap: 5px;
|
||||
}
|
||||
.parameters {
|
||||
display: grid;
|
||||
padding: 12px 0;
|
||||
grid-template-columns: 40% max-content 24px;
|
||||
grid-column-gap: 10px;
|
||||
grid-row-gap: 5px;
|
||||
}
|
||||
|
||||
.parameters label {
|
||||
text-align: right;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
.parameters label {
|
||||
text-align: right;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
.parameters label::before {
|
||||
content: none;
|
||||
}
|
||||
.parameters label::before {
|
||||
content: none;
|
||||
}
|
||||
|
||||
.parameters input[type="text"],
|
||||
.parameters input[type="number"],
|
||||
.parameters input[type="checkbox"],
|
||||
.parameters select {
|
||||
margin-left: 0;
|
||||
}
|
||||
.parameters input[type="text"],
|
||||
.parameters input[type="number"],
|
||||
.parameters input[type="checkbox"],
|
||||
.parameters select {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.parameters input[type="text"],
|
||||
.parameters input[type="number"] {
|
||||
width: auto;
|
||||
color: #404552;
|
||||
}
|
||||
.parameters input[type="text"],
|
||||
.parameters input[type="number"] {
|
||||
width: auto;
|
||||
color: #404552;
|
||||
}
|
||||
|
||||
.parameters input[type="checkbox"] {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
.parameters input[type="checkbox"] {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
} /* @supports (display: grid) */
|
||||
|
||||
.maintainer {
|
||||
color: #888888;
|
||||
font-size: 70%;
|
||||
text-align: right;
|
||||
p.maintainer {
|
||||
color: #888888;
|
||||
font-size: 70%;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.secure-warning {
|
||||
background-color: #ffc600;
|
||||
color: #5f5f5f;
|
||||
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
|
||||
border-radius: 2px;
|
||||
border: 1px solid transparent;
|
||||
width: 80%;
|
||||
margin: auto;
|
||||
margin-bottom: 6px;
|
||||
background-color: #ffc600;
|
||||
color: #5f5f5f;
|
||||
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
|
||||
border-radius: 2px;
|
||||
border: 1px solid transparent;
|
||||
width: 80%;
|
||||
margin: auto auto 6px;
|
||||
}
|
||||
|
||||
.error strong {
|
||||
display: inline-block;
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
/* Hide all forms on the frontpage by default */
|
||||
form {
|
||||
display: none;
|
||||
display: none;
|
||||
}
|
||||
|
||||
select {
|
||||
padding: 5px 10px;
|
||||
margin-left: 8px;
|
||||
padding: 5px 10px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
h5 {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Show more / less */
|
||||
/* Show more/less */
|
||||
.showmore-box {
|
||||
display: none;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.showmore, .showless {
|
||||
color: #888888;
|
||||
cursor: pointer;
|
||||
color: #888888;
|
||||
cursor: pointer;
|
||||
}
|
||||
.showmore:hover, .showless:hover {
|
||||
color: #000;
|
||||
cursor: pointer;
|
||||
color: #000;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.showmore-box:checked ~ .showmore {
|
||||
display: none;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.showmore-box:not(:checked) ~ .showless {
|
||||
display: none;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.showmore-box:checked ~ form, .showmore-box:checked ~ h5 {
|
||||
display: block;
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Additional styles for error pages */
|
||||
.exception-message {
|
||||
background-color: #c00000;
|
||||
color: #FFFFFF;
|
||||
font-weight: bold;
|
||||
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
|
||||
border-radius: 2px;
|
||||
border: 1px solid transparent;
|
||||
width: 80%;
|
||||
margin: auto;
|
||||
margin-bottom: 6px;
|
||||
/* html format */
|
||||
h1.pagetitle {
|
||||
margin: 40px 0 20px;
|
||||
font-size: 300%;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
color: #2196F3;
|
||||
}
|
||||
|
||||
.advice > li {
|
||||
text-align: left;
|
||||
h1.pagetitle > a {
|
||||
color: #2196F3;
|
||||
}
|
||||
.buttons {
|
||||
text-align: center;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
button {
|
||||
line-height: 1.9em;
|
||||
color: #FFF;
|
||||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
padding: 6px 12px;
|
||||
margin: 12px auto 0px;
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
background: #2196F3 none repeat scroll 0% 0%;
|
||||
cursor: pointer;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 767px) {
|
||||
body {
|
||||
font-size: 75%;
|
||||
}
|
||||
.container {
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
header > div.logo {
|
||||
background-image: url(logo_300px.png);
|
||||
width: 300px;
|
||||
height: 89px;
|
||||
}
|
||||
.searchbar {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
header > section.warning {
|
||||
width: 90%;
|
||||
}
|
||||
header > div.logo {
|
||||
background-image: url(logo_300px.png);
|
||||
width: 300px;
|
||||
height: 89px;
|
||||
}
|
||||
|
||||
header > section.critical-warning {
|
||||
width: 90%;
|
||||
}
|
||||
button {
|
||||
display: inline-block;
|
||||
width: 40%;
|
||||
padding: 5px auto;
|
||||
margin: 3px auto 0;
|
||||
}
|
||||
|
||||
.searchbar {
|
||||
width: 90%;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.info, .no-info {
|
||||
display: none;
|
||||
}
|
||||
|
||||
section {
|
||||
width: 90%;
|
||||
margin: 10px auto;
|
||||
overflow: hidden;
|
||||
}
|
||||
@supports (display: grid) {
|
||||
|
||||
button {
|
||||
display: inline-block;
|
||||
width: 40%;
|
||||
padding: 5px auto;
|
||||
margin: 3px auto 0;
|
||||
}
|
||||
.parameters {
|
||||
grid-template-columns: auto auto;
|
||||
grid-column-gap: 5px;
|
||||
}
|
||||
|
||||
.info, .no-info {
|
||||
display: none;
|
||||
}
|
||||
.parameters label {
|
||||
line-height: 2em;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
@supports (display: grid) {
|
||||
} /* @supports (display: grid) */
|
||||
|
||||
.parameters {
|
||||
grid-template-columns: auto auto;
|
||||
grid-column-gap: 5px;
|
||||
}
|
||||
|
||||
.parameters label {
|
||||
line-height: 2em;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
} /* @supports (display: grid) */
|
||||
|
||||
.secure-warning {
|
||||
width: 100%;
|
||||
}
|
||||
.secure-warning {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Dark theme */
|
||||
@media (prefers-color-scheme: dark){
|
||||
* {
|
||||
scrollbar-color: #202324 #454a4d;
|
||||
}
|
||||
* {
|
||||
scrollbar-color: #202324 #454a4d;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: #202325;
|
||||
color: #e8e6e3;
|
||||
}
|
||||
body {
|
||||
background-color: #202325;
|
||||
color: #e8e6e3;
|
||||
}
|
||||
|
||||
a, a:link, a:visited {
|
||||
color: #0A6AB6;
|
||||
}
|
||||
a, a:link, a:visited {
|
||||
color: #0A6AB6;
|
||||
}
|
||||
|
||||
/* Header */
|
||||
select,
|
||||
input[type="text"],
|
||||
input[type="number"] {
|
||||
background-color: #181A1B;
|
||||
/* does not apply to placeholder text without !important */
|
||||
color: white !important;
|
||||
/* Header */
|
||||
select,
|
||||
input[type="text"],
|
||||
input[type="number"] {
|
||||
background-color: #181A1B;
|
||||
/* does not apply to placeholder text without !important */
|
||||
color: white !important;
|
||||
|
||||
border: 1px solid #393E40;
|
||||
}
|
||||
border: 1px solid #393E40;
|
||||
}
|
||||
|
||||
/* Section */
|
||||
section {
|
||||
background-color: #181A1B;
|
||||
}
|
||||
/* Section */
|
||||
section {
|
||||
background-color: #181A1B;
|
||||
}
|
||||
|
||||
/* Buttons */
|
||||
button {
|
||||
background: #0A6AB6 none repeat scroll 0% 0%;
|
||||
}
|
||||
/* Buttons */
|
||||
button {
|
||||
background: #0A6AB6 none repeat scroll 0% 0%;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: #004daa;
|
||||
}
|
||||
button:hover {
|
||||
background: #004daa;
|
||||
}
|
||||
|
||||
@supports (display: grid){
|
||||
.parameters input[type="number"] {
|
||||
color: #BAB4AB;
|
||||
}
|
||||
}
|
||||
@supports (display: grid){
|
||||
.parameters input[type="number"] {
|
||||
color: #BAB4AB;
|
||||
}
|
||||
}
|
||||
|
||||
/* Show more / less */
|
||||
.showmore:hover, .showless:hover {
|
||||
color: #d8d3cb;
|
||||
}
|
||||
/* Show more / less */
|
||||
.showmore:hover, .showless:hover {
|
||||
color: #d8d3cb;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
<section>
|
||||
<h1>
|
||||
Please authenticate in order to access this instance
|
||||
</h1>
|
||||
</section>
|
||||
|
||||
<h1>
|
||||
Please authenticate in order to access this instance
|
||||
</h1>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,15 @@
|
|||
<link href="static/style.css" rel="stylesheet">
|
||||
<link rel="icon" type="image/png" href="static/favicon.png">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div class="logo"></div>
|
||||
</header>
|
||||
|
||||
<?= raw($page) ?>
|
||||
<body>
|
||||
<div class="container">
|
||||
<header>
|
||||
<div class="logo"></div>
|
||||
</header>
|
||||
|
||||
<?= raw($page) ?>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,14 @@
|
|||
<section>
|
||||
<p class="exception-message">
|
||||
<?= e($message) ?>
|
||||
</p>
|
||||
|
||||
<?php foreach ($trace as $i => $frame) : ?>
|
||||
#<?= $i ?> <?= e(frame_to_call_point($frame)) ?>
|
||||
<br>
|
||||
<?php endforeach; ?>
|
||||
<?= raw($error) ?>
|
||||
|
||||
<br>
|
||||
<a href="<?= raw($searchUrl) ?>" title="Opens GitHub to search for similar issues">
|
||||
<button>Find similar bugs</button>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
Query string: <?= e(urldecode($_SERVER['QUERY_STRING']) ?? '') ?>
|
||||
</p>
|
||||
<p>
|
||||
Version: <?= raw(Configuration::getVersion()) ?>
|
||||
</p>
|
||||
<p>
|
||||
OS: <?= raw(PHP_OS_FAMILY) ?>
|
||||
</p>
|
||||
<p>
|
||||
PHP version: <?= raw(PHP_VERSION ?: 'Unknown') ?>
|
||||
</p>
|
||||
|
||||
<a href="<?= raw($searchUrl) ?>" title="Opens GitHub to search for similar issues">
|
||||
<button>Find similar bugs</button>
|
||||
</a>
|
||||
|
||||
<a href="<?= raw($issueUrl) ?>" title="After clicking this button you can review the issue before submitting it">
|
||||
<button>Create GitHub Issue</button>
|
||||
</a>
|
||||
|
||||
<p class="maintainer">
|
||||
<?= e($maintainer) ?>
|
||||
</p>
|
||||
</section>
|
||||
<a href="<?= raw($issueUrl) ?>" title="After clicking this button you can review the issue before submitting it">
|
||||
<button>Create GitHub Issue</button>
|
||||
</a>
|
||||
|
||||
<p class="maintainer">
|
||||
<?= e($maintainer) ?>
|
||||
</p>
|
||||
|
|
@ -1,14 +1,36 @@
|
|||
<div style="width: 60%; margin: 30px auto">
|
||||
<div class="error">
|
||||
|
||||
<h1>Something went wrong</h1>
|
||||
<h1>Application Error</h1>
|
||||
|
||||
<p>
|
||||
<?= e($message) ?>
|
||||
</p>
|
||||
<p>The application could not run because of the following error:</p>
|
||||
|
||||
<h2>Stacktrace</h2>
|
||||
<h2>Details</h2>
|
||||
|
||||
<?php foreach ($trace as $i => $frame) : ?>
|
||||
<div style="margin-bottom: 15px">
|
||||
<div>
|
||||
<strong>Type:</strong> <?= e(get_class($e)) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>Code:</strong> <?= e($e->getCode()) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>Message:</strong> <?= e($e->getMessage()) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>File:</strong> <?= e(trim_path_prefix($e->getFile())) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>Line:</strong> <?= e($e->getLine()) ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2>Trace</h2>
|
||||
|
||||
<?php foreach (trace_from_exception($e) as $i => $frame) : ?>
|
||||
<code>
|
||||
#<?= $i ?> <?= e(frame_to_call_point($frame)) ?>
|
||||
</code>
|
||||
|
|
@ -19,17 +41,24 @@
|
|||
|
||||
<h2>Context</h2>
|
||||
|
||||
<p>
|
||||
Query string: <?= e(urldecode($_SERVER['QUERY_STRING'] ?? '')) ?>
|
||||
</p>
|
||||
<p>
|
||||
Version: <?= raw(Configuration::getVersion()) ?>
|
||||
</p>
|
||||
<p>
|
||||
OS: <?= raw(PHP_OS_FAMILY) ?>
|
||||
</p>
|
||||
<p>
|
||||
PHP version: <?= raw(PHP_VERSION ?: 'Unknown') ?>
|
||||
</p>
|
||||
<div>
|
||||
<strong>Query:</strong> <?= e(urldecode($_SERVER['QUERY_STRING'] ?? '')) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>Version:</strong> <?= raw(Configuration::getVersion()) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>OS:</strong> <?= raw(PHP_OS_FAMILY) ?>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>PHP:</strong> <?= raw(PHP_VERSION ?: 'Unknown') ?>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<a href="/">Go back</a>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="<?= $charset ?>">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/ >
|
||||
<meta name="description" content="RSS-Bridge" />
|
||||
<title><?= e($title) ?></title>
|
||||
<link href="static/HtmlFormat.css" rel="stylesheet">
|
||||
<link href="static/style.css" rel="stylesheet">
|
||||
<link rel="icon" type="image/png" href="static/favicon.png">
|
||||
|
||||
<?php foreach ($linkTags as $link): ?>
|
||||
|
|
@ -18,73 +19,74 @@
|
|||
|
||||
<meta name="robots" content="noindex, follow">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1 class="pagetitle">
|
||||
<a href="<?= e($uri) ?>" target="_blank">
|
||||
<?= e($title) ?>
|
||||
</a>
|
||||
</h1>
|
||||
|
||||
<div class="buttons">
|
||||
<a href="./#bridge-<?= $_GET['bridge'] ?>">
|
||||
<button class="backbutton">← back to rss-bridge</button>
|
||||
</a>
|
||||
<div class="container">
|
||||
<h1 class="pagetitle">
|
||||
<a href="<?= e($uri) ?>" target="_blank"><?= e($title) ?></a>
|
||||
</h1>
|
||||
|
||||
<?php foreach ($buttons as $button): ?>
|
||||
<a href="<?= $button['href'] ?>">
|
||||
<button class="rss-feed"><?= $button['value'] ?></button>
|
||||
<div class="buttons">
|
||||
<a href="./#bridge-<?= $_GET['bridge'] ?>">
|
||||
<button class="backbutton">← back to rss-bridge</button>
|
||||
</a>
|
||||
|
||||
<?php foreach ($buttons as $button): ?>
|
||||
<a href="<?= $button['href'] ?>">
|
||||
<button class="rss-feed"><?= $button['value'] ?></button>
|
||||
</a>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
|
||||
<?php foreach ($items as $item): ?>
|
||||
<section class="feeditem">
|
||||
<h2>
|
||||
<a
|
||||
class="itemtitle"
|
||||
href="<?= e($item['url']) ?>"
|
||||
><?= strip_tags($item['title']) ?></a>
|
||||
</h2>
|
||||
|
||||
<?php if ($item['timestamp']): ?>
|
||||
<time datetime="<?= date('Y-m-d H:i:s', $item['timestamp']) ?>">
|
||||
<?= date('Y-m-d H:i:s', $item['timestamp']) ?>
|
||||
</time>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($item['author']): ?>
|
||||
<br/>
|
||||
<p class="author">by: <?= e($item['author']) ?></p>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="content">
|
||||
<?= sanitize_html($item['content']) ?>
|
||||
</div>
|
||||
|
||||
<?php if ($item['enclosures']): ?>
|
||||
<div class="attachments">
|
||||
<p>Attachments:</p>
|
||||
<?php foreach ($item['enclosures'] as $enclosure): ?>
|
||||
<li class="enclosure">
|
||||
<a href="<?= e($enclosure) ?>" rel="noopener noreferrer nofollow">
|
||||
<?= e(substr($enclosure, strrpos($enclosure, '/') + 1)) ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($item['categories']): ?>
|
||||
<div class="categories">
|
||||
<p>Categories:</p>
|
||||
<?php foreach ($item['categories'] as $category): ?>
|
||||
<li class="category"><?= e($category) ?></li>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</section>
|
||||
<?php endforeach; ?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php foreach ($items as $item): ?>
|
||||
<section class="feeditem">
|
||||
<h2>
|
||||
<a
|
||||
class="itemtitle"
|
||||
href="<?= e($item['url']) ?>"
|
||||
><?= strip_tags($item['title']) ?></a>
|
||||
</h2>
|
||||
|
||||
<?php if ($item['timestamp']): ?>
|
||||
<time datetime="<?= date('Y-m-d H:i:s', $item['timestamp']) ?>">
|
||||
<?= date('Y-m-d H:i:s', $item['timestamp']) ?>
|
||||
</time>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($item['author']): ?>
|
||||
<br/>
|
||||
<p class="author">by: <?= e($item['author']) ?></p>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="content">
|
||||
<?= sanitize_html($item['content']) ?>
|
||||
</div>
|
||||
|
||||
<?php if ($item['enclosures']): ?>
|
||||
<div class="attachments">
|
||||
<p>Attachments:</p>
|
||||
<?php foreach ($item['enclosures'] as $enclosure): ?>
|
||||
<li class="enclosure">
|
||||
<a href="<?= e($enclosure) ?>" rel="noopener noreferrer nofollow">
|
||||
<?= e(substr($enclosure, strrpos($enclosure, '/') + 1)) ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($item['categories']): ?>
|
||||
<div class="categories">
|
||||
<p>Categories:</p>
|
||||
<?php foreach ($item['categories'] as $category): ?>
|
||||
<li class="category"><?= e($category) ?></li>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</section>
|
||||
<?php endforeach; ?>
|
||||
|
||||
</body>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -40,4 +40,11 @@ final class UtilsTest extends TestCase
|
|||
$this->assertIsNumeric($sut->getTime());
|
||||
$sut->purgeCache(-1);
|
||||
}
|
||||
|
||||
public function testTrimFilePath()
|
||||
{
|
||||
$this->assertSame('', trim_path_prefix(dirname(__DIR__)));
|
||||
$this->assertSame('tests', trim_path_prefix(__DIR__));
|
||||
$this->assertSame('tests/UtilsTest.php', trim_path_prefix(__DIR__ . '/UtilsTest.php'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue