Changeset 6213

Timestamp:

10/09/07 22:49:42 (10 months ago)

Author:

ryan

Message:

jquery for list manipulation. Round one, fight. Props mdawaffe. fixes #4805

Files:

• trunk/wp-admin/admin-ajax.php (modified) (16 diffs)
• trunk/wp-admin/categories.php (modified) (1 diff)
• trunk/wp-admin/edit-category-form.php (modified) (2 diffs)
• trunk/wp-admin/edit-comments.php (modified) (5 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (1 diff)
• trunk/wp-admin/edit-link-form.php (modified) (1 diff)
• trunk/wp-admin/edit-pages.php (modified) (3 diffs)
• trunk/wp-admin/edit-post-rows.php (modified) (2 diffs)
• trunk/wp-admin/edit.php (modified) (3 diffs)
• trunk/wp-admin/includes/post.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (8 diffs)
• trunk/wp-admin/js/cat.js (modified) (1 diff)
• trunk/wp-admin/js/categories.js (modified) (1 diff)
• trunk/wp-admin/js/custom-fields.js (modified) (1 diff)
• trunk/wp-admin/js/edit-comments.js (modified) (1 diff)
• trunk/wp-admin/js/edit-posts.js (added)
• trunk/wp-admin/js/link-cat.js (modified) (1 diff)
• trunk/wp-admin/js/users.js (modified) (1 diff)
• trunk/wp-admin/link-add.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (5 diffs)
• trunk/wp-admin/page.php (modified) (1 diff)
• trunk/wp-admin/post.php (modified) (1 diff)
• trunk/wp-admin/users.php (modified) (3 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/classes.php (modified) (3 diffs)
• trunk/wp-includes/pluggable.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -5 +5 @@
-define('DOING_AJAX', true);
-
-check_ajax_referer();
-if ( !is_user_logged_in() )
-    die('-1');
@@ -12 +11 @@
-add_action( 'shutdown', 'get_out_now', -1 );
-
-function wp_ajax_meta_row( $pid, $mid, $key, $value ) {
-    $value = attribute_escape($value);
-    $key_js = addslashes(wp_specialchars($key, 'double'));
-    $key = attribute_escape($key);
-    $r .= "<tr id='meta-$mid'><td valign='top'>";
-    $r .= "<input name='meta[$mid][key]' tabindex='6' onkeypress='return killSubmit(\"theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);\",event);' type='text' size='20' value='$key' />";
-    $r .= "</td><td><textarea name='meta[$mid][value]' tabindex='6' rows='2' cols='30'>$value</textarea></td><td align='center'>";
-    $r .= "<input name='updatemeta' type='button' class='updatemeta' tabindex='6' value='".attribute_escape(__('Update'))."' onclick='return theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);' /><br />";
-    $r .= "<input name='deletemeta[$mid]' type='submit' onclick=\"return deleteSomething( 'meta', $mid, '";
-    $r .= js_escape(sprintf(__("You are about to delete the '%s' custom field on this post.\n'OK' to delete, 'Cancel' to stop."), $key_js));
-    $r .= "' );\" class='deletemeta' tabindex='6' value='".attribute_escape(__('Delete'))."' /></td></tr>";
-    return $r;
-}
-
-$id = (int) $_POST['id'];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-case 'delete-comment' :
+    check_ajax_referer( "delete-comment_$id" );
-    if ( !$comment = get_comment( $id ) )
-        die('0');
@@ -34 +35 @@
-        die('-1');
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        die('1');
-    else    die('0');
-    break;
-
-
-
-
-
-
-
+
+
+
+
+
+
-        die('1');
-    else    die('0');
-    break;
-case 'delete-cat' :
-    if ( !current_user_can( 'manage_categories' ) )
-        die('-1');
-
-    if ( wp_delete_category( $id ) )
-        die('1');
-    else    die('0');
-    break;
-case 'delete-link' :
-    if ( !current_user_can( 'manage_links' ) )
-        die('-1');
-
-    if ( wp_delete_link( $id ) )
-        die('1');
-    else    die('0');
-    break;
-case 'delete-meta' :
+    check_ajax_referer( 'change_meta' );
-    if ( !$meta = get_post_meta_by_id( $id ) )
-        die('0');
@@ -74 +71 @@
-    break;
-case 'delete-post' :
+    check_ajax_referer( "{$action}_$id" );
-    if ( !current_user_can( 'delete_post', $id ) )
-        die('-1');
@@ -79 +77 @@
-    if ( wp_delete_post( $id ) )
-        die('1');
-
+
+
-    break;
-case 'delete-page' :
+    check_ajax_referer( "{$action}_$id" );
-    if ( !current_user_can( 'delete_page', $id ) )
-        die('-1');
@@ -98 +98 @@
-
-    if ( 'unapproved' == wp_get_comment_status($comment->comment_ID) ) {
+        check_ajax_referer( "approve-comment_$id" );
-        if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
-            die('1');
-    } else {
+        check_ajax_referer( "unapprove-comment_$id" );
-        if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
-            die('1');
@@ -107 +109 @@
-    break;
-case 'add-category' : // On the Fly
+    check_ajax_referer( $action );
-    if ( !current_user_can( 'manage_categories' ) )
-        die('-1');
@@ -121 +124 @@
-            'what' => 'category',
-            'id' => $cat_id,
-
+
+
-        ) );
-    }
@@ -127 +131 @@
-    break;
-case 'add-link-category' : // On the Fly
+    check_ajax_referer( $action );
-    if ( !current_user_can( 'manage_categories' ) )
-        die('-1');
@@ -137 +142 @@
-        if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
-            $cat_id = wp_insert_term( $cat_name, 'link_category' );
-            $cat_id = $cat_id['term_id'];
-        }
+        $cat_id = $cat_id['term_id'];
-        $cat_name = wp_specialchars(stripslashes($cat_name));
-        $x->add( array(
-            'what' => 'link-category',
-            'id' => $cat_id,
-
+
+
-        ) );
-    }
@@ -149 +155 @@
-    break;
-case 'add-cat' : // From Manage->Categories
+    check_ajax_referer( 'add-category' );
-    if ( !current_user_can( 'manage_categories' ) )
-        die('-1');
@@ -156 +163 @@
-        die('0');
-    $level = 0;
-cat_
+
-    $_cat = $cat;
-category_
-category_
-cat_
+
+
+
-        $level++;
-    }
@@ -167 +174 @@
-    $x = new WP_Ajax_Response( array(
-        'what' => 'cat',
-cat_ID
+term_id
-        'data' => _cat_row( $cat, $level, $cat_full_name ),
-cat_ID
+term_id
-    ) );
-    $x->send();
-    break;
-case 'add-comment' :
+    check_ajax_referer( $action );
-    if ( !current_user_can( 'edit_post', $id ) )
-        die('-1');
-    $search = isset($_POST['s']) ? $_POST['s'] : false;
-: 25
+- 1: 24
-
-    list($comments, $total) = _wp_get_comment_list( $search, $start, 1 );
@@ -199 +207 @@
-    break;
-case 'add-meta' :
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $key = stripslashes($key);
-        $value = stripslashes($value);
-        $x = new WP_Ajax_Response( array(
-            'what' => 'meta',
-
-
+
+
+
+
+
+
+
-            'supplemental' => array('postid' => $meta->post_id)
-        ) );
-
-
-
+
+
-    break;
-case 'add-user' :
+    check_ajax_referer( $action );
-    if ( !current_user_can('edit_users') )
-        die('-1');
@@ -262 +282 @@
-    }
-    $user_object = new WP_User( $user_id );
+
-    $x = new WP_Ajax_Response( array(
-        'what' => 'user',
-        'id' => $user_id,
-        'data' => user_row( $user_object ),
-
+
+
+
+
-    ) );
-    $x->send();
-    break;
-case 'autosave' : // The name of this action is hardcoded in edit_post()
+    check_ajax_referer( $action );
-    $_POST['post_content'] = $_POST['content'];
-    $_POST['post_excerpt'] = $_POST['excerpt'];
@@ -301 +326 @@
-break;
-case 'autosave-generate-nonces' :
+    check_ajax_referer( $action );
-    $ID = (int) $_POST['post_ID'];
-    if($_POST['post_type'] == 'post') {

trunk/wp-admin/categories.php

@@ -100 +100 @@
-    </tr>
-    </thead>
-
+ class="list:cat"
-<?php
-cat_rows();

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

@@ -10 +10 @@
-    $heading = __('Add Category');
-    $submit_text = __('Add Category »');
-
+ class="add:the-list:"
-    $action = 'addcat';
-    $nonce_action = 'add-category';
@@ -44 +44 @@
-        </tr>
-    </table>
-
+class="add:the-list:cat:addcat" 
-<?php do_action('edit_category_form', $category); ?>
-</form>

trunk/wp-admin/edit-comments.php

@@ -103 +103 @@
-        $start = " start='$offset'";
-
-
+list:comment 
-        $i = 0;
-        foreach ( $comments as $comment ) {
@@ -113 +113 @@
-if ( $extra_comments ) : ?>
-<div id="extra-comments" style="display:none">
-ul id="the-extra-comment-list" class="commentlist
+ol id="the-extra-comment-list" class="list:comment commentlist" style="color:red
-<?php
-    foreach ( $extra_comments as $comment ) {
-        get_comment( $comment ); // Cache it
-
-
-
-
+
+
+
+
+
+
+
+
-</div>
-<?php endif; // $extra_comments ?>
@@ -150 +154 @@
-    <th scope="col" colspan="3" style="text-align: center">' .  __('Actions') . '</th>
-  </tr>
-
+
+
-        foreach ($comments as $comment) {
-        $post = get_post($comment->comment_post_ID);
@@ -160 +165 @@
-  <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
-    <td style="text-align: center"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
-
+ class="comment-author"
-    <td><?php comment_author_email_link() ?></td>
-    <td><a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></td>
@@ -174 +179 @@
-    echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-
+
+
-        } ?></td>
-  </tr>
-        <?php
-        } // end foreach
-
+
+
-<p class="submit"><input type="submit" name="delete_button" class="delete" value="<?php _e('Delete Checked Comments &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to delete")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to delete %s comments permanently \n  'Cancel' to stop, 'OK' to delete.")), "' + numchecked + '"); ?>')" />
-            <input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to mark as spam")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to mark %s comments as spam \n  'Cancel' to stop, 'OK' to mark as spam.")), "' + numchecked + '"); ?>')" /></p>

trunk/wp-admin/edit-form-advanced.php

@@ -75 +75 @@
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-
-
+?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?><
+ class="list:category"
-</fieldset>
-

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

@@ -43 +43 @@
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-
-linkcategorychecklist
+?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?><
+categorychecklist" class="list:link-category
-</div>
-</fieldset>

trunk/wp-admin/edit-pages.php

@@ -3 +3 @@
-$title = __('Pages');
-$parent_file = 'edit.php';
-listman
+wp-lists
-require_once('admin-header.php');
-
@@ -21 +21 @@
-
-?>
-
+
+
+
+
+
-<div class="wrap">
-
-<h2><?php
-// Use $_GET instead of is_ since they can override each other
@@ -82 +85 @@
-  </tr>
-  </thead>
-
+ class="list:page"
-<?php page_rows(0, 0, $posts, $all); ?>
-  </tbody>

trunk/wp-admin/edit-post-rows.php

@@ -9 +9 @@
-    </tr>
-    </thead>
-
+ class="list:post"
-<?php
+$i_post = 0;
-if ( have_posts() ) {
-$bgcolor = '';
-add_filter('the_title','wp_specialchars');
-
-
+
+
+
+
-global $current_user;
-$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
@@ -91 +94 @@
-    case 'control_delete':
-        ?>
-' onclick=\"return deleteSomething( 'post', " . $id . ", '" . js_escape(sprintf(__("You are about to delete this post '%s'.\n'OK' to delete, 'Cancel' to stop."), get_the_title())) . "' );\"
+:the-list:post-$post->ID delete'
-        <?php
-        break;

trunk/wp-admin/edit.php

@@ -4 +4 @@
-$title = __('Posts');
-$parent_file = 'edit.php';
-
+
+
+
-require_once('admin-header.php');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-?>
-
@@ -31 +18 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-?>
@@ -155 +109 @@
-    </fieldset>
-    <input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />
+    <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?>
+    <input type="button" id="get-extra-button" class="add:the-extra-list:searchform" style="display:none" />
-</form>
-

trunk/wp-admin/includes/post.php

@@ -469 +469 @@
-}
-
+function wp_edit_posts_query( $q = '_GET' ) {
+    global $wpdb;
+    $$q['m']   = (int) $$q['m'];
+    $$q['cat'] = (int) $$q['cat'];
+    $post_stati  = array(   //  array( adj, noun )
+                'draft' => array(__('Draft'), _c('Drafts|manage posts header')),
+                'future' => array(__('Scheduled'), __('Scheduled posts')),
+                'pending' => array(__('Pending Review'), __('Pending posts')),
+                'private' => array(__('Private'), __('Private posts')),
+                'publish' => array(__('Published'), __('Published posts'))
+            );
+
+    $avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'");
+
+    $post_status_q = '';
+    $post_status_label = _c('Posts|manage posts header');
+    if ( isset($$q['post_status']) && in_array( $$q['post_status'], array_keys($post_stati) ) ) {
+        $post_status_label = $post_stati[$$q['post_status']][1];
+        $post_status_q = '&post_status=' . $$q['post_status'];
+    }
+
+    if ( 'pending' === $$q['post_status'] ) {
+        $order = 'ASC';
+        $orderby = 'modified';
+    } elseif ( 'draft' === $$q['post_status'] ) {
+        $order = 'DESC';
+        $orderby = 'modified';
+    } else {
+        $order = 'DESC';
+        $orderby = 'date';
+    }
+
+    wp("what_to_show=posts$post_status_q&posts_per_page=20&order=$order&orderby=$orderby");
+
+    return array($post_stati, $avail_post_stati);
+}
+
-?>

trunk/wp-admin/includes/template.php

@@ -42 +42 @@
-
-        if ( $category->term_id != $default_cat_id )
-onclick=\"return deleteSomething( 'cat', $category->term_id, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll posts that were only assigned to this category will be assigned to the '%s' category.\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_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='
+class='delete:the-list:cat-$category->term_id 
-        else
-            $edit .= "<td style='text-align:center'>".__( "Default" );
@@ -165 +165 @@
-}
-
+// define the columns to display, the syntax is 'internal name' => 'display name'
+function wp_manage_posts_columns() {
+    $posts_columns = array();
+    $posts_columns['id'] = '<div style="text-align: center">' . __('ID') . '</div>';
+    if ( 'draft' === $_GET['post_status'] )
+        $posts_columns['modified'] = __('Modified');
+    elseif ( 'pending' === $_GET['post_status'] )
+        $posts_columns['modified'] = __('Submitted');
+    else
+        $posts_columns['date'] = __('When');
+    $posts_columns['title'] = __('Title');
+    $posts_columns['categories'] = __('Categories');
+    if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
+        $posts_columns['comments'] = '<div style="text-align: center">' . __('Comments') . '</div>';
+    $posts_columns['author'] = __('Author');
+    $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
+
+    // you can not edit these at the moment
+    $posts_columns['control_view']   = '';
+    $posts_columns['control_edit']   = '';
+    $posts_columns['control_delete'] = '';
+
+    return $posts_columns;
+}
+
-function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) {
-    global $wpdb, $class, $post;
@@ -191 +216 @@
-    <td><?php the_author() ?></td>
-    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td>
-   
+    
-    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>
-' onclick=\"return deleteSomething( 'page', " . $id . ", '" . js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ), get_the_title() ) ) . "' );\"
+:the-list:page-$id delete'
-  </tr>
-
@@ -263 +288 @@
-function _wp_comment_list_item( $id, $alt = 0 ) {
-    global $authordata, $comment, $wpdb;
-    $id = (int) $id;
-    $comment =& get_comment( $id );
+    $id = (int) $comment->comment_ID;
-    $class = '';
-    $post = get_post($comment->comment_post_ID);
-    $authordata = get_userdata($post->post_author);
-comment->comment_ID
+id
-    if ( 'unapproved' == $comment_status )
-        $class .= ' unapproved';
-    if ( $alt % 2 )
-        $class .= ' alternate';
-comment->comment_ID
-
-
+id
+
+ class="comment-author"
-
-<?php comment_text() ?>
@@ -282 +307 @@
-<?php
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-
-
+
+
+
-    if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-
-
-
-
+
+
+
+
+
+
+
-}
-$post = get_post($comment->comment_post_ID, OBJECT, 'display');
@@ -325 +354 @@
-    // Exit if no meta
-    if (!$meta ) {
-
+ class="list:meta"
-        return;
-    }
@@ -337 +366 @@
-    </tr>
-    </thead>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    echo "\n\t</tbody>";
+}
+
+function _list_meta_row( $entry, &$count ) {
+    $r = '';
+    ++ $count;
+    if ( $count % 2 )
+        $style = 'alternate';
+    else
+        $style = '';
+    if ('_' == $entry['meta_key'] { 0 } )
+        $style .= ' hidden';
+
+    if ( is_serialized( $entry['meta_value'] ) ) {
+        if ( is_serialized_string( $entry['meta_value'] ) ) {
+            // this is a serialized string, so we should display it
+            $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
+        } else {
+            // this is a serialized array/object so we should NOT display it
+            --$count;
+            return;
+        }
+    }
+
+    $key_js = js_escape( $entry['meta_key'] );
+    $entry['meta_key']   = attribute_escape($entry['meta_key']);
+    $entry['meta_value'] = attribute_escape($entry['meta_value']);
+    $entry['meta_id'] = (int) $entry['meta_id'];
+    $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
+    $r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
+    $r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
+    $r .= "\n\t\t<td align='center'><input name='updatemeta' type='submit' tabindex='6' value='".attribute_escape(__( 'Update' ))."' class='add:the-list:meta-{$entry['meta_id']} updatemeta' /><br />";
+    $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
+    $r .= "class='delete:the-list:meta-{$entry['meta_id']} deletemeta' tabindex='6' value='".attribute_escape(__( 'Delete' ))."' />";
+    $r .= "<input type='hidden' name='_ajax_nonce' value='$nonce' />";
+    $r .= "</td>\n\t</tr>";
+    return $r;
-}
-
@@ -414 +447 @@
-    </tr>
-
+<tr class="submit"><td colspan="3">
+    <?php wp_nonce_field( 'change_meta', '_ajax_nonce', false ); ?>
+    <input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _e( 'Add Custom Field &raquo;' ) ?>" />
+</td></tr>
-</table>
-<p class="submit"><input type="submit" id="updatemetasub" name="updatemeta" tabindex="9" value="<?php _e( 'Add Custom Field &raquo;' ) ?>" /></p>
-<?php
-