Vergleich inc/class_captcha.php - 1.8.10 - 1.8.21

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 104Zeile 104
		{
$this->captcha_template = $template;


		{
$this->captcha_template = $template;


			if($this->type == 2)

			if($this->type == 4)

			{

			{

				$this->captcha_template .= "_recaptcha";
}
else if($this->type == 4){

 
				$this->captcha_template .= "_nocaptcha";
}

				$this->captcha_template .= "_nocaptcha";
}

		}






			elseif($this->type == 5)
{
$this->captcha_template .= "_recaptcha_invisible";
}
}


		// Work on which CAPTCHA we've got installed

		// Work on which CAPTCHA we've got installed

		if($this->type == 2 && $mybb->settings['captchapublickey'] && $mybb->settings['captchaprivatekey'])
{
// We want to use reCAPTCHA, set the server options
$this->server = "//www.google.com/recaptcha/api";
$this->verify_server = "www.google.com";

if($build == true)
{
$this->build_recaptcha();
}
}
else if($this->type == 4 && $mybb->settings['captchapublickey'] && $mybb->settings['captchaprivatekey'])

		if(in_array($this->type, array(4, 5)) && $mybb->settings['captchapublickey'] && $mybb->settings['captchaprivatekey'])












		{

		{

			// We want to use reCAPTCHA, set the server options

			// We want to use noCAPTCHA or reCAPTCHA invisible, set the server options

			$this->server = "//www.google.com/recaptcha/api.js";
$this->verify_server = "https://www.google.com/recaptcha/api/siteverify";

if($build == true)
{
$this->build_recaptcha();

			$this->server = "//www.google.com/recaptcha/api.js";
$this->verify_server = "https://www.google.com/recaptcha/api/siteverify";

if($build == true)
{
$this->build_recaptcha();

			}
}
else if($this->type == 1)

			}
}
elseif($this->type == 1)

		{
if(!function_exists("imagecreatefrompng"))
{
// We want to use the default CAPTCHA, but it's not installed
return;
}

		{
if(!function_exists("imagecreatefrompng"))
{
// We want to use the default CAPTCHA, but it's not installed
return;
}

			else if($build == true)

			elseif($build == true)

			{
$this->build_captcha();
}

			{
$this->build_captcha();
}

Zeile 168Zeile 158
			"imagestring" => $randomstr,
"dateline" => TIME_NOW
);

			"imagestring" => $randomstr,
"dateline" => TIME_NOW
);





		$db->insert_query("captcha", $insert_array);
eval("\$this->html = \"".$templates->get($this->captcha_template)."\";");
//eval("\$this->html = \"".$templates->get("member_register_regimage")."\";");

		$db->insert_query("captcha", $insert_array);
eval("\$this->html = \"".$templates->get($this->captcha_template)."\";");
//eval("\$this->html = \"".$templates->get("member_register_regimage")."\";");

	}


	}


	function build_recaptcha()
{
global $lang, $mybb, $templates;

	function build_recaptcha()
{
global $lang, $mybb, $templates;





		// This will build a reCAPTCHA
$server = $this->server;
$public_key = $mybb->settings['captchapublickey'];

eval("\$this->html = \"".$templates->get($this->captcha_template, 1, 0)."\";");
//eval("\$this->html = \"".$templates->get("member_register_regimage_recaptcha")."\";");

		// This will build a reCAPTCHA
$server = $this->server;
$public_key = $mybb->settings['captchapublickey'];

eval("\$this->html = \"".$templates->get($this->captcha_template, 1, 0)."\";");
//eval("\$this->html = \"".$templates->get("member_register_regimage_recaptcha")."\";");

	}


	}


	/**
* @return string
*/

	/**
* @return string
*/

Zeile 200Zeile 190
			// Names
$hash = "imagehash";
$string = "imagestring";

			// Names
$hash = "imagehash";
$string = "imagestring";


// Values


// Values

			$field['hash'] = $db->escape_string($mybb->input['imagehash']);
$field['string'] = $db->escape_string($mybb->input['imagestring']);
}

			$field['hash'] = $db->escape_string($mybb->input['imagehash']);
$field['string'] = $db->escape_string($mybb->input['imagestring']);
}

		else if($this->type == 2)
{
// Names
$hash = "recaptcha_challenge_field";
$string = "recaptcha_response_field";

// Values
$field['hash'] = $mybb->input['recaptcha_challenge_field'];
$field['string'] = $mybb->input['recaptcha_response_field'];
}
else if($this->type == 3)

		elseif($this->type == 3)











		{
// Are You a Human can't be built as a hidden captcha
return '';

		{
// Are You a Human can't be built as a hidden captcha
return '';

Zeile 260Zeile 240
				$db->delete_query("captcha", "imagehash = '{$imagehash}'");
}
}

				$db->delete_query("captcha", "imagehash = '{$imagehash}'");
}
}

		elseif($this->type == 2)
{
$challenge = $mybb->input['recaptcha_challenge_field'];
$response = $mybb->input['recaptcha_response_field'];

if(!$challenge || strlen($challenge) == 0 || !$response || strlen($response) == 0)
{
$this->set_error($lang->invalid_captcha);
}
else
{
// We have a reCAPTCHA to handle
$data = $this->_qsencode(array(
'privatekey' => $mybb->settings['captchaprivatekey'],
'remoteip' => $session->ipaddress,
'challenge' => $challenge,
'response' => $response
));

// Contact Google and see if our reCAPTCHA was successful
$http_request = "POST /recaptcha/api/verify HTTP/1.0\r\n";
$http_request .= "Host: $this->verify_server\r\n";
$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
$http_request .= "Content-Length: ".strlen($data)."\r\n";
$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
$http_request .= "\r\n";
$http_request .= $data;

$fs = @fsockopen($this->verify_server, 80, $errno, $errstr, 10);

if($fs == false)
{
$this->set_error($lang->invalid_captcha_transmit);
}
else
{
// We connected, but is it correct?
fwrite($fs, $http_request);

while(!feof($fs))
{
$response .= fgets($fs, 1160);
}

fclose($fs);

$response = explode("\r\n\r\n", $response, 2);
$answer = explode("\n", $response[1]);

if(trim($answer[0]) != 'true')
{
// We got it wrong! Oh no...
$this->set_error($lang->invalid_captcha_verify);
}
}
}
}
elseif($this->type == 4)

		elseif(in_array($this->type, array(4, 5)))


























































		{
$response = $mybb->input['g-recaptcha-response'];
if(!$response || strlen($response) == 0)

		{
$response = $mybb->input['g-recaptcha-response'];
if(!$response || strlen($response) == 0)

Zeile 326Zeile 249
			}
else
{

			}
else
{

				// We have a noCAPTCHA to handle

				// We have a noCAPTCHA or reCAPTCHA invisible to handle

				// Contact Google and see if our reCAPTCHA was successful
$response = fetch_remote_file($this->verify_server, array(
'secret' => $mybb->settings['captchaprivatekey'],

				// Contact Google and see if our reCAPTCHA was successful
$response = fetch_remote_file($this->verify_server, array(
'secret' => $mybb->settings['captchaprivatekey'],