From cf7bb3ab12ab012026b2ece5fc200555ece04ea6 Mon Sep 17 00:00:00 2001
From: Tom Slominski <me@tomslominski.net>
Date: Sun, 15 Feb 2015 19:21:27 +0000
Subject: [PATCH 1/3] Updated gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8669f8b..5b7f8b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@
 
 # Specifically ignore the config file
 public/config.php
+
+# And the OS X files
+public/.DS_Store
\ No newline at end of file

From 7cd8d58f1c5e8cf0691fd765d5f3ed0077032846 Mon Sep 17 00:00:00 2001
From: Tom Slominski <me@tomslominski.net>
Date: Sun, 15 Feb 2015 19:55:10 +0000
Subject: [PATCH 2/3] Updated readme

---
 README.md | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 94cd850..6290a68 100755
--- a/README.md
+++ b/README.md
@@ -1,11 +1,28 @@
-*DO NOT update to Infinity Squared 1.4 without upgrading your YOURLS installation to 1.6*
+# Infinity Squared
 
-Infinity Squared
-================
-A beautiful theme for YOURLS, carefully crafted by [Tom Slominski](http://tomslominski.net/).
+A beautiful public page theme for YOURLS, carefully crafted by [Tom Slominski](http://tomslominski.net/).
+
+![Front page of Infinity Squared](http://i.imgur.com/KipiHAr.png)
+Front page of Infinity Squared
+
+#### **[See more screenshots](http://imgur.com/a/2aiQk)**
+
+## Features
+
+* A simple, WordPress Twenty-Ten like look;
+* User configurable options which are not overwritten on upgrade;
+* Sharers for Facebook, Twitter, Google+ and LinkedIn;
+* Unified look across all browsers and systems thanks to Formalize;
+* A fluid interface, meaning the page will look great on all displays and resolutions;
+* Ready for translations which are not overwritten on upgrade;
+* reCAPTCHA support to avoid spam.
+
+## Usage
 
 See the project's [Wiki pages](https://github.com/tomslominski/infinity-squared/wiki) at GitHub for the latest installation and upgrade instructions.
 
+## Licensing
+
 qTip 2 is dual licensed under [MIT](http://en.wikipedia.org/wiki/MIT_License) or [GPLv2](http://en.wikipedia.org/wiki/GNU_General_Public_License) licenses.
 
-Formalize, jQuery and the Infinity Squared itself are also licenced on GPLv2.
+Formalize, jQuery and the Infinity Squared itself are also licenced on GPLv2.
\ No newline at end of file

From 27cb9de93989d96da6a33a0c7c23ced71845482c Mon Sep 17 00:00:00 2001
From: "BestNa.me Labs" <info@bestna.me>
Date: Tue, 17 Feb 2015 17:37:28 +0100
Subject: [PATCH 3/3] Update result.php

Area: reCAPTCHA response check
Title: Fixes ineffective check of reCAPTCHA response
Threat level: Serious
Author: BestNa.me Labs (http://BestNa.me)
Description:
a) Problem: In the original code the check for the reCAPTCHA response was ineffective: a short URL gets generated and inserted into the DB even when the reCAPTCHA question was not answered correctly. To reproduce the problem with the original code, please enter a destination URL, but simply leave the reCAPTCHA question unanswered, and then inspect the DB right after the error message 'The reCAPTCHA wasn't entered correctly ...' has been displayed. The short URL will show up in the DB, though. This behavior (behaviour) has been observed and described by other users before.
b) Fix: Moved the call to yourls_add_new_link (and some associated lines of code) BELOW the check of the recaptcha response.
---
 result.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/result.php b/result.php
index 2bbf02c..b6765c3 100644
--- a/result.php
+++ b/result.php
@@ -1,15 +1,6 @@
 <?php
 include('header.php');
 
-$url     = yourls_sanitize_url( $_REQUEST['url'] );
-$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ;
-$title   = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ;
-$return  = yourls_add_new_link( $url, $keyword, $title );
-		
-$shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : '';
-$message  = isset( $return['message'] ) ? $return['message'] : '';
-$title    = isset( $return['title'] ) ? $return['title'] : '';
-
 $resp = recaptcha_check_answer (ISQ::$recaptcha['private'],
 								$_SERVER["REMOTE_ADDR"],
 								$_POST["recaptcha_challenge_field"],
@@ -20,6 +11,14 @@ if (!$resp->is_valid) {
 	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     = yourls_sanitize_url( $_REQUEST['url'] );
+$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ;
+$title   = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ;
+$return  = yourls_add_new_link( $url, $keyword, $title );
+		
+$shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : '';
+$message  = isset( $return['message'] ) ? $return['message'] : '';
+$title    = isset( $return['title'] ) ? $return['title'] : '';
 ?>
 
 <!-- Error reporting -->