<!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][7525] trunk/bp-notifications/bp-notifications-classes.php: Clean up bp-notifications-classes.php.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://buddypress.trac.wordpress.org/changeset/7525">7525</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-11-08 04:12:50 +0000 (Fri, 08 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up bp-notifications-classes.php. See <a href="http://buddypress.trac.wordpress.org/ticket/5148">#5148</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpnotificationsbpnotificationsclassesphp">trunk/bp-notifications/bp-notifications-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpnotificationsbpnotificationsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-notifications/bp-notifications-classes.php (7524 => 7525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-notifications/bp-notifications-classes.php 2013-11-08 03:24:24 UTC (rev 7524)
+++ trunk/bp-notifications/bp-notifications-classes.php 2013-11-08 04:12:50 UTC (rev 7525)
</span><span class="lines">@@ -492,12 +492,11 @@
</span><span class="cx"> 'per_page' => false,
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $bp = buddypress();
-
</del><ins>+ $bp = buddypress();
+ $pag_sql = '';
</ins><span class="cx"> $select_sql = "SELECT *";
</span><span class="cx"> $from_sql = "FROM {$bp->notifications->table_name}";
</span><del>-
- $where_args = array(
</del><ins>+ $where_sql = self::get_where_sql( array(
</ins><span class="cx"> 'id' => $r['id'],
</span><span class="cx"> 'user_id' => $r['user_id'],
</span><span class="cx"> 'item_id' => $r['item_id'],
</span><span class="lines">@@ -506,16 +505,13 @@
</span><span class="cx"> 'component_action' => $r['component_action'],
</span><span class="cx"> 'is_new' => $r['is_new'],
</span><span class="cx"> 'search_terms' => $r['search_terms'],
</span><del>- );
</del><ins>+ ) );
</ins><span class="cx">
</span><del>- $where_sql = self::get_where_sql( $where_args );
-
- $pag_sql = '';
</del><span class="cx"> if ( ! empty( $r['page'] ) && ! empty( $r['per_page'] ) ) {
</span><del>- $page = absint( $r['page'] );
</del><ins>+ $page = absint( $r['page'] );
</ins><span class="cx"> $per_page = absint( $r['per_page'] );
</span><span class="cx"> $offset = $per_page * ( $page - 1 );
</span><del>- $pag_sql = $wpdb->prepare( "LIMIT %d, %d", $offset, $per_page );
</del><ins>+ $pag_sql = $wpdb->prepare( "LIMIT %d, %d", $offset, $per_page );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $sql = "{$select_sql} {$from_sql} {$where_sql} {$pag_sql}";
</span><span class="lines">@@ -537,14 +533,12 @@
</span><span class="cx"> public static function get_total_count( $args ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- $bp = buddypress();
-
</del><ins>+ $bp = buddypress();
</ins><span class="cx"> $select_sql = "SELECT COUNT(*)";
</span><span class="cx"> $from_sql = "FROM {$bp->notifications->table_name}";
</span><span class="cx"> $where_sql = self::get_where_sql( $args );
</span><ins>+ $sql = "{$select_sql} {$from_sql} {$where_sql}";
</ins><span class="cx">
</span><del>- $sql = "{$select_sql} {$from_sql} {$where_sql}";
-
</del><span class="cx"> return $wpdb->get_var( $sql );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -566,7 +560,7 @@
</span><span class="cx"> */
</span><span class="cx"> public static function update( $update_args = array(), $where_args = array() ) {
</span><span class="cx"> $update = self::get_query_clauses( $update_args );
</span><del>- $where = self::get_query_clauses( $where_args );
</del><ins>+ $where = self::get_query_clauses( $where_args );
</ins><span class="cx">
</span><span class="cx"> return self::_update( $update['data'], $where['data'], $update['format'], $where['format'] );
</span><span class="cx"> }
</span><span class="lines">@@ -590,9 +584,8 @@
</span><span class="cx"> return self::_delete( $where['data'], $where['format'] );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /** Convenience methods ***************************************************/
</ins><span class="cx">
</span><del>- /** Convenience methods **********************************************/
-
</del><span class="cx"> /**
</span><span class="cx"> * Delete a single notification by ID.
</span><span class="cx"> *
</span><span class="lines">@@ -622,11 +615,10 @@
</span><span class="cx"> * @return array Associative array of notification items.
</span><span class="cx"> */
</span><span class="cx"> public static function get_all_for_user( $user_id, $status = 'is_new' ) {
</span><del>- $args = array(
</del><ins>+ return self::get( array(
</ins><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'is_new' => 'is_new' === $status,
</span><del>- );
- return self::get( $args );
</del><ins>+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -639,11 +631,10 @@
</span><span class="cx"> * @return array Associative array of unread notification items.
</span><span class="cx"> */
</span><span class="cx"> public static function get_unread_for_user( $user_id = 0 ) {
</span><del>- $args = array(
</del><ins>+ return self::get( array(
</ins><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'is_new' => true,
</span><del>- );
- return self::get( $args );
</del><ins>+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -656,11 +647,10 @@
</span><span class="cx"> * @return array Associative array of unread notification items.
</span><span class="cx"> */
</span><span class="cx"> public static function get_read_for_user( $user_id = 0 ) {
</span><del>- $args = array(
</del><ins>+ return self::get( array(
</ins><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'is_new' => false,
</span><del>- );
- return self::get( $args );
</del><ins>+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -707,7 +697,7 @@
</span><span class="cx"> return array( 'notifications' => &$notifications, 'total' => $total_count );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /** Mark Read *************************************************************/
</del><ins>+ /** Mark ******************************************************************/
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Mark all user notifications as read.
</span><span class="lines">@@ -730,15 +720,19 @@
</span><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( $component_name ) {
</del><ins>+ if ( !empty( $item_id ) ) {
+ $where_args['item_id'] = $item_id;
+ }
+
+ if ( !empty( $component_name ) ) {
</ins><span class="cx"> $where_args['component_name'] = $component_name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $component_action ) {
</del><ins>+ if ( !empty( $component_action ) ) {
</ins><span class="cx"> $where_args['component_action'] = $component_action;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $secondary_item_id ) {
</del><ins>+ if ( !empty( $secondary_item_id ) ) {
</ins><span class="cx"> $where_args['secondary_item_id'] = $secondary_item_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -765,15 +759,15 @@
</span><span class="cx"> 'item_id' => $user_id,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( $component_name ) {
</del><ins>+ if ( !empty( $component_name ) ) {
</ins><span class="cx"> $where_args['component_name'] = $component_name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $component_action ) {
</del><ins>+ if ( !empty( $component_action ) ) {
</ins><span class="cx"> $where_args['component_action'] = $component_action;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $secondary_item_id ) {
</del><ins>+ if ( !empty( $secondary_item_id ) ) {
</ins><span class="cx"> $where_args['secondary_item_id'] = $secondary_item_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -807,15 +801,15 @@
</span><span class="cx"> 'item_id' => $item_id,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( $component_name ) {
</del><ins>+ if ( !empty( $component_name ) ) {
</ins><span class="cx"> $where_args['component_name'] = $component_name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $component_action ) {
</del><ins>+ if ( !empty( $component_action ) ) {
</ins><span class="cx"> $where_args['component_action'] = $component_action;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $secondary_item_id ) {
</del><ins>+ if ( !empty( $secondary_item_id ) ) {
</ins><span class="cx"> $where_args['secondary_item_id'] = $secondary_item_id;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>