Changeset 3592 for trunk/bp-core/bp-core-settings.php

Timestamp:

12/27/2010 10:57:31 PM (14 years ago)

Author:

djpaul

Message:

Removes trailing whitespace. Fixes #2965, props cnorris23

File:

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

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

@@ -24 +24 @@
     if ( !is_super_admin() && empty( $bp->site_options['bp-disable-account-deletion'] ) )
         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() ) );
-    
+
     do_action( 'bp_core_settings_setup_nav' );
 }
@@ -45 +45 @@
 
         // Form has been submitted and nonce checks out, lets do it.
-        
+
         // Validate the user again for the current password when making a big change
         if ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password($_POST['pwd'], $current_user->user_pass, $current_user->ID) ) {
- 
+
             // Make sure changing an email address does not already exist
             if ( $_POST['email'] != '' ) {
- 
+
                 // What is missing from the profile page vs signup - lets double check the goodies
                 $user_email = sanitize_email( wp_specialchars( trim( $_POST['email'] ) ) );
- 
+
                 if ( !is_email( $user_email ) )
                     $email_error = true;
- 
+
                 $limited_email_domains = get_site_option( 'limited_email_domains', 'buddypress' );
- 
+
                 if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
                     $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
- 
+
                     if ( in_array( $emaildomain, (array)$limited_email_domains ) == false ) {
                         $email_error = true;
-                        
+
                     }
                 }
- 
+
                 if ( !$email_error && $current_user->user_email != $user_email  ) {
-                
+
                     //we don't want email dups in the system
                     if ( email_exists( $user_email ) )
                         $email_error = true;
-                        
+
                     if (!$email_error)
                         $current_user->user_email = $user_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;
@@ -92 +92 @@
                 unset( $current_user->user_pass );
             }
- 
+
             if ( !$email_error && !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
                 $bp_settings_updated = true;
-            
+
         } else {
             $pwd_error = true;
         }
-        
+
         do_action( 'bp_core_general_settings_after_save' );
     }
@@ -127 +127 @@
         </div>
     <?php } ?>
-    
+
     <?php if ( $pwd_error && !$bp_settings_updated ) { ?>
         <div id="message" class="error fade">
@@ -134 +134 @@
     <?php } ?>
 
-    <?php 
+    <?php
     if ( $email_error && !$bp_settings_updated ) { ?>
         <div id="message" class="error fade">
@@ -153 +153 @@
         <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?><br />
         <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
-        
+
         <?php do_action( 'bp_core_general_settings_before_submit' ) ?>
 
@@ -159 +159 @@
             <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" />
         </div>
-        
+
         <?php do_action( 'bp_core_general_settings_after_submit' ) ?>
 
@@ -184 +184 @@
 
         $bp_settings_updated = true;
-        
+
         do_action( 'bp_core_notification_settings_after_save' );
     }
@@ -217 +217 @@
 
         <?php do_action( 'bp_core_notification_settings_after_submit' ) ?>
-        
+
         <?php wp_nonce_field('bp_settings_notifications') ?>
 
@@ -257 +257 @@
 
         <?php do_action( 'bp_core_delete_account_before_submit' ) ?>
-        
+
         <div class="submit">
             <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &rarr;" id="delete-account-button" name="delete-account-button" />
         </div>
-        
+
         <?php do_action( 'bp_core_delete_account_after_submit' ) ?>