diff -r c7d828c0f90f wp-content/plugins/buddypress/bp-core/bp-core-settings.php
a
|
b
|
function bp_core_add_settings_nav() { |
24 | 24 | if ( !is_super_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] ) |
25 | 25 | 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() ) ); |
26 | 26 | } |
27 | 27 | add_action( 'bp_setup_nav', 'bp_core_add_settings_nav' ); |
28 | 28 | |
29 | 29 | /**** GENERAL SETTINGS ****/ |
30 | 30 | |
31 | 31 | function 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; |
33 | 33 | |
34 | 34 | $bp_settings_updated = false; |
35 | 35 | $pass_error = false; |
| 36 | $email_error = false; |
36 | 37 | |
37 | 38 | if ( isset($_POST['submit']) ) { |
38 | 39 | check_admin_referer('bp_settings_general'); |
39 | 40 | |
40 | 41 | require_once( WPINC . '/registration.php' ); |
41 | 42 | |
42 | 43 | // Form has been submitted and nonce checks out, lets do it. |
43 | 44 | |
44 | | if ( $_POST['email'] != '' ) |
45 | | $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) ); |
| 45 | do_action('bp_core_screen_general_settings_before_save'); |
46 | 46 | |
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'] ) ); |
57 | 50 | |
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 | } |
60 | 65 | } |
61 | 66 | |
62 | 67 | add_action( 'bp_template_title', 'bp_core_screen_general_settings_title' ); |
63 | 68 | add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' ); |
64 | 69 | |
65 | 70 | bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ) ); |
66 | 71 | } |
67 | 72 | |
68 | 73 | function bp_core_screen_general_settings_title() { |
69 | 74 | _e( 'General Settings', 'buddypress' ); |
70 | 75 | } |
71 | 76 | |
72 | 77 | function 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 | ?> |
74 | 87 | |
75 | 88 | <?php if ( $bp_settings_updated && !$pass_error ) { ?> |
76 | 89 | <div id="message" class="updated fade"> |
77 | 90 | <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p> |
78 | 91 | </div> |
79 | 92 | <?php } ?> |
80 | 93 | |
81 | | <?php if ( $pass_error && !$bp_settings_updated ) { ?> |
| 94 | <?php if ( ( $pass_error || $email_error ) && !$bp_settings_updated ) { ?> |
82 | 95 | <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 } ?> |
84 | 103 | </div> |
85 | 104 | <?php } ?> |
86 | 105 | |
87 | 106 | <form action="<?php echo $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/general' ?>" method="post" class="standard-form" id="settings-form"> |
88 | 107 | <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" /> |
90 | 109 | |
91 | 110 | <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label> |
92 | 111 | <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> <?php _e( 'New Password', 'buddypress' ) ?><br /> |
93 | 112 | <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> <?php _e( 'Repeat New Password', 'buddypress' ) ?> |
94 | 113 | |
95 | 114 | <div class="submit"> |
96 | 115 | <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" /> |
97 | 116 | </div> |