Commit Graph

102 Commits

Author SHA1 Message Date
Tom Slominski
5127f68093 Removing the secret API code for Google reCAPTCHA sounds like a cool idea, right? 2015-03-01 21:14:08 +00:00
Tom Slominski
8e94aa40a0 Correcting broken commit... 2015-03-01 20:25:20 +00:00
Tom Slominski
26dea2e4c4 Merge branch 'master' of https://github.com/LordBeaver/infinity-squared
Conflicts:
	index.php
	result.php
2015-03-01 20:06:24 +00:00
Tom Slominski
4683e2bd3d Switching to using phpqrcode for QR code generation, as Google is due to shut down it's QR code generation API. 2015-02-24 22:41:58 +00:00
Tom Slominski
fd2b74a5f5 One of my merges might have removed the actual CAPTCHA checking code. Nobody will find out anyway, eh? Eh? 2015-02-24 16:01:40 +00:00
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
LordBeaver
ff9d158626 ru_RU 2015-02-22 10:31:00 +03:00
LordBeaver
223d2b4c4a Update result.php 2015-02-22 10:26:39 +03:00
LordBeaver
8f6bad8843 Update result.php 2015-02-21 22:31:29 +03:00
LordBeaver
9d3d53e525 Update result.php 2015-02-21 22:11:46 +03:00
LordBeaver
585454d674 Update index.php 2015-02-21 21:57:33 +03:00
LordBeaver
665668d253 Update result.php 2015-02-21 21:36:45 +03:00
LordBeaver
0e28538aa5 Update index.php 2015-02-21 21:34:23 +03:00
LordBeaver
ba0c68bc17 Update header.php 2015-02-21 21:33:18 +03: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. v1.6 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 *cough*Facebook*cough*. 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