Changeset 6299

Timestamp:

10/31/2007 03:53:32 AM (18 years ago)

Author:

ryan

Message:

AJAX for link category add and delete. Props mdawaffe. fixes #5291

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/edit-link-categories.php (modified) (3 diffs)
• wp-admin/edit-link-category-form.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (3 diffs)
• wp-admin/js/categories.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-settings.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -52 +52 @@
         die('1');
     else    die('0');
+    break;
+case 'delete-link-cat' :
+    check_ajax_referer( "delete-link-category_$id" );
+    if ( !current_user_can( 'manage_categories' ) )
+        die('-1');
+
+    $cat_name = get_term_field('name', $id, 'link_category');
+
+    // Don't delete the default cats.
+    if ( $id == get_option('default_link_category') ) {
+        $x = new WP_AJAX_Response( array(
+            'what' => 'link-cat',
+            'id' => $id,
+            'data' => new WP_Error( 'default-link-cat', sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name) )
+        ) );
+        $x->send();
+    }
+
+    $r = wp_delete_term($id, 'link_category');
+    if ( !$r )
+        die('0');
+    if ( is_wp_error($r) ) {
+        $x = new WP_AJAX_Response( array(
+            'what' => 'link-cat',
+            'id' => $id,
+            'data' => $r
+        ) );
+        $x->send();
+    }
+    die('1');
     break;
 case 'delete-link' :
@@ -179 +209 @@
         'data' => _cat_row( $cat, $level, $cat_full_name ),
         'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category <a href="#%s">%s</a> added' ), "cat-$cat->term_id", $cat_full_name))
+    ) );
+    $x->send();
+    break;
+case 'add-link-cat' : // From Blogroll -> Categories
+    check_ajax_referer( 'add-link-category' );
+    if ( !current_user_can( 'manage_categories' ) )
+        die('-1');
+
+    $r = wp_insert_term($_POST['name'], 'link_category', $_POST );
+    if ( is_wp_error( $r ) ) {
+        $x = new WP_AJAX_Response( array(
+            'what' => 'link-cat',
+            'id' => $r
+        ) );
+        $x->send();
+    }
+
+    extract($r, EXTR_SKIP);
+
+    if ( !$link_cat = link_cat_row( $term_id ) )
+        die('0');
+        
+    $x = new WP_Ajax_Response( array(
+        'what' => 'link-cat',
+        'id' => $term_id,
+        'data' => $link_cat
     ) );
     $x->send();

trunk/wp-admin/edit-link-categories.php

@@ -5 +5 @@
 $parent_file = 'link-manager.php';
 
-//wp_enqueue_script( 'admin-categories' );  TODO: Fix AJAX
+wp_enqueue_script( 'admin-categories' );
 require_once ('admin-header.php');
 
@@ -14 +14 @@
 $messages[5] = __('Category not updated.');
 
-function link_cat_row($category) {
-    global $class;
+if (isset($_GET['message'])) : ?>
 
-    if ( current_user_can( 'manage_categories' ) ) {
-        $edit = "<a href='link-category.php?action=edit&amp;cat_ID=$category->term_id' class='edit'>".__( 'Edit' )."</a></td>";
-        $default_cat_id = (int) get_option( 'default_link_category' );
-
-        if ( $category->term_id != $default_cat_id )
-            $edit .= "<td><a href='" . wp_nonce_url( "link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id ) . "' onclick=\"return deleteSomething( 'cat', $category->term_id, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->name, get_term_field( 'name', $default_cat_id,  'link_category' ))) . "' );\" class='delete'>".__( 'Delete' )."</a>";
-        else
-            $edit .= "<td style='text-align:center'>".__( "Default" );
-    } else {
-        $edit = '';
-    }
-
-    $class = ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
-
-    $category->count = number_format_i18n( $category->count );
-    $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
-    return "<tr id='cat-$category->term_id'$class>
-        <th scope='row' style='text-align: center'>$category->term_id</th>
-        <td>" . ( $name_override ? $name_override : $pad . ' ' . $category->name ) . "</td>
-        <td>$category->description</td>
-        <td align='center'>$count</td>
-        <td>$edit</td>\n\t</tr>\n";
-}
-?>
-
-<?php if (isset($_GET['message'])) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
@@ -62 +35 @@
     </tr>
     </thead>
-    <tbody id="the-list">
+    <tbody id="the-list" class="list:link-cat">
 <?php
 $categories = get_terms( 'link_category', 'hide_empty=0' );

trunk/wp-admin/edit-link-category-form.php

@@ -10 +10 @@
     $heading = __('Add Category');
     $submit_text = __('Add Category »');
-    $form = '<form name="addcat" id="addcat" method="post" action="link-category.php">';
+    $form = '<form name="addcat" id="addcat" class="add:the-list:" method="post" action="link-category.php">';
     $action = 'addcat';
     $nonce_action = 'add-link-category';

trunk/wp-admin/includes/template.php

@@ -35 +35 @@
     global $class;
 
+    $category = get_category( $category );
+
     $pad = str_repeat( '— ', $level );
     if ( current_user_can( 'manage_categories' ) ) {
@@ -48 +50 @@
         $edit = '';
 
-    $class = ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
+    $class = " class='alternate'" == $class ? '' : " class='alternate'";
 
     $category->count = number_format_i18n( $category->count );
@@ -60 +62 @@
 
     return apply_filters('cat_row', $output);
+}
+
+function link_cat_row( $category ) {
+    global $class;
+
+    if ( !$category = get_term( $category, 'link_category' ) )
+        return false;
+    if ( is_wp_error( $category ) )
+        return $category;
+
+    if ( current_user_can( 'manage_categories' ) ) {
+        $edit = "<a href='link-category.php?action=edit&amp;cat_ID=$category->term_id' class='edit'>".__( 'Edit' )."</a></td>";
+        $default_cat_id = (int) get_option( 'default_link_category' );
+
+        $delete_url = wp_nonce_url( "link-category.php?action=delete&amp;cat_ID=$category->term_id", "delete-link-category_$category->term_id" );
+        if ( $category->term_id != $default_cat_id )
+            $edit .= "<td><a href='$delete_url' class='delete:the-list:link-cat-$category->term_id delete'>" . __( 'Delete' ) . "</a>";
+        else
+            $edit .= "<td style='text-align:center'>" . __( "Default" );
+    } else {
+        $edit = '';
+    }
+
+    $class = " class='alternate'" == $class ? '' : " class='alternate'";
+
+    $category->count = number_format_i18n( $category->count );
+    $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
+    $output = "<tr id='link-cat-$category->term_id'$class>
+        <th scope='row' style='text-align: center'>$category->term_id</th>
+        <td>" . ( $name_override ? $name_override : $pad . ' ' . $category->name ) . "</td>
+        <td>$category->description</td>
+        <td align='center'>$count</td>
+        <td>$edit</td>\n\t</tr>\n";
+
+    return apply_filters( 'link_cat_row', $output );
 }
 

trunk/wp-admin/js/categories.js

@@ -1 +1 @@
 jQuery(function($) {
-    var options = document.forms['addcat'].category_parent.options;
+    var options = false
+    if ( document.forms['addcat'].category_parent )
+        options = document.forms['addcat'].category_parent.options;
 
     var addAfter = function( r, settings ) {
@@ -15 +17 @@
     }
 
-    var a = $('#the-list').wpList( { addAfter: addAfter, delAfter: delAfter } );
+    if ( options )
+        $('#the-list').wpList( { addAfter: addAfter, delAfter: delAfter } );
+    else
+        $('#the-list').wpList();
 });

trunk/wp-includes/script-loader.php

@@ -116 +116 @@
                 'how' => __('Separate multiple categories with commas.')
             ) );
-            $this->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20070823' );
+            $this->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20071031' );
             $this->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' );
             $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20070822' );

trunk/wp-settings.php

@@ -119 +119 @@
 require (ABSPATH . WPINC . '/compat.php');
 require (ABSPATH . WPINC . '/functions.php');
+require (ABSPATH . WPINC . '/classes.php');
 
 require_wp_db();
-// $table_prefix is deprecated as of 2.1
-$wpdb->prefix = $table_prefix;
-
-if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') )
+$prefix = $wpdb->set_prefix($table_prefix);
+
+if ( is_wp_error($prefix) )
     wp_die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.");
-
-// Table names
-$wpdb->posts          = $wpdb->prefix . 'posts';
-$wpdb->users          = $wpdb->prefix . 'users';
-$wpdb->categories     = $wpdb->prefix . 'categories';
-$wpdb->post2cat       = $wpdb->prefix . 'post2cat';
-$wpdb->comments       = $wpdb->prefix . 'comments';
-$wpdb->link2cat       = $wpdb->prefix . 'link2cat';
-$wpdb->links          = $wpdb->prefix . 'links';
-$wpdb->options        = $wpdb->prefix . 'options';
-$wpdb->postmeta       = $wpdb->prefix . 'postmeta';
-$wpdb->usermeta       = $wpdb->prefix . 'usermeta';
-$wpdb->terms          = $wpdb->prefix . 'terms';
-$wpdb->term_taxonomy  = $wpdb->prefix . 'term_taxonomy';
-$wpdb->term_relationships = $wpdb->prefix . 'term_relationships';
-
-if ( defined('CUSTOM_USER_TABLE') )
-    $wpdb->users = CUSTOM_USER_TABLE;
-if ( defined('CUSTOM_USER_META_TABLE') )
-    $wpdb->usermeta = CUSTOM_USER_META_TABLE;
 
 if ( file_exists(ABSPATH . 'wp-content/object-cache.php') )
@@ -154 +134 @@
 wp_cache_init();
 
-require (ABSPATH . WPINC . '/classes.php');
 require (ABSPATH . WPINC . '/plugin.php');
 require (ABSPATH . WPINC . '/default-filters.php');