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

Add option to redirect 404s and disabled URLs; update setup picture for 2.0.0 stable

Browse Source
This commit is contained in:
Chaoyi Zha 2016-09-11 16:01:34 -04:00
parent 0ef7f85b1f
commit ab95465786
9 changed files with 59 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.env.setup
View File

@ -1,22 +0,0 @@
APP_ENV=local
APP_DEBUG=true
APP_KEY=:_<uw?zyc`QQdO{):V?wd9J}%v9/m^bz
APP_LOCALE=en
APP_FALLBACK_LOCALE=en
# DB_CONNECTION=mysql
# DB_HOST=localhost
# DB_PORT=3306
# DB_DATABASE=homestead
# DB_USERNAME=homestead
# DB_PASSWORD=secret
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=file
VERSION=2.0.0rc1
VERSION_RELMONTH=August
VERSION_RELDAY=15
VERSION_RELYEAR=2016

11
app/Exceptions/Handler.php
View File

@ -42,10 +42,15 @@ class Handler extends ExceptionHandler {
{
if (env('APP_DEBUG') != true) {
// Render nice error pages if debug is off
if ($e instanceof NotFoundHttpException){
if ($e instanceof NotFoundHttpException) {
if (env('SETTING_REDIRECT_404')) {
// Redirect 404s to SETTING_INDEX_REDIRECT
return redirect()->to(env('SETTING_INDEX_REDIRECT'));
}
// Otherwise, show a nice error page
return view('errors.404');
}
if ($e instanceof HttpException){
if ($e instanceof HttpException) {
$status_code = $e->getStatusCode();
$status_message = $e->getMessage();
@ -54,7 +59,7 @@ class Handler extends ExceptionHandler {
return view('errors.500');
}
else {
// If not 500, then render generic page
// If not 500, render generic page
return response(view('errors.generic', ['status_code' => $status_code, 'status_message' => $status_message]), $status_code);
}
}

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

@ -48,10 +48,24 @@ class LinkController extends Controller {
$link = Link::where('short_url', $short_url)
->first();
// Return 404 if link not found
if ($link == null) {
return $this->handleShortUrlNotExist();
return abort(404);
}
// Return an error if the link has been disabled
// or return a 404 if SETTING_REDIRECT_404 is set to true
if ($link->is_disabled == 1) {
if (env('SETTING_REDIRECT_404')) {
return abort(404);
}
return view('error', [
'message' => 'Sorry, but this link has been disabled by an administrator.'
]);
}
// Return a 403 if the secret key is incorrect
$link_secret_key = $link->secret_key;
if ($link_secret_key) {
if (!$secret_key) {
@ -67,36 +81,19 @@ class LinkController extends Controller {
}
}
if ($link->is_disabled == 1) {
return view('error', [
'message' => 'Sorry, but this link has been disabled by an administrator.'
]);
}
// Increment click count
$long_url = $link->long_url;
$clicks = intval($link->clicks);
if (is_int($clicks)) {
$clicks += 1;
}
$link->clicks = $clicks;
$link->save();
// Redirect to final destination
LinkHelper::processPostClick($link);
return redirect()->to($long_url);
}
private function handleShortUrlNotExist() {
$urlNotExistHandleType = env('SETTING_REDIRECT_URL_NOT_EXIST');
$urlRedirect = env('SETTING_INDEX_REDIRECT');
if (($urlNotExistHandleType == true) && ($urlRedirect)) {
return redirect()->to($urlRedirect);
} else {
return abort(404);
}
}
}

5
app/Http/Controllers/SetupController.php
View File

@ -102,8 +102,7 @@ class SetupController extends Controller {
// if true, only logged in users can shorten
$st_shorten_permission = $request->input('setting:shorten_permission');
$st_index_redirect = $request->input('setting:index_redirect');
$st_url_not_exist_handle_type = $request->input('setting:url_not_exist_handle');
$st_url_not_found_redirect = $request->input('setting:url_not_exist_redirect');
$st_redirect_404 = $request->input('setting:redirect_404');
$st_password_recov = $request->input('setting:password_recovery');
$st_base = $request->input('setting:base');
@ -145,7 +144,7 @@ class SetupController extends Controller {
'POLR_ACCT_ACTIVATION' => $polr_acct_activation,
'ST_SHORTEN_PERMISSION' => $st_shorten_permission,
'ST_INDEX_REDIRECT' => $st_index_redirect,
'ST_URL_NOT_EXIST_HANDLE_TYPE' => $st_url_not_exist_handle_type,
'ST_REDIRECT_404' => $st_redirect_404,
'ST_PASSWORD_RECOV' => $st_password_recov,
'MAIL_ENABLED' => $mail_enabled,

BIN
public/img/setup.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 612 KiB

After

Width:  |  Height:  |  Size: 1.6 MiB

10
resources/views/env.blade.php
View File

@ -54,15 +54,13 @@ POLR_ACCT_ACTIVATION={{$POLR_ACCT_ACTIVATION}}
# Set to true to require users to be logged in before shortening URLs
SETTING_SHORTEN_PERMISSION={{$ST_SHORTEN_PERMISSION}}
# You must set SETTING_INDEX_REDIRETC if SETTING_PUBLIC_INTERFACE is false
# You must set SETTING_INDEX_REDIRECT if SETTING_PUBLIC_INTERFACE is false
# Polr will redirect logged off users to this URL
SETTING_INDEX_REDIRECT={{$ST_INDEX_REDIRECT}}
# Set value to true if you want to redirect to specified URL
# when requested short URL not exist
# The SETTING_INDEX_REDIRECT will be used as redirect URL,
# if it not set it will show as error message
SETTING_REDIRECT_URL_NOT_EXIST={{$ST_URL_NOT_EXIST_HANDLE_TYPE}}
# Set to true if you wish to redirect 404s to SETTING_INDEX_REDIRECT
# Otherwise, an error message will be shown
SETTING_REDIRECT_404={{$ST_REDIRECT_404}}
# Set to true to enable password recovery
SETTING_PASSWORD_RECOV={{$ST_PASSWORD_RECOV}}

26
resources/views/setup.blade.php
View File

@ -52,7 +52,7 @@ Setup
<p>Application protocol:</p>
<input type='text' class='form-control' name='app:protocol' value='http://'>
<p>Application URL (path to Polr, no http://, or trailing slash):</p>
<p>Application URL (path to Polr; do not include http:// or trailing slash):</p>
<input type='text' class='form-control' name='app:external_url' value='yoursite.com'>
<p>Shortening Permissions:</p>
@ -61,23 +61,21 @@ Setup
<option value='true'>Only logged in users may shorten URLs</option>
</select>
<p>Show Public Interface:</p>
<p>Public Interface:</p>
<select name='setting:public_interface' class='form-control'>
<option value='true' selected='selected'>Show public interface (default)</option>
<option value='false'>Hide public interface (for private shorteners)</option>
<option value='false'>Redirect index page to redirect URL</option>
</select>
<p>
Short URL not exist handle type :
</p>
<select name='setting:url_not_exist_handle' class='form-control'>
<option value='false' selected='selected'>Show error message (Default)</option>
<option value='true'>Redirect to URL</option>
<p>404s and Disabled Short Links:</p>
<select name='setting:redirect_404' class='form-control'>
<option value='false' selected='selected'>Show an error message (default)</option>
<option value='true'>Redirect to redirect URL</option>
</select>
<p>
If public interface is hidden or short URL not exist handle type set to redirect to URL, redirect index page to:
<button data-content="Required if public interface is hidden or if you set handle not exist URL as redirect to URL. To use Polr, login by directly heading to yoursite.com/login first." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
Redirect URL:
<button data-content="Required if you wish to redirect the index page or 404s to a different website. To use Polr, login by directly heading to yoursite.com/login first." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
</p>
<input type='text' class='form-control' name='setting:index_redirect' placeholder='http://your-main-site.com'>
<p class='text-muted'>
@ -85,7 +83,7 @@ Setup
http://yoursite.com/login before you can access the index
page.
</p>
<p>
Default URL Ending Type:
<button data-content="If you choose to use pseudorandom strings, you will not have the option to use a counter-based ending." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
@ -189,7 +187,7 @@ Setup
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/simplex/bootstrap.min.css'>Crisp White</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/darkly/bootstrap.min.css'>Cloudy Night</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/cerulean/bootstrap.min.css'>Calm Skies</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/paper/bootstrap.min.css'>Android Material Design</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/paper/bootstrap.min.css'>Google Material Design</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/superhero/bootstrap.min.css'>Blue Metro</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/sandstone/bootstrap.min.css'>Sandstone</option>
<option value='//maxcdn.bootstrapcdn.com/bootswatch/3.3.6/cyborg/bootstrap.min.css'>Jet Black</option>

7
tests/IndexTest.php
View File

@ -14,11 +14,4 @@ class IndexTest extends TestCase
->see('>Sign In</a>') // Ensure log in buttons are shown when user is logged out
->dontSee('SQLSTATE'); // Ensure database connection is correct
}
public function testRequestGetNotExistShortUrl() {
$response = $this->call('GET', '/notexist');
$this->assertTrue($response->isRedirection());
$this->assertRedirectedTo(env('SETTING_INDEX_REDIRECT'));
}
}

15
tests/LinkControllerTest.php Normal file
View File

@ -0,0 +1,15 @@
<?php
class LinkControllerTest extends TestCase
{
/**
* Test LinkController
*
* @return void
*/
public function testRequestGetNotExistShortUrl() {
$response = $this->call('GET', '/notexist');
$this->assertTrue($response->isRedirection());
$this->assertRedirectedTo(env('SETTING_INDEX_REDIRECT'));
}
}