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

Merge branch 'master' of https://github.com/LordBeaver/infinity-squared

Browse Source 
Conflicts:
	index.php
	result.php
This commit is contained in:
Tom Slominski
2015-03-01 20:06:24 +00:00
parent 4683e2bd3d ff9d158626
commit 26dea2e4c4
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
header.php
View File

@@ -9,8 +9,7 @@ class ISQ { public static $general = array(), $links = array(), $social = array(
// Load translations // Load translations
function isq_load_textdomain() { function isq_load_textdomain() {
yourls_load_custom_textdomain( 'isq_translation', $site . '/public/languages' ); yourls_load_custom_textdomain( 'isq_translation', '/public/languages' );
$site = YOURLS_SITE;
} }
isq_load_textdomain(); isq_load_textdomain();
?> ?>

4
index.php
View File

@@ -1,7 +1,7 @@
<?php include('header.php'); <?php include('header.php');
$url = yourls_sanitize_url( $_REQUEST['url'] ); $url = isset( $_REQUEST['url'] ) ? yourls_sanitize_url( $_REQUEST['url'] ) : '' ;
$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; $keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ) : '' ;
$title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; $title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ;
?> ?>

BIN
public/languages/isq_translation-ru_RU.mo Normal file
View File

Binary file not shown.

18
result.php
View File

@@ -1,11 +1,27 @@
<?php <?php
include('header.php'); include('header.php');
<<<<<<< HEAD
$url = yourls_sanitize_url( $_REQUEST['url'] ); $url = yourls_sanitize_url( $_REQUEST['url'] );
$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; $keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ;
=======
$resp = recaptcha_check_answer (ISQ::$recaptcha['private'],
$_SERVER["REMOTE_ADDR"],
isset($_POST["recaptcha_challenge_field"]) ? $_POST["recaptcha_challenge_field"] : '',
isset($_POST["recaptcha_response_field"]) ? $_POST["recaptcha_response_field"] : '');
if (!$resp->is_valid) {
// What happens when the CAPTCHA was entered incorrectly
die ( '<p class="error" title="' . $resp->error . '">' . yourls__( 'The reCAPTCHA wasn\'t entered correctly. Go back and try it again.', 'isq_translation' ) . '</p></div></div>' );
}
$url = isset( $_REQUEST['url'] ) ? yourls_sanitize_url( $_REQUEST['url'] ) : '';
$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ) : '' ;
>>>>>>> ff9d158626e1981bd381cda4e9ccf791b75d4dc0
$title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; $title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ;
$return = yourls_add_new_link( $url, $keyword, $title ); $return = yourls_add_new_link( $url, $keyword, $title );
$shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : '';
$message = isset( $return['message'] ) ? $return['message'] : ''; $message = isset( $return['message'] ) ? $return['message'] : '';
$title = isset( $return['title'] ) ? $return['title'] : ''; $title = isset( $return['title'] ) ? $return['title'] : '';
@@ -29,7 +45,7 @@ $qrCode = QRcode::svg($url, $qrContainerId, $saveToFile, QR_ECLEVEL_L, $imageWid
?> ?>
<!-- Error reporting --> <!-- Error reporting -->
<?php echo $error; ?> <?php isset( $error ) ? $error : ''; ?>
<!-- Default output --> <!-- Default output -->
<h2><?php yourls_e( 'Results', 'isq_translation'); ?></h2> <h2><?php yourls_e( 'Results', 'isq_translation'); ?></h2>