From c4372dd38a4d109b4f3881ea63b667e33adbe503 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 26 Apr 2012 18:23:31 +0200 Subject: Update to MediaWiki 1.18.3 --- extensions/ConfirmEdit/recaptchalib.php | 146 ++++++++++++++++---------------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'extensions/ConfirmEdit/recaptchalib.php') diff --git a/extensions/ConfirmEdit/recaptchalib.php b/extensions/ConfirmEdit/recaptchalib.php index 32c4f4d7..8e2c0c4f 100644 --- a/extensions/ConfirmEdit/recaptchalib.php +++ b/extensions/ConfirmEdit/recaptchalib.php @@ -1,5 +1,5 @@ $value ) - $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; + $req .= $key . '=' . urlencode( stripslashes( $value ) ) . '&'; // Cut the last '&' - $req=substr($req,0,strlen($req)-1); + $req = substr( $req, 0, strlen( $req ) -1 ); return $req; } @@ -64,29 +64,29 @@ function _recaptcha_qsencode ($data) { * @param int port * @return array response */ -function _recaptcha_http_post($host, $path, $data, $port = 80) { +function _recaptcha_http_post( $host, $path, $data, $port = 80 ) { - $req = _recaptcha_qsencode ($data); + $req = _recaptcha_qsencode ( $data ); $http_request = "POST $path HTTP/1.0\r\n"; $http_request .= "Host: $host\r\n"; $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; - $http_request .= "Content-Length: " . strlen($req) . "\r\n"; + $http_request .= "Content-Length: " . strlen( $req ) . "\r\n"; $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; $http_request .= "\r\n"; $http_request .= $req; $response = ''; - if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { - die ('Could not open socket'); + if ( false == ( $fs = @fsockopen( $host, $port, $errno, $errstr, 10 ) ) ) { + die ( 'Could not open socket' ); } - fwrite($fs, $http_request); + fwrite( $fs, $http_request ); - while ( !feof($fs) ) - $response .= fgets($fs, 1160); // One TCP-IP packet - fclose($fs); - $response = explode("\r\n\r\n", $response, 2); + while ( !feof( $fs ) ) + $response .= fgets( $fs, 1160 ); // One TCP-IP packet + fclose( $fs ); + $response = explode( "\r\n\r\n", $response, 2 ); return $response; } @@ -103,26 +103,26 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) { * @return string - The HTML to be embedded in the user's form. */ -function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) +function recaptcha_get_html ( $pubkey, $error = null, $use_ssl = false ) { - if ($pubkey == null || $pubkey == '') { - die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + if ( $pubkey == null || $pubkey == '' ) { + die ( "To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create" ); } - - if ($use_ssl) { + + if ( $use_ssl ) { $server = RECAPTCHA_API_SECURE_SERVER; } else { $server = RECAPTCHA_API_SERVER; } $errorpart = ""; - if ($error) { + if ( $error ) { $errorpart = "&error=" . $error; } - return ' + return ' '; @@ -149,27 +149,27 @@ class ReCaptchaResponse { * @param array $extra_params an array of extra variables to post to the server * @return ReCaptchaResponse */ -function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) +function recaptcha_check_answer ( $privkey, $remoteip, $challenge, $response, $extra_params = array() ) { - if ($privkey == null || $privkey == '') { - die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + if ( $privkey == null || $privkey == '' ) { + die ( "To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create" ); } - if ($remoteip == null || $remoteip == '') { - die ("For security reasons, you must pass the remote ip to reCAPTCHA"); + if ( $remoteip == null || $remoteip == '' ) { + die ( "For security reasons, you must pass the remote ip to reCAPTCHA" ); } - - - //discard spam submissions - if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { + + + // discard spam submissions + if ( $challenge == null || strlen( $challenge ) == 0 || $response == null || strlen( $response ) == 0 ) { $recaptcha_response = new ReCaptchaResponse(); $recaptcha_response->is_valid = false; $recaptcha_response->error = 'incorrect-captcha-sol'; return $recaptcha_response; } - $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify", + $response = _recaptcha_http_post ( RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify", array ( 'privatekey' => $privkey, 'remoteip' => $remoteip, @@ -178,10 +178,10 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex ) + $extra_params ); - $answers = explode ("\n", $response [1]); + $answers = explode ( "\n", $response [1] ); $recaptcha_response = new ReCaptchaResponse(); - if (trim ($answers [0]) == 'true') { + if ( trim ( $answers [0] ) == 'true' ) { $recaptcha_response->is_valid = true; } else { @@ -199,45 +199,45 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex * @param string $domain The domain where the page is hosted * @param string $appname The name of your application */ -function recaptcha_get_signup_url ($domain = null, $appname = null) { - return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname)); +function recaptcha_get_signup_url ( $domain = null, $appname = null ) { + return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode ( array ( 'domains' => $domain, 'app' => $appname ) ); } -function _recaptcha_aes_pad($val) { +function _recaptcha_aes_pad( $val ) { $block_size = 16; - $numpad = $block_size - (strlen ($val) % $block_size); - return str_pad($val, strlen ($val) + $numpad, chr($numpad)); + $numpad = $block_size - ( strlen ( $val ) % $block_size ); + return str_pad( $val, strlen ( $val ) + $numpad, chr( $numpad ) ); } /* Mailhide related code */ -function _recaptcha_aes_encrypt($val,$ky) { - if (! function_exists ("mcrypt_encrypt")) { - die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); +function _recaptcha_aes_encrypt( $val, $ky ) { + if ( ! function_exists ( "mcrypt_encrypt" ) ) { + die ( "To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed." ); } - $mode=MCRYPT_MODE_CBC; - $enc=MCRYPT_RIJNDAEL_128; - $val=_recaptcha_aes_pad($val); - return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); + $mode = MCRYPT_MODE_CBC; + $enc = MCRYPT_RIJNDAEL_128; + $val = _recaptcha_aes_pad( $val ); + return mcrypt_encrypt( $enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ); } -function _recaptcha_mailhide_urlbase64 ($x) { - return strtr(base64_encode ($x), '+/', '-_'); +function _recaptcha_mailhide_urlbase64 ( $x ) { + return strtr( base64_encode ( $x ), '+/', '-_' ); } /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ -function recaptcha_mailhide_url($pubkey, $privkey, $email) { - if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { - die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . - "you can do so at http://www.google.com/recaptcha/mailhide/apikey"); +function recaptcha_mailhide_url( $pubkey, $privkey, $email ) { + if ( $pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null ) { + die ( "To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . + "you can do so at http://www.google.com/recaptcha/mailhide/apikey" ); } - - $ky = pack('H*', $privkey); - $cryptmail = _recaptcha_aes_encrypt ($email, $ky); - - return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); + + $ky = pack( 'H*', $privkey ); + $cryptmail = _recaptcha_aes_encrypt ( $email, $ky ); + + return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ( $cryptmail ); } /** @@ -245,15 +245,15 @@ function recaptcha_mailhide_url($pubkey, $privkey, $email) { * eg, given johndoe@example,com return ["john", "example.com"]. * the email is then displayed as john...@example.com */ -function _recaptcha_mailhide_email_parts ($email) { - $arr = preg_split("/@/", $email ); +function _recaptcha_mailhide_email_parts ( $email ) { + $arr = preg_split( "/@/", $email ); - if (strlen ($arr[0]) <= 4) { - $arr[0] = substr ($arr[0], 0, 1); - } else if (strlen ($arr[0]) <= 6) { - $arr[0] = substr ($arr[0], 0, 3); + if ( strlen ( $arr[0] ) <= 4 ) { + $arr[0] = substr ( $arr[0], 0, 1 ); + } elseif ( strlen ( $arr[0] ) <= 6 ) { + $arr[0] = substr ( $arr[0], 0, 3 ); } else { - $arr[0] = substr ($arr[0], 0, 4); + $arr[0] = substr ( $arr[0], 0, 4 ); } return $arr; } @@ -264,12 +264,12 @@ function _recaptcha_mailhide_email_parts ($email) { * * http://www.google.com/recaptcha/mailhide/apikey */ -function recaptcha_mailhide_html($pubkey, $privkey, $email) { - $emailparts = _recaptcha_mailhide_email_parts ($email); - $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); - - return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); +function recaptcha_mailhide_html( $pubkey, $privkey, $email ) { + $emailparts = _recaptcha_mailhide_email_parts ( $email ); + $url = recaptcha_mailhide_url ( $pubkey, $privkey, $email ); + + return htmlentities( $emailparts[0] ) . "...@" . htmlentities ( $emailparts [1] ); } -- cgit v1.2.3-54-g00ecf