Changeset 856577

Timestamp:

02/12/2014 07:02:56 PM (12 years ago)

Author:

buildcreate

Message:

Fixed registration page glitch

Location:

agreeable

Files:

• tags/0.1.2.1 (added)
• tags/0.1.2.1/agreeable-options.php (copied) (copied from agreeable/trunk/agreeable-options.php) (1 diff)
• tags/0.1.2.1/agreeable.php (copied) (copied from agreeable/trunk/agreeable.php) (5 diffs)
• tags/0.1.2.1/readme.txt (copied) (copied from agreeable/trunk/readme.txt)
• trunk/agreeable-options.php (modified) (1 diff)
• trunk/agreeable.php (modified) (5 diffs)

agreeable/tags/0.1.2.1/agreeable-options.php

@@ -4 +4 @@
              
             $dbfail = $_POST['ag_fail'];
-          $dbtermm = stripslashes($dbfail);
+          $dbfail = stripslashes($dbfail);
             update_option('ag_fail', $dbfail);
           

agreeable/tags/0.1.2.1/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.1.2
+Version: 0.1.2.1
 Author: buildcreate, thesturs
 Author URI: http://buildcreate.com
@@ -14 +14 @@
     $dbregister = get_option('ag_register');
     
-    if(in_array($GLOBALS['pagenow'], array('wp-login.php')) && $dblogin == 1 || in_array($GLOBALS['pagenow'], array('wp-register.php', 'index.php')) && $dbregister == 1) {
+    if($GLOBALS['pagenow'] == 'wp-login.php' && $dblogin == 1 || in_array('login', $body_class) && $dblogin == 1 || $GLOBALS['pagenow'] == 'wp-register.php' && $dbregister == 1 || in_array('register', $body_class) && $dbregister == 1 ) {
     
          $dbfail = get_option('ag_fail');
@@ -50 +50 @@
     
         // Add an element to the login form, which must be checked
-        echo '<div id="terms-accept"><label><input type="checkbox" name="login_accept" id="login_accept" />&nbsp;<a target="_BLANK" href="'.$dburl.'">'.$dbtermm.'</a></label></div>';
+        echo '<div id="terms-accept"><label><input type="checkbox" name="login_accept" id="login_accept" />&nbsp;<a target="_BLANK" href="'.$dburl.'">'.$dbtermm.'</a></label></div><br>';
     }
 }
@@ -67 +67 @@
 // Add it to the appropriate hooks
 add_filter('wp_authenticate_user', 'wp_authenticate_user_acc', 99999, 2);
+add_filter('registration_errors', 'wp_authenticate_user_acc', 99999, 2);
 add_filter('bp_signup_validate', 'wp_authenticate_user_acc', 9999, 2);
 
@@ -106 +107 @@
 
 function send_feedback() {
-    if($_POST['feedback_email'] && $_POST['feedback_content']) {
+    if(isset($_POST['feedback_email']) && isset($_POST['feedback_content'])) {
         
         $to = '[email protected]';

agreeable/trunk/agreeable-options.php

@@ -4 +4 @@
              
             $dbfail = $_POST['ag_fail'];
-          $dbtermm = stripslashes($dbfail);
+          $dbfail = stripslashes($dbfail);
             update_option('ag_fail', $dbfail);
           

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.1.2
+Version: 0.1.2.1
 Author: buildcreate, thesturs
 Author URI: http://buildcreate.com
@@ -14 +14 @@
     $dbregister = get_option('ag_register');
     
-    if(in_array($GLOBALS['pagenow'], array('wp-login.php')) && $dblogin == 1 || in_array($GLOBALS['pagenow'], array('wp-register.php', 'index.php')) && $dbregister == 1) {
+    if($GLOBALS['pagenow'] == 'wp-login.php' && $dblogin == 1 || in_array('login', $body_class) && $dblogin == 1 || $GLOBALS['pagenow'] == 'wp-register.php' && $dbregister == 1 || in_array('register', $body_class) && $dbregister == 1 ) {
     
          $dbfail = get_option('ag_fail');
@@ -50 +50 @@
     
         // Add an element to the login form, which must be checked
-        echo '<div id="terms-accept"><label><input type="checkbox" name="login_accept" id="login_accept" />&nbsp;<a target="_BLANK" href="'.$dburl.'">'.$dbtermm.'</a></label></div>';
+        echo '<div id="terms-accept"><label><input type="checkbox" name="login_accept" id="login_accept" />&nbsp;<a target="_BLANK" href="'.$dburl.'">'.$dbtermm.'</a></label></div><br>';
     }
 }
@@ -67 +67 @@
 // Add it to the appropriate hooks
 add_filter('wp_authenticate_user', 'wp_authenticate_user_acc', 99999, 2);
+add_filter('registration_errors', 'wp_authenticate_user_acc', 99999, 2);
 add_filter('bp_signup_validate', 'wp_authenticate_user_acc', 9999, 2);
 
@@ -106 +107 @@
 
 function send_feedback() {
-    if($_POST['feedback_email'] && $_POST['feedback_content']) {
+    if(isset($_POST['feedback_email']) && isset($_POST['feedback_content'])) {
         
         $to = '[email protected]';