Merging noCAPTCHA reCAPTCHA

.gitignore

@@ -12,4 +12,4 @@
 
 # Specifically ignore the config file and the DS_Store
 public/config.php
-public/.DS_Store
+public/.DS_Store

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 public page theme for YOURLS, carefully crafted by [Tom Slominski](http://tomslominski.net/).
-================
+
-A beautiful 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.

result.php

@@ -18,6 +18,14 @@ if ($recaptcha_json['success'] != 'true') {
 	die ( '<p class="error" title="' . $resp->error . '">' . yourls__( 'Are you a bot? Google thinks so. Go back and try 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 -->