Changeset 3633 for trunk/bp-friends.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-friends.php (modified) (2 diffs)

trunk/bp-friends.php

@@ -108 +108 @@
 
 function friends_screen_notification_settings() {
-    global $bp; 
-    
-    ?>
-    
+    global $bp;
+
+    $send_requests = get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true );
+    if ( !$send_requests )
+        $send_requests = 'yes';
+
+    $accept_requests = get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true );
+    if ( !$accept_requests )
+        $accept_requests = 'yes';
+?>
     <table class="notification-settings zebra" id="friends-notification-settings">
         <thead>
@@ -126 +132 @@
                 <td></td>
                 <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php checked( $send_requests, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php checked( $send_requests, 'no', true ) ?>/></td>
             </tr>
             <tr id="friends-notification-settings-accepted">
                 <td></td>
                 <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php checked( $accept_requests, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php checked( $accept_requests, 'no', true ) ?>/></td>
             </tr>