<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][3633] trunk: Cleanup code in notification settings, and don't reinvent the wheel.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3633</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-31 18:05:34 +0000 (Fri, 31 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup code in notification settings, and don't reinvent the wheel. Fixes #2987, props wpmuguru</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpmessagesphp">trunk/bp-messages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3632 => 3633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-12-31 18:01:24 UTC (rev 3632)
+++ trunk/bp-activity.php 2010-12-31 18:05:34 UTC (rev 3633)
</span><span class="lines">@@ -202,10 +202,16 @@
</span><span class="cx"> add_action( 'wp', 'bp_activity_screen_single_activity_permalink', 3 );
</span><span class="cx">
</span><span class="cx"> function bp_activity_screen_notification_settings() {
</span><del>- global $bp;
-
- ?>
-
</del><ins>+ global $bp;
+
+ $mention = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true );
+ if ( !$mention )
+ $mention = 'yes';
+
+ $reply = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true );
+ if ( !$reply )
+ $reply = 'yes';
+?>
</ins><span class="cx"> <table class="notification-settings zebra" id="activity-notification-settings">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -220,14 +226,14 @@
</span><span class="cx"> <tr id="activity-notification-settings-mentions">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ?></td>
</span><del>- <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
</del><ins>+ <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php checked( $mention, 'yes', true ) ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php checked( $mention, 'no', true ) ?>/></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr id="activity-notification-settings-replies">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( "A member replies to an update or comment you've posted", 'buddypress' ) ?></td>
</span><del>- <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
</del><ins>+ <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php checked( $reply, 'yes', true ) ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php checked( $reply, 'no', true ) ?>/></td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_activity_screen_notification_settings' ) ?>
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (3632 => 3633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2010-12-31 18:01:24 UTC (rev 3632)
+++ trunk/bp-friends.php 2010-12-31 18:05:34 UTC (rev 3633)
</span><span class="lines">@@ -107,10 +107,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function friends_screen_notification_settings() {
</span><del>- global $bp;
-
- ?>
-
</del><ins>+ 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';
+?>
</ins><span class="cx"> <table class="notification-settings zebra" id="friends-notification-settings">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -125,14 +131,14 @@
</span><span class="cx"> <tr id="friends-notification-settings-request">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr id="friends-notification-settings-accepted">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'friends_screen_notification_settings' ); ?>
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3632 => 3633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-12-31 18:01:24 UTC (rev 3632)
+++ trunk/bp-groups.php 2010-12-31 18:05:34 UTC (rev 3633)
</span><span class="lines">@@ -947,10 +947,24 @@
</span><span class="cx"> add_action( 'wp', 'groups_screen_group_admin_delete_group', 4 );
</span><span class="cx">
</span><span class="cx"> function groups_screen_notification_settings() {
</span><del>- global $bp;
-
- ?>
-
</del><ins>+ 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';
+?>
</ins><span class="cx"> <table class="notification-settings zebra" id="groups-notification-settings">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -965,26 +979,26 @@
</span><span class="cx"> <tr id="groups-notification-settings-invitation">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr id="groups-notification-settings-info-updated">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr id="groups-notification-settings-promoted">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr id="groups-notification-settings-request">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'groups_screen_notification_settings' ); ?>
</span></span></pre></div>
<a id="trunkbpmessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages.php (3632 => 3633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages.php 2010-12-31 18:01:24 UTC (rev 3632)
+++ trunk/bp-messages.php 2010-12-31 18:05:34 UTC (rev 3633)
</span><span class="lines">@@ -167,10 +167,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function messages_screen_notification_settings() {
</span><del>- global $bp;
-
- ?>
-
</del><ins>+ global $bp;
+
+ $new_messages = get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true );
+ if ( !$new_messages )
+ $new_messages = 'yes';
+
+ $new_notices = get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true );
+ if ( !$new_notices )
+ $new_notices = 'yes';
+?>
</ins><span class="cx"> <table class="notification-settings zebra" id="messages-notification-settings">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -185,14 +191,14 @@
</span><span class="cx"> <tr id="messages-notification-settings-new-message">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
</span><del>- <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
</del><ins>+ <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php checked( $new_messages, 'yes', true ) ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php checked( $new_messages, 'no', true ) ?>/></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr id="messages-notification-settings-new-site-notice">
</span><span class="cx"> <td></td>
</span><span class="cx"> <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
</span><del>- <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
</del><ins>+ <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php checked( $new_notices, 'yes', true ) ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php checked( $new_notices, 'no', true ) ?>/></td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'messages_screen_notification_settings' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>