#520: categories-build661.patch - bbPress - Trac

bb-templates/kakumei/style.css

old	new
169	169	padding-bottom: 10px;
170	170	}
171	171
172		#front-page #main h2, h2.post-form, #userlogin, #currentfavorites, #register {
	172	#front-page #main h2, #category-page #main h2, h2.post-form, #userlogin, #currentfavorites, #register {
173	173	color: #333;
174	174	border-bottom: 1px solid #ddd;
175	175	margin: 0 0 10px;
…	…
180	180
181	181	.sticky { background: #a1d29a; }
182	182
	183	tr.category {
	184	background-color: #4fad4f;
	185	color: #ffffff;
	186	}
	187
	188	tr.category td {
	189	border-top: 1px solid #91d691;
	190	border-bottom: 1px solid #176e17;
	191	}
	192
	193	.category:hover { background-color: #339a33 !important; }
	194
	195	tr.category a { color: #cdf6cd; }
	196
	197	tr.category h3 { display: inline; }
	198
	199	tr.category p { margin: 0.3em 0 0 0; }
	200
183	201	/* Topic Page
184	202	=================================== */
185	203

bb-templates/kakumei/category.php

old	new
	1	<?php bb_get_header(); ?>
	2
	3	<h3 class="bbcrumb"><a href="<?php bb_option('uri'); ?>"><?php bb_option('name'); ?></a> » <?php category_name(); ?></h3>
	4
	5	<?php if ( $topics \|\| $stickies ) : ?>
	6
	7	<h2><?php _e('Latest Discussions'); ?></h2>
	8
	9	<table id="latest">
	10	<tr>
	11	<th><?php _e('Topic'); ?> — <?php new_topic(); ?></th>
	12	<th><?php _e('Posts'); ?></th>
	13	<th><?php _e('Last Poster'); ?></th>
	14	<th><?php _e('Freshness'); ?></th>
	15	</tr>
	16
	17	<?php if ( $stickies ) : foreach ( $stickies as $topic ) : ?>
	18	<tr<?php topic_class(); ?>>
	19	<td><?php _e('Sticky:'); ?> <big><a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></big></td>
	20	<td class="num"><?php topic_posts(); ?></td>
	21	<td class="num"><?php topic_last_poster(); ?></td>
	22	<td class="num"><small><?php topic_time(); ?></small></td>
	23	</tr>
	24	<?php endforeach; endif; ?>
	25
	26	<?php if ( $topics ) : foreach ( $topics as $topic ) : ?>
	27	<tr<?php topic_class(); ?>>
	28	<td><a href="<?php topic_link(); ?>"><?php topic_title(); ?></a></td>
	29	<td class="num"><?php topic_posts(); ?></td>
	30	<td class="num"><?php topic_last_poster(); ?></td>
	31	<td class="num"><small><?php topic_time(); ?></small></td>
	32	</tr>
	33	<?php endforeach; endif; ?>
	34	</table>
	35
	36	<?php endif; ?>
	37
	38	<h2><?php _e('Forums'); ?></h2>
	39
	40	<?php
	41	add_filter('get_forums_where', 'get_forums_where_in_category_filter', 1);
	42	$forums = get_forums();
	43	?>
	44
	45	<p style="float:right;"><?php category_forums(); ?> <?php echo __ngettext('forum', 'forums', get_category_forums()); ?></p>
	46
	47	<p><?php category_description(); ?></p>
	48
	49	<?php if ( $forums ) : ?>
	50
	51	<table style="clear:both;" id="forumlist">
	52
	53	<tr>
	54	<th><?php _e('Main Theme'); ?></th>
	55	<th><?php _e('Topics'); ?></th>
	56	<th><?php _e('Posts'); ?></th>
	57	</tr>
	58
	59	<?php foreach ( $forums as $forum ) : ?>
	60	<tr<?php alt_class('forum'); ?>>
	61	<td><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a> — <small><?php forum_description(); ?></small></td>
	62	<td class="num"><?php forum_topics(); ?></td>
	63	<td class="num"><?php forum_posts(); ?></td>
	64	</tr>
	65	<?php endforeach; // forums ?>
	66	</table>
	67	<?php endif; // forums ?>
	68
	69	<p><a href="<?php category_rss_link(); ?>"><?php _e('RSS feed for this category'); ?></a></p>
	70
	71	<?php bb_get_footer(); ?>

bb-templates/kakumei/topic.php

old	new
1	1	<?php bb_get_header(); ?>
2	2
3		<h3 class="bbcrumb"><a href="<?php bb_option('uri'); ?>"><?php bb_option('name'); ?></a> » <a href="<?php forum_link(); ?>"><?php forum_name(); ?></a></h3>
	3	<h3 class="bbcrumb">
	4	<a href="<?php bb_option('uri'); ?>"><?php bb_option('name'); ?></a> »
	5	<?php if ( $category ): ?>
	6	<a href="<?php category_link(); ?>"><?php category_name(); ?></a> »
	7	<?php endif; ?>
	8	<a href="<?php forum_link(); ?>"><?php forum_name(); ?></a>
	9	</h3>
4	10	<div class="infobox">
5	11
6	12	<div id="topic-info">

bb-templates/kakumei/forum.php

old	new
1	1	<?php bb_get_header(); ?>
2	2
3		<h3 class="bbcrumb"><a href="<?php bb_option('uri'); ?>"><?php bb_option('name'); ?></a> » <?php forum_name(); ?></h3>
	3	<h3 class="bbcrumb">
	4	<a href="<?php bb_option('uri'); ?>"><?php bb_option('name'); ?></a> »
	5	<?php if ( $category ): ?>
	6	<a href="<?php category_link(); ?>"><?php category_name(); ?></a> »
	7	<?php endif; ?>
	8	<?php forum_name(); ?>
	9	</h3>
4	10
5	11	<?php if ( $topics \|\| $stickies ) : ?>
6	12

bb-templates/kakumei/front-page.php

old	new
40	40	</table>
41	41	<?php endif; ?>
42	42
	43	<?php if ( $categories ) : ?>
	44
43	45	<h2><?php _e('Forums'); ?></h2>
	46
44	47	<table id="forumlist">
45	48
46	49	<tr>
…	…
49	52	<th><?php _e('Posts'); ?></th>
50	53	</tr>
51	54
	55	<?php foreach ( $categories as $category ) : ?>
	56
	57	<?php if ( $category->category_id ) : ?>
	58	<?php
	59	add_filter('get_forums_where', 'get_forums_where_in_category_filter', 1);
	60	$forums = get_forums();
	61	?>
	62
	63	<?php if ( $forums ) : ?>
	64	<tr class="category">
	65	<td colspan="3">
	66	<h3><a href="<?php category_link(); ?>"><?php category_name(); ?></a></h3> — <?php category_forums(); ?> <?php echo __ngettext('forum', 'forums', get_category_forums()); ?>
	67	<?php if ( get_category_description() ) : ?>
	68	<p><small><?php category_description(); ?></small></p>
	69	<?php endif; ?>
	70	</td>
	71	</tr>
	72	<?php endif; ?>
	73
	74	<?php endif; ?>
	75
	76	<?php if ( $forums ) : ?>
52	77	<?php foreach ( $forums as $forum ) : ?>
53	78	<tr<?php alt_class('forum'); ?>>
54	79	<td><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a> — <small><?php forum_description(); ?></small></td>
…	…
56	81	<td class="num"><?php forum_posts(); ?></td>
57	82	</tr>
58	83	<?php endforeach; ?>
	84	<?php elseif ( count($categories) < 2 ) : ?>
	85	<tr>
	86	<td colspan="3"><?php _e('No forums available.'); ?></td>
	87	</tr>
	88	<?php endif; ?>
	89
	90	<?php endforeach; // catagories ?>
	91
59	92	</table>
60	93
	94	<?php endif; // catagories ?>
	95
61	96	<?php if ( $bb_current_user->ID ) : ?>
62	97	<div id="viewdiv">
63	98	<h2><?php _e('Views'); ?></h2>

bb-includes/capabilities.php

old	new
37	37	'edit_users' => true,
38	38	'manage_tags' => true, // Rename, Merge, Destroy
39	39	'edit_others_favorites' => true,
	40	'manage_categories' => true,
	41	'delete_categories' => true,
40	42	'manage_forums' => true, // Add/Rename forum
41	43	'delete_forums' => true, // Delete forum
42	44	'manage_topics' => true, // Delete/Close/Stick
…	…
71	73	'edit_users' => true, //+
72	74	'manage_tags' => true, //+
73	75	'edit_others_favorites' => true, //+
	76	'manage_categories' => true,
	77	'delete_categories' => true,
74	78	'manage_forums' => true, //+
75	79	'delete_forums' => true, //+
76	80	'manage_topics' => true,
…	…
404	408	case 'write_post':
405	409	$caps[] = 'write_posts';
406	410	break;
	411	case 'delete_category':
	412	$caps[] = 'delete_categories';
	413	break;
407	414	case 'delete_forum':
408	415	$caps[] = 'delete_forums';
409	416	break;

bb-includes/cache.php

old	new
137	137	return $posts;
138	138	}
139	139
	140	function get_categories() {
	141	global $bbdb;
	142
	143	$normal = true;
	144	if ( '' != $where = apply_filters('get_categories_where', '') )
	145	$normal = false;
	146
	147	if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_categories') )
	148	return $this->read_cache(BBPATH . 'bb-cache/bb_categories');
	149
	150	$categories = $bbdb->get_results("SELECT * FROM $bbdb->categories $where ORDER BY category_order");
	151	if ( $this->use_cache && $normal && $categories )
	152	$this->write_cache(BBPATH . 'bb-cache/bb_categories', $categories);
	153	return $categories;
	154	}
	155
	156	function get_category( $category_id ) {
	157	global $bbdb;
	158	$category_id = (int) $category_id;
	159
	160	$normal = true;
	161	if ( '' != $where = apply_filters('get_category_where', '') )
	162	$normal = false;
	163
	164	if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_category-' . $category_id) )
	165	return $this->read_cache(BBPATH . 'bb-cache/bb_category-' . $category_id);
	166
	167	$category = $bbdb->get_row("SELECT * FROM $bbdb->categories WHERE category_id = $category_id $where");
	168	if ( $this->use_cache && $normal && $category )
	169	$this->write_cache(BBPATH . 'bb-cache/bb_category-' . $category_id, $category);
	170	return $category;
	171	}
	172
140	173	function get_forums() {
141	174	global $bbdb;
142	175
143	176	$normal = true;
	177	if ( '' != $join = apply_filters('get_forums_join', '') )
	178	$normal = false;
144	179	if ( '' != $where = apply_filters('get_forums_where', '') )
145	180	$normal = false;
	181	if ( 'ORDER BY forum_order' != $orderby = apply_filters('get_forums_orderby', 'ORDER BY forum_order'))
	182	$normal = false;
146	183
147	184	if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_forums') )
148	185	return $this->read_cache(BBPATH . 'bb-cache/bb_forums');
149	186
150		$forums = $bbdb->get_results("SELECT * FROM $bbdb->forums $~~where ORDER BY forum_order~~");
	187	$forums = $bbdb->get_results("SELECT * FROM $bbdb->forums $join $where $orderby");
151	188	if ( $this->use_cache && $normal && $forums )
152	189	$this->write_cache(BBPATH . 'bb-cache/bb_forums', $forums);
153	190	return $forums;

bb-includes/functions.php

old	new
1	1	<?php
2	2
	3	function get_categories() {
	4	global $bb_cache;
	5	return apply_filters('get_categories',$bb_cache->get_categories());
	6	}
	7
	8	function get_category( $id ) {
	9	global $bb_cache;
	10	return $bb_cache->get_category( $id );
	11	}
	12
3	13	function get_forums() {
4	14	global $bb_cache;
5	15	return apply_filters('get_forums',$bb_cache->get_forums());
…	…
82	92	else return false;
83	93	}
84	94
	95	function get_latest_category_topics( $category = 0, $page = 1, $exclude = '') {
	96	global $bbdb, $bb_last_countable_query;
	97	$category = (int) $category;
	98	$page = (int) $page;
	99	$where = 'WHERE topic_status = 0';
	100	if ( $category )
	101	$where .= " AND category_id = $category ";
	102	if ( !empty( $exclude ) )
	103	$where .= " AND category_id NOT IN ('$exclude') ";
	104	if ( is_category() \|\| is_view() )
	105	$where .= " AND topic_sticky = 0 ";
	106	$limit = bb_get_option('page_topics');
	107	$where = apply_filters('get_latest_category_topics_where', $where);
	108	if ( 1 < $page )
	109	$limit = ($limit * ($page - 1)) . ", $limit";
	110	$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";
	111	if ( $topics = $bbdb->get_results($bb_last_countable_query) )
	112	return bb_append_meta( $topics, 'topic' );
	113	else
	114	return false;
	115	}
85	116
	117	function get_sticky_category_topics( $category = 0, $display = 1 ) {
	118	global $bbdb, $bb_last_countable_query;
	119	if ( 1 != $display )
	120	return false;
	121	$category = (int) $category;
	122	$where = 'WHERE topic_sticky <> 0 AND topic_status = 0';
	123	if ( $category )
	124	$where .= " AND category_id = $category ";
	125	$where = apply_filters('get_sticky_category_topics_where', $where);
	126	$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";
	127	if ( $stickies = $bbdb->get_results($bb_last_countable_query) )
	128	return bb_append_meta( $stickies, 'topic' );
	129	else return false;
	130	}
	131
	132
86	133	// Globalizes the result.
87	134	function bb_get_first_post( $_topic = false, $author_cache = true ) {
88	135	global $topic, $bb_first_post_cache, $bb_post;
…	…
216	263	return;
217	264	}
218	265
	266	function bb_move_category_forums( $from_category_id, $to_category_id ) {
	267	global $bb_cache, $bbdb;
	268
	269	$from_category_id = (int) $from_category_id ;
	270	$to_category_id = (int) $to_category_id;
	271
	272	add_filter('get_category_where', 'no_where'); // Just in case
	273
	274	$from_category = get_category( $from_category_id );
	275	if ( !$to_category = get_category( $to_category_id ) )
	276	return false;
	277
	278	$bb_cache->flush_many( 'category', $from_category_id );
	279	$bb_cache->flush_many( 'category', $to_category_id );
	280
	281	$forums = $to_category->forums + ( $from_category ? $from_category->forums : 0 );
	282
	283	$bbdb->query("UPDATE $bbdb->categories SET forums = '$forums' WHERE category_id = '$to_category_id'");
	284	$bbdb->query("UPDATE $bbdb->categories SET forums = 0 WHERE category_id = '$from_category_id'");
	285	$forum_ids = $bbdb->get_col("SELECT forum_id FROM $bbdb->forums WHERE category_id = '$from_category_id'");
	286	$return = $bbdb->query("UPDATE $bbdb->forums SET category_id = '$to_category_id' WHERE category_id = '$from_category_id'");
	287	if ( $forum_ids )
	288	foreach ( $forum_ids as $forum_id ) {
	289	$bb_cache->flush_one( 'forum', $forum_id );
	290	}
	291	$bb_cache->flush_one( 'category', $to_category_id );
	292	$bb_cache->flush_many( 'category', $from_category_id );
	293	return $return;
	294	}
	295
219	296	function bb_move_forum_topics( $from_forum_id, $to_forum_id ) {
220	297	global $bb_cache, $bbdb;
221	298
…	…
272	349	return $bbdb->get_results("SELECT * FROM $bbdb->posts $where ORDER BY post_time DESC LIMIT $limit");
273	350	}
274	351
	352	function get_latest_category_posts( $category_id, $limit = 0, $page = 1 ) {
	353	global $bbdb;
	354	$limit = (int) $limit;
	355	$category_id = (int) $category_id;
	356	if ( !$limit )
	357	$limit = bb_get_option( 'page_topics' );
	358	if ( 1 < $page )
	359	$limit = ($limit * ($page - 1)) . ", $limit";
	360	$where = apply_filters('get_latest_category_posts_where', "WHERE `" . $bbdb->forums . "`.category_id = '$category_id' AND post_status = 0");
	361	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");
	362	}
	363
275	364	function get_user_favorites( $user_id, $list = false ) {
276	365	global $bbdb, $page;
277	366	$user = bb_get_user( $user_id );
…	…
835	924
836	925
837	926
838		function bb_new_~~forum~~( $name, $desc, $order = 0 ) {
	927	function bb_new_category( $name, $desc, $order = 0 ) {
839	928	global $bbdb, $bb_cache, $bb_current_user;
	929	if ( !bb_current_user_can('manage_categories') )
	930	return false;
	931	if ( strlen($name) < 1 )
	932	return false;
	933	$bbdb->query("INSERT INTO $bbdb->categories (category_name, category_desc, category_order) VALUES ('$name', '$desc', '$order')");
	934	$bb_cache->flush_one( 'categories' );
	935	return $bbdb->insert_id;
	936	}
	937
	938	function bb_update_category( $category_id, $name, $desc, $order = 0 ) {
	939	global $bbdb, $bb_cache, $bb_current_user;
	940	if ( !bb_current_user_can('manage_categories') )
	941	return false;
	942	if ( !$category_id = (int) $category_id )
	943	return false;
	944	$order = (int) $order;
	945	if ( strlen($name) < 1 )
	946	return false;
	947	$bb_cache->flush_many( 'category', $category_id );
	948	return $bbdb->query("UPDATE $bbdb->categories SET category_name = '$name', category_desc = '$desc', category_order = '$order' WHERE category_id = $category_id");
	949	}
	950
	951	// When you delete a category, the underlying forums are given a category_id of 0
	952	function bb_delete_category( $category_id ) {
	953	global $bbdb, $bb_cache;
	954	if ( !bb_current_user_can( 'delete_category', $category_id ) )
	955	return false;
	956	if ( !$category_id = (int) $category_id )
	957	return false;
	958
	959	$category = get_forum( $category_id );
	960
	961	if ( $forum_ids = $bbdb->get_col("SELECT forum_id FROM $bbdb->forums WHERE category_id = '$category_id'") ) {
	962	$_forum_ids = join(',', $forum_ids);
	963	$bbdb->query("UPDATE $bbdb->forums SET category_id = 0 WHERE forum_id IN ($_forum_ids)");
	964	}
	965
	966	$return = $bbdb->query("DELETE FROM $bbdb->categories WHERE category_id = $category_id");
	967
	968	if ( $forum_ids )
	969	foreach ( $forum_ids as $forum_id ) {
	970	$bb_cache->flush_one( 'forum', $forum_id );
	971	}
	972
	973	$bb_cache->flush_one( 'categories' );
	974	return $return;
	975	}
	976
	977	function bb_new_forum( $name, $desc, $order = 0, $category_id = 0 ) {
	978	global $bbdb, $bb_cache, $bb_current_user;
840	979	if ( !bb_current_user_can('manage_forums') )
841	980	return false;
842	981	if ( strlen($name) < 1 )
843	982	return false;
844		$bbdb->query("INSERT INTO $bbdb->forums (forum_name, forum_desc, forum_order) VALUES ('$name', '$desc', '$order')");
	983	$bbdb->query("INSERT INTO $bbdb->forums (category_id, forum_name, forum_desc, forum_order) VALUES ($category_id, '$name', '$desc', '$order')");
	984	$bbdb->query("UPDATE $bbdb->categories SET forums = forums + 1 WHERE category_id = $category_id");
845	985	$bb_cache->flush_one( 'forums' );
	986	$bb_cache->flush_many( 'category', $category_id );
846	987	return $bbdb->insert_id;
847	988	}
848	989
849		function bb_update_forum( $forum_id, $name, $desc, $order = 0 ) {
	990	function bb_update_forum( $forum_id, $name, $desc, $order = 0, $category_id = 0 ) {
850	991	global $bbdb, $bb_cache, $bb_current_user;
851	992	if ( !bb_current_user_can('manage_forums') )
852	993	return false;
…	…
855	996	$order = (int) $order;
856	997	if ( strlen($name) < 1 )
857	998	return false;
	999
	1000	$forum = get_forum( $forum_id );
	1001
	1002	$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");
	1003	$bbdb->query("UPDATE $bbdb->categories SET forums = forums + 1 WHERE category_id = $category_id");
	1004	$bbdb->query("UPDATE $bbdb->categories SET forums = forums - 1 WHERE category_id = $forum->category_id");
858	1005	$bb_cache->flush_many( 'forum', $forum_id );
859		return $bbdb->query("UPDATE $bbdb->forums SET forum_name = '$name', forum_desc = '$desc', forum_order = '$order' WHERE forum_id = $forum_id");
	1006	$bb_cache->flush_one( 'categories' );
	1007	return $return;
860	1008	}
861	1009
862	1010	// When you delete a forum, you delete everything
…	…
867	1015	if ( !$forum_id = (int) $forum_id )
868	1016	return false;
869	1017
	1018	$forum = get_forum( $forum_id );
	1019
870	1020	if ( $topic_ids = $bbdb->get_col("SELECT topic_id FROM $bbdb->topics WHERE forum_id = '$forum_id'") ) {
871	1021	$_topic_ids = join(',', $topic_ids);
872	1022	$bbdb->query("DELETE FROM $bbdb->posts WHERE topic_id IN ($_topic_ids) AND topic_id != 0");
…	…
875	1025	}
876	1026
877	1027	$return = $bbdb->query("DELETE FROM $bbdb->forums WHERE forum_id = $forum_id");
	1028	$bbdb->query("UPDATE $bbdb->categories SET forums = forums - 1 WHERE category_id = $forum->category_id");
878	1029
879	1030	if ( $topic_ids )
880	1031	foreach ( $topic_ids as $topic_id ) {
…	…
883	1034	}
884	1035
885	1036	$bb_cache->flush_many( 'forum', $forum_id );
	1037	$bb_cache->flush_one( 'categories' );
886	1038	return $return;
887	1039	}
888	1040
…	…
1565	1717
1566	1718	do_action( 'pre_permalink', $permalink );
1567	1719
1568		if ( is_forum() ) {
	1720	if ( is_category() ) {
	1721	global $category_id;
	1722	$category_id = $permalink;
	1723	$permalink = get_category_link( $permalink, $page );
	1724	} elseif ( is_forum() ) {
1569	1725	global $forum_id;
1570	1726	$forum_id = $permalink;
1571	1727	$permalink = get_forum_link( $permalink, $page );

bb-includes/bozo.php

old	new
282	282
283	283	add_action( 'pre_permalink', 'bozo_pre_permalink' );
284	284	add_action( 'bb_index.php_pre_db', 'bozo_latest_filter' );
	285	add_action( 'bb_category.php_pre_db', 'bozo_latest_filter' );
285	286	add_action( 'bb_forum.php_pre_db', 'bozo_latest_filter' );
286	287	add_action( 'bb_topic.php_pre_db', 'bozo_topic_db_filter' );
287	288	add_action( 'bb_profile.php_pre_db', 'bozo_profile_db_filter' );

bb-includes/template-functions.php

old	new
1	1	<?php
2	2
3	3	function bb_load_template( $file, $globals = false ) {
4		global $bb, $bbdb, $bb_current_user, $page, $bb_cache,
	4	global $bb, $bbdb, $bb_current_user, $category, $categories, $page, $bb_cache,
5	5	$posts, $bb_post, $post_id, $topics, $topic, $topic_id,
6	6	$forums, $forum, $forum_id, $tags, $tag, $tag_name, $user, $user_id, $view;
7	7
…	…
196	196	case 'index.php' :
197	197	return 'front-page';
198	198	break;
	199	case 'category.php' :
	200	return 'category-page';
	201	break;
199	202	case 'forum.php' :
200	203	return 'forum-page';
201	204	break;
…	…
239	242	return false;
240	243	}
241	244
	245	function is_category() {
	246	if ( 'category-page' == get_bb_location() )
	247	return true;
	248	else
	249	return false;
	250	}
	251
242	252	function is_forum() {
243	253	if ( 'forum-page' == get_bb_location() )
244	254	return true;
…	…
313	323	$title = get_topic_title(). ' « ';
314	324	if ( is_forum() )
315	325	$title = get_forum_name() . ' « ';
	326	if ( is_category() )
	327	$title = get_category_name() . ' « ';
316	328	if ( is_tag() )
317	329	$title = wp_specialchars( get_tag_name() ). ' « ' . __('Tags') . ' « ';
318	330	if ( is_bb_profile() )
…	…
332	344	$feed_link = '<link rel="alternate" type="application/rss+xml" title="' . __('Tag') . ': ' . wp_specialchars( get_tag_name(), 1 ) . '" href="' . get_tag_rss_link() . '" />';
333	345	elseif ( is_forum() )
334	346	$feed_link = '<link rel="alternate" type="application/rss+xml" title="' . __('Forum') . ': ' . wp_specialchars( get_forum_name(), 1) . '" href="' . get_forum_rss_link() . '" />';
	347	elseif ( is_category() )
	348	$feed_link = '<link rel="alternate" type="application/rss+xml" title="' . __('Category') . ': ' . wp_specialchars( get_category_name(), 1) . '" href="' . get_category_rss_link() . '" />';
335	349	elseif ( is_front() )
336	350	$feed_link = '<link rel="alternate" type="application/rss+xml" title="' . __('Recent Posts') . '" href="' . get_recent_rss_link() . '" />';
337	351	echo apply_filters('bb_feed_head', $feed_link);
…	…
345	359	return apply_filters( 'get_recent_rss_link', $link );
346	360	}
347	361
	362	// CATEGORIES
	363
	364	function get_forums_where_in_category_filter() {
	365	global $category;
	366	if ($category->category_id)
	367	return 'WHERE category_id = ' . $category->category_id;
	368	else return NULL;
	369	}
	370
	371	function get_forums_join_categories_filter() {
	372	global $bbdb;
	373	return 'LEFT JOIN `' . $bbdb->categories . '` ON `' . $bbdb->categories . '`.`category_id` = `' . $bbdb->forums . '`.`category_id`';
	374	}
	375
	376	function get_forums_orderby_category_order_filter() {
	377	return 'ORDER BY `category_order`, `forum_order`';
	378	}
	379
	380	function category_id() {
	381	echo apply_filters( 'category_id', get_category_id() );
	382	}
	383
	384	function get_category_id() {
	385	global $category;
	386	return $category->category_id;
	387	}
	388
	389	function category_link( $category_id = 0, $page = 1 ) {
	390	echo apply_filters('category_link', get_category_link( $category_id, $page ), $category_id );
	391	}
	392
	393	function get_category_link( $category_id = 0, $page = 1 ) {
	394	global $category;
	395
	396	if ( $category_id )
	397	$category = get_category( $category_id );
	398	if ( bb_get_option( 'mod_rewrite' ) )
	399	$link = bb_get_option( 'uri' ) . "category/$category->category_id" . ( 1 < $page ? "/page/$page" : '' );
	400	else {
	401	$args = array();
	402	$link = bb_get_option( 'uri' ) . 'category.php';
	403	$args['id'] = $category->category_id;
	404	$args['page'] = 1 < $page ? $page : '';
	405	$link = add_query_arg( $args, $link );
	406	}
	407
	408	return apply_filters( 'get_category_link', $link, $category->category_id );
	409	}
	410
	411	function category_name( $category_id = 0 ) {
	412	echo apply_filters( 'category_name', get_category_name( $category_id ), $category_id );
	413	}
	414
	415	function get_category_name( $category_id = 0 ) {
	416	global $category;
	417	if ( $category_id )
	418	$category = get_category( $category_id );
	419	return apply_filters( 'get_category_name', $category->category_name, $forum->category_id );
	420	}
	421
	422	function category_description( $category_id = 0 ) {
	423	echo apply_filters( 'category_description', get_category_description( $category_id ), $category_id );
	424	}
	425
	426	function get_category_description( $category_id = 0 ) {
	427	global $category;
	428	if ( $category_id )
	429	$category = get_forum( $category_id );
	430	return apply_filters( 'get_category_description', $category->category_desc, $category->category_id );
	431	}
	432
	433	function category_forums( $category_id = 0 ) {
	434	echo apply_filters( 'category_forums', get_category_forums( $category_id ), $category_id );
	435	}
	436
	437	function get_category_forums( $category_id = 0 ) {
	438	global $category;
	439	if ( $category_id )
	440	$category = get_category( $category_id );
	441	return apply_filters( 'get_category_forums', $category->forums, $category->category_id );
	442	}
	443
	444	function category_rss_link( $category_id = 0 ) {
	445	echo apply_filters('category_rss_link', get_category_rss_link( $category_id ) );
	446	}
	447
	448	function get_category_rss_link( $category_id = 0 ) {
	449	global $category;
	450
	451	if ( $category_id )
	452	$category = get_category( $category_id );
	453
	454	if ( bb_get_option('mod_rewrite') )
	455	$link = bb_get_option('uri') . "rss/category/$category->category_id";
	456	else
	457	$link = bb_get_option('uri') . "rss.php?category=$category->category_id";
	458
	459	return apply_filters( 'get_category_rss_link', $link, $category_id );
	460	}
	461
348	462	// FORUMS
349	463
350	464	function forum_link( $forum_id = 0, $page = 1 ) {
…	…
751	865	$class[] = 'bozo';
752	866	if ( '0' === $topic->topic_open )
753	867	$class[] = 'closed';
754		if ( 1 == $topic->topic_sticky && ~~is_forum(~~) )
	868	if ( 1 == $topic->topic_sticky && ( is_forum() \|\| is_category() ) )
755	869	$class[] = 'sticky';
756		elseif ( 2 == $topic->topic_sticky && ( is_front() \|\| is_forum() ) )
	870	elseif ( 2 == $topic->topic_sticky && ( is_front() \|\| is_forum() \|\| is_category() ) )
757	871	$class[] = 'sticky super-sticky';
758	872	$class = apply_filters( 'topic_class', $class, $topic->topic_id );
759	873	$class = join(' ', $class);
…	…
767	881
768	882	if ( is_forum() \|\| is_tag() )
769	883	$url = '#postform';
770		elseif ( is_front() )
	884	elseif ( is_front() \|\| is_category() )
771	885	$url = add_query_arg( 'new', '1', bb_get_option( 'uri' ) );
772	886	if ( !bb_is_user_logged_in() )
773	887	$url = add_query_arg( 're', urlencode($url), bb_get_option( 'uri' ) . 'bb-login.php' );
…	…
1333	1447
1334	1448	function forum_dropdown() {
1335	1449	global $forum_id;
1336		$~~forums = get_forum~~s();
	1450	$categories = get_categories();
1337	1451	echo '<select name="forum_id" id="forum_id" tabindex="5">';
1338
1339		foreach ( $forums as $forum ) :
1340		$selected = ( $forum_id == $forum->forum_id ) ? " selected='selected'" : '';
1341		echo "<option value='$forum->forum_id'$selected>$forum->forum_name</option>";
1342		endforeach;
	1452	if ($categories) :
	1453	global $category;
	1454	foreach ( $categories as $category ) :
	1455	add_filter('get_forums_where', 'get_forums_where_in_category_filter', 1);
	1456	$forums = get_forums();
	1457	if ( $forums ) :
	1458	echo "<optgroup label='$category->category_name'>";
	1459	foreach ( $forums as $forum ) :
	1460	$selected = ( $forum_id == $forum->forum_id ) ? " selected='selected'" : '';
	1461	echo "<option value='$forum->forum_id'$selected>$forum->forum_name</option>";
	1462	endforeach;
	1463	echo "</optgroup>";
	1464	endif;
	1465	endforeach;
	1466	else :
	1467	$forums = get_forums();
	1468	foreach ( $forums as $forum ) :
	1469	$selected = ( $forum_id == $forum->forum_id ) ? " selected='selected'" : '';
	1470	echo "<option value='$forum->forum_id'$selected>$forum->forum_name</option>";
	1471	endforeach;
	1472	endif;
1343	1473	echo '</select>';
1344	1474	}
1345	1475

bb-includes/db.php

old	new
17	17	var $queries;
18	18
19	19	// Our tables
	20	var $categories;
20	21	var $forums;
21	22	var $posts;
22	23	var $topics;

index.php

old	new
6	6	do_action( 'bb_index.php_pre_db', '' );
7	7
8	8	if ( isset($_GET['new']) && '1' == $_GET['new'] ) :
	9	$categories = false;
9	10	$forums = false;
10	11	elseif ( !$bb_db_override ) :
	12	$categories = get_categories(); // Comment to hide categories
11	13	$forums = get_forums(); // Comment to hide forums
12	14	$topics = get_latest_topics();
13	15	$super_stickies = get_sticky_topics();
	16
	17	if ( $forums && !$categories ) :
	18	$categories = array(
	19	0 => new stdClass()
	20	);
	21	$categories[0]->category_id = 0;
	22	$categories[0]->forums = $forums ? count($forums) : 0;
	23	endif;
14	24	endif;
15	25
16	26	do_action( 'bb_index.php', '' );

rss.php

old	new
22	22	elseif ( 'forum' == get_path() )
23	23	$forum_id = (int) get_path(2);
24	24
	25	elseif ( isset($_GET['category']) )
	26	$category_id = (int) $_GET['category'];
	27	elseif ( 'category' == get_path() )
	28	$category_id = (int) get_path(2);
	29
25	30	$bb_db_override = false;
26	31	do_action( 'bb_rss.php_pre_db', '' );
27	32
…	…
48	53	if ( !$posts = get_latest_forum_posts( $forum_id ) )
49	54	die();
50	55	$title = wp_specialchars( bb_get_option( 'name' ) ) . ' ' . __('Forum') . ': ' . get_forum_name( $forum_id );
	56	} elseif ( isset($category_id) ) {
	57	if ( !$posts = get_latest_category_posts( $category_id ) )
	58	die();
	59	$title = wp_specialchars( bb_get_option( 'name' ) ) . ' ' . __('Category') . ': ' . get_category_name( $category_id );
51	60	} else {
52	61	if ( !$posts = get_latest_posts( 35 ) )
53	62	die();

category.php

old	new
	1	<?php
	2
	3	require_once('./bb-load.php');
	4
	5	$category_id = 0;
	6
	7	bb_repermalink();
	8
	9	if ( !$category )
	10	bb_die(__('Category not found.'));
	11
	12	$bb_db_override = false;
	13	do_action( 'bb_category.php_pre_db', $category_id );
	14
	15	if ( !$bb_db_override ) :
	16	add_filter('get_forums_where', 'get_forums_where_in_category_filter', 1);
	17	$forums = get_forums();
	18	$topics = get_latest_category_topics( $category_id, $page );
	19	$stickies = get_sticky_category_topics( $category_id, $page );
	20	endif;
	21
	22	do_action( 'bb_category.php', $category_id );
	23
	24	bb_load_template( 'category.php', array('bb_db_override', 'stickies') );
	25
	26	?>

topic.php

old	new
20	20	if ( !$bb_db_override ) :
21	21	$posts = get_thread( $topic_id, $page );
22	22	$forum = get_forum ( $topic->forum_id );
	23	$category = get_category( $forum->category_id );
23	24
24	25	$tags = get_topic_tags ( $topic_id );
25	26	if ( $bb_current_user && $tags ) {

bb-settings.php

old	new
62	62	require( BBPATH . BBINC . 'db.php');
63	63	}
64	64
	65	$bbdb->categories = $bb_table_prefix . 'categories';
65	66	$bbdb->forums = $bb_table_prefix . 'forums';
66	67	$bbdb->posts = $bb_table_prefix . 'posts';
67	68	$bbdb->topics = $bb_table_prefix . 'topics';

bb-admin/bb-do-counts.php

old	new
70	70	echo "\n\t</li>\n";
71	71	endif;
72	72
	73	if ( isset($_POST['categories']) && 1 == $_POST['categories'] ):
	74	echo "\t<li>\n";
	75	if ( $categories = (array) $bbdb->get_col("SELECT category_id, COUNT(forum_id) FROM $bbdb->forums GROUP BY category_id") ) :
	76	echo "\t\t" . __('Counting category forums...') . "<br />\n";
	77	$counts = (array) $bbdb->get_col('', 1);
	78	foreach ($categories as $t => $i)
	79	$bbdb->query("UPDATE $bbdb->categories SET forums = '{$counts[$t]}' WHERE category_id = $i");
	80	unset($topics, $t, $i, $counts);
	81	endif;
	82	echo "\t\t" . __('Done counting category forums.');
	83	echo "\n\t</li>\n";
	84	endif;
	85
73	86	if ( isset($_POST['topics-replied']) && 1 == $_POST['topics-replied'] ) :
74	87	echo "\t<li>\n";
75	88	if ( $users = (array) $bbdb->get_col("SELECT ID FROM $bbdb->users") ) :

bb-admin/bb-category.php

old	new
	1	<?php
	2	require_once('admin.php');
	3
	4	if ( !bb_current_user_can('manage_categories') )
	5	bb_die(__("You don't have the authority to mess with the categories."));
	6
	7	if ( !isset($_POST['action']) )
	8	wp_redirect( bb_get_option( 'uri' ) . 'bb-admin/content-categories.php' );
	9
	10	$sent_from = wp_get_referer();
	11
	12	switch ( $_POST['action'] ) :
	13	case 'add' :
	14	if ( !isset($_POST['category']) \|\| '' === $_POST['category'] )
	15	bb_die(__('Bad category name. Go back and try again.'));
	16
	17	bb_check_admin_referer( 'add-category' );
	18
	19	$category_name = $_POST['category'];
	20	$category_desc = $_POST['category-desc'];
	21	$category_order = ( '' === $_POST['category-order'] ) ? 0 : (int) $_POST['category-order'];
	22	if ( false !== bb_new_category( $category_name, $category_desc, $category_order ) ) :
	23	wp_redirect( $sent_from );
	24	exit;
	25	else :
	26	bb_die(__('The category was not added'));
	27	endif;
	28	break;
	29	case 'update' :
	30	bb_check_admin_referer( 'update-categories' );
	31
	32	if ( !$categories = get_categories() )
	33	bb_die(__('No categories to update!'));
	34	foreach ( $categories as $category ) :
	35	if ( isset($_POST['name-' . $category->category_id]) && '' !== $_POST['name-' . $category->category_id] )
	36	bb_update_category( $category->category_id, $_POST['name-' . $category->category_id], $_POST['desc-' . $category->category_id], $_POST['order-' . $category->category_id]);
	37	endforeach;
	38	wp_redirect( $sent_from );
	39	exit;
	40	break;
	41	case 'delete' :
	42	bb_check_admin_referer( 'delete-category' );
	43
	44	$category_id = (int) $_POST['category_id'];
	45	$move_forums_category = (int) $_POST['move_forums_category'];
	46
	47	if ( !bb_current_user_can( 'delete_category', $forum_id ) )
	48	bb_die(__("You don't have the authority to kill off the categories."));
	49
	50	if ( isset($_POST['move_forums']) && $_POST['move_forums'] != 'delete' )
	51	bb_move_category_forums( $category_id, $move_forums_category );
	52
	53	if ( !bb_delete_category( $category_id ) )
	54	bb_die( __('Error occured while trying to delete category') );
	55
	56	foreach ( array('action', 'id') as $arg )
	57	$sent_from = remove_query_arg( $arg, $sent_from );

Ticket #520: categories-build661.patch

bb-templates/kakumei/style.css

bb-templates/kakumei/category.php

bb-templates/kakumei/topic.php

bb-templates/kakumei/forum.php

bb-templates/kakumei/front-page.php

bb-includes/capabilities.php

bb-includes/cache.php

bb-includes/functions.php

bb-includes/bozo.php

bb-includes/template-functions.php

bb-includes/db.php

index.php

rss.php

category.php

topic.php

bb-settings.php

bb-admin/bb-do-counts.php

bb-admin/bb-category.php