+ — + + + + |
+— | - + + + + + + |
Index: bb-includes/capabilities.php
===================================================================
--- bb-includes/capabilities.php (revision 629)
+++ bb-includes/capabilities.php (working copy)
@@ -37,6 +37,8 @@
'edit_users' => true,
'manage_tags' => true, // Rename, Merge, Destroy
'edit_others_favorites' => true,
+ 'manage_categories' => true,
+ 'delete_categories' => true,
'manage_forums' => true, // Add/Rename forum
'delete_forums' => true, // Delete forum
'manage_topics' => true, // Delete/Close/Stick
@@ -71,6 +73,8 @@
'edit_users' => true, //+
'manage_tags' => true, //+
'edit_others_favorites' => true, //+
+ 'manage_categories' => true,
+ 'delete_categories' => true,
'manage_forums' => true, //+
'delete_forums' => true, //+
'manage_topics' => true,
@@ -404,6 +408,9 @@
case 'write_post':
$caps[] = 'write_posts';
break;
+ case 'delete_category':
+ $caps[] = 'delete_categories';
+ break;
case 'delete_forum':
$caps[] = 'delete_forums';
break;
Index: bb-includes/cache.php
===================================================================
--- bb-includes/cache.php (revision 629)
+++ bb-includes/cache.php (working copy)
@@ -137,17 +137,54 @@
return $posts;
}
+ function get_categories() {
+ global $bbdb;
+
+ $normal = true;
+ if ( '' != $where = apply_filters('get_categories_where', '') )
+ $normal = false;
+
+ if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_categories') )
+ return $this->read_cache(BBPATH . 'bb-cache/bb_categories');
+
+ $categories = $bbdb->get_results("SELECT * FROM $bbdb->categories $where ORDER BY category_order");
+ if ( $this->use_cache && $normal && $categories )
+ $this->write_cache(BBPATH . 'bb-cache/bb_categories', $categories);
+ return $categories;
+ }
+
+ function get_category( $category_id ) {
+ global $bbdb;
+ $category_id = (int) $category_id;
+
+ $normal = true;
+ if ( '' != $where = apply_filters('get_category_where', '') )
+ $normal = false;
+
+ if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_category-' . $category_id) )
+ return $this->read_cache(BBPATH . 'bb-cache/bb_category-' . $category_id);
+
+ $category = $bbdb->get_row("SELECT * FROM $bbdb->categories WHERE category_id = $category_id $where");
+ if ( $this->use_cache && $normal && $category )
+ $this->write_cache(BBPATH . 'bb-cache/bb_category-' . $category_id, $category);
+ return $category;
+ }
+
function get_forums() {
global $bbdb;
$normal = true;
+ if ( '' != $join = apply_filters('get_forums_join', '') )
+ $normal = false;
if ( '' != $where = apply_filters('get_forums_where', '') )
$normal = false;
+ if ( 'ORDER BY forum_order' != $orderby = apply_filters('get_forums_orderby', 'ORDER BY forum_order'))
+ $normal = false;
if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_forums') )
return $this->read_cache(BBPATH . 'bb-cache/bb_forums');
- $forums = $bbdb->get_results("SELECT * FROM $bbdb->forums $where ORDER BY forum_order");
+ $forums = $bbdb->get_results("SELECT * FROM $bbdb->forums $join $where $orderby");
if ( $this->use_cache && $normal && $forums )
$this->write_cache(BBPATH . 'bb-cache/bb_forums', $forums);
return $forums;
Index: bb-includes/functions.php
===================================================================
--- bb-includes/functions.php (revision 629)
+++ bb-includes/functions.php (working copy)
@@ -1,5 +1,15 @@
get_categories());
+}
+
+function get_category( $id ) {
+ global $bb_cache;
+ return $bb_cache->get_category( $id );
+}
+
function get_forums() {
global $bb_cache;
return apply_filters('get_forums',$bb_cache->get_forums());
@@ -82,7 +92,44 @@
else return false;
}
+function get_latest_category_topics( $category = 0, $page = 1, $exclude = '') {
+ global $bbdb, $bb_last_countable_query;
+ $category = (int) $category;
+ $page = (int) $page;
+ $where = 'WHERE topic_status = 0';
+ if ( $category )
+ $where .= " AND category_id = $category ";
+ if ( !empty( $exclude ) )
+ $where .= " AND category_id NOT IN ('$exclude') ";
+ if ( is_category() || is_view() )
+ $where .= " AND topic_sticky = 0 ";
+ $limit = bb_get_option('page_topics');
+ $where = apply_filters('get_latest_category_topics_where', $where);
+ if ( 1 < $page )
+ $limit = ($limit * ($page - 1)) . ", $limit";
+ $bb_last_countable_query = "SELECT * FROM $bbdb->topics LEFT JOIN $bbdb->forums ON " . $bbdb->forums . ".forum_id = " . $bbdb->topics . ".forum_id $where ORDER BY topic_time DESC LIMIT $limit";
+ if ( $topics = $bbdb->get_results($bb_last_countable_query) )
+ return bb_append_meta( $topics, 'topic' );
+ else
+ return false;
+}
+function get_sticky_category_topics( $category = 0, $display = 1 ) {
+ global $bbdb, $bb_last_countable_query;
+ if ( 1 != $display )
+ return false;
+ $category = (int) $category;
+ $where = 'WHERE topic_sticky <> 0 AND topic_status = 0';
+ if ( $category )
+ $where .= " AND category_id = $category ";
+ $where = apply_filters('get_sticky_category_topics_where', $where);
+ $bb_last_countable_query = "SELECT * FROM $bbdb->topics LEFT JOIN $bbdb->forums ON " . $bbdb->forums . ".forum_id = " . $bbdb->topics . ".forum_id $where ORDER BY topic_time DESC";
+ if ( $stickies = $bbdb->get_results($bb_last_countable_query) )
+ return bb_append_meta( $stickies, 'topic' );
+ else return false;
+}
+
+
// Globalizes the result.
function bb_get_first_post( $_topic = false, $author_cache = true ) {
global $topic, $bb_first_post_cache, $bb_post;
@@ -216,6 +263,36 @@
return;
}
+function bb_move_category_forums( $from_category_id, $to_category_id ) {
+ global $bb_cache, $bbdb;
+
+ $from_category_id = (int) $from_category_id ;
+ $to_category_id = (int) $to_category_id;
+
+ add_filter('get_category_where', 'no_where'); // Just in case
+
+ $from_category = get_category( $from_category_id );
+ if ( !$to_category = get_category( $to_category_id ) )
+ return false;
+
+ $bb_cache->flush_many( 'category', $from_category_id );
+ $bb_cache->flush_many( 'category', $to_category_id );
+
+ $forums = $to_category->forums + ( $from_category ? $from_category->forums : 0 );
+
+ $bbdb->query("UPDATE $bbdb->categories SET forums = '$forums' WHERE category_id = '$to_category_id'");
+ $bbdb->query("UPDATE $bbdb->categories SET forums = 0 WHERE category_id = '$from_category_id'");
+ $forum_ids = $bbdb->get_col("SELECT forum_id FROM $bbdb->forums WHERE category_id = '$from_category_id'");
+ $return = $bbdb->query("UPDATE $bbdb->forums SET category_id = '$to_category_id' WHERE category_id = '$from_category_id'");
+ if ( $forum_ids )
+ foreach ( $forum_ids as $forum_id ) {
+ $bb_cache->flush_one( 'forum', $forum_id );
+ }
+ $bb_cache->flush_one( 'category', $to_category_id );
+ $bb_cache->flush_many( 'category', $from_category_id );
+ return $return;
+}
+
function bb_move_forum_topics( $from_forum_id, $to_forum_id ) {
global $bb_cache, $bbdb;
@@ -272,6 +349,18 @@
return $bbdb->get_results("SELECT * FROM $bbdb->posts $where ORDER BY post_time DESC LIMIT $limit");
}
+function get_latest_category_posts( $category_id, $limit = 0, $page = 1 ) {
+ global $bbdb;
+ $limit = (int) $limit;
+ $category_id = (int) $category_id;
+ if ( !$limit )
+ $limit = bb_get_option( 'page_topics' );
+ if ( 1 < $page )
+ $limit = ($limit * ($page - 1)) . ", $limit";
+ $where = apply_filters('get_latest_category_posts_where', "WHERE `" . $bbdb->forums . "`.category_id = '$category_id' AND post_status = 0");
+ return $bbdb->get_results("SELECT * FROM $bbdb->posts LEFT JOIN $bbdb->forums ON `" . $bbdb->forums . "`.forum_id = `" . $bbdb->posts . "`.forum_id $where ORDER BY post_time DESC LIMIT $limit");
+}
+
function get_user_favorites( $user_id, $list = false ) {
global $bbdb, $page;
$user = bb_get_user( $user_id );
@@ -823,18 +912,70 @@
-function bb_new_forum( $name, $desc, $order = 0 ) {
+function bb_new_category( $name, $desc, $order = 0 ) {
global $bbdb, $bb_cache, $bb_current_user;
+ if ( !bb_current_user_can('manage_categories') )
+ return false;
+ if ( strlen($name) < 1 )
+ return false;
+ $bbdb->query("INSERT INTO $bbdb->categories (category_name, category_desc, category_order) VALUES ('$name', '$desc', '$order')");
+ $bb_cache->flush_one( 'categories' );
+ return $bbdb->insert_id;
+}
+
+function bb_update_category( $category_id, $name, $desc, $order = 0 ) {
+ global $bbdb, $bb_cache, $bb_current_user;
+ if ( !bb_current_user_can('manage_categories') )
+ return false;
+ if ( !$category_id = (int) $category_id )
+ return false;
+ $order = (int) $order;
+ if ( strlen($name) < 1 )
+ return false;
+ $bb_cache->flush_many( 'category', $category_id );
+ return $bbdb->query("UPDATE $bbdb->categories SET category_name = '$name', category_desc = '$desc', category_order = '$order' WHERE category_id = $category_id");
+}
+
+// When you delete a category, the underlying forums are given a category_id of 0
+function bb_delete_category( $category_id ) {
+ global $bbdb, $bb_cache;
+ if ( !bb_current_user_can( 'delete_category', $category_id ) )
+ return false;
+ if ( !$category_id = (int) $category_id )
+ return false;
+
+ $category = get_forum( $category_id );
+
+ if ( $forum_ids = $bbdb->get_col("SELECT forum_id FROM $bbdb->forums WHERE category_id = '$category_id'") ) {
+ $_forum_ids = join(',', $forum_ids);
+ $bbdb->query("UPDATE $bbdb->forums SET category_id = 0 WHERE forum_id IN ($_forum_ids)");
+ }
+
+ $return = $bbdb->query("DELETE FROM $bbdb->categories WHERE category_id = $category_id");
+
+ if ( $forum_ids )
+ foreach ( $forum_ids as $forum_id ) {
+ $bb_cache->flush_one( 'forum', $forum_id );
+ }
+
+ $bb_cache->flush_one( 'categories' );
+ return $return;
+}
+
+function bb_new_forum( $name, $desc, $order = 0, $category_id = 0 ) {
+ global $bbdb, $bb_cache, $bb_current_user;
if ( !bb_current_user_can('manage_forums') )
return false;
if ( strlen($name) < 1 )
return false;
- $bbdb->query("INSERT INTO $bbdb->forums (forum_name, forum_desc, forum_order) VALUES ('$name', '$desc', '$order')");
+ $bbdb->query("INSERT INTO $bbdb->forums (category_id, forum_name, forum_desc, forum_order) VALUES ($category_id, '$name', '$desc', '$order')");
+ $bbdb->query("UPDATE $bbdb->categories SET forums = forums + 1 WHERE category_id = $category_id");
$bb_cache->flush_one( 'forums' );
+ $bb_cache->flush_many( 'category', $category_id );
return $bbdb->insert_id;
}
-function bb_update_forum( $forum_id, $name, $desc, $order = 0 ) {
+function bb_update_forum( $forum_id, $name, $desc, $order = 0, $category_id = 0 ) {
global $bbdb, $bb_cache, $bb_current_user;
if ( !bb_current_user_can('manage_forums') )
return false;
@@ -843,8 +984,15 @@
$order = (int) $order;
if ( strlen($name) < 1 )
return false;
+
+ $forum = get_forum( $forum_id );
+
+ $return = $bbdb->query("UPDATE $bbdb->forums SET category_id = $category_id, forum_name = '$name', forum_desc = '$desc', forum_order = '$order' WHERE forum_id = $forum_id");
+ $bbdb->query("UPDATE $bbdb->categories SET forums = forums + 1 WHERE category_id = $category_id");
+ $bbdb->query("UPDATE $bbdb->categories SET forums = forums - 1 WHERE category_id = $forum->category_id");
$bb_cache->flush_many( 'forum', $forum_id );
- return $bbdb->query("UPDATE $bbdb->forums SET forum_name = '$name', forum_desc = '$desc', forum_order = '$order' WHERE forum_id = $forum_id");
+ $bb_cache->flush_one( 'categories' );
+ return $return;
}
// When you delete a forum, you delete *everything*
@@ -855,6 +1003,8 @@
if ( !$forum_id = (int) $forum_id )
return false;
+ $forum = get_forum( $forum_id );
+
if ( $topic_ids = $bbdb->get_col("SELECT topic_id FROM $bbdb->topics WHERE forum_id = '$forum_id'") ) {
$_topic_ids = join(',', $topic_ids);
$bbdb->query("DELETE FROM $bbdb->posts WHERE topic_id IN ($_topic_ids) AND topic_id != 0");
@@ -863,6 +1013,7 @@
}
$return = $bbdb->query("DELETE FROM $bbdb->forums WHERE forum_id = $forum_id");
+ $bbdb->query("UPDATE $bbdb->categories SET forums = forums - 1 WHERE category_id = $forum->category_id");
if ( $topic_ids )
foreach ( $topic_ids as $topic_id ) {
@@ -871,6 +1022,7 @@
}
$bb_cache->flush_many( 'forum', $forum_id );
+ $bb_cache->flush_one( 'categories' );
return $return;
}
@@ -1547,7 +1699,11 @@
do_action( 'pre_permalink', $permalink );
- if ( is_forum() ) {
+ if ( is_category() ) {
+ global $category_id;
+ $category_id = $permalink;
+ $permalink = get_category_link( $permalink, $page );
+ } elseif ( is_forum() ) {
global $forum_id;
$forum_id = $permalink;
$permalink = get_forum_link( $permalink, $page );
Index: bb-includes/bozo.php
===================================================================
--- bb-includes/bozo.php (revision 629)
+++ bb-includes/bozo.php (working copy)
@@ -279,6 +279,7 @@
add_action( 'pre_permalink', 'bozo_pre_permalink' );
add_action( 'bb_index.php_pre_db', 'bozo_latest_filter' );
+add_action( 'bb_category.php_pre_db', 'bozo_latest_filter' );
add_action( 'bb_forum.php_pre_db', 'bozo_latest_filter' );
add_action( 'bb_topic.php_pre_db', 'bozo_topic_db_filter' );
add_action( 'bb_profile.php_pre_db', 'bozo_profile_db_filter' );
Index: bb-includes/formatting-functions.php
===================================================================
--- bb-includes/formatting-functions.php (revision 629)
+++ bb-includes/formatting-functions.php (working copy)
@@ -154,7 +154,8 @@
function closed_title( $title ) {
global $topic;
if ( '0' === $topic->topic_open )
- return sprintf(__('[closed] %s'), $title);
+ //return sprintf(__('[closed] %s'), $title);
+ return '![[' . __('[closed]') . ']](' . bb_get_option('uri') . 'my-templates/images/closed.png)
' . $title;
return $title;
}
Index: bb-includes/template-functions.php
===================================================================
--- bb-includes/template-functions.php (revision 629)
+++ bb-includes/template-functions.php (working copy)
@@ -183,6 +183,9 @@
case 'index.php' :
return 'front-page';
break;
+ case 'category.php' :
+ return 'category-page';
+ break;
case 'forum.php' :
return 'forum-page';
break;
@@ -226,6 +229,13 @@
return false;
}
+function is_category() {
+ if ( 'category-page' == get_bb_location() )
+ return true;
+ else
+ return false;
+}
+
function is_forum() {
if ( 'forum-page' == get_bb_location() )
return true;
@@ -300,6 +310,8 @@
$title = get_topic_title(). ' « ';
if ( is_forum() )
$title = get_forum_name() . ' « ';
+ if ( is_category() )
+ $title = get_category_name() . ' « ';
if ( is_tag() )
$title = wp_specialchars( get_tag_name() ). ' « ' . __('Tags') . ' « ';
if ( is_bb_profile() )
@@ -319,6 +331,8 @@
$feed_link = '';
elseif ( is_forum() )
$feed_link = '';
+ elseif ( is_category() )
+ $feed_link = '';
elseif ( is_front() )
$feed_link = '';
echo apply_filters('bb_feed_head', $feed_link);
@@ -332,6 +346,106 @@
return apply_filters( 'get_recent_rss_link', $link );
}
+// CATEGORIES
+
+function get_forums_where_in_category_filter() {
+ global $category;
+ if ($category->category_id)
+ return 'WHERE category_id = ' . $category->category_id;
+ else return NULL;
+}
+
+function get_forums_join_categories_filter() {
+ global $bbdb;
+ return 'LEFT JOIN `' . $bbdb->categories . '` ON `' . $bbdb->categories . '`.`category_id` = `' . $bbdb->forums . '`.`category_id`';
+}
+
+function get_forums_orderby_category_order_filter() {
+ return 'ORDER BY `category_order`, `forum_order`';
+}
+
+function category_id() {
+ echo apply_filters( 'category_id', get_category_id() );
+}
+
+function get_category_id() {
+ global $category;
+ return $category->category_id;
+}
+
+function category_link( $category_id = 0, $page = 1 ) {
+ echo apply_filters('category_link', get_category_link( $category_id, $page ), $category_id );
+}
+
+function get_category_link( $category_id = 0, $page = 1 ) {
+ global $category;
+
+ if ( $category_id )
+ $category = get_category( $category_id );
+ if ( bb_get_option( 'mod_rewrite' ) )
+ $link = bb_get_option( 'uri' ) . "category/$category->category_id" . ( 1 < $page ? "/page/$page" : '' );
+ else {
+ $args = array();
+ $link = bb_get_option( 'uri' ) . 'category.php';
+ $args['id'] = $category->category_id;
+ $args['page'] = 1 < $page ? $page : '';
+ $link = add_query_arg( $args, $link );
+ }
+
+ return apply_filters( 'get_category_link', $link, $category->category_id );
+}
+
+function category_name( $category_id = 0 ) {
+ echo apply_filters( 'category_name', get_category_name( $category_id ), $category_id );
+}
+
+function get_category_name( $category_id = 0 ) {
+ global $category;
+ if ( $category_id )
+ $category = get_category( $category_id );
+ return apply_filters( 'get_category_name', $category->category_name, $forum->category_id );
+}
+
+function category_description( $category_id = 0 ) {
+ echo apply_filters( 'category_description', get_category_description( $category_id ), $category_id );
+}
+
+function get_category_description( $category_id = 0 ) {
+ global $category;
+ if ( $category_id )
+ $category = get_forum( $category_id );
+ return apply_filters( 'get_category_description', $category->category_desc, $category->category_id );
+}
+
+function category_forums( $category_id = 0 ) {
+ echo apply_filters( 'category_forums', get_category_forums( $category_id ), $category_id );
+}
+
+function get_category_forums( $category_id = 0 ) {
+ global $category;
+ if ( $category_id )
+ $category = get_category( $category_id );
+ return apply_filters( 'get_category_forums', $category->forums, $category->category_id );
+}
+
+function category_rss_link( $category_id = 0 ) {
+ echo apply_filters('category_rss_link', get_category_rss_link( $category_id ) );
+}
+
+function get_category_rss_link( $category_id = 0 ) {
+ global $category;
+
+ if ( $category_id )
+ $category = get_category( $category_id );
+
+ if ( bb_get_option('mod_rewrite') )
+ $link = bb_get_option('uri') . "rss/category/$category->category_id";
+ else
+ $link = bb_get_option('uri') . "rss.php?category=$category->category_id";
+
+ return apply_filters( 'get_category_rss_link', $link, $category_id );
+}
+
// FORUMS
function forum_link( $forum_id = 0, $page = 1 ) {
@@ -744,9 +858,9 @@
$class[] = 'bozo';
if ( '0' === $topic->topic_open )
$class[] = 'closed';
- if ( 1 == $topic->topic_sticky && is_forum() )
+ if ( 1 == $topic->topic_sticky && ( is_forum() || is_category() ) )
$class[] = 'sticky';
- elseif ( 2 == $topic->topic_sticky && ( is_front() || is_forum() ) )
+ elseif ( 2 == $topic->topic_sticky && ( is_front() || is_forum() || is_category() ) )
$class[] = 'sticky super-sticky';
$class = apply_filters( 'topic_class', $class, $topic->topic_id );
$class = join(' ', $class);
@@ -760,7 +874,7 @@
if ( is_forum() || is_tag() )
$url = '#postform';
- elseif ( is_front() )
+ elseif ( is_front() || is_category() )
$url = add_query_arg( 'new', '1', bb_get_option( 'uri' ) );
if ( !bb_is_user_logged_in() )
$url = add_query_arg( 're', urlencode($url), bb_get_option( 'uri' ) . 'bb-login.php' );
@@ -1333,13 +1447,29 @@
function forum_dropdown() {
global $forum_id;
- $forums = get_forums();
+ $categories = get_categories();
echo '';
}
Index: bb-includes/db.php
===================================================================
--- bb-includes/db.php (revision 629)
+++ bb-includes/db.php (working copy)
@@ -17,6 +17,7 @@
var $queries;
// Our tables
+ var $categories;
var $forums;
var $posts;
var $topics;
Index: index.php
===================================================================
--- index.php (revision 629)
+++ index.php (working copy)
@@ -6,11 +6,23 @@
do_action( 'bb_index.php_pre_db', '' );
if ( isset($_GET['new']) && '1' == $_GET['new'] ) :
+ $categories = false;
$forums = false;
elseif ( !$bb_db_override ) :
+ $categories = get_categories(); // Comment to hide categories
$forums = get_forums(); // Comment to hide forums
$topics = get_latest_topics();
$super_stickies = get_sticky_topics();
+
+ if ( $forums && !$categories ) :
+ $categories = array(
+ 0 => new stdClass()
+ );
+ $categories[0]->category_id = 0;
+ $categories[0]->category_name = __('Forums');
+ $categories[0]->category_desc = __('All available forums.');
+ $categories[0]->forums = $forums ? count($forums) : 0;
+ endif;
endif;
do_action( 'bb_index.php', '' );
Index: rss.php
===================================================================
--- rss.php (revision 629)
+++ rss.php (working copy)
@@ -22,6 +22,11 @@
elseif ( 'forum' == get_path() )
$forum_id = (int) get_path(2);
+elseif ( isset($_GET['category']) )
+ $category_id = (int) $_GET['category'];
+elseif ( 'category' == get_path() )
+ $category_id = (int) get_path(2);
+
$bb_db_override = false;
do_action( 'bb_rss.php_pre_db', '' );
@@ -48,6 +53,10 @@
if ( !$posts = get_latest_forum_posts( $forum_id ) )
die();
$title = wp_specialchars( bb_get_option( 'name' ) ) . ' ' . __('Forum') . ': ' . get_forum_name( $forum_id );
+} elseif ( isset($category_id) ) {
+ if ( !$posts = get_latest_category_posts( $category_id ) )
+ die();
+ $title = wp_specialchars( bb_get_option( 'name' ) ) . ' ' . __('Category') . ': ' . get_category_name( $category_id );
} else {
if ( !$posts = get_latest_posts( 35 ) )
die();
Index: category.php
===================================================================
--- category.php (revision 0)
+++ category.php (revision 0)
@@ -0,0 +1,28 @@
+
Index: topic.php
===================================================================
--- topic.php (revision 629)
+++ topic.php (working copy)
@@ -20,6 +20,7 @@
if ( !$bb_db_override ) :
$posts = get_thread( $topic_id, $page );
$forum = get_forum ( $topic->forum_id );
+ $category = get_category( $forum->category_id );
$tags = get_topic_tags ( $topic_id );
if ( $bb_current_user && $tags ) {
Index: bb-settings.php
===================================================================
--- bb-settings.php (revision 629)
+++ bb-settings.php (working copy)
@@ -60,6 +60,7 @@
require( BBPATH . BBINC . '/db.php');
}
+$bbdb->categories = $bb_table_prefix . 'categories';
$bbdb->forums = $bb_table_prefix . 'forums';
$bbdb->posts = $bb_table_prefix . 'posts';
$bbdb->topics = $bb_table_prefix . 'topics';
Index: bb-admin/bb-do-counts.php
===================================================================
--- bb-admin/bb-do-counts.php (revision 629)
+++ bb-admin/bb-do-counts.php (working copy)
@@ -70,6 +70,19 @@
echo "\n\t\n";
endif;
+if ( isset($_POST['categories']) && 1 == $_POST['categories'] ):
+ echo "\t\n";
+ if ( $categories = (array) $bbdb->get_col("SELECT category_id, COUNT(forum_id) FROM $bbdb->forums GROUP BY category_id") ) :
+ echo "\t\t" . __('Counting category forums...') . "
\n"; + $counts = (array) $bbdb->get_col('', 1); + foreach ($categories as $t => $i) + $bbdb->query("UPDATE $bbdb->categories SET forums = '{$counts[$t]}' WHERE category_id = $i"); + unset($topics, $t, $i, $counts); + endif; + echo "\t\t" . __('Done counting category forums.'); + echo "\n\t \n";
+endif;
+
if ( isset($_POST['topics-replied']) && 1 == $_POST['topics-replied'] ) :
echo "\t\n";
if ( $users = (array) $bbdb->get_col("SELECT ID FROM $bbdb->users") ) :
Index: bb-admin/bb-category.php
===================================================================
--- bb-admin/bb-category.php (revision 0)
+++ bb-admin/bb-category.php (revision 0)
@@ -0,0 +1,62 @@
+category_id]) && '' !== $_POST['name-' . $category->category_id] )
+ bb_update_category( $category->category_id, $_POST['name-' . $category->category_id], $_POST['desc-' . $category->category_id], $_POST['order-' . $category->category_id]);
+ endforeach;
+ wp_redirect( $sent_from );
+ exit;
+ break;
+case 'delete' :
+ bb_check_admin_referer( 'delete-category' );
+
+ $category_id = (int) $_POST['category_id'];
+ $move_forums_category = (int) $_POST['move_forums_category'];
+
+ if ( !bb_current_user_can( 'delete_category', $forum_id ) )
+ bb_die(__("You don't have the authority to kill off the categories."));
+
+ if ( isset($_POST['move_forums']) && $_POST['move_forums'] != 'delete' )
+ bb_move_category_forums( $category_id, $move_forums_category );
+
+ if ( !bb_delete_category( $category_id ) )
+ bb_die( __('Error occured while trying to delete category') );
+
+ foreach ( array('action', 'id') as $arg )
+ $sent_from = remove_query_arg( $arg, $sent_from );
+ wp_redirect( add_query_arg( 'message', 'deleted', $sent_from ) );
+ exit;
+ break;
+endswitch;
+?>
Index: bb-admin/rewrite-rules.php
===================================================================
--- bb-admin/rewrite-rules.php (revision 629)
+++ bb-admin/rewrite-rules.php (working copy)
@@ -14,6 +14,7 @@
RewriteEngine On
RewriteBase
+RewriteRule ^category/([0-9]+)$ category.php?id=$1 [L,QSA]
RewriteRule ^forum/([0-9]+)/page/([0-9]+)$ forum.php?id=$1&page=$2 [L,QSA]
RewriteRule ^forum/([0-9]+)$ forum.php?id=$1 [L,QSA]
RewriteRule ^topic/([0-9]+)/page/([0-9]+)$ topic.php?id=$1&page=$2 [L,QSA]
@@ -28,6 +29,7 @@
RewriteRule ^view/([a-z-]+)/page/([0-9]+)$ view.php?view=$1&page=$2 [L,QSA]
RewriteRule ^view/([a-z-]+)$ view.php?view=$1 [L,QSA]
RewriteRule ^rss/$ rss.php [L,QSA]
+RewriteRule ^rss/category/([0-9]+)$ rss.php?category=$1 [L,QSA]
RewriteRule ^rss/forum/([0-9]+)$ rss.php?forum=$1 [L,QSA]
RewriteRule ^rss/topic/([0-9]+)$ rss.php?topic=$1 [L,QSA]
RewriteRule ^rss/tags/([a-z]+)$ rss.php?tag=$1 [L,QSA]
Index: bb-admin/content-forums.php
===================================================================
--- bb-admin/content-forums.php (revision 629)
+++ bb-admin/content-forums.php (working copy)
@@ -1,6 +1,8 @@
@@ -79,6 +83,17 @@
+
+
+
' . $title;
return $title;
}
Index: bb-includes/template-functions.php
===================================================================
--- bb-includes/template-functions.php (revision 629)
+++ bb-includes/template-functions.php (working copy)
@@ -183,6 +183,9 @@
case 'index.php' :
return 'front-page';
break;
+ case 'category.php' :
+ return 'category-page';
+ break;
case 'forum.php' :
return 'forum-page';
break;
@@ -226,6 +229,13 @@
return false;
}
+function is_category() {
+ if ( 'category-page' == get_bb_location() )
+ return true;
+ else
+ return false;
+}
+
function is_forum() {
if ( 'forum-page' == get_bb_location() )
return true;
@@ -300,6 +310,8 @@
$title = get_topic_title(). ' « ';
if ( is_forum() )
$title = get_forum_name() . ' « ';
+ if ( is_category() )
+ $title = get_category_name() . ' « ';
if ( is_tag() )
$title = wp_specialchars( get_tag_name() ). ' « ' . __('Tags') . ' « ';
if ( is_bb_profile() )
@@ -319,6 +331,8 @@
$feed_link = '';
elseif ( is_forum() )
$feed_link = '';
+ elseif ( is_category() )
+ $feed_link = '';
elseif ( is_front() )
$feed_link = '';
echo apply_filters('bb_feed_head', $feed_link);
@@ -332,6 +346,106 @@
return apply_filters( 'get_recent_rss_link', $link );
}
+// CATEGORIES
+
+function get_forums_where_in_category_filter() {
+ global $category;
+ if ($category->category_id)
+ return 'WHERE category_id = ' . $category->category_id;
+ else return NULL;
+}
+
+function get_forums_join_categories_filter() {
+ global $bbdb;
+ return 'LEFT JOIN `' . $bbdb->categories . '` ON `' . $bbdb->categories . '`.`category_id` = `' . $bbdb->forums . '`.`category_id`';
+}
+
+function get_forums_orderby_category_order_filter() {
+ return 'ORDER BY `category_order`, `forum_order`';
+}
+
+function category_id() {
+ echo apply_filters( 'category_id', get_category_id() );
+}
+
+function get_category_id() {
+ global $category;
+ return $category->category_id;
+}
+
+function category_link( $category_id = 0, $page = 1 ) {
+ echo apply_filters('category_link', get_category_link( $category_id, $page ), $category_id );
+}
+
+function get_category_link( $category_id = 0, $page = 1 ) {
+ global $category;
+
+ if ( $category_id )
+ $category = get_category( $category_id );
+ if ( bb_get_option( 'mod_rewrite' ) )
+ $link = bb_get_option( 'uri' ) . "category/$category->category_id" . ( 1 < $page ? "/page/$page" : '' );
+ else {
+ $args = array();
+ $link = bb_get_option( 'uri' ) . 'category.php';
+ $args['id'] = $category->category_id;
+ $args['page'] = 1 < $page ? $page : '';
+ $link = add_query_arg( $args, $link );
+ }
+
+ return apply_filters( 'get_category_link', $link, $category->category_id );
+}
+
+function category_name( $category_id = 0 ) {
+ echo apply_filters( 'category_name', get_category_name( $category_id ), $category_id );
+}
+
+function get_category_name( $category_id = 0 ) {
+ global $category;
+ if ( $category_id )
+ $category = get_category( $category_id );
+ return apply_filters( 'get_category_name', $category->category_name, $forum->category_id );
+}
+
+function category_description( $category_id = 0 ) {
+ echo apply_filters( 'category_description', get_category_description( $category_id ), $category_id );
+}
+
+function get_category_description( $category_id = 0 ) {
+ global $category;
+ if ( $category_id )
+ $category = get_forum( $category_id );
+ return apply_filters( 'get_category_description', $category->category_desc, $category->category_id );
+}
+
+function category_forums( $category_id = 0 ) {
+ echo apply_filters( 'category_forums', get_category_forums( $category_id ), $category_id );
+}
+
+function get_category_forums( $category_id = 0 ) {
+ global $category;
+ if ( $category_id )
+ $category = get_category( $category_id );
+ return apply_filters( 'get_category_forums', $category->forums, $category->category_id );
+}
+
+function category_rss_link( $category_id = 0 ) {
+ echo apply_filters('category_rss_link', get_category_rss_link( $category_id ) );
+}
+
+function get_category_rss_link( $category_id = 0 ) {
+ global $category;
+
+ if ( $category_id )
+ $category = get_category( $category_id );
+
+ if ( bb_get_option('mod_rewrite') )
+ $link = bb_get_option('uri') . "rss/category/$category->category_id";
+ else
+ $link = bb_get_option('uri') . "rss.php?category=$category->category_id";
+
+ return apply_filters( 'get_category_rss_link', $link, $category_id );
+}
+
// FORUMS
function forum_link( $forum_id = 0, $page = 1 ) {
@@ -744,9 +858,9 @@
$class[] = 'bozo';
if ( '0' === $topic->topic_open )
$class[] = 'closed';
- if ( 1 == $topic->topic_sticky && is_forum() )
+ if ( 1 == $topic->topic_sticky && ( is_forum() || is_category() ) )
$class[] = 'sticky';
- elseif ( 2 == $topic->topic_sticky && ( is_front() || is_forum() ) )
+ elseif ( 2 == $topic->topic_sticky && ( is_front() || is_forum() || is_category() ) )
$class[] = 'sticky super-sticky';
$class = apply_filters( 'topic_class', $class, $topic->topic_id );
$class = join(' ', $class);
@@ -760,7 +874,7 @@
if ( is_forum() || is_tag() )
$url = '#postform';
- elseif ( is_front() )
+ elseif ( is_front() || is_category() )
$url = add_query_arg( 'new', '1', bb_get_option( 'uri' ) );
if ( !bb_is_user_logged_in() )
$url = add_query_arg( 're', urlencode($url), bb_get_option( 'uri' ) . 'bb-login.php' );
@@ -1333,13 +1447,29 @@
function forum_dropdown() {
global $forum_id;
- $forums = get_forums();
+ $categories = get_categories();
echo '';
}
Index: bb-includes/db.php
===================================================================
--- bb-includes/db.php (revision 629)
+++ bb-includes/db.php (working copy)
@@ -17,6 +17,7 @@
var $queries;
// Our tables
+ var $categories;
var $forums;
var $posts;
var $topics;
Index: index.php
===================================================================
--- index.php (revision 629)
+++ index.php (working copy)
@@ -6,11 +6,23 @@
do_action( 'bb_index.php_pre_db', '' );
if ( isset($_GET['new']) && '1' == $_GET['new'] ) :
+ $categories = false;
$forums = false;
elseif ( !$bb_db_override ) :
+ $categories = get_categories(); // Comment to hide categories
$forums = get_forums(); // Comment to hide forums
$topics = get_latest_topics();
$super_stickies = get_sticky_topics();
+
+ if ( $forums && !$categories ) :
+ $categories = array(
+ 0 => new stdClass()
+ );
+ $categories[0]->category_id = 0;
+ $categories[0]->category_name = __('Forums');
+ $categories[0]->category_desc = __('All available forums.');
+ $categories[0]->forums = $forums ? count($forums) : 0;
+ endif;
endif;
do_action( 'bb_index.php', '' );
Index: rss.php
===================================================================
--- rss.php (revision 629)
+++ rss.php (working copy)
@@ -22,6 +22,11 @@
elseif ( 'forum' == get_path() )
$forum_id = (int) get_path(2);
+elseif ( isset($_GET['category']) )
+ $category_id = (int) $_GET['category'];
+elseif ( 'category' == get_path() )
+ $category_id = (int) get_path(2);
+
$bb_db_override = false;
do_action( 'bb_rss.php_pre_db', '' );
@@ -48,6 +53,10 @@
if ( !$posts = get_latest_forum_posts( $forum_id ) )
die();
$title = wp_specialchars( bb_get_option( 'name' ) ) . ' ' . __('Forum') . ': ' . get_forum_name( $forum_id );
+} elseif ( isset($category_id) ) {
+ if ( !$posts = get_latest_category_posts( $category_id ) )
+ die();
+ $title = wp_specialchars( bb_get_option( 'name' ) ) . ' ' . __('Category') . ': ' . get_category_name( $category_id );
} else {
if ( !$posts = get_latest_posts( 35 ) )
die();
Index: category.php
===================================================================
--- category.php (revision 0)
+++ category.php (revision 0)
@@ -0,0 +1,28 @@
+
Index: topic.php
===================================================================
--- topic.php (revision 629)
+++ topic.php (working copy)
@@ -20,6 +20,7 @@
if ( !$bb_db_override ) :
$posts = get_thread( $topic_id, $page );
$forum = get_forum ( $topic->forum_id );
+ $category = get_category( $forum->category_id );
$tags = get_topic_tags ( $topic_id );
if ( $bb_current_user && $tags ) {
Index: bb-settings.php
===================================================================
--- bb-settings.php (revision 629)
+++ bb-settings.php (working copy)
@@ -60,6 +60,7 @@
require( BBPATH . BBINC . '/db.php');
}
+$bbdb->categories = $bb_table_prefix . 'categories';
$bbdb->forums = $bb_table_prefix . 'forums';
$bbdb->posts = $bb_table_prefix . 'posts';
$bbdb->topics = $bb_table_prefix . 'topics';
Index: bb-admin/bb-do-counts.php
===================================================================
--- bb-admin/bb-do-counts.php (revision 629)
+++ bb-admin/bb-do-counts.php (working copy)
@@ -70,6 +70,19 @@
echo "\n\t\n";
endif;
+if ( isset($_POST['categories']) && 1 == $_POST['categories'] ):
+ echo "\t\n"; + $counts = (array) $bbdb->get_col('', 1); + foreach ($categories as $t => $i) + $bbdb->query("UPDATE $bbdb->categories SET forums = '{$counts[$t]}' WHERE category_id = $i"); + unset($topics, $t, $i, $counts); + endif; + echo "\t\t" . __('Done counting category forums.'); + echo "\n\t