Changeset 2695

Timestamp:

07/03/2005 07:26:51 PM (21 years ago)

Author:

ryan

Message:

wp_insert_category(), wp_update_category(), wp_delete_category().

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• categories.php (modified) (7 diffs)

trunk/wp-admin/admin-functions.php

@@ -203 +203 @@
 
         return $comment;
+}
+
+function get_category_to_edit($id) {
+        $category = get_category($id);
+
+        return $category;
+}
+
+function wp_insert_category($catarr) {
+        global $wpdb;
+
+        extract($catarr);
+
+        $cat_ID = (int) $cat_ID;
+
+        // Are we updating or creating?
+        if ( !empty($cat_ID) ) {
+                $update = true;
+        } else {
+                $update = false;
+                $id_result = $wpdb->get_row("SHOW TABLE STATUS LIKE '$wpdb->categories'");
+                $cat_ID = $id_result->Auto_increment;
+        }
+
+        $cat_name = wp_specialchars($cat_name);
+
+        if ( empty($category_nicename) )
+                $category_nicename = sanitize_title($cat_name, $cat_ID);
+        else
+                $category_nicename = sanitize_title($category_nicename, $cat_ID);
+
+        if ( empty($category_description) )
+                $category_description = '';
+
+        if ( empty($category_parent) )
+                $category_parent = 0;
+
+        if ( !$update)
+                $query = "INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$cat')";
+        else
+                $query = "UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$category_parent' WHERE cat_ID = '$cat_ID'";
+
+        $result = $wpdb->query($query);
+
+        if ( $update ) {
+                $rval = $wpdb->rows_affected;
+                do_action('edit_category', $cat_ID);
+        } else {
+                $rval = $wpdb->insert_id;
+                do_action('create_category', $cat_ID);
+        }
+
+        return $rval;
+}
+
+function wp_update_category($catarr) {
+        global $wpdb;
+
+        $cat_ID = (int) $catarr['cat_ID'];
+        
+        // First, get all of the original fields
+        $category = get_category($cat_ID, ARRAY_A);     
+
+        // Escape data pulled from DB.
+        $category = add_magic_quotes($category);
+
+        // Merge old and new fields with new fields overwriting old ones.
+        $catarr = array_merge($category, $catarr);
+
+        return wp_insert_category($catarr);
+}
+
+function wp_delete_category($cat_ID) {
+        global $wpdb;
+
+        $cat_ID = (int) $cat_ID;
+
+        // Don't delete the default cat.
+        if ( 1 == $cat_ID )
+                return 0;
+
+        $category = get_category($cat_ID);
+
+        $parent = $category->category_parent;
+
+        // Delete the category.
+        $wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
+
+        // Update children to point to new parent.
+        $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
+
+        // TODO: Only set categories to general if they're not in another category already
+        $wpdb->query("UPDATE $wpdb->post2cat SET category_id='1' WHERE category_id='$cat_ID'");
+
+        do_action('delete_category', $cat_ID);
+
+        return 1;
 }
 

trunk/wp-admin/categories.php

@@ -24 +24 @@
 
 case 'addcat':
+
         if ($user_level < 3)
                 die (__('Cheatin&#8217; uh?'));
         
-        $cat_name= wp_specialchars($_POST['cat_name']);
-        $id_result = $wpdb->get_row("SHOW TABLE STATUS LIKE '$wpdb->categories'");
-        $cat_ID = $id_result->Auto_increment;
-        $category_nicename = sanitize_title($cat_name, $cat_ID);
-        $category_description = $_POST['category_description'];
-        $cat = intval($_POST['cat']);
-        
-        $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$cat')");
-        
+        wp_insert_category($_POST);
+
         header('Location: categories.php?message=1#addcat');
 break;
@@ -43 +37 @@
         check_admin_referer();
 
+        if ( $user_level < 3 )
+                die (__('Cheatin&#8217; uh?'));
+
         $cat_ID = (int) $_GET['cat_ID'];
         $cat_name = get_catname($cat_ID);
-        $category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
-        $cat_parent = $category->category_parent;
 
         if ( 1 == $cat_ID )
                 die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
-        if ( $user_level < 3 )
-                die (__('Cheatin&#8217; uh?'));
-
-        $wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
-        $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$cat_parent' WHERE category_parent = '$cat_ID'");
-        // TODO: Only set categories to general if they're not in another category already
-        $wpdb->query("UPDATE $wpdb->post2cat SET category_id='1' WHERE category_id='$cat_ID'");
+        wp_delete_category($cat_ID);
 
         header('Location: categories.php?message=2');
@@ -67 +56 @@
     require_once ('admin-header.php');
     $cat_ID = (int) $_GET['cat_ID'];
-    $category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
-    $cat_name = $category->cat_name;
+    $category = get_category_to_edit($cat_ID);
     ?>
 
@@ -77 +65 @@
                 <tr>
                   <th width="33%" scope="row"><?php _e('Category name:') ?></th>
-                  <td width="67%"><input name="cat_name" type="text" value="<?php echo wp_specialchars($cat_name); ?>" size="40" /> <input type="hidden" name="action" value="editedcat" />
-<input type="hidden" name="cat_ID" value="<?php echo $cat_ID ?>" /></td>
+                  <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" />
+<input type="hidden" name="cat_ID" value="<?php echo $category->cat_ID ?>" /></td>
                 </tr>
                 <tr>
@@ -87 +75 @@
                         <th scope="row"><?php _e('Category parent:') ?></th>
                         <td>        
-                        <select name='cat'>
+                        <select name='category_parent'>
           <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
           <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
@@ -109 +97 @@
                 die (__('Cheatin&#8217; uh?'));
         
-        $cat_name = wp_specialchars($_POST['cat_name']);
-        $cat_ID = (int) $_POST['cat_ID'];
-        $category_nicename = sanitize_title($_POST['category_nicename'], $cat_ID);
-        $category_description = $_POST['category_description'];
-        
-        $wpdb->query("UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$cat' WHERE cat_ID = '$cat_ID'");
+        wp_update_category($_POST);
 
         header('Location: categories.php?message=3');
@@ -166 +149 @@
         <input type="text" name="cat_name" value="" /></p>
         <p><?php _e('Category parent:') ?><br />
-        <select name='cat' class='postform'>
+        <select name='category_parent' class='postform'>
         <option value='0'><?php _e('None') ?></option>
         <?php wp_dropdown_cats(0); ?>