Alex/polr
1
0
Fork 0
mirror of https://github.com/cydrobolt/polr.git synced 2024-09-19 15:11:40 +02:00
Code Issues Releases Wiki Activity

Made linkNotFound function

Browse Source 
Made a function called linkNotFound to handle redirection of 404's and displaying of 404 errors without repetition.
This commit is contained in:
Zachary Claret-Scott 2017-06-14 11:51:21 +01:00 committed by GitHub
parent de1d4a8bff
commit eae590980b
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/LinkController.php
View File

@ -19,6 +19,16 @@ class LinkController extends Controller {
private function renderError($message) {
return redirect(route('index'))->with('error', $message);
}
private function linkNotFound() {
if (env('SETTING_REDIRECT_404')) {
return redirect()->to(env('SETTING_INDEX_REDIRECT'));
}
return response(view('error', [
'message' => 'Sorry, but this link does not exist.'
]), 404);
}
public function performShorten(Request $request) {
if (env('SETTING_SHORTEN_PERMISSION') && !self::isLoggedIn()) {
@ -54,13 +64,7 @@ class LinkController extends Controller {
// Return an error if the link does not exist
// or return a 404 if SETTING_REDIRECT_404 is set to true
if ($link == null) {
if (env('SETTING_REDIRECT_404')) {
return redirect()->to(env('SETTING_INDEX_REDIRECT'));
}
return response(view('error', [
'message' => 'Sorry, but this link does not exist.'
]), 404);
return self::linkNotFound();
}
// Return an error if the link has been disabled
@ -81,24 +85,12 @@ class LinkController extends Controller {
if (!$secret_key) {
// if we do not receieve a secret key
// when we are expecting one, return a 404 to keep the link secret
if (env('SETTING_REDIRECT_404')) {
return redirect()->to(env('SETTING_INDEX_REDIRECT'));
}
return response(view('error', [
'message' => 'Sorry, but this link does not exist.'
]), 404);
return self::linkNotFound();
}
else {
if ($link_secret_key != $secret_key) {
// a secret key is provided, but it is incorrect, return a 404 to keep the link secret
if (env('SETTING_REDIRECT_404')) {
return redirect()->to(env('SETTING_INDEX_REDIRECT'));
}
return response(view('error', [
'message' => 'Sorry, but this link does not exist.'
]), 404);
return self::linkNotFound();
}
}
}