Ticket #1471: 1471-1.diff

bb-templates/kakumei/style.css

@@ -695 +695 @@
         margin-top: -8px;
 }
 
-#latest td, #forumlist td, #favorites td { padding: 5px 10px; }
+#latest td, #forumlist td, #favorites td, #subscriptions td { padding: 5px 10px; }
 
 #forumlist tr td div.nest {
         padding-left: 2.5ex;
 }
 
-#latest tr:hover, #forumlist tr:hover, #favorites tr:hover { background-color: #e4f3e1; }
+#latest tr:hover, #forumlist tr:hover, #favorites tr:hover, #subscriptions tr:hover { background-color: #e4f3e1; }
 
-#latest th, #forumlist th, #favorites th {
+#latest th, #forumlist th, #favorites th, #subscriptions th {
         text-align: left;
         background-color: rgb(102, 102, 102);
         font: 11px Verdana,Arial,Helvetica,sans-serif;
@@ -712 +712 @@
         color: rgb(255, 255, 255);
 }
 
-#latest th a, #forumlist th a, #favorites th a {
+#latest th a, #forumlist th a, #favorites th a, #subscriptions th a {
         color: rgb(200, 200, 200);
         font-style: italic;
 }
 
-#latest th a:hover, #forumlist th a:hover, #favorites th a:hover {
+#latest th a:hover, #forumlist th a:hover, #favorites th a:hover, #subscriptions th a:hover {
         color: rgb(255, 255, 255);
 }
 
@@ -725 +725 @@
         background-color: #ddd;
 }
 
-#latest, #forumlist, #favorites {
+#latest, #forumlist, #favorites, #subscriptions  {
         background-color: #f7f7f7;
         margin-bottom: 3em;
         width: 100%;

bb-templates/kakumei/subscriptions.php

@@ +1 @@
+<?php bb_get_header(); ?>
+
+<div class="bbcrumb"><a href="<?php bb_uri(); ?>"><?php bb_option('name'); ?></a> &raquo; <a href="<?php user_profile_link( $user_id ); ?>"><?php echo get_user_display_name( $user_id ); ?></a> &raquo; <?php _e('Subscriptions'); ?></div>
+
+<h2 id="userlogin" role="main"><?php echo get_user_display_name( $user->ID ); ?> <small>(<?php echo get_user_name( $user->ID ); ?>)</small> <?php _e( 'subscriptions' ); ?><?php if ( !empty( $topics ) ) echo ' (' . count( $topics ) . ')'; ?></h2>
+
+<p class="lead-in"><?php _e('Subscriptions allow you to receive an email each time a reply is posted on your subscribed forum topics.'); ?></p>
+
+<?php if ( count( $topics ) > 1 ) : ?>
+        <p><a href="<?php echo bb_get_uri( null, array( 'doit' => 'bb-subscribe', 'remove_all' => true, 'user_id' => $user_id ) ) ?>"><?php _e( 'Unsubscribe from all topics' ) ?></a></p>
+<?php endif; ?>
+
+<?php
+if ( !empty( $_GET['unsubscribed'] ) ) {
+        if ( 'all' == $_GET['unsubscribed'] ) {
+                echo '<p class="subscribed">' . __( "You are now unubscribed from all topics." ) . '</p>';
+        } elseif ( is_numeric( $_GET['unsubscribed'] ) && !bb_is_user_subscribed( array( 'user_id' => $user_id, 'topic_id' => (int) $_GET['unsubscribed'] ) ) ) {
+                $unsub_id = (int) $_GET['unsubscribed'];
+                echo '<p class="subscribed">' . sprintf( __( "You are now unubscribed from the '<a href='%s'>%s</a>' topic." ), get_topic_link( $unsub_id ), get_topic_title( $unsub_id ) ) . '</p>';
+        }
+}
+?>
+
+<?php if ( !empty( $topics ) ) : ?>
+
+<table id="subscriptions">
+        <tr>
+                <th><?php _e('Topic'); ?></th>
+                <th><?php _e('Post Count'); ?></th>
+                <th><?php _e('Freshness'); ?></th>
+                <th><?php _e('Remove'); ?></th>
+        </tr>
+        <?php foreach ( $topics as $topic ) : ?>
+                <tr<?php topic_class(); ?>>
+                        <td><?php bb_topic_labels(); ?> <a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></td>
+                        <td class="num"><?php topic_posts(); ?></td>
+                        <td class="num"><?php topic_time(); ?></td>
+                        <td class="num">[<a href="<?php echo bb_nonce_url( bb_get_uri( null, array( 'doit' => 'bb-subscribe', 'topic_id' => $topic->topic_id, 'and' => 'remove', 'redirect_to' => urlencode( add_query_arg( array( 'unsubscribed' => $topic->topic_id ), get_subscriptions_link( $user_id ) ) ) ) ), 'toggle-subscribe_' . $topic->topic_id ) ?>">X</a>]</td>
+                </tr>
+        <?php endforeach; ?>
+</table>
+
+<?php else: if ( $user_id == $bb_current_user->ID ) : ?>
+
+<p style="margin-left: 12px;"><?php _e('You currently have no subscriptions.'); ?></p>
+
+<?php else : ?>
+
+<p style="margin-left: 12px;"><?php echo get_user_name( $user_id ); ?> <?php _e('currently has no subscriptions.'); ?></p>
+
+<?php endif; endif; ?>
+
+<?php bb_get_footer(); ?>
+ No newline at end of file

bb-includes/functions.bb-users.php

@@ -494 +494 @@
         do_action('bb_remove_user_favorite', $user_id, $topic_id);
         return true;
 }
+
+/**
+ * Get all topics the user is subscribed to
+ *
+ * @since 1.2
+ * @param int $user_id ID of user
+ * @param int $limit the max amount of topics to return
+ * @return array $topics the topics the user is subscribed to
+ */
+function bb_get_user_subscriptions( $user_id = '', $limit = 250 ) {
+
+        if ( !bb_is_user_logged_in() )
+                return false;
+
+        if ( empty( $user_id ) )
+                $user_id = bb_get_current_user_info( 'id' );
+
+        if ( $user_id != bb_get_current_user_info( 'id' ) && !bb_current_user_can( 'edit_favorites_of', $user_id ) )
+                return false;
+
+        global $bbdb;
+        $topics = array();
+
+        $topic_ids = $bbdb->get_results( $bbdb->prepare( "SELECT slug FROM `$bbdb->term_relationships` AS tr JOIN `$bbdb->term_taxonomy` as tt ON tt.`term_taxonomy_id` = tr.`term_taxonomy_id` JOIN $bbdb->terms AS terms ON terms.`term_id` = tt.`term_id` WHERE tt.`taxonomy` = 'bb_subscribe' AND tr.`object_id` = %d LIMIT 0, %d", $user_id, $limit ) );
+        if ( !empty( $topic_ids ) ) {
+                foreach ( $topic_ids as $term_object ) {
+                        $_topic_id = explode( 'topic-', $term_object->slug );
+                        $topic_id = (int) $_topic_id[1];
+                        if ( $bbdb->get_var( $bbdb->prepare( "SELECT topic_id FROM $bbdb->topics WHERE topic_id = %d AND topic_status = 0", $topic_id ) ) )
+                                $topics[] = get_topic( $topic_id );
+                }
+        }
+
+        return apply_filters( 'bb_get_user_subscriptions', $topics );
+
+}
+ No newline at end of file

bb-includes/action.subscribe.php

@@ -1 @@
-<?php
-
-if ( !isset( $_GET['doit'] ) || 'bb-subscribe' != $_GET['doit'] ) // sanity check
-        bb_die( __( 'What are you trying to do, exactly?' ) );
-
-if ( !bb_is_subscriptions_active() )
-        bb_die( __( 'You can not subscribe to topics.' ) );
-
-if ( !isset( $_GET['topic_id'] ) )
-        bb_die( __( 'Missing topic ID!' ) );
-
-bb_auth( 'logged_in' );
-
-$topic_id = (int) $_GET['topic_id'];
-
-$topic = get_topic( $topic_id );
-if ( !$topic )
-        bb_die( __( 'Topic not found! What are you subscribing to?' ) );
-
-bb_check_admin_referer( 'toggle-subscribe_' . $topic_id );
-
-// Okay, we should be covered now
-
-if ( in_array( $_GET['and'], array( 'add', 'remove' ) ) )
-        bb_subscription_management( $topic->topic_id, $_GET['and'] );
-
-wp_redirect( get_topic_link( $topic_id, 1 ) );
-
-exit;
+<?php
+
+if ( !isset( $_GET['doit'] ) || 'bb-subscribe' != $_GET['doit'] ) // sanity check
+        bb_die( __( 'What are you trying to do, exactly?' ) );
+
+if ( !bb_is_subscriptions_active() )
+        bb_die( __( 'You can not un/subscribe to topics.' ) );
+
+bb_auth( 'logged_in' );
+
+$default_redirect_to = get_subscriptions_link();
+
+// single topic
+if ( !empty( $_GET['topic_id'] ) && is_numeric( $_GET['topic_id'] ) ) {
+        $topic_id = (int) $_GET['topic_id'];
+
+        $topic = get_topic( $topic_id );
+        if ( !$topic )
+                bb_die( __( 'Topic not found! What are you subscribing to?' ) );
+
+        bb_check_admin_referer( 'toggle-subscribe_' . $topic_id );
+
+        if ( in_array( $_GET['and'], array( 'add', 'remove' ) ) )
+                bb_subscription_management( $topic->topic_id, $_GET['and'] );
+
+        $default_redirect_to = get_topic_link( $topic_id, 1 );
+}
+
+// unsub all
+if ( !empty( $_GET['remove_all'] ) && !empty( $_GET['user_id'] ) && is_numeric( $_GET['user_id'] ) ) {
+        $user_id = (int) $_GET['user_id'];
+        $topics = bb_get_user_subscriptions( $user_id );
+        if ( !empty( $topics ) ) {
+                foreach ( $topics as $topic )
+                        bb_subscription_management( $topic->topic_id, 'remove' );
+        }
+
+        $default_redirect_to = add_query_arg( array( 'unsubscribed' => 'all' ), get_subscriptions_link( $user_id ) );
+}
+
+
+$redirect_to = ( isset( $_GET['redirect_to'] ) ) ? esc_url_raw( $_GET['redirect_to'] ) : $default_redirect_to;
+
+wp_redirect( $redirect_to );
+exit;
+ No newline at end of file

bb-includes/functions.bb-template.php

@@ -3564 +3564 @@
 }
 
 /**
+ * Outputs the subscription link.
+ *
+ * @since 1.1
+ * @param $user_id the user id for whom to generate the link
+ */
+function get_subscriptions_link( $user_id = 0 ) {
+        if ( !$user_id )
+                $user_id = bb_get_current_user_info( 'id' );
+        return apply_filters( 'get_subscriptions_link', get_profile_tab_link( $user_id, 'subscriptions' ), $user_id );
+}
+
+/**
  * Outputs the post form subscription checkbox.
  *
  * Checks if user is subscribed and outputs checkbox based on status.

bb-includes/functions.bb-core.php

@@ -857 +857 @@
         // Item name for URL (nontranslated)
         $profile_menu[0] = array(__('Edit'), 'edit_profile', 'edit_users', 'profile-edit.php', 'edit');
         $profile_menu[5] = array(__('Favorites'), '', '', 'favorites.php', 'favorites');
+        if ( bb_is_subscriptions_active() )
+                $profile_menu[6] = array(__('Subscriptions'), '', '', 'subscriptions.php', 'subscriptions');
 
         // Create list of page plugin hook names the current user can access
         $profile_hooks = array();

subscriptions.php

@@ +1 @@
+<?php
+require_once('./bb-load.php');
+
+if ( !bb_is_subscriptions_active() )
+        bb_die( __( 'You can not (un)subscribe to topics.' ) );
+
+if ( !bb_current_user_can( 'edit_favorites_of', $user_id ) ) {
+        bb_die( __( 'You cannot edit these subscriptions. How did you get here?' ) );
+}
+
+if ( !bb_is_profile() ) {
+        $sendto = get_profile_tab_link( $user_id, 'subscriptions' );
+        wp_redirect( $sendto );
+        exit;
+}
+
+if ( $topics = bb_get_user_subscriptions( $user_id ) ) {
+        bb_cache_last_posts( $topics );
+}
+
+bb_load_template( 'subscriptions.php' );
+ No newline at end of file