Merge branch 'master' into nocaptcha-recaptcha

Conflicts: .gitignore result.php
Merging noCAPTCHA reCAPTCHA
2015-02-24 15:38:26 +00:00 · 2015-02-24 15:24:27 +00:00 · 2015-02-19 23:17:58 +00:00 · 2015-02-17 17:37:28 +01:00 · 2015-02-15 19:55:10 +00:00 · 2015-02-15 19:21:27 +00:00
19 changed files with 333 additions and 235 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# Ignore everything
+/*
+/*/
+
+# Except Infinity Squared
+!public/
+!index.php
+!result.php
+!header.php
+!footer.php
+!.gitignore
+
+# Specifically ignore the config file and the DS_Store
+public/config.php
+public/.DS_Store
--- 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/).

-See the project's [Wiki pages](https://github.com/tomslominski/infinity-squared) at GitHub for the latest installation and upgrade instructions.
+![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.
--- a/footer.php
+++ b/footer.php
@@ -0,0 +1,16 @@
+</div>
+<div class="paragraph">
+	<h2><?php yourls_e( 'The bookmarklet', 'isq_translation') ?></h2>
+
+	<?php $bookmarkletdialog = yourls__( 'Save this as a bookmark', 'isq_translation') // Can't put it where it belongs as there'd be too much char escaping ?>
+	<p><?php yourls_e( 'Add this to your bookmarks or drag it to your bookmarks bar to quickly access shortening functions:', 'isq_translation') ?> <a href="javascript:(function()%7Bvar%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:enc(s)),f='<?php echo YOURLS_SITE . '/index.php'; ?>',l=d.location,p='?url='+enc(l.href)+'&title='+enc(d.title)+'&keyword='+s2,u=f+p;try%7Bthrow('ozhismygod');%7Dcatch(z)%7Ba=function()%7Bif(!w.open(u))l.href=u;%7D;if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();%7Dvoid(0);%7D)();" onClick="alert('<?php echo $bookmarkletdialog ?>'); return false;" class="bookmarklet"><?php yourls_e( 'Shorten', 'isq_translation') ?></a></p>
+	<p><?php yourls_e( 'This bookmarklet takes the page URL and title and opens a new tab, where you can fill out a CAPTCHA. If you have selected text before using the bookmarklet, that will be used as the keyword.', 'isq_translation') ?></p>
+	<p><?php yourls_e( 'Support for bookmarklets on mobile varies. For example, they work on Chrome for Android but you have to add and sync them from your desktop.', 'isq_translation') ?></p>
+</div>
+
+<div class="footer">
+	<p><?php yourls_e( 'Powered by <a href="http://yourls.org/">YOURLS</a>. Design by <a href="http://tomslominski.net/">Tom Slominski</a>. Also used: <a href="http://formalize.me/">Formalize</a> and <a href="http://qtip2.com/">qTip²</a>. Find this theme on <a href="https://github.com/tomslominski/infinity-squared">GitHub</a>.', 'isq_translation') ?></p>
+</div>
+</div>
+</body>
+</html>
--- a/header.php
+++ b/header.php
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<?php
+// Start YOURLS engine
+require_once( dirname(__FILE__).'/includes/load-yourls.php' );
+
+// Ask for Infinity Squared settings
+include( dirname(__FILE__).'/public/config.php' );
+class ISQ { public static $general = array(), $links = array(), $social = array(), $recaptcha = array(); }
+
+// Load translations
+function isq_load_textdomain() {
+    yourls_load_custom_textdomain( 'isq_translation', $site . '/public/languages' );
+    $site = YOURLS_SITE;
+}
+isq_load_textdomain();
+?>
+
+<html>
+<head>
+<title><?php echo ISQ::$general['name']; ?></title> <!-- Site title defined in theme settings -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
+<link rel="shortcut icon" href="<?php echo YOURLS_SITE; ?>/images/favicon.gif" /> <!-- Default favicon -->
+<link rel="stylesheet" href="<?php echo YOURLS_SITE; ?>/public/formalize.css" /> <!-- Formalize CSS -->
+<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/qtip2/2.1.1/basic/jquery.qtip.min.css" /><!-- qTip CSS -->
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic"><!-- Ubuntu from Google Web Fonts -->
+<link rel="stylesheet" href="<?php echo YOURLS_SITE; ?>/public/style.css" /><!-- Theme CSS -->
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <!-- jQuery -->
+<script src="<?php echo YOURLS_SITE; ?>/public/js/jquery.formalize.min.js"></script><!-- Formalize JS -->
+<script src="http://cdnjs.cloudflare.com/ajax/libs/qtip2/2.1.1/basic/jquery.qtip.min.js"></script><!-- qTip JS -->
+<?php if (!empty(ISQ::$social['plus'])) { ?>
+<script type="text/javascript" src="https://apis.google.com/js/plusone.js">
+  {lang: "en-GB"}
+</script>
+<?php } ?>
+<script src='https://www.google.com/recaptcha/api.js'></script><!-- reCAPTCHA -->
+<?php if (!empty(ISQ::$general['clipboard'])) { ?>
+<script type="text/javascript" src="js/jquery.zclip.min.js"></script>
+<script>
+$(document).ready(function(){
+    $('button#long-copy').zclip({
+        path:'js/ZeroClipboard.swf',
+        copy:function(){return $('input#long-copy').val();},
+        afterCopy: function() {
+        	$("button#long-copy").html('<?php yourls_e( 'Copied!', 'isq_translation'); ?>');
+        }
+    });
+    $('button#short-copy').zclip({
+        path:'js/ZeroClipboard.swf',
+        copy:function(){return $('input#short-copy').val();},
+        afterCopy: function() {
+        	$("button#short-copy").html('<?php yourls_e( 'Copied!', 'isq_translation'); ?>');
+        }
+    });
+    $('button#stats-copy').zclip({
+        path:'js/ZeroClipboard.swf',
+        copy:function(){return $('input#stats-copy').val();},
+        afterCopy: function() {
+        	$("button#stats-copy").html('<?php yourls_e( 'Copied!', 'isq_translation'); ?>');
+        }
+    });
+});
+</script>
+<?php } ?>
+<script>
+$(document).ready(function()
+{
+	$('a.bookmarklet').qtip({
+	});
+	$('label').qtip({
+	});
+});
+</script>
+</head>
+
+<body>
+
+<div id="container">
+<header>
+	<h1><a href="<?php echo YOURLS_SITE; ?>"><?php echo ISQ::$general['name']; ?></a></h1>
+	<ul class="menu">
+		<li><a href="<?php echo YOURLS_SITE; ?>"><?php echo ISQ::$general['name']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_1']; ?>"><?php echo ISQ::$links['name_1']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_2']; ?>"><?php echo ISQ::$links['name_2']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_3']; ?>"><?php echo ISQ::$links['name_3']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_4']; ?>"><?php echo ISQ::$links['name_4']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_5']; ?>"><?php echo ISQ::$links['name_5']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_6']; ?>"><?php echo ISQ::$links['name_6']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_7']; ?>"><?php echo ISQ::$links['name_7']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_8']; ?>"><?php echo ISQ::$links['name_8']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_9']; ?>"><?php echo ISQ::$links['name_9']; ?></a></li>
+		<li><a href="<?php echo ISQ::$links['url_10']; ?>"><?php echo ISQ::$links['name_10']; ?></a></li>
+	</ul>
+</header>
+
+<div class="paragraph">
--- a/index.php
+++ b/index.php
@@ -1,196 +1,20 @@
-<!DOCTYPE html>
-<?php 
-// Start YOURLS engine
-require_once( dirname(__FILE__).'/includes/load-yourls.php' );
-
-// Ask for Infinity Squared settings
-require_once( dirname(__FILE__).'/public/config.php' );
-class ISQ { public static $general = array(), $links = array(), $social = array(); }
-
-// Translations stuff
-function isq_load_textdomain() {
-    yourls_load_custom_textdomain( 'isq_translation', $site . '/public/languages' );
-    $site = YOURLS_SITE;
-}
-isq_load_textdomain();
-
-// Settings definitions
-$ISQtitle = ISQ::$general['name'];
-$ISQname_1= ISQ::$links['name_1'];
-$ISQurl_1= ISQ::$links['url_1'];
-$ISQname_2= ISQ::$links['name_2'];
-$ISQurl_2= ISQ::$links['url_2'];
-$ISQname_3= ISQ::$links['name_3'];
-$ISQurl_3= ISQ::$links['url_3'];
-$ISQname_4= ISQ::$links['name_4'];
-$ISQurl_4= ISQ::$links['url_4'];
-$ISQname_5= ISQ::$links['name_5'];
-$ISQurl_5= ISQ::$links['url_5'];
-$ISQname_6= ISQ::$links['name_6'];
-$ISQurl_6= ISQ::$links['url_6'];
-$ISQname_7= ISQ::$links['name_7'];
-$ISQurl_7= ISQ::$links['url_7'];
-$ISQname_8= ISQ::$links['name_8'];
-$ISQurl_8= ISQ::$links['url_8'];
-$ISQname_9= ISQ::$links['name_9'];
-$ISQurl_9= ISQ::$links['url_9'];
-$ISQname_10= ISQ::$links['name_10'];
-$ISQurl_10= ISQ::$links['url_10'];
-
-// Error definitions
-
-$genericerror = '<h2 class="error">' . yourls__( 'An error has occured :(', 'isq_translation') . '</h2>';
-
-if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) {
-		$error = '<h2>' . yourls__( 'URL shortened successfully', 'isq_translation') . '</h2><p>' . yourls__( 'View the details of your short URL below.', 'isq_translation') . '</p>';
-	} elseif ( $message = $url. yourls__( 'already exists in database', 'isq_translation') ) {
-		$error = $genericerror . '<p class="error">' . yourls__( 'This URL already exists in this database. This website does not allow a single URL to have multiple short links.', 'isq_translation') . '</p>';
-	} elseif ( $message = yourls__( 'Short URL', 'isq_translation') . $url . yourls__( 'already exists in database or is reserved', 'isq_translation') ) {
-		$error = $genericerror . '<p class="error">' . yourls__( 'This short URL already exists in this database or is reserved. This website does not allow a single URL to have multiple short links. It could\'ve also been reserved by the admin.', 'isq_translation') . '</p>';
-	} elseif ( $message = yourls__( 'Missing URL input', 'isq_translation') ) {
-		$error = $genericerror . '<p class="error">' . yourls__( 'You did not enter the URL you want to shorten or the server lost it. Please try again.', 'isq_translation') . '</p>';
-	} elseif ( $message = yourls__( 'This URL is a short URL', 'isq_translation') ) {
-		$error = $genericerror . '<p class="error">' . yourls__( 'You cannot shorten a short URL!', 'isq_translation') . '</p>';
-	}
-?>
-
-<html>
-<head>
-<title><?php echo $ISQtitle; ?></title> <!-- Site title defined in theme settings -->
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
-<link rel="stylesheet" href="<?php echo YOURLS_SITE; ?>/public/formalize.css" /> <!-- Formalize CSS -->
-<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/qtip2/2.1.1/basic/jquery.qtip.min.css" /><!-- qTip CSS -->
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic"><!-- Ubuntu from Google Web Fonts -->
-<link rel="stylesheet" href="<?php echo YOURLS_SITE; ?>/public/style.css" /><!-- Theme CSS -->
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <!-- jQuery -->
-<script src="<?php echo YOURLS_SITE; ?>/public/js/jquery.formalize.min.js"></script><!-- Formalize JS -->
-<script src="http://cdnjs.cloudflare.com/ajax/libs/qtip2/2.1.1/basic/jquery.qtip.min.js"></script><!-- qTip JS -->
-<?php if (!empty(ISQ::$social['plus'])) { ?>
-<script type="text/javascript" src="https://apis.google.com/js/plusone.js">
-  {lang: "en-GB"}
-</script>
-<?php } ?>
-<script>
-$(document).ready(function()
-{
-	$('a.bookmarklet').qtip({
-	});
-	$('label').qtip({
-	});
-});
-</script>
-</head>
-
-<body>
-
-<div id="container">
-<header>
-<h1><a href="<?php echo YOURLS_SITE; ?>"><?php echo $ISQtitle; ?></a></h1>
-<ul class="menu">
-	<li><a href="<?php echo $ISQurl_1; ?>"><?php echo $ISQname_1; ?></a></li>
-	<li><a href="<?php echo $ISQurl_2; ?>"><?php echo $ISQname_2; ?></a></li>
-	<li><a href="<?php echo $ISQurl_3; ?>"><?php echo $ISQname_3; ?></a></li>
-	<li><a href="<?php echo $ISQurl_4; ?>"><?php echo $ISQname_4; ?></a></li>
-	<li><a href="<?php echo $ISQurl_5; ?>"><?php echo $ISQname_5; ?></a></li>
-	<li><a href="<?php echo $ISQurl_6; ?>"><?php echo $ISQname_6; ?></a></li>
-	<li><a href="<?php echo $ISQurl_7; ?>"><?php echo $ISQname_7; ?></a></li>
-	<li><a href="<?php echo $ISQurl_8; ?>"><?php echo $ISQname_8; ?></a></li>
-	<li><a href="<?php echo $ISQurl_9; ?>"><?php echo $ISQname_9; ?></a></li>
-	<li><a href="<?php echo $ISQurl_10; ?>"><?php echo $ISQname_10; ?></a></li>
-</ul>
-</header>
-	<div class="paragraph">
-	<?php
-
-	// Part to be executed if FORM has been submitted
-	if ( isset($_REQUEST['url']) ) {
-
-		$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'] : '';
-
-		if (!empty(ISQ::$social['facebook'])) { $ISQfacebook = '<a href="http://facebook.com/sharer.php?u=$shorturl" class="share-button" target="_blank"><img src="public/img/facebook.png" alt="Facebook" width="55px" height="62px" /></a>'; }
-		if (!empty(ISQ::$social['twitter'])) { $ISQtwitter = '<a href="http://twitter.com/share" class="twitter-share-button" data-url="$shorturl" data-text="$title" data-count="vertical">Tweet</a><script src="http://platform.twitter.com/widgets.js"></script>'; }
-		if (!empty(ISQ::$social['plus'])) { $ISQplus = '<div class="g-plus" data-action="share" data-annotation="vertical-bubble" data-height="62" data-href="$shorturl"></div>'; }
-		if (!empty(ISQ::$social['linkedin'])) { $ISQlinkedin = '<script src="http://platform.linkedin.com/in.js"></script><script type="IN/Share" data-url="$shorturl" data-counter="top"></script>'; }
-		if (!empty(ISQ::$general['qr'])) { $ISQqr = '<h2>' . yourls__( 'QR code', 'isq-translation' ) . '</h2><p>' . yourls__( 'Share your code with external devices', 'isq-translation' ) . '</p><img class="qr" src="https://chart.googleapis.com/chart?cht=qr&chs=250x250&chl=$shorturl&chld=L|0" alt="QR" width="250px" height="250px" />'; }
-
-		$output_original = yourls__( 'Original URL:', 'isq_translation');
-		$output_short = yourls__( 'Short URL:', 'isq_translation');
-		/* translators: This is short for statistics */
-		$output_stats = yourls__( 'Stats:', 'isq_translation');
-		$output_copy = yourls__( 'Click on a link and press Ctrl+C to quickly copy it', 'isq_translation');
-		$output_share_h2 = yourls__( 'Share', 'isq_translation');
-		$output_share_p = yourls__( 'Share your short URL', 'isq_translation');
-
-		echo <<<RESULT
-		$error
-		<div class="output">
-		<p><label>$output_original</label> <input type="text" name="shorturl" onclick="this.select();" onload="this.select();" value="$url"></p>
-		<p><label>$output_short</label> <input type="text" name="shorturl" onclick="this.select();" onload="this.select();" value="$shorturl"></p>
-		<p><label>$output_stats</label> <input type="text" name="shorturl" onclick="this.select();" onload="this.select();" value="$shorturl+"></p>
-		<p class="desktop-only">$output_copy</p>
-		</div>
-
-		$ISQqr
-
-		<h2>$output_share_h2</h2>
-		<p>$output_share_p</p>
-		$ISQfacebook
-		$ISQtwitter
-		$ISQplus
-		$ISQlinkedin
-RESULT;
-
-	// Part to be executed when no form has been submitted
-	} else {
-	
-		$site = YOURLS_SITE;
-
-		$site_enter = yourls__( 'Enter a new URL to shorten', 'isq_translation');
-		$site_hover = yourls__( 'Hover over the labels to see more information', 'isq_translation');
-		$site_long = yourls__( 'Long URL (required):', 'isq_translation');
-		$site_long_hover = yourls__( 'Paste the long URL here', 'isq_translation');
-		$site_keyword = yourls__( 'Custom keyword:', 'isq_translation');
-		$site_keyword_hover = yourls__( 'A keyword replaces the default short string', 'isq_translation');
-		$site_title = yourls__( 'Optional title:', 'isq_translation');
-		$site_title_hover = yourls__( 'Optional title used when sharing a link from YOURLS', 'isq_translation');
-		$site_submit = yourls__( 'Shorten', 'isq_translation');
-
-		echo <<<HTML
-		<h2>$site_enter</h2>
-		<h3>$site_hover</h3>
-		<form method="post" action="">
-		<p><label for="url" title="$site_long_hover">$site_long</label> <input type="text" id="url" class="right" name="url" /></p>
-		<p><label for="keyword" title="$site_keyword_hover">$site_keyword</label> <input type="text" id="keyword" class="right" name="keyword" /></p>
-		<p><label for="title" title="$site_title_hover">$site_title</label> <input type="text" id="title" class="right" name="title" /></p>
-		<p><input type="submit" value="$site_submit" /></p>
-		</form>
-HTML;
-
-	}
-	?>
-	</div>
-
-<div class="paragraph desktop-only">
-<h2><?php yourls_e( 'The bookmarklets', 'isq_translation') ?></h2>
-<p><?php yourls_e( 'To use the bookmarklets drag them to your bookmark bar or simply right click on them and select the appropriate option.', 'isq_translation') ?></p>
-
-<a href="javascript:(function()%7Bvar%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:enc(s)),f='<?php echo $page; ?>',l=d.location,p='?url='+enc(l.href)+'&title='+enc(d.title)+'&text='+s2,u=f+p;try%7Bthrow('ozhismygod');%7Dcatch(z)%7Ba=function()%7Bif(!w.open(u))l.href=u;%7D;if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();%7Dvoid(0);%7D)()" title="<?php yourls_e( 'Shortens the URL of the current site and opens a new tab with the details of the shortened URL.', 'isq_translation') ?>" class="bookmarklet"><?php yourls_e( 'Simple Shorten', 'isq_translation') ?></a>
-<a href="javascript:(function()%7Bvar%20d=document,s=d.createElement('script');window.yourls_callback=function(r)%7Bif(r.short_url)%7Bprompt(r.message,r.short_url);%7Delse%7Balert('An%20error%20occured:%20'+r.message);%7D%7D;s.src='<?php echo $page; ?>?url='+encodeURIComponent(d.location.href)+'&jsonp=yourls';void(d.body.appendChild(s));%7D)();" title="<?php yourls_e( 'Opens a pop up with the short URL for the current page.', 'isq_translation') ?>" class="bookmarklet"><?php yourls_e( 'Instant Shorten', 'isq_translation') ?></a>
-<a href="javascript:(function()%7Bvar%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:enc(s)),f='<?php echo $page; ?>',l=d.location,k=prompt(%22Custom%20URL%22),k2=(k?'&keyword='+k:%22%22),p='?url='+enc(l.href)+'&title='+enc(d.title)+'&text='+s2+k2,u=f+p;if(k!=null)%7Btry%7Bthrow('ozhismygod');%7Dcatch(z)%7Ba=function()%7Bif(!w.open(u))l.href=u;%7D;if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();%7Dvoid(0)%7D%7D)()" title="<?php yourls_e( 'Opens a popup which asks for the keyword for the current URL and opens a new tab with the details of the shortened URL.', 'isq_translation') ?>" class="bookmarklet" ><?php yourls_e( 'Custom Shorten', 'isq_translation') ?></a>
-<a href="javascript:(function()%7Bvar%20d=document,k=prompt('Custom%20URL'),s=d.createElement('script');if(k!=null){window.yourls_callback=function(r)%7Bif(r.short_url)%7Bprompt(r.message,r.short_url);%7Delse%7Balert('An%20error%20occured:%20'+r.message);%7D%7D;s.src='<?php echo $page; ?>?url='+encodeURIComponent(d.location.href)+'&keyword='+k+'&jsonp=yourls';void(d.body.appendChild(s));%7D%7D)();" title="<?php yourls_e( 'This prompts you for the keyword for the current page and then opens a pop up with the short URL of the current page.', 'isq_translation') ?>" class="bookmarklet"><?php yourls_e( 'Instant Custom Shorten', 'isq_translation') ?></a>
-</div>
-
-<div class="footer">
-<p><?php yourls_e( 'Powered by <a href="http://yourls.org/">YOURLS</a>. Design by <a href="http://tomslominski.net/">Tom Slominski</a>. Also used: <a href="http://formalize.me/">Formalize</a> and <a href="http://qtip2.com/">qTip²</a>. Find this theme on <a href="https://github.com/tomslominski/infinity-squared">GitHub</a>.', 'isq_translation') ?></p>
-</div>
-</div>
-</body>
-</html>
+<?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'] ) : '' ;
+
+?>
+
+<h2><?php yourls_e( 'Enter a new URL to shorten', 'isq_translation'); ?></h2>
+<h3><?php yourls_e( 'Hover over the labels to see more information', 'isq_translation'); ?></h3>
+<form method="post" action="result.php">
+	<p><label for="url" title="<?php yourls_e( 'Paste the long URL here', 'isq_translation'); ?>"><?php yourls_e( 'Long URL (required):', 'isq_translation'); ?></label> <input type="text" id="url" class="right" name="url" value="<?php echo($url); ?>" /></p>
+	<p><label for="keyword" title="<?php yourls_e( 'A keyword replaces the default short string', 'isq_translation'); ?>"><?php yourls_e( 'Custom keyword:', 'isq_translation'); ?></label> <input type="text" id="keyword" class="right" name="keyword" value="<?php echo($keyword); ?>" /></p>
+	<p><label for="title" title="<?php yourls_e( 'Optional title used when sharing a link from YOURLS using social sharers', 'isq_translation'); ?>"><?php yourls_e( 'Optional title:', 'isq_translation'); ?></label> <input type="text" id="title" class="right" name="title" value="<?php echo($title); ?>" /></p>
+	<div class="recaptcha-container"><label title="<?php yourls_e( 'Verification used to ensure the user is not a bot', 'isq_translation'); ?>"><?php yourls_e( 'reCAPTCHA:', 'isq_translation'); ?></label> <div class="g-recaptcha right" data-sitekey="<?php echo ISQ::$recaptcha['sitekey']; ?>"></div></div>
+
+	<p><input type="submit" value="<?php yourls_e( 'Shorten', 'isq_translation'); ?>" /></p>
+</form>
+
+<?php include('footer.php'); ?>
--- a/public/CHANGELOG.md
+++ b/public/CHANGELOG.md
--- a/public/config-sample.php
+++ b/public/config-sample.php
@@ -1,10 +1,13 @@
 <?php
+
+// Copy and rename your file to config.php in this directory to edit your settings
+
 // General settings
 // 1 to enable, 0 to disable
 ISQ::$general = array(
-	'name' => 'kwl.me', // The name of your URL shortener
+	'name' => 'URL shortener', // The name of your URL shortener
 	'qr' => 1, // Do you want to display a QR code?
-	'mobile' => 0 // Do you want to enable the mobile version?
+	'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash)
 );

 // Menu- The width of ∞² menu allows you to have about 10 links
@@ -38,6 +41,14 @@ ISQ::$social = array(
 	'facebook' => 1,
 	'twitter' => 1,
 	'plus' => 1,
-	'linkedin' => 1
+	'linkedin' => 1,
+	'tumblr' => 1
+);
+
+// reCAPTCHA API keys
+// Get yourls from https://www.google.com/recaptcha/admin
+ISQ::$recaptcha = array(
+	'sitekey' => '',
+	'secret' => ''
 );
 ?>
--- a/public/fonts/icons.svg
+++ b/public/fonts/icons.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icons" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#xe600;" d="M512 221.714q0-7.428-5.428-12.857l-73.143-73.143q-5.428-5.428-12.857-5.428t-12.857 5.428-5.428 12.857v36.572h-109.714v-109.714h36.572q7.428 0 12.857-5.428t5.428-12.857-5.428-12.857l-73.143-73.143q-5.428-5.429-12.857-5.429t-12.857 5.429l-73.143 73.143q-5.428 5.428-5.428 12.857t5.428 12.857 12.857 5.428h36.571v109.714h-109.715v-36.572q0-7.428-5.428-12.857t-12.857-5.428-12.857 5.428l-73.143 73.143q-5.428 5.428-5.428 12.857t5.428 12.857l73.143 73.143q5.428 5.428 12.857 5.428t12.857-5.428 5.428-12.857v-36.571h109.715v109.714h-36.572q-7.428 0-12.857 5.428t-5.429 12.857 5.428 12.857l73.143 73.143q5.429 5.428 12.857 5.428t12.857-5.428l73.143-73.143q5.428-5.429 5.428-12.857t-5.428-12.857-12.857-5.428h-36.572v-109.714h109.714v36.572q0 7.428 5.428 12.857t12.857 5.428 12.857-5.428l73.143-73.143q5.428-5.429 5.428-12.857z" />
+</font></defs></svg>
--- a/public/fonts/icons.ttf
+++ b/public/fonts/icons.ttf
--- a/public/fonts/icons.woff
+++ b/public/fonts/icons.woff
--- a/public/formalize.css
+++ b/public/formalize.css
--- a/public/img/button.png
+++ b/public/img/button.png
--- a/public/img/facebook.png
+++ b/public/img/facebook.png
--- a/public/img/noise.png
+++ b/public/img/noise.png
--- a/public/img/select_arrow.gif
+++ b/public/img/select_arrow.gif
--- a/public/img/tumblr.png
+++ b/public/img/tumblr.png
--- a/public/js/jquery.formalize.min.js
+++ b/public/js/jquery.formalize.min.js
--- a/public/style.css
+++ b/public/style.css
@@ -3,6 +3,21 @@ Infinity Squared CSS
 https://github.com/tomslominski/infinity-squared
 */

+/* Structure */
+body {
+	background: #F1F1F1;
+	color: black;
+	font-family: 'Ubuntu', sans-serif, Helvetica, Arial;
+	font-size: 62.5%;
+}
+
+#container {
+	width: 60%;
+	min-width: 720px;
+	margin: 0 auto;
+	background-color: white;
+}
+
 /* General */
 ::selection {
 	background: rgba(1,63,109,0.7);
@@ -29,23 +44,30 @@ a, a:visited, .footer a, .footer a:visited {
 	text-decoration: none;
 }

-p {
+p, a {
 	font-size: 1.2em;
 }

-/* Structure */
-body {
-	background: #F1F1F1;
-	color: black;
-	font-family: 'Ubuntu', sans-serif, Helvetica, Arial;
-	font-size: 62.5%;
+@font-face {
+	font-family: 'icons';
+	src:url('fonts/icons.woff') format('woff'),
+		url('fonts/icons.ttf') format('truetype'),
+		url('fonts/icons.svg#icons') format('svg');
+	font-weight: normal;
+	font-style: normal;
 }

-#container {
-	width: 60%;
-	min-width: 720px;
-	margin: 0 auto;
-	background-color: white;
+[class^="icon-"], [class*=" icon-"] {
+	font-family: 'icons';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }

 /* Header */
@@ -88,7 +110,6 @@ h1 a:hover {
 	color: white;
 	padding: 0 2% 0 2%;
 	margin-bottom: 30px;
-	font-size: 1.2em;
 }

 .menu a {
@@ -134,22 +155,24 @@ h2 {
 	float: right;
 }

-a.bookmarklet {
-	border-radius: 11px;
-	background: #ddd url(../img/button.png) repeat-x;
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(1, #ddd));
-	background: -moz-linear-gradient(top center, #fff 0%, #ddd 100%);
-	border: 1px solid;
-	border-color: #ddd #bbb #999;
-	cursor: pointer;
-	color: #333;
-	font: bold 12px/1.2 Arial, sans-serif;
-	outline: 0;
-	overflow: visible;
-	padding: 3px 10px 4px;
-	text-shadow: #fff 0 1px 1px;
-	text-decoration: none;
-	margin-right: 2%;
+.radio {
+	margin-right: 10%;
+}
+
+input[type="radio"] {
+	margin-right: 1%;
+}
+
+.bookmarklet:before {
+	font-family: 'icons';
+	content: "\e600";
+	margin: 2px;
+}
+
+/* reCAPTCHA */
+.recaptcha-container {
+	font-size: 1.2em;
+	overflow: hidden;
 }

 /* Tooltips */
@@ -178,6 +201,31 @@ a.bookmarklet {

 .error {
 	color: red;
+	padding-bottom: 20px;
+	font-weight: bold;
+	text-align: center;
+	font-size: 1.2rem;
+}
+
+.social-sharer {
+	display: inline-block;
+	padding: 0 2px;
+}
+
+.output label {
+	width: 20%;
+}
+
+.output input {
+	width: 60%
+}
+
+.output button {
+	float: right;
+}
+
+.output button.active {
+	color:#013F6D;
 }

 /* Footer */
@@ -193,6 +241,10 @@ a.bookmarklet {
 	font-size: 1.1em;
 }

+.footer a {
+	font-size: 1.1em;
+}
+
 .footer a:hover {
 	text-decoration: none;
 	border-bottom: dashed 1px #013F6D;
@@ -221,7 +273,20 @@ header {
 	margin-top:0;
 }

-.desktop-only {
+.desktop-only, .zclip {
 	display:none;
 }
 }
+
+/* Error page */
+#wrap > h1 > a {
+	display: none;
+}
+
+#wrap > h2,
+#wrap > p {
+	color: red;
+}
+
+/* Importing custom user styles */
+@import url("public/user-style.css");
--- a/result.php
+++ b/result.php
@@ -0,0 +1,43 @@
+<?php
+include('header.php');
+
+if ($recaptcha_json['success'] != 'true') {
+	// What happens when the CAPTCHA was entered incorrectly
+	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 -->
+<?php echo $error; ?>
+
+<!-- Default output -->
+<h2><?php yourls_e( 'Results', 'isq_translation'); ?></h2>
+<p><?php yourls_e( 'View your short URL', 'isq_translation'); ?></p>
+<div class="output">
+	<p><label for="longurl"><?php yourls_e( 'Original URL:', 'isq_translation'); ?></label> <input type="text" name="longurl" onclick="this.select();" onload="this.select();" value="<?php echo $url; ?>" id="long-copy"> <?php if (!empty(ISQ::$general['clipboard'])) { echo '<button id="long-copy" data-clipboard-target="long-copy" class="desktop-only">' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . '</button>'; } ?> </p>
+	<p><label for="shorturl"><?php yourls_e( 'Short URL:', 'isq_translation'); ?></label> <input type="text" name="shorturl" onclick="this.select();" onload="this.select();" value="<?php echo $shorturl; ?>" id="short-copy"> <?php if (!empty(ISQ::$general['clipboard'])) { echo '<button id="short-copy" data-clipboard-target="short-copy" class="desktop-only">' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . '</button>'; } ?> </p>
+	<p><label for="stats"><?php /* translators: This is short for statistics */ yourls_e( 'Stats:', 'isq_translation'); ?></label> <input type="text" name="stats" onclick="this.select();" onload="this.select();" value="<?php echo $shorturl . '+'; ?>" id="stats-copy"> <?php if (!empty(ISQ::$general['clipboard'])) { echo '<button id="stats-copy" data-clipboard-target="stats-copy" class="desktop-only">' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . '</button>'; } ?> </p>
+	<p class="desktop-only"><?php yourls_e( 'Click on a link and press Ctrl+C to quickly copy it.', 'isq_translation'); ?></p>
+</div>
+
+<!-- QR code -->
+<?php if (!empty(ISQ::$general['qr'])) { echo '<h2>' . yourls__( 'QR code', 'isq-translation' ) . '</h2><p>' . yourls__( 'Share your link with external devices', 'isq-translation' ) . '</p><img class="qr" src="https://chart.googleapis.com/chart?cht=qr&chs=250x250&chl=$shorturl&chld=L|0" alt="QR" width="250px" height="250px" />'; } ?>
+
+<!-- Social sharers -->
+<h2><?php yourls_e( 'Share', 'isq_translation'); ?></h2>
+<p><?php yourls_e( 'Share your short URL', 'isq_translation'); ?></p>
+<?php if (!empty(ISQ::$social['facebook'])) { echo '<div class="social-sharer"><a href="http://facebook.com/sharer.php?u=' . $shorturl . '" class="share-button" target="_blank"><img src="public/img/facebook.png" alt="Facebook" width="55px" height="62px" /></a></div>'; } ?>
+<?php if (!empty(ISQ::$social['twitter'])) { echo '<div class="social-sharer"><a href="http://twitter.com/share" class="twitter-share-button" data-url="' . $shorturl . '" data-text="'. $title .'" data-count="vertical">Tweet</a><script src="http://platform.twitter.com/widgets.js"></script></div>'; } ?>
+<?php if (!empty(ISQ::$social['plus'])) { echo '<div class="g-plus social-sharer" data-action="share" data-annotation="vertical-bubble" data-height="62" data-href="' . $shorturl . '"></div>'; } ?>
+<?php if (!empty(ISQ::$social['linkedin'])) { echo '<div class="social-sharer"><script src="http://platform.linkedin.com/in.js"></script><script type="IN/Share" data-url="' . $shorturl . '" data-counter="top"></script></div>'; } ?>
+<?php if (!empty(ISQ::$social['tumblr'])) { echo '<a href="http://www.tumblr.com/share/link?url='. urlencode($shorturl) .'&name='. urlencode($title) .'" title="Share on Tumblr"><img src="public/img/tumblr.png" alt="Share on Tumblr" width="55px" height="62px" /></a>'; } ?>
+<?php include('footer.php'); ?>
Author	SHA1	Message	Date
Tom Slominski	af9b2ac48d	Merge branch 'master' into nocaptcha-recaptcha Conflicts: .gitignore result.php	2015-02-24 15:38:26 +00:00
Tom Slominski	770f24786b	Merging noCAPTCHA reCAPTCHA	2015-02-24 15:24:27 +00:00
Tom Slominski	bf408d12fc	Merge pull request #11 from BstName/bugfix Bugfix in result.php: fixes ineffective check of reCAPTCHA response	2015-02-19 23:17:58 +00:00
BestNa.me Labs	27cb9de939	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.	2015-02-17 17:37:28 +01:00
Tom Slominski	7cd8d58f1c	Updated readme	2015-02-15 19:55:10 +00:00
Tom Slominski	cf7bb3ab12	Updated gitignore	2015-02-15 19:21:27 +00:00
Tom Slominski	1ff153dad9	Upgrade to Google's no CAPTCHA reCAPTCHA Not tested this very well, but it seems to be working anyway…	2015-01-31 00:01:01 +00:00
Tom Slominski	f5ac64c570	Removing the left over bookmarklet code reduces spam by further 25%, say completely unscientific studies.	2014-01-06 19:34:12 +00:00
Tom Slominski	50308c2783	More reliably attaching the reCAPTCHA library	2014-01-06 19:26:47 +00:00
Tom Slominski	daaeebfcda	Revert "Allowing the user to add their own CSS" This reverts commit `be5287c8b6`. Forgot I already added this :P	2013-12-31 01:50:46 +00:00
Tom Slominski	48f480ae7d	Merge pull request #6 from tomslominski/dev Merging all the changes for this release together	2013-12-30 17:26:23 -08:00
Tom Slominski	38e6ca4f98	Merge pull request #5 from tomslominski/two-page Merging all the changes for this release together	2013-12-30 17:22:34 -08:00
Tom Slominski	7c4138e3a4	Merge pull request #4 from tomslominski/two-page-onwards Merging all the changes for this release together	2013-12-30 17:21:30 -08:00
Tom Slominski	be5287c8b6	Allowing the user to add their own CSS	2013-12-31 01:16:36 +00:00
Tom Slominski	ddd23ad4e4	Ensuring font size is consistent	2013-12-31 01:11:36 +00:00
Tom Slominski	16d0500cc5	Reducing the amount of PHP if's.	2013-12-31 01:00:00 +00:00
Tom Slominski	94bcee59ec	Giving the results a heading	2013-12-31 00:56:00 +00:00
Tom Slominski	14f293a2e1	Final corrections to the goddamn sharing buttons...	2013-12-31 00:54:22 +00:00
Tom Slominski	06f475d075	Have a Tumblr button. I cannot deal with any more social sharing button pain :( But the Tumblr one is relatively easy to use, unlike coughFacebookcough.	2013-12-31 00:49:52 +00:00
Tom Slominski	bde1a92c19	Added a more meaningful description to the twitter sharer	2013-12-31 00:28:06 +00:00
Tom Slominski	7b5e477585	Adding a default favicon	2013-12-30 23:33:23 +00:00
Tom Slominski	cc8cdcc9cd	New bookmarklet button	2013-12-30 23:27:33 +00:00
Tom Slominski	b3cc086649	An improved .gitignore thanks to http://stackoverflow.com/a/3694877/1432333	2013-12-30 23:26:38 +00:00
Tom Slominski	bd499e0e1d	Commiting updated .gitignore allowing me to push more files	2013-12-30 23:13:55 +00:00
Tom Slominski	c70df5b4d6	New bookmarklet	2013-12-29 23:25:23 +00:00
Tom Slominski	8c4da404f6	Merge branch 'two-page-onwards' of https://github.com/tomslominski/infinity-squared into two-page-onwards	2013-12-29 22:10:01 +00:00
Tom Slominski	ab37632469	Preparing the index page for the new bookmarklet. The new bookmarklet just takes details of the page you're on and places them in the fields, allowing the user to modify things before submitting the link and fill out a CAPTCHA, avoiding spam.	2013-12-29 22:09:21 +00:00
Tom Slominski	f31ec32821	Merge pull request #3 from tomslominski/recaptcha-ssl Editing the reCAPTCHA library so that it dynamically checks whether the site is using SSL or not- allowing reCAPTCHA to be displayed on both	2013-12-29 10:54:25 -08:00
Tom Slominski	d2a2966390	Removing boolean and popping some documentation down	2013-12-29 18:31:55 +00:00
Tom Slominski	1e8eb9fe08	Adding proper SSL checking, maybe?	2013-12-29 18:30:08 +00:00
Tom Slominski	e3823abefb	Adding some ;	2013-11-24 21:37:24 +00:00
Tom Slominski	2423d8036f	Moving up some definitions to fix the bookmarklets (thanks Sam Tran!)	2013-11-24 21:35:51 +00:00
Tom Slominski	7dc37d4de7	For some reason git wouldn't include a file if I didn't specifically include it in .gitignore, even though other files push...	2013-11-13 16:48:31 +00:00
Tom Slominski	2b9ab972ce	Hiding flash copy on mobile devices	2013-11-13 16:46:27 +00:00
Tom Slominski	9ec1bbe529	Changing the reCAPTCHA theme since the clear one doesn't fit on mobile phones...	2013-11-02 19:27:55 +00:00
Tom Slominski	10af3dbe1c	Since error definitions have been removed from the public page included with YOURLS, I guess they're not needed anymore.	2013-11-02 19:17:42 +00:00
Tom Slominski	f0566b8b5e	Missing line break	2013-11-02 18:20:38 +00:00
Tom Slominski	e898da7e6c	reCAPTCHA support	2013-11-02 18:19:38 +00:00
Tom Slominski	c97d882872	Bit of CSS allowing for user styles which are not overwritten on upgrade	2013-11-02 15:34:20 +00:00
Tom Slominski	8cbc21f60f	A note	2013-11-02 15:32:30 +00:00
Tom Slominski	2c2dcb740d	Improved the error page as much as I can without affecting the actual theme	2013-11-02 15:23:12 +00:00
Tom Slominski	78cb3ed559	Improvements to the look of the "Too many URLs added too fast" error page	2013-11-02 15:17:13 +00:00
Tom Slominski	da890206ab	Merge branch 'two-page-onwards' of https://github.com/tomslominski/infinity-squared into two-page-onwards Because git broke. Or I broke git.	2013-11-02 14:53:53 +00:00
Tom Slominski	f770cfa03e	Fixing the social sharers and whipping out some padding for them	2013-11-02 14:50:39 +00:00
Tom Slominski	ea01a72d2b	Typo	2013-11-02 14:04:53 +00:00
Tom Slominski	7530b53c56	config-sample.php gets a special mention because otherwise git won't accept it...	2013-11-02 14:03:44 +00:00
Tom Slominski	9f651f9059	config-sample.php gets a special mention because otherwise git won't accept it...	2013-11-02 13:52:45 +00:00
Tom Slominski	8ca020a5b6	Removing config.php from the repo in favour of config-sample.php	2013-11-02 13:48:11 +00:00
Tom Slominski	8f818e63b4	Updated .gitignore so my reCAPTCHA keys don't leak	2013-11-02 13:41:10 +00:00
Tom Slominski	cf605a9ec5	I've merged some code from YOURLS, but the SATANIC bookmarklets still do not work. Ugh.	2013-11-02 00:44:41 +00:00
Tom Slominski	2f98a2707c	Missed a </div>	2013-11-01 23:59:16 +00:00
Tom Slominski	c05a17fbab	Sorted out header	2013-11-01 19:27:23 +00:00
Tom Slominski	679dcd0961	New lines at the ends of files	2013-11-01 19:21:45 +00:00
Tom Slominski	0293dff577	Less tabs	2013-11-01 19:20:38 +00:00
Tom Slominski	718420690b	Sorted out the results page	2013-11-01 19:19:35 +00:00
Tom Slominski	90fbc64d0a	Corrected tabs and comments	2013-11-01 18:45:34 +00:00
Tom Slominski	553a1a8743	Moved the text strings from variables directly into the text. Such readability. Much wow.	2013-11-01 18:40:28 +00:00
Tom Slominski	1ee65b690d	Rudimentary basic two-file structure. This should make the code more readable and easier to edit, but we'll see how we go. It's called two file since only two files here are important. I've split the form and the results page together, and the header.php and footer.php are just additional files so we don't double the code.	2013-11-01 18:15:39 +00:00
Tom Slominski	db1565dbe9	A new .gitignore to prepare for additional files on this branch	2013-11-01 18:06:54 +00:00
Tom Slominski	f1c7c4b8c2	String correction	2013-09-04 00:37:04 +01:00
Tom Slominski	9d59f95dcc	Permission fixes: rw-r--r-- on all files and +x on directories	2013-09-04 00:16:31 +01:00
Tom Slominski	250f92df69	Making the antispam check error more severe looking.	2013-09-03 23:56:22 +01:00
Tom Slominski	b507bb48cb	Antispam i18n strings	2013-09-03 23:36:32 +01:00
Tom Slominski	e34de4c290	Simple mandatory antispam check based on Tihomir Hristov code. Thanks!	2013-09-03 00:43:45 +01:00
Tom Slominski	2dbe0d987f	zeroClipboard	2013-09-02 23:02:41 +01:00
Tom Slominski	a97007a8c9	Adding zeroClipboard support	2013-08-30 22:49:35 +01:00
Tom Slominski	337f158812	Correct link	2013-08-14 23:33:38 +01:00