Changeset 973415

Timestamp:

08/26/2014 04:34:49 PM (11 years ago)

Author:

buildcreate

Message:

Misc multisite and buddypress fixes

Location:

agreeable/trunk

Files:

• agreeable.php (modified) (7 diffs)
• readme.txt (modified) (2 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.  Based on the I-Agree plugin by Michael Stursberg.
-Version: 1.3.2
+Version: 1.3.3
 Author: kraftpress
 Author URI: http://kraftpress.it
@@ -30 +30 @@
 
         /* Initialize the plugin */
-        add_action('init', array($this, 'ag_language_init'));
+        add_action('init', array($this, 'init'));
         add_action('admin_enqueue_scripts', array($this, 'ag_admin'));
         add_action('wp_enqueue_scripts', array($this, 'ag_front'));
@@ -58 +58 @@
         add_action('tml_register_form', array($this, 'ag_register_terms_accept'), 10, 3);
         add_action('bp_after_login_widget_loggedout', array($this, 'ag_widget_terms_accept'));
-
-        if (is_multisite()) {
-            add_action( 'signup_extra_fields', 'ag_register_terms_accept', 10, 3);
-            add_action( 'signup_blogform', 'ag_register_terms_accept', 10, 3);
-        }
 
         $this->options = array(
@@ -94 +89 @@
     }
 
-    function ag_language_init() {
+    function init() {
         // Localization
         load_plugin_textdomain('agreeable', false, basename( dirname( __FILE__ ) ) . '/languages' );
+        
+        if (is_multisite()) {
+            add_action( 'signup_extra_fields', array($this, 'ag_register_terms_accept'), 10, 3);
+            add_action( 'signup_blogform', array($this, 'ag_register_terms_accept'), 10, 3);
+        }
     }
 
     function ag_admin() {
+    
         /* Plugin Stylesheet */
         wp_enqueue_style( 'agreeable-css', plugins_url('css/admin.css', __FILE__), '', '0.3.4', 'screen');
+        
     }
 
     function ag_front() {
+    
         /* Only load lightbox code on the frontend, where we need it */
         if ( $this->is_login_page() ) {
             wp_enqueue_script('jquery');
         }
+        
         wp_enqueue_script( 'magnific', plugins_url('js/magnific.js', __FILE__),'', '', true);
         wp_enqueue_script( 'agreeable-js', plugins_url('js/agreeable.js', __FILE__), '', '', true);
         wp_enqueue_style( 'magnific', plugins_url('css/magnific.css', __FILE__));
         wp_enqueue_style( 'agreeable-css', plugins_url('css/front.css', __FILE__));
+        
     }
 
@@ -160 +165 @@
 
                 if(is_multisite()) {
-
+                    
+                    $result = $user;
                     $result['errors'] = $errors;
-                    $result['errors']->add('ag_did_not_accept', $this->options['fail_text']);
-
+                    
                     return $result;
 
@@ -268 +273 @@
         $errors = new WP_Error();
 
-        if(isset($_SESSION['ag_errors']) && $errors->get_error_message( 'ag_did_not_accept' ) != '' ) {
+        if(isset($_SESSION['ag_errors']) && $errors->get_error_message( 'ag_did_not_accept' ) == '' ) {
 
             $error = $_SESSION['ag_errors'];
@@ -323 +328 @@
         if($this->options['register'] == 1) {
             $this->ag_display_terms_form('register', $errors);
-        }
-
-        echo '<script>';
-        echo '
-                jQuery(document).ready(function($){
-                    if($("#theme-my-login")) {
-                        $("#theme-my-login #terms-accept").insertBefore("#theme-my-login .submit");
-                    }
-                });
-            ';
-        echo '</script>';
-
+            
+            echo '<script>';
+            echo '
+                    jQuery(document).ready(function($){
+                        if($("#theme-my-login")) {
+                            $("#theme-my-login #terms-accept").insertBefore("#theme-my-login .submit");
+                        }
+                    });
+                ';
+            echo '</script>';
+            
+        }
+        return;
     }
 

agreeable/trunk/readme.txt

@@ -9 +9 @@
 
 == Description ==
-Add an "agree to terms" check box to your login and/or registration pages, requiring users to agree prior to logging in or registering. Tested with BuddyPress.  Based on the I-Agree plugin by thesturs.
+Add an "agree to terms" check box to your login, registration, or comment forms, requiring users to agree. Tested with BuddyPress and Multisite.  Based on the I-Agree plugin by thesturs.
 
 Use the form in the plugin settings page to contact us with feature requests, comments, or concerns.
 
-= New! =
-* Lightbox is now RESPONSIVE!  And prettier :)
-* Customize your lightbox background and text colors
-* Disable the lightbox if you want
-* Add the checkbox to your comment forms now too!
-
 = Features =
 * Select your terms page from a dropdown
-* Terms open in a lightbox or new tab
+* Terms open in a responsive lightbox or new tab
 * Tested with WP, BuddyPress, and bbPress login widgets
 * Customizable text and error message
+
+= Extensions =
+* [Agreeable Records] (http://kraftpress.it/downloads/agreeable-records/, "Agreeable Records Premium Plugin Extension") allows you to track user agreement by IP and username each time they log in.
 
 = Translations =
@@ -41 +38 @@
 
 == Changelog ==
+
+= 1.3.3 =
+* Misc Multisite and BuddyPress bug fixes
 
 = 1.3 =