Changeset 2059

Timestamp:

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

Author:

apeatling

Message:

Merging 1.1 branch updates with trunk

Location:

trunk

Files:

• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

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 );
 
 /**

trunk/bp-core/bp-core-settings.php

@@ -154 +154 @@
 /**** DELETE ACCOUNT ****/
 
-function bp_core_screen_delete_account() {
-    global $current_user, $bp_settings_updated, $pass_error;
-    
-    if ( isset( $_POST['delete-account-button'] ) ) {
+function bp_core_screen_delete_account() {  
+    if ( isset( $_POST['delete-account-understand'] ) ) {
         check_admin_referer( 'delete-account' );
-        
+
         // delete the users account
         if ( bp_core_delete_account() )
             bp_core_redirect( site_url() );
-    }
-    
-    $bp_settings_updated = false;
-    $pass_error = false;
-    
-    if ( isset($_POST['submit']) ) {
-        check_admin_referer('bp_settings_general');
-        
-        require_once( WPINC . '/registration.php' );
-        
-        // Form has been submitted and nonce checks out, lets do it.
-        
-        if ( $_POST['email'] != '' ) {
-            $current_user->user_email = wp_specialchars( trim( $_POST['email'] ));
-        }
-
-        if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
-            if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) ) {
-                $current_user->user_pass = $_POST['pass1'];
-            } else {
-                $pass_error = true;
-            }
-        } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
-            $pass_error = true;
-        } else {
-            unset( $current_user->user_pass );
-        }
-        
-        if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
-            $bp_settings_updated = true;
     }
     

trunk/bp-xprofile.php

@@ -328 +328 @@
         /* Loop through the posted fields formatting any datebox values then validate the field */
         foreach ( $posted_field_ids as $field_id ) {        
-            
+
             if ( !isset( $_POST['field_' . $field_id] ) ) {
-                
-                if ( isset( $_POST['field_' . $field_id . '_day'] ) ) {
+
+                if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
                     /* Concatenate the values. */
                     $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .  
                                   $_POST['field_' . $field_id . '_month'] . ' ' .
                                   $_POST['field_' . $field_id . '_year'];
-                        
+
                     /* Turn the concatenated value into a timestamp */
                     $_POST['field_' . $field_id] = strtotime( $date_value );
                 }
-                
+
             }
-            
+
             if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
                 $errors = true;
         }
-        
+
         if ( $errors )
             bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );          

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -470 +470 @@
             
             case 'datebox':
-            
-                if ( $field->data->value != '' ) {
+
+                if ( !empty( $field->data->value ) ) {
                     $day = date("j", $field->data->value);
                     $month = date("F", $field->data->value);