Changeset 9668

Timestamp:

03/31/2015 11:29:11 PM (11 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Improvemets to bp-xprofile-admin.php

• Introduce xprofile_admin_screen() for outputting the root admin screen content
• Add brackets to conditional statements
• Add @todo regarding feedback message (kvetch)

See #6318.

File:

• trunk/src/bp-xprofile/bp-xprofile-admin.php (modified) (8 diffs)

trunk/src/bp-xprofile/bp-xprofile-admin.php

@@ -22 +22 @@
 function xprofile_add_admin_menu() {
 
-        if ( !bp_current_user_can( 'bp_moderate' ) )
+        // Bail if current user cannot moderate community
+        if ( ! bp_current_user_can( 'bp_moderate' ) ) {
                 return false;
+        }
 
         add_users_page( _x( 'Profile Fields', 'xProfile admin page title', 'buddypress' ), _x( 'Profile Fields', 'Admin Users menu', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
@@ -37 +39 @@
         $type = preg_replace( '|[^a-z]|i', '', $type );
 
+        if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'add_field' == $_GET['mode'] ) {
+                xprofile_admin_manage_field( $_GET['group_id'] );
+
+        } elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && isset( $_GET['field_id'] ) && 'edit_field' == $_GET['mode'] ) {
+                xprofile_admin_manage_field( $_GET['group_id'], $_GET['field_id'] );
+
+        } elseif ( isset( $_GET['mode'] ) && isset( $_GET['field_id'] ) && 'delete_field' == $_GET['mode'] ) {
+                xprofile_admin_delete_field( $_GET['field_id'], 'field');
+
+        } elseif ( isset( $_GET['mode'] ) && isset( $_GET['option_id'] ) && 'delete_option' == $_GET['mode'] ) {
+                xprofile_admin_delete_field( $_GET['option_id'], 'option' );
+
+        } elseif ( isset( $_GET['mode'] ) && 'add_group' == $_GET['mode'] ) {
+                xprofile_admin_manage_group();
+
+        } elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'delete_group' == $_GET['mode'] ) {
+                xprofile_admin_delete_group( $_GET['group_id'] );
+
+        } elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'edit_group' == $_GET['mode'] ) {
+                xprofile_admin_manage_group( $_GET['group_id'] );
+
+        } else {
+                xprofile_admin_screen( $message );
+        }
+}
+
+/**
+ * Output the main XProfile management screen
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @todo Improve error message output
+ */
+function xprofile_admin_screen( $message = '' ) {
+
+        // Get all of the profile groups & fields
         $groups = bp_xprofile_get_groups( array(
                 'fetch_fields' => true
-        ) );
-
-        if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'add_field' == $_GET['mode'] )
-                xprofile_admin_manage_field( $_GET['group_id'] );
-
-        elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && isset( $_GET['field_id'] ) && 'edit_field' == $_GET['mode'] )
-                xprofile_admin_manage_field( $_GET['group_id'], $_GET['field_id'] );
-
-        elseif ( isset( $_GET['mode'] ) && isset( $_GET['field_id'] ) && 'delete_field' == $_GET['mode'] )
-                xprofile_admin_delete_field( $_GET['field_id'], 'field');
-
-        elseif ( isset( $_GET['mode'] ) && isset( $_GET['option_id'] ) && 'delete_option' == $_GET['mode'] )
-                xprofile_admin_delete_field( $_GET['option_id'], 'option' );
-
-        elseif ( isset( $_GET['mode'] ) && 'add_group' == $_GET['mode'] )
-                xprofile_admin_manage_group();
-
-        elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'delete_group' == $_GET['mode'] )
-                xprofile_admin_delete_group( $_GET['group_id'] );
-
-        elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'edit_group' == $_GET['mode'] )
-                xprofile_admin_manage_group( $_GET['group_id'] );
-
-        else { ?>
+        ) ); ?>
 
         <div class="wrap">
@@ -203 +218 @@
 
 <?php
-        }
 }
 
@@ -226 +240 @@
                                 $type    = 'success';
 
-                                if ( 1 == $group_id )
+                                if ( 1 == $group_id ) {
                                         bp_update_option( 'bp-xprofile-base-group-name', $group->name );
+                                }
 
                                 /**
@@ -297 +312 @@
                         $field->type        = wp_filter_kses( $_POST['fieldtype'] );
 
-                        if ( !empty( $_POST["sort_order_{$field->type}"] ) )
+                        if ( !empty( $_POST["sort_order_{$field->type}"] ) ) {
                                 $field->order_by = wp_filter_kses( $_POST["sort_order_{$field->type}"] );
+                        }
 
                         $field->field_order = $wpdb->get_var( $wpdb->prepare( "SELECT field_order FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id ) );
@@ -322 +338 @@
                                 $type = 'success';
 
-                                if ( 1 == $field_id )
+                                if ( 1 == $field_id ) {
                                         bp_update_option( 'bp-xprofile-fullname-field-name', $field->name );
+                                }
 
                                 if ( !empty( $_POST['default-visibility'] ) ) {
@@ -402 +419 @@
         check_admin_referer( 'bp_reorder_fields', '_wpnonce_reorder_fields' );
 
-        if ( empty( $_POST['field_order'] ) )
+        if ( empty( $_POST['field_order'] ) ) {
                 return false;
+        }
 
         parse_str( $_POST['field_order'], $order );
@@ -423 +441 @@
         check_admin_referer( 'bp_reorder_groups', '_wpnonce_reorder_groups' );
 
-        if ( empty( $_POST['group_order'] ) )
+        if ( empty( $_POST['group_order'] ) ) {
                 return false;
+        }
 
         parse_str( $_POST['group_order'], $order );