Changeset 5837

Timestamp:

02/24/2012 10:34:38 PM (13 years ago)

Author:

boonebgorges

Message:

Allows users to modify profile field visibility during registration. Fixes #4044.

Location:

trunk

Files:

• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-members/bp-members-screens.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-caps.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-template.php (modified) (1 diff)

trunk/bp-members/bp-members-functions.php

@@ -1051 +1051 @@
                     $current_field = $usermeta["field_{$field_id}"];
                     xprofile_set_field_data( $field_id, $user_id, $current_field );
+                    
+                    // Save the visibility level
+                    $visibility_level = !empty( $usermeta['field_' . $field_id . '_visibility'] ) ? $usermeta['field_' . $field_id . '_visibility'] : 'public';
+                    xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
                 }
             }
@@ -1109 +1113 @@
                     if ( !empty( $current_field ) )
                         xprofile_set_field_data( $field_id, $user_id, $current_field );
+                    
+                    // Save the visibility level
+                    $visibility_level = !empty( $user['meta']['field_' . $field_id . '_visibility'] ) ? $user['meta']['field_' . $field_id . '_visibility'] : 'public';
+                    xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
                 }
             }

trunk/bp-members/bp-members-screens.php

@@ -170 +170 @@
                     if ( !empty( $_POST['field_' . $field_id] ) )
                         $usermeta['field_' . $field_id] = $_POST['field_' . $field_id];
+                    
+                    if ( !empty( $_POST['field_' . $field_id . '_visibility'] ) )
+                        $usermeta['field_' . $field_id . '_visibility'] = $_POST['field_' . $field_id . '_visibility'];
                 }
 

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -2399 +2399 @@
     font-size: .9em;
 }
+body.register div.page ul {
+    list-style: none;
+}

trunk/bp-themes/bp-default/registration/register.php

@@ -154 +154 @@
 
                                 <?php endif; ?>
+                                
+                                <?php if ( bp_current_user_can( 'bp_xprofile_change_field_visibility' ) ) : ?>
+                                    <div class="field-visibility-settings-toggle" id="field-visibility-settings-toggle-<?php bp_the_profile_field_id() ?>">
+                                        <?php printf( __( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?> <a href="#" class="visibility-toggle-link">Change</a>
+                                    </div>
+                                    
+                                    <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id() ?>">
+                                        <label for="field-visibility"><?php _e( 'Who can see this field?', 'buddypress' ) ?></label>
+                                        
+                                        <?php bp_profile_visibility_radio_buttons() ?>
+                                        
+                                        <a class="field-visibility-settings-close" href="#"><?php _e( 'Close', 'buddypress' ) ?></a>
+                                    </div>
+                                <?php else : ?>
+                                    <div class="field-visibility-settings-notoggle" id="field-visibility-settings-toggle-<?php bp_the_profile_field_id() ?>">
+                                        <?php printf( __( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?>
+                                    </div>          
+                                <?php endif ?>
+
 
                                 <?php do_action( 'bp_custom_profile_edit_fields' ); ?>

trunk/bp-xprofile/bp-xprofile-caps.php

@@ -29 +29 @@
     switch ( $cap ) {
         case 'bp_xprofile_change_field_visibility' :
-            $caps = array( 'read' );
+            $caps = array( 'exist' ); // Must allow for logged-out users during registration
 
             // You may pass args manually: $field_id, $profile_user_id
@@ -48 +48 @@
 
             // Friends don't let friends edit each other's visibility
-            // @todo - This would be a proper map if we used CPTs?
             if ( $profile_user_id != bp_displayed_user_id() && !bp_current_user_can( 'bp_moderate' ) ) {
                 $caps[] = 'do_not_allow'; 

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -229 +229 @@
                     }
                 }
-                        
-                if ( $fetch_visibility_level ) {
-                    $fields = self::fetch_visibility_level( $user_id, $fields );
-                }
+            }
+                                
+            if ( $fetch_visibility_level ) {
+                $fields = self::fetch_visibility_level( $user_id, $fields );
             }
         }

trunk/bp-xprofile/bp-xprofile-template.php

@@ -160 +160 @@
     
     // We only need to fetch visibility levels when viewing your own profile
-    if ( bp_is_my_profile() || bp_current_user_can( 'bp_moderate' ) ) {
+    if ( bp_is_my_profile() || bp_current_user_can( 'bp_moderate' ) || bp_is_register_page() ) {
         $fetch_visibility_level_default = true;
     } else {