Changeset 1671400

Timestamp:

06/06/2017 03:00:59 AM (8 years ago)

Author:

Sanskritforum

Message:

version 3.5.0 release

Location:

skt-nurcaptcha

Files:

• tags/3.5.0 (added)
• tags/3.5.0/gpl.txt (added)
• tags/3.5.0/img (added)
• tags/3.5.0/img/blackglass.png (added)
• tags/3.5.0/img/bs_logo_msmall.gif (added)
• tags/3.5.0/img/clean.png (added)
• tags/3.5.0/img/dark.png (added)
• tags/3.5.0/img/icon.svg (added)
• tags/3.5.0/img/light.png (added)
• tags/3.5.0/img/red.png (added)
• tags/3.5.0/img/sfs_banner.jpg (added)
• tags/3.5.0/img/white.png (added)
• tags/3.5.0/js (added)
• tags/3.5.0/js/skt-nurc-functions.js (added)
• tags/3.5.0/js/skt-nurc-login.js (added)
• tags/3.5.0/languages (added)
• tags/3.5.0/languages/skt-nurcaptcha-fr_FR.mo (added)
• tags/3.5.0/languages/skt-nurcaptcha-fr_FR.po (added)
• tags/3.5.0/languages/skt-nurcaptcha-nl_NL.mo (added)
• tags/3.5.0/languages/skt-nurcaptcha-nl_NL.po (added)
• tags/3.5.0/languages/skt-nurcaptcha.pot (added)
• tags/3.5.0/readme.txt (added)
• tags/3.5.0/skt-nurc-admin.php (added)
• tags/3.5.0/skt-nurc-login-style.css (added)
• tags/3.5.0/skt-nurc-recaptcha-locales.php (added)
• tags/3.5.0/skt-nurcaptcha.php (added)
• tags/3.5.0/uninstall.php (added)
• trunk/languages/skt-nurcaptcha.pot (modified) (10 diffs)
• trunk/readme.txt (modified) (3 diffs)
• trunk/skt-nurcaptcha.php (modified) (12 diffs)

skt-nurcaptcha/trunk/languages/skt-nurcaptcha.pot

@@ -4 +4 @@
 "Project-Id-Version: Skt_nurcaptcha 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-02 21:20-0200\n"
+"POT-Creation-Date: 2017-05-31 21:47-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Carlos Eduardo G. Barbosa <carlos.eduardo@mais.com>\n"
@@ -17 +17 @@
 "X-Textdomain-Support: yes\n"
 "X-Poedit-Basepath: ..\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.0.2\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -72 +72 @@
 msgstr ""
 
-#: skt-nurc-admin.php:210 skt-nurcaptcha.php:245
+#: skt-nurc-admin.php:210 skt-nurcaptcha.php:246
 msgid "Skt NURCaptcha Settings"
 msgstr ""
@@ -431 +431 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:213 skt-nurcaptcha.php:559 skt-nurcaptcha.php:602
+#: skt-nurcaptcha.php:214 skt-nurcaptcha.php:578 skt-nurcaptcha.php:621
 msgid "Fill the Captcha below"
 msgstr ""
 
-#: skt-nurcaptcha.php:241
+#: skt-nurcaptcha.php:242
 msgid "Skt NURCaptcha Warning"
 msgstr ""
 
-#: skt-nurcaptcha.php:243
+#: skt-nurcaptcha.php:244
 msgid ""
 "You must register your reCAPTCHA keys to have Skt NURCaptcha protection "
@@ -445 +445 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:245
+#: skt-nurcaptcha.php:246
 msgid "Go to"
 msgstr ""
 
-#: skt-nurcaptcha.php:245
+#: skt-nurcaptcha.php:246
 msgid "and save your keys to the appropriate fields"
 msgstr ""
 
-#: skt-nurcaptcha.php:247
+#: skt-nurcaptcha.php:248
 msgid "Be sure your keys are saved to the appropriate fields down here"
 msgstr ""
 
-#: skt-nurcaptcha.php:269
+#: skt-nurcaptcha.php:270
 msgid "reCaptcha ERROR"
 msgstr ""
 
-#: skt-nurcaptcha.php:353
-msgid "username or email missing"
-msgstr ""
-
-#: skt-nurcaptcha.php:398
+#: skt-nurcaptcha.php:363
+msgid "username missing"
+msgstr ""
+
+#: skt-nurcaptcha.php:367
+msgid "email missing"
+msgstr ""
+
+#: skt-nurcaptcha.php:412
 msgid "Registration Form"
 msgstr ""
 
-#: skt-nurcaptcha.php:398
+#: skt-nurcaptcha.php:412
 msgid "Register For This Site"
 msgstr ""
 
-#: skt-nurcaptcha.php:407
+#: skt-nurcaptcha.php:421
 #, php-format
 msgid "There is a problem with your response: %s"
 msgstr ""
 
-#: skt-nurcaptcha.php:419
+#: skt-nurcaptcha.php:433
 msgid "Username"
 msgstr ""
 
-#: skt-nurcaptcha.php:424
-msgid "E-mail"
-msgstr ""
-
-#: skt-nurcaptcha.php:434
-msgid "A password will be e-mailed to you."
-msgstr ""
-
-#: skt-nurcaptcha.php:446
+#: skt-nurcaptcha.php:438
+msgid "Email"
+msgstr ""
+
+#: skt-nurcaptcha.php:453
+msgid "Registration confirmation will be emailed to you."
+msgstr ""
+
+#: skt-nurcaptcha.php:465
 msgid "Log in"
 msgstr ""
 
-#: skt-nurcaptcha.php:447
+#: skt-nurcaptcha.php:466
 msgid "Lost your password?"
 msgstr ""
 
-#: skt-nurcaptcha.php:518
+#: skt-nurcaptcha.php:537
 msgid ""
 "Use only non-accented alphanumeric characters plus these: _ [underscore], "
@@ -504 +508 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:525
+#: skt-nurcaptcha.php:544
 msgid ""
 "Use a functional email address, as your temporary password will be sent to "
@@ -510 +514 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:533
+#: skt-nurcaptcha.php:552
 msgid ""
 "To get registered, just transcribe both the words, numbers and signs you see "
@@ -518 +522 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:538
+#: skt-nurcaptcha.php:557
 msgid ""
 "To get registered, just click on the box below to confirm you're not a spam "
@@ -528 +532 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:707
+#: skt-nurcaptcha.php:727
 msgid "Could not open socket - server communication failed - try again later."
 msgstr ""
 
-#: skt-nurcaptcha.php:760
+#: skt-nurcaptcha.php:780
 #, php-format
 msgid "To use reCAPTCHA you must get an API key from %s"
 msgstr ""
 
-#: skt-nurcaptcha.php:765
+#: skt-nurcaptcha.php:785
 msgid "For security reasons, you must pass the remote ip to reCAPTCHA"
 msgstr ""
 
-#: skt-nurcaptcha.php:770
+#: skt-nurcaptcha.php:790
 msgid "Inconsistency detected - try again later."
 msgstr ""
 
-#: skt-nurcaptcha.php:774
+#: skt-nurcaptcha.php:794
 msgid "Response field was empty!"
 msgstr ""
 
-#: skt-nurcaptcha.php:800
+#: skt-nurcaptcha.php:820
 msgid "Incorrect Captcha solution - please try again."
 msgstr ""
 
-#: skt-nurcaptcha.php:837
+#: skt-nurcaptcha.php:872
 msgid "error: No return data from query. Try again later."
 msgstr ""
 
-#: skt-nurcaptcha.php:841
+#: skt-nurcaptcha.php:877
 msgid ""
 "says: 'Spammer signature found!' Registration will not be allowed for this "
@@ -563 +567 @@
 msgstr ""
 
-#: skt-nurcaptcha.php:844
+#: skt-nurcaptcha.php:878
 msgid "is suspect"
 msgstr ""
 
-#: skt-nurcaptcha.php:845
-msgid "occurrences found"
-msgstr ""
-
-#: skt-nurcaptcha.php:881
+#: skt-nurcaptcha.php:883
+msgid "says: data checked - no spammer! "
+msgstr ""
+
+#: skt-nurcaptcha.php:915
 msgid "error: No return data from API query."
 msgstr ""
 
-#: skt-nurcaptcha.php:888
+#: skt-nurcaptcha.php:922
 #, php-format
 msgid "error: %s"
 msgstr ""
 
-#: skt-nurcaptcha.php:904
+#: skt-nurcaptcha.php:938
 msgid ""
 "says: 'Bot signature found!' Registration will not be allowed for this user."
 msgstr ""
 
-#: skt-nurcaptcha.php:1007
+#: skt-nurcaptcha.php:1041
 msgid "Log table successfully deleted."
 msgstr ""

skt-nurcaptcha/trunk/readme.txt

@@ -4 +4 @@
 Tags: security, login form, new user, captcha, spambots, reCAPTCHA, register form, bots, spam, register, anti-spam
 Requires at least: 4.0
-Tested up to: 4.7
-Stable tag: 3.4.90
+Tested up to: 4.8
+Stable tag: 3.5.0
 
 NURCaptcha inserts a reCAPTCHA on the Register Form of your site to protect it against spambots. 
@@ -85 +85 @@
 == Changelog ==
 
+= 3.5.0 =
+* Upgrade in antispam databases querying routines and a few other small fixes
 = 3.4.90 =
 * Small adjustments to PHP7 affecting BuddyPress installs
@@ -163 +165 @@
 == Upgrade Notice ==
 
+= 3.5.0 =
+* Upgrade in antispam databases querying routines
 = 3.4.90 =
 * Small adjustments to PHP7 affecting BuddyPress installs

skt-nurcaptcha/trunk/skt-nurcaptcha.php

@@ -4 +4 @@
     Plugin URI: https://skt-nurcaptcha.sanskritforum.org/
     Description: If your Blog allows new subscribers to register via the registration option at the Login page, this plugin may be useful to you. It includes a reCaptcha block to the register form, so you get rid of spambots. To use it you have to sign up for (free) public and private keys at <a href="https://www.google.com/recaptcha/admin#createsite" target="_blank">reCAPTCHA API Signup Page</a>. Version 3 added extra security by querying antispam databases for known ip and email of spammers, so you get rid of them even if they break the reCaptcha challenge by solving it as real persons.
-    Version: 3.4.90
+    Version: 3.5.0
     Author: Carlos E. G. Barbosa
     Author URI: http://www.yogaforum.org
@@ -324 +324 @@
 * Main routine - non-multisite *** 
 * This code overrides entirely the 'register' case on main switch @ wp_login.php 
-* we fetch the 'login-form-register' hook 
+* we fetch the 'login_form_register' hook 
 * You may experience some problems if you install another plugin that needs to customize those lines.
 *
@@ -331 +331 @@
 
     $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
+    
     if ( is_multisite() ) {
-        // Multisite uses wp-signup.php 
-        wp_redirect( apply_filters( 'wp_signup_location', network_site_url('wp-signup.php') ) );
-        exit();
-    }
-    
-    if ( !get_site_option('users_can_register') ) {
+        /**
+         * Filters the Multisite sign up URL.
+         *
+         * @since 3.0.0
+         *
+         * @param string $sign_up_url The sign up URL.
+         */
+        wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
+        exit;
+    }
+
+    if ( !get_option('users_can_register') ) {
         wp_redirect( site_url('wp-login.php?registration=disabled') );
         exit();
@@ -350 +357 @@
     $errors = NULL;
     if ( $http_post ) { // if we have a response, let's check it
-        $user_login = $_POST['user_login'];
-        $user_email = $_POST['user_email'];
-        if (($user_login =='')||($user_email=='')){
+        $user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : '';
+        $user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : '';
+        if ($user_login ==''){
             $result->is_valid = false;
-            $result->error = __("username or email missing", 'skt-nurcaptcha'); 
+            $result->error = __("username missing", 'skt-nurcaptcha'); 
+        }
+        if ($user_email==''){
+            $result->is_valid = false;
+            $result->error = __("email missing", 'skt-nurcaptcha'); 
         }
         if ($result->is_valid) {
@@ -418 +429 @@
     <?php }else{ ?>
         style="width:300px;" 
-    <?php } ?> novalidate="novalidate">
+    <?php } ?> novalidate>
     <p>
-        <label><?php _e('Username', 'skt-nurcaptcha'); ?><?php nurc_username_help(); ?>
+        <label for="user_login"><?php _e('Username'); ?><?php nurc_username_help(); ?>
         <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" />
         </label>
     </p>
     <p>
-        <label><?php _e('E-mail', 'skt-nurcaptcha'); ?><?php nurc_email_help(); ?>
+        <label for="user_email"><?php _e('Email'); ?><?php nurc_email_help(); ?>
         <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr(wp_unslash($user_email)); ?>" size="25" />
         </label>
@@ -432 +443 @@
     <?php 
     nurc_recaptcha_challenge(); 
+    /**
+     * Fires following the 'Email' field in the user registration form.
+     *
+     * @since 2.1.0
+     */
     do_action('register_form'); 
     ?>
     
-    <p id="reg_passmail"><?php _e('A password will be e-mailed to you.', 'skt-nurcaptcha'); ?></p>
+    <p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
     <br class="clear" />
     <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
@@ -447 +463 @@
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e('Log in', 'skt-nurcaptcha'); ?></a> |
-<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>" title="<?php esc_attr_e('Password Lost and Found', 'skt-nurcaptcha'); ?>"><?php _e('Lost your password?', 'skt-nurcaptcha'); ?></a>
+<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> |
+<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
 </p>
 <?php
@@ -662 +678 @@
         
         if (defined('SKTNURC_BP_ACTIVE')) {
-            $ue = $_POST['signup_email'];
-            $ul = $_POST['signup_username'];
+            $ue = (isset($_POST['signup_email']))? $_POST['signup_email']: '';
+            $ul = (isset($_POST['signup_username']))? $_POST['signup_username']: '';
         }else{
-            $ue = $_POST['user_email']; 
+            $ue = (isset($_POST['user_email']))? $_POST['user_email']: ''; 
             if ( is_multisite() ) {     
-                $ul = $_POST['user_name'];
+                $ul = (isset($_POST['user_name']))? $_POST['user_name']: '';
             }else{
-                $ul = $_POST['user_login'];
+                $ul = (isset($_POST['user_login']))? $_POST['user_login']: '';
             }
         }
@@ -827 +843 @@
 * 
 ****/
-function skt_nurc_check_stopforumspam($XMAIL = '', $XIP = '', $XNAME = '') {
+function skt_nurc_check_stopforumspam($email='', $ip='', $username =''){
     $stopforumspam_response = new nurc_ReCaptchaResponse();
-    $returned_data=''; $botdata='';
-    
-    $XMAIL = urlencode($XMAIL); // make url compliant with urlencode()
-    $test_string = "http://www.stopforumspam.com/api?ip=$XIP&email=$XMAIL&username=$XNAME";
-    
-    $xmlstr = skt_nurc_get_page($test_string);
-    $xml = simplexml_load_string($xmlstr);
-    
-    if($xml->appears[0] == '' || $xml->appears[1] == '' || $xml->appears[2] == ''){ 
-        $stopforumspam_response->is_valid = false;
-        $stopforumspam_response->error = 'StopForumSpam '. __("error: No return data from query. Try again later.", 'skt-nurcaptcha').'<strong>';
-    }
-    if($xml->appears[0] == 'yes' || $xml->appears[1] == 'yes' || $xml->appears[2] == 'yes'){ 
-        $stopforumspam_response->is_valid = false;
-        $stopforumspam_response->error = 'StopForumSpam '. __("says: 'Spammer signature found!' Registration will not be allowed for this user ", 'skt-nurcaptcha').'<strong>';
-        for ($i = 0; $i < 3; $i++) {
-            if($xml->appears[$i] == 'yes'){
-                $stopforumspam_response->error .= ':: '. $xml->type[$i] . ' ' . __("is suspect", 'skt-nurcaptcha') . ' ';
-                $stopforumspam_response->error .= '[' . $xml->frequency[$i] . ' ' . __("occurrences found", 'skt-nurcaptcha') .'] ';
-            }
-        }
-        $stopforumspam_response->error .= '</strong>';
-    } else {
-        $stopforumspam_response->is_valid = true;
+    $url = 'http://api.stopforumspam.org/api';
+    $data = array();
+    if($email!='') $data['email']=$email;
+    if($ip!='') $data['ip']=$ip;
+    if($username!='') $data['username']=$username;
+    $data = http_build_query($data);
+
+    // init the request, set some info, send it and finally close it
+    $ch = curl_init($url);
+    curl_setopt($ch, CURLOPT_POST, 1);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    $result = curl_exec($ch);
+    curl_close($ch);
+
+    $xml = simplexml_load_string($result);
+    $rnum = count($xml->appears);
+    if(isset($xml->error)){
+            $stopforumspam_response->is_valid = false;
+            $stopforumspam_response->error = 'StopForumSpam '. $xml->error[0];
+            return $stopforumspam_response;
+    }
+    for($i=0;$i<$rnum;$i++){
+        if($xml->appears[$i] == ''){ 
+            $stopforumspam_response->is_valid = false;
+            $stopforumspam_response->error = 'StopForumSpam '. __("error: No return data from query. Try again later.", 'skt-nurcaptcha').'<strong>';
+            break;
+        }
+        if($xml->appears[$i] == 'yes'){ 
+            $stopforumspam_response->is_valid = false;
+            $stopforumspam_response->error = 'StopForumSpam '. __("says: 'Spammer signature found!' Registration will not be allowed for this user ", 'skt-nurcaptcha').'<strong>';
+            $stopforumspam_response->error .= ':: '. $xml->type[$i] . ' ' . __("is suspect", 'skt-nurcaptcha') . ' ';
+            $stopforumspam_response->error .= '</strong>';
+            break;
+        } else {
+            $stopforumspam_response->is_valid = true;
+            $stopforumspam_response->error = 'StopForumSpam '. __("says: data checked - no spammer! ", 'skt-nurcaptcha');
+        }
     }
     return $stopforumspam_response; 
-        
+
 } // here ends: function skt_nurc_check_stopforumspam()
 
@@ -867 +897 @@
     $returned_data=''; $botdata='';
     $APIKEY = get_site_option('sktnurc_botscoutKey');
-    
-    $XMAIL = urlencode($XMAIL); // make url compliant with urlencode()
-    if ($XNAME == ''){
-        $test_string = "http://botscout.com/test/?multi&mail=$XMAIL";
-    }else{
-        $test_string = "http://botscout.com/test/?multi&name=$XNAME&mail=$XMAIL";
-    }
-    if(get_site_option('sktnurc_botscoutTestMode')==false){$test_string .= "&ip=$XIP";}
-    if($APIKEY != ''){   // append API key.
-        $test_string .= "&key=$APIKEY";
-    }
-    
+
+    $test_string = "http://botscout.com/test/?";
+    $data = array();
+    if($email!='') $data['mail']=$email;
+    if(($ip!='')&&(get_site_option('sktnurc_botscoutTestMode')=='false')) $data['ip']=$ip;
+    if($username!='') $data['name']=$username;
+    if($APIKEY != '') $data['key']= $APIKEY;
+    $query = http_build_query($data);
+    $query = (count($data)>1)? 'multi&'.$query:$query;
+    $test_string .= $query;
+
+
     $returned_data = skt_nurc_get_page($test_string);
 
     if($returned_data==''){ 
-        $botscout_response->is_valid = false;
+        $botscout_response->is_valid = true; // no answer from botscout - so, drop the test
         $botscout_response->error = 'BotScout ' . __("error: No return data from API query.", 'skt-nurcaptcha');
         return $botscout_response;
@@ -889 +919 @@
     if(substr($returned_data, 0,1) == '!'){
         // the first character is an exclamation mark, an error occurred!  
-        $botscout_response->is_valid = false;
+        $botscout_response->is_valid = true; // botscout site failed to answer, so, drop the test
         $botscout_response->error = 'BotScout ' . sprintf(__("error: %s", 'skt-nurcaptcha'),$returned_data);
         return $botscout_response;
@@ -1012 +1042 @@
     }
 }
-/************
-* This method solves the problem of server restrictions on getting external url contents
-* such as the responses given by antispam databases
-* Thanks to Greg on (http://www.bugz.com.br/2011/09/file_get_contents/) [pt_BR]
-*************/
-function skt_nurc_get_page($url, $referer='', $timeout=30, $header=''){
-        if ($referer=='') $referer='http://'.$_SERVER['HTTP_HOST'];
-        if(!isset($timeout)) $timeout=30;
-        $curl = curl_init();
-        if(strstr($referer,"://")){
-            curl_setopt ($curl, CURLOPT_REFERER, $referer);
-        }
-        curl_setopt ($curl, CURLOPT_URL, $url);
-        curl_setopt ($curl, CURLOPT_TIMEOUT, $timeout);
-        curl_setopt ($curl, CURLOPT_USERAGENT, sprintf("Mozilla/%d.0",rand(4,5)));
-        curl_setopt ($curl, CURLOPT_HEADER, (int)$header);
-        curl_setopt ($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt ($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        $html = curl_exec ($curl);
-        curl_close ($curl);
-        return $html;
-    }
+/**
+* Send a GET request using cURL
+* @param string $url to request
+* @param array $get values to send
+* @param array $options for cURL
+* @return string
+*/
+function skt_nurc_get_page($url, array $get = null, array $options = array()){
+    if($get !== null) $url = $url. (strpos($url, '?') === FALSE ? '?' : ''). http_build_query($get);
+    $protocol = ($_SERVER['HTTPS'])? 'https':'http';
+    $referer= $protocol.'://'.$_SERVER['HTTP_HOST'];
+    $defaults = array(
+        CURLOPT_URL => $url,
+        CURLOPT_USERAGENT => 'Mozilla/5.0',
+        CURLOPT_HEADER => 0,
+        CURLOPT_RETURNTRANSFER => TRUE,
+        CURLOPT_TIMEOUT => 30,
+        CURLOPT_SSL_VERIFYPEER => false,
+        CURLOPT_REFERER => $referer
+    );
+    $ch = curl_init();
+    curl_setopt_array($ch, ($options + $defaults));
+    if( ! $result = curl_exec($ch)) $result ='';
+    curl_close($ch);
+    return $result;
+}
 /***************
 * This method derived from one published by Manish Zope, as a comment at: