diff --git a/Changelog b/Changelog index 83166e381..8171b6c01 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-08-30 DariusIII + * Chg: Update warnings and http response templates * Chg: Disable caching for php-tmdb * Chg: Update Tmux class, use Models/Tmux and change usage of $pdo variable * Chg: Update bytesToSizeString function in Utility class diff --git a/public/pages/BasePage.php b/public/pages/BasePage.php index 3abf9b813..78bbe6286 100644 --- a/public/pages/BasePage.php +++ b/public/pages/BasePage.php @@ -211,12 +211,7 @@ class BasePage public function showFloodWarning($seconds = 5): void { header('Retry-After: ' . $seconds); - $this->show503( - sprintf( - 'Too many requests!

You must wait %s seconds before trying again.', - $seconds - ) - ); + $this->show503(); } /** @@ -291,6 +286,15 @@ class BasePage die(view('errors.maintenance')); } + /** + * Show Security token mismatch page. + */ + public function showTokenError(): void + { + header('HTTP/1.1 503 Service Temporarily Unavailable'); + die(view('errors.tokenError')); + } + /** * @param string $retry */ diff --git a/public/pages/login.php b/public/pages/login.php index 864565c46..f4eb01dba 100644 --- a/public/pages/login.php +++ b/public/pages/login.php @@ -41,7 +41,7 @@ if (!isset($_POST['username']) || !isset($_POST['password'])) { $logging->LogBadPasswd($username, $_SERVER['REMOTE_ADDR']); } } else { - $page->show503('Security token mismatch!'); + $page->showTokenError(); } } diff --git a/public/pages/register.php b/public/pages/register.php index 30aa51e51..e68e729e4 100644 --- a/public/pages/register.php +++ b/public/pages/register.php @@ -84,7 +84,7 @@ if ($showRegister === 1) { } } } else { - $page->show503('Security token mismatch'); + $page->showTokenError(); } } break; diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index eead42205..0f4ed944b 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -1,43 +1,9 @@ - - - - HTTP/1.1 404 Not Found +@extends('errors.layout) - +@section('title') + HTTP/1.1 404 Not Found +@endsection - - - -

-
-
We could not find page you are looking for.
Monkeys are hard at work to find it for you!
Or you could try on your own.
-
-
- - \ No newline at end of file +@section('content') + We could not find page you are looking for.
Monkeys are hard at work to find it for you!
Or you could try on your own. +@endsection diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 6d0d00a5a..87373a96d 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -1,43 +1,9 @@ - - - - Be right back. +@extends('errors.layout) - +@section('title') + Be right back. +@endsection - - - -
-
-
Service temporarily unavailable. Please try again later!
-
-
- - \ No newline at end of file +@section('content') + Service temporarily unavailable. Please try again later! +@endsection diff --git a/resources/views/errors/flood.blade.php b/resources/views/errors/flood.blade.php new file mode 100644 index 000000000..46d32f614 --- /dev/null +++ b/resources/views/errors/flood.blade.php @@ -0,0 +1,9 @@ +@extends('errors.layout) + +@section('title') + Too many requests. +@endsection + +@section('content') + Too many requests, retry after 5 seconds! +@endsection \ No newline at end of file diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php new file mode 100644 index 000000000..269bd33b7 --- /dev/null +++ b/resources/views/errors/layout.blade.php @@ -0,0 +1,47 @@ + + + + + @yield('title') + + + + + + + +
+ @yield('content') +
+ + \ No newline at end of file diff --git a/resources/views/errors/maintenance.blade.php b/resources/views/errors/maintenance.blade.php index 74f983d23..d0cd9f65e 100644 --- a/resources/views/errors/maintenance.blade.php +++ b/resources/views/errors/maintenance.blade.php @@ -1,3 +1,12 @@ +@extends('errors.layout) + +@section('title') + Be right back. +@endsection + +@section('content') + We are currently performing maintenance. Please try again later! + @endsection diff --git a/resources/views/errors/tokenError.blade.php b/resources/views/errors/tokenError.blade.php new file mode 100644 index 000000000..5d5fcaae0 --- /dev/null +++ b/resources/views/errors/tokenError.blade.php @@ -0,0 +1,9 @@ +@extends('errors.layout) + +@section('title') + Security token mismatch +@endsection + +@section('content') + Security token mismatch! +@endsection \ No newline at end of file