Changeset 996179

Timestamp:

09/24/2014 04:22:40 PM (11 years ago)

Author:

buildcreate

Message:

Fixed validation error

Location:

agreeable/trunk

Files:

• agreeable.php (modified) (9 diffs)
• readme.txt (modified) (3 diffs)

agreeable/trunk/agreeable.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/agreeable
 Description: Add a required "Agree to terms" checkbox to login and/or register forms.
-Version: 1.3.5
+Version: 1.3.6
 Author: kraftpress
 Author URI: http://kraftpress.it
@@ -35 +35 @@
 
         /* Registration Validation Hooks  */
-        add_filter('registration_errors', array($this, 'ag_authenticate_user_acc'), 10, 2);
+        add_filter('registration_errors', array($this, 'registration_validation'), 0, 2);
         add_filter('bp_signup_validate', array($this, 'ag_authenticate_user_acc'), 10, 2);
         add_filter('wpmu_validate_user_signup', array($this, 'ag_authenticate_user_acc'), 10, 3);
@@ -115 +115 @@
 
         /* Plugin Stylesheet */
-        wp_enqueue_style( 'agreeable-css', plugins_url('css/admin.css', __FILE__), '', '0.3.4', 'screen');
+        wp_enqueue_style( 'agreeable-css', plugins_url('css/admin.css', __FILE__), '', '1.3.5', 'screen');
 
     }
@@ -132 +132 @@
 
     }
+    
+    function registration_validation() {
+        
+        $errors = new WP_error();
+        
+        if(isset($_REQUEST['ag_type']) && $_REQUEST['ag_type'] == 'register' && $this->options['register'] == 1) {
+            
+            if ( isset( $_REQUEST['ag_login_accept'] ) && $_REQUEST['ag_login_accept'] == 1) {
+            
+                return $errors;
+            
+            } else {
+            
+                $errors->add('ag_login_accept', $this->options['fail_text']);
+                
+                return $errors;
+            }
+            
+        } else {
+        
+            return $errors;
+            
+        }
+        
+    }
 
     function ag_authenticate_user_acc($user) {
@@ -151 +176 @@
 
                 unset($_SESSION['ag_errors']);
-
+                            
                 return $user;
+        
 
             } else {
@@ -179 +205 @@
                     $result = $user;
                     
+                    $result['errors'] = $errors;
+                    
                     return $result;
 
@@ -188 +216 @@
 
         } else {
-
+                
             return $user;
 
@@ -244 +272 @@
             if ( isset( $_REQUEST['ag_login_accept'] ) && $_REQUEST['ag_login_accept'] == 'on' ) {
                 // Checkbox on, allow comment
+                do_action('agreeable_validate_user', $user, $_REQUEST['ag_type']);
                 return $comment;
             } else {
@@ -316 +345 @@
         echo '<div id="terms" class="mfp-hide">'.$terms_content.'</div>';
         echo $type == 'comments' ? '<br>':'';
+                
     }
 

agreeable/trunk/readme.txt

@@ -9 +9 @@
 
 == Description ==
-Add an "agree to terms" check box to your login, registration, or comment forms, requiring users to agree. Tested with BuddyPress and Multisite.
+Add an "agree to terms" check box to your login, registration, or comment forms, requiring users to agree. Tested with BuddyPress and Multisite.  WooCommerce extension available.
 
 = Features =
@@ -18 +18 @@
 
 = Extensions =
-* Agreeable Login Records - Allows you to track user agreement by IP and username each time they log in. Learn more and purchase at: http://kraftpress.it/downloads/agreeable-records/
-* WooCommerce Integration - Integrates Agreeable's terms & conditions fields into Woocommerce login, registration, and checkout. Learn more and purchase at: http://kraftpress.it/downloads/agreeable-woocommerce/
+* Login Records - Allows you to track user agreement by IP and username each time they log in. Learn more and purchase at: http://kraftpress.it/downloads/agreeable-records/
+* WooCommerce - Integrates Agreeable's terms & conditions fields into Woocommerce login, registration, and checkout. Learn more and purchase at: http://kraftpress.it/downloads/agreeable-woocommerce/
 
 = Translations =
@@ -37 +37 @@
 
 == Changelog ==
+
+= 1.3.6 =
+* Fixed bug with user registration validation
 
 = 1.3.5 =