WordPress.org
Get WordPress

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/categories.php

    r3422 r4258  
    44$title = __('Categories');
    55$parent_file = 'edit.php';
    6 $list_js = true;
    76
    8 $wpvarstoreset = array('action','cat');
    9 for ($i=0; $i<count($wpvarstoreset); $i += 1) {
    10     $wpvar = $wpvarstoreset[$i];
    11     if (!isset($$wpvar)) {
    12         if (empty($_POST["$wpvar"])) {
    13             if (empty($_GET["$wpvar"])) {
    14                 $$wpvar = '';
    15             } else {
    16                 $$wpvar = $_GET["$wpvar"];
    17             }
    18         } else {
    19             $$wpvar = $_POST["$wpvar"];
    20         }
    21     }
    22 }
     7wp_reset_vars(array('action', 'cat'));
    238
    249switch($action) {
    … …  
    2611case 'addcat':
    2712
     13    check_admin_referer('add-category');
     14
    2815    if ( !current_user_can('manage_categories') )
    29         die (__('Cheatin&#8217; uh?'));
    30    
    31     wp_insert_category($_POST);
     16        wp_die(__('Cheatin&#8217; uh?'));
    3217
    33     header('Location: categories.php?message=1#addcat');
     18    if( wp_insert_category($_POST ) ) {
     19        wp_redirect('categories.php?message=1#addcat');
     20    } else {
     21        wp_redirect('categories.php?message=4#addcat');
     22    }
    3423break;
    3524
    3625case 'delete':
    37 
    38     check_admin_referer();
     26    $cat_ID = (int) $_GET['cat_ID'];
     27    check_admin_referer('delete-category_' .  $cat_ID);
    3928
    4029    if ( !current_user_can('manage_categories') )
    41         die (__('Cheatin&#8217; uh?'));
     30        wp_die(__('Cheatin&#8217; uh?'));
    4231
    43     $cat_ID = (int) $_GET['cat_ID'];
    4432    $cat_name = get_catname($cat_ID);
    4533
    46     if ( 1 == $cat_ID )
    47         die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
     34    // Don't delete the default cats.
     35    if ( $cat_ID == get_option('default_category') )
     36        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
     37
     38    if ( $cat_ID == get_option('default_link_category') )
     39        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
    4840
    4941    wp_delete_category($cat_ID);
    5042
    51     header('Location: categories.php?message=2');
     43    wp_redirect('categories.php?message=2');
    5244
    5345break;
    … …  
    5850    $cat_ID = (int) $_GET['cat_ID'];
    5951    $category = get_category_to_edit($cat_ID);
    60     ?>
    61 
    62 <div class="wrap">
    63  <h2><?php _e('Edit Category') ?></h2>
    64  <form name="editcat" action="categories.php" method="post">
    65       <table class="editform" width="100%" cellspacing="2" cellpadding="5">
    66         <tr>
    67           <th width="33%" scope="row"><?php _e('Category name:') ?></th>
    68           <td width="67%"><input name="cat_name" type="text" value="<?php echo wp_specialchars($category->cat_name); ?>" size="40" /> <input type="hidden" name="action" value="editedcat" />
    69 <input type="hidden" name="cat_ID" value="<?php echo $category->cat_ID ?>" /></td>
    70         </tr>
    71         <tr>
    72             <th scope="row"><?php _e('Category slug:') ?></th>
    73             <td><input name="category_nicename" type="text" value="<?php echo wp_specialchars($category->category_nicename); ?>" size="40" /></td>
    74         </tr>
    75         <tr>
    76             <th scope="row"><?php _e('Category parent:') ?></th>
    77             <td>       
    78             <select name='category_parent'>
    79       <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
    80       <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
    81       </select></td>
    82         </tr>
    83         <tr>
    84             <th scope="row"><?php _e('Description:') ?></th>
    85             <td><textarea name="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->category_description, 1); ?></textarea></td>
    86         </tr>
    87         </table>
    88       <p class="submit"><input type="submit" name="submit" value="<?php _e('Edit category') ?> &raquo;" /></p>
    89  </form>
    90  <p><a href="categories.php"><?php _e('&laquo; Return to category list'); ?></a></p>
    91 </div>
    92     <?php
     52    include('edit-category-form.php');
    9353
    9454break;
    9555
    9656case 'editedcat':
     57    $cat_ID = (int) $_POST['cat_ID'];
     58    check_admin_referer('update-category_' . $cat_ID);
     59
    9760    if ( !current_user_can('manage_categories') )
    98         die (__('Cheatin&#8217; uh?'));
    99    
     61        wp_die(__('Cheatin&#8217; uh?'));
     62
    10063    wp_update_category($_POST);
    10164
    102     header('Location: categories.php?message=3');
     65    wp_redirect('categories.php?message=3');
    10366break;
    10467
    10568default:
    10669
     70wp_enqueue_script( 'admin-categories' );
    10771require_once ('admin-header.php');
    10872
    … …  
    11074$messages[2] = __('Category deleted.');
    11175$messages[3] = __('Category updated.');
     76$messages[4] = __('Category not added.');
    11277?>
    11378
    … …  
    12287    <h2><?php _e('Categories') ?> </h2>
    12388<?php endif; ?>
    124 <table id="the-list-x" width="100%" cellpadding="3" cellspacing="3">
     89<table class="widefat">
     90    <thead>
    12591    <tr>
    126         <th scope="col"><?php _e('ID') ?></th>
     92        <th scope="col" style="text-align: center"><?php _e('ID') ?></th>
    12793        <th scope="col"><?php _e('Name') ?></th>
    12894        <th scope="col"><?php _e('Description') ?></th>
    129         <th scope="col"><?php _e('# Posts') ?></th>
    130         <th colspan="2"><?php _e('Action') ?></th>
     95        <th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th>
     96        <th scope="col" width="90" style="text-align: center"><?php _e('Bookmarks') ?></th>
     97        <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
    13198    </tr>
     99    </thead>
     100    <tbody id="the-list">
    132101<?php
    133102cat_rows();
    134103?>
     104    </tbody>
    135105</table>
    136 
    137 <div id="ajax-response"></div>
    138106
    139107</div>
    … …  
    141109<?php if ( current_user_can('manage_categories') ) : ?>
    142110<div class="wrap">
    143 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete posts from that category, it will just set them back to the default category <strong>%s</strong>.'), get_catname(get_option('default_category'))) ?></p>
     111<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and bookmarks in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and bookmarks are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
    144112</div>
    145113
    146 <div class="wrap">
    147     <h2><?php _e('Add New Category') ?></h2>
    148     <form name="addcat" id="addcat" action="categories.php" method="post">
    149        
    150         <p><?php _e('Name:') ?><br />
    151         <input type="text" name="cat_name" value="" /></p>
    152         <p><?php _e('Category parent:') ?><br />
    153         <select name='category_parent' class='postform'>
    154         <option value='0'><?php _e('None') ?></option>
    155         <?php wp_dropdown_cats(0); ?>
    156         </select></p>
    157         <p><?php _e('Description: (optional)') ?> <br />
    158         <textarea name="category_description" rows="5" cols="50" style="width: 97%;"></textarea></p>
    159         <p class="submit"><input type="hidden" name="action" value="addcat" /><input type="submit" name="submit" value="<?php _e('Add Category &raquo;') ?>" /></p>
    160     </form>
    161 </div>
     114<?php include('edit-category-form.php'); ?>
    162115<?php endif; ?>
    163116
    … …  
    167120
    168121include('admin-footer.php');
     122
    169123?>
Note: See TracChangeset for help on using the changeset viewer.