Changeset 2059 for trunk/bp-core.php

Timestamp:

10/26/2009 07:03:25 PM (15 years ago)

Author:

apeatling

Message:

Merging 1.1 branch updates with trunk

File:

• trunk/bp-core.php (modified) (2 diffs)

trunk/bp-core.php

@@ -1546 +1546 @@
 
     /* Make sure account deletion is not disabled */
-    if ( ( !(int) get_site_option( 'bp-disable-account-deletion' ) && !is_site_admin() ) )
+    if ( ( '' != get_site_option( 'bp-disable-account-deletion' ) || (int) get_site_option( 'bp-disable-account-deletion' ) ) && !is_site_admin() )
         return false;
 
@@ -1716 +1716 @@
 }
 
+/**
+ * bp_core_boot_spammer()
+ *
+ * When a user logs in, check if they have been marked as a spammer. If then simply
+ * redirect them to the home page and stop them from logging in.
+ * 
+ * @package BuddyPress Core
+ * @param $username The username of the user
+ * @uses delete_usermeta() deletes a row from the wp_usermeta table based on meta_key
+ */
+function bp_core_boot_spammer( $auth_obj, $username ) {
+    global $bp;
+    
+    $user = get_userdatabylogin( $username );
+
+    if ( (int)$user->spam )
+        bp_core_redirect( $bp->root_domain );
+}
+add_filter( 'authenticate', 'bp_core_boot_spammer', 11, 2 );
 
 /**