Changeset 859423

Timestamp:

02/17/2014 01:56:48 PM (12 years ago)

Author:

buildcreate

Message:

Fixed login/register form validation issues

Location:

agreeable

Files:

• assets/screenshot-2.jpg (modified) (previous)
• tags/0.2.2 (added)
• tags/0.2.2/agreeable-options.php (added)
• tags/0.2.2/agreeable.php (added)
• tags/0.2.2/readme.txt (added)
• trunk/agreeable-options.php (modified) (1 diff)
• trunk/agreeable.php (modified) (8 diffs)
• trunk/readme.txt (modified) (1 diff)

agreeable/trunk/agreeable-options.php

@@ -101 +101 @@
             
                 <p class="submit">
-                <input type="submit" name="Submit" value="<?php _e('Update Options', 'ag_trdom' ) ?>" />
+                <input type="submit" class="button button-large button-primary" name="Submit" value="<?php _e('Update Options', 'ag_trdom' ) ?>" />
                 </p>
             </form>

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.  Based on the I-Agree plugin by Michael Stursberg.
-Version: 0.2.1
+Version: 0.2.2
 Author: buildcreate
 Author URI: http://buildcreate.com
@@ -14 +14 @@
     $dbregister = get_option('ag_register');
     $dbfail = get_option('ag_fail');
-    $body_class = get_body_class();
-    $login_page = get_option('ag_login_page');
-    $register_page = get_option('ag_register_page');
     
-    global $bp, $post;
-    isset($post) ? $pid = $post->ID : $pid = NULL;
+    global $bp;
+    
+    if(isset($_REQUEST['ag_type']) && $_REQUEST['ag_type'] == "login" && $dblogin == 1 || isset($_REQUEST['ag_type']) && $_REQUEST['ag_type'] == 'register' && $dbregister == 1) {
           
           // See if the checkbox #login_accept was checked
@@ -37 +35 @@
             return $error;
         }
+    } else {
+        return $user;
+    }
 
 }
@@ -45 +46 @@
 add_filter('bp_signup_validate', 'wp_authenticate_user_acc', 99999, 2);
 
-function display_terms_form() {
+function display_terms_form($type) {
     $dbtermm = get_option('ag_termm');
     $dburl = get_option('ag_url');
-    
-    global $post;
-    isset($post) ? $pid = $post->ID : $pid = NULL;
-    $body_class = get_body_class();
-    
-    global $bp;
  
    if(isset($dburl)) {$terms = get_post($dburl); $terms = apply_filters('the_content', $terms->post_content);}    
@@ -65 +60 @@
         if(isset($bp)){do_action( 'bp_login_accept_errors' );}
     echo '<label style="text-align: left;"><input type="checkbox" name="login_accept" id="login_accept" />&nbsp;<a title="'.get_post($dburl)->post_title.'" class="thickbox" target="_BLANK" href="#TB_inline?width=600&height=550&inlineId=terms">'.$dbtermm.'</a></label></div>';
-    
+    echo '<input type="hidden" value="'.$type.'" name="ag_type" />';
     echo '<div id="terms"><div>'.$terms.'</div></div>';
 }
@@ -73 +68 @@
     
     if($dblogin == 1) {
-        display_terms_form();
+        display_terms_form('login');
     }
 }
@@ -82 +77 @@
     
     if($dbregister == 1) {
-        display_terms_form();
+        display_terms_form('register');
     }
 }
@@ -97 +92 @@
     
     if($dblogin == 1) {
-        display_terms_form();
+        display_terms_form('login');
     }
     

agreeable/trunk/readme.txt

@@ -33 +33 @@
 == Changelog ==
 
-= 0.2.1 =
-* Issue with login pages that also have login widgets on them
+= 0.2.2 =
+* Fixed issue with form validation
 
 = 0.2 =