Skip to:
Content

BuddyPress.org

Ticket #3114: bp-core-settings.patch

File bp-core-settings.patch, 5.3 KB (added by dimitryz, 14 years ago)

Patch adding a new action and email validation to bp_core_screen_general_settings

  • wp-content/plugins/buddypress/bp-core/bp-core-settings.php

    diff -r c7d828c0f90f wp-content/plugins/buddypress/bp-core/bp-core-settings.php
    a b function bp_core_add_settings_nav() { 
    2424        if ( !is_super_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] )
    2525                bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_my_profile() ) );
    2626}
    2727add_action( 'bp_setup_nav', 'bp_core_add_settings_nav' );
    2828
    2929/**** GENERAL SETTINGS ****/
    3030
    3131function bp_core_screen_general_settings() {
    32         global $current_user, $bp_settings_updated, $pass_error;
     32        global $current_user, $bp_settings_updated, $pass_error, $email_error;
    3333
    3434        $bp_settings_updated = false;
    3535        $pass_error = false;
     36    $email_error = false;
    3637
    3738        if ( isset($_POST['submit']) ) {
    3839                check_admin_referer('bp_settings_general');
    3940
    4041                require_once( WPINC . '/registration.php' );
    4142
    4243                // Form has been submitted and nonce checks out, lets do it.
    4344
    44                 if ( $_POST['email'] != '' )
    45                         $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
     45        do_action('bp_core_screen_general_settings_before_save');
    4646
    47                 if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
    48                         if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
    49                                 $current_user->user_pass = $_POST['pass1'];
    50                         else
    51                                 $pass_error = true;
    52                 } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
    53                         $pass_error = true;
    54                 } else {
    55                         unset( $current_user->user_pass );
    56                 }
     47        if ( !$pass_error && !$email_error ) {
     48            if ( $_POST['email'] != '' )
     49                $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
    5750
    58                 if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
    59                         $bp_settings_updated = true;
     51            if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
     52                if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
     53                    $current_user->user_pass = $_POST['pass1'];
     54                else
     55                    $pass_error = true;
     56            } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
     57                $pass_error = true;
     58            } else {
     59                unset( $current_user->user_pass );
     60            }
     61
     62            if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
     63                $bp_settings_updated = true;
     64        }
    6065        }
    6166
    6267        add_action( 'bp_template_title', 'bp_core_screen_general_settings_title' );
    6368        add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' );
    6469
    6570        bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ) );
    6671}
    6772
    6873function bp_core_screen_general_settings_title() {
    6974        _e( 'General Settings', 'buddypress' );
    7075}
    7176
    7277function bp_core_screen_general_settings_content() {
    73         global $bp, $current_user, $bp_settings_updated, $pass_error; ?>
     78        global $bp, $current_user, $bp_settings_updated, $pass_error, $email_error;
     79   
     80    if ( $email_error ) {
     81        $user_email = $_POST['email'];
     82    } else {
     83        $user_email = $current_user->user_email;
     84    }
     85
     86    ?>
    7487
    7588        <?php if ( $bp_settings_updated && !$pass_error ) { ?>
    7689                <div id="message" class="updated fade">
    7790                        <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
    7891                </div>
    7992        <?php } ?>
    8093
    81         <?php if ( $pass_error && !$bp_settings_updated ) { ?>
     94        <?php if ( ( $pass_error || $email_error ) && !$bp_settings_updated ) { ?>
    8295                <div id="message" class="error fade">
    83                         <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
     96            <?php if ( $pass_error ) { ?>
     97                <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
     98            <?php } ?>
     99
     100            <?php if ( $email_error ) { ?>
     101                <p><?php _e( 'Please enter a valid email address', 'buddypress' ) ?></p>
     102            <?php } ?>
    84103                </div>
    85104        <?php } ?>
    86105
    87106        <form action="<?php echo $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/general' ?>" method="post" class="standard-form" id="settings-form">
    88107                <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
    89                 <input type="text" name="email" id="email" value="<?php echo esc_attr( $current_user->user_email ); ?>" class="settings-input" />
     108                <input type="text" name="email" id="email" value="<?php echo esc_attr( $user_email ); ?>" class="settings-input" />
    90109
    91110                <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
    92111                <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?><br />
    93112                <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
    94113
    95114                <div class="submit">
    96115                        <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" />
    97116                </div>