if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- if( wp_insert_category($_POST ) ) {
- wp_redirect('categories.php?message=1#addcat');
- } else {
- wp_redirect('categories.php?message=4#addcat');
- }
+ if ( wp_insert_category($_POST ) )
+ wp_safe_redirect( add_query_arg( 'message', 1, wp_get_referer() ) . '#addcat' );
+ else
+ wp_safe_redirect( add_query_arg( 'message', 4, wp_get_referer() ) . '#addcat' );
+
exit;
break;
case 'delete':
+ if ( !isset( $_GET['cat_ID'] ) ) {
+ wp_redirect('categories.php');
+ exit;
+ }
+
$cat_ID = (int) $_GET['cat_ID'];
check_admin_referer('delete-category_' . $cat_ID);
if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- $cat_name = get_catname($cat_ID);
-
// Don't delete the default cats.
- if ( $cat_ID == get_option('default_category') )
- wp_die(sprintf(__("Can’t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+ if ( $cat_ID == get_option('default_category') )
+ wp_die( sprintf( __("Can’t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
wp_delete_category($cat_ID);
- wp_redirect('categories.php?message=2');
+ wp_safe_redirect( add_query_arg( 'message', 2, wp_get_referer() ) );
exit;
break;
if ( !current_user_can('manage_categories') )
wp_die( __('You are not allowed to delete categories.') );
- foreach ( (array) $_GET['delete'] as $cat_ID ) {
- $cat_name = get_catname($cat_ID);
+ $cats = (array) $_GET['delete'];
+ $default_cat = get_option('default_category');
+ foreach ( $cats as $cat_ID ) {
+ $cat_ID = (int) $cat_ID;
- // Don't delete the default cats.
- if ( $cat_ID == get_option('default_category') )
- wp_die(sprintf(__("Can’t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+ // Don't delete the default cat.
+ if ( $cat_ID == $default_cat )
+ wp_die( sprintf( __("Can’t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
wp_delete_category($cat_ID);
}
- $sendback = wp_get_referer();
-
- wp_redirect($sendback);
- exit();
+ wp_safe_redirect( wp_get_referer() );
+ exit;
break;
case 'edit':
<div class="wrap nosubsub">
<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title );
+<h2><?php echo esc_html( $title );
if ( isset($_GET['s']) && $_GET['s'] )
- printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+ printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
</h2>
<?php
<form class="search-form topmargin" action="" method="get">
<p class="search-box">
- <label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
- <input type="text" class="search-input" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
- <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
+ <label class="screen-reader-text" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
+ <input type="text" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+ <input type="submit" value="<?php esc_attr_e( 'Search Categories' ); ?>" class="button" />
</p>
</form>
<br class="clear" />
$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
if ( empty($pagenum) )
$pagenum = 1;
-if( ! isset( $catsperpage ) || $catsperpage < 0 )
- $catsperpage = 20;
+
+$cats_per_page = (int) get_user_option( 'categories_per_page', 0, false );
+if ( empty( $cats_per_page ) || $cats_per_page < 1 )
+ $cats_per_page = 20;
+$cats_per_page = apply_filters( 'edit_categories_per_page', $cats_per_page );
+
+if ( !empty($_GET['s']) )
+ $num_cats = count(get_categories(array('hide_empty' => 0, 'search' => $_GET['s'])));
+else
+ $num_cats = wp_count_terms('category');
$page_links = paginate_links( array(
'base' => add_query_arg( 'pagenum', '%#%' ),
'format' => '',
'prev_text' => __('«'),
'next_text' => __('»'),
- 'total' => ceil(wp_count_terms('category') / $catsperpage),
+ 'total' => ceil($num_cats / $cats_per_page),
'current' => $pagenum
));
<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
<option value="delete"><?php _e('Delete'); ?></option>
</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
<?php wp_nonce_field('bulk-categories'); ?>
</div>
<tbody id="the-list" class="list:cat">
<?php
-cat_rows(0, 0, 0, $pagenum, $catsperpage);
+cat_rows(0, 0, 0, $pagenum, $cats_per_page);
?>
</tbody>
</table>
<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
<option value="delete"><?php _e('Delete'); ?></option>
</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
<?php wp_nonce_field('bulk-categories'); ?>
</div>
</form>
<div class="form-wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p>
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
</div>
<div class="form-field">
<label for="category_description"><?php _e('Description') ?></label>
<textarea name="category_description" id="category_description" rows="5" cols="40"></textarea>
- <p><?php _e('The description is not prominent by default, however some themes may show it.'); ?></p>
+ <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</div>
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
<?php do_action('edit_category_form', $category); ?>
</form></div>
</div><!-- /col-container -->
</div><!-- /wrap -->
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
- $(document).ready(function(){
- $('#doaction, #doaction2').click(function(){
- if ( $('select[name^="action"]').val() == 'delete' ) {
- var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
- return showNotice.warn(m);
- }
- });
- });
-})(jQuery);
-/* ]]> */
-</script>
-
<?php
inline_edit_term_row('categories');
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff