Changeset 1784

Timestamp:

09/03/2009 07:48:41 PM (17 years ago)

Author:

apeatling

Message:

Added ability for admins to disable account deletion.

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-admin.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (5 diffs)

trunk/bp-core.php

@@ -1326 +1326 @@
         global $bp;
 
-        // Be careful with this function!
-        
+        /* Make sure account deletion is not disabled */
+        if ( 1 == (int)get_site_option( 'bp-disable-account-deletion' ) )
+                return false;
+
         /* Site admins should not be allowed to delete their accounts */
         if ( is_site_admin() )
                 return false;
-        
+
         require_once( ABSPATH . '/wp-admin/includes/mu.php' );
         require_once( ABSPATH . '/wp-admin/includes/user.php' );

trunk/bp-core/bp-core-admin.php

@@ -85 +85 @@
                                         </td>                   
                                 </tr>
-                                <?php } ?>
-                                
+                                <?php } ?>                              
+                                <tr>
+                                        <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
+                                        <td>
+                                                <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( (int)get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
+                                                <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( !(int)get_site_option( 'bp-disable-account-deletion' ) || '' == get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
+                                        </td>                   
+                                </tr>                           
                                 <?php if ( !locate_template( array( 'registration/register.php' ) ) ) :?>
                                 <tr>

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

@@ -22 +22 @@
         bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_home() ) );
         
-        if ( !is_site_admin() )
+        if ( !is_site_admin() && 1 != (int)get_site_option( '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_home() ) );
 }
@@ -36 +36 @@
         $pass_error = false;
         
-        if ( isset($_POST['submit']) && check_admin_referer('bp_settings_general') ) {
+        if ( isset($_POST['submit']) ) {
+                check_admin_referer('bp_settings_general');
+                
                 require_once( WPINC . '/registration.php' );
                 
@@ -105 +107 @@
         $bp_settings_updated = false;
         
-        if ( $_POST['submit'] && check_admin_referer('bp_settings_notifications') ) {
+        if ( $_POST['submit'] ) {
+                check_admin_referer('bp_settings_notifications');
+                
                 if ( $_POST['notifications'] ) {
                         foreach ( $_POST['notifications'] as $key => $value ) {
@@ -153 +157 @@
         global $current_user, $bp_settings_updated, $pass_error;
         
-        if ( isset( $_POST['delete-account-button'] ) && check_admin_referer('delete-account') ) {
-                if ( !check_admin_referer( 'delete-account' ) )
-                        return false;
+        if ( isset( $_POST['delete-account-button'] ) ) {
+                check_admin_referer( 'delete-account' );
                 
                 // delete the users account
@@ -165 +168 @@
         $pass_error = false;
         
-        if ( isset($_POST['submit']) && check_admin_referer('bp_settings_general') ) {
+        if ( isset($_POST['submit']) ) {
+                check_admin_referer('bp_settings_general');
+                
                 require_once( WPINC . '/registration.php' );