Changeset 3633 for trunk/bp-groups.php

Timestamp:

12/31/2010 06:05:34 PM (14 years ago)

Author:

djpaul

Message:

Cleanup code in notification settings, and don't reinvent the wheel. Fixes #2987, props wpmuguru

File:

• trunk/bp-groups.php (modified) (2 diffs)

trunk/bp-groups.php

@@ -948 +948 @@
 
 function groups_screen_notification_settings() {
-    global $bp; 
-    
-    ?>
-    
+    global $bp;
+
+    $group_invite = get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true );
+    if ( !$group_invite )
+        $group_invite = 'yes';
+
+    $group_update = get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true );
+    if ( !$group_update )
+        $group_update = 'yes';
+
+    $group_promo = get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true );
+    if ( !$group_promo )
+        $group_promo = 'yes';
+
+    $group_request = get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true );
+    if ( !$group_request )
+        $group_request = 'yes';
+?>
     <table class="notification-settings zebra" id="groups-notification-settings">
         <thead>
@@ -966 +980 @@
                 <td></td>
                 <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php checked( $group_invite, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php checked( $group_invite, 'no', true ) ?>/></td>
             </tr>
             <tr id="groups-notification-settings-info-updated">
                 <td></td>
                 <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php checked( $group_update, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php checked( $group_update, 'no', true ) ?>/></td>
             </tr>
             <tr id="groups-notification-settings-promoted">
                 <td></td>
                 <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php checked( $group_promo, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php checked( $group_promo, 'no', true ) ?>/></td>
             </tr>
             <tr id="groups-notification-settings-request">
                 <td></td>
                 <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php checked( $group_request, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php checked( $group_request, 'no', true ) ?>/></td>
             </tr>