d13forme/infinity-squared
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Expanding the display of errors, with support from Luke Goh.

Browse Source
This commit is contained in:
Tom Slominski
2015-07-09 00:13:35 +01:00
parent 36ee279e18
commit c40f67c435
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/style.css
View File

@@ -228,6 +228,8 @@ input[type=submit] {
transition: background 0.5s; transition: background 0.5s;
cursor: pointer; cursor: pointer;
margin: 0; margin: 0;
padding: 7px;
display: inline-block;
} }
.button:hover, .zeroclipboard-is-hover { .button:hover, .zeroclipboard-is-hover {
@@ -240,11 +242,17 @@ input[type=submit] {
/* Output */ /* Output */
.error { .error {
color: red;
font-weight: bold;
text-align: center; text-align: center;
} }
.error p.message {
margin-bottom: 30px;
}
.error p .key {
font-weight: bold;
}
.copy-button { .copy-button {
margin-top: 2px; margin-top: 2px;
} }
@@ -308,7 +316,6 @@ svg#url-qr-code {
} }
.bookmarklet { .bookmarklet {
padding: 7px;
font-size: 1.4rem; font-size: 1.4rem;
color: black; color: black;
} }

32
result.php
View File

@@ -7,16 +7,36 @@ if ( ISQ::$general['clipboard'] ) {
$dependencies[] = 'ZeroClipboard'; $dependencies[] = 'ZeroClipboard';
}; };
function display_error($message) { function display_error( $message, $action ) {
echo '<div class="content"><p class="error">' . $message . '</p></div>'; echo '<div class="content error">';
echo '<p class="message">' . $message . '</p>';
if( !empty( $action ) ) {
echo $action;
} else {
echo '<p class="action"><a href="javascript:history.go(-1)" class="button">' . yourls__( '&larr; Go back and try again', 'isq_translation' ) . '</a></p>';
}
echo '</div>';
include('footer.php'); include('footer.php');
die(); die();
} }
if ( empty( $_REQUEST['url'] ) ) { if ( empty( $_REQUEST['url'] ) ) {
display_error( yourls__( 'You haven\'t entered a URL to shorten. Please go back and try again.', 'isq_translation' ) ); display_error( yourls__( 'You haven\'t entered a URL to shorten.', 'isq_translation' ) );
}; };
if ( !yourls_keyword_is_reserved( $_REQUEST['keyword'] ) ) {
display_error( sprintf( yourls__( 'The keyword %1$s is reserved.'), '<span class="key">' . $_REQUEST['keyword'] . '</span>' ) );
}
if( function_exists( 'advanced_reserved_urls' ) ) {
if ( advanced_reserved_urls( $_REQUEST['keyword'] ) ) {
display_error( sprintf( yourls__( 'The keyword %1$s is restricted.'), '<span class="key">' . $_REQUEST['keyword'] . '</span>' ) );
}
}
// Check what CAPTCHA method was used // Check what CAPTCHA method was used
$antispam_method = $_REQUEST['antispam_method']; $antispam_method = $_REQUEST['antispam_method'];
@@ -32,7 +52,7 @@ if ( $antispam_method == 'user_login' ) {
// What happens when the reCAPTCHA was completed incorrectly // What happens when the reCAPTCHA was completed incorrectly
if ( $recaptcha_json['success'] != 'true' ) { if ( $recaptcha_json['success'] != 'true' ) {
display_error( yourls__( 'Are you a bot? Google certainly thinks you are. Please go back and try again.', 'isq_translation' ) ); display_error( yourls__( 'Are you a bot? Google certainly thinks you are.', 'isq_translation' ) );
} }
} else if ( $antispam_method == 'basic' ) { } else if ( $antispam_method == 'basic' ) {
@@ -40,13 +60,13 @@ if ( $antispam_method == 'user_login' ) {
// Basic antispam protection fallback // Basic antispam protection fallback
// What happens when it was not completed correctly // What happens when it was not completed correctly
if ( $_REQUEST['basic_antispam'] != "" ) { if ( $_REQUEST['basic_antispam'] != "" ) {
display_error( yourls__( 'Are you a bot? The verification was not completed successfully. Please go back and try again.', 'isq_translation' ) ); display_error( yourls__( 'Are you a bot? The verification was not completed successfully.', 'isq_translation' ) );
} }
} else { } else {
// No antispam protection was detected // No antispam protection was detected
display_error( yourls__( 'Are you a bot? No antispam protection was completed successfully. Please go back and try again.', 'isq_translation' ) ); display_error( yourls__( 'Are you a bot? No antispam protection was completed successfully.', 'isq_translation' ) );
} }