Its now possible to choose between reCaptcha and the soon coming reCaptchabv2 + fixed some bugs

Author: ChristianGrieger

Diff for: config.php

@@ -44,10 +44,14 @@
 	// "both": check both the IP and coins address in the payout history.
 	"user_check" => "both",
 
-	"captcha" => "recaptcha",
+	"use_captcha" => true, // require the user to enter a captcha
+
+	"captcha" => "recaptcha", // valid options: recaptcha, recaptcha2
+
+	"captcha_https" => false, // use https (only for recaptcha2) valid options: true, false
 
 	// enter your private and public reCAPTCHA key here:
-	    "captcha_config" => array(
+	"captcha_config" => array(
 		"private_key" => "privatekey",
 		"public_key" => "publickey"
 		),

Diff for: cron/run.php

@@ -0,0 +1,26 @@
+<?php
+/*
+* Cryptocurrency faucet script
+* You are completely free to use/modify this script in any way. Credit is not required.
+*/
+
+// this is a re-implementation of recaptchalib.php so it can easily be swapped out.
+
+$this->add_head('<script src="http'.($this->config("captcha_https")?'s':'').'://www.google.com/recaptcha/api.js"></script>');
+
+function recaptcha_check_answer($secret,$response_code,$use_https = false)
+	{
+	$response = file_get_contents('http'.($use_https?'s':'').'://www.google.com/recaptcha/api/siteverify?secret='.urlencode($secret).'&response='.urlencode($response_code));
+	if ($response)
+		{
+		$response = json_decode($response,true);
+		return (@$response["success"] === true);
+		}
+	return false;
+	}
+
+function recaptcha_get_html($sitekey)
+	{
+	return '<div class="g-recaptcha" data-sitekey="'.htmlentities($sitekey).'"></div>';
+	}
+?>

Diff for: css/bootstrap.min.css

@@ -16,6 +16,8 @@ class simple_faucet
 
 	protected $balance = 0;
 
+	protected $header = '';
+
 
 	public function __construct($config)
 		{
@@ -66,6 +68,8 @@ public function __construct($config)
 
 		if ($this->config["captcha"] == "recaptcha")
 			require_once('./lib/recaptchalib.php');
+		elseif ($this->config["captcha"] == "recaptcha2")
+			require_once('./lib/recaptchalib2.php');
 
 		if (isset($config["rpc_user"],$config["rpc_password"],$config["rpc_host"],$config["rpc_port"],$config["mysql_user"],$config["mysql_password"],$config["mysql_host"],$config["mysql_database"]))
 			{
@@ -190,6 +194,11 @@ public function __construct($config)
 			$this->status = SF_STATUS_FAUCET_INCOMPLETE; // missing some settings
 		}
 
+	public function add_head($h)
+		{
+		$this->header .= $h;
+		}
+
 	public function render()
 		{
 		if (!file_exists("./templates/".$this->config["template"].".template.php"))
@@ -200,14 +209,15 @@ public function render()
 
 		$self = $this;
 		$db = $this->db;
+		$header = $this->header;
 		$status = $this->status;
 		$config = $this->config;
 		$balance = $this->balance;
 		$payout_amount = $this->payout_amount;
 		$payout_address = $this->payout_address;
 		$promo_payout_amount = $this->promo_payout_amount;
 
-		$template = preg_replace_callback("/\{\{([a-zA-Z-0-9\ \_]+?)\}\}/",function($match) use ($self,$db,$status,$config,$balance,$payout_amount,$payout_address,$promo_payout_amount)
+		$template = preg_replace_callback("/\{\{([a-zA-Z-0-9\ \_]+?)\}\}/",function($match) use ($self,$db,$header,$status,$config,$balance,$payout_amount,$payout_address,$promo_payout_amount)
 			{
 			switch (strtolower($match[1]))
 				{
@@ -219,8 +229,10 @@ public function render()
 				case "title":
 					return isset($config[strtolower($match[1])]) ? $config[strtolower($match[1])] : $match[1];
 
+                case "head":
+                	return $header;
 
-                case"coinname":
+                case "coinname":
 	               return $config["coinname"];
 
 				case "balance":
@@ -282,13 +294,12 @@ public function render()
 				// CAPTCHA:
 
 				case "captcha":
-					if ($config["captcha"] == "recaptcha")
-						return recaptcha_get_html(@$config["captcha_config"]["public_key"]);
-					return isset($_SESSION['captcha']) ? '<img src="'.$_SESSION['captcha']["image_src"].'" alt="[captcha]"/>' : '';
-					//return isset($_SESSION['captcha']) ? '<img src="'.htmlentities($_SESSION['captcha']["image_src"]).'" alt="[captcha]"/>' : '';
-
-				case "captcha_url":
-					return isset($_SESSION['captcha']) ? $_SESSION['captcha']["image_src"] : '';
+					if ($config["use_captcha"])
+						{
+						if ($config["captcha"] == "recaptcha" || $config["captcha"] == "recaptcha2")
+							return recaptcha_get_html(@$config["captcha_config"]["public_key"]);
+						}
+					return '';
 
 				default:
 					return $match[1];
@@ -331,12 +342,16 @@ public function payout_aggregate($function = "AVG")
 
 	protected function valid_captcha()
 		{
+		if (!$this->config["use_captcha"])
+			return true;
 		if ($this->config["captcha"] == "recaptcha")
 			{
 			$resp = @recaptcha_check_answer($this->config["captcha_config"]["private_key"],$_SERVER["REMOTE_ADDR"],@$_POST["recaptcha_challenge_field"],@$_POST["recaptcha_response_field"]);
 			return $resp->is_valid; // $resp->error;
 			}
-		return @$_POST["captcha_code"] == @$_SESSION['captcha']['code'];		
+		else
+			return recaptcha_check_answer($this->config["captcha_config"]["private_key"],@$_POST["g-recaptcha-response"],$this->config["captcha_https"]);
+		return false;		
 		}
 
 	protected function stage_payment($address,$amount)

Diff for: css/default.css

@@ -19,6 +19,8 @@
       <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
 
+    {{HEAD}}
+
 	<title>{{TITLE}}</title>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
@@ -44,26 +46,14 @@
     </div>
     <div class="panel-body">
         <span>Balance:</span> 
-        <span class="highlight">{{BALANCE}}</span> {{COINNAME}}<br>
-        Already paid:<span class="highlight" >
-        <?php
-            mysql_connect($this->config['mysql_host'],$this->config['mysql_user'],$this->config['mysql_password']);
-            mysql_select_db($this->config['mysql_database']);
-            $erg = mysql_query ("SELECT SUM(payout_amount + promo_payout_amount) as anzahl FROM sf_payouts");
-            $result = mysql_fetch_array($erg);
-            $result = $result["anzahl"];
-            $result = round($result,8);
-            echo $result;
-        ?>
-        
-        
-        </span> with <span class="highlight" >{{NUMBER_OF_PAYOUTS}}</span> payouts<br><br>
+        <span class="highlight">{{BALANCE}}</span> {{COINNAME}}<br/>
+        Already paid:<span class="highlight" >{{TOTAL_PAYOUT}}</span> with <span class="highlight" >{{NUMBER_OF_PAYOUTS}}</span> payouts<br/><br/>
 
-        How many payments are currently staged: <span class="highlight" >{{STAGED_PAYMENT_COUNT}}</span> payments.<br>
+        How many payments are currently staged: <span class="highlight" >{{STAGED_PAYMENT_COUNT}}</span> payments.<br/>
 
-        How many payments are left before they are executed: <span class="highlight" >{{STAGED_PAYMENTS_LEFT}}</span> payments.<br>
+        How many payments are left before they are executed: <span class="highlight" >{{STAGED_PAYMENTS_LEFT}}</span> payments.<br/>
 
-        Payments will be done after <span class="highlight" >{{STAGED_PAYMENT_THRESHOLD}}</span> staged payments or automated hourly.<br><br>
+        Payments will be done after <span class="highlight" >{{STAGED_PAYMENT_THRESHOLD}}</span> staged payments or automated hourly.<br/><br/>
         You can get free {{COINNAME}} every hour.
   </div>
 </div>
@@ -136,7 +126,7 @@
             <h3 class="panel-title">Status</h3>
         </div>
         <div class="panel-body">
-            Success! You have been awarded with {{PAYOUT_AMOUNT}} {{COINNAME}}!<br>
+            Success! You have been awarded with {{PAYOUT_AMOUNT}} {{COINNAME}}!<br/>
             Additionally, you received a bonus of {{PROMO_PAYOUT_AMOUNT}} {{COINNAME}}!
         </div>
     </div>