Index: bb-admin/includes/functions.bb-admin.php =================================================================== --- bb-admin/includes/functions.bb-admin.php (revision 2442) +++ bb-admin/includes/functions.bb-admin.php (working copy) @@ -68,6 +68,8 @@ $bb_submenu['topics.php'][5] = array( __( 'Topics' ), 'moderate', 'topics.php' ); $bb_menu[160] = array( __( 'Posts' ), 'moderate', 'posts.php', '', 'bb-menu-posts' ); $bb_submenu['posts.php'][5] = array( __( 'Posts' ), 'moderate', 'posts.php' ); + $bb_menu[165] = array( __( 'Tags' ), 'manage_tags', 'tags.php', '', 'bb-menu-tags' ); + $bb_submenu['tags.php'][5] = array( __( 'Tags' ), 'manage_tags', 'tags.php' ); // 200 < Plugin added menu items < 250 @@ -710,6 +712,289 @@ } +/* Tags */ + +function bb_tag_row( $tag ) { + + $actions = "" . __( 'View' ) . ""; + $actions .= " | " . __( 'Edit' ) . ""; + $actions .= " | 'destroy', 'id' => $tag['tag_id'], 'tagsearch' => @$_GET['tagsearch'], 'page' => @$_GET['page'], 'orderby' => @$_GET['orderby'], 'order' => @$_GET['order'], 'per_page' => @$_GET['per_page'] ), BB_URI_CONTEXT_A_HREF + BB_URI_CONTEXT_BB_ADMIN ), 'destroy-tag_' . $tag['tag_id'] ) ) . "' onclick=\"return confirm('" . esc_js( sprintf(__( 'Are you sure you want to destroy the "%s" tag? This is permanent and cannot be undone.' ), $tag['name'] ) ) . "');\">" . __( 'Delete' ) . ""; + + $r = "\t\n"; + $r .= "\t"; + $r .= "\t\t" . $tag['tag_id'] . "\n"; + $r .= "\t\t" . $tag['name'] . "
$actions 
\n"; + $r .= "\t\t" . $tag['count'] . "\n"; + $r .= "\t\n"; + + return $r; +} + +// BB_Tag_Search class +// Derived from BB_User_Search + +class BB_Tag_Search { + var $results; + var $search_term; + var $page; + var $raw_page; + var $tags_per_page = 25; + var $first_tag; + var $last_tag; + var $query_limit; + var $total_tags_for_query = 0; + var $search_errors; + var $paging_text; + var $paging_text_bottom; + var $order_by = 'name'; + var $order = 'ASC'; + + function BB_Tag_Search ( $search_term = false, $page = 1, $getorder_by = 'name', $getorder = 'ASC', $get_per_page = 25 ) { // constructor + $this->search_term = $search_term ? stripslashes( $search_term ) : false; + $this->raw_page = ( '' == $page ) ? false : (int) $page; + $page = (int) $page; + $this->page = $page < 2 ? 1 : $page; + + $this->order_by = in_array( $getorder_by, array( 'id', 'name', 'count' ) ) ? $getorder_by : 'name'; + $this->order = in_array( $getorder, array( 'ASC', 'DESC' ) ) ? $getorder : 'ASC'; + $this->tags_per_page = in_array( $get_per_page, array( 25, 50, 100 ) ) ? (int)$get_per_page : 25; + + $this->prepare_query(); + $this->query(); + $this->prepare_vars_for_template_usage(); + $this->do_paging(); + } + + function prepare_query() { + $this->first_tag = ( $this->page - 1 ) * $this->tags_per_page; + } + + function query() { + global $wp_taxonomy_object; + + $terms = $wp_taxonomy_object->get_terms( + 'bb_topic_tag', + array( + 'search' => $this->search_term, + 'offset' => $this->first_tag, + 'number' => $this->tags_per_page, + 'orderby' => $this->order_by, + 'order' => $this->order, + 'get' => 'all' + ) + ); + if ( is_wp_error( $terms ) ) + $this->search_errors = $terms; + + $tags = array(); + + for ( $i = 0; isset( $terms[$i] ); $i++ ) { + $tags[$i]['tag_id'] = $terms[$i]->term_id; + $tags[$i]['name'] = $terms[$i]->name; + $tags[$i]['count'] = $terms[$i]->count; + } + + $this->results = $tags; + + if ( $this->results ) + $this->total_tags_for_query = bb_count_last_query(); + elseif ( !is_wp_error( $this->search_errors ) ) + $this->search_errors = new WP_Error( 'no_matching_users_found', '' . __( 'No matching tags were found!' ) . '' ); + + if ( is_wp_error( $this->search_errors ) ) + bb_admin_notice( $this->search_errors ); + } + + function prepare_vars_for_template_usage() { + $this->search_term = stripslashes($this->search_term); // done with DB, from now on we want slashes gone + } + + function do_paging() { + global $bb_current_submenu; + $displaying_num = sprintf( + __( '%1$s to %2$s of %3$s' ), + bb_number_format_i18n( ( $this->page - 1 ) * $this->tags_per_page + 1 ), + $this->page * $this->tags_per_page < $this->total_tags_for_query ? bb_number_format_i18n( $this->page * $this->tags_per_page ) : '' . bb_number_format_i18n( $this->total_tags_for_query ) . '', + '' . bb_number_format_i18n( $this->total_tags_for_query ) . '' + ); + $page_number_links = $this->total_tags_for_query > $this->tags_per_page ? get_page_number_links( $this->page, $this->total_tags_for_query, $this->tags_per_page, false ) : ''; + $this->paging_text = "
$displaying_num$page_number_links
\n"; + $this->paging_text_bottom = "
$page_number_links
\n"; + } + + function get_results() { + return (array) $this->results; + } + + function page_links() { + echo $this->paging_text; + } + + function results_are_paged() { + if ( isset($this->paging_text) && $this->paging_text ) + return true; + return false; + } + + function is_search() { + if ( $this->search_term ) + return true; + return false; + } + + function display( $show_extra = true ) { + $r = ''; + + $h2_search = $this->search_term ? ' ' . sprintf( __( 'matching “%s”' ), esc_html( $this->search_term ) ) : ''; + + $h2_span = ''; + $h2_span .= apply_filters( 'bb_tag_search_description', $h2_search, $this ); + $h2_span .= ''; + + echo "

" . apply_filters( 'bb_tag_search_title', __( 'Tags' ) ) . $h2_span . "

\n"; + do_action( 'bb_admin_notices' ); + + if ( $show_extra ) { + + $order_by = array( 'id' => __( 'Tag ID' ), 'name' => __( 'Tag Name' ), 'count' => __( 'Topic Count' ) ); + $orders = array( 'ASC' => __( 'Ascending' ), 'DESC' => __( 'Descending' ) ); + $per_pages = array( '25' => bb_number_format_i18n( '25' ), '50' => bb_number_format_i18n( '50' ), '100' => bb_number_format_i18n( '100' ) ); + + $r .= "\n\n"; + + /* Bulk Actions */ + + $bulk_actions = array( + 'destroy' => __( 'Destroy' ), + 'merge' => __( 'Merge' ) + ); + + do_action_ref_array( 'bulk_tag_actions', array( &$bulk_actions ) ); + + $r .= "
\n"; + $r .= "\t
\n"; + $r .= "\t\t\n"; + $r .= "\t\t\n"; + $r .= "\t\t\n"; + $r .= bb_nonce_field( 'tags-bulk', '_wpnonce', true, false ); + $r .= "\t
\n"; + } + + if ( $this->get_results() ) { + if ( $this->results_are_paged() ) + $r .= "
\n" . $this->paging_text . "
\n\n"; + + $r .= "\n"; + $r .= "\n"; + $r .= "\t\n"; + + $r .= "\t\t\n"; + $r .= "\t\t\n"; + $r .= "\t\t\n"; + $r .= "\t\t\n"; + + $r .= "\t\n"; + $r .= "\n\n"; + + $r .= "\n"; + $r .= "\t\n"; + + $r .= "\t\t\n"; + $r .= "\t\t\n"; + $r .= "\t\t\n"; + $r .= "\t\t\n"; + + $r .= "\t\n"; + $r .= "\n\n"; + + $r .= "\n"; + foreach ( (array) $this->get_results() as $tag ) + $r .= bb_tag_row( $tag ); + $r .= "\n"; + $r .= "
" . __( 'Tag ID' ) . "" . __( 'Tag Name' ) . "" . __( 'Topics' ) . "
" . __( 'Tag ID' ) . "" . __( 'Tag Name' ) . "" . __( 'Topics' ) . "
\n\n"; + + $r .= "
\n"; + + if ( $this->results_are_paged() ) + $r .= "
\n" . $this->paging_text_bottom . "
\n\n"; + } + echo $r; + } + +} + /* Forums */ // Expects forum_name, forum_desc to be pre-escaped Index: bb-admin/style.css =================================================================== --- bb-admin/style.css (revision 2442) +++ bb-admin/style.css (working copy) @@ -451,6 +451,15 @@ background-position: -186px -7px; } +ul#bbAdminMenu li#bb-menu-tags a div.bb-menu-icon { + background-position: -278px -39px; +} + +ul#bbAdminMenu li#bb-menu-tags.bb-menu-current a div.bb-menu-icon, +ul#bbAdminMenu li#bb-menu-tags a:hover div.bb-menu-icon { + background-position: -278px -7px; +} + ul#bbAdminMenu li#bb-menu-users a div.bb-menu-icon { background-position: -308px -39px; } @@ -847,7 +856,8 @@ color: rgb(70, 70, 70); } -form.search-form fieldset div div input.text-input { +form.search-form fieldset div div input.text-input, +#new-tag { width: 100px; padding: 3px; -moz-border-radius: 4px; Index: bb-admin/tag-destroy.php =================================================================== --- bb-admin/tag-destroy.php (revision 2442) +++ bb-admin/tag-destroy.php (working copy) @@ -1,22 +0,0 @@ -\n"), $destroyed['tags']); - printf(__("Rows deleted from tagged table: %d
\n"), $destroyed['tagged']); - printf(__('Home'), bb_get_uri()); -} else { - die(printf(__("Something odd happened when attempting to destroy that tag.
\nTry Again?"), wp_get_referer())); -} -?> Index: bb-admin/tag-merge.php =================================================================== --- bb-admin/tag-merge.php (revision 2442) +++ bb-admin/tag-merge.php (working copy) @@ -1,26 +0,0 @@ -tag_id ) ) { - printf(__("Number of topics from which the old tag was removed: %d
\n"), $merged['old_count']); - printf(__("Number of topics to which the new tag was added: %d
\n"),$merged['diff_count']); - printf(__("Number of rows deleted from tags table:%d
\n"),$merged['destroyed']['tags']); - printf(__('New Tag'), bb_get_tag_link()); -} else { - die(printf(__("Something odd happened when attempting to merge those tags.
\nTry Again?"), wp_get_referer())); -} -?> Index: bb-admin/tag-rename.php =================================================================== --- bb-admin/tag-rename.php (revision 2442) +++ bb-admin/tag-rename.php (working copy) @@ -1,22 +0,0 @@ -Try Again'), wp_get_referer())); -exit; -?> Index: bb-admin/tags.php =================================================================== --- bb-admin/tags.php (revision 0) +++ bb-admin/tags.php (revision 0) @@ -0,0 +1,107 @@ + 'destroyed', 'count' => $count ); + break; + case 'merge' : + if ( !$new_tag = (string) trim( $_POST['merge_new_tag'] ) ) + break; + if ( !$new_tag_id = bb_create_tag( $new_tag ) ) /* The tag ID would be returned if tag is already there, else it would be created */ + if ( !$new_tag_id = bb_get_tag_id( $new_tag ) ) /* Due to some problem, bb_create_tag doesn't return the term id so we need to try to get the id again */ + break; + + foreach ( $tag_ids as $tag_id ) { + if ( $tag_id == $new_tag_id ) + continue; + $count += (int) (bool) bb_merge_tags( $tag_id, $new_tag_id ); + } + + $query_vars = array( 'message' => 'merged', 'count' => $count, 'new_id' => $new_tag_id ); + break; + default : + if ( $action ) + $query_vars = apply_filters( "bulk_tag__$action", array(), $tag_ids, $action ); + break; + } + + bb_safe_redirect( add_query_arg( $query_vars ) ); + exit; +} + +if ( !empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'rename', 'merge', 'destroy' ) ) && $old_tag = bb_get_tag( (int) $_GET['id'] ) ) { /* Accepts only one tag */ + $action = $_GET['action']; + $old_id = (int) $_GET['id']; + + bb_check_admin_referer( $action . '-tag_' . $old_id ); + + switch ( $action ) { + case 'destroy': + $query_vars = ( (bool) bb_destroy_tag( $old_id ) ) ? array( 'message' => 'destroyed' ) : $query_vars = array( 'message' => 'error' ); + break; + case 'merge': + if ( !$new_tag = bb_get_tag( $_GET['tag'] ) ) { + $query_vars = array( 'message' => 'error' ); + break; + } + $query_vars = ( (bool) bb_merge_tags( $old_id, $new_tag->tag_id ) ) ? array( 'message' => 'merged', 'new_id' => $new_tag->tag_id ) : array( 'message' => 'error' ); + break; + case 'rename': + $new_tag = stripslashes( $_GET['tag'] ); + $query_vars = ( (bool) bb_rename_tag( $old_id, $new_tag ) ) ? array( 'message' => 'renamed', 'new_id' => $old_id ) : array( 'message' => 'error' ); + break; + } + + bb_safe_redirect( remove_query_arg( array( 'action', 'tag', 'Submit', 'id', '_wpnonce' ), add_query_arg( $query_vars ) ) ); /* Just keep _wp_http_referer for messages (below) */ + exit; +} + +if ( !empty( $_GET['message'] ) ) { + $message_count = isset( $_GET['count'] ) ? (int) $_GET['count'] : 1; + + switch ( (string) $_GET['message'] ) { + case 'destroyed': + $back = isset( $_GET['_wp_http_referer'] ) ? ' ' . __( 'Back to forums.' ) . '' : ''; + bb_admin_notice( '' . sprintf( _n( 'Tag destroyed.', '%s tags destroyed.', $message_count ), bb_number_format_i18n( $message_count ) ) . '' . $back ); + break; + case 'merged': + bb_admin_notice( '' . sprintf( _n( 'Tag merged into %2$s.', '%1$s tags merged into %2$s.', $message_count ), bb_number_format_i18n( $message_count ), '' . bb_get_tag_name( (int) $_GET['new_id'] ) . '' ) . '' ); + break; + case 'renamed': + bb_admin_notice( '' . sprintf( 'Tag renamed to %s.', '' . bb_get_tag_name( (int) $_GET['new_id'] ) . '' ) . '' ); + break; + case 'error': + $back = isset( $_GET['_wp_http_referer'] ) ? ' ' . __( 'Back to forums.' ) . '' : ''; + bb_admin_notice( '' . __( 'There was an error with your request! Please try again.' ) . '' . $back ); + break; + } +} + +$tag_query = new BB_Tag_Search( @$_GET['tagsearch'], @$_GET['page'], @$_GET['orderby'], @$_GET['order'], @$_GET['per_page'] ); + +$bb_admin_body_class = ' bb-admin-tags'; + +bb_get_admin_header(); + +if ( !bb_current_user_can( 'manage_tags' ) ) + die( __( "Now how'd you get here? And what did you think you'd being doing?" ) ); //This should never happen. +?> + +
+ +display(); ?> + +
+ + Index: bb-includes/functions.bb-template.php =================================================================== --- bb-includes/functions.bb-template.php (revision 2442) +++ bb-includes/functions.bb-template.php (working copy) @@ -3137,39 +3137,44 @@ ' . "\n"; - $form .= '
  • ' . __('Rename tag:') . "\n\t"; - $form .= '
    ' . "\n\t"; + $form .= '
  • ' . __( 'Rename tag:' ) . "\n\t"; + $form .= '
    ' . "\n\t"; $form .= '' . "\n\t"; $form .= '' . "\n\t"; - $form .= "\n\t"; + $form .= '' . "\n\t"; + $form .= "\n\t"; echo $form; bb_nonce_field( 'rename-tag_' . $tag->tag_id ); echo "\n\t
    • \n
    • \n "; - $form = "
  • " . __('Merge this tag into:') . "\n\t"; - $form .= "
    \n\t"; + + $form = "
  • " . __( 'Merge this tag into:' ) . "\n\t"; + $form .= "
    \n\t"; $form .= "\n\t"; $form .= "\n\t"; - $form .= "raw_tag) ) . "');\" />\n\t"; + $form .= '' . "\n\t"; + $form .= "raw_tag ) ) . "');\" />\n\t"; echo $form; bb_nonce_field( 'merge-tag_' . $tag->tag_id ); echo "\n\t
    • \n
    • \n "; - $form = "
  • " . __('Destroy tag:') . "\n\t"; - $form .= "
    \n\t"; + + $form = "
  • " . __( 'Destroy tag:' ) . "\n\t"; + $form .= "
    \n\t"; $form .= "\n\t"; - $form .= "raw_tag) ) . "');\" />\n\t"; + $form .= '' . "\n\t"; + $form .= "raw_tag ) ) . "');\" />\n\t"; echo $form; bb_nonce_field( 'destroy-tag_' . $tag->tag_id ); echo "\n\t
    • \n
    • \n"; + } function bb_tag_remove_link( $args = null ) { Index: bb-includes/functions.bb-topic-tags.php =================================================================== --- bb-includes/functions.bb-topic-tags.php (revision 2442) +++ bb-includes/functions.bb-topic-tags.php (working copy) @@ -422,7 +422,7 @@ $tag_id = (int) $tag_id; $raw_tag = bb_trim_for_db( $tag_name, 50 ); - $tag_name = tag_sanitize( $tag_name ); + $tag_name = bb_pre_term_slug( $tag_name ); if ( empty( $tag_name ) ) { return false; @@ -464,16 +464,16 @@ do_action( 'bb_pre_merge_tags', $old_id, $new_id ); // Get all topics tagged with old tag - $old_topics = bb_get_tagged_topic_ids( $old_id ); + $old_topics = (array) bb_get_tagged_topic_ids( $old_id ); // Get all toics tagged with new tag - $new_topics = bb_get_tagged_topic_ids( $new_id ); + $new_topics = (array) bb_get_tagged_topic_ids( $new_id ); // Get intersection of those topics - $both_topics = array_intersect( $old_topics, $new_topics ); + $both_topics = (array) array_intersect( $old_topics, $new_topics ); // Discard the intersection from the old tags topics - $old_topics = array_diff( $old_topics, $both_topics ); + $old_topics = (array) array_diff( $old_topics, $both_topics ); // Add the remainder of the old tag topics to the new tag if ( count( $old_topics ) ) {