wp-admin/css/farbtastic-rtl.css wp-admin/css/farbtastic.css wp-admin/css/plugin-install-rtl.css wp-admin/css/plugin-install.css wp-admin/images/archive-link.png wp-admin/images/blue-grad.png wp-admin/images/bubble_bg-rtl.gif wp-admin/images/button-grad-active.png wp-admin/images/button-grad.png wp-admin/images/ed-bg.gif wp-admin/images/fav-arrow-rtl.gif wp-admin/images/fav-arrow.gif wp-admin/images/fav-top.png wp-admin/images/fav.png wp-admin/images/generic.png wp-admin/images/gray-grad.png wp-admin/images/icons32-vs.png wp-admin/images/icons32.png wp-admin/images/list-vs.png wp-admin/images/list.png wp-admin/images/marker.png wp-admin/images/mask.png wp-admin/images/menu-arrows.gif wp-admin/images/menu-bits-rtl.gif wp-admin/images/menu-bits.gif wp-admin/images/menu-dark-rtl.gif wp-admin/images/menu-dark.gif wp-admin/images/menu-vs.png wp-admin/images/menu.png wp-admin/images/resize.gif wp-admin/images/screen-options-left.gif wp-admin/images/screen-options-right-up.gif wp-admin/images/screen-options-right.gif wp-admin/images/se.png wp-admin/images/star.gif wp-admin/images/wheel.png wp-admin/images/white-grad-active.png wp-admin/images/white-grad.png wp-admin/images/wp-logo.gif wp-admin/import/opml.php wp-admin/includes/class-wp-filesystem-ssh2.php wp-admin/includes/plugin-install.php wp-admin/includes/update-core.php wp-admin/js/dashboard.js wp-admin/js/farbtastic.js wp-admin/js/inline-edit-post.js wp-admin/js/inline-edit-tax.js wp-admin/js/plugin-install.js wp-admin/media-new.php wp-admin/options-media.php wp-admin/plugin-install.php wp-admin/tools.php wp-admin/update-core.php wp-admin/user-new.php wp-includes/http.php wp-includes/images/upload.png wp-includes/js/comment-reply.js wp-includes/js/hoverIntent.js wp-includes/js/jquery/jquery.hotkeys.js wp-includes/js/jquery/jquery.table-hotkeys.js wp-includes/js/jquery/ui.dialog.js wp-includes/js/jquery/ui.draggable.js wp-includes/js/jquery/ui.resizable.js wp-includes/js/swfupload/plugins/swfupload.swfobject.js wp-includes/js/swfupload/swfupload.swf wp-includes/js/tinymce/langs/wp-langs-en.js wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js wp-includes/js/tinymce/plugins/wpgallery/img/delete.png wp-includes/js/tinymce/plugins/wpgallery/img/edit.png wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png wp-includes/js/tinymce/plugins/wpgallery/img/t.gif @@ -1,8 +1,9 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110, USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. license.txt @@ -1,29 +1,67 @@ <?php +/** + * WordPress AJAX Process Execution. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Executing AJAX process. + * + * @since unknown + */ define('DOING_AJAX', true); +define('WP_ADMIN', true); require_once('../wp-load.php'); require_once('includes/admin.php'); -if ( !is_user_logged_in() ) +if ( ! is_user_logged_in() ) { + + if ( $_POST['action'] == 'autosave' ) { + $id = isset($_POST['post_ID'])? (int) $_POST['post_ID'] : 0; + + if ( ! $id ) + die('-1'); + + $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() ); + $x = new WP_Ajax_Response( array( + 'what' => 'autosave', + 'id' => $id, + 'data' => $message + ) ); + $x->send(); + } + die('-1'); +} -if ( isset($_GET['action']) && 'ajax-tag-search' == $_GET['action'] ) { +if ( isset( $_GET['action'] ) ) : +switch ( $action = $_GET['action'] ) : +case 'ajax-tag-search' : if ( !current_user_can( 'manage_categories' ) ) die('-1'); $s = $_GET['q']; // is this slashed already? - if ( strstr( $s, ',' ) ) { - $s = explode( ',', $s ); - $s = $s[count( $s ) - 1]; + if ( false !== strpos( $s, ',' ) ) { + $s = explode( ',', $s ); + $s = $s[count( $s ) - 1]; } $s = trim( $s ); if ( strlen( $s ) < 2 ) - die; // require 2 chars for matching - $results = $wpdb->get_col( "SELECT name FROM $wpdb->terms WHERE name LIKE ('%". $s . "%')" ); + die; // require 2 chars for matching + $results = $wpdb->get_col( "SELECT t.name FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = 'post_tag' AND t.name LIKE ('%". $s . "%')" ); echo join( $results, "\n" ); die; -} + break; +default : + do_action( 'wp_ajax_' . $_GET['action'] ); + die('0'); + break; +endswitch; +endif; $id = isset($_POST['id'])? (int) $_POST['id'] : 0; switch ( $action = $_POST['action'] ) : @@ -170,7 +208,7 @@ case 'dim-comment' : if ( $_POST['new'] == $current ) die('1'); - if ( 'unapproved' == $current ) { + if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) { check_ajax_referer( "approve-comment_$id" ); if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) ) die('1'); @@ -278,7 +316,7 @@ case 'add-cat' : // From Manage->Categories ) ); $x->send(); } - + $cat = wp_insert_category( $_POST, true ); if ( is_wp_error($cat) ) { @@ -305,6 +343,7 @@ case 'add-cat' : // From Manage->Categories $x = new WP_Ajax_Response( array( 'what' => 'cat', 'id' => $cat->term_id, + 'position' => -1, '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)) ) ); @@ -340,6 +379,7 @@ case 'add-link-cat' : // From Blogroll -> Categories $x = new WP_Ajax_Response( array( 'what' => 'link-cat', 'id' => $term_id, + 'position' => -1, 'data' => $link_cat ) ); $x->send(); @@ -376,11 +416,35 @@ case 'add-tag' : // From Manage->Tags $x = new WP_Ajax_Response( array( 'what' => 'tag', 'id' => $tag->term_id, + 'position' => '-1', 'data' => _tag_row( $tag ), 'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name)) ) ); $x->send(); break; +case 'get-tagcloud' : + if ( !current_user_can( 'manage_categories' ) ) + die('-1'); + + $tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) ); + + if ( empty( $tags ) ) + die( __('No tags found!') ); + + foreach ( $tags as $key => $tag ) { + $tags[ $key ]->link = '#'; + $tags[ $key ]->id = $tag->term_id; + } + + $return = wp_generate_tag_cloud( $tags ); + + if ( empty($return) ) + die('0'); + + echo $return; + + exit; + break; case 'add-comment' : check_ajax_referer( $action ); if ( !current_user_can( 'edit_post', $id ) ) @@ -389,8 +453,9 @@ case 'add-comment' : $start = isset($_POST['page']) ? intval($_POST['page']) * 25 - 1: 24; $status = isset($_POST['comment_status']) ? $_POST['comment_status'] : false; $mode = isset($_POST['mode']) ? $_POST['mode'] : 'detail'; - - list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 ); + $p = isset($_POST['p']) ? $_POST['p'] : 0; + $comment_type = isset($_POST['comment_type']) ? $_POST['comment_type'] : ''; + list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1, $p, $comment_type ); if ( get_option('show_avatars') ) add_filter( 'comment_author', 'floated_admin_avatar' ); @@ -401,7 +466,7 @@ case 'add-comment' : foreach ( (array) $comments as $comment ) { get_comment( $comment ); ob_start(); - _wp_comment_row( $comment->comment_ID, $mode, $status ); + _wp_comment_row( $comment->comment_ID, $mode, $status, true, true ); $comment_list_item = ob_get_contents(); ob_end_clean(); $x->add( array( @@ -412,6 +477,142 @@ case 'add-comment' : } $x->send(); break; +case 'get-comments' : + check_ajax_referer( $action ); + + $post_ID = (int) $_POST['post_ID']; + if ( !current_user_can( 'edit_post', $post_ID ) ) + die('-1'); + + $start = isset($_POST['start']) ? intval($_POST['start']) : 0; + $num = isset($_POST['num']) ? intval($_POST['num']) : 10; + + list($comments, $total) = _wp_get_comment_list( false, false, $start, $num, $post_ID ); + + if ( !$comments ) + die('1'); + + $comment_list_item = ''; + $x = new WP_Ajax_Response(); + foreach ( (array) $comments as $comment ) { + get_comment( $comment ); + ob_start(); + _wp_comment_row( $comment->comment_ID, 'single', false, false ); + $comment_list_item .= ob_get_contents(); + ob_end_clean(); + } + $x->add( array( + 'what' => 'comments', + 'data' => $comment_list_item + ) ); + $x->send(); + break; +case 'replyto-comment' : + check_ajax_referer( $action ); + + $comment_post_ID = (int) $_POST['comment_post_ID']; + if ( !current_user_can( 'edit_post', $comment_post_ID ) ) + die('-1'); + + $status = $wpdb->get_var( $wpdb->prepare("SELECT post_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) ); + + if ( empty($status) ) + die('1'); + elseif ( in_array($status, array('draft', 'pending') ) ) + die( __('Error: you are replying to a comment on a draft post.') ); + + $user = wp_get_current_user(); + if ( $user->ID ) { + $comment_author = $wpdb->escape($user->display_name); + $comment_author_email = $wpdb->escape($user->user_email); + $comment_author_url = $wpdb->escape($user->user_url); + $comment_content = trim($_POST['content']); + if ( current_user_can('unfiltered_html') ) { + if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) { + kses_remove_filters(); // start with a clean slate + kses_init_filters(); // set up the filters + } + } + } else { + die( __('Sorry, you must be logged in to reply to a comment.') ); + } + + if ( '' == $comment_content ) + die( __('Error: please type a comment.') ); + + $comment_parent = absint($_POST['comment_ID']); + $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID'); + + $comment_id = wp_new_comment( $commentdata ); + $comment = get_comment($comment_id); + if ( ! $comment ) die('1'); + + $modes = array( 'single', 'detail', 'dashboard' ); + $mode = isset($_POST['mode']) && in_array( $_POST['mode'], $modes ) ? $_POST['mode'] : 'detail'; + $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1'; + $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; + + if ( get_option('show_avatars') && 'single' != $mode ) + add_filter( 'comment_author', 'floated_admin_avatar' ); + + $x = new WP_Ajax_Response(); + + ob_start(); + if ( 'dashboard' == $mode ) { + require_once( ABSPATH . 'wp-admin/includes/dashboard.php' ); + _wp_dashboard_recent_comments_row( $comment, false ); + } else { + _wp_comment_row( $comment->comment_ID, $mode, false, $checkbox ); + } + $comment_list_item = ob_get_contents(); + ob_end_clean(); + + $x->add( array( + 'what' => 'comment', + 'id' => $comment->comment_ID, + 'data' => $comment_list_item, + 'position' => $position + )); + + $x->send(); + break; +case 'edit-comment' : + check_ajax_referer( 'replyto-comment' ); + + $comment_post_ID = (int) $_POST['comment_post_ID']; + if ( ! current_user_can( 'edit_post', $comment_post_ID ) ) + die('-1'); + + if ( '' == $_POST['content'] ) + die( __('Error: please type a comment.') ); + + $comment_id = (int) $_POST['comment_ID']; + $_POST['comment_status'] = $_POST['status']; + edit_comment(); + + $mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail'; + $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1'; + $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; + + if ( get_option('show_avatars') && 'single' != $mode ) + add_filter( 'comment_author', 'floated_admin_avatar' ); + + $x = new WP_Ajax_Response(); + + ob_start(); + _wp_comment_row( $comment_id, $mode, true, $checkbox ); + $comment_list_item = ob_get_contents(); + ob_end_clean(); + + $x->add( array( + 'what' => 'edit_comment', + 'id' => $comment->comment_ID, + 'data' => $comment_list_item, + 'position' => $position + )); + + $x->send(); + break; case 'add-meta' : check_ajax_referer( 'add-meta' ); $c = 0; @@ -616,13 +817,29 @@ case 'closed-postboxes' : check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' ); $closed = isset( $_POST['closed'] )? $_POST['closed'] : ''; $closed = explode( ',', $_POST['closed'] ); + $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : ''; + $hidden = explode( ',', $_POST['hidden'] ); + $page = isset( $_POST['page'] )? $_POST['page'] : ''; + if ( !preg_match( '/^[a-z-_]+$/', $page ) ) { + die(-1); + } + $current_user = wp_get_current_user(); + if ( is_array($closed) ) + update_usermeta($current_user->ID, 'closedpostboxes_'.$page, $closed); + if ( is_array($hidden) ) + update_usermeta($current_user->ID, 'meta-box-hidden_'.$page, $hidden); +break; +case 'hidden-columns' : + check_ajax_referer( 'hiddencolumns', 'hiddencolumnsnonce' ); + $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : ''; + $hidden = explode( ',', $_POST['hidden'] ); $page = isset( $_POST['page'] )? $_POST['page'] : ''; - if ( !preg_match( '/^[a-z-]+$/', $page ) ) { + if ( !preg_match( '/^[a-z-_]+$/', $page ) ) { die(-1); } - if (!is_array($closed)) break; $current_user = wp_get_current_user(); - update_usermeta($current_user->ID, 'closedpostboxes_'.$page, $closed); + if ( is_array($hidden) ) + update_usermeta($current_user->ID, "manage-$page-columns-hidden", $hidden); break; case 'get-permalink': check_ajax_referer( 'getpermalink', 'getpermalinknonce' ); @@ -636,6 +853,189 @@ case 'sample-permalink': $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : ''; die(get_sample_permalink_html($post_id, $title, $slug)); break; +case 'inline-save': + check_ajax_referer( 'inlineeditnonce', '_inline_edit' ); + + if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) ) + exit; + + if ( 'page' == $_POST['post_type'] ) { + if ( ! current_user_can( 'edit_page', $post_ID ) ) + die( __('You are not allowed to edit this page.') ); + } else { + if ( ! current_user_can( 'edit_post', $post_ID ) ) + die( __('You are not allowed to edit this post.') ); + } + + if ( $last = wp_check_post_lock( $post_ID ) ) { + $last_user = get_userdata( $last ); + $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' ); + printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ), wp_specialchars( $last_user_name ) ); + exit; + } + + $data = &$_POST; + $post = get_post( $post_ID, ARRAY_A ); + $data['content'] = $post['post_content']; + $data['excerpt'] = $post['post_excerpt']; + + // rename + $data['user_ID'] = $GLOBALS['user_ID']; + + if ( isset($data['post_parent']) ) + $data['parent_id'] = $data['post_parent']; + + // status + if ( isset($data['keep_private']) && 'private' == $data['keep_private'] ) + $data['post_status'] = 'private'; + else + $data['post_status'] = $data['_status']; + + if ( empty($data['comment_status']) ) + $data['comment_status'] = 'closed'; + if ( empty($data['ping_status']) ) + $data['ping_status'] = 'closed'; + + // update the post + $_POST = $data; + edit_post(); + + $post = array(); + if ( 'page' == $_POST['post_type'] ) { + $post[] = get_post($_POST['post_ID']); + page_rows($post); + } elseif ( 'post' == $_POST['post_type'] ) { + $mode = $_POST['post_view']; + $post[] = get_post($_POST['post_ID']); + post_rows($post); + } + + exit; + break; +case 'inline-save-tax': + check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' ); + + if ( ! current_user_can('manage_categories') ) + die( __('Cheatin&#8217; uh?') ); + + if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) ) + die(-1); + + switch ($_POST['tax_type']) { + case 'cat' : + $data = array(); + $data['cat_ID'] = $id; + $data['cat_name'] = $_POST['name']; + $data['category_nicename'] = $_POST['slug']; + if ( isset($_POST['parent']) && (int) $_POST['parent'] > 0 ) + $data['category_parent'] = $_POST['parent']; + + $cat = get_category($id, ARRAY_A); + $data['category_description'] = $cat['category_description']; + + $updated = wp_update_category($data); + + if ( $updated && !is_wp_error($updated) ) + echo _cat_row( $updated, 0 ); + else + die( __('Category not updated.') ); + + break; + case 'link-cat' : + $updated = wp_update_term($id, 'link_category', $_POST); + + if ( $updated && !is_wp_error($updated) ) + echo link_cat_row($updated['term_id']); + else + die( __('Category not updated.') ); + + break; + case 'tag' : + $updated = wp_update_term($id, 'post_tag', $_POST); + if ( $updated && !is_wp_error($updated) ) { + $tag = get_term( $updated['term_id'], 'post_tag' ); + if ( !$tag || is_wp_error( $tag ) ) + die( __('Tag not updated.') ); + + echo _tag_row($tag); + } else { + die( __('Tag not updated.') ); + } + + break; + } + + exit; + break; +case 'meta-box-order': + check_ajax_referer( 'meta-box-order' ); + update_user_option( $GLOBALS['current_user']->ID, "meta-box-order_$_POST[page]", $_POST['order'] ); + die('1'); + break; +case 'find_posts': + check_ajax_referer( 'find-posts' ); + + if ( empty($_POST['ps']) ) + exit; + + $what = isset($_POST['pages']) ? 'page' : 'post'; + $s = stripslashes($_POST['ps']); + preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches); + $search_terms = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]); + + $searchand = $search = ''; + foreach( (array) $search_terms as $term) { + $term = addslashes_gpc($term); + $search .= "{$searchand}(($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%'))"; + $searchand = ' AND '; + } + $term = $wpdb->escape($s); + if ( count($search_terms) > 1 && $search_terms[0] != $s ) + $search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')"; + + $posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND $search ORDER BY post_date_gmt DESC LIMIT 50" ); + + if ( ! $posts ) + exit( __('No posts found.') ); + + $html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th>'.__('Time').'</th><th>'.__('Status').'</th></tr></thead><tbody>'; + foreach ( $posts as $post ) { + + switch ( $post->post_status ) { + case 'publish' : + case 'private' : + $stat = __('Published'); + break; + case 'future' : + $stat = __('Scheduled'); + break; + case 'pending' : + $stat = __('Pending Review'); + break; + case 'draft' : + $stat = __('Unpublished'); + break; + } + + if ( '0000-00-00 00:00:00' == $post->post_date ) { + $time = ''; + } else { + $time = mysql2date(__('Y/m/d'), $post->post_date); + } + + $html .= '<tr class="found-posts"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="'.$post->ID.'"></td>'; + $html .= '<td><label for="found-'.$post->ID.'">'.wp_specialchars($post->post_title, true).'</label></td><td>'.wp_specialchars($time, true).'</td><td>'.wp_specialchars($stat, true).'</td></tr>'."\n\n"; + } + $html .= '</tbody></table>'; + + $x = new WP_Ajax_Response(); + $x->add( array( + 'what' => $what, + 'data' => $html + )); + $x->send(); + + break; default : do_action( 'wp_ajax_' . $_POST['action'] ); die('0'); wp-admin/admin-ajax.php @@ -1,14 +1,28 @@ -</div><!-- wpbody --> -</div><!-- wpcontent --> +<?php +/** + * WordPress Administration Template Footer + * + * @package WordPress + * @subpackage Administration + */ +?> + +<div class="clear"></div></div><!-- wpbody-content --> +<div class="clear"></div></div><!-- wpbody --> +<div class="clear"></div></div><!-- wpcontent --> </div><!-- wpwrap --> + <div id="footer"> -<p><?php -do_action('in_admin_footer', ''); +<p id="footer-left" class="alignleft"><?php +do_action( 'in_admin_footer' ); $upgrade = apply_filters( 'update_footer', '' ); -echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade; -?></p> +echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>'); ?> +</p> +<?php // if ( $is_IE ) browse_happy(); ?> +<p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p> +<div class="clear"></div> </div> <?php do_action('admin_footer', ''); ?> <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script> </body> -</html> +</html> \ No newline at end of file wp-admin/admin-footer.php @@ -1,5 +1,16 @@ <?php -// Deprecated. Use includes/admin.php. +/** + * Administration Functions + * + * This file is deprecated, use 'wp-admin/includes/admin.php' instead. + * + * @deprecated 2.5 + * @package WordPress + * @subpackage Administration + */ + _deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/admin.php' ); + +/** WordPress Administration API: Includes all Administration functions. */ require_once(ABSPATH . 'wp-admin/includes/admin.php'); -?> +?> \ No newline at end of file wp-admin/admin-functions.php @@ -1,33 +1,23 @@ <?php +/** + * WordPress Administration Template Header + * + * @package WordPress + * @subpackage Administration + */ + @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); if (!isset($_GET["page"])) require_once('admin.php'); -if ( $editing ) { - if ( user_can_richedit() ) - wp_enqueue_script( 'wp_tiny_mce' ); -} -wp_enqueue_script( 'wp-gears' ); - -$min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' ); -$the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); -$ie6_no_scrollbar = true; - -function add_minwidth($c) { - return $c . 'minwidth '; -} - -if ( in_array( $the_current_page, $min_width_pages ) ) { - $ie6_no_scrollbar = false; - add_filter( 'admin_body_class', 'add_minwidth' ); -} get_admin_page_title(); - +$title = wp_specialchars( strip_tags( $title ) ); +wp_user_settings(); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>> <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> -<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title> +<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title> <?php wp_admin_css( 'css/global' ); @@ -39,94 +29,104 @@ wp_admin_css( 'css/ie' ); <script type="text/javascript"> //<![CDATA[ addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}}; + +function convertEntities(o) { + var c = function(s) { + if (/&[^;]+;/.test(s)) { + var e = document.createElement("div"); + e.innerHTML = s; + return !e.firstChild ? s : e.firstChild.nodeValue; + } + return s; + } + + if ( typeof o === 'string' ) + return c(o); + else if ( typeof o === 'object' ) + for (var v in o) { + if ( typeof o[v] === 'string' ) + o[v] = c(o[v]); + } + return o; +}; //]]> </script> -<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') && $ie6_no_scrollbar ) : ?> -<style type="text/css">* html { overflow-x: hidden; }</style> -<?php endif; +<?php -$hook_suffixes = array(); +if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) { + add_action( 'admin_head', 'wp_tiny_mce' ); +} +$hook_suffix = ''; if ( isset($page_hook) ) - $hook_suffixes[] = "-$page_hook"; + $hook_suffix = "$page_hook"; else if ( isset($plugin_page) ) - $hook_suffixes[] = "-$plugin_page"; + $hook_suffix = "$plugin_page"; else if ( isset($pagenow) ) - $hook_suffixes[] = "-$pagenow"; - -$hook_suffixes[] = ''; + $hook_suffix = "$pagenow"; -foreach ( $hook_suffixes as $hook_suffix ) - do_action("admin_print_styles$hook_suffix"); // do_action( 'admin_print_styles-XXX' ); do_action( 'admin_print_styles' ); -foreach ( $hook_suffixes as $hook_suffix ) - do_action("admin_print_scripts$hook_suffix"); // do_action( 'admin_print_scripts-XXX' ); do_action( 'admin_print_scripts' ); -foreach ( $hook_suffixes as $hook_suffix ) - do_action("admin_head$hook_suffix"); // do_action( 'admin_head-XXX' ); do_action( 'admin_head' ); -unset($hook_suffixes, $hook_suffix); +do_action("admin_print_styles-$hook_suffix"); +do_action('admin_print_styles'); +do_action("admin_print_scripts-$hook_suffix"); +do_action('admin_print_scripts'); +do_action("admin_head-$hook_suffix"); +do_action('admin_head'); -?> +if ( $is_iphone ) { ?> +<style type="text/css">.row-actions{visibility:visible;}</style> +<?php } ?> </head> <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>"> + <div id="wpwrap"> <div id="wpcontent"> <div id="wphead"> -<h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> -</div> - <?php -if ( ! $is_opera ) { +$blog_name = get_bloginfo('name', 'display'); +if ( '' == $blog_name ) { + $blog_name = '&nbsp;'; +} else { + $blog_name_excerpt = wp_html_excerpt($blog_name, 40); + if ( $blog_name != $blog_name_excerpt ) + $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;'; + $blog_name = $blog_name_excerpt; +} +$title_class = ''; +if ( function_exists('mb_strlen') ) { + if ( mb_strlen($blog_name, 'UTF-8') > 30 ) + $title_class = 'class="long-title"'; +} else { + if ( strlen($blog_name) > 30 ) + $title_class = 'class="long-title"'; +} ?> - <div id="gears-info-box" class="info-box" style="display:none;"> - <img src="images/gear.png" title="Gear" alt="" class="gears-img" /> - <div id="gears-msg1"> - <h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3> - <p><?php _e('WordPress now has support for Gears, which adds new features to your web browser.'); ?><br /> - <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p> - <p><?php _e('After you install and enable Gears most of WordPress&#8217; images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p> - <p><strong><?php _e('Don&#8217;t install on a public or shared computer.'); ?></strong></p> <div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&amp;return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button> - <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div> - </div> - - <div id="gears-msg2" style="display:none;"> - <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> - <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> - <p><?php - - if ( $is_safari ) - _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.'); - else - _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); - - ?></p> - <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p> - <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button> - <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div> - </div> - - <div id="gears-msg3" style="display:none;"> - <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> - <p><?php - - if ( $is_safari ) - _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.'); - else - _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); - - ?></p> - <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> - <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> - <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div> - </div> - </div> + +<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit site') ?>"><?php echo $blog_name ?> <span>&larr; <?php _e('Visit site') ?></span></a></h1> + +<div id="wphead-info"> +<div id="user_info"> +<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> +<?php if ( ! $is_opera ) { ?><span class="turbo-nag hidden"> | <a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> | +<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p> +</div> + +<?php favorite_actions(); ?> +</div> +</div> + +<?php if ( get_user_setting('mfold') == 'f' ) { ?> +<script type="text/javascript">jQuery('#wpcontent').addClass('folded');</script> <?php } ?> -<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div> +<div id="wpbody"> +<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?> +<div id="wpbody-content"> <?php -require(ABSPATH . 'wp-admin/menu-header.php'); +screen_meta($hook_suffix); + +do_action('admin_notices'); if ( $parent_file == 'options-general.php' ) { require(ABSPATH . 'wp-admin/options-head.php'); } -?> -<div id="wpbody"> wp-admin/admin-header.php @@ -1,5 +1,13 @@ <?php -define('WP_ADMIN', TRUE); +/** + * WordPress Administration Generic POST Handler. + * + * @package WordPress + * @subpackage Administration + */ + +/** We are located in WordPress Administration Panels */ +define('WP_ADMIN', true); if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); wp-admin/admin-post.php @@ -1,4 +1,16 @@ <?php +/** + * WordPress Administration Bootstrap + * + * @package WordPress + * @subpackage Administration + */ + +/** + * In WordPress Administration Panels + * + * @since unknown + */ define('WP_ADMIN', TRUE); if ( defined('ABSPATH') ) @@ -26,8 +38,8 @@ $time_format = get_option('time_format'); wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback')); -wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE')); -wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE')); +wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7')); +wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF')); wp_enqueue_script( 'common' ); wp_enqueue_script( 'jquery-color' ); @@ -45,7 +57,14 @@ do_action('admin_init'); // Handle plugin admin pages. if (isset($plugin_page)) { - $page_hook = get_plugin_page_hook($plugin_page, $pagenow); + if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) { + $page_hook = get_plugin_page_hook($plugin_page, $plugin_page); + // backwards compatibility for plugins using add_management_page + if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) { + wp_redirect('tools.php?page=' . $plugin_page); + exit; + } + } if ( $page_hook ) { do_action('load-' . $page_hook); @@ -84,7 +103,7 @@ if (isset($plugin_page)) { } // Allow plugins to define importers as well - if (! is_callable($wp_importers[$importer][2])) + if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) { if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) { @@ -93,7 +112,7 @@ if (isset($plugin_page)) { include(ABSPATH . "wp-admin/import/$importer.php"); } - $parent_file = 'edit.php'; + $parent_file = 'tools.php'; $submenu_file = 'import.php'; $title = __('Import'); @@ -108,6 +127,10 @@ if (isset($plugin_page)) { include(ABSPATH . 'wp-admin/admin-footer.php'); + // Make sure rules are flushed + global $wp_rewrite; + $wp_rewrite->flush_rules(); + exit(); } else { do_action("load-$pagenow"); wp-admin/admin.php @@ -1,8 +1,10 @@ <?php - -/* This accepts file uploads from swfupload or other asynchronous upload methods. - -*/ +/** + * Accepts file uploads from swfupload or other asynchronous upload methods. + * + * @package WordPress + * @subpackage Administration + */ if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); @@ -22,9 +24,14 @@ header('Content-Type: text/plain; charset=' . get_option('blog_charset')); if ( !current_user_can('upload_files') ) wp_die(__('You do not have permission to upload files.')); -// just fetch the detail form for that attachment -if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { - echo get_media_item($id); +// just fetch the detail form for that attachment +if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { + if ( 2 == $_REQUEST['fetch'] ) { + add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2); + echo get_media_item($id, array( 'send' => false, 'delete' => false )); + } else { + echo get_media_item($id); + } exit; } @@ -46,4 +53,4 @@ else { echo apply_filters("async_upload_{$type}", $id); } -?> +?> \ No newline at end of file wp-admin/async-upload.php @@ -1,12 +1,19 @@ <?php +/** + * Categories Management Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once('admin.php'); $title = __('Categories'); -$parent_file = 'edit.php'; -wp_reset_vars(array('action', 'cat')); +wp_reset_vars( array('action', 'cat') ); -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) +if ( isset( $_GET['action'] ) && isset($_GET['delete']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) $action = 'bulk-delete'; switch($action) { @@ -63,7 +70,6 @@ case 'bulk-delete': } $sendback = wp_get_referer(); - $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); wp_redirect($sendback); exit(); @@ -71,6 +77,8 @@ case 'bulk-delete': break; case 'edit': + $title = __('Edit Category'); + require_once ('admin-header.php'); $cat_ID = (int) $_GET['cat_ID']; $category = get_category_to_edit($cat_ID); @@ -85,23 +93,32 @@ case 'editedcat': if ( !current_user_can('manage_categories') ) wp_die(__('Cheatin&#8217; uh?')); + $location = 'categories.php'; + if ( $referer = wp_get_original_referer() ) { + if ( false !== strpos($referer, 'categories.php') ) + $location = $referer; + } + if ( wp_update_category($_POST) ) - wp_redirect('categories.php?message=3'); + $location = add_query_arg('message', 3, $location); else - wp_redirect('categories.php?message=5'); + $location = add_query_arg('message', 5, $location); + + wp_redirect($location); exit; break; default: -if ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -wp_enqueue_script( 'admin-categories' ); -wp_enqueue_script('admin-forms'); +wp_enqueue_script('admin-categories'); +if ( current_user_can('manage_categories') ) + wp_enqueue_script('inline-edit-tax'); require_once ('admin-header.php'); @@ -112,39 +129,47 @@ $messages[4] = __('Category not added.'); $messages[5] = __('Category not updated.'); ?> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<div class="wrap nosubsub"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> +</h2> + +<?php +if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); endif; ?> -<div class="wrap"> -<form id="posts-filter" action="" method="get"> -<?php if ( current_user_can('manage_categories') ) : ?> - <h2><?php printf(__('Manage Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2> -<?php else : ?> - <h2><?php _e('Manage Categories') ?> </h2> -<?php endif; ?> - -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> +<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" /> </p> - +</form> <br class="clear" /> +<div id="col-container"> + +<div id="col-right"> +<div class="col-wrap"> +<form id="posts-filter" action="" method="get"> <div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$catsperpage || $catsperpage < 0 ) +if( ! isset( $catsperpage ) || $catsperpage < 0 ) $catsperpage = 20; $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => ceil(wp_count_terms('category') / $catsperpage), 'current' => $pagenum )); @@ -153,56 +178,135 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<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" /> <?php wp_nonce_field('bulk-categories'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<table class="widefat"> +<table class="widefat fixed" cellspacing="0"> <thead> <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Name') ?></th> - <th scope="col"><?php _e('Description') ?></th> - <th scope="col" class="num"><?php _e('Posts') ?></th> +<?php print_column_headers('categories'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('categories', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:cat"> <?php cat_rows(0, 0, 0, $pagenum, $catsperpage); ?> </tbody> </table> -</form> <div class="tablenav"> - <?php if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<br class="clear" /> + +<div class="alignleft actions"> +<select name="action2"> +<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" /> +<?php wp_nonce_field('bulk-categories'); ?> </div> -<br class="clear" /> +<br class="clear" /> </div> -<?php if ( current_user_can('manage_categories') ) : ?> -<div class="wrap"> +</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(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p> </div> -<?php include('edit-category-form.php'); ?> +</div> +</div><!-- /col-right --> + +<div id="col-left"> +<div class="col-wrap"> + +<?php if ( current_user_can('manage_categories') ) { ?> +<?php $category = (object) array(); $category->parent = 0; do_action('add_category_form_pre', $category); ?> + +<div class="form-wrap"> +<h3><?php _e('Add Category'); ?></h3> +<div id="ajax-response"></div> +<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate"> +<input type="hidden" name="action" value="addcat" /> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-category'); ?> + +<div class="form-field form-required"> + <label for="cat_name"><?php _e('Category Name') ?></label> + <input name="cat_name" id="cat_name" type="text" value="" size="40" aria-required="true" /> + <p><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></p> +</div> + +<div class="form-field"> + <label for="category_nicename"><?php _e('Category Slug') ?></label> + <input name="category_nicename" id="category_nicename" type="text" value="" size="40" /> + <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> +</div> + +<div class="form-field"> + <label for="category_parent"><?php _e('Category Parent') ?></label> + <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?> + <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></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> +</div> + +<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p> +<?php do_action('edit_category_form', $category); ?> +</form></div> -<?php endif; ?> +<?php } ?> + +</div> +</div><!-- /col-left --> + +</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'); + break; } wp-admin/categories.php @@ -1,4 +1,12 @@ <?php +/** + * Comment Management Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once('admin.php'); $parent_file = 'edit-comments.php'; @@ -9,7 +17,12 @@ wp_reset_vars( array('action') ); if ( isset( $_POST['deletecomment'] ) ) $action = 'deletecomment'; -function comment_footer_die( $msg ) { // $msg is assumed to contain HTML and be sanitized +/** + * Display error message at bottom of comments. + * + * @param string $msg Error Message. Assumed to contain HTML and be sanitized. + */ +function comment_footer_die( $msg ) { // echo "<div class='wrap'><p>$msg</p></div>"; include('admin-footer.php'); die; @@ -21,7 +34,6 @@ case 'editcomment' : $title = __('Edit Comment'); wp_enqueue_script('comment'); - require_once('admin-header.php'); $comment_id = absint( $_GET['c'] ); @@ -111,7 +123,7 @@ if ( 'spam' == $_GET['dt'] ) { </tr> <?php } ?> <tr> -<th scope="row" valign="top"><?php _e('Comment'); ?></th> +<th scope="row" valign="top"><?php echo _c('Comment|noun'); ?></th> <td><?php echo $comment->comment_content; ?></td> </tr> </table> @@ -171,7 +183,7 @@ case 'unapprovecomment' : if ( '' != wp_get_referer() && false == $noredir ) wp_redirect( wp_get_referer() ); else - wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); + wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); exit(); break; @@ -196,7 +208,7 @@ case 'approvecomment' : if ( '' != wp_get_referer() && false == $noredir ) wp_redirect( wp_get_referer() ); else - wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); + wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); exit(); break; @@ -210,7 +222,7 @@ case 'editedcomment' : edit_comment(); - $location = ( empty( $_POST['referredby'] ) ? "edit.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id; + $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id; $location = apply_filters( 'comment_edit_redirect', $location, $comment_id ); wp_redirect( $location ); @@ -225,4 +237,4 @@ default: include('admin-footer.php'); -?> +?> \ No newline at end of file wp-admin/comment.php @@ -1,24 +1,80 @@ -.post-com-count { -} -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-rtl.gif); - background-position:right bottom; -} -#footer { - background-position:99% 10px; -} -#poststuff .closed .togbox, #poststuff .togbox { - background-image: url(../images/toggle-arrow-rtl.gif) !important; -} .bar { border-right-color: transparent; border-left-color: #99d; } + .plugins .togl { border-right-color: transparent; border-left-color: #ccc; } + +.post-com-count { + background-image: url(../images/bubble_bg-rtl.gif); +} +.tablenav .tablenav-pages a { + background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px; +} #upload-menu li.current { border-right-color: transparent; border-left-color: #448abd; } + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +#adminmenu li.wp-has-current-submenu .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark-rtl.gif) top right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: url(../images/menu-bits-rtl.gif) top right repeat-x; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px; +} + +#adminmenu a.wp-has-submenu { + background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px; +} + +#adminmenu li.current a, +#adminmenu .wp-submenu a:hover { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-submenu { + background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px; +} wp-admin/css/colors-classic-rtl.css @@ -1,9 +1,27 @@ +html { + background-color: #F5FCFD; +} + +.find-box-search { + border-color: #dfdfdf; + background-color: #f1f1f1; +} + +.find-box { + background-color: #f1f1f1; +} + +.find-box-inside { + background-color: #fff; +} + a.page-numbers:hover { border-color: #999; } -body, .form-table .pre { - background-color: #fff; +body, +#wpbody, +.form-table .pre { color: #333; } @@ -11,51 +29,118 @@ body > #upload-menu { border-bottom-color: #fff; } -div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat { +kbd, code { + background: #eaeaea; +} + +div#current-widgets, +#postcustomstuff table, +#your-profile fieldset, +#rightnow, +div.dashboard-widget, +#dashboard-widgets p.dashboard-widget-links, +#replyrow #ed_reply_toolbar input { border-color: #ccc; } +#poststuff .inside label.spam { + color: red; +} + +#poststuff .inside label.waiting { + color: orange; +} + +#poststuff .inside label.approved { + color: green; +} + +#postcustomstuff table { + border-color: #dfdfdf; + background-color: #F9F9F9; +} + +#postcustomstuff thead th { + background-color: #F1F1F1; +} + +#postcustomstuff table input, +#postcustomstuff table textarea { + border-color: #dfdfdf; + background-color: #fff; +} + +.widefat { + border-color: #BBD8E7; + background-color: #fff; +} + div.dashboard-widget-error { background-color: #c43; } div.dashboard-widget-notice { - background-color: #F0F6FB; + background-color: #cfe1ef; } -div.dashboard-widget-submit, ul.widget-control-list div.widget-control-actions { +div.dashboard-widget-submit, +ul.widget-control-list div.widget-control-actions { border-top-color: #ccc; } -input.disabled, textarea.disabled { - background-color: #ccc; +div.ui-tabs-panel { + border-color: #f1f1f1; +} + +ul#category-tabs li.ui-tabs-selected { + background-color: #f1f1f1; } -#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, +input.disabled, +textarea.disabled { + background-color: #ccc; +} +/* #upload-menu li a.upload-tab-link, */ +li.widget-list-control-item h4.widget-title a:hover, +li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, -#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover { +#draghelper li.widget-list-control-item h4.widget-title a:visited, +.login #backtoblog a:hover, +#plugin-information .action-button a, +#plugin-information .action-button a:hover, +#plugin-information .action-button a:visited { color: #fff; } -ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { - background-color: #cfebf7; +li.widget-list-control-item div.widget-control { + background-color: #fff; + border-color: #dfdfdf; } -div.ui-tabs-panel { - border-color: #cfebf7; +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background: #dfdfdf url("../images/blue-grad.png") repeat-x left top; + text-shadow: #fff 0 1px 0; +} + +.form-table th, +.form-wrap label { + color: #222; + text-shadow: #fff 0 1px 0; +} + +.setting-description, .form-wrap p { + color: #666; } select { background-color: #fff; - border-color: #ddd; + border-color: #8CBDD5; } strong .post-com-count span { - background-color: #2583ad; -} - -.button-secondary, #login form .submit input { - background-color: #8ebddc !important; + background-color: #21759b; } ul#widget-list li.widget-list-item h4.widget-title { @@ -67,10 +152,14 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #ccf3fa; } -.ac_match, .subsubsub a.current, h2 { +.ac_match, .subsubsub a.current { color: #000; } +.wrap h2 { + color: #093E56; +} + .ac_over { background-color: #f0f0b8; } @@ -84,13 +173,13 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #101010; } -.alternate { - background-color: #f9f9f9; +.alternate, .alt { + background-color: #EDFBFC; } .available-theme a.screenshot { background-color: #f1f1f1; - border-color: #ccc; + border-color: #ddd; } .bar { @@ -98,8 +187,11 @@ ul#widget-list li.widget-list-item h4.widget-title { border-right-color: #99d; } -.describe { - border-top-color: #d0d0d0; +#media-upload { + background: #fff; +} +#media-upload .slidetoggle { + border-top-color: #dfdfdf; } .error, #login #login_error { @@ -119,44 +211,45 @@ ul#widget-list li.widget-list-item h4.widget-title { border-color: #c00 !important; } -.form-table input, .form-table textarea { - border-color: #c6d9e9; -} - -.form-table td, .form-table th { - border-bottom-color: #fff; +.form-table input, +.form-table textarea, +.search-input, +.form-field input, +.form-field textarea, +.submit { + border-color: #8CBDD5; } .highlight { - background-color: #cfebf7; + background-color: #e4f2fd; color: #d54e21; } -.howto, .nonessential, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { - color: #999; -} - -#dashmenu a, #user_info a { - color: #88b4d7; +.howto, +.nonessential, +#edit-slug-box, +.form-input-tip, +.rss-widget span.rss-date, +.subsubsub { + color: #666; } .media-item { - border-bottom-color: #d0d0d0; + border-bottom-color: #dfdfdf; } -.media-upload-form label.form-help, td.help { - color: #9a9a9a; +#wpbody-content #media-items .describe { + border-top-color: #dfdfdf; } -.page-numbers { - background-color: #fff; - border-color: #fff; +.describe input[type="text"], +.describe textarea { + border-color: #dfdfdf; } -.page-numbers.current { - background-color: #328ab2; - border-color: #328ab2; - color: #fff; +.media-upload-form label.form-help, +td.help { + color: #9a9a9a; } .post-com-count { @@ -186,46 +279,100 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #666; } -.submit input, .button, .button-secondary, #login form .submit input, div.dashboard-widget-submit input, #edit-slug-buttons a.save { - background-color: #e5e5e5; - color: #07273e; - border-color: #a3a3a3; +.button, +.button-secondary, +.submit input, +input[type=button], +input[type=submit] { + border-color: #8CBDD5; + color: #093E56; } -.button[disabled], .button:disabled { - background-color: #999; +.button:hover, +.button-secondary:hover, +.submit input:hover, +input[type=button]:hover, +input[type=submit]:hover { + color: #000; + border-color: #21759B; } -.tablenav .button-secondary { - border-color: #5396c5; +.button, +.submit input, +.button-secondary { + background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } -.submit input:hover, .button:hover, #edit-slug-buttons a.save:hover { - border-color: #535353; +.button:active, +.submit input:active, +.button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; } -.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.del-link:hover { +.button-primary, +.submit .button-primary, +#login form .submit input { + border-color: #298cba !important; + font-weight: bold; + color: #FFF !important; + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; +} + +.button-primary:active, +#login form .submit input:active { + background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important; +} + +.button[disabled], +.button:disabled, +.button-secondary[disabled], +.button-secondary:disabled, +a.button.disabled { + color: #ccc !important; + border-color: #ccc; +} + +.button-primary[disabled], +.button-primary:disabled { + color: #2fa0d5 !important; +} + +a:active, +a:focus { color: #d54e21; } -#adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover { - color: #97c4d8; +a:hover, +#wphead #viewsite a:hover, +#adminmenu a:hover, +#adminmenu ul.wp-submenu a:hover, +#the-comment-list .comment a:hover, +#rightnow a:hover, +.subsubsub a:hover, +.subsubsub a.current:hover, +#login form .submit input:hover, +div.dashboard-widget-submit input:hover, +#media-upload a.del-link:hover, +.ui-tabs-nav a:hover { + color: #d54e21; } -.button-secondary:hover, #login form .submit input:hover { - border-color: #328ab2; - background-color: #a6d2e5 !important; +#the-comment-list .comment-item, +#dashboard-widgets #dashboard_quick_press form p.submit { + border-color: #dfdfdf; } -.submitbox #autosave .error, ul.view-switch li.current a { - color: #333; +.button-primary:hover, +#login form .submit input:hover { + border-color: #13455b !important; + color: #EAF2FA !important; } -.submitbox #previewview { - background-color: #5488af; +#side-info-column #category-tabs .ui-tabs-selected a { + color: #333; } -.submitbox #previewview a, #rightnow .rbutton { +#rightnow .rbutton { background-color: #ebebeb; color: #264761; } @@ -235,8 +382,9 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #ccc; } -.submitbox .submitdelete { - border-bottom-color: #999; +.submitbox .submitdelete, a.delete { + color: #f00; + border-bottom-color: #f00; } .submitbox .submitdelete:hover, @@ -246,94 +394,136 @@ ul#widget-list li.widget-list-item h4.widget-title { border-bottom-color: #f00; } +#normal-sortables .submitbox .submitdelete:hover { + color: #000; + background-color: #f00; + border-bottom-color: #f00; +} + .tablenav .dots { - background-color: #cfebf7; - border-color: #cfebf7; + border-color: transparent; } -.tablenav .next, .tablenav .prev{ - background-color: #cfebf7; - border-bottom-color: #cfebf7; - border-color: #cfebf7; - color: #2583ad; +.tablenav .next, +.tablenav .prev { + border-color: transparent; + color: #21759b; } -.tablenav .next:hover, .tablenav .prev:hover { - border-bottom-color: #d54e21; - border-color: #cfebf7; +.tablenav .next:hover, +.tablenav .prev:hover { + border-color: transparent; color: #d54e21; } -.updated, .login #login_error, .login .message { +.updated, +.login #login_error, +.login .message { background-color: #ffffe0; border-color: #e6db55; } -.updated a { - border-bottom-color: #2583ad; +a.page-numbers { + border-bottom-color: #B8D3E2; } -.widefat td, .widefat th, div#available-widgets-filter, ul#widget-list li.widget-list-item, .commentlist li { +div#available-widgets-filter, +ul#widget-list li.widget-list-item, +.commentlist li { border-bottom-color: #ccc; } -.widefat thead, .thead { - background-color: #464646; - color: #d7d7d7; +.widefat td, +.widefat th { + border-bottom-color: #BBD8E7; } -.widget-control-save, .widget-control-remove { - background-color: #83b4d5; - color: #246; +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; } -.wrap h2 { - border-bottom-color: #dadada; - color: #5a5a5a; +.widefat thead tr th, +.widefat tfoot tr th, +h3.dashboard-widget-title, +h3.dashboard-widget-title span, +h3.dashboard-widget-title small, +.find-box-head { + color: #333; + background: #dfdfdf url(../images/blue-grad.png) repeat-x scroll left top; } -#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a { - color: #2e7ca0; +h3.dashboard-widget-title small a { + color: #d7d7d7; } -#adminmenu a, .ui-tabs-nav a { - color: #cfebf6; +h3.dashboard-widget-title small a:hover { + color: #fff; } -#submenu a { - color: #2782af +#adminmenu a, +#poststuff #edButtonPreview, +#poststuff #edButtonHTML, +#the-comment-list p.comment-author strong a, +#media-upload a.del-link, +#media-upload a.delete, +.ui-tabs-nav a, a { + color: #1C6280; } + /* Because we don't want visited on these links */ -#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { +body.press-this .ui-tabs-selected a, +body.press-this .ui-tabs-selected a:hover { background-color: #fff; - border-color: #07273e; + border-color: #c6d9e9; border-bottom-color: #fff; color: #d54e21; - font-weight: bold; } -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-classic.gif); -} - -#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span { +#adminmenu #awaiting-mod, +#adminmenu .update-plugins, +#sidemenu a .update-plugins, +#rightnow .reallynow, +#plugin-information .action-button { background-color: #d54e21; color: #fff; } -#rightnow .reallynow { - background-color: #114973; +#adminmenu li a:hover #awaiting-mod, +#adminmenu li a:hover .update-plugins, +#sidemenu li a:hover .update-plugins { + background-color: #264761; color: #fff; } +#adminmenu li.current a #awaiting-mod, +#adminmenu li.current a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins { + background-color: #ddd; + color: #000; + text-shadow: none; + -moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; +} + +#adminmenu li.current a:hover #awaiting-mod, +#adminmenu li.current a:hover .update-plugins, +#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod, +#adminmenu li.wp-has-current-submenu a:hover .update-plugins { + background-color: #264761; + color: #fff; +} -#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span { - background-color: #07273E; +div#media-upload-header { + background-color: #f9f9f9; + border-bottom-color: #dfdfdf; } -#adminmenu, div#media-upload-header { - background-color: #14568a; - border-bottom-color: #07273e; +div#plugin-information-header { + background-color: #e4f2fd; + border-bottom-color: #c6d9e9; } #currenttheme img { @@ -348,75 +538,83 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #f9f9f9; } -input.readonly { +input.readonly, textarea.readonly { background-color: #ddd; } -#dashmenu a.current { - background-color: #14568a; - color: #cfebf6; -} - -#dragHelper h4.widget-title, li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 { +#dragHelper h4.widget-title, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4 { background-color: #2683ae; color: #fff; } -#ed_toolbar input { - background: url( ../images/fade-butt.png ) #fff repeat-x 0 -2px; +#ed_toolbar input, +#ed_reply_toolbar input { + background: #fff url("../images/fade-butt.png") repeat-x 0 -2px; } #editable-post-name { background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a { +#edit-slug-box strong, +.tablenav .displaying-num, +#submitted-on { color: #777; } -#edit-slug-buttons a.save { - background-color: #ebebeb; +.login #nav a { + color: #21759b !important; +} + +.login #nav a:hover { + color: #d54e21 !important; } -#footer { - background: url(../images/logo-ghost.png) #464646 no-repeat 20px 10px; +#footer, +#footer-upgrade { + background: #073447; color: #999; } #media-items { - border-color: #c0c0c0; + border-color: #dfdfdf; } #pass-strength-result { - background-color: #e3e3e3; - border-color: #000; + background-color: #eee; + border-color: #ddd !important; } #pass-strength-result.bad { - background-color: #ffeff7; - border-color: #c69; + background-color: #ffb78c; + border-color: #ff853c !important; } #pass-strength-result.good { - background-color: #effff4; - border-color: #66cc87; + background-color: #ffec8b; + border-color: #fc0 !important; } #pass-strength-result.short { - background-color: #e3e3e3; + background-color: #ffa0a0; + border-color: #f04040 !important; } #pass-strength-result.strong { - background-color: #59ef86; - border-color: #319f52; + background-color: #c3ff88; + border-color: #8dff1c !important; } -.checkbox, .side-info, #your-profile #rich_editing { +.checkbox, +.side-info, +#your-profile #rich_editing { background-color: #fff; } .plugins .active { - background-color: #BBEEBB; + background-color: #e7f7d3; } .plugins .togl { @@ -427,29 +625,49 @@ input.readonly { background-color: #ffffe0; } +#the-comment-list .approve a { + color: #006505; +} + +#the-comment-list .unapprove a { + color: #d98500; +} + +#the-comment-list .delete a { + color: #bc0b0b; +} + .plugins tr { background-color: #fff; } -#poststuff #editor-toolbar .active { - background-color: #83b4d5; - color: #333; +.metabox-holder .postbox, +#poststuff .postbox, +#titlediv, +#poststuff .postarea, +#poststuff .stuffbox, +.postbox input[type="text"], +.postbox textarea, +.stuffbox input[type="text"], +.stuffbox textarea { + border-color: #BBD8E7; } -#poststuff .closed .togbox { - background-color: #2583ad; - background-image: url(../images/toggle-arrow.gif); +.metabox-holder .postbox, +#poststuff .postbox { + background-color: #FFF; } -#poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox { - border-color: #ebebeb; - border-right-color: #ccc; - border-bottom-color: #ccc; +.ui-sortable .postbox h3 { + color: #093E56; } -#poststuff .togbox { - background-color: #b2b2b2; - background-image: url(../images/toggle-arrow.gif); +.ui-sortable .postbox h3:hover { + color: #000; +} + +.curtime #timestamp { + background-image: url(../images/date-button.gif); } #quicktags #ed_link { @@ -464,26 +682,16 @@ input.readonly { color: #448abd; } -#sidemenu a { - background-color: #14568a; - border-bottom-color: #07273e; - border-top-color: #14568a; - color: #cfebf6; -} - -#tagchecklist span a { +#tagchecklist span a, +#bulk-titles div a { background: url(../images/xit.gif) no-repeat; } -#tagchecklist span a:hover { +#tagchecklist span a:hover, +#bulk-titles div a:hover { background: url(../images/xit.gif) no-repeat -10px 0; } -#the-comment-list .comment a { - border-bottom-color: #ababab; - color: #666; -} - #update-nag, .plugin-update { background-color: #fffeeb; border-bottom-color: #ccc; @@ -491,159 +699,185 @@ input.readonly { color: #555; } -#upload-files a.file-link { - background-color: #d1e2ef; +.login #backtoblog a { + color: #ccc; } -#upload-file-view a img { - border-bottom-color: #69c; +#wphead { + background-color: #073447; } -#upload-menu li #current-tab-nav, #upload-file { - background-color: #f9fcfe; +body.login { + border-top-color: #093E56; } -#upload-menu li span a.page-numbers { - color: #00019b; +#wphead h1 a { + color: #fff; } -#upload-menu li.current { - border-right-color: #448abd; - color: #000; +#login form input { + color: #555; } -#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover { - background-color: #f9fcfe; - color: #000; +#wphead h1 a:hover { + text-decoration: underline; } -#upload-menu, #upload-menu li { - border-top-color: #247fab; +#user_info { + color: #999; } -#user_info, .login #backtoblog a { +#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited { color: #ccc; + text-decoration: none; } -#wphead { - background-color: #14568a; +#user_info a:hover, #footer a:hover { + color: #fff; + text-decoration: underline !important; } -#wphead, body.login { - border-top-color: #07273e; +#user_info a:active, #footer a:active { + color: #ccc !important; } -#wphead #viewsite a { - background-color: #5488af; - color: #cfebf7; - border-color: #0b3d64; +div#media-upload-error, +.file-error, +abbr.required, +.widget-control-remove:hover, +.delete a:hover { + color: #f00; } -#wphead #viewsite a:hover { - color: #07273e; +#media-upload a.delete { + color: #888; } -#wphead h1, #dashmenu a.current:hover { - color: #cfebf6; +/* editors */ +#quicktags { + border-color: #dfdfdf; + background-color: #dfdfdf; } -div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, .delete:hover { - color: #f00; +#ed_toolbar input { + border-color: #C3C3C3; +} + +#ed_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +#poststuff .wp_themeSkin .mceStatusbar { + border-color: #EDEDED; +} + +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + background-color: #f1f1f1; + border-color: #dfdfdf; + color: #999; +} + +#poststuff #editor-toolbar .active { + border-bottom-color: #e9e9e9; + background-color: #e9e9e9; + color: #333; } /* TinyMCE */ +#post-status-info { + background-color: #EDEDED; +} + .wp_themeSkin *, -.wp_themeSkin a:hover, -.wp_themeSkin a:link, -.wp_themeSkin a:visited, +.wp_themeSkin a:hover, +.wp_themeSkin a:link, +.wp_themeSkin a:visited, .wp_themeSkin a:active { color: #000; } /* Containers */ -.wp_themeSkin table, #wp_editbtns { - background: #83B4D5; -} - .wp_themeSkin iframe { background: #fff; } /* Layout */ .wp_themeSkin .mceStatusbar { - color:#000; - background-color: #eaf3fa; + color: #000; + background-color: #f5f5f5; } /* Button */ -.wp_themeSkin .mceButton { +.wp_themeSkin .mceButton { background-color: #e9e8e8; - border-color: #83B4D5; + border-color: #B2B2B2; } .wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, +.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-color: #d6d8da; - border-color: #7789ba !important; + background-color: #d5d5d5; + border-color: #777 !important; } .wp_themeSkin .mceButtonDisabled { - border-color: #83B4D5 !important; + border-color: #ccc !important; } /* ListBox */ .wp_themeSkin .mceListBox .mceText, .wp_themeSkin .mceListBox .mceOpen { - border-color: #83B4D5; - background-color: #e9e8e8; + border-color: #B2B2B2; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, +.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, .wp_themeSkin .mceListBoxHover .mceOpen, .wp_themeSkin .mceListBoxSelected .mceOpen, .wp_themeSkin .mceListBoxSelected .mceText { - border-color: #7789ba !important; - background-color: #d6d8da; + border-color: #777 !important; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, +.wp_themeSkin table.mceListBoxEnabled:hover .mceText, .wp_themeSkin .mceListBoxHover .mceText { - border-color: #7789ba !important; + border-color: #777 !important; } .wp_themeSkin select.mceListBox { - border-color: #b3c7e1; + border-color: #B2B2B2; background-color: #fff; } /* SplitButton */ -.wp_themeSkin .mceSplitButton a.mceAction, +.wp_themeSkin .mceSplitButton a.mceAction, .wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e9e8e8; - border-color: #83B4D5; + background-color: #e8e8e8; + border-color: #B2B2B2; } .wp_themeSkin .mceSplitButton a.mceOpen:hover, .wp_themeSkin .mceSplitButtonSelected a.mceOpen, .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, .wp_themeSkin .mceSplitButton a.mceAction:hover { - background-color: #d6d8da; - border-color: #7789ba !important; -} + background-color: #d5d5d5; + border-color: #777 !important; +} .wp_themeSkin .mceSplitButtonActive { - background-color: #d6d8da; + background-color: #B2B2B2; } /* ColorSplitButton */ .wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebeaeb; - border-color: #808080; + background-color: #ebebeb; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a { - border-color: #808080; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a.mceMoreColors { @@ -669,18 +903,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover } .wp_themeSkin .mceMenu .mceText { - color: #000; + color: #000; } .wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, -.wp_themeSkin .mceMenu .mceMenuItemActive, #quicktags { - background-color: #83B4D5; +.wp_themeSkin .mceMenu .mceMenuItemActive { + background-color: #f5f5f5; } .wp_themeSkin td.mceMenuItemSeparator { background-color: #aaa; } .wp_themeSkin .mceMenuItemTitle a { - background-color: #ccc; + background-color: #ccc; border-bottom-color: #aaa; } .wp_themeSkin .mceMenuItemTitle span.mceText { @@ -690,23 +924,80 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #888; } -/* pop-up */ -.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { - background-color: #cee1ef; - border-color: #c6d9e9; +.wp_themeSkin tr.mceFirst td.mceToolbar { + background-color: #dfdfdf; + border-color: #dfdfdf; } -.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { - background-color: #5488AF; - border-color: #464646; +.wp-admin #mceModalBlocker { + background: #000; } -#editorcontainer { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft { + background: #444444; + border-left: 1px solid #999; + border-top: 1px solid #999; + -moz-border-radius: 4px 0 0 0; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; } -#poststuff #titlewrap { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight { + background: #444444; + border-right: 1px solid #999; + border-top: 1px solid #999; + border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-radius: 0 4px 0 0; +} + +.wp-admin .clearlooks2 .mceMiddle .mceLeft { + background: #f1f1f1; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceMiddle .mceRight { + background: #f1f1f1; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceLeft { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceCenter { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceRight { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceFocus .mceTop span { + color: #e5e5e5; +} +/* end TinyMCE */ + +#editorcontainer, +#post-status-info, +#titlediv #title { + border-color: #dfdfdf; +} + +#titlediv #title { + background-color: #fff; } #tTips p#tTips_inside { @@ -714,8 +1005,223 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #333; } -/* Diff */ +#timestampdiv input, +#namediv input, +#tagsdiv #the-tagcloud { + border-color: #ddd; +} + +/* menu */ +#adminmenu * { + border-color: #BBD8E7; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px; +} + +#adminmenu a.menu-top { + background: #EAF3FA url(../images/menu-bits.gif) repeat-x scroll left -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px; +} + +#adminmenu .wp-has-current-submenu ul li a { + background: none; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark.gif) top left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: #6d6d6d url(../images/menu-bits.gif) top left repeat-x; + border-color: #6d6d6d; + color: #fff; + text-shadow: rgba(0,0,0,0.4) 0px -1px 0px; +} + +#adminmenu li.wp-has-current-submenu .wp-submenu, +#adminmenu li.wp-has-current-submenu ul li a { + border-color: #aaa !important; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark.gif) bottom left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu ul { + border-bottom-color: #aaa; +} + +#adminmenu li.menu-top .current:hover { + border-color: #B5B5B5; +} + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; +} + +#adminmenu .wp-submenu a:hover { + background-color: #EAF2FA !important; + color: #333 !important; +} + +#adminmenu .wp-submenu li.current, +#adminmenu .wp-submenu li.current a, +#adminmenu .wp-submenu li.current a:hover { + color: #333; + background-color: #f5f5f5; + background-image: none; + border-color: #e3e3e3; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; +} + +#adminmenu .wp-submenu ul { + background-color: #fff; +} + +.folded #adminmenu li.menu-top, +#adminmenu .wp-submenu .wp-submenu-head { + background-color: #EAF2FA; +} + +.folded #adminmenu li.wp-has-current-submenu, +.folded #adminmenu li.menu-top.current { + background-color: #BBD8E7; +} + +#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { + background-color: #BBD8E7; + border-color: #8CBDD5; +} + +#adminmenu div.wp-submenu { + background-color: transparent; +} + +/* menu icons */ +#adminmenu #menu-dashboard div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -61px -33px; +} + +#adminmenu #menu-dashboard:hover div.wp-menu-image, +#adminmenu #menu-dashboard.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-dashboard.current div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -61px -1px; +} + +#adminmenu #menu-posts div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -272px -33px; +} + +#adminmenu #menu-posts:hover div.wp-menu-image, +#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -272px -1px; +} + +#adminmenu #menu-media div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -121px -33px; +} + +#adminmenu #menu-media:hover div.wp-menu-image, +#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -121px -1px; +} + +#adminmenu #menu-links div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -91px -33px; +} + +#adminmenu #menu-links:hover div.wp-menu-image, +#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -91px -1px; +} + +#adminmenu #menu-pages div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -33px; +} + +#adminmenu #menu-pages:hover div.wp-menu-image, +#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -1px; +} + +#adminmenu #menu-comments div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -31px -33px; +} + +#adminmenu #menu-comments:hover div.wp-menu-image, +#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-comments.current div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -31px -1px; +} + +#adminmenu #menu-appearance div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -33px; +} + +#adminmenu #menu-appearance:hover div.wp-menu-image, +#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -1px; +} + +#adminmenu #menu-plugins div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -33px; +} + +#adminmenu #menu-plugins:hover div.wp-menu-image, +#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -1px; +} + +#adminmenu #menu-users div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -301px -33px; +} + +#adminmenu #menu-users:hover div.wp-menu-image, +#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -301px -1px; +} + +#adminmenu #menu-tools div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -33px; +} + +#adminmenu #menu-tools:hover div.wp-menu-image, +#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -1px; +} + +#adminmenu #menu-settings div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -241px -33px; +} + +#adminmenu #menu-settings:hover div.wp-menu-image, +#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -241px -1px; +} +/* end menu */ + + +/* Diff */ table.diff .diff-deletedline { background-color: #ffdddd; } @@ -728,3 +1234,344 @@ table.diff .diff-addedline { table.diff .diff-addedline ins { background-color: #99ff99; } + +#att-info { + background-color: #E4F2FD; +} + +/* edit image */ +#sidemenu a { + background-color: #f9f9f9; + border-color: #f9f9f9; + border-bottom-color: #dfdfdf; +} + +#sidemenu a.current { + background-color: #fff; + border-color: #dfdfdf #dfdfdf #fff; + color: #D54E21; +} + + +#screen-options-wrap, +#contextual-help-wrap { + background-color: #f1f1f1; + border-color: #dfdfdf; +} + +#screen-meta-links a.show-settings { + color: #606060; +} + +#screen-meta-links a.show-settings:hover { + color: #000; +} + +#replysubmit { + background-color: #f1f1f1; + border-top-color: #ddd; +} + +#replyerror { + border-color: #ddd; + background-color: #f9f9f9; +} + +#edithead, +#replyhead { + background-color: #f1f1f1; +} + +#ed_reply_toolbar { + background-color: #e9e9e9; +} + +/* table vim shortcuts */ +.vim-current { + background-color: #E4F2FD !important; +} + +/* Install Plugins */ +.star-average, +.star.star-rating { + background-color: #fc0; +} + +div.star.select:hover { + background-color: #d00; +} + +#plugin-information .fyi ul { + background-color: #eaf3fa; +} + +#plugin-information .fyi h2.mainheader { + background-color: #cee1ef; +} + +#plugin-information pre, +#plugin-information code { + background-color: #ededff; +} + +#plugin-information pre { + border: 1px solid #ccc; +} + +/* inline editor */ +.inline-edit-row fieldset input[type="text"], +.inline-edit-row fieldset textarea, +#bulk-titles, +#replyrow input { + border-color: #ddd; +} + +.inline-editor div.title { + background-color: #EAF3FA; +} + +.inline-editor ul.cat-checklist { + background-color: #FFFFFF; + border-color: #ddd; +} + +.inline-edit-row p.submit { + background-color: #f1f1f1; +} + +.inline-editor .categories .catshow, +.inline-editor .categories .cathide { + color: #21759b; +} + +.inline-editor .quick-edit-save { + background-color: #f1f1f1; +} + +#replyrow #ed_reply_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +fieldset.inline-edit-col-right .inline-edit-col { + border-color: #dfdfdf; +} + +.attention { + color: #D54E21; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; +} + +#major-publishing-actions { + background: #eaf2fa; +} + +.tablenav .tablenav-pages { + color: #555; +} + +.tablenav .tablenav-pages a { + border-color: #e3e3e3; + background: #eee url('../images/menu-bits.gif') repeat-x scroll left -379px; +} + +.tablenav .tablenav-pages a:hover { + color: #d54e21; + border-color: #d54321; +} + +.tablenav .tablenav-pages a:active { + color: #fff !important; +} + +.tablenav .tablenav-pages .current { + background: #dfdfdf; + border-color: #d3d3d3; +} + +#availablethemes, +#availablethemes td { + border-color: #ddd; +} + +#current-theme img { + border-color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link, +#TB_window #TB_title a.tb-theme-preview-link:visited { + color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link:hover, +#TB_window #TB_title a.tb-theme-preview-link:focus { + color: #ccc; +} + +.misc-pub-section { + border-bottom-color: #eee; +} + +#minor-publishing { + border-bottom-color: #ddd; +} + +#post-body .misc-pub-section { + border-right-color: #eee; +} + +.post-com-count span { + background-color: #bbb; +} + +.form-table .color-palette td { + border-color: #fff; +} + +.sortable-placeholder { + border-color: #bbb; + background-color: #f5f5f5; +} + +#post-body ul#category-tabs li.ui-tabs-selected a { + color: #333; +} + +#wp_editimgbtn, +#wp_delimgbtn, +#wp_editgallery, +#wp_delgallery { + border-color: #999; + background-color: #eee; +} + +#wp_editimgbtn:hover, +#wp_delimgbtn:hover, +#wp_editgallery:hover, +#wp_delgallery:hover { + border-color: #555; + background-color: #ccc; +} + +#favorite-first { + background: #797979 url(../images/fav.png) repeat-x 0 center; + border-color: #777 !important; + border-bottom-color: #666 !important; +} + +#favorite-inside { + border-color: #797979; + background-color: #797979; +} + +#favorite-toggle { + background: transparent url(../images/fav-arrow.gif) no-repeat 0 -4px; +} + +#favorite-actions a { + color: #ddd; +} + +#favorite-actions a:hover { + color: #fff; +} + +#favorite-inside a:hover { + text-decoration: underline; +} + +#favorite-actions .slide-down { + border-bottom-color: #626262; +} + +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + +.button-primary, +.submit .button-primary { + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#screen-meta a.show-settings { + background-color: transparent; + text-shadow: rgba(255,255,255,0.7) 0 1px 0; +} + +#icon-edit, +#icon-post { + background: transparent url(../images/icons32-vs.png) no-repeat -552px -5px; +} + +#icon-index { + background: transparent url(../images/icons32-vs.png) no-repeat -137px -5px; +} + +#icon-upload { + background: transparent url(../images/icons32-vs.png) no-repeat -251px -5px; +} + +#icon-link-manager, +#icon-link, +#icon-link-category { + background: transparent url(../images/icons32-vs.png) no-repeat -190px -5px; +} + +#icon-edit-pages, +#icon-page { + background: transparent url(../images/icons32-vs.png) no-repeat -312px -5px; +} + +#icon-edit-comments { + background: transparent url(../images/icons32-vs.png) no-repeat -72px -5px; +} + +#icon-themes { + background: transparent url(../images/icons32-vs.png) no-repeat -11px -5px; +} + +#icon-plugins { + background: transparent url(../images/icons32-vs.png) no-repeat -370px -5px; +} + +#icon-users, +#icon-user-edit { + background: transparent url(../images/icons32-vs.png) no-repeat -600px -5px; +} + +#icon-tools, +#icon-admin { + background: transparent url(../images/icons32-vs.png) no-repeat -432px -5px; +} + +#icon-options-general { + background: transparent url(../images/icons32-vs.png) no-repeat -492px -5px; +} + +.view-switch #view-switch-list { + background: transparent url(../images/list-vs.png) no-repeat 0 0; +} + +.view-switch #view-switch-list.current { + background: transparent url(../images/list-vs.png) no-repeat -40px 0; +} + +.view-switch #view-switch-excerpt { + background: transparent url(../images/list-vs.png) no-repeat -20px 0; +} + +.view-switch #view-switch-excerpt.current { + background: transparent url(../images/list-vs.png) no-repeat -60px 0; +} + +#header-logo { + background: transparent url(../images/wp-logo.gif) no-repeat scroll center center; +} wp-admin/css/colors-classic.css @@ -2,23 +2,82 @@ border-right-color: transparent; border-left-color: #99d; } -.post-com-count { -} -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-rtl.gif); - background-position:right bottom; -} -#footer { - background-position:99% 10px; -} + .plugins .togl { border-right-color: transparent; border-left-color: #ccc; } -#poststuff .closed .togbox, #poststuff .togbox { - background-image: url(../images/toggle-arrow-rtl.gif); + +.post-com-count { + background-image: url(../images/bubble_bg-rtl.gif); +} +.tablenav .tablenav-pages a { + background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px; } #upload-menu li.current { - border-right-color:transparent; + border-right-color: transparent; border-left-color: #448abd; } + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +#adminmenu li.wp-has-current-submenu .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark-rtl.gif) top right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: url(../images/menu-bits-rtl.gif) top right repeat-x; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px; +} + +#adminmenu a.wp-has-submenu { + background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px; +} + +#adminmenu li.current a, +#adminmenu .wp-submenu a:hover { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-submenu { + background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px; +} +#favorite-toggle { + background: transparent url(../images/fav-arrow-rtl.gif) no-repeat right -4px; +} wp-admin/css/colors-fresh-rtl.css @@ -1,9 +1,27 @@ +html { + background-color: #f9f9f9; +} + +.find-box-search { + border-color: #dfdfdf; + background-color: #f1f1f1; +} + +.find-box { + background-color: #f1f1f1; +} + +.find-box-inside { + background-color: #fff; +} + a.page-numbers:hover { border-color: #999; } -body, .form-table .pre { - background-color: #fff; +body, +#wpbody, +.form-table .pre { color: #333; } @@ -11,10 +29,52 @@ body > #upload-menu { border-bottom-color: #fff; } -div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat { +kbd, code { + background: #eaeaea; +} + +div#current-widgets, +#postcustomstuff table, +#your-profile fieldset, +#rightnow, +div.dashboard-widget, +#dashboard-widgets p.dashboard-widget-links, +#replyrow #ed_reply_toolbar input { border-color: #ccc; } +#poststuff .inside label.spam { + color: red; +} + +#poststuff .inside label.waiting { + color: orange; +} + +#poststuff .inside label.approved { + color: green; +} + +#postcustomstuff table { + border-color: #dfdfdf; + background-color: #F9F9F9; +} + +#postcustomstuff thead th { + background-color: #F1F1F1; +} + +#postcustomstuff table input, +#postcustomstuff table textarea { + border-color: #dfdfdf; + background-color: #fff; +} + +.widefat { + border-color: #dfdfdf; + background-color: #fff; +} + div.dashboard-widget-error { background-color: #c43; } @@ -23,26 +83,55 @@ div.dashboard-widget-notice { background-color: #cfe1ef; } -div.dashboard-widget-submit, ul.widget-control-list div.widget-control-actions { +div.dashboard-widget-submit, +ul.widget-control-list div.widget-control-actions { border-top-color: #ccc; } div.ui-tabs-panel { - border-color: #cee1ef; + border-color: #f1f1f1; } -input.disabled, textarea.disabled { - background-color: #ccc; +ul#category-tabs li.ui-tabs-selected { + background-color: #f1f1f1; } -#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, +input.disabled, +textarea.disabled { + background-color: #ccc; +} +/* #upload-menu li a.upload-tab-link, */ +li.widget-list-control-item h4.widget-title a:hover, +li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, -#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover { +#draghelper li.widget-list-control-item h4.widget-title a:visited, +.login #backtoblog a:hover, +#plugin-information .action-button a, +#plugin-information .action-button a:hover, +#plugin-information .action-button a:visited { color: #fff; } -li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { - background-color: #eaf3fa; +li.widget-list-control-item div.widget-control { + background-color: #fff; + border-color: #dfdfdf; +} + +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background: #dfdfdf url("../images/gray-grad.png") repeat-x left top; + text-shadow: #fff 0 1px 0; +} + +.form-table th, +.form-wrap label { + color: #222; + text-shadow: #fff 0 1px 0; +} + +.setting-description, .form-wrap p { + color: #666; } select { @@ -51,11 +140,7 @@ select { } strong .post-com-count span { - background-color: #2583ad; -} - -ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input { - background-color: #cee1ef !important; + background-color: #21759b; } ul#widget-list li.widget-list-item h4.widget-title { @@ -67,10 +152,14 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #ccf3fa; } -.ac_match, .subsubsub a.current, h2 { +.ac_match, .subsubsub a.current { color: #000; } +.wrap h2 { + color: #464646; +} + .ac_over { background-color: #f0f0b8; } @@ -84,13 +173,13 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #101010; } -.alternate { +.alternate, .alt { background-color: #f9f9f9; } .available-theme a.screenshot { background-color: #f1f1f1; - border-color: #ccc; + border-color: #ddd; } .bar { @@ -98,8 +187,11 @@ ul#widget-list li.widget-list-item h4.widget-title { border-right-color: #99d; } -.describe { - border-top-color: #d0d0d0; +#media-upload { + background: #fff; +} +#media-upload .slidetoggle { + border-top-color: #dfdfdf; } .error, #login #login_error { @@ -119,12 +211,13 @@ ul#widget-list li.widget-list-item h4.widget-title { border-color: #c00 !important; } -.form-table input, .form-table textarea { - border-color: #c6d9e9; -} - -.form-table td, .form-table th { - border-bottom-color: #fff; +.form-table input, +.form-table textarea, +.search-input, +.form-field input, +.form-field textarea, +.submit { + border-color: #DFDFDF; } .highlight { @@ -132,27 +225,31 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #d54e21; } -#user_info, .howto, .nonessential, #dashmenu a, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { - color: #999; +.howto, +.nonessential, +#edit-slug-box, +.form-input-tip, +.rss-widget span.rss-date, +.subsubsub { + color: #666; } .media-item { - border-bottom-color: #d0d0d0; + border-bottom-color: #dfdfdf; } -.media-upload-form label.form-help, td.help { - color: #9a9a9a; +#wpbody-content #media-items .describe { + border-top-color: #dfdfdf; } -.page-numbers { - background-color: #fff; - border-color: #fff; +.describe input[type="text"], +.describe textarea { + border-color: #dfdfdf; } -.page-numbers.current { - background-color: #328ab2; - border-color: #328ab2; - color: #fff; +.media-upload-form label.form-help, +td.help { + color: #9a9a9a; } .post-com-count { @@ -182,37 +279,100 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #666; } -.submit input, .button, .button-secondary, #login form .submit input, div.dashboard-widget-submit input, #edit-slug-buttons a.save { - background-color: #e5e5e5; - color: #246; - border-color: #80b5d0; +.button, +.button-secondary, +.submit input, +input[type=button], +input[type=submit] { + border-color: #bbb; + color: #464646; +} + +.button:hover, +.button-secondary:hover, +.submit input:hover, +input[type=button]:hover, +input[type=submit]:hover { + color: #000; + border-color: #666; +} + +.button, +.submit input, +.button-secondary { + background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; +} + +.button:active, +.submit input:active, +.button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; +} + +.button-primary, +.submit .button-primary, +#login form .submit input { + border-color: #298cba !important; + font-weight: bold; + color: #FFF !important; + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; +} + +.button-primary:active, +#login form .submit input:active { + background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important; } -.button[disabled], .button:disabled { - background-color: #999; +.button[disabled], +.button:disabled, +.button-secondary[disabled], +.button-secondary:disabled, +a.button.disabled { + color: #ccc !important; + border-color: #ccc; } -.submit input:hover, .button:hover, #edit-slug-buttons a.save:hover { - border-color: #535353; +.button-primary[disabled], +.button-primary:disabled { + color: #2fa0d5 !important; } -.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover, .ui-tabs-nav a:hover { +a:active, +a:focus { color: #d54e21; } -.button-secondary:hover, #login form .submit input:hover { - border-color: #328ab2; +a:hover, +#wphead #viewsite a:hover, +#adminmenu a:hover, +#adminmenu ul.wp-submenu a:hover, +#the-comment-list .comment a:hover, +#rightnow a:hover, +.subsubsub a:hover, +.subsubsub a.current:hover, +#login form .submit input:hover, +div.dashboard-widget-submit input:hover, +#media-upload a.del-link:hover, +.ui-tabs-nav a:hover { + color: #d54e21; } -.submitbox #autosave .error, ul.view-switch li.current a { - color: #333; +#the-comment-list .comment-item, +#dashboard-widgets #dashboard_quick_press form p.submit { + border-color: #dfdfdf; } -.submitbox #previewview { - background-color: #2683ae; +.button-primary:hover, +#login form .submit input:hover { + border-color: #13455b !important; + color: #EAF2FA !important; +} + +#side-info-column #category-tabs .ui-tabs-selected a { + color: #333; } -.submitbox #previewview a, #rightnow .rbutton { +#rightnow .rbutton { background-color: #ebebeb; color: #264761; } @@ -222,8 +382,9 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #ccc; } -.submitbox .submitdelete { - border-bottom-color: #999; +.submitbox .submitdelete, a.delete { + color: #f00; + border-bottom-color: #f00; } .submitbox .submitdelete:hover, @@ -233,78 +394,134 @@ ul#widget-list li.widget-list-item h4.widget-title { border-bottom-color: #f00; } +#normal-sortables .submitbox .submitdelete:hover { + color: #000; + background-color: #f00; + border-bottom-color: #f00; +} + .tablenav .dots { - background-color: #e4f2fd; - border-color: #e4f2fd; + border-color: transparent; } -.tablenav .next, .tablenav .prev{ - background-color: #e4f2fd; - border-bottom-color: #2583ad; - border-color: #e4f2fd; - color: #2583ad; +.tablenav .next, +.tablenav .prev { + border-color: transparent; + color: #21759b; } -.tablenav .next:hover, .tablenav .prev:hover { - border-bottom-color: #d54e21; - border-color: #e4f2fd; +.tablenav .next:hover, +.tablenav .prev:hover { + border-color: transparent; color: #d54e21; } -.updated, .login #login_error, .login .message { +.updated, +.login #login_error, +.login .message { background-color: #ffffe0; border-color: #e6db55; } -.updated a { - border-bottom-color: #2583ad; +a.page-numbers { + border-bottom-color: #B8D3E2; } -.widefat td, .widefat th, div#available-widgets-filter, ul#widget-list li.widget-list-item, .commentlist li { +div#available-widgets-filter, +ul#widget-list li.widget-list-item, +.commentlist li { border-bottom-color: #ccc; } -.widefat thead, .thead { - background-color: #464646; - color: #d7d7d7; +.widefat td, +.widefat th { + border-color: #dfdfdf; } -.widget-control-save, .widget-control-remove { - background-color: #cee1ef; - color: #246; +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; } -.wrap h2 { - border-bottom-color: #dadada; - color: #666; +.widefat thead tr th, +.widefat tfoot tr th, +h3.dashboard-widget-title, +h3.dashboard-widget-title span, +h3.dashboard-widget-title small, +.find-box-head { + color: #333; + background: #dfdfdf url(../images/gray-grad.png) repeat-x scroll left top; } -#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { - color: #2583ad; +h3.dashboard-widget-title small a { + color: #d7d7d7; +} + +h3.dashboard-widget-title small a:hover { + color: #fff; +} + +#adminmenu a, +#poststuff #edButtonPreview, +#poststuff #edButtonHTML, +#the-comment-list p.comment-author strong a, +#media-upload a.del-link, +#media-upload a.delete, +.ui-tabs-nav a, a { + color: #21759b; } /* Because we don't want visited on these links */ -#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { +body.press-this .ui-tabs-selected a, +body.press-this .ui-tabs-selected a:hover { background-color: #fff; border-color: #c6d9e9; border-bottom-color: #fff; color: #d54e21; } -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-fresh.gif); +#adminmenu #awaiting-mod, +#adminmenu .update-plugins, +#sidemenu a .update-plugins, +#rightnow .reallynow, +#plugin-information .action-button { + background-color: #d54e21; + color: #fff; } -#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow { - background-color: #d54e21; +#adminmenu li a:hover #awaiting-mod, +#adminmenu li a:hover .update-plugins, +#sidemenu li a:hover .update-plugins { + background-color: #264761; color: #fff; } -#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span { +#adminmenu li.current a #awaiting-mod, +#adminmenu li.current a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins { + background-color: #ddd; + color: #000; + text-shadow: none; + -moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; +} + +#adminmenu li.current a:hover #awaiting-mod, +#adminmenu li.current a:hover .update-plugins, +#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod, +#adminmenu li.wp-has-current-submenu a:hover .update-plugins { background-color: #264761; + color: #fff; } -#adminmenu, div#media-upload-header { +div#media-upload-header { + background-color: #f9f9f9; + border-bottom-color: #dfdfdf; +} + +div#plugin-information-header { background-color: #e4f2fd; border-bottom-color: #c6d9e9; } @@ -321,66 +538,78 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #f9f9f9; } -input.readonly { +input.readonly, textarea.readonly { background-color: #ddd; } -#dashmenu a.current { - background-color: #e4f2fd; - color: #555; -} - -#dragHelper h4.widget-title, li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 { +#dragHelper h4.widget-title, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4 { background-color: #2683ae; color: #fff; } -#ed_toolbar input { - background: url( ../images/fade-butt.png ) #fff repeat-x 0 -2px; +#ed_toolbar input, +#ed_reply_toolbar input { + background: #fff url("../images/fade-butt.png") repeat-x 0 -2px; } #editable-post-name { background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a { +#edit-slug-box strong, +.tablenav .displaying-num, +#submitted-on { color: #777; } -#footer { - background: url(../images/logo-ghost.png) #464646 no-repeat 20px 10px; +.login #nav a { + color: #21759b !important; +} + +.login #nav a:hover { + color: #d54e21 !important; +} + +#footer, +#footer-upgrade { + background: #464646; color: #999; } #media-items { - border-color: #c0c0c0; + border-color: #dfdfdf; } #pass-strength-result { - background-color: #e3e3e3; - border-color: #000; + background-color: #eee; + border-color: #ddd !important; } #pass-strength-result.bad { - background-color: #ffeff7; - border-color: #c69; + background-color: #ffb78c; + border-color: #ff853c !important; } #pass-strength-result.good { - background-color: #effff4; - border-color: #66cc87; + background-color: #ffec8b; + border-color: #fc0 !important; } #pass-strength-result.short { - background-color: #e3e3e3; + background-color: #ffa0a0; + border-color: #f04040 !important; } #pass-strength-result.strong { - background-color: #59ef86; - border-color: #319f52; + background-color: #c3ff88; + border-color: #8dff1c !important; } -.checkbox, .side-info, #your-profile #rich_editing { +.checkbox, +.side-info, +#your-profile #rich_editing { background-color: #fff; } @@ -396,29 +625,49 @@ input.readonly { background-color: #ffffe0; } +#the-comment-list .approve a { + color: #006505; +} + +#the-comment-list .unapprove a { + color: #d98500; +} + +#the-comment-list .delete a { + color: #bc0b0b; +} + .plugins tr { background-color: #fff; } -#poststuff #editor-toolbar .active { - background-color: #cee1ef; - color: #333; +.metabox-holder .postbox, +#poststuff .postbox, +#titlediv, +#poststuff .postarea, +#poststuff .stuffbox, +.postbox input[type="text"], +.postbox textarea, +.stuffbox input[type="text"], +.stuffbox textarea { + border-color: #dfdfdf; } -#poststuff .closed .togbox { - background-color: #2583ad; - background-image: url(../images/toggle-arrow.gif); +.metabox-holder .postbox, +#poststuff .postbox { + background-color: #FFF; } -#poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox { - border-color: #ebebeb; - border-right-color: #ccc; - border-bottom-color: #ccc; +.ui-sortable .postbox h3 { + color: #464646; } -#poststuff .togbox { - background-color: #b2b2b2; - background-image: url(../images/toggle-arrow.gif); +.ui-sortable .postbox h3:hover { + color: #000; +} + +.curtime #timestamp { + background-image: url(../images/date-button.gif); } #quicktags #ed_link { @@ -433,25 +682,16 @@ input.readonly { color: #448abd; } -#sidemenu a { - background-color: #e4f2fd; - border-bottom-color: #c6d9e9; - border-top-color: #e4f2fd; -} - -#tagchecklist span a { +#tagchecklist span a, +#bulk-titles div a { background: url(../images/xit.gif) no-repeat; } -#tagchecklist span a:hover { +#tagchecklist span a:hover, +#bulk-titles div a:hover { background: url(../images/xit.gif) no-repeat -10px 0; } -#the-comment-list .comment a { - border-bottom-color: #ababab; - color: #666; -} - #update-nag, .plugin-update { background-color: #fffeeb; border-bottom-color: #ccc; @@ -459,163 +699,185 @@ input.readonly { color: #555; } -#upload-files a.file-link { - background-color: #d1e2ef; +.login #backtoblog a { + color: #ccc; } -#upload-file-view a img { - border-bottom-color: #69c; +#wphead { + background-color: #464646; } -#upload-menu li #current-tab-nav, #upload-file { - background-color: #f9fcfe; +body.login { + border-top-color: #464646; } -#upload-menu li span a.page-numbers { - color: #00019b; +#wphead h1 a { + color: #fff; } -#upload-menu li.current { - border-right-color: #448abd; - color: #000; +#login form input { + color: #555; } -#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover { - background-color: #f9fcfe; - color: #000; +#wphead h1 a:hover { + text-decoration: underline; } -#upload-menu, #upload-menu li { - border-top-color: #247fab; +#user_info { + color: #999; } -.login #backtoblog a, .curtime, #user_info a { +#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited { color: #ccc; + text-decoration: none; } -#wphead { - background-color: #e4f2fd; +#user_info a:hover, #footer a:hover { + color: #fff; + text-decoration: underline !important; } -#wphead, body.login { - border-top-color: #464646; +#user_info a:active, #footer a:active { + color: #ccc !important; } -#wphead #viewsite a { - background-color: #c6d9e9; - color: #246; - border-color: #80b5d0; +div#media-upload-error, +.file-error, +abbr.required, +.widget-control-remove:hover, +.delete a:hover { + color: #f00; } -#wphead #viewsite a:hover { - border-color: #328ab2; +#media-upload a.delete { + color: #888; } -#wphead h1, #dashmenu a.current:hover, #login form input { - color: #555; +/* editors */ +#quicktags { + border-color: #dfdfdf; + background-color: #dfdfdf; } -div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, .delete:hover { - color: #f00; +#ed_toolbar input { + border-color: #C3C3C3; } -#media-upload a.delete { - color: #888; +#ed_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +#poststuff .wp_themeSkin .mceStatusbar { + border-color: #EDEDED; +} + +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + background-color: #f1f1f1; + border-color: #dfdfdf; + color: #999; +} + +#poststuff #editor-toolbar .active { + border-bottom-color: #e9e9e9; + background-color: #e9e9e9; + color: #333; } /* TinyMCE */ +#post-status-info { + background-color: #EDEDED; +} + .wp_themeSkin *, -.wp_themeSkin a:hover, -.wp_themeSkin a:link, -.wp_themeSkin a:visited, +.wp_themeSkin a:hover, +.wp_themeSkin a:link, +.wp_themeSkin a:visited, .wp_themeSkin a:active { color: #000; } /* Containers */ -.wp_themeSkin table, #wp_editbtns { - background: #cee1ef; -} - .wp_themeSkin iframe { background: #fff; } /* Layout */ .wp_themeSkin .mceStatusbar { - color:#000; - background-color: #eaf3fa; + color: #000; + background-color: #f5f5f5; } /* Button */ -.wp_themeSkin .mceButton { +.wp_themeSkin .mceButton { background-color: #e9e8e8; - border-color: #abc0fb; + border-color: #B2B2B2; } .wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, +.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-color: #d6d8da; - border-color: #7789ba !important; + background-color: #d5d5d5; + border-color: #777 !important; } .wp_themeSkin .mceButtonDisabled { - border-color: #bdd !important; + border-color: #ccc !important; } /* ListBox */ .wp_themeSkin .mceListBox .mceText, .wp_themeSkin .mceListBox .mceOpen { - border-color: #abc0fb; - background-color: #e9e8e8; + border-color: #B2B2B2; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, +.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, .wp_themeSkin .mceListBoxHover .mceOpen, .wp_themeSkin .mceListBoxSelected .mceOpen, .wp_themeSkin .mceListBoxSelected .mceText { - border-color: #7789ba !important; - background-color: #d6d8da; + border-color: #777 !important; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, +.wp_themeSkin table.mceListBoxEnabled:hover .mceText, .wp_themeSkin .mceListBoxHover .mceText { - border-color: #7789ba !important; + border-color: #777 !important; } .wp_themeSkin select.mceListBox { - border-color: #b3c7e1; + border-color: #B2B2B2; background-color: #fff; } /* SplitButton */ -.wp_themeSkin .mceSplitButton a.mceAction, +.wp_themeSkin .mceSplitButton a.mceAction, .wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e9e8e8; - border-color: #abc0fb; + background-color: #e8e8e8; + border-color: #B2B2B2; } .wp_themeSkin .mceSplitButton a.mceOpen:hover, .wp_themeSkin .mceSplitButtonSelected a.mceOpen, .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, .wp_themeSkin .mceSplitButton a.mceAction:hover { - background-color: #d6d8da; - border-color: #7789ba !important; -} + background-color: #d5d5d5; + border-color: #777 !important; +} .wp_themeSkin .mceSplitButtonActive { - background-color: #d6d8da; + background-color: #B2B2B2; } /* ColorSplitButton */ .wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebeaeb; - border-color: #808080; + background-color: #ebebeb; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a { - border-color: #808080; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a.mceMoreColors { @@ -641,18 +903,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover } .wp_themeSkin .mceMenu .mceText { - color: #000; + color: #000; } .wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, .wp_themeSkin .mceMenu .mceMenuItemActive { - background-color: #CEE1EF; + background-color: #f5f5f5; } .wp_themeSkin td.mceMenuItemSeparator { background-color: #aaa; } .wp_themeSkin .mceMenuItemTitle a { - background-color: #ccc; + background-color: #ccc; border-bottom-color: #aaa; } .wp_themeSkin .mceMenuItemTitle span.mceText { @@ -662,27 +924,80 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #888; } -/* pop-up */ -.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { - background-color: #cee1ef; - border-color: #c6d9e9; +.wp_themeSkin tr.mceFirst td.mceToolbar { + background-color: #dfdfdf; + border-color: #dfdfdf; } -.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { - background-color: #2683ae; - border-color: #464646; +.wp-admin #mceModalBlocker { + background: #000; } -#editorcontainer { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft { + background: #444444; + border-left: 1px solid #999; + border-top: 1px solid #999; + -moz-border-radius: 4px 0 0 0; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; } -#poststuff #titlewrap { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight { + background: #444444; + border-right: 1px solid #999; + border-top: 1px solid #999; + border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-radius: 0 4px 0 0; } -.curtime { - color: #666; +.wp-admin .clearlooks2 .mceMiddle .mceLeft { + background: #f1f1f1; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceMiddle .mceRight { + background: #f1f1f1; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceLeft { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceCenter { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceRight { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceFocus .mceTop span { + color: #e5e5e5; +} +/* end TinyMCE */ + +#editorcontainer, +#post-status-info, +#titlediv #title { + border-color: #dfdfdf; +} + +#titlediv #title { + background-color: #fff; } #tTips p#tTips_inside { @@ -690,8 +1005,223 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #333; } -/* Diff */ +#timestampdiv input, +#namediv input, +#tagsdiv #the-tagcloud { + border-color: #ddd; +} + +/* menu */ +#adminmenu * { + border-color: #e3e3e3; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px; +} + +#adminmenu a.menu-top { + background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px; +} + +#adminmenu .wp-has-current-submenu ul li a { + background: none; +} +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark.gif) top left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: #6d6d6d url(../images/menu-bits.gif) top left repeat-x; + border-color: #6d6d6d; + color: #fff; + text-shadow: rgba(0,0,0,0.4) 0px -1px 0px; +} + +#adminmenu li.wp-has-current-submenu .wp-submenu, +#adminmenu li.wp-has-current-submenu ul li a { + border-color: #aaa !important; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark.gif) bottom left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu ul { + border-bottom-color: #aaa; +} + +#adminmenu li.menu-top .current:hover { + border-color: #B5B5B5; +} + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; +} + +#adminmenu .wp-submenu a:hover { + background-color: #EAF2FA !important; + color: #333 !important; +} + +#adminmenu .wp-submenu li.current, +#adminmenu .wp-submenu li.current a, +#adminmenu .wp-submenu li.current a:hover { + color: #333; + background-color: #f5f5f5; + background-image: none; + border-color: #e3e3e3; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; +} + +#adminmenu .wp-submenu ul { + background-color: #fff; +} + +.folded #adminmenu li.menu-top, +#adminmenu .wp-submenu .wp-submenu-head { + background-color: #F1F1F1; +} + +.folded #adminmenu li.wp-has-current-submenu, +.folded #adminmenu li.menu-top.current { + background-color: #e6e6e6; +} + +#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { + background-color: #EAEAEA; + border-color: #aaa; +} + +#adminmenu div.wp-submenu { + background-color: transparent; +} + +/* menu icons */ +#adminmenu #menu-dashboard div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -61px -33px; +} + +#adminmenu #menu-dashboard:hover div.wp-menu-image, +#adminmenu #menu-dashboard.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-dashboard.current div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -61px -1px; +} + +#adminmenu #menu-posts div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -272px -33px; +} + +#adminmenu #menu-posts:hover div.wp-menu-image, +#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -272px -1px; +} + +#adminmenu #menu-media div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -121px -33px; +} + +#adminmenu #menu-media:hover div.wp-menu-image, +#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -121px -1px; +} + +#adminmenu #menu-links div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -91px -33px; +} + +#adminmenu #menu-links:hover div.wp-menu-image, +#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -91px -1px; +} + +#adminmenu #menu-pages div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -151px -33px; +} + +#adminmenu #menu-pages:hover div.wp-menu-image, +#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -151px -1px; +} + +#adminmenu #menu-comments div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -31px -33px; +} + +#adminmenu #menu-comments:hover div.wp-menu-image, +#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-comments.current div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -31px -1px; +} + +#adminmenu #menu-appearance div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -1px -33px; +} + +#adminmenu #menu-appearance:hover div.wp-menu-image, +#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -1px -1px; +} + +#adminmenu #menu-plugins div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -181px -33px; +} + +#adminmenu #menu-plugins:hover div.wp-menu-image, +#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -181px -1px; +} + +#adminmenu #menu-users div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -301px -33px; +} + +#adminmenu #menu-users:hover div.wp-menu-image, +#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -301px -1px; +} + +#adminmenu #menu-tools div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -211px -33px; +} + +#adminmenu #menu-tools:hover div.wp-menu-image, +#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -211px -1px; +} + +#adminmenu #menu-settings div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -241px -33px; +} + +#adminmenu #menu-settings:hover div.wp-menu-image, +#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -241px -1px; +} +/* end menu */ + + +/* Diff */ table.diff .diff-deletedline { background-color: #ffdddd; } @@ -704,3 +1234,344 @@ table.diff .diff-addedline { table.diff .diff-addedline ins { background-color: #99ff99; } + +#att-info { + background-color: #E4F2FD; +} + +/* edit image */ +#sidemenu a { + background-color: #f9f9f9; + border-color: #f9f9f9; + border-bottom-color: #dfdfdf; +} + +#sidemenu a.current { + background-color: #fff; + border-color: #dfdfdf #dfdfdf #fff; + color: #D54E21; +} + + +#screen-options-wrap, +#contextual-help-wrap { + background-color: #f1f1f1; + border-color: #dfdfdf; +} + +#screen-meta-links a.show-settings { + color: #606060; +} + +#screen-meta-links a.show-settings:hover { + color: #000; +} + +#replysubmit { + background-color: #f1f1f1; + border-top-color: #ddd; +} + +#replyerror { + border-color: #ddd; + background-color: #f9f9f9; +} + +#edithead, +#replyhead { + background-color: #f1f1f1; +} + +#ed_reply_toolbar { + background-color: #e9e9e9; +} + +/* table vim shortcuts */ +.vim-current { + background-color: #E4F2FD !important; +} + +/* Install Plugins */ +.star-average, +.star.star-rating { + background-color: #fc0; +} + +div.star.select:hover { + background-color: #d00; +} + +#plugin-information .fyi ul { + background-color: #eaf3fa; +} + +#plugin-information .fyi h2.mainheader { + background-color: #cee1ef; +} + +#plugin-information pre, +#plugin-information code { + background-color: #ededff; +} + +#plugin-information pre { + border: 1px solid #ccc; +} + +/* inline editor */ +.inline-edit-row fieldset input[type="text"], +.inline-edit-row fieldset textarea, +#bulk-titles, +#replyrow input { + border-color: #ddd; +} + +.inline-editor div.title { + background-color: #EAF3FA; +} + +.inline-editor ul.cat-checklist { + background-color: #FFFFFF; + border-color: #ddd; +} + +.inline-edit-row p.submit { + background-color: #f1f1f1; +} + +.inline-editor .categories .catshow, +.inline-editor .categories .cathide { + color: #21759b; +} + +.inline-editor .quick-edit-save { + background-color: #f1f1f1; +} + +#replyrow #ed_reply_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +fieldset.inline-edit-col-right .inline-edit-col { + border-color: #dfdfdf; +} + +.attention { + color: #D54E21; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; +} + +#major-publishing-actions { + background: #eaf2fa; +} + +.tablenav .tablenav-pages { + color: #555; +} + +.tablenav .tablenav-pages a { + border-color: #e3e3e3; + background: #eee url('../images/menu-bits.gif') repeat-x scroll left -379px; +} + +.tablenav .tablenav-pages a:hover { + color: #d54e21; + border-color: #d54321; +} + +.tablenav .tablenav-pages a:active { + color: #fff !important; +} + +.tablenav .tablenav-pages .current { + background: #dfdfdf; + border-color: #d3d3d3; +} + +#availablethemes, +#availablethemes td { + border-color: #ddd; +} + +#current-theme img { + border-color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link, +#TB_window #TB_title a.tb-theme-preview-link:visited { + color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link:hover, +#TB_window #TB_title a.tb-theme-preview-link:focus { + color: #ccc; +} + +.misc-pub-section { + border-bottom-color: #eee; +} + +#minor-publishing { + border-bottom-color: #ddd; +} + +#post-body .misc-pub-section { + border-right-color: #eee; +} + +.post-com-count span { + background-color: #bbb; +} + +.form-table .color-palette td { + border-color: #fff; +} + +.sortable-placeholder { + border-color: #bbb; + background-color: #f5f5f5; +} + +#post-body ul#category-tabs li.ui-tabs-selected a { + color: #333; +} + +#wp_editimgbtn, +#wp_delimgbtn, +#wp_editgallery, +#wp_delgallery { + border-color: #999; + background-color: #eee; +} + +#wp_editimgbtn:hover, +#wp_delimgbtn:hover, +#wp_editgallery:hover, +#wp_delgallery:hover { + border-color: #555; + background-color: #ccc; +} + +#favorite-first { + background: #797979 url(../images/fav.png) repeat-x left center; + border-color: #777 !important; + border-bottom-color: #666 !important; +} + +#favorite-inside { + border-color: #797979; + background-color: #797979; +} + +#favorite-toggle { + background: transparent url(../images/fav-arrow.gif) no-repeat 0 -4px; +} + +#favorite-actions a { + color: #ddd; +} + +#favorite-actions a:hover { + color: #fff; +} + +#favorite-inside a:hover { + text-decoration: underline; +} + +#favorite-actions .slide-down { + border-bottom-color: #626262; +} + +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + +.button-primary, +.submit .button-primary { + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#screen-meta a.show-settings { + background-color: transparent; + text-shadow: rgba(255,255,255,0.7) 0 1px 0; +} + +#icon-edit, +#icon-post { + background: transparent url(../images/icons32.png) no-repeat -552px -5px; +} + +#icon-index { + background: transparent url(../images/icons32.png) no-repeat -137px -5px; +} + +#icon-upload { + background: transparent url(../images/icons32.png) no-repeat -251px -5px; +} + +#icon-link-manager, +#icon-link, +#icon-link-category { + background: transparent url(../images/icons32.png) no-repeat -190px -5px; +} + +#icon-edit-pages, +#icon-page { + background: transparent url(../images/icons32.png) no-repeat -312px -5px; +} + +#icon-edit-comments { + background: transparent url(../images/icons32.png) no-repeat -72px -5px; +} + +#icon-themes { + background: transparent url(../images/icons32.png) no-repeat -11px -5px; +} + +#icon-plugins { + background: transparent url(../images/icons32.png) no-repeat -370px -5px; +} + +#icon-users, +#icon-user-edit { + background: transparent url(../images/icons32.png) no-repeat -600px -5px; +} + +#icon-tools, +#icon-admin { + background: transparent url(../images/icons32.png) no-repeat -432px -5px; +} + +#icon-options-general { + background: transparent url(../images/icons32.png) no-repeat -492px -5px; +} + +.view-switch #view-switch-list { + background: transparent url(../images/list.png) no-repeat 0 0; +} + +.view-switch #view-switch-list.current { + background: transparent url(../images/list.png) no-repeat -40px 0; +} + +.view-switch #view-switch-excerpt { + background: transparent url(../images/list.png) no-repeat -20px 0; +} + +.view-switch #view-switch-excerpt.current { + background: transparent url(../images/list.png) no-repeat -60px 0; +} + +#header-logo { + background: transparent url(../images/wp-logo.gif) no-repeat scroll center center; +} wp-admin/css/colors-fresh.css @@ -1,62 +1,93 @@ -/* Right Now */ -#rightnow { - margin-right:0; - margin-left: 7px; +#dashboard-widgets-wrap .has-sidebar { + margin-right: 0; + margin-left: -51%; } -#rightnow .reallynow span { - text-align: right; - float: right; +#dashboard-widgets-wrap .has-sidebar .has-sidebar-content { + margin-right: 0; + margin-left: 51%; +} +.view-all { + right: auto; + left: 0; } -#rightnow .reallynow a { +#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve { + font-family: Tahoma, Arial; +} +#dashboard_right_now td.b { + padding-right: 0; + padding-left: 6px; text-align: left; + font-family: Tahoma, Arial; +} +#dashboard_right_now .t { + padding-right: 0; + padding-left: 12px; +} +#dashboard_right_now .versions a { + font-family: Tahoma, Arial; +} +#dashboard_right_now a.button { float: left; - margin: 1px 0 0 6px; + clear: left; } -/* Widgets */ -div#dashboard-widgets-wrap { - margin-right:0; - margin-left:-13px; +#dashboard-widgets h3 .postbox-title-action { + right: auto; + left: 30px; } -div.dashboard-widget-holder { - float:right; +#the-comment-list .pingback { + padding-left: 0 !important; + padding-right: 9px !important; } -div.dashboard-widget { - margin-right:0; - margin-left: 20px; +/* Recent Comments */ +#the-comment-list .comment-item { + padding: 1em 70px 1em 10px; } -h3.dashboard-widget-title span { - text-align: right; +#the-comment-list .comment-item .avatar { float: right; + margin-left: 0; + margin-right: -60px; } -h3.dashboard-widget-title small { +/* Feeds */ +.rss-widget cite { text-align: left; - float:left; -} -div.dashboard-widget-submit input { - font-family: Tahoma; } -div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl { - padding-left:0; - padding-right:15px; +.rss-widget span.rss-date { + font-family: Tahoma, Arial; + margin-left: 0; + margin-right: 3px; } -#dashboard_secondary div.dashboard-widget-content ul li { - float:right; +/* QuickPress */ +#dashboard_quick_press h4 { + float: right; + text-align: left; } -#dashboard_secondary div.dashboard-widget-content ul li .post { - font-family:arial; +#dashboard_quick_press h4 label { + margin-right: 0; + margin-left: 10px; } -#dashboard_secondary div.dashboard-widget-content ul li a { - border-right:0 none; - border-left: 1px solid #dadada; - height:110px; +#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap { + margin: 0 5em 1em 0; } -#dashboard_secondary div.dashboard-widget-content ul li a cite { - font-family: Tahoma; +#dashboard_quick_press #media-buttons { + margin: 0 5em .5em 0; + padding: 0 10px 0 0; } -#dashboard-widgets .widget_rss ul li span.rss-date { - float:right; +#dashboard-widgets #dashboard_quick_press form p.submit { + margin-left: 0; + margin-right: 4.6em; } -#dashboard-widgets .widget_rss ul li a { +#dashboard-widgets #dashboard_quick_press form p.submit input { float: right; - margin: 0 0 .2em .5em; +} +#dashboard-widgets #dashboard_quick_press form p.submit #save-post { + margin: 0 10px 0 1em; +} +#dashboard-widgets #dashboard_quick_press form p.submit #publish { + float: left; +} +/* Recent Drafts */ +#dashboard_recent_drafts h4 abbr { + font-family: Tahoma, Arial; + margin-left:0; + margin-right: 3px; } wp-admin/css/dashboard-rtl.css @@ -1,282 +1,396 @@ -/* Right Now */ +.postbox p, .postbox ul, .postbox ol, .postbox blockquote, #wp-version-message { font-size: 11px; } + +.edit-box { + display: none; +} + +h3:hover .edit-box { + display: inline; +} -#rightnow { +form .input-text-wrap { + border-style: solid; border-width: 1px; + padding: 2px 3px; + border-color: #ccc; +} + +#dashboard-widgets form .input-text-wrap input { + border: 0 none; + outline: none; + margin: 0; + padding: 0; + width: 99%; + color: #333; +} + +form .textarea-wrap { border-style: solid; + border-width: 1px; padding: 2px; - margin-top: 10px; - margin-right: 7px; + border-color: #ccc; } -#rightnow .reallynow { - padding: 6px; - font-size: 15px; - line-height: 2; +#dashboard-widgets form .textarea-wrap textarea { + border: 0 none; + padding: 0; + outline: none; + width: 99%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +#dashboard-widgets .postbox form .submit { + float: none; + margin: .5em 0 0; + padding: 0; + border: none; +} + +#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input { margin: 0; } -#rightnow .rbutton { - font-weight: normal; - padding: 6px; - border-bottom: none; - -moz-border-radius: 2px; - -khtml-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - text-decoration: none; +#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish { + min-width: 0; } -#rightnow .reallynow span { - display: block; - text-align: left; - float: left; - padding: 0 6px; +#dashboard-widgets-wrap .has-sidebar { + margin-right: -51%; } -#rightnow .reallynow a { - display: block; - text-align: right; - float: right; - padding: 0 6px; - font-size: 14px; - margin: 1px 6px 0 0; +#dashboard-widgets-wrap .inner-sidebar { + width: 49%; } -#rightnow .youhave { - font-size: 14px; - padding: 10px; +#dashboard-widgets-wrap .has-sidebar .has-sidebar-content { + margin-right: 51%; } -#rightnow h3, #rightnow p { - padding: 0 10px; +div.postbox div.inside { + margin: 10px; + position: relative; } -#rightnow a { - font-weight: bold; +#dashboard-widgets a { + text-decoration: none; } -/* Widgets */ +#dashboard-widgets h3 a { + text-decoration: underline; +} -div#dashboard-widgets-wrap { - margin-top: -20px; - margin-right: -13px; /* 20 (div.dashboard-widget margin-right) - 7 (#rightnow margin-right) */ +#dashboard-widgets h3 .postbox-title-action { + position: absolute; + right: 30px; + padding: 0; } -div#dashboard-widgets { - width: 100%; +#dashboard-widgets h4 { + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + font-size: 13px; + margin: 0 0 .2em; + padding: 0; } -div.dashboard-widget-holder { - margin-top: 20px; - width: 50%; - float: left; +/* Right Now */ + +#dashboard_right_now p.sub, +#dashboard_right_now .table, #dashboard_right_now .versions { + margin: -12px; +} + +#dashboard_right_now .inside { + font-size: 12px; } -div.dashboard-widget-holder.third { - width: 33.3%; +#dashboard_right_now p.sub { + font-style: italic; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + padding: 5px 10px 15px; + color: #777; + font-size: 13px; } -div.dashboard-widget-holder.fourth { - width: 25%; +#dashboard_right_now .table { + background: #f9f9f9; + border-top: #ececec 1px solid; + border-bottom: #ececec 1px solid; + margin: 0 -9px 10px; + padding: 0 10px; } -div.dashboard-widget-holder.full { +#dashboard_right_now table { width: 100%; } -div.dashboard-widget-holder.double div.dashboard-widget { - height: 54em; - padding-bottom: 28px /* lame */ +#dashboard_right_now table td { + border-top: #ececec 1px solid; + padding: 3px 0; + white-space: nowrap; } -div.dashboard-widget { - position: relative; - margin-right: 20px; - border-width: 1px; - border-style: solid; - padding: 2px; - height: 27em; - overflow: auto; - font-size: 11px; +#dashboard_right_now table tr.first td { + border-top: none; } -h3.dashboard-widget-title { - margin: 0; - padding: 0 7px; +#dashboard_right_now td.b { + padding-right: 6px; + text-align: right; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-size: 14px; - line-height: 2; } -h3.dashboard-widget-title span { - display: block; - text-align: left; - float: left; +#dashboard_right_now td.b a { + font-size: 18px; } -h3.dashboard-widget-title small { - display: block; - text-align: right; - float: right; - font-size: 75%; - line-height: 2.67; /* math: it works, bitches */ +#dashboard_right_now td.b a:hover { + color: #d54e21; } -h3.dashboard-widget-title img.rss-icon { - vertical-align: middle; - margin: .5em 0; +#dashboard_right_now .t { + font-size: 12px; + padding-right: 12px; + padding-top: 6px; + color: #777; } -div.dashboard-widget-notice { - padding: 0 14px; - font-size: 1.2em; - line-height: 2; +#dashboard_right_now td.first, +#dashboard_right_now td.last { + width: 1px; } -div.dashboard-widget-error { - padding: 0 20px; - font-size: 1.2em; - line-height: 2; +#dashboard_right_now .spam { + color: red; } -div.dashboard-widget-content { - padding: 10px 15px; +#dashboard_right_now .waiting { + color: orange; } -div.dashboard-widget-submit { - border-top: 1px solid #ccc; - padding: 1em 0 0 0; - margin: 10px 0 0 0; +#dashboard_right_now .approved { + color: green; } -div.dashboard-widget-submit input { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 4px 6px; - border: none; - font-size: 13px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: pointer; - text-decoration: none; + +#dashboard_right_now .versions { + padding: 6px 10px 12px; } -div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl { - margin: 0; - text-indent: 0; - padding-left: 15px; +#dashboard_right_now .versions .b { + font-weight: bold; +} + +#dashboard_right_now a.button { + float: right; + clear: right; + position: relative; + top: -5px; } -div.dashboard-widget-content li { - margin: .5em 0 1em; + +/* Recent Comments */ + +#dashboard_recent_comments h3 { + margin-bottom: 0; } -div.dashboard-widget-content blockquote { - margin: -1em 0; +#dashboard_recent_comments .inside { + margin-top: 0; } -div#dashboard_recent_comments p { - font-size: 14px; +#dashboard_recent_comments .comment-meta .approve { + font-style: italic; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + font-size: 10px; } -div.dashboard-widget-content p.comment-meta { - font-size: 11px !important; +#the-comment-list { + position: relative; } -#dashboard_secondary div.dashboard-widget { - height: auto; +#the-comment-list .comment-item { + padding: 1em 10px 1em 70px; + border-top: 1px solid; } -#dashboard_secondary div.dashboard-widget-content ul { - list-style: none; - padding: 0; +#the-comment-list .pingback { + padding-left: 9px !important; } -#dashboard_secondary div.dashboard-widget-content ul li { - display: block; - width: 19.95%; - padding-bottom: 10px; - margin: 0; +#the-comment-list .comment-item, +#the-comment-list #replyrow { + margin: 0 -10px; +} + +#the-comment-list .comment-item:first-child { + border-top: none; +} + +#the-comment-list .comment-item .avatar { float: left; - font-size: 95%; + margin-left: -60px; } -#dashboard_secondary div.dashboard-widget-content { - margin: 10px 5px; - padding: 0; +#the-comment-list .comment-item h4 { + line-height: 1.4; + margin-top: -.2em; + font-weight: normal; + color: #999; } -#dashboard_secondary div.dashboard-widget-content ul li .post { - display:block; - font-family:Georgia,"Times New Roman",Times,serif; - font-size:18px; - line-height: 1.2em; - height:90px; - overflow:hidden; +#the-comment-list .comment-item h4 cite { + font-style: normal; + font-weight: normal; } -#dashboard_secondary div.dashboard-widget-content ul li a { - display: block; - height:100%; - overflow:hidden; - margin: 5px 10px; - text-decoration: none; - padding: .5em; - border-right: 1px solid #dadada; - border-bottom: 1px solid #dadada; +#the-comment-list .comment-item blockquote, +#the-comment-list .comment-item blockquote p { + margin: 0; + padding: 0; + display: inline; } -#dashboard_secondary div.dashboard-widget-content ul li a cite { +#dashboard_recent_comments #the-comment-list .trackback blockquote, +#dashboard_recent_comments #the-comment-list .pingback blockquote { display: block; - font-family: "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; } -#dashboard-widgets .widget_rss ul { - list-style: none; +#the-comment-list .comment-item p.row-actions { + margin: 3px 0 0; padding: 0; + font-size: 10px; } -#dashboard-widgets .widget_rss ul li { +/* QuickPress */ + +#dashboard_quick_press h4 { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + float: left; + width: 5.5em; clear: both; + font-weight: normal; + text-align: right; + padding-top: 5px; + font-size: 12px; +} + +#dashboard_quick_press h4 label { + margin-right: 10px; } -#dashboard-widgets .widget_rss ul li span.rss-date { +#dashboard_quick_press .input-text-wrap, +#dashboard_quick_press .textarea-wrap { + margin: 0 0 1em 5em; +} + +#dashboard_quick_press #media-buttons { + margin: 0 0 .5em 5em; + padding: 0 0 0 10px; + font-size: 11px; +} + +#dashboard_quick_press #media-buttons a { + vertical-align: bottom; +} + +#dashboard-widgets #dashboard_quick_press form p.submit { + margin-left: 4.6em; +} + +#dashboard-widgets #dashboard_quick_press form p.submit input { float: left; +} + +#dashboard-widgets #dashboard_quick_press form p.submit #save-post { + margin: 0 1em 0 10px; +} + +#dashboard-widgets #dashboard_quick_press form p.submit #publish { + float: right; +} + +/* Recent Drafts */ +#dashboard_recent_drafts ul { + margin: 0; + padding: 0; + list-style: none; +} + +#dashboard_recent_drafts ul li { + margin-bottom: 0.6em; +} + +#dashboard_recent_drafts h4 { + font-weight: normal; +} + +#dashboard_recent_drafts h4 abbr { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + font-size: 11px; + color: #999; + margin-left: 3px; +} + +#dashboard_recent_drafts p { margin: 0; + padding: 0; } -#dashboard-widgets .widget_rss ul li a { - float: left; - margin: 0 .5em .2em 0; - font-weight: bold; +/* Feeds */ + +.rss-widget ul { + margin: 0; + padding: 0; + list-style: none; } -#dashboard-widgets .widget_rss ul li div { - clear: both; +a.rsswidget { + font-size: 13px; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + line-height: 1.7em; +} + +.rss-widget ul li { line-height: 1.5em; + margin-bottom: 12px; } -#dashboard_primary a.rsswidget, #dashboard_plugins h5 { - font-size: 14px; +.rss-widget span.rss-date { + margin-left: 3px; } -#dashboard_primary span.rss-date { - font-size: 14px; +.rss-widget cite { + display: block; + text-align: right; + margin: 0 0 1em; + padding: 0; } +.rss-widget cite:before { + content: '\2014'; +} + +/* Plugins */ + #dashboard_plugins h4 { - font-size: 1em; - margin: 0 0 .1em; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } #dashboard_plugins h5 { + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + font-size: 13px !important; margin: 0; display: inline; line-height: 1.4em; } -#dashboard_plugins p { - margin: 0 0 1em; - line-height: 1.5em; +#dashboard_plugins h5 a { + font-weight: normal; + line-height: 1.7em; } -.widget-loading { +#dashboard_plugins p { + margin: 0 0 1.4em; + line-height: 1.4em; } wp-admin/css/dashboard.css @@ -1,31 +1,74 @@ -body, td { - font-family: Tahoma; +/* 2 column liquid layout */ +#adminmenu { + float: right; + clear: right; + margin-right:-160px; + margin-left: 5px; } -textarea, input, select { - font-family: Tahoma; +div.folded #adminmenu { + margin-left: 0; + margin-right: -45px; } -h1, h2, h3 { - font-family:arial; +/* inner 2 column liquid layout */ +.inner-sidebar { + float: left; + clear: left; } -.widefat td { - padding: 7px 10px 9px 15px; +.has-sidebar { + float: right; + clear: right; + margin-right: 0; + margin-left: -340px; +} +.has-sidebar .has-sidebar-content { + margin-right: 0; + margin-left: 305px; +} +#wpbody { + margin-left:0; + margin-right: 175px; +} +.folded #wpbody { + margin-left: 0; + margin-right: 60px; +} +#wpbody-content { + float: right; +} +/* 2 columns main area */ +#col-right { + float: left; + clear: left; +} +.wrap { + margin: 0 5px 0 15px; +} +/* styles for use by people extending the WordPress interface */ +body, td, textarea, input, select { + font-family: Tahoma, arial; +} +.alignleft { + float: right; +} +.alignright { + float: left; +} +.subsubsub { + float: right; } .widefat th { - padding: 9px 10px 6px 15px; text-align: right; } .widefat th input { margin: 0 8px 0 0; } -.widefat .check-column { - text-align: left; -} .wrap h2 { - font-family:arial; - margin: 5px -4px 0 0; - padding-right:0; - padding-left: 280px; + font-family: arial; + padding: 14px 0 3px 15px; } .wrap h2.long-header { padding-left: 0; } +.updated, .error { + clear: both; +} wp-admin/css/global-rtl.css @@ -1,40 +1,244 @@ -/* styles for use by people extending the WordPress interface */ +/* http://meyerweb.com/eric/tools/css/reset/ */ +/* v1.0 | 20080212 */ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + outline: 0; +/* font-size: 100%; + vertical-align: baseline; */ + background: transparent; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +/* remember to define focus styles! */ +/* +:focus { + outline: 0; +} +*/ +/* remember to highlight inserts somehow! */ +ins { + text-decoration: none; +} +del { + text-decoration: line-through; +} -body { +/* tables still need 'cellspacing="0"' in the markup */ +/* +table { + border-collapse: collapse; + border-spacing: 0; +} +*/ +/* end reset css */ + + +/* 2 column liquid layout */ +#wpwrap { + height: auto; + min-height: 100%; + width: 100%; +} + +#wpcontent { + height: 100%; + padding-bottom: 50px; +} + +#wpbody { + clear: both; + margin-left: 175px; +} + +.folded #wpbody { + margin-left: 60px; +} + +#wpbody-content { + float: left; + width: 100%; +} + +#adminmenu { + float: left; + clear: left; + width: 145px; + margin-top: 15px; + margin-right: 5px; + margin-bottom: 15px; + margin-left: -160px; + position: relative; + padding: 0; + list-style: none; +} + +.folded #adminmenu { + margin-left: -45px; +} + +.folded #adminmenu, +.folded #adminmenu li.menu-top { + width: 28px; +} + +#footer { + clear: both; + position: relative; + width: 100%; +} + +/* inner 2 column liquid layout */ + +.inner-sidebar { + float: right; + clear: right; + width: 280px; + position: relative; +} + +.has-sidebar { + float: left; + clear: left; + width: 100%; + margin-right: -340px; +} + +.has-sidebar .has-sidebar-content { + margin-right: 305px; +} + +/* 2 columns main area */ + +#col-container { + overflow: hidden; + padding: 0; margin: 0; +} + +#col-left { padding: 0; + margin: 0; + overflow: hidden; + width: 39%; +} + +#col-right { + float: right; + clear: right; + overflow: hidden; + padding: 0; + margin: 0; + width: 59%; +} + +/* utility classes */ +.alignleft { + float: left; +} + +.alignright { + float: right; +} + +.textleft { + text-align: left; } -body, td { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; +.textright { + text-align: right; } -form, label input { margin: 0; padding: 0; } +.clear { + clear: both; +} -img { border: 0; } +.hidden, +.closed .inside, +.hide-if-no-js { + display: none; +} -label { cursor: pointer; } +/* include margin and padding in the width calculation of input and textarea */ +input[type="text"], +textarea { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; /* ie8 only */ + box-sizing: border-box; +} + +input[type="checkbox"], +input[type="radio"] { + vertical-align: text-top; +} -li, dd { margin-bottom: 6px; } +/* styles for use by people extending the WordPress interface */ +html, +body { + height: 100%; +} -p, li, dl, dd, dt { line-height: 140%; } +body, +td { + font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; +} -textarea, input, select { - font: 13px Verdana, Arial, Helvetica, sans-serif; - margin: 1px; - padding: 3px; +p { + margin: 1em 0; } -.alignleft { float: left; } -.alignright { float: right; } +blockquote { + margin: 1em; +} -.textleft { text-align: left; } -.textright { text-align: right; } +label { + cursor: pointer; +} -.clear { clear: both; height: 2px; } +li, +dd { + margin-bottom: 6px; +} -.hidden { display: none; } +p, +li, +dl, +dd, +dt { + line-height: 140%; +} + +textarea, +input, +select { + font: 13px/19px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + margin: 1px; + padding: 3px; +} h1 { display: block; @@ -79,50 +283,105 @@ h6 { .subsubsub { list-style: none; - margin: 14px 0 8px 0; + margin: 8px 0 5px; padding: 0; white-space: nowrap; - font-size: 12px; + font-size: 11px; + float: left; } -.subsubsub a { line-height: 200%; padding: 3px; text-decoration: none; } +.subsubsub a { + line-height: 2; + padding: .2em; + text-decoration: none; +} -.subsubsub a.current { font-weight: bold; background: none; border: none;} +.subsubsub a .count, .subsubsub a.current .count { + color: #999; + font-weight: normal; +} -.subsubsub li { display: inline; margin: 0; padding: 0; } +.subsubsub a.current { + font-weight: bold; + background: none; + border: none; +} + +.subsubsub li { + display: inline; + margin: 0; + padding: 0; +} .widefat { border-width: 1px; border-style: solid; - border-collapse: collapse; + border-collapse: separate; + border-spacing: 0; width: 100%; clear: both; margin: 0; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } -.widefat a { - text-decoration: none; +.widefat * { + word-wrap: break-word; } -.widefat abbr { - white-space: nowrap; +.widefat a { + text-decoration: none; } -.widefat td, .widefat th { +.widefat td, +.widefat th { border-bottom-width: 1px; border-bottom-style: solid; - border-bottom-color: #ccc; font-size: 11px; vertical-align: text-top; } .widefat td { - padding: 7px 15px 9px 10px; + padding: 7px 7px 5px; vertical-align: top; } +.widefat thead tr th:first { + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; +} + +.widefat thead tr th:last { + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + border-top-right-radius: 4px; +} + +.widefat tfoot tr th:first { + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + -khtml-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; +} + +.widefat tfoot tr th:last { + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -khtml-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.widefat td p { + font-size: 11px; +} + .widefat th { - padding: 9px 15px 6px 10px; + padding: 7px 7px 8px; text-align: left; line-height: 1.3em; } @@ -130,69 +389,65 @@ h6 { .widefat th input { margin: 0 0 0 8px; padding: 0; + vertical-align: text-top; } .widefat .check-column { - text-align: right; - width: 1.5em; + width: 2.2em; padding: 0; } .widefat tbody th.check-column { - padding: 8px 0 22px; -} -/* -th.check-column + th, th.check-column + td { - padding-left: 5px; + padding: 7px 0 22px; } -*/ -.widefat .num { + +.widefat .num, +.column-comments, +.column-links, +.column-posts, +.column-parent { text-align: center; } -.wrap, .updated, .error { - margin: 0; - margin-left: 15px; - margin-right: 15px; - padding: 0; - max-width: 980px; +.widefat th#comments { + vertical-align: middle; } -.updated, .error { +.wrap { + margin: 0 15px 0 5px; +} + +.updated, +.error { border-width: 1px; border-style: solid; padding: 0 0.6em; - max-width: 950px; - margin-bottom: 1em; -} - -.updated p, .error p { - margin: 0.6em 0; + margin: 5px 15px 2px; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } -.wrap .updated, .wrap .error { - margin: auto 0 0; +.updated p, +.error p { + margin: 0.5em 0; + line-height: 1; + padding: 2px; } -.updated a, .error a { - text-decoration: underline; -} - -.updated a { - text-decoration: none; - padding-bottom: 2px; +.wrap .updated, +.wrap .error { + margin: 5px 0; } .wrap h2 { - border-bottom-width: 1px; - border-bottom-style: solid; - clear: both; - font: 24px Georgia, "Times New Roman", Times, serif; - margin: 5px 0 0 -4px; - padding: 0; - padding-bottom: 7px; - padding-right: 280px; + font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + margin: 0; + padding: 14px 15px 3px 0; + line-height: 35px; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; } .wrap h2.long-header { wp-admin/css/global.css @@ -1,73 +1,91 @@ -#poststuff .postbox h3 { - padding-left:0; - padding-right: 23px; +* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle { + background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -109px; } -* html #poststuff .postarea, * html #poststuff #titlediv { + +* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle { + background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -206px; +} +* html #adminmenu { margin-left:0; - margin-right: 3%; + margin-right: -80px; +} +* html div.folded #adminmenu { + margin-left: 0; + margin-right: -22px; +} +#wpcontent #adminmenu .wp-submenu li.wp-submenu-head { + padding: 3px 10px 4px 4px; +} +.inline-edit-row fieldset label span.title { + float: right; +} +.inline-edit-row fieldset label span.input-text-wrap { + margin-right: 0; +} +p.search-box { + float: left; } * html #poststuff h2 { margin-right: 0; } #bh { - padding-right:0; - padding-left: 15px; + margin: 7px 10px 0 0; + float: left; +} +#user_info + div#favorite-actions { + right: auto; + left: 15px; +} +#wphead-info { + float: left; } +/* without this dashboard widgets appear in one column for some screen widths */ div#dashboard-widgets { - padding-right:0; + padding-right: 0; padding-left: 1px; } #tagchecklist span a { margin: 4px -9px 0 0; } -#poststuff .togbox { - margin-left:0; - margin-right: -19px; -} .widefat th input { margin: 0 5px 0 0; } /* ---------- add by navid */ -#dashmenu { /* fix top right bottom in admin */ - direction:ltr; -} -#sidemenu a { /* fix left admin buttom ex. plugins, options */ - float:left; +#TB_window { + width: 670px; + position: absolute; + top: 50%; + left: 50%; + margin-right: 335px !important; } -.wrap h2 { - margin:5px 4px 0 0; +#dashboard_plugins { + direction: ltr; } -#editor-toolbar {/* fix hover in media uploader icon */ - direction:ltr; +#dashboard_plugins h3.hndle { + direction: rtl; } -#TB_window { /* fix theme preview */ - left:2%; +#dashboard_incoming_links ul li, +#dashboard_secondary ul li, +#dashboard_primary ul li, +p.row-actions { + width: 100%; } -/* fix widget page */ -form#widgets-filter { - position:static; +#favorite-inside { + position: absolute; + right:0; } -#widget-search { - display:none; +#post-status-info { + height: 25px; } -/* fix manage comment page */ -ul.view-switch li { - float:left; +#screen-meta { + position: static; } -form#posts-filter { - position:static; +p.submit { /* quick edit and reply in edit-comments.php */ + height:22px; } -#post-search { - display:none; +.inner-sidebar { /* fix edit single comment */ + position: static; } -#submenu { - margin-right: 20px; +form#widgets-filter { /* fix widget page */ + position: static; } -/* Fixes for media-upload window */ -/* Center media-upload panel on screen */ -#TB_window { - width: 670px; - position: absolute; - top: 50%; - left: 50%; - margin-right: 335px !important; } wp-admin/css/ie-rtl.css @@ -1,14 +1,44 @@ /* Fixes for IE bugs */ -#poststuff .postbox h3 { - padding-left: 23px; +input.button, +input.button-secondary, +input.button-highlighted { + padding: 0; +} + +#minor-publishing-actions input, +#major-publishing-actions input, +#minor-publishing-actions .preview { + min-width: auto; + padding-left: 0; + padding-right: 0; +} + +#wpbody-content .postbox { + border: 1px solid #dfdfdf; +} + +#wpbody-content .postbox h3 { + margin-bottom: -1px; } -#submenu li a.current { - background:none; - border:none; +* html #side-info-column { + height: auto; } +* html #wpbody-content #screen-options-link-wrap { + display: inline-block; + width: 150px; + text-align: center; +} + +* html #wpbody-content #contextual-help-link-wrap { + display: inline-block; + width: 100px; + text-align: center; +} + +/* * html body.minwidth { _width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%"); } @@ -16,34 +46,225 @@ * html #wpbody { _width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%"); } +*/ -* html #poststuff .postarea, * html #poststuff #titlediv { - width: 95%; - margin-left: 3%; +* html #adminmenu { + margin-left: -80px; +} + +* html div.folded #adminmenu { + margin-left: -22px; +} + +* html #wpcontent #adminmenu li.menu-top { + display: inline; + padding: 0; + margin: 0; +} + +#wpcontent.folded #adminmenu li.menu-top { + display: block; +} + +ul#adminmenu { + z-index: 99; +} + +#adminmenu li.menu-top a.menu-top { + min-width: auto; + width: auto; +} + +#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu { + font-style: normal; +} + +* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle { + background: none; +} + +* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle { + background: url(../images/menu-bits.gif) no-repeat scroll left -109px; +} + +* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle { + background: url(../images/menu-bits.gif) no-repeat scroll left -206px; +} + +* html #adminmenu div.wp-menu-image { + height: 29px; +} + +#wpcontent #adminmenu .wp-submenu li { + padding: 0; +} + +#adminmenu, +.wp-submenu, +.wp-submenu li, +.wp-menu-toggle { + zoom: 100%; +} + +#wpcontent.folded #adminmenu li.wp-menu-separator { + width: 28px; +} + +#wpcontent #adminmenu .wp-submenu li.wp-submenu-head { + padding: 3px 4px 4px 10px; + zoom: 100%; +} + +#wpcontent.folded #adminmenu .menu-top { + height: 30px; +} + +.folded #adminmenu .wp-submenu { + margin: -1px 0 0 0; +} + +#template, +#template div, +#editcat, +#addcat { + zoom: 100%; } .submitbox { margin-top: 10px; } -* html div.widget-liquid-left-holder, * html div.widget-liquid-right { +/* Inline Editor */ +#wpbody-content .quick-edit-row-post .inline-edit-col-left { + width: 39%; +} + +#wpbody-content .inline-edit-row-post .inline-edit-col-center { + width: 19%; +} + +#wpbody-content .quick-edit-row-page .inline-edit-col-left { + width: 49%; +} + +#wpbody-content .bulk-edit-row .inline-edit-col-left { + width: 29%; +} + +.inline-edit-row p.submit { + zoom: 100%; +} + +.inline-edit-row fieldset label span.title { + display: block; + float: left; + width: 5em; +} + +.inline-edit-row fieldset label span.input-text-wrap { + margin-left: 0; + zoom: 100%; +} + +#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input { + line-height: 130%; +} + +#wpbody-content .inline-edit-row .input-text-wrap input { + width: 95%; +} + +#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input { + width: 8em; +} +/* end Inline Editor */ + +* html .row-actions { + visibility: visible; +} + +#dashboard-widgets h3 a { + height: 20px; + line-height: 20px; +} + +#the-comment-list .comment-item, +ul#widget-list li.widget-list-item { + zoom: 100%; +} + +#wphead-info { + float: right; +} + +#titlediv #title { + width: 98%; +} + +a.button { + line-height: 1.4em; + margin: 1px; +} + +* html div.widget-liquid-left-holder, +* html div.widget-liquid-right { display: block; position: relative; } -#wpwrap, #wpcontent, #post, #wrap, #postdivrich, #postdiv, #poststuff, #titlediv, #post-body, #editorcontainer, .tablenav, .widget-control-list, li.widget-list-control-item, #dragHelper, li.widget-list-control-item h4, .widget-sortable, .widget-control-actions { +#screen-options-wrap { + overflow: hidden; +} + +#favorite-actions { + z-index: 12; +} + +#favorite-inside, +#favorite-inside a, +.favorite-action { + zoom: 100%; +} + +#post-status-info, +#wpwrap, +#wpcontent, +#post, +#wrap, +#postdivrich, +#postdiv, +#poststuff, +.metabox-holder, +#titlediv, +#post-body, +#editorcontainer, +.tablenav, +.widget-control-list, +li.widget-list-control-item, +#dragHelper, +li.widget-list-control-item h4, +.widget-sortable, +.widget-control-actions, +#tagchecklist, +#col-container, +#col-left, +#col-right { display: block; zoom: 100%; } +p.search-box { + position: static; + float: right; + margin: -3px 0 4px; +} + * html #editorcontainer { padding: 0; } -* html #editorcontainer #content { - position: relative; +#editorcontainer #content { overflow: auto; - padding: 6px; margin: auto; width: 98%; } @@ -66,7 +287,8 @@ form#template div { } #bh { - padding-right: 15px; + margin: 7px 10px 0 0; + float: right; } /* without this dashboard widgets appear in one column for some screen widths */ @@ -74,11 +296,6 @@ div#dashboard-widgets { padding-right: 1px; } -#tagchecklist { - display: block; - zoom: 100%; -} - #tagchecklist span, #tagchecklist span a { display: inline-block; display: block; @@ -88,10 +305,6 @@ div#dashboard-widgets { margin: 4px 0 0 -9px; } -#poststuff .togbox { - margin-left: -19px; -} - .tablenav .button-secondary, .nav .button-secondary { padding: 0 1px; vertical-align: middle; @@ -104,23 +317,10 @@ div#dashboard-widgets { margin-top: 2px; } -.tablenav-pages .page-numbers { - display: inline-block; -} - -.tablenav-pages { - display: block; - margin-top: -3px; -} - table.ie-fixed { table-layout: fixed; } -#post-search .button, #widget-search .button { - padding: 1px; -} - .widefat tr, .widefat th { margin-bottom: 0; border-spacing: 0; wp-admin/css/ie.css @@ -1,27 +1,16 @@ body { - font-family: Tahoma; + font-family: Tahoma, arial; } -/* Half the page disapears on IE6 */ -* html body { - width: 700px; - position: absolute; - left: 50%; - margin-right: 350px; -} -ul, ol { - padding: 5px 22px 5px 5px; -} -.step, th { - text-align:right; +h1 { + font-family: arial; + margin: 5px -4px 0 0; } -.submit input, .button, .button-secondary { - font-family: Tahoma; +ul, ol { padding: 5px 22px 5px 5px; } +.step, th { text-align: right; } +.submit input, .button, .button-secondary { + font-family: Tahoma, arial; margin-right:0; } .form-table th { - text-align:right; -} -h1 { - font-family:arial; - margin: 5px -4px 0 0; + text-align: right; } wp-admin/css/install-rtl.css @@ -1,78 +1,83 @@ -html { background: #f1f1f1; } +html { background: #f7f7f7; } body { background: #fff; color: #333; - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; margin: 2em auto 0 auto; width: 700px; padding: 1em 2em; - -moz-border-radius: 12px; - -khtml-border-radius: 12px; - -webkit-border-radius: 12px; - border-radius: 12px; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; + border: 1px solid #dfdfdf; } a { color: #2583ad; text-decoration: none; } a:hover { color: #d54e21; } - h1 { - font-size: 18px; - margin-bottom: 0; + border-bottom: 1px solid #dadada; + clear: both; + color: #666; + font: 24px Georgia, "Times New Roman", Times, serif; + margin: 5px 0 0 -4px; + padding: 0; + padding-bottom: 7px; } h2 { font-size: 16px; } p, li { padding-bottom: 2px; - font-size: 13px; + font-size: 12px; line-height: 18px; } -code { - font-size: 13px; -} +code { font-size: 13px; } ul, ol { padding: 5px 5px 5px 22px; } -#logo { margin: 6px 0 14px 0px; border-bottom: none;} +#logo { margin: 6px 0 14px 0; border-bottom: none;} .step { margin: 20px 0 15px; } -.step input { - font-size: 18px; -} - -a.button { - font-size: 18px; -} - .step, th { text-align: left; padding: 0; } .submit input, .button, .button-secondary { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 5px 7px 7px; - border: 1px solid #a3a3a3; - margin-left: 0; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - color: #246; - background: #e5e5e5; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + text-decoration: none; + font-size: 14px !important; + line-height: 16px; + padding: 6px 12px; + cursor: pointer; + border: 1px solid #bbb; + color: #464646; + -moz-border-radius: 15px; + -khtml-border-radius: 15px; + -webkit-border-radius: 15px; + border-radius: 15px; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + -khtml-box-sizing: content-box; + box-sizing: content-box; +} + +.button:hover, .button-secondary:hover, .submit input:hover { + color: #000; + border-color: #666; } -.button-secondary { - background: #cee1ef; +.button, .submit input, .button-secondary { + background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } -.submit input:hover, .button:hover, .button-secondary:hover { - color: #d54e21; - border-color: #535353; +.button:active, .submit input:active, .button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; } .form-table { @@ -98,7 +103,7 @@ a.button { } .form-table tr { - background: #eaf3fa; + background: #f3f3f3; } .form-table code { @@ -117,26 +122,12 @@ a.button { padding: 2px; } -h1 { - border-bottom: 1px solid #dadada; - clear: both; - color: #666666; - font: 24px Georgia, "Times New Roman", Times, serif; - margin: 5px 0 0 -4px; - padding: 0; - padding-bottom: 7px; -} - -#error-page { - margin-top: 50px; -} +#error-page { margin-top: 50px; } #error-page p { - font-size: 14px; - line-height: 16px; + font-size: 12px; + line-height: 18px; margin: 25px 0 20px; } -#error-page code { - font-size: 15px; -} \ No newline at end of file +#error-page code { font-family: Consolas, Monaco, Courier, monospace; } wp-admin/css/install.css @@ -1,37 +1,30 @@ body { - font-family: Tahoma; + font-family: Tahoma, arial; } form { - margin-left:0; margin-right: 8px; + margin-left: 0; } form .forgetmenot { - float:right; + float: right; } -#login form .submit input { - font-family: Tahoma; -} -form .submit { - float:left; +#login form .submit input { + font-family: Tahoma, arial; } +form .submit { float: left; } #backtoblog a { - left:auto; - right:15px; + left: auto; + right: 15px; } #login_error, .message { margin: 0 8px 16px 0; } -#nav { - margin:0 8px 0 0; -} +#nav { margin: 0 8px 0 0; } #user_pass, #user_login, #user_email { - margin-right:0; margin-left: 6px; + margin-right: 0; + direction:ltr; } h1 a { - text-decoration:none; -} -/* ltr input */ -#user_login, #user_pass { - direction:ltr; + text-decoration: none; } wp-admin/css/login-rtl.css @@ -3,35 +3,56 @@ body { border-top-width: 30px; border-top-style: solid; - font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 11px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } form { margin-left: 8px; padding: 16px 16px 40px 16px; - font-weight: bold; - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; + font-weight: normal; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; border-radius: 5px; + background: #fff; + border: 1px solid #e5e5e5; + -moz-box-shadow: rgba(200,200,200,1) 0 4px 18px; + -webkit-box-shadow: rgba(200,200,200,1) 0 4px 18px; + -khtml-box-shadow: rgba(200,200,200,1) 0 4px 18px; + box-shadow: rgba(200,200,200,1) 0 4px 18px; } -form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0;} +form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0; } #login form .submit input { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 5px; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + padding: 3px 10px; border: none; - font-size: 13px; + font-size: 12px; border-width: 1px; border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: default; - text-decoration: none; - margin-top: -6px; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; + cursor: pointer; + text-decoration: none; + margin-top: -3px; + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#login form p { + margin-bottom: 0; +} + +label { + color: #777; + font-size: 13px; +} + +form .forgetmenot label { + font-size: 11px; + line-height: 19px; } form .submit { float: right; } @@ -39,15 +60,19 @@ form .submit { float: right; } form p { margin-bottom: 24px; } h1 a { - background: url(../images/logo-login.gif) no-repeat; - width: 292px; - height: 66px; + background: url(../images/logo-login.gif) no-repeat top center; + width: 326px; + height: 67px; text-indent: -9999px; overflow: hidden; padding-bottom: 15px; display: block; } +#nav { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + #backtoblog a { position: absolute; top: 7px; @@ -55,20 +80,28 @@ h1 a { text-decoration: none; } -#login { width: 292px; margin: 7em auto; } +#login { width: 320px; margin: 7em auto; } #login_error, .message { margin: 0 0 16px 8px; border-width: 1px; border-style: solid; padding: 12px; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } #nav { margin: 0 0 0 8px; padding: 16px; } #user_pass, #user_login, #user_email { - font-size: 20px; + font-size: 24px; width: 97%; padding: 3px; + margin-top: 2px; margin-right: 6px; -} \ No newline at end of file + margin-bottom: 16px; + border: 1px solid #e5e5e5; + background: #fbfbfb; +} wp-admin/css/login.css @@ -1,66 +1,93 @@ body#media-upload ul#sidemenu { - left:auto; - right:0; - width: 620px; + left: auto; + right: 0; } #search-filter { - text-align:left; + text-align: left; } +/* specific to the image upload form */ .align .field label { padding: 0 28px 0 0; margin: 0 0 0 1em; } .image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label { - background-position:center right; + background-position: center right; +} +tr.image-size div.image-size-item { + float: right; } tr.image-size label { - margin: 0 0 0 1em; + margin: 0 1em 0 0; } .filename.original { float: right; } .crunching { text-align: left; - margin-right:0; + margin-right: 0; margin-left: 5px; } button.dismiss { - right:auto; - left:5px; + right: auto; + left: 5px; } .file-error { margin: 0 50px 5px 0; } .progress { - left:auto; - right:0; + left: auto; + right: 0; +} +.describe td { + padding: 0 0 0 5px; } .bar { - border-right-width:0; + border-right-width: 0; border-left-width: 3px; + border-right-style: none; border-left-style: solid; } .media-item .pinkynail { - float:right; + float: right; } -.describe-toggle-on, .describe-toggle-off { +.describe-toggle-on, +.describe-toggle-off { float: left; - margin-right:0; + margin-right: 0; margin-left: 20px; } /* Specific to Uploader */ - #media-upload .media-upload-form p { margin: 0 0 1em 1em; } .filename { float: right; - margin-left:0; + margin-left: 0; margin-right: 10px; } #media-upload .describe th.label { - text-align:right; + text-align: right; } .menu_order { - float:left; + float: left; +} +.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help { + font-family: Tahoma, Arial; +} +#gallery-settings #basic th.label { + padding: 5px 0 5px 5px; +} +#gallery-settings .title, h3.media-title { + font-family: Tahoma, Arial; +} +#gallery-settings .describe th.label { + text-align: right; +} +#gallery-settings label, +#gallery-settings legend { + margin-right: 0; + margin-left: 15px; +} +#gallery-settings .align .field label { + margin: 0 0 0 1.5em; } wp-admin/css/media-rtl.css @@ -29,17 +29,21 @@ form { text-align: right; } -.media-upload-form label, .media-upload-form legend { - display:block; +.media-upload-form label, +.media-upload-form legend { + display: block; font-weight: bold; font-size: 13px; margin-bottom: 0.5em; margin: 0 0 0.5em 0; } -th { position: relative; } +th { + position: relative; +} .media-upload-form label.form-help, td.help { + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; font-style: italic; font-weight: normal; } @@ -63,6 +67,7 @@ th { position: relative; } padding: 0 0 0 28px; margin: 0 1em 0 0; } + .image-align-none-label { background: url(../images/align-none.png) no-repeat center left; } @@ -79,14 +84,21 @@ th { position: relative; } background: url(../images/align-right.png) no-repeat center left; } -#flash-upload-ui, .insert-gallery { - display: none; +tr.image-size td { + width: 460px; +} + +tr.image-size div.image-size-item { + float: left; + width: 25%; + margin: 0; } tr.image-size label { display: inline; - margin: 0 1em 0 0; + margin: 0 0 0 1em; } + .pinkynail { max-width: 40px; max-height: 40px; @@ -95,38 +107,49 @@ tr.image-size label { .filename.original { float: left; } + .crunching { display: block; line-height: 32px; text-align: right; margin-right: 5px; } + button.dismiss { position: absolute; - top: 5px; + top: 7px; right: 5px; z-index: 4; + width: 8em; } + .file-error { - margin: 0 0 5px 50px; + float: left; font-weight: bold; + padding: 10px; } .progress { position: absolute; - top: 0px; - left: 0px; + top: 0; + left: 0; width: 623px; height: 36px; } + .bar { - width: 0px; + width: 0; height: 100%; border-right-width: 3px; border-right-style: solid; } -#library-form .progress, #gallery-form .progress { +#library-form .progress, +#gallery-form .progress, +#flash-upload-ui, +.insert-gallery, +.describe.startopen, +.describe.startclosed { display: none; } @@ -134,6 +157,7 @@ button.dismiss { max-width: 128px; max-height: 128px; } + .media-item .pinkynail { float: left; margin: 2px; @@ -144,7 +168,9 @@ button.dismiss { thead.media-item-info tr { background-color: transparent; } -thead.media-item-info th, thead.media-item-info td { + +thead.media-item-info th, +thead.media-item-info td { border: none; margin: 0; } @@ -153,41 +179,46 @@ thead.media-item-info th, thead.media-item-info td { border: 8px solid #fff; } -.describe.startopen, .describe.startclosed { - display: none; -} abbr.required { text-decoration: none; border: none; } + .describe label { display: inline; } + .describe td { vertical-align: middle; + padding: 0 5px 0 0; } + .describe td.A1 { width: 132px; } -.describe input[type="text"], .describe textarea { + +.describe input[type="text"], +.describe textarea { width: 460px; + border-width: 1px; + border-style: solid; } -.describe-toggle-on, .describe-toggle-off { + +.describe-toggle-on, +.describe-toggle-off { display: block; line-height: 36px; float: right; margin-right: 20px; } + .describe-toggle-off { display: none; } -.clickmask { -} - .hidden { - height: 0px; - width: 0px; + height: 0; + width: 0; overflow: hidden; border: none; } @@ -202,13 +233,17 @@ abbr.required { padding: 1em 0; } -#media-upload p.help { +#media-upload p.help, +#media-upload label.help { + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; font-style: italic; font-weight: normal; } + #media-upload tr.image-size td.field { text-align: center; } + #media-upload #media-items { border-width: 1px; border-style: solid; @@ -235,21 +270,29 @@ abbr.required { overflow: hidden; max-width: 430px; } + #media-upload .describe { - border-top-width: 1px; - border-top-style: solid; padding: 5px; width: 100%; clear: both; cursor: default; } + +#media-upload .slidetoggle { + border-top-width: 1px; + border-top-style: solid; +} + #media-upload .describe th.label { padding-top: .5em; text-align: left; + min-width: 120px; } + #media-upload tr.align td.field { text-align: center; } + #media-upload tr.image-size { margin-bottom: 1em; height: 3em; @@ -264,10 +307,11 @@ abbr.required { } #filter .tablenav select { - border-style:solid; - border-width:1px; - padding:2px; - vertical-align:top; + border-style: solid; + border-width: 1px; + padding: 2px; + vertical-align: top; + width: auto; } #media-upload a.delete, @@ -287,7 +331,7 @@ abbr.required { } .menu_order_input { - border: 1px solid #DDDDDD; + border: 1px solid #ddd; font-size: 10px; padding: 1px; width: 23px; @@ -301,8 +345,8 @@ abbr.required { } #media-upload th.order-head { - width: 25%; - text-align: center; + width: 25%; + text-align: center; } #media-upload .widefat { @@ -313,3 +357,70 @@ abbr.required { .sorthelper { z-index: -1; } + +#gallery-settings th.label { + width: 160px; +} + +#gallery-settings #basic th.label { + padding: 5px 5px 5px 0; +} + +#gallery-settings .title { + clear: both; + padding: 0 0 3px; + border-bottom-style: solid; + border-bottom-width: 1px; + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 1.6em; + border-bottom-color: #DADADA; + color: #5A5A5A; +} + +h3.media-title { + color: #5A5A5A; + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 1.6em; + font-weight: normal; +} + +#gallery-settings .describe td { + vertical-align: middle; + height: 3.5em; +} + +#gallery-settings .describe th.label { + padding-top: .5em; + text-align: left; +} + +#gallery-settings .describe { + padding: 5px; + width: 615px; + clear: both; + cursor: default; +} + +#gallery-settings .describe select { + width: 15em; + border: 1px solid #dfdfdf; +} + +#gallery-settings label, +#gallery-settings legend { + font-size: 13px; + color: #464646; + margin-right: 15px; +} + +#gallery-settings .align .field label { + margin: 0 1.5em 0 0; +} + +#gallery-settings p.ml-submit { + border-top: 1px solid #dfdfdf; +} + +#gallery-settings select#columns { + width: 6em; +} wp-admin/css/media.css @@ -1,98 +1,106 @@ body { - font-family: Tahoma; + font-family: Tahoma, Arial; } -.ui-tabs-nav { - padding-left:0; - padding-right:8px; -} -.ui-tabs-nav li { +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + margin: 0px 0 0 5px; float: right; } -.button { - font-family: Tahoma; - margin-left:0; - margin-right: 5px; +/* Editor/Main Column */ +div#poststuff { + padding-left: 0; + padding-right: 10px; } -#wphead #viewsite { - margin-left:0; - margin-right: 10px; +.posting { + margin-right: 0; + margin-left: 228px; + left:auto; + right: 0; } -#viewsite { - right:auto; - left: 8px; +#side-info-column { + float: left; + right: auto; + left: 0; + margin-right: 0; + margin-left: 10px; } -#wphead #viewsite a { - font-family: Tahoma; +#side-info-column .sleeve { + padding-left: 0; + padding-right: 10px; } -h1 { - right:auto; - left:0; +h3.tb { + margin-left: 0; + margin-right: 5px; } -div#posting { - padding-left:0; - padding-right: 16px; +#actions { + float: left; } -#photo_directions span { - right:auto; - left:3px; +#extra_fields #actions { + right: auto; + left: 4px; } -#img_container a { - float:right; +#actions li { + float: right; + margin-right: 0; + margin-left: 10px; +} +#extra_fields .button { + margin-right: 0; + margin-left: 5px; } -#img_container a, #img_container a:link, #img_container a:visited { - margin:0 0 4px 4px; +/* Photo Styles */ +#img_container a { + float: right; } -div#categories { - right:auto; - left:16px; +#category-add input, #category-add select { + font-family: Tahoma, Arial; } -div#categories h2 { - margin: .5em 1em .5em 0; +#categorydiv ul.categorychecklist ul { + margin-left: 0; + margin-right: 18px; } +/* Tags */ #tagsdiv #newtag { - margin-right:0; - margin-left: 5px; -} -#jaxtag { - padding-left:0; - padding-right: 1em; + margin-right: 0; + margin-left: 5px; } -#tagchecklist { - padding-left:0; - padding-right: 1em; +#tagadd { + margin-left: 0; + margin-right: 3px; } #tagchecklist span { - margin-right: 10px; margin-left: .5em; + margin-right: 10px; float: right; } #tagchecklist span a { - margin: 6px -9px 0pt 0; + margin: 6px -9px 0 0; float: right; } -.submitbox { - float: left; -} -.submitbox .submit input { - text-align:right; +#content { + margin-left: 0; + margin-right: 1%; } -.video_split #extra_fields { - float:right; -} -.video_split .editor_area { - float: left; +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + font-family: tahoma; } .ac_results li { - text-align:right; + text-align: right; } #TB_ajaxContent #options { - right:auto; - left:25px; + right: auto; + left: 25px; } #post_status { - margin-left:0; + margin-left: 0; margin-right: 10px; } +/* Footer */ #footer { padding: 10px 60px 0 0; } wp-admin/css/press-this-rtl.css @@ -1,235 +1,240 @@ body { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 13px "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; color: #333; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } -img { border: 0; } -/* Tabs */ -@media projection , screen { - .ui-tabs-hide { - display: none; - } +img { + border: none; } -@media print { - .ui-tabs-nav { - display: none; - } +/* Header */ +#wphead { + border-top: none; + padding-top: 4px; + background: #444 !important; } -.ui-tabs-nav { - list-style: none; - border-bottom: 1px solid #C6D9E9; - padding-left: 8px; - margin-bottom: .5em; - margin-top: -2em; +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + -moz-border-radius-bottomleft: 0; + -moz-border-radius-bottomright: 0; + -moz-border-radius-topleft: 3px; + -moz-border-radius-topright: 3px; + -khtml-border-radius-bottomleft: 0; + -khtml-border-radius-bottomright: 0; + -khtml-border-radius-topleft: 3px; + -khtml-border-radius-topright: 3px; + -webkit-border-radius-bottomleft: 0; + -webkit-border-radius-bottomright: 0; + -webkit-border-radius-topleft: 3px; + -webkit-border-radius-topright: 3px; + border-radius-bottomleft: 0; + border-radius-bottomright: 0; + border-radius-topleft: 3px; + border-radius-topright: 3px; + border-style: solid; + border-width: 1px; + cursor: pointer; + display: block; + height: 18px; + margin: 0px 5px 0 0; + padding: 0px 5px 0px; + background-color: #E9E9E9; + border-bottom-color: #E9E9E9; + color: #333333; + font-size: 10px; + line-height: 18px; + float: left; } -/* Additional IE specific bug fixes... */ -* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */ - display: inline-block; +.howto { + margin-top: 2px; + margin-bottom: 3px; + font-size: 11px; + font-style: italic; + display: block; } -* :first-child+html .ui-tabs-nav { - /* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */ - display: inline-block; +input.text { + outline-color: -moz-use-text-color; + outline-style: none; + outline-width: medium; + width: 100%; } -.ui-tabs-nav:after { - /* clearing without presentational markup, IE gets extra treatment */ - display: block; - clear: both; - content: " "; +#message { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } -.ui-tabs-nav li { - float: left; - margin: 0; - height: 2em; - line-height: 2em; +/* Editor/Main Column */ +div#poststuff { + padding-left: 10px; + margin-top: 10px; } -.ui-tabs-nav a,.ui-tabs-nav a span { - display: block; +div.zerosize { + border: 0 none; + height: 0; + margin: 0; + overflow: hidden; + padding: 0; + position: absolute; + width: 0; } -.ui-tabs-nav a { - margin: 1px 0 0; - /* position: relative makes opacity fail for disabled tab in IE */ - padding-left: 0; - color: #27537a; - font-weight: bold; - line-height: 2em; - text-align: center; - text-decoration: none; - white-space: nowrap; /* required in IE 6 */ - outline: 0; /* prevent dotted border in Firefox */ - padding: 0 1em; +#poststuff #edButtonPreview.active, +#poststuff #edButtonHTML.active { + display: none; } -.ui-tabs-nav .ui-tabs-selected a { +.posting { + margin-right: 228px; position: relative; - top: 1px; - z-index: 2; - margin-top: 0; - -moz-border-radius-topleft: 4px; - -moz-border-radius-topright: 4px; - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; - border-style: solid; - border-width: 1px; - background: white; - border-bottom-width: 2px; - margin-top: -2px; + left: 0; } -.ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active, -.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited { - cursor: pointer; +#side-info-column { + float: right; + width: 218px; + position: absolute; + right: 0; + margin-right: 10px; } -/* Header */ -#wphead { - border-top: none; - height: 2em; - padding-top: 8px; +#side-info-column .sleeve { + padding-left: 10px; } -.button { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 5px; - font-size: 12px; - line-height: 1.5em; - border-width: 1px; - border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: pointer; - margin-left: 5px; - text-decoration: none; +#poststuff .inside { + font-size: 11px; + margin: 0 12px 12px; } -.howto { - font-size: 11px; - font-style: italic; - display: block; +#poststuff h2, #poststuff h3 { + font-size: 14px; + font-weight: bold; + padding: 7px; + margin: 0 0 10px; + background-image: url(../images/postbox-bg.gif); + background-position: left top; + background-repeat: repeat-x; + font-size: 12px; + font-weight: bold; + line-height: 1; + margin: 0 0 10px; + padding: 7px 9px; + text-shadow: 0 1px 0 #FFFFFF; } -#wphead #viewsite { - position: absolute; - margin-top: 12px; - margin-left: 10px; +h3.tb { + text-shadow: 0 1px 0 #FFFFFF; + font-weight: bold; + font-size: 12px; + margin-left: 5px; } -#viewsite { - position: relative; - right: 8px; - top: 6px; - margin: 0 !important; +#TB_window { + border: 1px solid #333; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } -#wphead #viewsite a { - font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 4px; - display: block; - letter-spacing: normal; +.metabox-holder .postbox, +.postbox, +.stuffbox { + margin-bottom: 10px; border-width: 1px; border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - text-decoration: none; + line-height: 1; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + border-color: #DFDFDF; } -#previewview { - padding-top: 8px !important; - padding-bottom: 8px !important; -} - -h1 { - font-size: .75em; - line-height: 2.666em; - top: .5em; - right: 0; - margin: 0 !important; - padding: 0 !important; - width: 236px; - background: none; +.titlediv { + border-color: #DFDFDF; } -input.text { - border: 0pt none; - outline-color: -moz-use-text-color; - outline-style: none; - outline-width: medium; - padding: 0pt; - width: 100%; +#title, .tbtitle { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-style: solid; - color: #333333; -} - -/* Editor/Main Column */ - -div#container { - margin: 0; - min-width: 500px; + border-width: 1px; + font-size: 1.7em; + outline: none; + padding: 3px 4px; + border-color: #DFDFDF; } -div#container form { - margin: 0px; - padding: 0px; +.tbtitle { + font-size: 12px; + padding: 3px; } -div#posting { - padding-left: 16px; - position: absolute; - z-index: 1; - width: 66%; +#title { + width: 98%; } -#post_title { - width: 99%; +.postbox h2 { + background-image: url(../images/postbox-bg.gif); + background-position: left top; + background-repeat: repeat-x; + background-color: #DFDFDF; } -.titlewrap { +.editor-container { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + border-collapse: separate; border-style: solid; border-width: 1px; - padding: 2px 3px; - border-color: #CCCCCC; + border-color: #DFDFDF; } -div#posting h2 { - margin: .5em 0 .25em 0; - font-size: 12px; - padding: 3px; - background: ; +.postdivrich { + position: relative; + padding-top: 25px; } -.editor-container { - border-width: 1px; - border-color: #ccc; - border-style: solid; - margin-bottom: 1em; +#actions { + clear: both; + float: right; + margin-top: -19px; + position: relative; +} +#extra_fields #actions { + clear: both; + position: absolute; + right: 4px; + top: 6px; + margin: 0; } -/* Photo Styles */ - -#photo_directions { - margin-top: .25em; - display: block; - position: relative; +#actions li { + float: left; + list-style: none; + margin-right: 10px; +} +#extra_fields .button { + margin-right: 5px; } -#photo_directions span { - display: block; - position: absolute; - top: 0; - right: 3px; +/* Photo Styles */ +.photolist { + margin-top: -10px; } #photo_saving { @@ -239,77 +244,162 @@ div#posting h2 { #img_container { background-color: #fff; + height: 101px; + width: 100%; +} + +#extra_fields { + margin-top: 10px; + position: relative; +} + +#extra_fields .postbox { + margin-bottom: 5px; +} + +#extra_fields .titlewrap { + padding: 0; overflow: auto; height: 100px; } +#img_container { + position: relative; +} + #img_container a { display: block; - width: 79px; - height: 79px; float: left; + overflow: hidden; + vertical-align: center; +} + +#img_container img, #img_container a { + width: 68px; + height: 68px; } #img_container img { - width: 75px; - height: 75px; - border: 0px; - padding: 2px; + width: 68px; + height: 68px; + border: none; background-color: #f4f4f4; cursor: pointer; } -#img_container a, #img_container a:link, #img_container a:visited { - border: 2px solid #ccc; - margin: 0 4px 4px 0; -} -#img_container a:hover, #img_container a:active { - border: 2px solid #000; + +#img_container a, +#img_container a:link, +#img_container a:visited { + border: 1px solid #ccc; + display: block; + position: relative; +} + +#img_container a:hover, +#img_container a:active { + border-color: #000; + z-index: 1000; + border-width: 2px; + margin: -1px; +} + +/* Video */ +#embed-code { + width: 100%; + height: 98px; } /* Submit Column */ +#viewsite { + padding: 0; + margin: 0 0 20px 0; + font-size: 10px; + clear: both; +} -div#categories { - font-size: 85%; - position: absolute; - top: 50px; - right: 16px; - width: 27%; - z-index: 2; +#viewsite .button { + margin: 0 0 0px 0; + display: block; } -div#categories h2 { - color: #333; +.wp-hidden-children .wp-hidden-child { + display: none; +} + +#category-adder { + padding: 4px 0; +} + +#category-adder h4 { + margin: 0 0 8px; +} + +#category-add input { + width: 94%; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 13px; + margin: 1px; + padding: 3px; +} + +#category-add select { + width: 70%; + -x-system-font: none; + border-style: solid; + border-width: 1px; + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; font-size: 12px; - margin: .5em 0 .5em 1em; - padding: 0; + height: 2em; + line-height: 20px; + padding: 2px; + margin: 1px; + vertical-align: top; } -#categories-all { - overflow: auto; - padding: 0 1em 1em 1em; - height: 15em; +#category-add input#category-add-sumbit { + width: auto; } -#categories ul { +/* Categories */ +#categorydiv ul, #linkcategorydiv ul { list-style: none; padding: 0; margin: 0; } +#categorydiv ul.categorychecklist ul { + margin-left: 18px; +} + +#categorydiv div.ui-tabs-panel { + height: 150px; + overflow: auto; +} + +ul.categorychecklist li { + margin: 0; + padding: 0; + line-height: 19px; +} + +/* Tags */ #tagsdiv #newtag { padding: 3px; margin-right: 5px; - width: 16em; + width: 16em; } #jaxtag { clear: both; - padding-left: 1em; margin: 0; } +#tagadd { + margin-left: 3px; +} + #tagchecklist { - padding-left: 1em; + margin-top: 3px; margin-bottom: 1em; font-size: 12px; overflow: auto; @@ -332,7 +422,7 @@ div#categories h2 { } #tagchecklist span a { - margin: 6px 0pt 0pt -9px; + margin: 6px 0 0 -9px; cursor: pointer; width: 10px; height: 10px; @@ -342,68 +432,44 @@ div#categories h2 { overflow: hidden; position: absolute; } -.submit { - -moz-border-radius-bottomleft: 3px; - -khtml-border-bottom-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -moz-border-radius-bottomright: 3px; - -khtml-border-bottom-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - margin: 0; - padding: 10px; -} -.submitbox { - width: 100%; - float: right; -} -.submitbox .submit a:hover { - border-bottom-width: 1px; - border-bottom-style: solid; +#content { + width: 96% !important; + margin-left: 1%; + margin-bottom: 10px; + border: 1px solid #f1f1f1; } -.submitbox .submit input { - border: none; - text-align: left; - padding: 6px 4px; - font-size: 12px; - margin: 2px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: pointer; -} +/* Submit */ -.submitbox #previewview { - padding: 15px 10px; - -moz-border-radius-topleft: 3px; - -khtml-border-top-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-topright: 3px; - -khtml-border-top-right-radius: 3px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; +#saving { + display: inline; } -/* Video Styles */ -.video_split #extra_fields { - width: 27%; - height: 300px; - float: left; +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; + text-decoration: none; + font-size: 11px !important; + line-height: 16px; + padding: 2px 8px; + cursor: pointer; + border-width: 1px; + border-style: solid; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; } -#embed_code { - border: 0; - width: 99%; - height: 200px; -} -.video_split .editor_area { - width: 70%; - float: right; +.button-primary { + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; + border-color: #21759B; + color: #FFFFFF; } .ac_results { @@ -431,45 +497,32 @@ div#categories h2 { text-decoration: underline; } -.photolist { - display: none; -} - -#extra_fields small { - display: block; - margin-top: .5em; - padding-bottom: .25em; -} - #TB_ajaxContent #options { position: absolute; top: 20px; right: 25px; padding: 5px; } + #TB_ajaxContent h3 { margin-bottom: .25em; } .updated { - margin: 0; - margin-left: 15px; - margin-right: 15px; + margin: 10px 0; padding: 0; - max-width: 980px; border-width: 1px; border-style: solid; - padding: 0 0.6em; - max-width: 950px; - margin-top: 1em; - margin-bottom: 1em; + width: 99%; } -.updated p, .error p { +.updated p, +.error p { margin: 0.6em 0; + padding: 0 0.6em; } -.updated a, .error a { +.error a { text-decoration: underline; } @@ -485,7 +538,6 @@ div#categories h2 { } /* Footer */ - #footer { height: 65px; display: block; @@ -505,12 +557,10 @@ div#categories h2 { #footer p a { text-decoration: none; } - #footer p a:hover { text-decoration: underline; } - /* Utility Classes */ .centered { text-align: center; @@ -518,4 +568,4 @@ div#categories h2 { .hidden { display: none; -} \ No newline at end of file +} wp-admin/css/press-this.css @@ -1,15 +1,12 @@ -#template textarea { - font-family:monospace; -} #templateside { - float:left; + float: left; } #themeselector { - padding-right:0; + padding-right: 0; padding-left: 5px; float: left; } div.tablenav { - margin-right:0; + margin-right: 0; margin-left: 210px; } wp-admin/css/theme-editor-rtl.css @@ -1,5 +1,5 @@ #template textarea { - font-family: 'Courier New', Courier, monospace; + font-family: Consolas, Monaco, Courier, monospace; font-size: 12px; width: 97%; } @@ -11,7 +11,6 @@ #templateside { float: right; width: 190px; - margin-top:-3.4em; } #templateside h3, #postcustomstuff p.submit { @@ -23,7 +22,7 @@ h3#bordertitle { } #templateside h4 { - margin-bottom: 0px; + margin-bottom: 0; } #templateside ol, #templateside ul { @@ -33,7 +32,7 @@ h3#bordertitle { } #templateside ol li, #templateside ul li { - margin: 1px 0px; + margin: 1px 0; } #themeselector { @@ -41,6 +40,7 @@ h3#bordertitle { float: right; position: relative; bottom: 25px; + top:20px; } #themeselector select { @@ -58,7 +58,7 @@ h3#bordertitle { div.bordertitle h2 { border: none; - padding-bottom: 0px; + padding-bottom: 0; } div.tablenav { wp-admin/css/theme-editor.css @@ -1,45 +1,27 @@ -/* 2 column liquid layout */ -div.widget-liquid-left-holder { - float: right; - clear: right; - margin-right:0; - margin-left: -310px; -} -div.widget-liquid-left { - margin-right:0; - margin-left: 320px; -} -div.widget-liquid-right { - float: left; - clear: left; -} -p#widget-search { - right:auto; - left:0; -} h4.widget-title span { float: right; } h4.widget-title a { float: left; - margin-left:0; + margin-left: 0; margin-right: 1em; } ul#widget-list li.widget-list-item h4.widget-title { - float:right; + float: right; } ul#widget-list li.widget-list-item div.widget-description { margin: 0 200px 0 0; padding: 0 4em 0 0; } -.widget-control-save, .widget-control-remove { - margin-right:0; +.widget-control-save, +.widget-control-remove { + margin-right: 0; margin-left: 8px; float: right; } li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited { - right:auto; + right: auto; left: 1em; } wp-admin/css/widgets-rtl.css @@ -27,13 +27,6 @@ div#available-widgets-filter { border-bottom-style: solid; } -p#widget-search { - position: absolute; - right: 0; - top: 0; - margin: 0; -} - ul#widget-list { list-style: none; margin: 0; @@ -112,8 +105,8 @@ li.widget-list-control-item { border-radius: 3px; } -li.widget-list-control-item h4, -#dragHelper li.widget-list-control-item h4, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4, li.widget-sortable h4 { margin: 0; cursor: move; @@ -126,12 +119,8 @@ li.widget-sortable h4 { border-radius: 3px; } -.widget-control-save, .widget-control-remove { - padding: 3px 5px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; +.widget-control-save, +.widget-control-remove { margin-right: 8px; float: left; text-decoration: none; @@ -149,6 +138,8 @@ li.widget-list-control-item h4.widget-title a:hover { } li.widget-list-control-item div.widget-control { + border-width: 0 1px 1px; + border-style: none solid solid; display: none; padding: 15px; font-size: 11px; @@ -161,8 +152,6 @@ li.widget-list-control-item div.widget-control p { } ul.widget-control-list div.widget-control-actions { - border-top-width: 1px; - border-top-style: solid; padding: 0.5em 0 0; } @@ -173,7 +162,7 @@ ul.widget-control-list div.widget-control-actions { div#current-widgets { padding-top: 1em; - border-width: 1px; + border-width: 1px 0 0; border-style: solid none none; } wp-admin/css/widgets.css @@ -1,36 +1,105 @@ <?php - +/** + * The custom header image script. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * The custom header image class. + * + * @since unknown + * @package WordPress + * @subpackage Administration + */ class Custom_Image_Header { + + /** + * Callback for administration header. + * + * @var callback + * @since unknown + * @access private + */ var $admin_header_callback; + /** + * PHP4 Constructor - Register administration header callback. + * + * @since unknown + * @param callback $admin_header_callback + * @return Custom_Image_Header + */ function Custom_Image_Header($admin_header_callback) { $this->admin_header_callback = $admin_header_callback; } + /** + * Setup the hooks for the Custom Header admin page. + * + * @since unknown + */ function init() { $page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page')); add_action("admin_print_scripts-$page", array(&$this, 'js_includes')); + add_action("admin_print_styles-$page", array(&$this, 'css_includes')); add_action("admin_head-$page", array(&$this, 'take_action'), 50); add_action("admin_head-$page", array(&$this, 'js'), 50); add_action("admin_head-$page", $this->admin_header_callback, 51); } + /** + * Get the current step. + * + * @since unknown + * + * @return int Current step + */ function step() { - $step = (int) @$_GET['step']; + if ( ! isset( $_GET['step'] ) ) + return 1; + + $step = (int) $_GET['step']; if ( $step < 1 || 3 < $step ) $step = 1; + return $step; } + /** + * Setup the enqueue for the JavaScript files. + * + * @since unknown + */ function js_includes() { $step = $this->step(); + if ( 1 == $step ) - wp_enqueue_script('colorpicker'); - elseif ( 2 == $step ) + wp_enqueue_script('farbtastic'); + elseif ( 2 == $step ) wp_enqueue_script('cropper'); } + /** + * Setup the enqueue for the CSS files + * + * @since 2.7 + */ + function css_includes() { + $step = $this->step(); + + if ( 1 == $step ) { + wp_enqueue_style('farbtastic'); + } + } + + /** + * Execute custom header modification. + * + * @since unknown + */ function take_action() { if ( isset( $_POST['textcolor'] ) ) { check_admin_referer('custom-header'); @@ -48,6 +117,11 @@ class Custom_Image_Header { } } + /** + * Execute Javascript depending on step. + * + * @since unknown + */ function js() { $step = $this->step(); if ( 1 == $step ) @@ -56,123 +130,134 @@ class Custom_Image_Header { $this->js_2(); } + /** + * Display Javascript based on Step 1. + * + * @since unknown + */ function js_1() { ?> <script type="text/javascript"> - var cp = new ColorPicker(); + var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor']; + var farbtastic; function pickColor(color) { - $('name').style.color = color; - $('desc').style.color = color; - $('textcolor').value = color; - } - function PopupWindow_hidePopup(magicword) { - if ( magicword != 'prettyplease' ) - return false; - if (this.divName != null) { - if (this.use_gebi) { - document.getElementById(this.divName).style.visibility = "hidden"; - } - else if (this.use_css) { - document.all[this.divName].style.visibility = "hidden"; - } - else if (this.use_layers) { - document.layers[this.divName].visibility = "hidden"; - } - } - else { - if (this.popupWindow && !this.popupWindow.closed) { - this.popupWindow.close(); - this.popupWindow = null; - } - } - return false; - } - function colorSelect(t,p) { - if ( cp.p == p && document.getElementById(cp.divName).style.visibility != "hidden" ) { - cp.hidePopup('prettyplease'); - } else { - cp.p = p; - cp.select(t,p); - } + jQuery('#name').css('color', color); + jQuery('#desc').css('color', color); + jQuery('#textcolor').val(color); + farbtastic.setColor(color); } + + jQuery(document).ready(function() { + jQuery('#pickcolor').click(function() { + jQuery('#colorPickerDiv').show(); + }); + + jQuery('#hidetext').click(function() { + toggle_text(); + }); + + farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); }); + pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>'); + + <?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?> + toggle_text(); + <?php } ?> + }); + + jQuery(document).mousedown(function(){ + // Make the picker disappear, since we're using it in an independant div + hide_picker(); + }); + function colorDefault() { pickColor('#<?php echo HEADER_TEXTCOLOR; ?>'); } - function hide_text() { - $('name').style.display = 'none'; - $('desc').style.display = 'none'; - $('pickcolor').style.display = 'none'; - $('defaultcolor').style.display = 'none'; - $('textcolor').value = 'blank'; - $('hidetext').value = '<?php _e('Show Text'); ?>'; -// $('hidetext').onclick = 'show_text()'; - Event.observe( $('hidetext'), 'click', show_text ); + function hide_picker(what) { + var update = false; + jQuery('#colorPickerDiv').each(function(){ + var id = jQuery(this).attr('id'); + if (id == what) { + return; + } + var display = jQuery(this).css('display'); + if (display == 'block') { + jQuery(this).fadeOut(2); + } + }); } - function show_text() { - $('name').style.display = 'block'; - $('desc').style.display = 'block'; - $('pickcolor').style.display = 'inline'; - $('defaultcolor').style.display = 'inline'; - $('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>'; - $('hidetext').value = '<?php _e('Hide Text'); ?>'; - Event.stopObserving( $('hidetext'), 'click', show_text ); - Event.observe( $('hidetext'), 'click', hide_text ); + function toggle_text(force) { + if(jQuery('#textcolor').val() == 'blank') { + //Show text + jQuery( buttons.toString() ).show(); + jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>'); + jQuery('#hidetext').val('<?php _e('Hide Text'); ?>'); + } + else { + //Hide text + jQuery( buttons.toString() ).hide(); + jQuery('#textcolor').val('blank'); + jQuery('#hidetext').val('<?php _e('Show Text'); ?>'); + } } - <?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?> -Event.observe( window, 'load', hide_text ); - <?php } ?> + </script> <?php } + /** + * Display Javascript based on Step 2. + * + * @since unknown + */ function js_2() { ?> <script type="text/javascript"> function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + jQuery( '#x1' ).val(coords.x1); + jQuery( '#y1' ).val(coords.y1); + jQuery( '#x2' ).val(coords.x2); + jQuery( '#y2' ).val(coords.y2); + jQuery( '#width' ).val(dimensions.width); + jQuery( '#height' ).val(dimensions.height); } // with a supplied ratio - Event.observe( - window, - 'load', - function() { - var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>; - var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>; - var ratio = xinit / yinit; - var ximg = $('upload').width; - var yimg = $('upload').height; - if ( yimg < yinit || ximg < xinit ) { - if ( ximg / yimg > ratio ) { - yinit = yimg; - xinit = yinit * ratio; - } else { - xinit = ximg; - yinit = xinit / ratio; - } + jQuery(document).ready(function() { + var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>; + var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>; + var ratio = xinit / yinit; + var ximg = jQuery('#upload').width(); + var yimg = jQuery('#upload').height(); + if ( yimg < yinit || ximg < xinit ) { + if ( ximg / yimg > ratio ) { + yinit = yimg; + xinit = yinit * ratio; + } else { + xinit = ximg; + yinit = xinit / ratio; } - new Cropper.Img( - 'upload', - { - ratioDim: { x: xinit, y: yinit }, - displayOnInit: true, - onEndCrop: onEndCrop - } - ) } - ); + new Cropper.Img( + 'upload', + { + ratioDim: { x: xinit, y: yinit }, + displayOnInit: true, + onEndCrop: onEndCrop + } + ) + }); </script> <?php } + /** + * Display first step of custom header image page. + * + * @since unknown + */ function step_1() { if ( $_GET['updated'] ) { ?> <div id="message" class="updated fade"> @@ -181,6 +266,7 @@ Event.observe( window, 'load', hide_text ); <?php } ?> <div class="wrap"> +<?php screen_icon(); ?> <h2><?php _e('Your Header Image'); ?></h2> <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p> @@ -191,12 +277,12 @@ Event.observe( window, 'load', hide_text ); <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?> <form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>"> <input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" /> -<input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" /> +<input type="button" value="<?php _e('Select a Text Color'); ?>" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" /> <?php wp_nonce_field('custom-header') ?> <input type="hidden" name="textcolor" id="textcolor" value="#<?php attribute_escape(header_textcolor()) ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?>" /></form> <?php } ?> -<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div> +<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div> </div> <div class="wrap"> <h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?></p> @@ -226,6 +312,11 @@ Event.observe( window, 'load', hide_text ); } + /** + * Display second step of custom header image page. + * + * @since unknown + */ function step_2() { check_admin_referer('custom-header'); $overrides = array('test_form' => false); @@ -298,6 +389,11 @@ Event.observe( window, 'load', hide_text ); <?php } + /** + * Display third step of custom header image page. + * + * @since unknown + */ function step_3() { check_admin_referer('custom-header'); if ( $_POST['oitar'] > 1 ) { @@ -339,6 +435,11 @@ Event.observe( window, 'load', hide_text ); return $this->finished(); } + /** + * Display last step of custom header image page. + * + * @since unknown + */ function finished() { ?> <div class="wrap"> @@ -350,6 +451,11 @@ Event.observe( window, 'load', hide_text ); <?php } + /** + * Display the page based on the current step. + * + * @since unknown + */ function admin_page() { $step = $this->step(); if ( 1 == $step ) wp-admin/custom-header.php @@ -1,69 +1,127 @@ -<?php if ( ! defined('ABSPATH') ) die(); ?> -<table class="widefat"> - <thead> - <tr> +<?php +/** + * Edit attachments table for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ -<?php $posts_columns = wp_manage_media_columns(); ?> -<?php foreach($posts_columns as $post_column_key => $column_display_name) { - if ( 'cb' === $post_column_key ) - $class = ' class="check-column"'; - elseif ( 'comments' === $post_column_key ) - $class = ' class="num"'; - else - $class = ''; -?> - <th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th> -<?php } ?> +if ( ! defined('ABSPATH') ) die(); +if ( have_posts() ) { ?> +<table class="widefat fixed" cellspacing="0"> + <thead> + <tr> +<?php print_column_headers('upload'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('upload', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:post"> <?php -if ( have_posts() ) { -$bgcolor = ''; add_filter('the_title','wp_specialchars'); +$alt = ''; +$posts_columns = get_column_headers('upload'); +$hidden = get_hidden_columns('upload'); while (have_posts()) : the_post(); -$class = 'alternate' == $class ? '' : 'alternate'; +$alt = ( 'alternate' == $alt ) ? '' : 'alternate'; global $current_user; $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); -$att_title = get_the_title(); -if ( empty($att_title) ) - $att_title = __('(no title)'); +$att_title = _draft_or_post_title(); ?> - <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top"> + <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top"> <?php +foreach ($posts_columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; -foreach($posts_columns as $column_name=>$column_display_name) { + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; switch($column_name) { case 'cb': ?> - <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /></th> + <th scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /></th> <?php break; case 'icon': + $attributes = 'class="column-icon media-icon"' . $style; ?> - <td class="media-icon"><?php echo wp_get_attachment_link($post->ID, array(80, 60), false, true); ?></td> + <td <?php echo $attributes ?>><?php + if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) { +?> + + <a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"> + <?php echo $thumb; ?> + </a> + +<?php } + ?></td> <?php // TODO break; case 'media': ?> - <td><strong><a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br /> + <td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br /> <?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?> - <?php do_action('manage_media_media_column', $post->ID); ?> - </td> + <p> + <?php + $actions = array(); + if ( current_user_can('edit_post', $post->ID) ) + $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>'; + if ( current_user_can('delete_post', $post->ID) ) + $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>'; + $action_count = count($actions); + $i = 0; + echo '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + echo "<span class='$action'>$link$sep</span>"; + } + echo '</div>'; + ?></p></td> + <?php + break; + + case 'author': + ?> + <td <?php echo $attributes ?>><?php the_author() ?></td> + <?php + break; + + case 'tags': + ?> + <td <?php echo $attributes ?>><?php + $tags = get_the_tags(); + if ( !empty( $tags ) ) { + $out = array(); + foreach ( $tags as $c ) + $out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>"; + echo join( ', ', $out ); + } else { + _e('No Tags'); + } + ?></td> <?php break; case 'desc': ?> - <td><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td> + <td <?php echo $attributes ?>><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td> <?php break; @@ -73,7 +131,7 @@ foreach($posts_columns as $column_name=>$column_display_name) { } else { $t_time = get_the_time(__('Y/m/d g:i:s A')); $m_time = $post->post_date; - $time = get_post_time( 'G', true ); + $time = get_post_time( 'G', true, $post ); if ( ( abs($t_diff = time() - $time) ) < 86400 ) { if ( $t_diff < 0 ) $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); @@ -84,38 +142,36 @@ foreach($posts_columns as $column_name=>$column_display_name) { } } ?> - <td><?php echo $h_time ?></td> + <td <?php echo $attributes ?>><?php echo $h_time ?></td> <?php break; case 'parent': - $title = __('(no title)'); // override below if ( $post->post_parent > 0 ) { if ( get_post($post->post_parent) ) { - $parent_title = get_the_title($post->post_parent); - if ( !empty($parent_title) ) - $title = $parent_title; + $title =_draft_or_post_title($post->post_parent); } ?> - <td><strong><a href="post.php?action=edit&amp;post=<?php echo $post->post_parent; ?>"><?php echo $title ?></a></strong></td> + <td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong>, <?php echo get_the_time(__('Y/m/d')); ?></td> <?php } else { ?> - <td>&nbsp;</td> + <td <?php echo $attributes ?>>&nbsp;</td> <?php } break; case 'comments': + $attributes = 'class="comments column-comments num"' . $style; ?> - <td class="num"><div class="post-com-count-wrapper"> + <td <?php echo $attributes ?>><div class="post-com-count-wrapper"> <?php $left = get_pending_comments_num( $post->ID ); $pending_phrase = sprintf( __('%s pending'), number_format( $left ) ); if ( $left ) echo '<strong>'; - comments_number("<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); + comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); if ( $left ) echo '</strong>'; ?> @@ -123,30 +179,32 @@ foreach($posts_columns as $column_name=>$column_display_name) { <?php break; - case 'location': + case 'actions': ?> - <td><a href="<?php the_permalink(); ?>"><?php _e('Permalink'); ?></a></td> + <td <?php echo $attributes ?>> + <a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php _e('Edit'); ?></a> | + <a href="<?php the_permalink(); ?>"><?php _e('Get permalink'); ?></a> + </td> <?php break; default: ?> - <td><?php do_action('manage_media_custom_column', $column_name, $id); ?></td> + <td <?php echo $attributes ?>><?php do_action('manage_media_custom_column', $column_name, $id); ?></td> <?php break; } } ?> </tr> -<?php -endwhile; -} else { -?> - <tr style='background-color: <?php echo $bgcolor; ?>'> - <td colspan="8"><?php _e('No posts found.') ?></td> - </tr> +<?php endwhile; ?> + </tbody> +</table> +<?php } else { ?> + +<p><?php _e('No posts found.') ?></p> + <?php } // end if ( have_posts() ) ?> - </tbody> -</table> + wp-admin/edit-attachment-rows.php @@ -1,28 +1,51 @@ <?php -if ( ! empty($cat_ID) ) { - $heading = __('Edit Category'); - $submit_text = __('Edit Category'); - $form = '<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">'; - $action = 'editedcat'; - $nonce_action = 'update-category_' . $cat_ID; - do_action('edit_category_form_pre', $category); -} else { - $heading = __('Add Category'); - $submit_text = __('Add Category'); - $form = '<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">'; - $action = 'addcat'; - $nonce_action = 'add-category'; - do_action('add_category_form_pre', $category); +/** + * Edit category form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * @var object + */ +if ( ! isset( $category ) ) + $category = (object) array(); + +/** + * @ignore + * @since 2.7 + * @internal Used to prevent errors in page when no category is being edited. + * + * @param object $category + */ +function _fill_empty_category(&$category) { + if ( ! isset( $category->name ) ) + $category->name = ''; + + if ( ! isset( $category->slug ) ) + $category->slug = ''; + + if ( ! isset( $category->parent ) ) + $category->parent = ''; + + if ( ! isset( $category->description ) ) + $category->description = ''; } + +do_action('edit_category_form_pre', $category); + +_fill_empty_category($category); ?> <div class="wrap"> -<h2><?php echo $heading ?></h2> +<?php screen_icon(); ?> +<h2><?php _e('Edit Category'); ?></h2> <div id="ajax-response"></div> -<?php echo $form ?> -<input type="hidden" name="action" value="<?php echo $action ?>" /> +<form name="editcat" id="editcat" method="post" action="categories.php" class="validate"> +<input type="hidden" name="action" value="editedcat" /> <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" /> -<?php wp_nonce_field($nonce_action); ?> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-category_' . $cat_ID); ?> <table class="form-table"> <tr class="form-field form-required"> <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th> @@ -47,7 +70,7 @@ if ( ! empty($cat_ID) ) { <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td> </tr> </table> -<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p> +<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Category'); ?>" /></p> <?php do_action('edit_category_form', $category); ?> </form> </div> wp-admin/edit-category-form.php @@ -1,35 +1,64 @@ <?php +/** + * Edit Comments Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -$title = __('Edit Comments'); -$parent_file = 'edit-comments.php'; -wp_enqueue_script( 'admin-comments' ); -wp_enqueue_script('admin-forms'); +wp_enqueue_script('admin-comments'); +enqueue_comment_hotkeys_js(); -if ( !empty( $_REQUEST['delete_comments'] ) ) { +$post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0; + +if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) { + check_admin_referer('bulk-spam-delete', '_spam_nonce'); + + $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] ); + $deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" ); + + $redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam; + if ( $post_id ) + $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to ); + wp_redirect( $redirect_to ); +} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) { check_admin_referer('bulk-comments'); + $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2']; + + $deleted = $approved = $unapproved = $spammed = 0; + foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each + $comment_id = (int) $comment_id; + $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) ); - $comments_deleted = $comments_approved = $comments_unapproved = $comments_spammed = 0; - foreach ($_REQUEST['delete_comments'] as $comment) : // Check the permissions on each - $comment = (int) $comment; - $post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment) ); - if ( !current_user_can('edit_post', $post_id) ) + if ( !current_user_can('edit_post', $_post_id) ) continue; - if ( !empty( $_REQUEST['spamit'] ) ) { - wp_set_comment_status($comment, 'spam'); - $comments_spammed++; - } elseif ( !empty( $_REQUEST['deleteit'] ) ) { - wp_set_comment_status($comment, 'delete'); - $comments_deleted++; - } elseif ( !empty( $_REQUEST['approveit'] ) ) { - wp_set_comment_status($comment, 'approve'); - $comments_approved++; - } elseif ( !empty( $_REQUEST['unapproveit'] ) ) { - wp_set_comment_status($comment, 'hold'); - $comments_unapproved++; + + switch( $doaction ) { + case 'markspam' : + wp_set_comment_status($comment_id, 'spam'); + $spammed++; + break; + case 'delete' : + wp_set_comment_status($comment_id, 'delete'); + $deleted++; + break; + case 'approve' : + wp_set_comment_status($comment_id, 'approve'); + $approved++; + break; + case 'unapprove' : + wp_set_comment_status($comment_id, 'hold'); + $unapproved++; + break; } endforeach; - $redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved; + + $redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved; + if ( $post_id ) + $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to ); if ( isset($_REQUEST['apage']) ) $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to ); if ( !empty($_REQUEST['mode']) ) @@ -39,29 +68,34 @@ if ( !empty( $_REQUEST['delete_comments'] ) ) { if ( !empty($_REQUEST['s']) ) $redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to); wp_redirect( $redirect_to ); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } +if ( $post_id ) + $title = sprintf(__('Edit Comments on &#8220;%s&#8221;'), wp_html_excerpt(_draft_or_post_title($post_id), 50)); +else + $title = __('Edit Comments'); + require_once('admin-header.php'); -if ( empty($_GET['mode']) ) - $mode = 'detail'; -else - $mode = attribute_escape($_GET['mode']); +$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribute_escape($_GET['mode']); -if ( isset($_GET['comment_status']) ) - $comment_status = attribute_escape($_GET['comment_status']); -else - $comment_status = ''; +$comment_status = !empty($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : ''; + +$comment_type = !empty($_GET['comment_type']) ? attribute_escape($_GET['comment_type']) : ''; + +$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : ''; +$search = attribute_escape( $search_dirty ); ?> + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( wp_specialchars( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?> +</h2> -if ( isset($_GET['s']) ) - $search_dirty = $_GET['s']; -else - $search_dirty = ''; -$search = attribute_escape( $search_dirty ); -?> <?php if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) { $approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0; @@ -90,50 +124,61 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp } } ?> -<div class="wrap"> -<form id="posts-filter" action="" method="get"> -<h2><?php _e('Manage Comments'); ?></h2> +<form id="comments-form" action="" method="get"> <ul class="subsubsub"> <?php $status_links = array(); -$num_comments = wp_count_comments(); -$stati = array('moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"), 'approved' => _c('Approved|plural')); +$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments(); +//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"), +//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>") +$stati = array( + 'all' => __ngettext_noop('All', 'All'), // singular not used + 'moderated' => __ngettext_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'), + 'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used + 'spam' => __ngettext_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)') + ); $class = ( '' === $comment_status ) ? ' class="current"' : ''; -$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>"; +// $status_links[] = "<li><a href='edit-comments.php'$class>" . __( 'All' ) . '</a>'; +$link = 'edit-comments.php'; +if ( !empty($comment_type) && 'all' != $comment_type ) + $link = add_query_arg( 'comment_type', $comment_type, $link ); foreach ( $stati as $status => $label ) { $class = ''; - if ( $status == $comment_status ) + if ( str_replace( 'all', '', $status ) == $comment_status ) $class = ' class="current"'; - - $status_links[] = "<li><a href=\"edit-comments.php?comment_status=$status\"$class>" . $label . '</a>'; + if ( !isset( $num_comments->$status ) ) + $num_comments->$status = 10; + if ( 'all' != $status ) + $link = add_query_arg( 'comment_status', $status, $link ); + if ( $post_id ) + $link = add_query_arg( 'p', absint( $post_id ), $link ); + /* + // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark + if ( !empty( $_GET['s'] ) ) + $link = add_query_arg( 's', attribute_escape( stripslashes( $_GET['s'] ) ), $link ); + */ + $status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf( + __ngettext( $label[0], $label[1], $num_comments->$status ), + number_format_i18n( $num_comments->$status ) + ) . '</a>'; } $status_links = apply_filters( 'comment_status_links', $status_links ); -echo implode(' | </li>', $status_links) . '</li>'; +echo implode( " |</li>\n", $status_links) . '</li>'; unset($status_links); ?> </ul> -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" /> +<p class="search-box"> + <label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label> + <input type="text" class="search-input" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" /> </p> -<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> -<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" /> -</form> - -<ul class="view-switch"> - <li <?php if ( 'detail' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'detail', $_SERVER['REQUEST_URI'])) ?>"><?php _e('Detail View') ?></a></li> - <li <?php if ( 'list' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><?php _e('List View') ?></a></li> -</ul> - <?php - $comments_per_page = apply_filters('comments_per_page', 20, $comment_status); if ( isset( $_GET['apage'] ) ) @@ -143,7 +188,17 @@ else $start = $offset = ( $page - 1 ) * $comments_per_page; -list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5 ); // Grab a few extra +list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5, $post_id, $comment_type ); // Grab a few extra + +$_comment_post_ids = array(); +foreach ( $_comments as $_c ) { + $_comment_post_ids[] = $_c->comment_post_ID; +} +$_comment_pending_count_temp = (array) get_pending_comments_num($_comment_post_ids); +foreach ( (array) $_comment_post_ids as $_cpid ) + $_comment_pending_count[$_cpid] = isset( $_comment_pending_count_temp[$_cpid] ) ? $_comment_pending_count_temp[$_cpid] : 0; +if ( empty($_comment_pending_count) ) + $_comment_pending_count = array(); $comments = array_slice($_comments, 0, $comments_per_page); $extra_comments = array_slice($_comments, $comments_per_page); @@ -151,54 +206,98 @@ $extra_comments = array_slice($_comments, $comments_per_page); $page_links = paginate_links( array( 'base' => add_query_arg( 'apage', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => ceil($total / $comments_per_page), 'current' => $page )); ?> -<form id="comments-form" action="" method="post"> +<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> +<?php if ( $post_id ) : ?> +<input type="hidden" name="p" value="<?php echo intval( $post_id ); ?>" /> +<?php endif; ?> +<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" /> +<input type="hidden" name="pagegen_timestamp" value="<?php echo current_time('mysql', 1); ?>" /> <div class="tablenav"> -<?php -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> +<?php if ( $page_links ) : ?> +<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s', + number_format_i18n( $start + 1 ), + number_format_i18n( min( $page * $comments_per_page, $total ) ), + number_format_i18n( $total ), + $page_links +); echo $page_links_text; ?></div> +<?php endif; ?> -<div class="alignleft"> -<?php if ( 'approved' != $comment_status ): ?> -<input type="submit" value="<?php _e('Approve'); ?>" name="approveit" class="button-secondary" /> +<div class="alignleft actions"> +<select name="action"> +<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option> +<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?> +<option value="unapprove"><?php _e('Unapprove'); ?></option> <?php endif; ?> -<input type="submit" value="<?php _e('Mark as Spam'); ?>" name="spamit" class="button-secondary" /> -<?php if ( 'moderated' != $comment_status ): ?> -<input type="submit" value="<?php _e('Unapprove'); ?>" name="unapproveit" class="button-secondary" /> +<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?> +<option value="approve"><?php _e('Approve'); ?></option> <?php endif; ?> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> -<?php do_action('manage_comments_nav', $comment_status); ?> +<?php if ( 'spam' != $comment_status ): ?> +<option value="markspam"><?php _e('Mark as Spam'); ?></option> +<?php endif; ?> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" name="doaction" id="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" /> <?php wp_nonce_field('bulk-comments'); ?> + +<?php if ( $comment_status ) echo "<input type='hidden' name='comment_status' value='$comment_status' />\n"; ?> +<select name="comment_type"> + <option value="all"><?php _e('Show all comment types'); ?></option> +<?php + $comment_types = apply_filters( 'admin_comment_types_dropdown', array( + 'comment' => __('Comments'), + 'pings' => __('Pings'), + ) ); + + foreach ( $comment_types as $type => $label ) { + echo " <option value='$type'"; + selected( $comment_type, $type ); + echo ">$label</option>\n"; + } +?> +</select> +<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" /> + <?php if ( isset($_GET['apage']) ) { ?> <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" /> +<?php } + +if ( 'spam' == $comment_status ) { + wp_nonce_field('bulk-spam-delete', '_spam_nonce'); ?> +<input type="submit" name="delete_all_spam" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" /> <?php } ?> +<?php do_action('manage_comments_nav', $comment_status); ?> </div> <br class="clear" /> </div> -<br class="clear" /> -<?php -if ($comments) { -?> -<table class="widefat"> +<div class="clear"></div> + +<?php if ( $comments ) { ?> +<table class="widefat comments fixed" cellspacing="0"> <thead> - <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Comment') ?></th> - <th scope="col"><?php _e('Date') ?></th> - <th scope="col" class="action-links"><?php _e('Actions') ?></th> - </tr> + <tr> +<?php print_column_headers('edit-comments'); ?> + </tr> </thead> + +<tfoot> + <tr> +<?php print_column_headers('edit-comments', false); ?> + </tr> +</tfoot> + <tbody id="the-comment-list" class="list:comment"> <?php foreach ($comments as $comment) @@ -213,6 +312,37 @@ if ($comments) { </tbody> </table> +<div class="tablenav"> +<?php +if ( $page_links ) + echo "<div class='tablenav-pages'>$page_links_text</div>"; +?> + +<div class="alignleft actions"> +<select name="action2"> +<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option> +<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?> +<option value="unapprove"><?php _e('Unapprove'); ?></option> +<?php endif; ?> +<?php if ( empty($comment_status) || 'moderated' == $comment_status ): ?> +<option value="approve"><?php _e('Approve'); ?></option> +<?php endif; ?> +<?php if ( 'spam' != $comment_status ): ?> +<option value="markspam"><?php _e('Mark as Spam'); ?></option> +<?php endif; ?> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" name="doaction2" id="doaction2" value="<?php _e('Apply'); ?>" class="button-secondary apply" /> + +<?php if ( 'spam' == $comment_status ) { ?> +<input type="submit" name="delete_all_spam2" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" /> +<?php } ?> +<?php do_action('manage_comments_nav', $comment_status); ?> +</div> + +<br class="clear" /> +</div> + </form> <form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;"> @@ -220,33 +350,39 @@ if ($comments) { <input type="hidden" name="mode" value="<?php echo $mode; ?>" /> <input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" /> <input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" /> + <input type="hidden" name="p" value="<?php echo attribute_escape( $post_id ); ?>" /> + <input type="hidden" name="comment_type" value="<?php echo attribute_escape( $comment_type ); ?>" /> <?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?> </form> <div id="ajax-response"></div> -<?php -} elseif ( 'moderated' == $_GET['comment_status'] ) { -?> -<p> -<?php _e('No comments awaiting moderation&hellip; yet.') ?> -</p> -<?php -} else { -?> -<p> -<?php _e('No results found.') ?> -</p> -<?php -} -?> -<div class="tablenav"> -<?php -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> -<br class="clear" /> -</div> +<?php } elseif ( 'moderated' == $_GET['comment_status'] ) { ?> +<p><?php _e('No comments awaiting moderation&hellip; yet.') ?></p> +</form> + +<?php } else { ?> +<p><?php _e('No results found.') ?></p> +</form> + +<?php } ?> </div> -<?php include('admin-footer.php'); ?> +<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 comments.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> + +<?php +wp_comment_reply('-1', true, 'detail'); +include('admin-footer.php'); ?> wp-admin/edit-comments.php @@ -1,12 +1,31 @@ <?php +/** + * Post advanced form for inclusion in the administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Post ID global + * @name $post_ID + * @var int + */ +if ( ! isset( $post_ID ) ) + $post_ID = 0; +else + $post_ID = (int) $post_ID; $action = isset($action) ? $action : ''; if ( isset($_GET['message']) ) $_GET['message'] = absint( $_GET['message'] ); -$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) ); +$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) ); $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); $messages[4] = __('Post updated.'); +$messages[6] = sprintf(__('Post published. <a href="%s">View post</a>'), get_permalink($post_ID)); +$messages[7] = __('Post saved.'); +$messages[8] = sprintf(__('Post submitted. <a href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ); if ( isset($_GET['revision']) ) $messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ); @@ -14,21 +33,20 @@ if ( isset($_GET['revision']) ) $notice = false; $notices[1] = __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>.' ); -if ( !isset($post_ID) || 0 == $post_ID ) { +if ( 0 == $post_ID ) { $form_action = 'post'; $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post() $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />"; $autosave = false; } else { - $post_ID = (int) $post_ID; $form_action = 'editpost'; $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />"; - $autosave = wp_get_post_autosave( $post_id ); + $autosave = wp_get_post_autosave( $post_ID ); // Detect if there exists an autosave newer than the post and if that autosave is different than the post if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) ) { foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { - if ( wp_text_diff( $autosave->$autosave_field, $post->$autosave_field ) ) { + if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) ); break; } @@ -37,215 +55,235 @@ if ( !isset($post_ID) || 0 == $post_ID ) { } } +// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action). + +/** + * Display post submit form fields. + * + * @since 2.7.0 + * + * @param object $post + */ +function post_submit_meta_box($post) { + global $action; + + $can_publish = current_user_can('publish_posts'); ?> -<?php if ( $notice ) : ?> -<div id="notice" class="error"><p><?php echo $notice ?></p></div> -<?php endif; ?> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> -<?php endif; ?> +<div class="submitbox" id="submitpost"> -<form name="post" action="post.php" method="post" id="post"> -<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?> -<input type="hidden" name="mode" value="bookmarklet" /> -<?php endif; ?> +<div id="minor-publishing"> -<div class="wrap"> -<h2><?php _e('Write Post') ?></h2> -<?php +<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?> +<div style="display:none;"> +<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" /> +</div> -if ( !isset($post_ID) || 0 == $post_ID) - wp_nonce_field('add-post'); -else - wp_nonce_field('update-post_' . $post_ID); +<div id="minor-publishing-actions"> +<div id="save-action"> +<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?> +<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?> +<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save as Pending') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } ?> +</div> -$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />'; +<div id="preview-action"> +<?php $preview_link = 'publish' == $post->post_status ? clean_url(get_permalink($post->ID)) : clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?> -$form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />'; +<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a> +<input type="hidden" name="wp-preview" id="wp-preview" value="" /> +</div> + +<div class="clear"></div> +</div><?php // /minor-publishing-actions ?> -$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />'; +<div id="misc-publishing-actions"> +<div class="misc-pub-section<?php if ( !$can_publish ) { echo ' misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label> +<b><span id="post-status-display"> +<?php +switch ( $post->post_status ) { + case 'private': + _e('Privately Published'); + break; + case 'publish': + _e('Published'); + break; + case 'future': + _e('Scheduled'); + break; + case 'pending': + _e('Pending Review'); + break; + case 'draft': + _e('Draft'); + break; +} ?> +</span></b> +<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?> +<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> -<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" /> -<input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" /> -<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" /> -<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" /> -<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" /> -<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" /> -<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> -<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?> +<div id="post-status-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" /> +<select name='post_status' id='post_status' tabindex='4'> +<?php if ( 'publish' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option> +<?php elseif ( 'private' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option> +<?php elseif ( 'future' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option> +<?php endif; ?> +<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option> +<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option> +</select> + <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a> +</div> -<?php echo $form_extra ?> +<?php } ?> +</div><?php // /misc-pub-section ?> + +<div class="misc-pub-section " id="visibility"> +<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php + +if ( 'private' == $post->post_status ) { + $post->post_password = ''; + $visibility = 'private'; + $visibility_trans = __('Private'); +} elseif ( !empty( $post->post_password ) ) { + $visibility = 'password'; + $visibility_trans = __('Password protected'); +} elseif ( is_sticky( $post->ID ) ) { + $visibility = 'public'; + $visibility_trans = __('Public, Sticky'); +} else { + $visibility = 'public'; + $visibility_trans = __('Public'); +} -<div id="poststuff"> +?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a> -<div class="submitbox" id="submitpost"> +<div id="post-visibility-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" /> +<input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID), true); ?> /> +<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" /> -<div id="previewview"> -<?php if ( 'publish' == $post->post_status ) { ?> -<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a> -<?php } elseif ( 'edit' == $action ) { ?> -<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Post'); ?></a> -<?php } ?> -</div> -<div class="inside"> +<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br /> +<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page') ?></label><br /></span> +<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br /> +<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span> +<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br /> -<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p> <p> -<select name='post_status' id='post_status' tabindex='4'> -<?php -// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) -if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) : -?> -<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option> -<?php if ( 'future' == $post->post_status ) : ?> -<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option> -<?php endif; ?> -<?php endif; ?> -<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option> -<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option> -</select> + <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a> </p> +</div> +<?php } ?> + +</div><?php // /misc-pub-section ?> + -<?php if ( current_user_can( 'publish_posts' ) ) : ?> -<p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p> -<?php endif; ?> <?php -if ($post_ID) { +$datef = _c( 'M j, Y @ G:i|Publish box date format'); +if ( 0 != $post->ID ) { if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date - $stamp = __('Scheduled for:<br />%1$s at %2$s'); - } else if ( 'publish' == $post->post_status ) { // already published - $stamp = __('Published on:<br />%1$s at %2$s'); - } else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified - $stamp = __('Publish immediately'); + $stamp = __('Scheduled for: <b>%1$s</b>'); + } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published + $stamp = __('Published on: <b>%1$s</b>'); + } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified + $stamp = __('Publish <b>immediately</b>'); + } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified + $stamp = __('Schedule for: <b>%1$s</b>'); } else { // draft, 1 or more saves, date specified - $stamp = __('Publish on:<br />%1$s at %2$s'); + $stamp = __('Publish on: <b>%1$s</b>'); } - $date = mysql2date(get_option('date_format'), $post->post_date); - $time = mysql2date(get_option('time_format'), $post->post_date); + $date = date_i18n( $datef, strtotime( $post->post_date ) ); } else { // draft (no saves, and thus no date specified) - $stamp = __('Publish immediately'); - $date = mysql2date(get_option('date_format'), current_time('mysql')); - $time = mysql2date(get_option('time_format'), current_time('mysql')); + $stamp = __('Publish <b>immediately</b>'); + $date = date_i18n( $datef, strtotime( current_time('mysql') ) ); } ?> -<?php if ( current_user_can( 'publish_posts' ) ) : // Contributors don't get to choose the date of publish ?> -<p class="curtime"><?php printf($stamp, $date, $time); ?> -&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p> - -<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div> +<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> +<div class="misc-pub-section curtime misc-pub-section-last"> + <span id="timestamp"> + <?php printf($stamp, $date); ?></span> + <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> + <div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div> +</div><?php // /misc-pub-section ?> <?php endif; ?> </div> +<div class="clear"></div> +</div> -<p class="submit"> -<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" /> +<div id="major-publishing-actions"> +<?php do_action('post_submitbox_start'); ?> +<div id="delete-action"> <?php -if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) { -?> +if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?> +<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a> +<?php } ?> +</div> + +<div id="publishing-action"> +<?php +if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?> <?php if ( current_user_can('publish_posts') ) : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> + <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" /> + <?php else : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Publish') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> + <?php endif; ?> <?php else : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Submit for Review') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> <?php endif; ?> -<?php -} - -if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) ) - echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post_ID", 'delete-post_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>"; -?> -<br class="clear" /> -<?php if ($post_ID): ?> -<?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) { - $last_user = get_userdata($last_id); - printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); -} else { - printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); -} -?> -<br class="clear" /> -<?php endif; ?> -<span id="autosave"></span> -<span id="wp-word-count"></span> -</p> - -<div class="side-info"> -<h5><?php _e('Related') ?></h5> - -<ul> -<?php if ($post_ID): ?> -<li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li> -<?php endif; ?> -<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li> -<li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li> -<li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li> -<li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li> -<li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li> -<?php do_action('post_relatedlinks_list'); ?> -</ul> - -<h5><?php _e('Shortcuts') ?></h5> -<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?> <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p> -</div> - -<?php do_action('submitpost_box'); ?> -</div> - -<div id="post-body"> -<div id="titlediv"> -<h3><label for="title"><?php _e('Title') ?></label></h3> -<div id="titlewrap"> - <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" /> -</div> -<div class="inside"> -<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?> - <div id="edit-slug-box"> -<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : - echo $sample_permalink_html; -endif; ?> - </div> +<?php } else { ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Update Post') ?>" /> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Post') ?>" /> +<?php } ?> </div> +<div class="clear"></div> </div> - -<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> -<h3><label for="content"><?php _e('Post') ?></label></h3> -<?php the_editor($post->post_content); ?> -<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?> -<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> -<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?> -<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?> </div> -<?php echo $form_pingback ?> -<?php echo $form_prevstatus ?> - <?php +} +add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side', 'core'); + +/** + * Display post tags form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_tags_meta_box($post) { ?> <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p> <div id="tagchecklist"></div> +<p id="tagcloud-link" class="hide-if-no-js"><a href='#'><?php _e( 'Choose from the most popular tags' ); ?></a></p> <?php } -add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'normal', 'core'); - +add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core'); + +/** + * Display post categories form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_categories_meta_box($post) { ?> -<div id="category-adder" class="wp-hidden-children"> - <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> - <p id="category-add" class="wp-hidden-child"> - <label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/> - <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> - <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" /> - <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?> - <span id="category-ajax-response"></span> - </p> -</div> - <ul id="category-tabs"> <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li> - <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li> + <li class="hide-if-no-js"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li> </ul> <div id="categories-pop" class="ui-tabs-panel" style="display: none;"> @@ -259,28 +297,67 @@ function post_categories_meta_box($post) { <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?> </ul> </div> + +<?php if ( current_user_can('manage_categories') ) : ?> +<div id="category-adder" class="wp-hidden-children"> + <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> + <p id="category-add" class="wp-hidden-child"> + <label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/> + <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> + <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" /> + <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?> + <span id="category-ajax-response"></span> + </p> +</div> <?php +endif; + } -add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'normal', 'core'); +add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core'); + +/** + * Display post password form fields. + * + * @since 2.6.0 + * + * @param object $post + */ +function post_password_meta_box($post) { ?> - -<?php do_meta_boxes('post', 'normal', $post); ?> - -<?php do_action('edit_form_advanced'); ?> - -<h2><?php _e('Advanced Options'); ?></h2> - +<p> + <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label> +</p> +<h4><?php _e( 'Post Password' ); ?></h4> +<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php the_post_password(); ?>" /></p> +<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p> <?php +} +// add_meta_box('passworddiv', __('Privacy Options'), 'post_password_meta_box', 'post', 'side', 'core'); + +/** + * Display post excerpt form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_excerpt_meta_box($post) { ?> <label class="hidden" for="excerpt"><?php _e('Excerpt') ?></label><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea> <p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p> <?php } -add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'advanced', 'core'); - +add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core'); + +/** + * Display trackback links form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_trackback_meta_box($post) { - $form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />'; + $form_trackback = '<input type="text" name="trackback_url" id="trackback_url" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />'; if ('' != $post->pinged) { $pings = '<p>'. __('Already pinged:') . '</p><ul>'; $already_pinged = explode("\n", trim($post->pinged)); @@ -291,67 +368,108 @@ function post_trackback_meta_box($post) { } ?> -<p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p> +<p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p> <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p> <?php if ( ! empty($pings) ) echo $pings; } -add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'advanced', 'core'); - +add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core'); + +/** + * Display custom fields for the post form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_custom_meta_box($post) { ?> <div id="postcustomstuff"> -<table cellpadding="3"> +<div id="ajax-response"></div> <?php $metadata = has_meta($post->ID); list_meta($metadata); +meta_form(); ?> - -</table> -<?php - meta_form(); -?> -<div id="ajax-response"></div> </div> <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p> <?php } -add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'advanced', 'core'); +add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core'); do_action('dbx_post_advanced'); +/** + * Display comment status for post form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_comment_status_meta_box($post) { + global $wpdb, $post_ID; ?> <input name="advanced_view" type="hidden" value="1" /> -<p><label for="comment_status" class="selectit"> -<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> -<?php _e('Allow Comments') ?></label></p> -<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p> -<p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p> +<p class="meta-options"> + <label for="comment_status" class="selectit"> <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e('Allow comments on this post') ?></label><br /> + <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label> +</p> <?php -} -add_meta_box('commentstatusdiv', __('Comments &amp; Pings'), 'post_comment_status_meta_box', 'post', 'advanced', 'core'); + $total = $wpdb->get_var($wpdb->prepare("SELECT count(1) FROM $wpdb->comments WHERE comment_post_ID = '%d' AND ( comment_approved = '0' OR comment_approved = '1')", $post_ID)); -function post_password_meta_box($post) { + if ( !$post_ID || $post_ID < 0 || 1 > $total ) + return; + +wp_nonce_field( 'get-comments', 'add_comment_nonce', false ); ?> -<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p> -<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p> + +<table class="widefat comments-box fixed" cellspacing="0" style="display:none;"> +<thead> + <tr> + <th scope="col" class="column-author"><?php _e('Author') ?></th> + <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th> + </tr> +</thead> +<tbody id="the-comment-list" class="list:comment"> +</tbody> +</table> +<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p> <?php + $hidden = get_hidden_meta_boxes('post'); + if ( ! in_array('commentstatusdiv', $hidden) ) { ?> + <script type="text/javascript">commentsBox.get(<?php echo $total; ?>, 10);</script> +<?php + } } -add_meta_box('passworddiv', __('Password Protect This Post'), 'post_password_meta_box', 'post', 'advanced', 'core'); - +add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core'); + +/** + * Display post slug form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_slug_meta_box($post) { ?> <label class="hidden" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /> <?php } -add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'advanced', 'core'); +if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) + add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', 'core'); $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM if ( $post->post_author && !in_array($post->post_author, $authors) ) $authors[] = $post->post_author; if ( $authors && count( $authors ) > 1 ) : +/** + * Display form field with list of authors. + * + * @since 2.6.0 + * + * @param object $post + */ function post_author_meta_box($post) { global $current_user, $user_ID; $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM @@ -361,26 +479,144 @@ function post_author_meta_box($post) { <label class="hidden" for="post_author_override"><?php _e('Post Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?> <?php } -add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'advanced', 'core'); +add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'normal', 'core'); endif; -if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +/** + * Display list of post revisions. + * + * @since 2.6.0 + * + * @param object $post + */ function post_revisions_meta_box($post) { wp_list_post_revisions(); } -add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'advanced', 'core'); +add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core'); endif; -do_meta_boxes('post', 'advanced', $post); +do_action('do_meta_boxes', 'post', 'normal', $post); +do_action('do_meta_boxes', 'post', 'advanced', $post); +do_action('do_meta_boxes', 'post', 'side', $post); + +require_once('admin-header.php'); -do_action('dbx_post_sidebar'); ?> + +<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?> +<input type="hidden" name="mode" value="bookmarklet" /> +<?php endif; ?> + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> +<?php if ( $notice ) : ?> +<div id="notice" class="error"><p><?php echo $notice ?></p></div> +<?php endif; ?> +<?php if (isset($_GET['message'])) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<?php endif; ?> +<form name="post" action="post.php" method="post" id="post"> +<?php + +if ( 0 == $post_ID) + wp_nonce_field('add-post'); +else + wp_nonce_field('update-post_' . $post_ID); + +?> + +<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" /> +<input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" /> +<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" /> +<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" /> +<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" /> +<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" /> +<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> +<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?> + +<?php echo $form_extra ?> + +<div id="poststuff" class="metabox-holder"> + +<div id="side-info-column" class="inner-sidebar"> + +<?php do_action('submitpost_box'); ?> + +<?php $side_meta_boxes = do_meta_boxes('post', 'side', $post); ?> +</div> + +<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>"> +<div id="post-body-content" class="has-sidebar-content"> +<div id="titlediv"> +<div id="titlewrap"> + <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" /> +</div> +<div class="inside"> +<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?> +<?php if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) { ?> + <div id="edit-slug-box"> +<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : + echo $sample_permalink_html; +endif; ?> + </div> +<?php } ?> </div> </div> +<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> + +<?php the_editor($post->post_content); ?> + +<div id="post-status-info"> + <span id="wp-word-count" class="alignleft"></span> + <span class="alignright"> + <span id="autosave">&nbsp;</span> +<?php + if ( $post_ID ) { + echo '<span id="last-edit">'; + if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) { + $last_user = get_userdata($last_id); + printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); + } else { + printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); + } + echo '</span>'; + } +?> + </span> + <br class="clear" /> +</div> + + +<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?> +<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> +<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?> +<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?> +<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?> </div> +<?php + +do_meta_boxes('post', 'normal', $post); + +do_action('edit_form_advanced'); + +do_meta_boxes('post', 'advanced', $post); + +do_action('dbx_post_sidebar'); + +?> + +</div> +</div> +<br class="clear" /> +</div><!-- /poststuff --> </form> +</div> + +<?php wp_comment_reply(); ?> <?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?> <script type="text/javascript"> wp-admin/edit-form-advanced.php @@ -1,4 +1,14 @@ <?php +/** + * Edit comment form for inclusion in another file. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * @var string + */ $submitbutton_text = __('Edit Comment'); $toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID); $form_action = 'editedcomment'; @@ -8,84 +18,110 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment- <form name="post" action="comment.php" method="post" id="post"> <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> <div class="wrap"> -<h2><?php echo $toprow_title; ?></h2> +<?php screen_icon(); ?> +<h2><?php _e('Edit Comment'); ?></h2> + +<div id="poststuff" class="metabox-holder"> <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' /> +<?php -<div id="poststuff"> +$email = attribute_escape( $comment->comment_author_email ); +$url = attribute_escape( $comment->comment_author_url ); +// add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core'); +?> +<div id="side-info-column" class="inner-sidebar"> +<div id="submitdiv" class="stuffbox" > +<h3><span class='hndle'><?php _e('Status') ?></span></h3> +<div class="inside"> <div class="submitbox" id="submitcomment"> +<div id="minor-publishing"> -<div id="previewview"> -<a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a> +<div id="minor-publishing-actions"> +<div id="preview-action"> +<a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a> +</div> +<div class="clear"></div> </div> -<div class="inside"> +<div id="misc-publishing-actions"> -<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p> -<p> -<select name='comment_status' id='comment_status'> -<option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option> -<option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option> -<option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option> -</select> -</p> +<div class="misc-pub-section" id="comment-status-radio"> +<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php echo _c('Approved|adjective') ?></label><br /> +<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php echo _c('Pending|adjective') ?></label><br /> +<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|adjective'); ?></label> +</div> +<div class="misc-pub-section curtime misc-pub-section-last"> <?php -$stamp = __('%1$s at %2$s'); -$date = mysql2date(get_option('date_format'), $comment->comment_date); -$time = mysql2date(get_option('time_format'), $comment->comment_date); +$datef = _c( 'M j, Y @ G:i|Publish box date format'); +$stamp = __('Submitted on: <b>%1$s</b>'); +$date = date_i18n( $datef, strtotime( $comment->comment_date ) ); ?> -<p class="curtime"><?php printf($stamp, $date, $time); ?> -&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a></p> - +<span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div> - +</div> +</div> <!-- misc actions --> +<div class="clear"></div> </div> -<p class="submit"> -<input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" /> -<?php -echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>"; -?> -</p> - -<div class="side-info"> -<h5><?php _e('Related') ?></h5> - -<ul> -<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li> -<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li> -<?php do_action('comment_relatedlinks_list'); ?> -</ul> +<div id="major-publishing-actions"> +<div id="delete-action"> +<a class='submitdelete deletion' href='<?php echo wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete'); ?></a> </div> -<?php do_action('submitcomment_box'); ?> +<div id="publishing-action"> +<input type="submit" name="save" value="<?php _e('Update Comment'); ?>" tabindex="4" class="button-primary" /> </div> - -<div id="post-body"> -<div id="namediv" class="stuffbox"> -<h3><label for="name"><?php _e('Name') ?></label></h3> -<div class="inside"> -<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" /> +<div class="clear"></div> </div> </div> - -<div id="emaildiv" class="stuffbox"> -<h3><label for="email"><?php _e('E-mail') ?></label></h3> -<div class="inside"> -<input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" /> </div> </div> +</div> + +<div id="post-body" class="has-sidebar"> +<div id="post-body-content" class="has-sidebar-content"> -<div id="uridiv" class="stuffbox"> -<h3><label for="newcomment_author_url"><?php _e('URL') ?></label></h3> +<div id="namediv" class="stuffbox"> +<h3><label for="name"><?php _e( 'Author' ) ?></label></h3> <div class="inside"> -<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" /> +<table class="form-table"> +<tbody> +<tr valign="top"> + <td class="first"><?php _e( 'Name:' ); ?></td> + <td><input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" /></td> +</tr> +<tr valign="top"> + <td class="first"> + <?php + if ( $email ) { + printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) ); + } else { + _e( 'E-mail:' ); + } +?></td> + <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $email; ?>" tabindex="2" id="email" /></td> +</tr> +<tr valign="top"> + <td class="first"> + <?php + $url = get_comment_author_url(); + if ( ! empty( $url ) && 'http://' != $url ) { + $link = "<a href='$url' rel='external nofollow' target='_blank'>" . __('visit site') . "</a>"; + printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) ); + } else { + _e( 'URL:' ); + } ?></td> + <td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo $url; ?>" tabindex="3" /></td> +</tr> +</tbody> +</table> +<br /> </div> </div> <div id="postdiv" class="postarea"> -<h3><label for="content"><?php _e('Comment') ?></label></h3> <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?> <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> </div> @@ -94,13 +130,14 @@ echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletec <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" /> <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" /> -<input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" /> +<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> <?php wp_original_referer_field(true, 'previous'); ?> <input type="hidden" name="noredir" value="1" /> + +</div> </div> </div> </div> - </form> <script type="text/javascript"> wp-admin/edit-form-comment.php @@ -1,43 +1,54 @@ <?php +/** + * Edit Link Categories Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -// Handle bulk deletes -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) { +// Handle bulk actions +if ( isset($_GET['action']) && isset($_GET['delete']) ) { check_admin_referer('bulk-link-categories'); + $doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2']; if ( !current_user_can('manage_categories') ) wp_die(__('Cheatin&#8217; uh?')); - foreach( (array) $_GET['delete'] as $cat_ID ) { - $cat_name = get_term_field('name', $cat_ID, 'link_category'); - $default_cat_id = get_option('default_link_category'); - - // Don't delete the default cats. - if ( $cat_ID == $default_cat_id ) - wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name)); + if ( 'delete' == $doaction ) { + foreach( (array) $_GET['delete'] as $cat_ID ) { + $cat_name = get_term_field('name', $cat_ID, 'link_category'); + $default_cat_id = get_option('default_link_category'); - wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id)); - } + // Don't delete the default cats. + if ( $cat_ID == $default_cat_id ) + wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name)); - $location = 'edit-link-categories.php'; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos($referer, 'edit-link-categories.php') ) - $location = $referer; - } + wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id)); + } + + $location = 'edit-link-categories.php'; + if ( $referer = wp_get_referer() ) { + if ( false !== strpos($referer, 'edit-link-categories.php') ) + $location = $referer; + } - $location = add_query_arg('message', 6, $location); - wp_redirect($location); - exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); + $location = add_query_arg('message', 6, $location); + wp_redirect($location); + exit(); + } +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } $title = __('Link Categories'); -$parent_file = 'edit.php'; -wp_enqueue_script( 'admin-categories' ); -wp_enqueue_script('admin-forms'); +wp_enqueue_script('admin-categories'); +if ( current_user_can('manage_categories') ) + wp_enqueue_script('inline-edit-tax'); require_once ('admin-header.php'); @@ -46,42 +57,48 @@ $messages[2] = __('Category deleted.'); $messages[3] = __('Category updated.'); $messages[4] = __('Category not added.'); $messages[5] = __('Category not updated.'); -$messages[6] = __('Categories deleted.'); +$messages[6] = __('Categories deleted.'); ?> + +<div class="wrap nosubsub"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> +</h2> -if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); endif; ?> -<div class="wrap"> - -<form id="posts-filter" action="" method="get"> -<?php if ( current_user_can('manage_categories') ) : ?> - <h2><?php printf(__('Manage Link Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2> -<?php else : ?> - <h2><?php _e('Manage Link Categories') ?> </h2> -<?php endif; ?> - -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> +<form class="search-form" action="" method="get"> +<p class="search-box"> + <label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?>:</label> + <input type="text" class="search-input" id="link-category-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" /> </p> - +</form> <br class="clear" /> +<div id="col-container"> + +<div id="col-right"> +<div class="col-wrap"> +<form id="posts-filter" action="" method="get"> <div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$catsperpage || $catsperpage < 0 ) +if( ! isset( $catsperpage ) || $catsperpage < 0 ) $catsperpage = 20; $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => ceil(wp_count_terms('link_category') / $catsperpage), 'current' => $pagenum )); @@ -90,25 +107,33 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<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" /> <?php wp_nonce_field('bulk-link-categories'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<table class="widefat"> +<table class="widefat fixed" cellspacing="0"> <thead> <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Name') ?></th> - <th scope="col"><?php _e('Description') ?></th> - <th scope="col" class="num" style="width: 90px;"><?php _e('Links') ?></th> +<?php print_column_headers('edit-link-categories'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('edit-link-categories', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:link-cat"> <?php $start = ($pagenum - 1) * $catsperpage; @@ -120,10 +145,8 @@ $categories = get_terms( 'link_category', $args ); if ( $categories ) { $output = ''; foreach ( $categories as $category ) { - $category = sanitize_term($category, 'link_category', 'display'); $output .= link_cat_row($category); } - $output = apply_filters('cat_rows', $output); echo $output; unset($category); } @@ -131,27 +154,90 @@ if ( $categories ) { ?> </tbody> </table> -</form> <div class="tablenav"> - <?php if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> + +<div class="alignleft actions"> +<select name="action2"> +<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" /> +</div> + <br class="clear" /> </div> <br class="clear" /> +</form> +<div class="form-wrap"> +<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the links in that category. Instead, links that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), get_term_field('name', get_option('default_link_category'), 'link_category')) ?></p> </div> -<?php if ( current_user_can('manage_categories') ) : ?> -<div class="wrap"> -<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the links in that category. Instead, links that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), get_term_field('name', get_option('default_link_category'), 'link_category')) ?></p> + +</div> +</div><!-- /col-right --> + +<div id="col-left"> +<div class="col-wrap"> + +<?php if ( current_user_can('manage_categories') ) { + $category = (object) array(); $category->parent = 0; do_action('add_link_category_form_pre', $category); ?> + +<div class="form-wrap"> +<h3><?php _e('Add Category'); ?></h3> +<div id="ajax-response"></div> +<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php"> +<input type="hidden" name="action" value="addcat" /> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-link-category'); ?> + +<div class="form-field form-required"> + <label for="name"><?php _e('Category name') ?></label> + <input name="name" id="name" type="text" value="" size="40" aria-required="true" /> </div> -<?php include('edit-link-category-form.php'); ?> +<div class="form-field"> + <label for="slug"><?php _e('Category slug') ?></label> + <input name="slug" id="slug" type="text" value="" size="40" /> + <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> +</div> -<?php endif; ?> +<div class="form-field"> + <label for="description"><?php _e('Description (optional)') ?></label> + <textarea name="description" id="description" rows="5" cols="40"></textarea> +</div> +<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p> +<?php do_action('edit_link_category_form', $category); ?> +</form> +</div> + +<?php } ?> + +</div> +</div><!-- /col-left --> + +</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 link categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> + +<?php inline_edit_term_row('edit-link-categories'); ?> <?php include('admin-footer.php'); ?> wp-admin/edit-link-categories.php @@ -1,23 +1,60 @@ <?php +/** + * Edit link category form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * @var object + */ +if ( ! isset( $category ) ) + $category = (object) array(); + if ( ! empty($cat_ID) ) { - $heading = __('Edit Category'); - $submit_text = __('Edit Category'); + /** + * @var string + */ + $heading = '<h2>' . __('Edit Link Category') . '</h2>'; + $submit_text = __('Update Category'); $form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">'; $action = 'editedcat'; $nonce_action = 'update-link-category_' . $cat_ID; do_action('edit_link_category_form_pre', $category); } else { - $heading = __('Add Category'); + $heading = '<h2>' . __('Add Link Category') . '</h2>'; $submit_text = __('Add Category'); $form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">'; $action = 'addcat'; $nonce_action = 'add-link-category'; do_action('add_link_category_form_pre', $category); } + +/** + * @ignore + * @since 2.7 + * @internal Used to prevent errors in page when no category is being edited. + * + * @param object $category + */ +function _fill_empty_link_category(&$category) { + if ( ! isset( $category->name ) ) + $category->name = ''; + + if ( ! isset( $category->slug ) ) + $category->slug = ''; + + if ( ! isset( $category->description ) ) + $category->description = ''; +} + +_fill_empty_link_category($category); ?> <div class="wrap"> -<h2><?php echo $heading ?></h2> +<?php screen_icon(); ?> +<?php echo $heading ?> <div id="ajax-response"></div> <?php echo $form ?> <input type="hidden" name="action" value="<?php echo $action ?>" /> @@ -30,7 +67,7 @@ if ( ! empty($cat_ID) ) { </tr> <tr class="form-field"> <th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th> - <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" /> + <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br /> <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td> </tr> <tr class="form-field"> @@ -38,7 +75,7 @@ if ( ! empty($cat_ID) ) { <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea></td> </tr> </table> -<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p> +<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php echo $submit_text ?>" /></p> <?php do_action('edit_link_category_form', $category); ?> </form> </div> wp-admin/edit-link-category-form.php @@ -1,20 +1,36 @@ <?php +/** + * Edit links form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + if ( ! empty($link_id) ) { - $heading = __('Edit Link'); - $submit_text = __('Save Changes'); + $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' ); + $submit_text = __('Update Link'); $form = '<form name="editlink" id="editlink" method="post" action="link.php">'; $nonce_action = 'update-bookmark_' . $link_id; } else { - $heading = __('Add Link'); + $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' ); $submit_text = __('Add Link'); $form = '<form name="addlink" id="addlink" method="post" action="link.php">'; $nonce_action = 'add-bookmark'; } +/** + * Display checked checkboxes attribute for xfn microformat options. + * + * @since 1.0.1 + * + * @param string $class + * @param string $value + * @param mixed $deprecated Not used. + */ function xfn_check($class, $value = '', $deprecated = '') { global $link; - $link_rel = $link->link_rel; + $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: ''; $rels = preg_split('/\s+/', $link_rel); if ('' != $value && in_array($value, $rels) ) { @@ -28,76 +44,75 @@ function xfn_check($class, $value = '', $deprecated = '') { if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"'; } } -?> - -<?php echo $form ?> -<?php wp_nonce_field($nonce_action); ?> -<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> - -<div class="wrap"> -<h2><?php echo $heading; ?></h2> - -<div id="poststuff"> +/** + * Display link create form fields. + * + * @since 2.7.0 + * + * @param object $link + */ +function link_submit_meta_box($link) { +?> <div class="submitbox" id="submitlink"> -<div id="previewview"> -<?php if ( !empty($link_id) ) { ?> -<a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a> -<?php } ?> -</div> +<div id="minor-publishing"> -<div class="inside"> -<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p> +<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?> +<div style="display:none;"> +<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" /> </div> -<p class="submit"> -<input type="submit" class="button button-highlighted" name="save" value="<?php _e('Save'); ?>" tabindex="4" /> -<?php -if ( ( 'edit' == $action) && current_user_can('manage_links') ) - echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>"; -?> -</p> - -<div class="side-info"> -<h5><?php _e('Related') ?></h5> - -<ul> -<li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li> -<li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li> -<li><a href="link-import.php"><?php _e('Import Links') ?></a></li> -<?php do_action('link_relatedlinks_list'); ?> -</ul> +<div id="minor-publishing-actions"> +<div id="preview-action"> +<?php if ( !empty($link->link_id) ) { ?> + <a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank" tabindex="4"><?php _e('Visit Link'); ?></a> +<?php } ?> </div> -<?php do_action('submitlink_box'); ?> +<div class="clear"></div> </div> -<div id="post-body"> -<div id="namediv" class="stuffbox"> -<h3><label for="link_name"><?php _e('Name') ?></label></h3> -<div class="inside"> - <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br /> - <?php _e('Example: Nifty blogging software'); ?> +<div id="misc-publishing-actions"> +<div class="misc-pub-section misc-pub-section-last"> + <label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label> </div> </div> -<div id="addressdiv" class="stuffbox"> -<h3><label for="link_url"><?php _e('Web Address') ?></label></h3> -<div class="inside"> - <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br /> - <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?> </div> + +<div id="major-publishing-actions"> +<?php do_action('post_submitbox_start'); ?> +<div id="delete-action"> +<?php +if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?> + <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a> +<?php } ?> </div> -<div id="descriptiondiv" class="stuffbox"> -<h3><label for="link_description"><?php _e('Description') ?></label></h3> -<div class="inside"> - <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br /> - <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?> +<div id="publishing-action"> +<?php if ( !empty($link->link_id) ) { ?> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="4" accesskey="p" value="<?php _e('Update Link') ?>" /> +<?php } else { ?> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="4" accesskey="p" value="<?php _e('Add Link') ?>" /> +<?php } ?> </div> +<div class="clear"></div> </div> +<?php do_action('submitlink_box'); ?> +<div class="clear"></div> +</div> +<?php +} +add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core'); -<?php function link_categories_meta_box($link) { ?> +/** + * Display link categories form fields. + * + * @since 2.6.0 + * + * @param object $link + */ +function link_categories_meta_box($link) { ?> <div id="category-adder" class="wp-hidden-children"> <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4> <p id="link-category-add" class="wp-hidden-child"> @@ -111,12 +126,17 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) <ul id="category-tabs"> <li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li> - <li class="wp-no-js-hidden"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li> + <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li> </ul> <div id="categories-all" class="ui-tabs-panel"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> - <?php wp_link_category_checklist($link->link_id); ?> + <?php + if ( isset($link->link_id) ) + wp_link_category_checklist($link->link_id); + else + wp_link_category_checklist(); + ?> </ul> </div> @@ -128,35 +148,44 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) <?php } add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core'); -?> - -<?php do_meta_boxes('link', 'normal', $link); ?> - -<h2><?php _e('Advanced Options'); ?></h2> -<?php function link_target_meta_box($link) { ?> +/** + * Display form fields for changing link target. + * + * @since 2.6.0 + * + * @param object $link + */ +function link_target_meta_box($link) { ?> <fieldset><legend class="hidden"><?php _e('Target') ?></legend> <label for="link_target_blank" class="selectit"> -<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> /> +<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> /> <code>_blank</code></label><br /> <label for="link_target_top" class="selectit"> -<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> /> +<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> /> <code>_top</code></label><br /> <label for="link_target_none" class="selectit"> -<input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> /> +<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> /> <?php _e('none') ?></label> </fieldset> <p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p> <?php } -add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'advanced', 'core'); +add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'normal', 'core'); +/** + * Display xfn form fields. + * + * @since 2.6.0 + * + * @param object $link + */ function link_xfn_meta_box($link) { ?> <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5"> <tr> <th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th> - <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td> + <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( isset( $link->link_rel ) ? $link->link_rel : ''); ?>" /></td> </tr> <tr> <td colspan="2"> @@ -262,22 +291,29 @@ function link_xfn_meta_box($link) { <p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p> <?php } -add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'advanced', 'core'); +add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'normal', 'core'); +/** + * Display advanced link options form fields. + * + * @since 2.6.0 + * + * @param object $link + */ function link_advanced_meta_box($link) { ?> <table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5"> <tr class="form-field"> <th valign="top" scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th> - <td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td> + <td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo ( isset( $link->link_image ) ? $link->link_image : ''); ?>" style="width: 95%" /></td> </tr> <tr class="form-field"> <th valign="top" scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th> - <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td> + <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? $link->link_rss : ''); ?>" size="50" style="width: 95%" /></td> </tr> <tr class="form-field"> <th valign="top" scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th> - <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td> + <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); ?></textarea></td> </tr> <tr class="form-field"> <th valign="top" scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th> @@ -285,7 +321,7 @@ function link_advanced_meta_box($link) { <?php for ($r = 0; $r < 10; $r++) { echo(' <option value="'.$r.'" '); - if ($link->link_rating == $r) + if ( isset($link->link_rating) && $link->link_rating == $r) echo 'selected="selected"'; echo('>'.$r.'</option>'); } @@ -295,7 +331,75 @@ function link_advanced_meta_box($link) { </table> <?php } -add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'advanced', 'core'); +add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); + +do_action('do_meta_boxes', 'link', 'normal', $link); +do_action('do_meta_boxes', 'link', 'advanced', $link); +do_action('do_meta_boxes', 'link', 'side', $link); + +require_once ('admin-header.php'); + +?> + + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> + +<?php if ( isset( $_GET['added'] ) ) : ?> +<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div> +<?php endif; ?> + +<?php +if ( !empty($form) ) + echo $form; +if ( !empty($link_added) ) + echo $link_added; + +wp_nonce_field( $nonce_action ); +wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); +wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?> + +<div id="poststuff" class="metabox-holder"> + +<div id="side-info-column" class="inner-sidebar"> +<?php + +do_action('submitlink_box'); +$side_meta_boxes = do_meta_boxes( 'link', 'side', $link ); + +?> +</div> + +<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>"> +<div id="post-body-content" class="has-sidebar-content"> +<div id="namediv" class="stuffbox"> +<h3><label for="link_name"><?php _e('Name') ?></label></h3> +<div class="inside"> + <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /> + <p><?php _e('Example: Nifty blogging software'); ?></p> +</div> +</div> + +<div id="addressdiv" class="stuffbox"> +<h3><label for="link_url"><?php _e('Web Address') ?></label></h3> +<div class="inside"> + <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /> + <p><?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?></p> +</div> +</div> + +<div id="descriptiondiv" class="stuffbox"> +<h3><label for="link_description"><?php _e('Description') ?></label></h3> +<div class="inside"> + <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo isset($link->link_description) ? $link->link_description : ''; ?>" id="link_description" /> + <p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p> +</div> +</div> + +<?php + +do_meta_boxes('link', 'normal', $link); do_meta_boxes('link', 'advanced', $link); @@ -310,7 +414,7 @@ if ( $link_id ) : ?> </div> </div> - </div> </form> +</div> wp-admin/edit-link-form.php @@ -1,10 +1,29 @@ <?php +/** + * Edit page form for inclusion in the administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Post ID global. + * @name $post_ID + * @var int + */ +if ( ! isset( $post_ID ) ) + $post_ID = 0; +if ( ! isset( $temp_ID ) ) + $temp_ID = 0; + if ( isset($_GET['message']) ) $_GET['message'] = absint( $_GET['message'] ); -$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) ); +$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) ); $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); $messages[4] = __('Page updated.'); +$messages[5] = sprintf(__('Page published. <a href="%s">View page</a>'), get_permalink($post_ID)); +$messages[6] = sprintf(__('Page submitted. <a href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ); if ( isset($_GET['revision']) ) $messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ); @@ -12,7 +31,7 @@ if ( isset($_GET['revision']) ) $notice = false; $notices[1] = __( 'There is an autosave of this page that is more recent than the version below. <a href="%s">View the autosave</a>.' ); -if (!isset($post_ID) || 0 == $post_ID) { +if ( 0 == $post_ID) { $form_action = 'post'; $nonce_action = 'add-page'; $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post() @@ -22,7 +41,7 @@ if (!isset($post_ID) || 0 == $post_ID) { $form_action = 'editpost'; $nonce_action = 'update-page_' . $post_ID; $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />"; - $autosave = wp_get_post_autosave( $post_id ); + $autosave = wp_get_post_autosave( $post_ID ); if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) ) $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) ); } @@ -30,193 +49,277 @@ if (!isset($post_ID) || 0 == $post_ID) { $temp_ID = (int) $temp_ID; $user_ID = (int) $user_ID; +/** + * Display submit form fields. + * + * @since 2.7.0 + * + * @param object $post + */ +function page_submit_meta_box($post) { + global $action; + + $can_publish = current_user_can('publish_pages'); ?> +<div class="submitbox" id="submitpage"> -<?php if ( $notice ) : ?> -<div id="notice" class="error"><p><?php echo $notice ?></p></div> -<?php endif; ?> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> -<?php endif; ?> +<div id="minor-publishing"> -<form name="post" action="page.php" method="post" id="post"> -<div class="wrap"> -<h2><?php _e('Write Page') ?></h2> +<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?> +<div style="display:none;"> +<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" /> +</div> -<?php -wp_nonce_field($nonce_action); +<div id="minor-publishing-actions"> +<div id="save-action"> +<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?> +<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?> +<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save as Pending') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } ?> +</div> -if (isset($mode) && 'bookmarklet' == $mode) - echo '<input type="hidden" name="mode" value="bookmarklet" />'; -?> -<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" /> -<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' /> -<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" /> -<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" /> -<?php echo $form_extra ?> -<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" /> -<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" /> -<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> -<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?> +<div id="preview-action"> +<?php $preview_link = 'publish' == $post->post_status ? clean_url(get_permalink($post->ID)) : clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?> -<div id="poststuff"> +<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a> +<input type="hidden" name="wp-preview" id="wp-preview" value="" /> +</div> -<div class="submitbox" id="submitpage"> +<div class="clear"></div> +</div><?php // /minor-publishing-actions ?> -<div id="previewview"> -<?php if ( 'publish' == $post->post_status ) { ?> -<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Page'); ?></a> -<?php } elseif ( 'edit' == $action ) { ?> -<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a> -<?php } ?> -</div> +<div id="misc-publishing-actions"> -<div class="inside"> -<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p> -<p> -<select name='post_status' tabindex='4' id='post_status'> -<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages') -// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown) -if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) : +<div class="misc-pub-section<?php if ( !$can_publish ) { echo ' misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label> +<b><span id="post-status-display"> +<?php +switch ( $post->post_status ) { + case 'private': + _e('Privately Published'); + break; + case 'publish': + _e('Published'); + break; + case 'future': + _e('Scheduled'); + break; + case 'pending': + _e('Pending Review'); + break; + case 'draft': + _e('Draft'); + break; +} ?> -<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option> -<?php endif; ?> -<?php if ( 'future' == $post->post_status ) : ?> -<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option> +</span></b> +<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?> +<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> + +<div id="post-status-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" /> +<select name='post_status' id='post_status' tabindex='4'> +<?php if ( 'publish' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option> +<?php elseif ( 'private' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option> +<?php elseif ( 'future' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option> <?php endif; ?> <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option> -<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option> +<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option> </select> + + <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a> +</div> + +<?php } ?> +</div><?php // /misc-pub-section ?> + +<div class="misc-pub-section " id="visibility"> +<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php + +if ( 'private' == $post->post_status ) { + $post->post_password = ''; + $visibility = 'private'; + $visibility_trans = __('Private'); +} elseif ( !empty( $post->post_password ) ) { + $visibility = 'password'; + $visibility_trans = __('Password protected'); +} else { + $visibility = 'public'; + $visibility_trans = __('Public'); +} + +?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a> + +<div id="post-visibility-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" /> +<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" /> + + +<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br /> +<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br /> +<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span> +<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br /> + +<p> + <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a> </p> -<?php if ( current_user_can( 'publish_posts' ) ) : ?> -<p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p> -<?php endif; ?> +</div> +<?php } ?> + +</div><?php // /misc-pub-section ?> <?php -if ($post_ID) { +$datef = _c( 'M j, Y @ G:i|Publish box date format'); +if ( 0 != $post->ID ) { if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date - $stamp = __('Scheduled for:<br />%1$s at %2$s'); - } else if ( 'publish' == $post->post_status ) { // already published - $stamp = __('Published on:<br />%1$s at %2$s'); - } else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified - $stamp = __('Publish immediately'); + $stamp = __('Scheduled for: <b>%1$s</b>'); + } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published + $stamp = __('Published on: <b>%1$s</b>'); + } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified + $stamp = __('Publish <b>immediately</b>'); + } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified + $stamp = __('Schedule for: <b>%1$s</b>'); } else { // draft, 1 or more saves, date specified - $stamp = __('Publish on:<br />%1$s at %2$s'); + $stamp = __('Publish on: <b>%1$s</b>'); } - $date = mysql2date(get_option('date_format'), $post->post_date); - $time = mysql2date(get_option('time_format'), $post->post_date); + $date = date_i18n( $datef, strtotime( $post->post_date ) ); } else { // draft (no saves, and thus no date specified) - $stamp = __('Publish immediately'); - $date = mysql2date(get_option('date_format'), current_time('mysql')); - $time = mysql2date(get_option('time_format'), current_time('mysql')); + $stamp = __('Publish <b>immediately</b>'); + $date = date_i18n( $datef, strtotime( current_time('mysql') ) ); } ?> -<p class="curtime"><?php printf($stamp, $date, $time); ?> -&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p> +<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> +<div class="misc-pub-section curtime misc-pub-section-last"> + <span id="timestamp"> + <?php printf($stamp, $date); ?></span> + <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> + <div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div> +</div><?php // /misc-pub-section ?> +<?php endif; ?> -<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div> +</div> +<div class="clear"></div> +</div> +<div id="major-publishing-actions"> +<?php do_action('post_submitbox_start'); ?> +<div id="delete-action"> +<?php +if ( ( 'edit' == $action ) && current_user_can('delete_page', $post->ID) ) { ?> +<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a> +<?php } ?> </div> -<p class="submit"> -<input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" /> +<div id="publishing-action"> <?php -if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) { -?> -<?php if ( current_user_can('publish_pages') ) : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> +if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?> +<?php if ( $can_publish ) : ?> + <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" /> + <?php else : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Publish') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> + <?php endif; ?> <?php else : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Submit for Review') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> <?php endif; ?> +<?php } else { ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Update Page') ?>" /> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Page') ?>" /> +<?php } ?> +</div> +<div class="clear"></div> +</div> +</div> <?php } - -if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) ) - echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post_ID", 'delete-page_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>"; +add_meta_box('pagesubmitdiv', __('Publish'), 'page_submit_meta_box', 'page', 'side', 'core'); + +/** + * Display page password form fields. + * + * @since 2.6.0 + * + * @param object $post + */ +function page_password_meta_box($post){ ?> -<br class="clear" /> -<?php if ($post_ID): ?> -<?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) { - $last_user = get_userdata($last_id); - printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); -} else { - printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); +<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p> +<h4><?php _e( 'Page Password' ); ?></h4> +<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php the_post_password(); ?>" /></p> +<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p> +<?php } +// add_meta_box('pagepassworddiv', __('Privacy Options'), 'page_password_meta_box', 'page', 'side', 'core'); + +/** + * Display page attributes form fields. + * + * @since 2.7.0 + * + * @param object $post + */ +function page_attributes_meta_box($post){ ?> -<br class="clear" /> -<?php endif; ?> -<span id="autosave"></span> -<span id="wp-word-count"></span> -</p> - -<div class="side-info"> -<h5><?php _e('Related') ?></h5> - -<ul> -<?php if ($post_ID): ?> -<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li> -<?php endif; ?> -<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li> -<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li> -<?php do_action('page_relatedlinks_list'); ?> -</ul> -</div> -<?php do_action('submitpage_box'); ?> -</div> - -<div id="post-body"> -<div id="titlediv"> -<h3><label for="title"><?php _e('Title') ?></label></h3> -<div id="titlewrap"> - <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" /> -</div> -<div class="inside"> -<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?> - <div id="edit-slug-box"> -<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : - echo $sample_permalink_html; -endif; ?> - </div> -</div> -</div> - -<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> -<h3><label for="content"><?php _e('Page') ?></label></h3> -<?php the_editor($post->post_content); ?> -<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?> -<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> -<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?> -<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?> -</div> - -<?php do_meta_boxes('page', 'normal', $post); ?> - -<?php do_action('edit_page_form'); ?> - -<h2><?php _e('Advanced Options'); ?></h2> - - -<?php +<h5><?php _e('Parent') ?></h5> +<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label> +<?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'), 'sort_column'=> 'menu_order, post_title')); ?> +<p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p> +<?php + if ( 0 != count( get_page_templates() ) ) { +?> +<h5><?php _e('Template') ?></h5> +<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template"> +<option value='default'><?php _e('Default Template'); ?></option> +<?php page_template_dropdown($post->page_template); ?> +</select> +<p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p> +<?php + } +?> +<h5><?php _e('Order') ?></h5> +<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p> +<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p> +<?php +} +add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', 'page', 'side', 'core'); + +/** + * Display custom field for page form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function page_custom_meta_box($post){ ?> <div id="postcustomstuff"> -<table cellpadding="3"> <?php $metadata = has_meta($post->ID); list_meta($metadata); -?> - -</table> -<?php - meta_form(); +meta_form(); ?> <div id="ajax-response"></div> </div> <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p> <?php } -add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core'); - +add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'normal', 'core'); + +/** + * Display comments status form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function page_comments_status_meta_box($post){ ?> <input name="advanced_view" type="hidden" value="1" /> @@ -225,92 +328,168 @@ function page_comments_status_meta_box($post){ <?php _e('Allow Comments') ?></label></p> <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p> <p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p> -<?php -} -add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core'); - -function page_password_meta_box($post){ -?> -<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p> -<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p> <?php } -add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core'); - +add_meta_box('pagecommentstatusdiv', __('Discussion'), 'page_comments_status_meta_box', 'page', 'normal', 'core'); + +/** + * Display page slug form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function page_slug_meta_box($post){ ?> <label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /> <?php } -add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'advanced', 'core'); - -function page_parent_meta_box($post){ -?> -<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label> -<select name="parent_id" id="parent_id"> -<option value='0'><?php _e('Main Page (no parent)'); ?></option> -<?php parent_dropdown($post->post_parent); ?> -</select> -<p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p> -<?php -} -add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core'); - -if ( 0 != count( get_page_templates() ) ) { - function page_template_meta_box($post){ -?> -<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template"> -<option value='default'><?php _e('Default Template'); ?></option> -<?php page_template_dropdown($post->page_template); ?> -</select> -<p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p> -<?php - } - add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core'); -} - -function page_order_meta_box($post){ -?> -<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p> -<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p> -<?php -} -add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core'); - +add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core'); -$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM +$authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM if ( $post->post_author && !in_array($post->post_author, $authors) ) $authors[] = $post->post_author; if ( $authors && count( $authors ) > 1 ) { + /** + * Display page author form fields, when more than one author exists. + * + * @since 2.6.0 + * + * @param object $post + */ function page_author_meta_box($post){ global $current_user, $user_ID; - $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM + $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM if ( $post->post_author && !in_array($post->post_author, $authors) ) $authors[] = $post->post_author; ?> <label class="hidden" for="post_author_override"><?php _e('Page Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?> <?php } - add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'advanced', 'core'); + add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'normal', 'core'); } - -if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +/** + * Display list of page revisions. + * + * @since 2.6.0 + * + * @param object $post + */ function page_revisions_meta_box($post) { wp_list_post_revisions(); } -add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'advanced', 'core'); +add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core'); endif; -do_meta_boxes('page', 'advanced', $post); +do_action('do_meta_boxes', 'page', 'normal', $post); +do_action('do_meta_boxes', 'page', 'advanced', $post); +do_action('do_meta_boxes', 'page', 'side', $post); + +require_once('admin-header.php'); +?> + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> + +<form name="post" action="page.php" method="post" id="post"> +<?php if ( $notice ) : ?> +<div id="notice" class="error"><p><?php echo $notice ?></p></div> +<?php endif; ?> +<?php if (isset($_GET['message'])) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<?php endif; ?> + +<?php +wp_nonce_field($nonce_action); + +if (isset($mode) && 'bookmarklet' == $mode) + echo '<input type="hidden" name="mode" value="bookmarklet" />'; +?> +<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" /> +<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' /> +<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" /> +<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" /> +<?php echo $form_extra ?> +<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" /> +<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" /> +<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> +<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?> + +<div id="poststuff" class="metabox-holder"> + +<div id="side-info-column" class="inner-sidebar"> + +<?php + +do_action('submitpage_box'); +$side_meta_boxes = do_meta_boxes('page', 'side', $post); + ?> +</div> + +<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>"> +<div id="post-body-content" class="has-sidebar-content"> + +<div id="titlediv"> +<div id="titlewrap"> + <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" /> +</div> +<div class="inside"> +<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?> + <div id="edit-slug-box"> +<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : + echo $sample_permalink_html; +endif; ?> + </div> +</div> +</div> +<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> + +<?php the_editor($post->post_content); ?> +<div id="post-status-info"> + <span id="wp-word-count" class="alignleft"></span> + <span class="alignright"> + <span id="autosave">&nbsp;</span> + +<?php + if ($post_ID) { + if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) { + $last_user = get_userdata($last_id); + printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); + } else { + printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); + } + } +?> + </span> + <br class="clear" /> </div> + +<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?> +<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> +<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?> +<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?> +<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?> </div> +<?php + +do_meta_boxes('page', 'normal', $post); +do_action('edit_page_form'); +do_meta_boxes('page', 'advanced', $post); + +?> + +</div> +</div> </div> </form> +</div> <script type="text/javascript"> try{document.post.title.focus();}catch(e){} wp-admin/edit-page-form.php @@ -1,199 +1,277 @@ <?php +/** + * Edit Pages Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -// Handle bulk deletes -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) { - check_admin_referer('bulk-pages'); - foreach( (array) $_GET['delete'] as $post_id_del ) { - $post_del = & get_post($post_id_del); - - if ( !current_user_can('delete_page', $post_id_del) ) - wp_die( __('You are not allowed to delete this page.') ); - - if ( $post_del->post_type == 'attachment' ) { - if ( ! wp_delete_attachment($post_id_del) ) - wp_die( __('Error in deleting...') ); - } else { - if ( !wp_delete_post($post_id_del) ) - wp_die( __('Error in deleting...') ); - } +// Handle bulk actions +if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { + $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + switch ( $doaction ) { + case 'delete': + if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { + check_admin_referer('bulk-pages'); + $deleted = 0; + foreach( (array) $_GET['post'] as $post_id_del ) { + $post_del = & get_post($post_id_del); + + if ( !current_user_can('delete_page', $post_id_del) ) + wp_die( __('You are not allowed to delete this page.') ); + + if ( $post_del->post_type == 'attachment' ) { + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); + } else { + if ( !wp_delete_post($post_id_del) ) + wp_die( __('Error in deleting...') ); + } + $deleted++; + } + } + break; + case 'edit': + if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) { + check_admin_referer('bulk-pages'); + + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } + + $done = bulk_edit_posts($_GET); + } + break; } $sendback = wp_get_referer(); if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php'); elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); - $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); - + if ( isset($done) ) { + $done['updated'] = count( $done['updated'] ); + $done['skipped'] = count( $done['skipped'] ); + $done['locked'] = count( $done['locked'] ); + $sendback = add_query_arg( $done, $sendback ); + } + if ( isset($deleted) ) + $sendback = add_query_arg('deleted', $deleted, $sendback); wp_redirect($sendback); exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -$title = __('Pages'); -$parent_file = 'edit.php'; -wp_enqueue_script('admin-forms'); +if ( empty($title) ) + $title = __('Edit Pages'); +$parent_file = 'edit-pages.php'; +wp_enqueue_script('inline-edit-post'); $post_stati = array( // array( adj, noun ) - 'publish' => array(__('Published'), __('Published pages'), __ngettext_noop('Published (%s)', 'Published (%s)')), - 'future' => array(__('Scheduled'), __('Scheduled pages'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')), - 'pending' => array(__('Pending Review'), __('Pending pages'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')), - 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')), - 'private' => array(__('Private'), __('Private pages'), __ngettext_noop('Private (%s)', 'Private (%s)')) + 'publish' => array(__('Published|page'), __('Published pages'), _n_noop('Published <span class="count">(%s)</span>|page', 'Published <span class="count">(%s)</span>')), + 'future' => array(__('Scheduled|page'), __('Scheduled pages'), _n_noop('Scheduled <span class="count">(%s)</span>|page', 'Scheduled <span class="count">(%s)</span>')), + 'pending' => array(__('Pending Review|page'), __('Pending pages'), _n_noop('Pending Review <span class="count">(%s)</span>|page', 'Pending Review <span class="count">(%s)</span>')), + 'draft' => array(__('Draft|page'), _c('Drafts|manage posts header'), _n_noop('Draft <span class="count">(%s)</span>|page', 'Drafts <span class="count">(%s)</span>')), + 'private' => array(__('Private|page'), __('Private pages'), _n_noop('Private <span class="count">(%s)</span>|page', 'Private <span class="count">(%s)</span>')) ); -$post_status_label = __('Manage Pages'); -$post_status_q = ''; +$query = array('post_type' => 'page', 'orderby' => 'menu_order title', 'what_to_show' => 'posts', + 'posts_per_page' => -1, 'posts_per_archive_page' => -1, 'order' => 'asc'); + +$post_status_label = __('Pages'); if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) { $post_status_label = $post_stati[$_GET['post_status']][1]; - $post_status_q = '&post_status=' . $_GET['post_status']; - $post_status_q .= '&perm=readable'; + $query['post_status'] = $_GET['post_status']; + $query['perm'] = 'readable'; } -$query_str = "post_type=page&orderby=menu_order title&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc"; +$query = apply_filters('manage_pages_query', $query); +wp($query); -$query_str = apply_filters('manage_pages_query', $query_str); -wp($query_str); - -if ( is_singular() ) +if ( is_singular() ) { wp_enqueue_script( 'admin-comments' ); -require_once('admin-header.php'); + enqueue_comment_hotkeys_js(); +} + +require_once('admin-header.php'); ?> -?> <div class="wrap"> -<form id="posts-filter" action="" method="get"> -<h2><?php -// Use $_GET instead of is_ since they can override each other -$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes( $_GET['s'] ) ) ) : ''; -$h2_author = ''; -if ( isset($_GET['author']) && $_GET['author'] ) { - $author_user = get_userdata( (int) $_GET['author'] ); - $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?> +</h2> + +<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?> +<div id="message" class="updated fade"><p> +<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) { + printf( __ngettext( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) ); + unset($_GET['updated']); +} + +if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) { + printf( __ngettext( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) ); + unset($_GET['skipped']); +} + +if ( isset($_GET['locked']) && (int) $_GET['locked'] ) { + printf( __ngettext( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) ); + unset($_GET['locked']); +} + +if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) { + printf( __ngettext( 'Page deleted.', '%s pages deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) ); + unset($_GET['deleted']); } -printf( _c( '%1$s%2$s%3$s|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search ); -?></h2> +$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] ); +?> +</p></div> +<?php } ?> + +<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> +<div id="message" class="updated fade"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit page'); ?></a></p></div> +<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); +endif; ?> +<form id="posts-filter" action="" method="get"> <ul class="subsubsub"> <?php $avail_post_stati = get_available_post_statuses('page'); - +if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts('page', 'readable'); +$total_posts = array_sum( (array) $num_posts ); $class = empty($_GET['post_status']) ? ' class="current"' : ''; -$status_links[] = "<li><a href=\"edit-pages.php\"$class>".__('All Pages')."</a>"; +$status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>'; foreach ( $post_stati as $status => $label ) { $class = ''; if ( !in_array($status, $avail_post_stati) ) continue; - if ( $status == $_GET['post_status'] ) + if ( isset( $_GET['post_status'] ) && $status == $_GET['post_status'] ) $class = ' class="current"'; - $status_links[] = "<li><a href=\"edit-pages.php?post_status=$status\"$class>" . - sprintf(__ngettext($label[2][0], $label[2][1], $num_posts->$status), number_format_i18n( $num_posts->$status ) ) . '</a>'; + $status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nc( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; } -echo implode(' |</li>', $status_links) . '</li>'; +echo implode( " |</li>\n", $status_links ) . '</li>'; unset($status_links); +endif; ?> </ul> +<p class="search-box"> + <label class="hidden" for="page-search-input"><?php _e( 'Search Pages' ); ?>:</label> + <input type="text" class="search-input" id="page-search-input" name="s" value="<?php _admin_search_query(); ?>" /> + <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" /> +</p> + <?php if ( isset($_GET['post_status'] ) ) : ?> <input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" /> -<?php -endif; -if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> -<div id="message" class="updated fade"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="page.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit page'); ?></a></p></div> -<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); -endif; -?> +<?php endif; ?> -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> - <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" /> -</p> +<?php if ($posts) { ?> <div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$per_page || $per_page < 0 ) +if( ! isset( $per_page ) || $per_page < 0 ) $per_page = 20; -$num_pages = ceil(count($posts) / $per_page); +$num_pages = ceil($wp_query->post_count / $per_page); $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => $num_pages, 'current' => $pagenum )); -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> - -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +if ( $page_links ) : ?> +<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s', + number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ), + number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ), + number_format_i18n( $wp_query->post_count ), + $page_links +); echo $page_links_text; ?></div> +<?php endif; ?> + +<div class="alignleft actions"> +<select name="action"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-pages'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<?php - -$all = !( $h2_search || $post_status_q ); - -if ($posts) { -?> -<table class="widefat"> +<table class="widefat page fixed" cellspacing="0"> <thead> <tr> -<?php $posts_columns = wp_manage_pages_columns(); ?> -<?php foreach($posts_columns as $post_column_key => $column_display_name) { - if ( 'cb' === $post_column_key ) - $class = ' class="check-column"'; - elseif ( 'comments' === $post_column_key ) - $class = ' class="num"'; - else - $class = ''; -?> - <th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th> -<?php } ?> +<?php print_column_headers('edit-pages'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('edit-pages', false); ?> + </tr> + </tfoot> + <tbody> <?php page_rows($posts, $pagenum, $per_page); ?> </tbody> </table> -</form> - -<div id="ajax-response"></div> - +<div class="tablenav"> <?php -} else { +if ( $page_links ) + echo "<div class='tablenav-pages'>$page_links_text</div>"; ?> -</form> + +<div class="alignleft actions"> +<select name="action2"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> +</div> + +<br class="clear" /> +</div> + +<?php } else { ?> +<div class="clear"></div> <p><?php _e('No pages found.') ?></p> <?php } // end if ($posts) ?> -<div class="tablenav"> -<?php -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> -<br class="clear" /> -</div> +</form> + +<?php inline_edit_row( 'page' ) ?> + +<div id="ajax-response"></div> + <?php @@ -209,24 +287,24 @@ if ( 1 == count($posts) && is_singular() ) : <br class="clear" /> -<table class="widefat" style="margin-top: .5em"> +<table class="widefat" cellspacing="0"> <thead> <tr> - <th scope="col"><?php _e('Comment') ?></th> - <th scope="col"><?php _e('Date') ?></th> - <th scope="col"><?php _e('Actions') ?></th> + <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th> + <th scope="col" class="column-author"><?php _e('Author') ?></th> + <th scope="col" class="column-date"><?php _e('Submitted') ?></th> </tr> </thead> <tbody id="the-comment-list" class="list:comment"> <?php foreach ($comments as $comment) - _wp_comment_row( $comment->comment_ID, 'detail', false, false ); + _wp_comment_row( $comment->comment_ID, 'single', false, false ); ?> </tbody> </table> <?php - +wp_comment_reply(); endif; // comments endif; // posts; @@ -234,4 +312,20 @@ endif; // posts; </div> +<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 pages.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +columns.init('edit-pages'); +/* ]]> */ +</script> + <?php include('admin-footer.php'); ?> wp-admin/edit-pages.php @@ -1,206 +1,27 @@ -<?php if ( ! defined('ABSPATH') ) die(); ?> -<table class="widefat"> +<?php +/** + * Edit posts rows table for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +if ( ! defined('ABSPATH') ) die(); +?> +<table class="widefat post fixed" cellspacing="0"> <thead> <tr> - -<?php $posts_columns = wp_manage_posts_columns(); ?> -<?php foreach($posts_columns as $post_column_key => $column_display_name) { - if ( 'cb' === $post_column_key ) - $class = ' class="check-column"'; - elseif ( 'comments' === $post_column_key ) - $class = ' class="num"'; - else - $class = ''; -?> - <th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th> -<?php } ?> - +<?php print_column_headers('edit'); ?> </tr> </thead> - <tbody> -<?php -if ( have_posts() ) { -$bgcolor = ''; -add_filter('the_title','wp_specialchars'); - -// Create array of post IDs. -$post_ids = array(); -foreach ( $wp_query->posts as $a_post ) - $post_ids[] = $a_post->ID; - -$comment_pending_count = get_pending_comments_num($post_ids); - -while (have_posts()) : the_post(); -$class = 'alternate' == $class ? '' : 'alternate'; -global $current_user; -$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); -$title = get_the_title(); -if ( empty($title) ) - $title = __('(no title)'); -?> - <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top"> - -<?php - -foreach($posts_columns as $column_name=>$column_display_name) { - - switch($column_name) { - - case 'cb': - ?> - <th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /><?php } ?></th> - <?php - break; - case 'modified': - case 'date': - if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) { - $t_time = $h_time = __('Unpublished'); - } else { - if ( 'modified' == $column_name ) { - $t_time = get_the_modified_time(__('Y/m/d g:i:s A')); - $m_time = $post->post_modified; - $time = get_post_modified_time('G', true); - } else { - $t_time = get_the_time(__('Y/m/d g:i:s A')); - $m_time = $post->post_date; - $time = get_post_time('G', true); - } - if ( ( abs(time() - $time) ) < 86400 ) { - if ( ( 'future' == $post->post_status) ) - $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); - else - $h_time = sprintf( __('%s ago'), human_time_diff( $time ) ); - } else { - $h_time = mysql2date(__('Y/m/d'), $m_time); - } - } - ?> - <td><abbr title="<?php echo $t_time ?>"><?php echo apply_filters('post_date_column_time', $h_time, $post, $column_name) ?></abbr></td> - <?php - break; - case 'title': - ?> - <td><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="post.php?action=edit&amp;post=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; } ?></strong> - <?php if ( !empty($post->post_password) ) { _e(' &#8212; <strong>Protected</strong>'); } elseif ('private' == $post->post_status) { _e(' &#8212; <strong>Private</strong>'); } ?></td> - <?php - break; - case 'categories': - ?> - <td><?php - $categories = get_the_category(); - if ( !empty( $categories ) ) { - $out = array(); - foreach ( $categories as $c ) - $out[] = "<a href='edit.php?category_name=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>"; - echo join( ', ', $out ); - } else { - _e('Uncategorized'); - } - ?></td> - <?php - break; - - case 'tags': - ?> - <td><?php - $tags = get_the_tags(); - if ( !empty( $tags ) ) { - $out = array(); - foreach ( $tags as $c ) - $out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>"; - echo join( ', ', $out ); - } else { - _e('No Tags'); - } - ?></td> - <?php - break; - - case 'comments': - ?> - <td class="num"><div class="post-com-count-wrapper"> - <?php - $left = isset($comment_pending_count) ? $comment_pending_count[$post->ID] : 0; - $pending_phrase = sprintf( __('%s pending'), number_format( $left ) ); - if ( $left ) - echo '<strong>'; - comments_number("<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); - if ( $left ) - echo '</strong>'; - ?> - </div></td> - <?php - break; - - case 'author': - ?> - <td><a href="edit.php?author=<?php the_author_ID(); ?>"><?php the_author() ?></a></td> - <?php - break; - - case 'status': - ?> - <td> - <a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink"> - <?php - switch ( $post->post_status ) { - case 'publish' : - case 'private' : - _e('Published'); - break; - case 'future' : - _e('Scheduled'); - break; - case 'pending' : - _e('Pending Review'); - break; - case 'draft' : - _e('Unpublished'); - break; - } - ?> - </a> - </td> - <?php - break; - - case 'control_view': - ?> - <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td> - <?php - break; - - case 'control_edit': - ?> - <td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> - <?php - break; - - case 'control_delete': - ?> - <td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td> - <?php - break; - - default: - ?> - <td><?php do_action('manage_posts_custom_column', $column_name, $id); ?></td> - <?php - break; - } -} -?> + <tfoot> + <tr> +<?php print_column_headers('edit', false); ?> </tr> -<?php -endwhile; -} else { -?> - <tr style='background-color: <?php echo $bgcolor; ?>'> - <td colspan="8"><?php _e('No posts found.') ?></td> - </tr> -<?php -} // end if ( have_posts() ) -?> + </tfoot> + + <tbody> +<?php post_rows(); ?> </tbody> -</table> +</table> \ No newline at end of file wp-admin/edit-post-rows.php @@ -1,41 +1,40 @@ <?php -if ( ! empty($tag_ID) ) { - $heading = __('Edit Tag'); - $submit_text = __('Edit Tag'); - $form = '<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">'; - $action = 'editedtag'; - $nonce_action = 'update-tag_' . $tag_ID; - do_action('edit_tag_form_pre', $tag); -} else { - $heading = __('Add Tag'); - $submit_text = __('Add Tag'); - $form = '<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">'; - $action = 'addtag'; - $nonce_action = 'add-tag'; - do_action('add_tag_form_pre', $tag); +/** + * Edit tag form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +if ( empty($tag_ID) ) { ?> + <div id="message" class="updated fade"><p><strong><?php _e('A tag was not selected for editing.'); ?></strong></p></div> +<?php + return; } -?> + +do_action('edit_tag_form_pre', $tag); ?> <div class="wrap"> -<h2><?php echo $heading ?></h2> +<?php screen_icon(); ?> +<h2><?php _e('Edit Tag'); ?></h2> <div id="ajax-response"></div> -<?php echo $form ?> -<input type="hidden" name="action" value="<?php echo $action ?>" /> +<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"> +<input type="hidden" name="action" value="editedtag" /> <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" /> -<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?> <table class="form-table"> <tr class="form-field form-required"> <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th> - <td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" aria-required="true" /> + <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo attribute_escape($tag->name); ?>" size="40" aria-required="true" /> <p><?php _e('The name is how the tag appears on your site.'); ?></p></td> </tr> <tr class="form-field"> <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th> - <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" /> + <td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" /> <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td> </tr> </table> -<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p> +<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Tag'); ?>" /></p> <?php do_action('edit_tag_form', $tag); ?> </form> </div> wp-admin/edit-tag-form.php @@ -1,12 +1,19 @@ <?php +/** + * Edit Tags Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); $title = __('Tags'); -$parent_file = 'edit.php'; -wp_reset_vars(array('action', 'tag')); +wp_reset_vars( array('action', 'tag') ); -if ( isset($_GET['deleteit']) && isset($_GET['delete_tags']) ) +if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) $action = 'bulk-delete'; switch($action) { @@ -65,6 +72,7 @@ case 'bulk-delete': break; case 'edit': + $title = __('Edit Tag'); require_once ('admin-header.php'); $tag_ID = (int) $_GET['tag_ID']; @@ -100,13 +108,16 @@ break; default: -if ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -wp_enqueue_script( 'admin-tags' ); -wp_enqueue_script('admin-forms'); +$can_manage = current_user_can('manage_categories'); + +wp_enqueue_script('admin-tags'); +if ( $can_manage ) + wp_enqueue_script('inline-edit-tax'); require_once ('admin-header.php'); @@ -115,43 +126,47 @@ $messages[2] = __('Tag deleted.'); $messages[3] = __('Tag updated.'); $messages[4] = __('Tag not added.'); $messages[5] = __('Tag not updated.'); -$messages[6] = __('Tags deleted.'); -?> +$messages[6] = __('Tags deleted.'); ?> + +<div class="wrap nosubsub"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> +</h2> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); endif; ?> -<div class="wrap"> - -<form id="posts-filter" action="" method="get"> -<?php if ( current_user_can('manage_categories') ) : ?> - <h2><?php printf(__('Manage Tags (<a href="%s">add new</a>)'), '#addtag') ?> </h2> -<?php else : ?> - <h2><?php _e('Manage Tags') ?> </h2> -<?php endif; ?> - -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> +<form class="search-form" action="" method="get"> +<p class="search-box"> + <label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label> + <input type="text" class="search-input" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" /> </p> - +</form> <br class="clear" /> -<div class="tablenav"> +<div id="col-container"> +<div id="col-right"> +<div class="col-wrap"> +<form id="posts-filter" action="" method="get"> +<div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$tagsperpage || $tagsperpage < 0 ) - $tagsperpage = 20; + +$tagsperpage = apply_filters("tagsperpage",20); $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => ceil(wp_count_terms('post_tag') / $tagsperpage), 'current' => $pagenum )); @@ -160,53 +175,127 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<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" /> <?php wp_nonce_field('bulk-tags'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<table class="widefat"> +<table class="widefat tag fixed" cellspacing="0"> <thead> <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Name') ?></th> - <th scope="col" class="num" style="width: 90px"><?php _e('Posts') ?></th> +<?php print_column_headers('edit-tags'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('edit-tags', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:tag"> <?php -$searchterms = trim( $_GET['s'] ); +$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : ''; $count = tag_rows( $pagenum, $tagsperpage, $searchterms ); ?> </tbody> </table> -</form> <div class="tablenav"> - <?php if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> + +<div class="alignleft actions"> +<select name="action2"> +<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" /> +</div> + <br class="clear" /> </div> + <br class="clear" /> +</form> +</div> +</div><!-- /col-right --> + +<div id="col-left"> +<div class="col-wrap"> +<div class="tagcloud"> +<h3><?php _e('Popular Tags'); ?></h3> +<?php +if ( $can_manage ) + wp_tag_cloud(array('link' => 'edit')); +else + wp_tag_cloud(); +?> +</div> + +<?php if ( $can_manage ) { + do_action('add_tag_form_pre'); ?> + +<div class="form-wrap"> +<h3><?php _e('Add a New Tag'); ?></h3> +<div id="ajax-response"></div> +<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate"> +<input type="hidden" name="action" value="addtag" /> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?> + +<div class="form-field form-required"> + <label for="name"><?php _e('Tag name') ?></label> + <input name="name" id="name" type="text" value="" size="40" aria-required="true" /> + <p><?php _e('The name is how the tag appears on your site.'); ?></p> </div> -<?php if ( current_user_can('manage_categories') ) : ?> +<div class="form-field"> + <label for="slug"><?php _e('Tag slug') ?></label> + <input name="slug" id="slug" type="text" value="" size="40" /> + <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> +</div> -<br /> -<?php include('edit-tag-form.php'); ?> +<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Tag'); ?>" /></p> +<?php do_action('add_tag_form'); ?> +</form></div> +<?php } ?> -<?php endif; ?> +</div> +</div><!-- /col-left --> + +</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 tags.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> + +<?php inline_edit_term_row('edit-tags'); ?> <?php break; wp-admin/edit-tags.php @@ -1,90 +1,149 @@ <?php +/** + * Edit Posts Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -// Handle bulk deletes -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) { - check_admin_referer('bulk-posts'); - foreach( (array) $_GET['delete'] as $post_id_del ) { - $post_del = & get_post($post_id_del); - - if ( !current_user_can('delete_post', $post_id_del) ) - wp_die( __('You are not allowed to delete this post.') ); - - if ( $post_del->post_type == 'attachment' ) { - if ( ! wp_delete_attachment($post_id_del) ) - wp_die( __('Error in deleting...') ); - } else { - if ( !wp_delete_post($post_id_del) ) - wp_die( __('Error in deleting...') ); - } +// Back-compat for viewing comments of an entry +if ( $_redirect = intval( max( @$_GET['p'], @$_GET['attachment_id'], @$_GET['page_id'] ) ) ) { + wp_redirect( admin_url('edit-comments.php?p=' . $_redirect ) ); + exit; +} else { + unset( $_redirect ); +} + +// Handle bulk actions +if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { + $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + switch ( $doaction ) { + case 'delete': + if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { + check_admin_referer('bulk-posts'); + $deleted = 0; + foreach( (array) $_GET['post'] as $post_id_del ) { + $post_del = & get_post($post_id_del); + + if ( !current_user_can('delete_post', $post_id_del) ) + wp_die( __('You are not allowed to delete this post.') ); + + if ( $post_del->post_type == 'attachment' ) { + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); + } else { + if ( !wp_delete_post($post_id_del) ) + wp_die( __('Error in deleting...') ); + } + $deleted++; + } + } + break; + case 'edit': + if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) { + check_admin_referer('bulk-posts'); + + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } + + $done = bulk_edit_posts($_GET); + } + break; } $sendback = wp_get_referer(); - if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php'); - elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); - $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); - + if ( strpos($sendback, 'post.php') !== false ) $sendback = admin_url('post-new.php'); + elseif ( strpos($sendback, 'attachments.php') !== false ) $sendback = admin_url('attachments.php'); + if ( isset($done) ) { + $done['updated'] = count( $done['updated'] ); + $done['skipped'] = count( $done['skipped'] ); + $done['locked'] = count( $done['locked'] ); + $sendback = add_query_arg( $done, $sendback ); + } + if ( isset($deleted) ) + $sendback = add_query_arg('deleted', $deleted, $sendback); wp_redirect($sendback); exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -$title = __('Posts'); +if ( empty($title) ) + $title = __('Edit Posts'); $parent_file = 'edit.php'; -wp_enqueue_script('admin-forms'); +wp_enqueue_script('inline-edit-post'); list($post_stati, $avail_post_stati) = wp_edit_posts_query(); -if ( 1 == count($posts) && is_singular() ) - wp_enqueue_script( 'admin-comments' ); require_once('admin-header.php'); if ( !isset( $_GET['paged'] ) ) $_GET['paged'] = 1; -?> +if ( empty($_GET['mode']) ) + $mode = 'list'; +else + $mode = attribute_escape($_GET['mode']); ?> <div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?> +</h2> -<form id="posts-filter" action="" method="get"> -<h2><?php -if ( is_single() ) { - printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title)); -} else { - $post_status_label = _c('Manage Posts|manage posts header'); - if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) - $post_status_label = $post_stati[$_GET['post_status']][1]; - if ( $post_listing_pageable && !is_archive() && !is_search() ) - $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label); - else - $h2_noun = $post_status_label; - // Use $_GET instead of is_ since they can override each other - $h2_author = ''; - $_GET['author'] = (int) $_GET['author']; - if ( $_GET['author'] != 0 ) { - if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion - $h2_author = ' ' . __('by other authors'); - } else { - $author_user = get_userdata( get_query_var( 'author' ) ); - $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); - } - } - $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; - $h2_cat = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : ''; - $h2_tag = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with &#8220;%s&#8221;'), single_tag_title('', false) ) : ''; - $h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : ''; - printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month ); +<?php +if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> +<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div> +<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); +endif; ?> + +<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?> +<div id="message" class="updated fade"><p> +<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) { + printf( __ngettext( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) ); + unset($_GET['updated']); +} + +if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) + unset($_GET['skipped']); + +if ( isset($_GET['locked']) && (int) $_GET['locked'] ) { + printf( __ngettext( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) ); + unset($_GET['locked']); +} + +if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) { + printf( __ngettext( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) ); + unset($_GET['deleted']); } -?></h2> + +$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] ); +?> +</p></div> +<?php } ?> + +<form id="posts-filter" action="" method="get"> <ul class="subsubsub"> <?php +if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts( 'post', 'readable' ); +$total_posts = array_sum( (array) $num_posts ); $class = empty( $_GET['post_status'] ) ? ' class="current"' : ''; -$status_links[] = "<li><a href='edit.php' $class>" . __('All Posts') . '</a>'; +$status_links[] = "<li><a href='edit.php' $class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>'; + + foreach ( $post_stati as $status => $label ) { $class = ''; @@ -93,52 +152,53 @@ foreach ( $post_stati as $status => $label ) { if ( empty( $num_posts->$status ) ) continue; - if ( $status == $_GET['post_status'] ) + if ( isset($_GET['post_status']) && $status == $_GET['post_status'] ) $class = ' class="current"'; - $status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . - sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; + $status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; } -echo implode( ' |</li>', $status_links ) . '</li>'; +echo implode( " |</li>\n", $status_links ) . '</li>'; unset( $status_links ); -?> -</ul> - -<?php if ( isset($_GET['post_status'] ) ) : ?> -<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" /> -<?php -endif; - -if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> -<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div> -<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); endif; ?> +</ul> -<p id="post-search"> +<p class="search-box"> <label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" /> + <input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" /> </p> -<div class="tablenav"> +<?php if ( isset($_GET['post_status'] ) ) : ?> +<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" /> +<?php endif; ?> +<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> +<?php if ( have_posts() ) { ?> + +<div class="tablenav"> <?php $page_links = paginate_links( array( 'base' => add_query_arg( 'paged', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => $wp_query->max_num_pages, 'current' => $_GET['paged'] )); -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-posts'); ?> -<?php + +<?php // view filters if ( !is_singular() ) { $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC"; @@ -146,16 +206,18 @@ $arc_result = $wpdb->get_results( $arc_query ); $month_count = count($arc_result); -if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?> +if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { +$m = isset($_GET['m']) ? (int)$_GET['m'] : 0; +?> <select name='m'> -<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option> +<option<?php selected( $m, 0 ); ?> value='0'><?php _e('Show all dates'); ?></option> <?php foreach ($arc_result as $arc_row) { if ( $arc_row->yyear == 0 ) continue; $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 ); - if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] ) + if ( $arc_row->yyear . $arc_row->mmonth == $m ) $default = ' selected="selected"'; else $default = ''; @@ -179,66 +241,75 @@ do_action('restrict_manage_posts'); <?php } ?> </div> -<br class="clear" /> -</div> +<?php if ( $page_links ) { ?> +<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s', + number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ), + number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ), + number_format_i18n( $wp_query->found_posts ), + $page_links +); echo $page_links_text; ?></div> +<?php } ?> -<br class="clear" /> +<div class="view-switch"> + <a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a> + <a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a> +</div> -<?php include( 'edit-post-rows.php' ); ?> +<div class="clear"></div> +</div> -</form> +<div class="clear"></div> -<div id="ajax-response"></div> +<?php include( 'edit-post-rows.php' ); ?> <div class="tablenav"> <?php if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; + echo "<div class='tablenav-pages'>$page_links_text</div>"; ?> +<div class="alignleft actions"> +<select name="action2"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> <br class="clear" /> </div> - <br class="clear" /> +</div> -<?php - -if ( 1 == count($posts) && is_singular() ) : - - $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) ); - if ( $comments ) : - // Make sure comments, post, and post_author are cached - update_comment_cache($comments); - $post = get_post($id); - $authordata = get_userdata($post->post_author); - ?> - -<br class="clear" /> +<?php } else { // have_posts() ?> +<div class="clear"></div> +<p><?php _e('No posts found') ?></p> +<?php } ?> -<table class="widefat" style="margin-top: .5em"> -<thead> - <tr> - <th scope="col"><?php _e('Comment') ?></th> - <th scope="col"><?php _e('Date') ?></th> - <th scope="col"><?php _e('Actions') ?></th> - </tr> -</thead> -<tbody id="the-comment-list" class="list:comment"> -<?php - foreach ($comments as $comment) - _wp_comment_row( $comment->comment_ID, 'detail', false, false ); -?> -</tbody> -</table> +</form> -<?php +<?php inline_edit_row( 'post' ); ?> -endif; // comments -endif; // posts; +<div id="ajax-response"></div> -?> +<br class="clear" /> </div> +<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 posts.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +columns.init('edit'); +/* ]]> */ +</script> + <?php include('admin-footer.php'); ?> wp-admin/edit.php @@ -1,11 +1,21 @@ <?php +/** + * WordPress Export Administration Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once ('admin.php'); + +/** Load WordPress export API */ require_once('includes/export.php'); $title = __('Export'); -$parent_file = 'edit.php'; if ( isset( $_GET['download'] ) ) { - export_wp( $_GET['author'] ); + $author = isset($_GET['author']) ? $_GET['author'] : 'all'; + export_wp( $author ); die(); } @@ -13,7 +23,9 @@ require_once ('admin-header.php'); ?> <div class="wrap"> -<h2><?php _e('Export'); ?></h2> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> + <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p> <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p> <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p> @@ -37,7 +49,7 @@ foreach ( $authors as $id ) { </td> </tr> </table> -<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?>" /> +<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Download Export File'); ?>" /> <input type="hidden" name="download" value="true" /> </p> </form> wp-admin/export.php @@ -1,20 +1,83 @@ <?php +/** + * Defines the Gears manifest file for Google Gears offline storage. + * + * @package WordPress + * @subpackage Administration + */ +/** Set ABSPATH for execution */ define( 'ABSPATH', dirname(dirname(__FILE__)) ); define( 'WPINC', '/wp-includes' ); +/** + * @ignore + */ function __() {} + +/** + * @ignore + */ +function _c() {} + +/** + * @ignore + */ function add_filter() {} + +/** + * @ignore + */ function attribute_escape() {} + +/** + * @ignore + */ function apply_filters() {} + +/** + * @ignore + */ function get_option() {} + +/** + * @ignore + */ function is_lighttpd_before_150() {} + +/** + * @ignore + */ function add_action() {} + +/** + * @ignore + */ function do_action_ref_array() {} + +/** + * @ignore + */ function get_bloginfo() {} + +/** + * @ignore + */ function is_admin() {return true;} + +/** + * @ignore + */ function site_url() {} + +/** + * @ignore + */ function admin_url() {} + +/** + * @ignore + */ function wp_guess_url() {} require(ABSPATH . '/wp-includes/script-loader.php'); @@ -28,8 +91,9 @@ wp_default_styles($wp_styles); $defaults = $man_version = ''; foreach ( $wp_scripts->registered as $script ) { - if ( empty($script->src) || strpos($script->src, 'tiny_mce_config.php') ) continue; + if ( empty($script->src) ) continue; $ver = empty($script->ver) ? $wp_version : $script->ver; + if ( 'editor' == $script->handle ) $mce_ver = $script->ver; $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src ); $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n"; $man_version .= $ver; @@ -46,7 +110,7 @@ foreach ( $wp_styles->registered as $style ) { if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) { if ( is_bool( $style->extra['rtl'] ) ) $rtl_href = str_replace( '.css', '-rtl.css', $src ); - else + else $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n"; @@ -64,7 +128,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); ?> { "betaManifestVersion" : 1, -"version" : "<?php echo $man_version; ?>_20080810", +"version" : "<?php echo $man_version; ?>_20081201", "entries" : [ <?php echo $defaults; ?> @@ -72,85 +136,126 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "images/align-left.png" }, { "url" : "images/align-none.png" }, { "url" : "images/align-right.png" }, +{ "url" : "images/archive-link.png" }, +{ "url" : "images/blue-grad.png" }, { "url" : "images/browse-happy.gif" }, { "url" : "images/bubble_bg.gif" }, +{ "url" : "images/bubble_bg-rtl.gif" }, +{ "url" : "images/button-grad.png" }, +{ "url" : "images/button-grad-active.png" }, { "url" : "images/comment-grey-bubble.png" }, -{ "url" : "images/comment-pill.gif" }, -{ "url" : "images/comment-stalk-classic.gif" }, -{ "url" : "images/comment-stalk-fresh.gif" }, -{ "url" : "images/comment-stalk-rtl.gif" }, { "url" : "images/date-button.gif" }, +{ "url" : "images/ed-bg.gif" }, { "url" : "images/fade-butt.png" }, -{ "url" : "images/gear.png" }, +{ "url" : "images/fav.png" }, +{ "url" : "images/fav-arrow.gif" }, +{ "url" : "images/fav-arrow-rtl.gif" }, +{ "url" : "images/fav-top.png" }, +{ "url" : "images/generic.png" }, +{ "url" : "images/gray-grad.png" }, +{ "url" : "images/icons32.png" }, +{ "url" : "images/icons32-vs.png" }, +{ "url" : "images/list.png" }, +{ "url" : "images/list-vs.png" }, +{ "url" : "images/loading.gif" }, +{ "url" : "images/loading-publish.gif" }, +{ "url" : "images/logo.gif" }, { "url" : "images/logo-ghost.png" }, { "url" : "images/logo-login.gif" }, -{ "url" : "images/logo.gif" }, -{ "url" : "images/media-button-gallery.gif" }, { "url" : "images/media-button-image.gif" }, { "url" : "images/media-button-music.gif" }, { "url" : "images/media-button-other.gif" }, { "url" : "images/media-button-video.gif" }, -{ "url" : "images/media-buttons.gif" }, -{ "url" : "images/tab.png" }, -{ "url" : "images/tail.gif" }, -{ "url" : "images/toggle-arrow-rtl.gif" }, +{ "url" : "images/menu.png" }, +{ "url" : "images/menu-vs.png" }, +{ "url" : "images/menu-arrows.gif" }, +{ "url" : "images/menu-bits.gif" }, +{ "url" : "images/menu-bits-rtl.gif" }, +{ "url" : "images/menu-dark.gif" }, +{ "url" : "images/menu-dark-rtl.gif" }, +{ "url" : "images/no.png" }, +{ "url" : "images/required.gif" }, +{ "url" : "images/resize.gif" }, +{ "url" : "images/screen-options-left.gif" }, +{ "url" : "images/screen-options-right.gif" }, +{ "url" : "images/screen-options-right-up.gif" }, +{ "url" : "images/se.png" }, +{ "url" : "images/star.gif" }, { "url" : "images/toggle-arrow.gif" }, +{ "url" : "images/toggle-arrow-rtl.gif" }, +{ "url" : "images/white-grad.png" }, +{ "url" : "images/white-grad-active.png" }, { "url" : "images/wordpress-logo.png" }, +{ "url" : "images/wp-logo.gif" }, { "url" : "images/xit.gif" }, -{ "url" : "images/loading-publish.gif" }, -{ "url" : "images/loading.gif" }, -{ "url" : "images/required.gif" }, -{ "url" : "images/no.png" }, { "url" : "images/yes.png" }, -<?php if ( is_file(ABSPATH.'/wp-includes/js/tinymce/tiny_mce.js') ) { ?> -{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" }, -{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" }, - -{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" }, -{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" }, - -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" }, +<?php if ( is_file('../wp-includes/js/tinymce/tiny_mce.js') ) { ?> +{ "url" : "../wp-includes/js/tinymce/tiny_mce.js", "src" : "../wp-includes/js/tinymce/tiny_mce.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/langs/wp-langs-en.js", "src" : "../wp-includes/js/tinymce/langs/wp-langs-en.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/wordpress.css", "src" : "../wp-includes/js/tinymce/wordpress.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js", "src" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/validate.js", "src" : "../wp-includes/js/tinymce/utils/validate.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js", "src" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js", "src" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js", "src" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js", "src" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js", "src" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm", "src" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" }, @@ -179,18 +284,22 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.gif" }, +{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png" }, <?php } ?> { "url" : "../wp-includes/images/crystal/archive.png" }, @@ -204,6 +313,5 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "../wp-includes/images/crystal/spreadsheet.png" }, { "url" : "../wp-includes/images/rss.png" }, { "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" }, -{ "url" : "../wp-includes/js/thickbox/tb-close.png" }, -{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" } +{ "url" : "../wp-includes/js/thickbox/tb-close.png" } ]} wp-admin/gears-manifest.php wp-admin/images/browse-happy.gif wp-admin/images/loading-publish.gif wp-admin/images/logo-ghost.png wp-admin/images/logo-login.gif wp-admin/images/logo.gif @@ -1,12 +1,21 @@ <?php +/** + * Import WordPress Administration Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once ('admin.php'); $title = __('Import'); -$parent_file = 'edit.php'; require_once ('admin-header.php'); +$parent_file = 'tools.php'; ?> <div class="wrap"> -<h2><?php _e('Import'); ?></h2> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> <p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p> <?php @@ -32,7 +41,7 @@ if (empty ($importers)) { echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful } else { ?> -<table class="widefat"> +<table class="widefat" cellspacing="0"> <?php $style = ''; wp-admin/import.php @@ -1,14 +1,51 @@ <?php - -define( 'MAX_RESULTS', 50 ); // How many records per GData query -define( 'MAX_EXECUTION_TIME', 20 ); // How many seconds to let the script run -define( 'STATUS_INTERVAL', 3 ); // How many seconds between status bar updates - +/** + * Blogger Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * How many records per GData query + * + * @package WordPress + * @subpackage Blogger_Import + * @var int + * @since unknown + */ +define( 'MAX_RESULTS', 50 ); + +/** + * How many seconds to let the script run + * + * @package WordPress + * @subpackage Blogger_Import + * @var int + * @since unknown + */ +define( 'MAX_EXECUTION_TIME', 20 ); + +/** + * How many seconds between status bar updates + * + * @package WordPress + * @subpackage Blogger_Import + * @var int + * @since unknown + */ +define( 'STATUS_INTERVAL', 3 ); + +/** + * Blogger Importer class + * + * @since unknown + */ class Blogger_Import { // Shows the welcome screen and the magic auth link. function greet() { - $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&noheader=true'; + $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&amp;noheader=true'; $auth_url = "https://www.google.com/accounts/AuthSubRequest"; $title = __('Import Blogger'); $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.'); @@ -17,7 +54,10 @@ class Blogger_Import { $auth = __('Authorize'); echo " - <div class='wrap'><h2>$title</h2><p>$welcome</p><p>$prereqs</p><p>$stepone</p> + <div class='wrap'> + ".screen_icon()." + <h2>$title</h2> + <p>$welcome</p><p>$prereqs</p><p>$stepone</p> <form action='$auth_url' method='get'> <p class='submit' style='text-align:left;'> <input type='submit' class='button' value='$auth' /> @@ -31,7 +71,9 @@ class Blogger_Import { } function uh_oh($title, $message, $info) { - echo "<div class='wrap'><h2>$title</h2><p>$message</p><pre>$info</pre></div>"; + echo "<div class='wrap'>"; + screen_icon(); + echo "<h2>$title</h2><p>$message</p><pre>$info</pre></div>"; } function auth() { @@ -181,9 +223,10 @@ class Blogger_Import { $rows .= "<tr id='blog$i'><td class='blogtitle'>$blogtitle</td><td class='bloghost'>{$blog['host']}</td><td class='bar'>$pstat</td><td class='bar'>$cstat</td><td class='submit'><input type='submit' class='button' id='submit$i' value='$value' /><input type='hidden' name='blog' value='$i' /></td></tr>\n"; } - echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></thead>\n$rows</table></form></div>"; + echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><tr><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></tr></thead>\n$rows</table></div>"; echo " <script type='text/javascript'> + /* <![CDATA[ */ var strings = {cont:'$continue',stop:'$stop',stopping:'$stopping',authors:'$authors',nothing:'$nothing'}; var blogs = {}; function blog(i, title, mode, status){ @@ -296,6 +339,7 @@ class Blogger_Import { }; $init jQuery.each(blogs, function(i, me){me.init();}); + /* ]]> */ </script>\n"; } @@ -485,7 +529,7 @@ class Blogger_Import { } function import_post( $entry ) { - global $wpdb, $importing_blog; + global $importing_blog; // The old permalink is all Blogger gives us to link comments to their posts. if ( isset( $entry->draft ) ) @@ -618,11 +662,11 @@ class Blogger_Import { foreach ( $blog['authors'] as $i => $author ) $rows .= "<tr><td><label for='authors[$i]'>{$author[0]}</label></td><td><select name='authors[$i]' id='authors[$i]'>" . $this->get_user_options($author[1]) . "</select></td></tr>"; - return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>"; + return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&amp;noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>"; } function get_user_options($current) { - global $wpdb, $importer_users; + global $importer_users; if ( ! isset( $importer_users ) ) $importer_users = (array) get_users_of_blog(); @@ -777,7 +821,7 @@ class Blogger_Import { echo $result->get_error_message(); } elseif ( isset($_GET['token']) ) $this->auth(); - elseif ( $this->token && $this->token_is_valid() ) + elseif ( isset($this->token) && $this->token_is_valid() ) $this->show_blogs(); else $this->greet(); @@ -788,7 +832,7 @@ class Blogger_Import { $restart = __('Restart'); $message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.'); $submit = __('Clear account information'); - echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>"; + echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&amp;noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>"; } } wp-admin/import/blogger.php @@ -1,13 +1,27 @@ <?php - -/* By Shayne Sweeney - http://www.theshayne.com/ */ - +/** + * Blogware XML Importer + * + * @package WordPress + * @subpackage Importer + * @author Shayne Sweeney + * @link http://www.theshayne.com/ + */ + +/** + * Blogware XML Importer class + * + * Extract posts from Blogware XML export file into your blog. + * + * @since unknown + */ class BW_Import { var $file; function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Blogware').'</h2>'; } wp-admin/import/blogware.php @@ -1,9 +1,24 @@ <?php - +/** + * BunnyTags Plugin Tag Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * BunnyTags Plugin tag converter + * + * This will process the BunnyTags plugin tags and convert them to the WordPress + * 2.3 taxonomy. + * + * @since unknown + */ class BunnyTags_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Bunny&#8217;s Technorati Tags').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>'; } @@ -20,7 +35,7 @@ class BunnyTags_Import { echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>'; echo '<form action="admin.php?import=btt&amp;step=1" method="post">'; wp_nonce_field('import-btt'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Tags').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Tags').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -90,7 +105,7 @@ class BunnyTags_Import { echo '<form action="admin.php?import=btt&amp;step='.($precheck? 2:3).'" method="post">'; wp_nonce_field('import-btt'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>'; echo '</form>'; echo '</div>'; } wp-admin/import/btt.php @@ -1,7 +1,11 @@ <?php -/* - * DotClear import plugin - * by Thomas Quinot - http://thomas.quinot.org/ +/** + * DotClear Importer + * + * @package WordPress + * @subpackage Importer + * @author Thomas Quinot + * @link http://thomas.quinot.org/ */ /** @@ -10,6 +14,15 @@ if(!function_exists('get_comment_count')) { + /** + * Get the comment count for posts. + * + * @package WordPress + * @subpackage Dotclear_Import + * + * @param int $post_ID Post ID + * @return int + */ function get_comment_count($post_ID) { global $wpdb; @@ -19,6 +32,15 @@ if(!function_exists('get_comment_count')) if(!function_exists('link_exists')) { + /** + * Check whether link already exists. + * + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $linkname + * @return int + */ function link_exists($linkname) { global $wpdb; @@ -40,31 +62,73 @@ if(!function_exists('link_exists')) // This cries out for a C-implementation to be included in PHP core // +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_1byte($char) { if(!is_int($char)) return false; return ($char & 0x80) == 0x00; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_2byte($char) { if(!is_int($char)) return false; return ($char & 0xE0) == 0xC0; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_3byte($char) { if(!is_int($char)) return false; return ($char & 0xF0) == 0xE0; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_4byte($char) { if(!is_int($char)) return false; return ($char & 0xF8) == 0xF0; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_nextbyte($char) { if(!is_int($char)) return false; return ($char & 0xC0) == 0x80; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $string + * @return string + */ function valid_utf8($string) { $len = strlen($string); $i = 0; @@ -92,6 +156,13 @@ function valid_utf8($string) { return true; // done } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $s + * @return string + */ function csc ($s) { if (valid_utf8 ($s)) { return $s; @@ -100,18 +171,34 @@ function csc ($s) { } } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $s + * @return string + */ function textconv ($s) { return csc (preg_replace ('|(?<!<br />)\s*\n|', ' ', $s)); } /** - The Main Importer Class -**/ + * Dotclear Importer class + * + * Will process the WordPress eXtended RSS files that you upload from the export + * file. + * + * @package WordPress + * @subpackage Importer + * + * @since unknown + */ class Dotclear_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import DotClear').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>'; } @@ -128,7 +215,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">'; wp_nonce_field('import-dotclear'); $this->db_form(); - echo '<p class="submit"><input type="submit" name="submit" value="'.attribute_escape(__('Import Categories')).'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.attribute_escape(__('Import Categories')).'" /></p>'; echo '</form></div>'; } @@ -545,7 +632,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&amp;step=2" method="post">'; wp_nonce_field('import-dotclear'); - printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Users'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Users'))); echo '</form>'; } @@ -558,7 +645,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&amp;step=3" method="post">'; wp_nonce_field('import-dotclear'); - printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Posts'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Posts'))); echo '</form>'; } @@ -572,7 +659,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&amp;step=4" method="post">'; wp_nonce_field('import-dotclear'); - printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Comments'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Comments'))); echo '</form>'; } @@ -584,7 +671,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&amp;step=5" method="post">'; wp_nonce_field('import-dotclear'); - printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Links'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Links'))); echo '</form>'; } @@ -597,7 +684,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&amp;step=6" method="post">'; wp_nonce_field('import-dotclear'); - printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Finish'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Finish'))); echo '</form>'; } @@ -644,7 +731,7 @@ class Dotclear_Import { printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('DotClear Database User:')); printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:')); printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('DotClear Database Name:')); - printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" nameid="dbhost" value="localhost" /></td></tr>', __('DotClear Database Host:')); + printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" id="dbhost" value="localhost" /></td></tr>', __('DotClear Database Host:')); printf('<tr><th><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" value="dc_"/></td></tr>', __('DotClear Table prefix:')); printf('<tr><th><label for="dccharset">%s</label></th><td><input type="text" name="dccharset" id="dccharset" value="ISO-8859-15"/></td></tr>', __('Originating character set:')); echo '</table>'; @@ -742,5 +829,7 @@ class Dotclear_Import { } $dc_import = new Dotclear_Import(); + register_importer('dotclear', __('DotClear'), __('Import categories, users, posts, comments, and links from a DotClear blog.'), array ($dc_import, 'dispatch')); + ?> wp-admin/import/dotclear.php @@ -1,11 +1,26 @@ <?php - +/** + * GreyMatter Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * GreyMatter Importer class + * + * Basic GreyMatter to WordPress importer, will import posts, comments, and + * posts karma. + * + * @since unknown + */ class GM_Import { var $gmnames = array (); function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import GreyMatter').'</h2>'; } @@ -31,7 +46,7 @@ class GM_Import { </ul> <p>&nbsp;</p> -<form name="stepOne" method="get"> +<form name="stepOne" method="get" action=""> <input type="hidden" name="import" value="greymatter" /> <input type="hidden" name="step" value="1" /> <?php wp_nonce_field('import-greymatter'); ?> @@ -51,8 +66,7 @@ class GM_Import { <?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td> </tr> </table> -</p> -<p><input type="submit" name="submit" value="<?php _e('Start Importing') ?>" class="button" /></p> +<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Start Importing') ?>" /></p> </form> <?php $this->footer(); wp-admin/import/greymatter.php @@ -1,9 +1,23 @@ <?php - +/** + * Jeromes Keyword Plugin Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * Jeromes Keyword Plugin Importer class + * + * Will convert Jeromes Keyword Plugin tags to WordPress taxonomy tags. + * + * @since 2.3 + */ class JeromesKeyword_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Jerome&#8217;s Keywords').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>'; } @@ -106,7 +120,7 @@ class JeromesKeyword_Import { echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 2:6).'" method="post">'; wp_nonce_field('import-jkw'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -139,7 +153,7 @@ class JeromesKeyword_Import { } echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 4:5).'" method="post">'; wp_nonce_field('import-jkw'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>'; echo '</form>'; echo '</div>'; } wp-admin/import/jkw.php @@ -1,11 +1,25 @@ <?php - +/** + * LiveJournal Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * LiveJournal Importer class + * + * Imports your LiveJournal XML exported file into WordPress. + * + * @since unknown + */ class LJ_Import { var $file; function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import LiveJournal').'</h2>'; } wp-admin/import/livejournal.php @@ -1,5 +1,18 @@ <?php - +/** + * Movable Type and Typepad Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * Moveable Type and Typepad Importer class + * + * Upload your exported Movable Type or Typepad entries into WordPress. + * + * @since unknown + */ class MT_Import { var $posts = array (); @@ -11,6 +24,7 @@ class MT_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Movable Type or TypePad').'</h2>'; } @@ -32,7 +46,7 @@ class MT_Import { <input type="hidden" name="upload_type" value="ftp" /> <?php _e('Or use <code>mt-export.txt</code> in your <code>/wp-content/</code> directory'); ?></p> <p class="submit"> -<input type="submit" value="<?php echo attribute_escape(__('Import mt-export.txt')); ?>" /> +<input type="submit" class="button" value="<?php echo attribute_escape(__('Import mt-export.txt')); ?>" /> </p> </form> <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p> @@ -42,7 +56,7 @@ class MT_Import { } function users_form($n) { - global $wpdb, $testing; + global $wpdb; $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); ?><select name="userselect[<?php echo $n; ?>]"> <option value="#NONE#"><?php _e('- Select -') ?></option> @@ -56,12 +70,38 @@ class MT_Import { </select> <?php + } + + function has_gzip() { + return is_callable('gzopen'); + } + + function fopen($filename, $mode='r') { + if ( $this->has_gzip() ) + return gzopen($filename, $mode); + return fopen($filename, $mode); + } + function feof($fp) { + if ( $this->has_gzip() ) + return gzeof($fp); + return feof($fp); } + function fgets($fp, $len=8192) { + if ( $this->has_gzip() ) + return gzgets($fp, $len); + return fgets($fp, $len); + } + + function fclose($fp) { + if ( $this->has_gzip() ) + return gzclose($fp); + return fclose($fp); + } + //function to check the authorname and do the mapping function checkauthor($author) { - global $wpdb; //mtnames is an array with the names in the mt import file $pass = wp_generate_password(); if (!(in_array($author, $this->mtnames))) { //a new mt author name is found @@ -69,7 +109,7 @@ class MT_Import { $this->mtnames[$this->j] = $author; //add that new mt author name to an array $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user if (!$user_id) { //banging my head against the desk now. - if ($newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname + if ($this->newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname $user_id = wp_create_user($author, $pass); $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank. } else { @@ -90,12 +130,12 @@ class MT_Import { $temp = array(); $authors = array(); - $handle = fopen($this->file, 'r'); + $handle = $this->fopen($this->file, 'r'); if ( $handle == null ) return false; $in_comment = false; - while ( $line = fgets($handle) ) { + while ( $line = $this->fgets($handle) ) { $line = trim($line); if ( 'COMMENT:' == $line ) @@ -118,7 +158,7 @@ class MT_Import { array_push($authors, "$next"); } - fclose($handle); + $this->fclose($handle); return $authors; } @@ -152,6 +192,7 @@ class MT_Import { function mt_authors_form() { ?> <div class="wrap"> +<?php screen_icon(); ?> <h2><?php _e('Assign Authors'); ?></h2> <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as admin\'s entries.'); ?></p> <p><?php _e('Below, you can see the names of the authors of the MovableType posts in <em>italics</em>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p> @@ -171,7 +212,7 @@ class MT_Import { echo '</label></li>'; } - echo '<input type="submit" value="'.__('Submit').'">'.'<br />'; + echo '<p class="submit"><input type="submit" class="button" value="'.__('Submit').'"></p>'.'<br />'; echo '</form>'; echo '</ol></div>'; @@ -224,10 +265,10 @@ class MT_Import { if ( 0 != count($post->categories) ) { wp_create_categories($post->categories, $post_id); } - + // Add tags or keywords if ( 1 < strlen($post->post_keywords) ) { - // Keywords exist. + // Keywords exist. printf(__('<br />Adding tags <i>%s</i>...'), stripslashes($post->post_keywords)); wp_add_post_tags($post_id, $post->post_keywords); } @@ -273,7 +314,7 @@ class MT_Import { function process_posts() { global $wpdb; - $handle = fopen($this->file, 'r'); + $handle = $this->fopen($this->file, 'r'); if ( $handle == null ) return false; @@ -286,7 +327,7 @@ class MT_Import { echo "<div class='wrap'><ol>"; - while ( $line = fgets($handle) ) { + while ( $line = $this->fgets($handle) ) { $line = trim($line); if ( '-----' == $line ) { @@ -415,6 +456,8 @@ class MT_Import { } } + $this->fclose($handle); + echo '</ol>'; wp_import_cleanup($this->id); wp-admin/import/mt.php @@ -1,5 +1,20 @@ <?php - +/** + * RSS Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * RSS Importer + * + * Will process a RSS feed for importing posts into WordPress. This is a very + * limited importer and should only be used as the last resort, when no other + * importer is available. + * + * @since unknown + */ class RSS_Import { var $posts = array (); @@ -7,6 +22,7 @@ class RSS_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import RSS').'</h2>'; } wp-admin/import/rss.php @@ -1,7 +1,22 @@ <?php +/** + * Simple Tags Plugin Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * Simple Tags Plugin Tags converter class. + * + * Will convert Simple Tags Plugin tags over to the WordPress 2.3 taxonomy. + * + * @since unknown + */ class STP_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Simple Tagging').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>'; } @@ -18,7 +33,7 @@ class STP_Import { echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>'; echo '<form action="admin.php?import=stp&amp;step=1" method="post">'; wp_nonce_field('import-stp'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 1').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 1').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -78,7 +93,7 @@ class STP_Import { echo '<form action="admin.php?import=stp&amp;step=2" method="post">'; wp_nonce_field('import-stp'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 2').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 2').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -94,7 +109,7 @@ class STP_Import { echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> tag was added!', 'Done! <strong>%s</strong> tags were added!', $tags_added), $tags_added ) . '<br /></p>'; echo '<form action="admin.php?import=stp&amp;step=3" method="post">'; wp_nonce_field('import-stp'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 3').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 3').'" /></p>'; echo '</form>'; echo '</div>'; } wp-admin/import/stp.php @@ -1,10 +1,22 @@ <?php /** - Add These Functions to make our lives easier -**/ + * TextPattern Importer + * + * @package WordPress + * @subpackage Importer + */ if(!function_exists('get_comment_count')) { + /** + * Get the comment count for posts. + * + * @package WordPress + * @subpackage Textpattern_Import + * + * @param int $post_ID Post ID + * @return int + */ function get_comment_count($post_ID) { global $wpdb; @@ -14,6 +26,15 @@ if(!function_exists('get_comment_count')) if(!function_exists('link_exists')) { + /** + * Check whether link already exists. + * + * @package WordPress + * @subpackage Textpattern_Import + * + * @param string $linkname + * @return int + */ function link_exists($linkname) { global $wpdb; @@ -22,13 +43,16 @@ if(!function_exists('link_exists')) } /** - The Main Importer Class -**/ + * TextPattern Importer Class + * + * @since unknown + */ class Textpattern_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Textpattern').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>'; } @@ -46,7 +70,7 @@ class Textpattern_Import { echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">'; wp_nonce_field('import-textpattern'); $this->db_form(); - echo '<p class="submit"><input type="submit" class="button" name="submit" value="'.attribute_escape(__('Import')).'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.attribute_escape(__('Import')).'" /></p>'; echo '</form>'; echo '</div>'; } @@ -481,7 +505,7 @@ class Textpattern_Import { echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">'; wp_nonce_field('import-textpattern'); - printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Users'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Users'))); echo '</form>'; } @@ -494,7 +518,7 @@ class Textpattern_Import { echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">'; wp_nonce_field('import-textpattern'); - printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Posts'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Posts'))); echo '</form>'; } @@ -508,7 +532,7 @@ class Textpattern_Import { echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">'; wp_nonce_field('import-textpattern'); - printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Comments'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Comments'))); echo '</form>'; } @@ -520,7 +544,7 @@ class Textpattern_Import { echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">'; wp_nonce_field('import-textpattern'); - printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Import Links'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Import Links'))); echo '</form>'; } @@ -533,7 +557,7 @@ class Textpattern_Import { echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">'; wp_nonce_field('import-textpattern'); - printf('<input type="submit" class="button" name="submit" value="%s" />', attribute_escape(__('Finish'))); + printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attribute_escape(__('Finish'))); echo '</form>'; } @@ -670,5 +694,7 @@ class Textpattern_Import { } $txp_import = new Textpattern_Import(); + register_importer('textpattern', __('Textpattern'), __('Import categories, users, posts, comments, and links from a Textpattern blog.'), array ($txp_import, 'dispatch')); + ?> wp-admin/import/textpattern.php @@ -1,9 +1,23 @@ <?php - +/** + * The Ultimate Tag Warrior Importer. + * + * @package WordPress + * @subpackage Importer + */ + +/** + * Ultimate Tag Warrior Converter to 2.3 taxonomy. + * + * This converts the Ultimate Tag Warrior tags to the 2.3 WordPress taxonomy. + * + * @since 2.3.0 + */ class UTW_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Ultimate Tag Warrior').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>'; } @@ -19,7 +33,7 @@ class UTW_Import { echo '<p>'.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 5-step program to help you kick that nasty UTW habit. Just keep clicking along and we will let you know when you are in the clear!').'</p>'; echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>'; echo '<form action="admin.php?import=utw&amp;step=1" method="post">'; - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 1').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 1').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -106,7 +120,7 @@ class UTW_Import { echo '<form action="admin.php?import=utw&amp;step=2" method="post">'; wp_nonce_field('import-utw'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 2').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 2').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -142,7 +156,7 @@ class UTW_Import { echo '<form action="admin.php?import=utw&amp;step=3" method="post">'; wp_nonce_field('import-utw'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 3').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 3').'" /></p>'; echo '</form>'; echo '</div>'; @@ -161,7 +175,7 @@ class UTW_Import { echo '<form action="admin.php?import=utw&amp;step=4" method="post">'; wp_nonce_field('import-utw'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 4').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 4').'" /></p>'; echo '</form>'; echo '</div>'; wp-admin/import/utw.php @@ -1,5 +1,19 @@ <?php - +/** + * WordPress Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * WordPress Importer + * + * Will process the WordPress eXtended RSS files that you upload from the export + * file. + * + * @since unknown + */ class WP_Import { var $post_ids_processed = array (); @@ -20,6 +34,7 @@ class WP_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import WordPress').'</h2>'; } @@ -35,7 +50,7 @@ class WP_Import { function greet() { echo '<div class="narrow">'; - echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, comments, custom fields, and categories into this blog.').'</p>'; + echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this blog.').'</p>'; echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>'; wp_import_upload_form("admin.php?import=wordpress&amp;step=1"); echo '</div>'; @@ -92,6 +107,11 @@ class WP_Import { if ( !$is_wxr_file && preg_match('|xmlns:wp="http://wordpress[.]org/export/\d+[.]\d+/"|', $importline) ) $is_wxr_file = true; + if ( false !== strpos($importline, '<wp:base_site_url>') ) { + preg_match('|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url); + $this->base_url = $url[1]; + continue; + } if ( false !== strpos($importline, '<wp:category>') ) { preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category); $this->categories[] = $category[1]; @@ -178,6 +198,7 @@ class WP_Import { function wp_authors_form() { ?> +<?php screen_icon(); ?> <h2><?php _e('Assign Authors'); ?></h2> <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p> <?php @@ -187,9 +208,9 @@ class WP_Import { $authors = $this->get_wp_authors(); - echo '<ol id="authors">'; echo '<form action="?import=wordpress&amp;step=2&amp;id=' . $this->id . '" method="post">'; wp_nonce_field('import-wordpress'); + echo '<ol id="authors">'; $j = -1; foreach ($authors as $author) { ++ $j; @@ -201,6 +222,7 @@ class WP_Import { if ( $this->allow_fetch_attachments() ) { ?> </ol> +<?php screen_icon(); ?> <h2><?php _e('Import Attachments'); ?></h2> <p> <input type="checkbox" value="1" name="attachments" id="import-attachments" /> @@ -210,7 +232,9 @@ class WP_Import { <?php } - echo '<input type="submit" value="'.attribute_escape( __('Submit') ).'">'.'<br />'; + echo '<p class="submit">'; + echo '<input type="submit" class="button" value="'.attribute_escape( __('Submit') ).'" />'.'<br />'; + echo '</p>'; echo '</form>'; } @@ -218,7 +242,7 @@ class WP_Import { function users_form($n, $author) { if ( $this->allow_create_users() ) { - printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"></label> <br />'); + printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30" /></label> <br />'); } else { echo __('Map to existing').'<br />'; @@ -320,7 +344,6 @@ class WP_Import { } function process_posts() { - $i = -1; echo '<ol>'; $this->get_entries(array(&$this, 'process_post')); @@ -339,7 +362,7 @@ class WP_Import { $post_ID = (int) $this->get_tag( $post, 'wp:post_id' ); if ( $post_ID && !empty($this->post_ids_processed[$post_ID]) ) // Processed already return 0; - + set_time_limit( 60 ); // There are only ever one of these @@ -390,6 +413,7 @@ class WP_Import { if ( $post_exists ) { echo '<li>'; printf(__('Post <em>%s</em> already exists.'), stripslashes($post_title)); + $comment_post_ID = $post_id = $post_exists; } else { // If it has parent, process parent first. @@ -410,6 +434,7 @@ class WP_Import { $post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt', 'post_title', 'post_status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent', 'menu_order', 'post_type', 'post_password'); + $postdata['import_id'] = $post_ID; if ($post_type == 'attachment') { $remote_url = $this->get_tag( $post, 'wp:attachment_url' ); if ( !$remote_url ) @@ -436,6 +461,8 @@ class WP_Import { if (count($categories) > 0) { $post_cats = array(); foreach ($categories as $category) { + if ( '' == $category ) + continue; $slug = sanitize_term_field('slug', $category, 0, 'category', 'db'); $cat = get_term_by('slug', $slug, 'category'); $cat_ID = 0; @@ -444,6 +471,8 @@ class WP_Import { if ($cat_ID == 0) { $category = $wpdb->escape($category); $cat_ID = wp_insert_category(array('cat_name' => $category)); + if ( is_wp_error($cat_ID) ) + continue; } $post_cats[] = $cat_ID; } @@ -454,6 +483,8 @@ class WP_Import { if (count($tags) > 0) { $post_tags = array(); foreach ($tags as $tag) { + if ( '' == $tag ) + continue; $slug = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db'); $tag_obj = get_term_by('slug', $slug, 'post_tag'); $tag_id = 0; @@ -462,6 +493,8 @@ class WP_Import { if ( $tag_id == 0 ) { $tag = $wpdb->escape($tag); $tag_id = wp_insert_term($tag, 'post_tag'); + if ( is_wp_error($tag_id) ) + continue; $tag_id = $tag_id['term_id']; } $post_tags[] = intval($tag_id); @@ -525,6 +558,11 @@ class WP_Import { function process_attachment($postdata, $remote_url) { if ($this->fetch_attachments and $remote_url) { printf( __('Importing attachment <em>%s</em>... '), htmlspecialchars($remote_url) ); + + // If the URL is absolute, but does not contain http, upload it assuming the base_site_url variable + if ( preg_match('/^\/[\w\W]+$/', $remote_url) ) + $remote_url = rtrim($this->base_url,'/').$remote_url; + $upload = $this->fetch_remote_file($postdata, $remote_url); if ( is_wp_error($upload) ) { printf( __('Remote file error: %s'), htmlspecialchars($upload->get_error_message()) ); @@ -579,10 +617,16 @@ class WP_Import { // fetch the remote url and write it to the placeholder file $headers = wp_get_http($url, $upload['file']); + //Request failed + if ( ! $headers ) { + @unlink($upload['file']); + return new WP_Error( 'import_file_error', __('Remote server did not respond') ); + } + // make sure the fetch was successful if ( $headers['response'] != '200' ) { @unlink($upload['file']); - return new WP_Error( 'import_file_error', sprintf(__('Remote file returned error response %d'), intval($headers['response'])) ); + return new WP_Error( 'import_file_error', sprintf(__('Remote file returned error response %1$d %2$s'), $headers['response'], get_status_header_desc($headers['response']) ) ); } elseif ( isset($headers['content-length']) && filesize($upload['file']) != $headers['content-length'] ) { @unlink($upload['file']); @@ -691,10 +735,12 @@ class WP_Import { $this->import_start(); $this->get_authors_from_post(); + wp_suspend_cache_invalidation(true); $this->get_entries(); $this->process_categories(); $this->process_tags(); $result = $this->process_posts(); + wp_suspend_cache_invalidation(false); $this->backfill_parents(); $this->backfill_attachment_urls(); $this->import_end(); @@ -746,8 +792,15 @@ class WP_Import { } } +/** + * Register WordPress Importer + * + * @since unknown + * @var WP_Import + * @name $wp_import + */ $wp_import = new WP_Import(); -register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, pages, and categories</strong> from a WordPress export file.'), array ($wp_import, 'dispatch')); +register_importer('wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.'), array ($wp_import, 'dispatch')); ?> wp-admin/import/wordpress.php @@ -1,5 +1,19 @@ <?php - +/** + * WordPress Categories to Tags Converter. + * + * @package WordPress + * @subpackage Importer + */ + +/** + * WordPress categories to tags converter class. + * + * Will convert WordPress categories to tags, removing the category after the + * process is complete and updating all posts to switch to the tag. + * + * @since unknown + */ class WP_Categories_to_Tags { var $categories_to_convert = array(); var $all_categories = array(); @@ -50,6 +64,7 @@ class WP_Categories_to_Tags { echo '<br class="clear" />'; if ( $cat_num > 0 ) { + screen_icon(); echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>'; echo '<div class="narrow">'; echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>'; @@ -103,7 +118,7 @@ function check_all_rows() { if ( in_array( intval($category->term_id), $this->hybrids_ids ) ) echo ' <a href="#note"> * </a>'; - + if ( isset($hier[$category->term_id]) ) $this->_category_children($category, $hier); ?></li> <?php } @@ -125,6 +140,7 @@ function check_all_rows() { echo '<br class="clear" />'; if ( $tags_num > 0 ) { + screen_icon(); echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>'; echo '<div class="narrow">'; echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>'; @@ -243,7 +259,7 @@ function check_all_tagrows() { if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) ) $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug)); - + $id = $id['term_taxonomy_id']; $posts = get_objects_in_term($category->term_id, 'category'); $term_order = 0; @@ -252,7 +268,7 @@ function check_all_tagrows() { $values[] = $wpdb->prepare( "(%d, %d, %d)", $post, $id, $term_order); clean_post_cache($post); } - + if ( $values ) { $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)"); @@ -262,7 +278,7 @@ function check_all_tagrows() { echo __('Converted successfully.') . "</li>\n"; continue; } - + // if tag already exists, add it to all posts in the category if ( $tag_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $category->term_id) ) ) { $objects_ids = get_objects_in_term($category->term_id, 'category'); wp-admin/import/wp-cat2tag.php @@ -1,20 +1,54 @@ <?php +/** + * Includes all of the WordPress Administration API files. + * + * @package WordPress + * @subpackage Administration + */ +/** WordPress Bookmark Administration API */ require_once(ABSPATH . 'wp-admin/includes/bookmark.php'); + +/** WordPress Comment Administration API */ require_once(ABSPATH . 'wp-admin/includes/comment.php'); + +/** WordPress Administration File API */ require_once(ABSPATH . 'wp-admin/includes/file.php'); + +/** WordPress Image Administration API */ require_once(ABSPATH . 'wp-admin/includes/image.php'); + +/** WordPress Media Administration API */ require_once(ABSPATH . 'wp-admin/includes/media.php'); + +/** WordPress Import Administration API */ require_once(ABSPATH . 'wp-admin/includes/import.php'); + +/** WordPress Misc Administration API */ require_once(ABSPATH . 'wp-admin/includes/misc.php'); + +/** WordPress Plugin Administration API */ require_once(ABSPATH . 'wp-admin/includes/plugin.php'); + +/** WordPress Post Administration API */ require_once(ABSPATH . 'wp-admin/includes/post.php'); + +/** WordPress Taxonomy Administration API */ require_once(ABSPATH . 'wp-admin/includes/taxonomy.php'); + +/** WordPress Template Administration API */ require_once(ABSPATH . 'wp-admin/includes/template.php'); + +/** WordPress Theme Administration API */ require_once(ABSPATH . 'wp-admin/includes/theme.php'); + +/** WordPress User Administration API */ require_once(ABSPATH . 'wp-admin/includes/user.php'); + +/** WordPress Update Administration API */ require_once(ABSPATH . 'wp-admin/includes/update.php'); +/** WordPress Registration API */ require_once(ABSPATH . WPINC . '/registration.php'); -?> +?> \ No newline at end of file wp-admin/includes/admin.php @@ -1,9 +1,30 @@ <?php - +/** + * WordPress Bookmark Administration API + * + * @package WordPress + * @subpackage Administration + */ + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function add_link() { return edit_link(); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $link_id + * @return unknown + */ function edit_link( $link_id = '' ) { if (!current_user_can( 'manage_links' )) wp_die( __( 'Cheatin&#8217; uh?' )); @@ -13,7 +34,7 @@ function edit_link( $link_id = '' ) { $_POST['link_name'] = wp_specialchars( $_POST['link_name'] ); $_POST['link_image'] = wp_specialchars( $_POST['link_image'] ); $_POST['link_rss'] = clean_url($_POST['link_rss']); - if ( 'N' != $_POST['link_visible'] ) + if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] ) $_POST['link_visible'] = 'Y'; if ( !empty( $link_id ) ) { @@ -24,6 +45,13 @@ function edit_link( $link_id = '' ) { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function get_default_link_to_edit() { if ( isset( $_GET['linkurl'] ) ) $link->link_url = clean_url( $_GET['linkurl']); @@ -40,44 +68,78 @@ function get_default_link_to_edit() { return $link; } -function wp_delete_link($link_id) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $link_id + * @return unknown + */ +function wp_delete_link( $link_id ) { global $wpdb; - do_action('delete_link', $link_id); + do_action( 'delete_link', $link_id ); + + wp_delete_object_term_relationships( $link_id, 'link_category' ); - wp_delete_object_term_relationships($link_id, 'link_category'); + $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->links WHERE link_id = %d", $link_id ) ); - $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->links WHERE link_id = %d", $link_id) ); + do_action( 'deleted_link', $link_id ); - do_action('deleted_link', $link_id); + clean_bookmark_cache( $link_id ); return true; } -function wp_get_link_cats($link_id = 0) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $link_id + * @return unknown + */ +function wp_get_link_cats( $link_id = 0 ) { - $cats = wp_get_object_terms($link_id, 'link_category', 'fields=ids'); + $cats = wp_get_object_terms( $link_id, 'link_category', 'fields=ids' ); - return array_unique($cats); + return array_unique( $cats ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $link_id + * @return unknown + */ function get_link_to_edit( $link_id ) { return get_bookmark( $link_id, OBJECT, 'edit' ); } -function wp_insert_link($linkdata) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $linkdata + * @return unknown + */ +function wp_insert_link( $linkdata, $wp_error = false ) { global $wpdb, $current_user; - $defaults = array('link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 ); + $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 ); - $linkdata = wp_parse_args($linkdata, $defaults); - $linkdata = sanitize_bookmark($linkdata, 'db'); + $linkdata = wp_parse_args( $linkdata, $defaults ); + $linkdata = sanitize_bookmark( $linkdata, 'db' ); - extract(stripslashes_deep($linkdata), EXTR_SKIP); + extract( stripslashes_deep( $linkdata ), EXTR_SKIP ); $update = false; - if ( !empty($link_id) ) + if ( !empty( $link_id ) ) $update = true; if ( trim( $link_name ) == '' ) @@ -86,91 +148,121 @@ function wp_insert_link($linkdata) { if ( trim( $link_url ) == '' ) return 0; - if ( empty($link_rating) ) + if ( empty( $link_rating ) ) $link_rating = 0; - if ( empty($link_image) ) + if ( empty( $link_image ) ) $link_image = ''; - if ( empty($link_target) ) + if ( empty( $link_target ) ) $link_target = ''; - if ( empty($link_visible) ) + if ( empty( $link_visible ) ) $link_visible = 'Y'; - if ( empty($link_owner) ) + if ( empty( $link_owner ) ) $link_owner = $current_user->id; - if ( empty($link_notes) ) + if ( empty( $link_notes ) ) $link_notes = ''; - if ( empty($link_description) ) + if ( empty( $link_description ) ) $link_description = ''; - if ( empty($link_rss) ) + if ( empty( $link_rss ) ) $link_rss = ''; - if ( empty($link_rel) ) + if ( empty( $link_rel ) ) $link_rel = ''; // Make sure we set a valid category - if (0 == count($link_category) || !is_array($link_category)) { - $link_category = array(get_option('default_link_category')); + if ( ! isset( $link_category ) ||0 == count( $link_category ) || !is_array( $link_category ) ) { + $link_category = array( get_option( 'default_link_category' ) ); } if ( $update ) { - $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_url = %s, - link_name = %s, link_image = %s, link_target = %s, - link_visible = %s, link_description = %s, link_rating = %s, + if ( false === $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_url = %s, + link_name = %s, link_image = %s, link_target = %s, + link_visible = %s, link_description = %s, link_rating = %s, link_rel = %s, link_notes = %s, link_rss = %s - WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id) ); + WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id ) ) ) { + if ( $wp_error ) + return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error ); + else + return 0; + } } else { - $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", - $link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss) ); + if ( false === $wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", + $link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss ) ) ) { + if ( $wp_error ) + return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error ); + else + return 0; + } $link_id = (int) $wpdb->insert_id; } - wp_set_link_cats($link_id, $link_category); + wp_set_link_cats( $link_id, $link_category ); if ( $update ) - do_action('edit_link', $link_id); + do_action( 'edit_link', $link_id ); else - do_action('add_link', $link_id); + do_action( 'add_link', $link_id ); + + clean_bookmark_cache( $link_id ); return $link_id; } -function wp_set_link_cats($link_id = 0, $link_categories = array()) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $link_id + * @param unknown_type $link_categories + */ +function wp_set_link_cats( $link_id = 0, $link_categories = array() ) { // If $link_categories isn't already an array, make it one: - if (!is_array($link_categories) || 0 == count($link_categories)) - $link_categories = array(get_option('default_link_category')); + if ( !is_array( $link_categories ) || 0 == count( $link_categories ) ) + $link_categories = array( get_option( 'default_link_category' ) ); + + $link_categories = array_map( 'intval', $link_categories ); + $link_categories = array_unique( $link_categories ); - $link_categories = array_map('intval', $link_categories); - $link_categories = array_unique($link_categories); + wp_set_object_terms( $link_id, $link_categories, 'link_category' ); - wp_set_object_terms($link_id, $link_categories, 'link_category'); + clean_bookmark_cache( $link_id ); } // wp_set_link_cats() -function wp_update_link($linkdata) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $linkdata + * @return unknown + */ +function wp_update_link( $linkdata ) { $link_id = (int) $linkdata['link_id']; - $link = get_link($link_id, ARRAY_A); + $link = get_link( $link_id, ARRAY_A ); // Escape data pulled from DB. - $link = add_magic_quotes($link); + $link = add_magic_quotes( $link ); // Passed link category list overwrites existing category list if not empty. - if ( isset($linkdata['link_category']) && is_array($linkdata['link_category']) - && 0 != count($linkdata['link_category']) ) + if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] ) + && 0 != count( $linkdata['link_category'] ) ) $link_cats = $linkdata['link_category']; else $link_cats = $link['link_category']; // Merge old and new fields with new fields overwriting old ones. - $linkdata = array_merge($link, $linkdata); + $linkdata = array_merge( $link, $linkdata ); $linkdata['link_category'] = $link_cats; - return wp_insert_link($linkdata); + return wp_insert_link( $linkdata ); } -?> \ No newline at end of file +?> wp-admin/includes/bookmark.php @@ -11,6 +11,20 @@ * @link http://www.phpclasses.org/browse/package/1743.html Site * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html */ + +/** + * FTP implementation using fsockopen to connect. + * + * @package PemFTP + * @subpackage Pure + * @since 2.5 + * + * @version 1.0 + * @copyright Alexey Dotsenko + * @author Alexey Dotsenko + * @link http://www.phpclasses.org/browse/package/1743.html Site + * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html + */ class ftp extends ftp_base { function ftp($verb=FALSE, $le=FALSE) { @@ -172,4 +186,5 @@ class ftp extends ftp_base { } } } + ?> wp-admin/includes/class-ftp-pure.php @@ -11,6 +11,20 @@ * @link http://www.phpclasses.org/browse/package/1743.html Site * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html */ + +/** + * Socket Based FTP implementation + * + * @package PemFTP + * @subpackage Socket + * @since 2.5 + * + * @version 1.0 + * @copyright Alexey Dotsenko + * @author Alexey Dotsenko + * @link http://www.phpclasses.org/browse/package/1743.html Site + * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html + */ class ftp extends ftp_base { function ftp($verb=FALSE, $le=FALSE) { wp-admin/includes/class-ftp-sockets.php @@ -11,15 +11,75 @@ * @link http://www.phpclasses.org/browse/package/1743.html Site * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html */ + +/** + * Defines the newline characters, if not defined already. + * + * This can be redefined. + * + * @since 2.5 + * @var string + */ if(!defined('CRLF')) define('CRLF',"\r\n"); + +/** + * Sets whatever to autodetect ASCII mode. + * + * This can be redefined. + * + * @since 2.5 + * @var int + */ if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1); + +/** + * + * This can be redefined. + * @since 2.5 + * @var int + */ if(!defined("FTP_BINARY")) define("FTP_BINARY", 1); + +/** + * + * This can be redefined. + * @since 2.5 + * @var int + */ if(!defined("FTP_ASCII")) define("FTP_ASCII", 0); -if(!defined('FTP_FORCE')) define('FTP_FORCE', TRUE); + +/** + * Whether to force FTP. + * + * This can be redefined. + * + * @since 2.5 + * @var bool + */ +if(!defined('FTP_FORCE')) define('FTP_FORCE', true); + +/** + * @since 2.5 + * @var string + */ define('FTP_OS_Unix','u'); + +/** + * @since 2.5 + * @var string + */ define('FTP_OS_Windows','w'); + +/** + * @since 2.5 + * @var string + */ define('FTP_OS_Mac','m'); +/** + * PemFTP base class + * + */ class ftp_base { /* Public variables */ var $LocalEcho; @@ -838,5 +898,6 @@ if (!extension_loaded('sockets')) { $prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : ''; if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=FALSE; } + require_once "class-ftp-".($mod_sockets?"sockets":"pure").".php"; ?> wp-admin/includes/class-ftp.php @@ -1,51 +1,60 @@ <?php -// -------------------------------------------------------------------------------- -// PhpConcept Library - Zip Module 2.5 -// -------------------------------------------------------------------------------- -// License GNU/LGPL - Vincent Blavet - March 2006 -// http://www.phpconcept.net -// -------------------------------------------------------------------------------- -// -// Presentation : -// PclZip is a PHP library that manage ZIP archives. -// So far tests show that archives generated by PclZip are readable by -// WinZip application and other tools. -// -// Description : -// See readme.txt and http://www.phpconcept.net -// -// Warning : -// This library and the associated files are non commercial, non professional -// work. -// It should not have unexpected results. However if any damage is caused by -// this software the author can not be responsible. -// The use of this software is at the risk of the user. -// -// -------------------------------------------------------------------------------- -// $Id: pclzip.lib.php,v 1.44 2006/03/08 21:23:59 vblavet Exp $ -// -------------------------------------------------------------------------------- - - // ----- Constants - define( 'PCLZIP_READ_BLOCK_SIZE', 2048 ); - - // ----- File list separator - // In version 1.x of PclZip, the separator for file list is a space - // (which is not a very smart choice, specifically for windows paths !). - // A better separator should be a comma (,). This constant gives you the - // abilty to change that. - // However notice that changing this value, may have impact on existing - // scripts, using space separated filenames. - // Recommanded values for compatibility with older versions : - //define( 'PCLZIP_SEPARATOR', ' ' ); - // Recommanded values for smart separation of filenames. - define( 'PCLZIP_SEPARATOR', ',' ); - - // ----- Error configuration - // 0 : PclZip Class integrated error handling - // 1 : PclError external library error handling. By enabling this - // you must ensure that you have included PclError library. - // [2,...] : reserved for futur use - define( 'PCLZIP_ERROR_EXTERNAL', 0 ); +/** + * PhpConcept Library - Zip Module 2.5 + * + * Presentation : + * PclZip is a PHP library that manage ZIP archives. + * So far tests show that archives generated by PclZip are readable by + * WinZip application and other tools. + * + * Warning : + * This library and the associated files are non commercial, non professional + * work. + * It should not have unexpected results. However if any damage is caused by + * this software the author can not be responsible. + * The use of this software is at the risk of the user. + * + * @package External + * @subpackage PclZip + * + * @license License GNU/LGPL + * @copyright March 2006 Vincent Blavet + * @author Vincent Blavet + * @link http://www.phpconcept.net + * @version $Id: pclzip.lib.php,v 1.44 2006/03/08 21:23:59 vblavet Exp $ + */ + +/** + * The read block size for reading zip files. + * + * @since 2.5 + */ +define( 'PCLZIP_READ_BLOCK_SIZE', 2048 ); + +/** + * File list separator + * + * In version 1.x of PclZip, the separator for file list is a space(which is not + * a very smart choice, specifically for windows paths !). A better separator + * should be a comma (,). This constant gives you the abilty to change that. + * + * However notice that changing this value, may have impact on existing scripts, + * using space separated filenames. Recommanded values for compatibility with + * older versions : + * <code>define( 'PCLZIP_SEPARATOR', ' ' );</code> + * Recommanded values for smart separation of filenames. + */ +define( 'PCLZIP_SEPARATOR', ',' ); + +/** + * Error configuration + * + * 0 : PclZip Class integrated error handling + * 1 : PclError external library error handling. By enabling this you must + * ensure that you have included PclError library. + * [2,...] : reserved for future use + */ +define( 'PCLZIP_ERROR_EXTERNAL', 0 ); // ----- Optional static temporary directory // By default temporary files are generated in the script current @@ -137,7 +146,7 @@ define( 'PCLZIP_CB_POST_EXTRACT', 78002 ); define( 'PCLZIP_CB_PRE_ADD', 78003 ); define( 'PCLZIP_CB_POST_ADD', 78004 ); - /* For futur use + /* For future use define( 'PCLZIP_CB_PRE_LIST', 78005 ); define( 'PCLZIP_CB_POST_LIST', 78006 ); define( 'PCLZIP_CB_PRE_DELETE', 78007 ); wp-admin/includes/class-pclzip.php @@ -1,41 +1,150 @@ <?php -class WP_Filesystem_Base{ +/** + * Base WordPress Filesystem. + * + * @package WordPress + * @subpackage Filesystem + */ + +/** + * Base WordPress Filesystem class for which Filesystem implementations extend + * + * @since 2.5 + */ +class WP_Filesystem_Base { + /** + * Whether to display debug data for the connection or not. + * + * @since 2.5 + * @access public + * @var bool + */ var $verbose = false; + /** + * Cached list of local filepaths to maped remote filepaths. + * + * @since 2.7 + * @access private + * @var array + */ var $cache = array(); - + + /** + * The Access method of the current connection, Set automatically. + * + * @since 2.5 + * @access public + * @var string + */ var $method = ''; - + + /** + * Returns the path on the remote filesystem of ABSPATH + * + * @since 2.7 + * @access public + * @return string The location of the remote path. + */ function abspath() { - if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false ) + if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false ) return FTP_BASE; - return $this->find_folder(ABSPATH); + $folder = $this->find_folder(ABSPATH); + //Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare. + if ( ! $folder && $this->is_dir('/wp-includes') ) + $folder = '/'; + return $folder; } + /** + * Returns the path on the remote filesystem of WP_CONTENT_DIR + * + * @since 2.7 + * @access public + * @return string The location of the remote path. + */ function wp_content_dir() { - if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false ) + if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false ) return FTP_CONTENT_DIR; return $this->find_folder(WP_CONTENT_DIR); } + /** + * Returns the path on the remote filesystem of WP_PLUGIN_DIR + * + * @since 2.7 + * @access public + * + * @return string The location of the remote path. + */ function wp_plugins_dir() { - if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false ) + if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false ) return FTP_PLUGIN_DIR; return $this->find_folder(WP_PLUGIN_DIR); } + /** + * Returns the path on the remote filesystem of the Themes Directory + * + * @since 2.7 + * @access public + * + * @return string The location of the remote path. + */ function wp_themes_dir() { return $this->wp_content_dir() . '/themes'; } - //Back compat: use abspath() or wp_*_dir + + /** + * Locates a folder on the remote filesystem. + * + * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead. + * + * @since 2.5 + * @deprecated 2.7 + * @access public + * + * @param string $base The folder to start searching from + * @param bool $echo True to display debug information + * @return string The location of the remote path. + */ function find_base_dir($base = '.', $echo = false) { + _deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' ); $this->verbose = $echo; return $this->abspath(); } - //Back compat: use ::abspath() or ::wp_*_dir + /** + * Locates a folder on the remote filesystem. + * + * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead. + * + * @since 2.5 + * @deprecated 2.7 + * @access public + * + * @param string $base The folder to start searching from + * @param bool $echo True to display debug information + * @return string The location of the remote path. + */ function get_base_dir($base = '.', $echo = false) { + _deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' ); $this->verbose = $echo; return $this->abspath(); } - + + /** + * Locates a folder on the remote filesystem. + * + * Assumes that on Windows systems, Stripping off the Drive letter is OK + * Sanitizes \\ to / in windows filepaths. + * + * @since 2.7 + * @access public + * + * @param string $folder the folder to locate + * @return string The location of the remote path. + */ function find_folder($folder) { - $folder = str_replace('\\', '/', $folder); //Windows Sanitiation + + $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there. + $folder = str_replace('\\', '/', $folder); //Windows path sanitiation + if ( isset($this->cache[ $folder ] ) ) return $this->cache[ $folder ]; @@ -47,26 +156,37 @@ class WP_Filesystem_Base{ $this->cache[ $folder ] = $return; return $return; } - - // Assumes $folder is windows sanitized; - // Assumes that the drive letter is safe to be stripped off, Should not be a problem for windows servers. + + /** + * Locates a folder on the remote filesystem. + * + * Expects Windows sanitized path + * + * @since 2.7 + * @access private + * + * @param string $folder the folder to locate + * @param string $base the folder to start searching from + * @param bool $loop if the function has recursed, Internal use only + * @return string The location of the remote path. + */ function search_for_folder($folder, $base = '.', $loop = false ) { if ( empty( $base ) || '.' == $base ) $base = trailingslashit($this->cwd()); - - $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there. - + + $folder = untrailingslashit($folder); + $folder_parts = explode('/', $folder); $last_path = $folder_parts[ count($folder_parts) - 1 ]; - + $files = $this->dirlist( $base ); - + foreach ( $folder_parts as $key ) { if ( $key == $last_path ) continue; //We want this to be caught by the next code block. - //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder, - // If its found, change into it and follow through looking for it. + //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder, + // If its found, change into it and follow through looking for it. // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on. // If it reaches the end, and still cant find it, it'll return false for the entire function. if( isset($files[ $key ]) ){ @@ -78,7 +198,7 @@ class WP_Filesystem_Base{ return $ret; } } - + //Only check this as a last resort, to prevent locating the incorrect install. All above proceeedures will fail quickly if this is the right branch to take. if(isset( $files[ $last_path ] ) ) { if( $this->verbose ) @@ -88,13 +208,23 @@ class WP_Filesystem_Base{ if( $loop ) return false;//Prevent tihs function looping again. //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups. - return $this->search_for_folder($folder, '/', true); - + return $this->search_for_folder($folder, '/', true); + } - - //Common Helper functions. + + /** + * Returns the *nix style file permissions for a file + * + * From the PHP documentation page for fileperms() + * + * @link http://docs.php.net/fileperms + * @since 2.5 + * @access public + * + * @param string $file string filename + * @return int octal representation of permissions + */ function gethchmod($file){ - //From the PHP.net page for ...? $perms = $this->getchmod($file); if (($perms & 0xC000) == 0xC000) // Socket $info = 's'; @@ -135,24 +265,52 @@ class WP_Filesystem_Base{ (($perms & 0x0200) ? 'T' : '-')); return $info; } + + /** + * Converts *nix style file permissions to a octal number. + * + * Converts '-rw-r--r--' to 0644 + * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod() + * + * @link http://docs.php.net/manual/en/function.chmod.php#49614 + * @since 2.5 + * @access public + * + * @param string $mode string *nix style file permission + * @return int octal representation + */ function getnumchmodfromh($mode) { - $realmode = ""; - $legal = array("", "w", "r", "x", "-"); - $attarray = preg_split("//", $mode); + $realmode = ''; + $legal = array('', 'w', 'r', 'x', '-'); + $attarray = preg_split('//', $mode); for($i=0; $i < count($attarray); $i++) if($key = array_search($attarray[$i], $legal)) $realmode .= $legal[$key]; - + $mode = str_pad($realmode, 9, '-'); $trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1'); $mode = strtr($mode,$trans); - + $newmode = ''; $newmode .= $mode[0] + $mode[1] + $mode[2]; $newmode .= $mode[3] + $mode[4] + $mode[5]; $newmode .= $mode[6] + $mode[7] + $mode[8]; return $newmode; } + + /** + * Determines if the string provided contains binary characters. + * + * @since 2.7 + * @access private + * + * @param string $text String to test against + * @return bool true if string is binary, false otherwise + */ + function is_binary( $text ) { + return (bool) preg_match('|[^\x20-\x7E]|', $text); //chr(32)..chr(127) + } } + ?> wp-admin/includes/class-wp-filesystem-base.php @@ -1,5 +1,19 @@ <?php +/** + * WordPress Direct Filesystem. + * + * @package WordPress + * @subpackage Filesystem + */ +/** + * WordPress Filesystem Class for direct PHP file and folder manipulation. + * + * @since 2.5 + * @package WordPress + * @subpackage Filesystem + * @uses WP_Filesystem_Base Extends class + */ class WP_Filesystem_Direct extends WP_Filesystem_Base { var $permission = null; var $errors = array(); @@ -218,7 +232,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base { return false; $ret = array(); - $dir = dir($path); + $dir = @dir($path); + if ( ! $dir ) + return false; while (false !== ($entry = $dir->read()) ) { $struc = array(); $struc['name'] = $entry; wp-admin/includes/class-wp-filesystem-direct.php @@ -1,5 +1,20 @@ <?php -class WP_Filesystem_FTPext extends WP_Filesystem_Base{ +/** + * WordPress FTP Filesystem. + * + * @package WordPress + * @subpackage Filesystem + */ + +/** + * WordPress Filesystem Class for implementing FTP. + * + * @since 2.5 + * @package WordPress + * @subpackage Filesystem + * @uses WP_Filesystem_Base Extends class + */ +class WP_Filesystem_FTPext extends WP_Filesystem_Base { var $link; var $timeout = 5; var $errors = array(); @@ -7,21 +22,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base{ var $permission = null; - var $filetypes = array( - 'php'=>FTP_ASCII, - 'css'=>FTP_ASCII, - 'txt'=>FTP_ASCII, - 'js'=>FTP_ASCII, - 'html'=>FTP_ASCII, - 'htm'=>FTP_ASCII, - 'xml'=>FTP_ASCII, - - 'jpg'=>FTP_BINARY, - 'png'=>FTP_BINARY, - 'gif'=>FTP_BINARY, - 'bmp'=>FTP_BINARY - ); - function WP_Filesystem_FTPext($opt='') { $this->method = 'ftpext'; $this->errors = new WP_Error(); @@ -57,7 +57,11 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base{ else $this->options['password'] = $opt['password']; - $this->options['ssl'] = ( !empty($opt['ssl']) ); + $this->options['ssl'] = false; + if ( isset($opt['ssl']) ) + $this->options['ssl'] = ( !empty($opt['ssl']) ); + elseif ( isset( $opt['connection_type']) ) + $this->options['ssl'] = ( 'ftps' == $opt['connection_type'] ); } function connect() { @@ -76,28 +80,33 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base{ return false; } + //Set the Connection to use Passive FTP + @ftp_pasv( $this->link, true ); + return true; } function setDefaultPermissions($perm) { $this->permission = $perm; } - + function get_contents($file, $type = '', $resumepos = 0 ){ - if( empty($type) ){ - $extension = substr(strrchr($file, "."), 1); - $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII; - } + if( empty($type) ) + $type = FTP_BINARY; + $temp = tmpfile(); if ( ! $temp ) return false; + if( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) ) return false; + fseek($temp, 0); //Skip back to the start of the file being written to $contents = ''; - while (!feof($temp)) { + + while ( ! feof($temp) ) $contents .= fread($temp, 8192); - } + fclose($temp); return $contents; } @@ -105,21 +114,23 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base{ return explode("\n", $this->get_contents($file)); } function put_contents($file, $contents, $type = '' ) { - if( empty($type) ) { - $extension = substr(strrchr($file, "."), 1); - $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII; - } + if( empty($type) ) + $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII; + $temp = tmpfile(); if ( ! $temp ) return false; + fwrite($temp, $contents); fseek($temp, 0); //Skip back to the start of the file being written to + $ret = @ftp_fput($this->link, $file, $temp, $type); + fclose($temp); return $ret; } function cwd() { - $cwd = ftp_pwd($this->link); + $cwd = @ftp_pwd($this->link); if( $cwd ) $cwd = trailingslashit($cwd); return $cwd; wp-admin/includes/class-wp-filesystem-ftpext.php @@ -1,4 +1,19 @@ <?php +/** + * WordPress FTP Sockets Filesystem. + * + * @package WordPress + * @subpackage Filesystem + */ + +/** + * WordPress Filesystem Class for implementing FTP Sockets. + * + * @since 2.5 + * @package WordPress + * @subpackage Filesystem + * @uses WP_Filesystem_Base Extends class + */ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { var $ftp = false; var $timeout = 5; @@ -7,22 +22,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { var $permission = null; - var $filetypes = array( - 'php' => FTP_ASCII, - 'css' => FTP_ASCII, - 'txt' => FTP_ASCII, - 'js' => FTP_ASCII, - 'html'=> FTP_ASCII, - 'htm' => FTP_ASCII, - 'xml' => FTP_ASCII, - - 'jpg' => FTP_BINARY, - 'png' => FTP_BINARY, - 'gif' => FTP_BINARY, - 'bmp' => FTP_BINARY - ); - - function WP_Filesystem_ftpsockets($opt='') { + function WP_Filesystem_ftpsockets($opt = '') { $this->method = 'ftpsockets'; $this->errors = new WP_Error(); @@ -86,51 +86,57 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { $this->permission = $perm; } - function get_contents($file, $type = '', $resumepos = 0){ + function get_contents($file, $type = '', $resumepos = 0) { if( ! $this->exists($file) ) return false; - if( empty($type) ){ - $extension = substr(strrchr($file, '.'), 1); - $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_AUTOASCII; - } + if( empty($type) ) + $type = FTP_AUTOASCII; $this->ftp->SetType($type); + $temp = wp_tempnam( $file ); + if ( ! $temphandle = fopen($temp, 'w+') ) return false; + if ( ! $this->ftp->fget($temphandle, $file) ) { fclose($temphandle); unlink($temp); return ''; //Blank document, File does exist, Its just blank. } + fseek($temphandle, 0); //Skip back to the start of the file being written to $contents = ''; + while ( ! feof($temphandle) ) $contents .= fread($temphandle, 8192); + fclose($temphandle); unlink($temp); return $contents; } - function get_contents_array($file){ + function get_contents_array($file) { return explode("\n", $this->get_contents($file) ); } function put_contents($file, $contents, $type = '' ) { - if( empty($type) ){ - $extension = substr(strrchr($file, '.'), 1); - $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_AUTOASCII; - } + if( empty($type) ) + $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII; + $this->ftp->SetType($type); $temp = wp_tempnam( $file ); if ( ! $temphandle = fopen($temp, 'w+') ){ - unlink($temp); + unlink($temp); return false; } + fwrite($temphandle, $contents); fseek($temphandle, 0); //Skip back to the start of the file being written to + $ret = $this->ftp->fput($file, $temphandle); + fclose($temphandle); unlink($temp); return $ret; @@ -146,12 +152,12 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { function chdir($file) { return $this->ftp->chdir($file); } - + function chgrp($file, $group, $recursive = false ) { return false; } - function chmod($file, $mode = false, $recursive = false ){ + function chmod($file, $mode = false, $recursive = false ) { if( ! $mode ) $mode = $this->permission; if( ! $mode ) @@ -251,7 +257,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { return $this->ftp->filesize($file); } - function touch($file, $time = 0, $atime = 0 ){ + function touch($file, $time = 0, $atime = 0 ) { return false; } @@ -311,8 +317,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { return $ret; } - function __destruct(){ + function __destruct() { $this->ftp->quit(); } } + ?> wp-admin/includes/class-wp-filesystem-ftpsockets.php @@ -1,5 +1,21 @@ <?php - +/** + * WordPress Comment Administration API. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * @uses $wpdb + * + * @param string $comment_author + * @param string $comment_date + * @return mixed Comment ID on success. + */ function comment_exists($comment_author, $comment_date) { global $wpdb; @@ -7,6 +23,11 @@ function comment_exists($comment_author, $comment_date) { WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function edit_comment() { $comment_post_ID = (int) $_POST['comment_post_ID']; @@ -28,7 +49,6 @@ function edit_comment() { } } - if (!empty ( $_POST['edit_date'] ) ) { $aa = $_POST['aa']; $mm = $_POST['mm']; @@ -46,6 +66,14 @@ function edit_comment() { wp_update_comment( $_POST); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @return unknown + */ function get_comment_to_edit( $id ) { if ( !$comment = get_comment($id) ) return false; @@ -64,6 +92,15 @@ function get_comment_to_edit( $id ) { return $comment; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * @uses $wpdb + * + * @param int $post_id Post ID + * @return unknown + */ function get_pending_comments_num( $post_id ) { global $wpdb; @@ -90,8 +127,15 @@ function get_pending_comments_num( $post_id ) { return $pending_keyed; } -// Add avatars to relevant places in admin, or try to - +/** + * Add avatars to relevant places in admin, or try to. + * + * @since unknown + * @uses $comment + * + * @param string $name User name. + * @return string Avatar with Admin name. + */ function floated_admin_avatar( $name ) { global $comment; @@ -107,6 +151,11 @@ function floated_admin_avatar( $name ) { return "$avatar $name"; } +function enqueue_comment_hotkeys_js() { + if ( 'true' == get_user_option( 'comment_shortcuts' ) ) + wp_enqueue_script( 'jquery-table-hotkeys' ); +} + if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) { if ( get_option('show_avatars') ) add_filter( 'comment_author', 'floated_admin_avatar' ); wp-admin/includes/comment.php @@ -1,39 +1,35 @@ <?php - -// Registers dashboard widgets, handles POST data, sets up filters +/** + * WordPress Dashboard Widget Administration Panel API + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Registers dashboard widgets. + * + * handles POST data, sets up filters. + * + * @since unknown + */ function wp_dashboard_setup() { - global $wpdb, $wp_dashboard_sidebars; + global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks; + $wp_dashboard_control_callbacks = array(); + $update = false; $widget_options = get_option( 'dashboard_widget_options' ); if ( !$widget_options || !is_array($widget_options) ) $widget_options = array(); - - /* Register WP Dashboard Dynamic Sidebar */ - register_sidebar( array( - 'name' => 'WordPress Dashboard', - 'id' => 'wp_dashboard', - 'before_widget' => "\t<div class='dashboard-widget-holder %2\$s' id='%1\$s'>\n\n\t\t<div class='dashboard-widget'>\n\n", - 'after_widget' => "\t\t</div>\n\n\t</div>\n\n", - 'before_title' => "\t\t\t<h3 class='dashboard-widget-title'>", - 'after_title' => "</h3>\n\n" - ) ); - - /* Register Widgets and Controls */ + // Right Now + wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' ); + // Recent Comments Widget - $mod_comments = wp_count_comments(); - $mod_comments = $mod_comments->moderated; - if ( current_user_can( 'moderate_comments' ) && $mod_comments ) { - $notice = sprintf( __ngettext( '%d comment awaiting moderation', '%d comments awaiting moderation', $mod_comments ), $mod_comments ); - $notice = "<a href='edit-comments.php?comment_status=moderated'>$notice</a>"; - } else { - $notice = ''; - } - wp_register_sidebar_widget( 'dashboard_recent_comments', __( 'Recent Comments' ), 'wp_dashboard_recent_comments', - array( 'all_link' => 'edit-comments.php', 'notice' => $notice, 'width' => 'half' ) - ); + $recent_comments_title = __( 'Recent Comments' ); + wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments' ); // Incoming Links Widget if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) { @@ -42,25 +38,23 @@ function wp_dashboard_setup() { 'home' => get_option('home'), 'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ), 'url' => apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ), - 'items' => 5, - 'show_date' => 0 + 'items' => isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10, + 'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false ); } - wp_register_sidebar_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_empty', - array( 'all_link' => $widget_options['dashboard_incoming_links']['link'], 'feed_link' => $widget_options['dashboard_incoming_links']['url'], 'width' => 'half' ), - 'wp_dashboard_cached_rss_widget', 'wp_dashboard_incoming_links_output' - ); - wp_register_widget_control( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_rss_control', array(), - array( 'widget_id' => 'dashboard_incoming_links', 'form_inputs' => array( 'title' => false, 'show_summary' => false, 'show_author' => false ) ) - ); - + wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' ); // WP Plugins Widget - wp_register_sidebar_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_empty', - array( 'all_link' => 'http://wordpress.org/extend/plugins/', 'feed_link' => 'http://wordpress.org/extend/plugins/rss/topics/', 'width' => 'half' ), - 'wp_dashboard_cached_rss_widget', 'wp_dashboard_plugins_output', - array( 'http://wordpress.org/extend/plugins/rss/browse/popular/', 'http://wordpress.org/extend/plugins/rss/browse/new/', 'http://wordpress.org/extend/plugins/rss/browse/updated/' ) - ); + if ( current_user_can( 'activate_plugins' ) ) + wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' ); + + // QuickPress Widget + if ( current_user_can('edit_posts') ) + wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' ); + + // Recent Drafts + if ( current_user_can('edit_posts') ) + wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' ); // Primary feed (Dev Blog) Widget if ( !isset( $widget_options['dashboard_primary'] ) ) { @@ -75,14 +69,7 @@ function wp_dashboard_setup() { 'show_date' => 1 ); } - wp_register_sidebar_widget( 'dashboard_primary', $widget_options['dashboard_primary']['title'], 'wp_dashboard_empty', - array( 'all_link' => $widget_options['dashboard_primary']['link'], 'feed_link' => $widget_options['dashboard_primary']['url'], 'width' => 'half', 'class' => 'widget_rss' ), - 'wp_dashboard_cached_rss_widget', 'wp_dashboard_rss_output' - ); - wp_register_widget_control( 'dashboard_primary', __( 'Primary Feed' ), 'wp_dashboard_rss_control', array(), - array( 'widget_id' => 'dashboard_primary' ) - ); - + wp_add_dashboard_widget( 'dashboard_primary', $widget_options['dashboard_primary']['title'], 'wp_dashboard_primary', 'wp_dashboard_primary_control' ); // Secondary Feed (Planet) Widget if ( !isset( $widget_options['dashboard_secondary'] ) ) { @@ -91,60 +78,21 @@ function wp_dashboard_setup() { 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ), 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ), 'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ), - 'items' => 15 + 'items' => 5 ); } - wp_register_sidebar_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_empty', - array( 'all_link' => $widget_options['dashboard_secondary']['link'], 'feed_link' => $widget_options['dashboard_secondary']['url'], 'width' => 'full' ), - 'wp_dashboard_cached_rss_widget', 'wp_dashboard_secondary_output' - ); - wp_register_widget_control( 'dashboard_secondary', __( 'Secondary Feed' ), 'wp_dashboard_rss_control', array(), - array( 'widget_id' => 'dashboard_secondary', 'form_inputs' => array( 'show_summary' => false, 'show_author' => false, 'show_date' => false ) ) - ); - - - /* Dashboard Widget Template - wp_register_sidebar_widget( $widget_id (unique slug) , $widget_title, $output_callback, - array( - 'all_link' => full url for "See All" link, - 'feed_link' => full url for "RSS" link, - 'width' => 'fourth', 'third', 'half', 'full' (defaults to 'half'), - 'height' => 'single', 'double' (defaults to 'single'), - ), - $wp_dashboard_empty_callback (only needed if using 'wp_dashboard_empty' as your $output_callback), - $arg, $arg, $arg... (further args passed to callbacks) - ); - - // optional: if you want users to be able to edit the settings of your widget, you need to register a widget_control - wp_register_widget_control( $widget_id, $widget_control_title, $control_output_callback, - array(), // leave an empty array here: oddity in widget code - array( - 'widget_id' => $widget_id, // Yes - again. This is required: oddity in widget code - 'arg' => an arg to pass to the $control_output_callback, - 'another' => another arg to pass to the $control_output_callback, - ... - ) - ); - */ + wp_add_dashboard_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_secondary', 'wp_dashboard_secondary_control' ); // Hook to register new widgets do_action( 'wp_dashboard_setup' ); - // Hard code the sidebar's widgets and order - $dashboard_widgets = array(); - $dashboard_widgets[] = 'dashboard_recent_comments'; - $dashboard_widgets[] = 'dashboard_incoming_links'; - $dashboard_widgets[] = 'dashboard_primary'; - if ( current_user_can( 'activate_plugins' ) ) - $dashboard_widgets[] = 'dashboard_plugins'; - $dashboard_widgets[] = 'dashboard_secondary'; - // Filter widget order - $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', $dashboard_widgets ); + $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() ); - $wp_dashboard_sidebars = array( 'wp_dashboard' => $dashboard_widgets, 'array_version' => 3.5 ); - - add_filter( 'dynamic_sidebar_params', 'wp_dashboard_dynamic_sidebar_params' ); + foreach ( $dashboard_widgets as $widget_id ) { + $name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>'; + wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback'] ); + } if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) { ob_start(); // hack - but the same hack wp-admin/widgets.php uses @@ -156,162 +104,447 @@ function wp_dashboard_setup() { if ( $update ) update_option( 'dashboard_widget_options', $widget_options ); + + do_action('do_meta_boxes', 'dashboard', 'normal', ''); + do_action('do_meta_boxes', 'dashboard', 'side', ''); } -// Echoes out the dashboard -function wp_dashboard() { - echo "<div id='dashboard-widgets'>\n\n"; +function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null ) { + global $wp_dashboard_control_callbacks; + if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) { + $wp_dashboard_control_callbacks[$widget_id] = $control_callback; + if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) { + list($url) = explode( '#', add_query_arg( 'edit', false ), 2 ); + $widget_name .= ' <span class="postbox-title-action"><a href="' . clean_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>'; + add_meta_box( $widget_id, $widget_name, '_wp_dashboard_control_callback', 'dashboard', 'normal', 'core' ); + return; + } + list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 ); + $widget_name .= ' <span class="postbox-title-action"><a href="' . clean_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>'; + } + $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary'); + $location = 'normal'; + if ( in_array($widget_id, $side_widgets) ) + $location = 'side'; + add_meta_box( $widget_id, $widget_name , $callback, 'dashboard', $location, 'core' ); +} - // We're already filtering dynamic_sidebar_params obove - add_filter( 'option_sidebars_widgets', 'wp_dashboard_sidebars_widgets' ); // here there be hackery - dynamic_sidebar( 'wp_dashboard' ); - remove_filter( 'option_sidebars_widgets', 'wp_dashboard_sidebars_widgets' ); +function _wp_dashboard_control_callback( $dashboard, $meta_box ) { + echo '<form action="" method="post" class="dashboard-widget-control-form">'; + wp_dashboard_trigger_widget_control( $meta_box['id'] ); + echo "<p class='submit'><input type='hidden' name='widget_id' value='$meta_box[id]' /><input type='submit' value='" . __( 'Submit' ) . "' /></p>"; - echo "<br class='clear' />\n</div>\n\n\n"; + echo '</form>'; } -// Makes sidebar_widgets option reflect the dashboard settings -function wp_dashboard_sidebars_widgets() { // hackery - return $GLOBALS['wp_dashboard_sidebars']; +/** + * Displays the dashboard. + * + * @since unknown + */ +function wp_dashboard() { + echo "<div id='dashboard-widgets' class='metabox-holder'>\n\n"; + + echo "<div id='side-info-column' class='inner-sidebar'>\n\n"; + $class = do_meta_boxes( 'dashboard', 'side', '' ) ? ' class="has-sidebar"' : ''; + echo "</div>\n\n"; + + echo "<div id='post-body'$class>\n\n"; + echo "<div id='dashboard-widgets-main-content' class='has-sidebar-content'>\n\n"; + do_meta_boxes( 'dashboard', 'normal', '' ); + echo "</div>\n\n"; + echo "</div>\n\n"; + + echo "<form style='display: none' method='get' action=''>\n<p>\n"; + wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); + wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); + echo "</p>\n</form>\n"; + + echo "</div>"; } -// Modifies sidbar params on the fly to set up ids, class names, titles for each widget (called once per widget) -// Switches widget to edit mode if $_GET['edit'] -function wp_dashboard_dynamic_sidebar_params( $params ) { - global $wp_registered_widgets, $wp_registered_widget_controls; +/* Dashboard Widgets */ + +function wp_dashboard_right_now() { + $num_posts = wp_count_posts( 'post' ); + $num_pages = wp_count_posts( 'page' ); - $sidebar_defaults = array('widget_id' => 0, 'before_widget' => '', 'after_widget' => '', 'before_title' => '', 'after_title' => ''); - extract( $sidebar_defaults, EXTR_PREFIX_ALL, 'sidebar' ); - extract( $params[0], EXTR_PREFIX_ALL, 'sidebar' ); + $num_cats = wp_count_terms('category'); - if ( !isset($wp_registered_widgets[$sidebar_widget_id]) || !is_array($wp_registered_widgets[$sidebar_widget_id]) ) { - return $params; + $num_tags = wp_count_terms('post_tag'); + + $num_comm = wp_count_comments( ); + + echo "\n\t".'<p class="sub">' . __('At a Glance') . '</p>'; + echo "\n\t".'<div class="table">'."\n\t".'<table>'; + echo "\n\t".'<tr class="first">'; + + // Posts + $num = number_format_i18n( $num_posts->publish ); + if ( current_user_can( 'edit_posts' ) ) + $text = "<a href='edit.php'>$num</a>"; + else + $text = $num; + echo '<td class="first b b-posts">' . $text . '</td>'; + echo '<td class="t posts">' . __ngettext( 'Post', 'Posts', intval($num_posts->publish) ) . '</td>'; + /* TODO: Show status breakdown on hover + if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can + $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>'; + } + if ( $can_edit_posts && !empty($num_posts->draft) ) { + $post_type_texts[] = '<a href="edit.php?post_status=draft">'.sprintf( __ngettext( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'</a>'; } - $widget_defaults = array('id' => '', 'width' => '', 'height' => '', 'class' => '', 'feed_link' => '', 'all_link' => '', 'notice' => false, 'error' => false); - extract( $widget_defaults, EXTR_PREFIX_ALL, 'widget' ); - extract( $wp_registered_widgets[$sidebar_widget_id], EXTR_PREFIX_ALL, 'widget' ); - - $the_classes = array(); - if ( in_array($widget_width, array( 'third', 'fourth', 'full' ) ) ) - $the_classes[] = $widget_width; - - if ( 'double' == $widget_height ) - $the_classes[] = 'double'; - - if ( $widget_class ) - $the_classes[] = $widget_class; - - // Add classes to the widget holder - if ( $the_classes ) - $sidebar_before_widget = str_replace( "<div class='dashboard-widget-holder ", "<div class='dashboard-widget-holder " . join( ' ', $the_classes ) . ' ', $sidebar_before_widget ); - - $links = array(); - if ( $widget_all_link ) - $links[] = '<a href="' . clean_url( $widget_all_link ) . '">' . __( 'See&nbsp;All' ) . '</a>'; - - $content_class = 'dashboard-widget-content'; - if ( current_user_can( 'edit_dashboard' ) && isset($wp_registered_widget_controls[$widget_id]) && is_callable($wp_registered_widget_controls[$widget_id]['callback']) ) { - // Switch this widget to edit mode - if ( isset($_GET['edit']) && $_GET['edit'] == $widget_id ) { - $content_class .= ' dashboard-widget-control'; - $wp_registered_widgets[$widget_id]['callback'] = 'wp_dashboard_empty'; - $sidebar_widget_name = $wp_registered_widget_controls[$widget_id]['name']; - $params[1] = 'wp_dashboard_trigger_widget_control'; - $sidebar_before_widget .= '<form action="' . clean_url(remove_query_arg( 'edit' )) . '" method="post">'; - $sidebar_after_widget = "<div class='dashboard-widget-submit'><input type='hidden' name='sidebar' value='wp_dashboard' /><input type='hidden' name='widget_id' value='$widget_id' /><input type='submit' value='" . __( 'Save' ) . "' /></div></form>$sidebar_after_widget"; - $links[] = '<a href="' . clean_url(remove_query_arg( 'edit' )) . '">' . __( 'Cancel' ) . '</a>'; + if ( $can_edit_posts && !empty($num_posts->future) ) { + $post_type_texts[] = '<a href="edit.php?post_status=future">'.sprintf( __ngettext( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'</a>'; + } + if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) { + $pending_text = sprintf( __ngettext( 'There is <a href="%1$s">%2$s post</a> pending your review.', 'There are <a href="%1$s">%2$s posts</a> pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) ); + } else { + $pending_text = ''; + } + */ + + // Total Comments + $num = number_format_i18n($num_comm->total_comments); + if ( current_user_can( 'moderate_comments' ) ) + $num = "<a href='edit-comments.php'>$num</a>"; + echo '<td class="b b-comments">'.$num.'</td>'; + echo '<td class="last t comments">' . __ngettext( 'Comment', 'Comments', $num_comm->total_comments ) . '</td>'; + + echo '</tr><tr>'; + + // Pages + $num = number_format_i18n( $num_pages->publish ); + if ( current_user_can( 'edit_pages' ) ) + $num = "<a href='edit-pages.php'>$num</a>"; + echo '<td class="first b b_pages">'.$num.'</td>'; + echo '<td class="t pages">' . __ngettext( 'Page', 'Pages', $num_pages->publish ) . '</td>'; + + // Approved Comments + $num = number_format_i18n($num_comm->approved); + if ( current_user_can( 'moderate_comments' ) ) + $num = "<a href='edit-comments.php?comment_status=approved'>$num</a>"; + echo '<td class="b b_approved">'.$num.'</td>'; + echo '<td class="last t approved">' . __ngettext( 'Approved', 'Approved', $num_comm->approved ) . '</td>'; + + echo "</tr>\n\t<tr>"; + + // Categories + $num = number_format_i18n( $num_cats ); + if ( current_user_can( 'manage_categories' ) ) + $num = "<a href='categories.php'>$num</a>"; + echo '<td class="first b b-cats">'.$num.'</td>'; + echo '<td class="t cats">' . __ngettext( 'Category', 'Categories', $num_cats ) . '</td>'; + + // Pending Comments + $num = number_format_i18n($num_comm->moderated); + if ( current_user_can( 'moderate_comments' ) ) + $num = "<a href='edit-comments.php?comment_status=moderated'><span class='pending-count'>$num</span></a>"; + echo '<td class="b b-waiting">'.$num.'</td>'; + echo '<td class="last t waiting">' . __ngettext( 'Pending', 'Pending', $num_comm->moderated ) . '</td>'; + + echo "</tr>\n\t<tr>"; + + // Tags + $num = number_format_i18n( $num_tags ); + if ( current_user_can( 'manage_categories' ) ) + $num = "<a href='edit-tags.php'>$num</a>"; + echo '<td class="first b b-tags">'.$num.'</td>'; + echo '<td class="t tags">' . __ngettext( 'Tag', 'Tags', $num_tags ) . '</td>'; + + // Spam Comments + $num = number_format_i18n($num_comm->spam); + if ( current_user_can( 'moderate_comments' ) ) + $num = "<a href='edit-comments.php?comment_status=spam'><span class='spam-count'>$num</span></a>"; + echo '<td class="b b-spam">'.$num.'</td>'; + echo '<td class="last t spam">' . __ngettext( 'Spam', 'Spam', $num_comm->spam ) . '</td>'; + + echo "</tr>"; + do_action('right_now_table_end'); + echo "\n\t</table>\n\t</div>"; + + echo "\n\t".'<div class="versions">'; + $ct = current_theme_info(); + $sidebars_widgets = wp_get_sidebars_widgets(); + $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ), 0 ); + $num = number_format_i18n( $num_widgets ); + + echo "\n\t<p>"; + if ( current_user_can( 'switch_themes' ) ) { + echo '<a href="themes.php" class="button rbutton">' . __('Change Theme') . '</a>'; + printf(__ngettext('Theme <span class="b"><a href="themes.php">%1$s</a></span> with <span class="b"><a href="widgets.php">%2$s Widget</a></span>', 'Theme <span class="b"><a href="themes.php">%1$s</a></span> with <span class="b"><a href="widgets.php">%2$s Widgets</a></span>', $num_widgets), $ct->title, $num); + } else { + printf(__ngettext('Theme <span class="b">%1$s</span> with <span class="b">%2$s Widget</span>', 'Theme <span class="b">%1$s</span> with <span class="b">%2$s Widgets</span>', $num_widgets), $ct->title, $num); + } + + echo '</p>'; + + update_right_now_message(); + + echo "\n\t".'</div>'; + do_action( 'rightnow_end' ); + do_action( 'activity_box_end' ); +} + +function wp_dashboard_quick_press() { + $drafts = false; + if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['action'] ) && 0 === strpos( $_POST['action'], 'post-quickpress' ) && (int) $_POST['post_ID'] ) { + $view = get_permalink( $_POST['post_ID'] ); + $edit = clean_url( get_edit_post_link( $_POST['post_ID'] ) ); + if ( 'post-quickpress-publish' == $_POST['action'] ) { + if ( current_user_can('publish_posts') ) + printf( '<div class="message"><p>' . __( 'Post Published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( $view ), $edit ); + else + printf( '<div class="message"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( add_query_arg( 'preview', 1, $view ) ), $edit ); } else { - $links[] = '<a href="' . clean_url(add_query_arg( 'edit', $widget_id )) . "#$widget_id" . '">' . __( 'Edit' ) . '</a>'; + printf( '<div class="message"><p>' . __( 'Draft Saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( add_query_arg( 'preview', 1, $view ) ), $edit ); + $drafts_query = new WP_Query( array( + 'post_type' => 'post', + 'what_to_show' => 'posts', + 'post_status' => 'draft', + 'author' => $GLOBALS['current_user']->ID, + 'posts_per_page' => 1, + 'orderby' => 'modified', + 'order' => 'DESC' + ) ); + + if ( $drafts_query->posts ) + $drafts =& $drafts_query->posts; } + printf('<p class="textright">' . __('You can also try %s, easy blogging from anywhere on the Web.') . '</p>', '<a href="tools.php">' . __('Press This') . '</a>' ); + $_REQUEST = array(); // hack for get_default_post_to_edit() } - if ( $widget_feed_link ) - $links[] = '<img class="rss-icon" src="' . includes_url('images/rss.png') . '" alt="' . __( 'rss icon' ) . '" /> <a href="' . clean_url( $widget_feed_link ) . '">' . __( 'RSS' ) . '</a>'; + $post = get_default_post_to_edit(); +?> + + <form name="post" action="<?php echo clean_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press"> + <h4 id="quick-post-title"><label for="title"><?php _e('Title') ?></label></h4> + <div class="input-text-wrap"> + <input type="text" name="post_title" id="title" tabindex="1" autocomplete="off" value="<?php echo attribute_escape( $post->post_title ); ?>" /> + </div> + + <?php if ( current_user_can( 'upload_files' ) ) : ?> + <div id="media-buttons" class="hide-if-no-js"> + <?php do_action( 'media_buttons' ); ?> + </div> + <?php endif; ?> + + <h4 id="content-label"><label for="content"><?php _e('Content') ?></label></h4> + <div class="textarea-wrap"> + <textarea name="content" id="content" class="mceEditor" rows="3" cols="15" tabindex="2"><?php echo $post->post_content; ?></textarea> + </div> + + <script type="text/javascript">edCanvas = document.getElementById('content');edInsertContent = null;</script> + + <h4><label for="tags-input"><?php _e('Tags') ?></label></h4> + <div class="input-text-wrap"> + <input type="text" name="tags_input" id="tags-input" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /> + </div> + + <p class="submit"> + <input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" /> + <input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" /> + <?php wp_nonce_field('add-post'); ?> + <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php _e('Save Draft'); ?>" /> + <input type="reset" value="<?php _e( 'Cancel' ); ?>" class="cancel" /> + <?php if ( current_user_can('publish_posts') ) { ?> + <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Publish'); ?>" /> + <?php } else { ?> + <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Submit for Review'); ?>" /> + <?php } ?> + <br class="clear" /> + </p> + + </form> - $links = apply_filters( "wp_dashboard_widget_links_$widget_id", $links ); +<?php + if ( $drafts ) + wp_dashboard_recent_drafts( $drafts ); +} - // Add links to widget's title bar - if ( $links ) { - $sidebar_before_title .= '<span>'; - $sidebar_after_title = '</span><small>' . join( '&nbsp;|&nbsp;', $links ) . "</small><br class='clear' />$sidebar_after_title"; +function wp_dashboard_recent_drafts( $drafts = false ) { + if ( !$drafts ) { + $drafts_query = new WP_Query( array( + 'post_type' => 'post', + 'what_to_show' => 'posts', + 'post_status' => 'draft', + 'author' => $GLOBALS['current_user']->ID, + 'posts_per_page' => 5, + 'orderby' => 'modified', + 'order' => 'DESC' + ) ); + $drafts =& $drafts_query->posts; } - // Could have put this in widget-content. Doesn't really matter - if ( $widget_notice ) - $sidebar_after_title .= "\t\t\t<div class='dashboard-widget-notice'>$widget_notice</div>\n\n"; + if ( $drafts && is_array( $drafts ) ) { + $list = array(); + foreach ( $drafts as $draft ) { + $url = get_edit_post_link( $draft->ID ); + $title = _draft_or_post_title( $draft->ID ); + $item = "<h4><a href='$url' title='" . sprintf( __( 'Edit "%s"' ), attribute_escape( $title ) ) . "'>$title</a> <abbr title='" . get_the_time(__('Y/m/d g:i:s A'), $draft) . "'>" . get_the_time( get_option( 'date_format' ), $draft ) . '</abbr></h4>'; + if ( $the_content = preg_split( '#\s#', strip_tags( $draft->post_content ), 11, PREG_SPLIT_NO_EMPTY ) ) + $item .= '<p>' . join( ' ', array_slice( $the_content, 0, 10 ) ) . ( 10 < count( $the_content ) ? '&hellip;' : '' ) . '</p>'; + $list[] = $item; + } +?> + <ul> + <li><?php echo join( "</li>\n<li>", $list ); ?></li> + </ul> + <p class="textright"><a href="edit.php?post_status=draft" class="button"><?php _e('View all'); ?></a></p> +<?php + } else { + _e('There are no drafts at the moment'); + } +} - if ( $widget_error ) - $sidebar_after_title .= "\t\t\t<div class='dashboard-widget-error'>$widget_error</div>\n\n"; +/** + * Display recent comments dashboard widget content. + * + * @since unknown + */ +function wp_dashboard_recent_comments() { + global $wpdb; + + if ( current_user_can('edit_posts') ) + $allowed_states = array('0', '1'); + else + $allowed_states = array('1'); + + // Select all comment types and filter out spam later for better query performance. + $comments = array(); + $start = 0; + + while ( count( $comments ) < 5 && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments ORDER BY comment_date_gmt DESC LIMIT $start, 50" ) ) { + + foreach ( $possible as $comment ) { + if ( count( $comments ) >= 5 ) + break; + if ( in_array( $comment->comment_approved, $allowed_states ) ) + $comments[] = $comment; + } - $sidebar_after_title .= "\t\t\t<div class='$content_class'>\n\n"; + $start = $start + 50; + } - $sidebar_after_widget .= "\t\t\t</div>\n\n"; + if ( $comments ) : +?> - foreach( array_keys( $params[0] ) as $key ) - $$key = ${'sidebar_' . $key}; + <div id="the-comment-list" class="list:comment"> +<?php + foreach ( $comments as $comment ) + _wp_dashboard_recent_comments_row( $comment ); +?> - $params[0] = compact( array_keys( $params[0] ) ); + </div> - return $params; -} +<?php + if ( current_user_can('edit_posts') ) { ?> + <p class="textright"><a href="edit-comments.php" class="button"><?php _e('View all'); ?></a></p> +<?php } + wp_comment_reply( -1, false, 'dashboard', false ); -/* Dashboard Widgets */ + else : +?> -function wp_dashboard_recent_comments( $sidebar_args ) { - global $comment; - extract( $sidebar_args, EXTR_SKIP ); + <p><?php _e( 'No comments yet.' ); ?></p> - echo $before_widget; +<?php + endif; // $comments; +} - echo $before_title; - echo $widget_name; - echo $after_title; +function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { + $GLOBALS['comment'] =& $comment; - $lambda = create_function( '', 'return 5;' ); - add_filter( 'option_posts_per_rss', $lambda ); // hack - comments query doesn't accept per_page parameter - $comments_query = new WP_Query(array('feed' => 'rss2', 'withcomments' => 1)); - remove_filter( 'option_posts_per_rss', $lambda ); + $comment_post_url = get_edit_post_link( $comment->comment_post_ID ); + $comment_post_title = get_the_title( $comment->comment_post_ID ); + $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>"; + $comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</a>'; - $is_first = true; + $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); + $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) ); + $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) ); + $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); - if ( $comments_query->have_comments() ) { - while ( $comments_query->have_comments() ) { $comments_query->the_comment(); + $actions = array(); - $comment_post_url = get_permalink( $comment->comment_post_ID ); - $comment_post_title = get_the_title( $comment->comment_post_ID ); - $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>"; - $comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</a>'; - $comment_meta = sprintf( __( 'From <strong>%1$s</strong> on %2$s %3$s' ), get_comment_author(), $comment_post_link, $comment_link ); + $actions_string = ''; + if ( current_user_can('edit_post', $comment->comment_post_ID) ) { + $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>'; + $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>'; + $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>'; + //$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>'; + $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>'; + $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>'; + $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>'; - if ( $is_first ) : $is_first = false; -?> - <blockquote><p>&#8220;<?php comment_excerpt(); ?>&#8221;</p></blockquote> - <p class='comment-meta'><?php echo $comment_meta; ?></p> -<?php - if ( $comments_query->comment_count > 1 ) : ?> - <ul id="dashboard-comments-list"> -<?php - endif; // comment_count - else : // is_first -?> + $actions = apply_filters( 'comment_row_actions', $actions, $comment ); - <li class='comment-meta'><?php echo $comment_meta; ?></li> -<?php - endif; // is_first - } + $i = 0; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; - if ( $comments_query->comment_count > 1 ) : ?> - </ul> -<?php - endif; // comment_count; + // Reply and quickedit need a hide-if-no-js span + if ( 'reply' == $action || 'quickedit' == $action ) + $action .= ' hide-if-no-js'; + $actions_string .= "<span class='$action'>$sep$link</span>"; + } } - echo $after_widget; +?> + + <div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>> + <?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?> + + <?php echo get_avatar( $comment, 50 ); ?> + <h4 class="comment-meta"><?php printf( __( 'From %1$s on %2$s%3$s' ), '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link." ".$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?></h4> + + <?php + else : + switch ( $comment->comment_type ) : + case 'pingback' : + $type = __( 'Pingback' ); + break; + case 'trackback' : + $type = __( 'Trackback' ); + break; + default : + $type = ucwords( $comment->comment_type ); + endswitch; + $type = wp_specialchars( $type ); + ?> + + <h4 class="comment-meta"><?php printf( __( '%1$s on %2$s' ), "<strong>$type</strong>", $comment_post_link ); ?></h4> + <p class="comment-author"><?php comment_author_link(); ?></p> + + <?php endif; // comment_type ?> + <blockquote><p><?php comment_excerpt(); ?></p></blockquote> + <p class="row-actions"><?php echo $actions_string; ?></p> + + <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden"> + <textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea> + <div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div> + <div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div> + <div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div> + <div class="comment_status"><?php echo $comment->comment_approved; ?></div> + </div> + + </div> +<?php +} + +function wp_dashboard_incoming_links() { + wp_dashboard_cached_rss_widget( 'dashboard_incoming_links', 'wp_dashboard_incoming_links_output' ); } -// $sidebar_args are handled by wp_dashboard_empty() +/** + * Display incoming links dashboard widget content. + * + * @since unknown + */ function wp_dashboard_incoming_links_output() { $widgets = get_option( 'dashboard_widget_options' ); @extract( @$widgets['dashboard_incoming_links'], EXTR_SKIP ); @@ -371,35 +604,83 @@ function wp_dashboard_incoming_links_output() { } } -// $sidebar_args are handled by wp_dashboard_empty() +function wp_dashboard_incoming_links_control() { + wp_dashboard_rss_control( 'dashboard_incoming_links', array( 'title' => false, 'show_summary' => false, 'show_author' => false ) ); +} + +function wp_dashboard_primary() { + wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' ); +} + +function wp_dashboard_primary_control() { + wp_dashboard_rss_control( 'dashboard_primary' ); +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param int $widget_id + */ function wp_dashboard_rss_output( $widget_id ) { $widgets = get_option( 'dashboard_widget_options' ); + echo "<div class='rss-widget'>"; wp_widget_rss_output( $widgets[$widget_id] ); + echo "</div>"; +} + +function wp_dashboard_secondary() { + wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' ); } -// $sidebar_args are handled by wp_dashboard_empty() +function wp_dashboard_secondary_control() { + wp_dashboard_rss_control( 'dashboard_secondary' ); +} + +/** + * Display secondary dashboard RSS widget feed. + * + * @since unknown + * + * @return unknown + */ function wp_dashboard_secondary_output() { $widgets = get_option( 'dashboard_widget_options' ); @extract( @$widgets['dashboard_secondary'], EXTR_SKIP ); $rss = @fetch_rss( $url ); + if ( !isset($rss->items) || 0 == count($rss->items) ) return false; - echo "<ul id='planetnews'>\n"; - $rss->items = array_slice($rss->items, 0, $items); - foreach ($rss->items as $item ) { - $title = wp_specialchars($item['title']); - list($author,$post) = explode( ':', $title, 2 ); - $link = clean_url($item['link']); - echo "\t<li><a href='$link'><span class='post'>$post</span><span class='hidden'> - </span><cite>$author</cite></a></li>\n"; + if ( 'http://planet.wordpress.org/' == $rss->channel['link'] ) { + foreach ( array_keys($rss->items) as $i ) { + list($site, $description) = explode( ':', wp_specialchars($rss->items[$i]['title']), 2 ); + $rss->items[$i]['dc']['creator'] = trim($site); + $rss->items[$i]['title'] = trim($description); + } } - echo "</ul>\n<br class='clear' />\n"; + echo "<div class='rss-widget'>"; + wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] ); + echo "</div>"; +} + +function wp_dashboard_plugins() { + wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array( + 'http://wordpress.org/extend/plugins/rss/browse/popular/', + 'http://wordpress.org/extend/plugins/rss/browse/new/', + 'http://wordpress.org/extend/plugins/rss/browse/updated/' + ) ); } -// $sidebar_args are handled by wp_dashboard_empty() +/** + * Display plugins most popular, newest plugins, and recently updated widget text. + * + * @since unknown + */ function wp_dashboard_plugins_output() { $popular = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/popular/' ); $new = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/new/' ); @@ -433,18 +714,35 @@ function wp_dashboard_plugins_output() { list($link, $frag) = explode( '#', $item['link'] ); $link = clean_url($link); - $dlink = rtrim($link, '/') . '/download/'; + if( preg_match('|/([^/]+?)/?$|', $link, $matches) ) + $slug = $matches[1]; + else + $slug = ''; + + $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . + '&amp;TB_iframe=true&amp;width=600&amp;height=800'; echo "<h4>$label</h4>\n"; - echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$dlink'>" . __( 'Download' ) . "</a>)</span>\n"; + echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n"; echo "<p>$description</p>\n"; } } -// Checks to see if all of the feed url in $check_urls are cached. -// If $check_urls is empty, look for the rss feed url found in the dashboard widget optios of $widget_id. -// If cached, call $callback, a function that echoes out output for this widget. -// If not cache, echo a "Loading..." stub which is later replaced by AJAX call (see top of /wp-admin/index.php) +/** + * Checks to see if all of the feed url in $check_urls are cached. + * + * If $check_urls is empty, look for the rss feed url found in the dashboard + * widget optios of $widget_id. If cached, call $callback, a function that + * echoes out output for this widget. If not cache, echo a "Loading..." stub + * which is later replaced by AJAX call (see top of /wp-admin/index.php) + * + * @since unknown + * + * @param int $widget_id + * @param callback $callback + * @param array $check_urls RSS feeds + * @return bool False on failure. True on success. + */ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) { $loading = '<p class="widget-loading">' . __( 'Loading&#8230;' ) . '</p>'; @@ -480,42 +778,36 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar return true; } -// Empty widget used for JS/AJAX created output. -// Callback inserts content between before_widget and after_widget. Used when widget is in edit mode. Can also be used for custom widgets. -function wp_dashboard_empty( $sidebar_args, $callback = false ) { - extract( $sidebar_args, EXTR_SKIP ); - - echo $before_widget; - - echo $before_title; - echo $widget_name; - echo $after_title; - - // When in edit mode, the callback passed to this function is the widget_control callback - if ( $callback && is_callable( $callback ) ) { - $args = array_slice( func_get_args(), 2 ); - array_unshift( $args, $widget_id ); - call_user_func_array( $callback, $args ); - } - - echo $after_widget; -} - -/* Dashboard Widgets Controls. Ssee also wp_dashboard_empty() */ +/* Dashboard Widgets Controls */ // Calls widget_control callback +/** + * Calls widget control callback. + * + * @since unknown + * + * @param int $widget_control_id Registered Widget ID. + */ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) { - global $wp_registered_widget_controls; - if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_registered_widget_controls[$widget_control_id]) && is_callable($wp_registered_widget_controls[$widget_control_id]['callback']) ) - call_user_func_array( $wp_registered_widget_controls[$widget_control_id]['callback'], $wp_registered_widget_controls[$widget_control_id]['params'] ); -} + global $wp_dashboard_control_callbacks; -// Sets up $args to be used as input to wp_widget_rss_form(), handles POST data from RSS-type widgets -function wp_dashboard_rss_control( $args ) { - extract( $args ); - if ( !$widget_id ) - return false; + if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id]) ) { + call_user_func( $wp_dashboard_control_callbacks[$widget_control_id], '', array( 'id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) ); + } +} +/** + * The RSS dashboard widget control. + * + * Sets up $args to be used as input to wp_widget_rss_form(). Handles POST data + * from RSS-type widgets. + * + * @since unknown + * + * @param string widget_id + * @param array form_inputs + */ +function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) { if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) $widget_options = array(); @@ -540,4 +832,9 @@ function wp_dashboard_rss_control( $args ) { wp_widget_rss_form( $widget_options[$widget_id], $form_inputs ); } +/** + * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS). + */ +function wp_dashboard_empty() {} + ?> wp-admin/includes/dashboard.php @@ -1,8 +1,28 @@ <?php - -// version number for the export format. bump this when something changes that might affect compatibility. +/** + * WordPress Export Administration API + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Version number for the export format. + * + * Bump this when something changes that might affect compatibility. + * + * @since unknown + * @var string + */ define('WXR_VERSION', '1.0'); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $author + */ function export_wp($author='') { global $wpdb, $post_ids, $post; @@ -26,6 +46,13 @@ $post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts $where ORDER BY post_dat $categories = (array) get_categories('get=all'); $tags = (array) get_tags('get=all'); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $categories + */ function wxr_missing_parents($categories) { if ( !is_array($categories) || empty($categories) ) return array(); @@ -61,6 +88,13 @@ while ( ( $cat = array_shift($categories) ) && ++$pass < $passes ) { } unset($categories); +/** + * Place string in CDATA tag. + * + * @since unknown + * + * @param string $str String to place in XML CDATA tag. + */ function wxr_cdata($str) { if ( seems_utf8($str) == false ) $str = utf8_encode($str); @@ -72,6 +106,13 @@ function wxr_cdata($str) { return $str; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return string Site URL. + */ function wxr_site_url() { global $current_site; @@ -85,6 +126,13 @@ function wxr_site_url() { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param object $c Category Object + */ function wxr_cat_name($c) { if ( empty($c->name) ) return; @@ -92,6 +140,13 @@ function wxr_cat_name($c) { echo '<wp:cat_name>' . wxr_cdata($c->name) . '</wp:cat_name>'; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param object $c Category Object + */ function wxr_category_description($c) { if ( empty($c->description) ) return; @@ -99,6 +154,13 @@ function wxr_category_description($c) { echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>'; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param object $t Tag Object + */ function wxr_tag_name($t) { if ( empty($t->name) ) return; @@ -106,6 +168,13 @@ function wxr_tag_name($t) { echo '<wp:tag_name>' . wxr_cdata($t->name) . '</wp:tag_name>'; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param object $t Tag Object + */ function wxr_tag_description($t) { if ( empty($t->description) ) return; @@ -113,6 +182,11 @@ function wxr_tag_description($t) { echo '<wp:tag_description>' . wxr_cdata($t->description) . '</wp:tag_description>'; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function wxr_post_taxonomy() { $categories = get_the_category(); $tags = get_the_tags(); @@ -148,7 +222,7 @@ echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n"; <!-- To import this information into a WordPress blog follow these steps. --> <!-- 1. Log into that blog as an administrator. --> -<!-- 2. Go to Manage: Import in the blog's admin panels. --> +<!-- 2. Go to Tools: Import in the blog's admin panels (or Manage: Import in older versions of WordPress). --> <!-- 3. Choose "WordPress" from the list. --> <!-- 4. Upload this file using the form provided on that page. --> <!-- 5. You will first be asked to map the authors in this export file to users --> @@ -159,6 +233,7 @@ echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n"; <?php the_generator('export');?> <rss version="2.0" + xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" @@ -190,6 +265,9 @@ echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n"; $where = "WHERE ID IN (".join(',', $next_posts).")"; $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC"); foreach ($posts as $post) { + // Don't export revisions. They bloat the export. + if ( 'revision' == $post->post_type ) + continue; setup_postdata($post); ?> <item> <title><?php echo apply_filters('the_title_rss', $post->post_title); ?></title> wp-admin/includes/export.php @@ -1,23 +1,70 @@ <?php - -$wp_file_descriptions = array ('index.php' => __( 'Main Index Template' ), 'style.css' => __( 'Stylesheet' ), 'rtl.css' => __( 'RTL Stylesheet' ), 'comments.php' => __( 'Comments' ), 'comments-popup.php' => __( 'Popup Comments' ), 'footer.php' => __( 'Footer' ), 'header.php' => __( 'Header' ), 'sidebar.php' => __( 'Sidebar' ), 'archive.php' => __( 'Archives' ), 'category.php' => __( 'Category Template' ), 'page.php' => __( 'Page Template' ), 'search.php' => __( 'Search Results' ), 'searchform.php' => __( 'Search Form' ), 'single.php' => __( 'Single Post' ), '404.php' => __( '404 Template' ), 'link.php' => __( 'Links Template' ), 'functions.php' => __( 'Theme Functions' ), 'attachment.php' => __( 'Attachment Template' ), 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), '.htaccess' => __( '.htaccess (for rewrite rules )' ), +/** + * File contains all the administration image manipulation functions. + * + * @package WordPress + * @subpackage Administration + */ + +/** The descriptions for theme files. */ +$wp_file_descriptions = array ( + 'index.php' => __( 'Main Index Template' ), + 'style.css' => __( 'Stylesheet' ), + 'rtl.css' => __( 'RTL Stylesheet' ), + 'comments.php' => __( 'Comments' ), + 'comments-popup.php' => __( 'Popup Comments' ), + 'footer.php' => __( 'Footer' ), + 'header.php' => __( 'Header' ), + 'sidebar.php' => __( 'Sidebar' ), + 'archive.php' => __( 'Archives' ), + 'category.php' => __( 'Category Template' ), + 'page.php' => __( 'Page Template' ), + 'search.php' => __( 'Search Results' ), + 'searchform.php' => __( 'Search Form' ), + 'single.php' => __( 'Single Post' ), + '404.php' => __( '404 Template' ), + 'link.php' => __( 'Links Template' ), + 'functions.php' => __( 'Theme Functions' ), + 'attachment.php' => __( 'Attachment Template' ), + 'image.php' => __('Image Attachment Template'), + 'video.php' => __('Video Attachment Template'), + 'audio.php' => __('Audio Attachment Template'), + 'application.php' => __('Application Attachment Template'), + 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), + '.htaccess' => __( '.htaccess (for rewrite rules )' ), // Deprecated files 'wp-layout.css' => __( 'Stylesheet' ), 'wp-comments.php' => __( 'Comments Template' ), 'wp-comments-popup.php' => __( 'Popup Comments Template' )); + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + * @return unknown + */ function get_file_description( $file ) { global $wp_file_descriptions; if ( isset( $wp_file_descriptions[basename( $file )] ) ) { return $wp_file_descriptions[basename( $file )]; } - elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) { - $template_data = implode( '', file( ABSPATH . $file ) ); - if ( preg_match( "|Template Name:(.*)|i", $template_data, $name )) - return $name[1]; + elseif ( file_exists( WP_CONTENT_DIR . $file ) && is_file( WP_CONTENT_DIR . $file ) ) { + $template_data = implode( '', file( WP_CONTENT_DIR . $file ) ); + if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name )) + return $name[1] . ' Page Template'; } return basename( $file ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function get_home_path() { $home = get_option( 'home' ); if ( $home != '' && $home != get_option( 'siteurl' ) ) { @@ -32,6 +79,14 @@ function get_home_path() { return $home_path; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + * @return unknown + */ function get_real_file_to_edit( $file ) { if ('index.php' == $file || '.htaccess' == $file ) { $real_file = get_home_path() . $file; @@ -41,8 +96,16 @@ function get_real_file_to_edit( $file ) { return $real_file; } -//$folder = Full path to folder -//$levels = Levels of folders to follow, Default: 100 (PHP Loop limit) + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param string $folder Optional. Full path to folder + * @param int $levels Optional. Levels of folders to follow, Default: 100 (PHP Loop limit). + * @return bool|array + */ function list_files( $folder = '', $levels = 100 ) { if( empty($folder) ) return false; @@ -70,6 +133,13 @@ function list_files( $folder = '', $levels = 100 ) { return $files; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function get_temp_dir() { if ( defined('WP_TEMP_DIR') ) return trailingslashit(WP_TEMP_DIR); @@ -84,6 +154,15 @@ function get_temp_dir() { return '/tmp/'; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $filename + * @param unknown_type $dir + * @return unknown + */ function wp_tempnam($filename = '', $dir = ''){ if ( empty($dir) ) $dir = get_temp_dir(); @@ -96,6 +175,15 @@ function wp_tempnam($filename = '', $dir = ''){ return $filename; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + * @param unknown_type $allowed_files + * @return unknown + */ function validate_file_to_edit( $file, $allowed_files = '' ) { $file = stripslashes( $file ); @@ -116,12 +204,16 @@ function validate_file_to_edit( $file, $allowed_files = '' ) { } } -// array wp_handle_upload ( array &file [, array overrides] ) -// file: reference to a single element of $_FILES. Call the function once for each uploaded file. -// overrides: an associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ). -// On success, returns an associative array of file attributes. -// On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). -function wp_handle_upload( &$file, $overrides = false ) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file. + * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ). + * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). + */ +function wp_handle_upload( &$file, $overrides = false, $time = null ) { // The default error handler. if (! function_exists( 'wp_handle_upload_error' ) ) { function wp_handle_upload_error( &$file, $message ) { @@ -132,6 +224,9 @@ function wp_handle_upload( &$file, $overrides = false ) { // You may define your own function and pass the name in $overrides['upload_error_handler'] $upload_error_handler = 'wp_handle_upload_error'; + // You may define your own function and pass the name in $overrides['unique_filename_callback'] + $unique_filename_callback = null; + // $_POST['action'] must be set and its value must equal $overrides['action'] or this: $action = 'wp_handle_upload'; @@ -141,6 +236,7 @@ function wp_handle_upload( &$file, $overrides = false ) { __( "The uploaded file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form." ), __( "The uploaded file was only partially uploaded." ), __( "No file was uploaded." ), + '', __( "Missing a temporary folder." ), __( "Failed to write file to disk." )); @@ -189,7 +285,7 @@ function wp_handle_upload( &$file, $overrides = false ) { } // A writable uploads dir will pass this test. Again, there's no point overriding this one. - if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) + if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) ) return $upload_error_handler( $file, $uploads['error'] ); $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); @@ -212,7 +308,18 @@ function wp_handle_upload( &$file, $overrides = false ) { return $return; } -// Pass this function an array similar to that of a $_FILES POST array. + +/** + * {@internal Missing Short Description}} + * + * Pass this function an array similar to that of a $_FILES POST array. + * + * @since unknown + * + * @param unknown_type $file + * @param unknown_type $overrides + * @return unknown + */ function wp_handle_sideload( &$file, $overrides = false ) { // The default error handler. if (! function_exists( 'wp_handle_upload_error' ) ) { @@ -224,6 +331,9 @@ function wp_handle_sideload( &$file, $overrides = false ) { // You may define your own function and pass the name in $overrides['upload_error_handler'] $upload_error_handler = 'wp_handle_upload_error'; + // You may define your own function and pass the name in $overrides['unique_filename_callback'] + $unique_filename_callback = null; + // $_POST['action'] must be set and its value must equal $overrides['action'] or this: $action = 'wp_handle_sideload'; @@ -285,11 +395,11 @@ function wp_handle_sideload( &$file, $overrides = false ) { return $upload_error_handler( $file, $uploads['error'] ); $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); - + // Strip the query strings. $filename = str_replace('?','-', $filename); $filename = str_replace('&','-', $filename); - + // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; if ( false === @ rename( $file['tmp_name'], $new_file ) ) { @@ -310,45 +420,65 @@ function wp_handle_sideload( &$file, $overrides = false ) { } /** -* Downloads a url to a local file using the Snoopy HTTP Class -* -* @param string $url the URL of the file to download -* @return mixed WP_Error on failure, string Filename on success. -*/ + * Downloads a url to a local file using the Snoopy HTTP Class. + * + * @since unknown + * @todo Transition over to using the new HTTP Request API (jacob). + * + * @param string $url the URL of the file to download + * @return mixed WP_Error on failure, string Filename on success. + */ function download_url( $url ) { //WARNING: The file is not automatically deleted, The script must unlink() the file. - if( ! $url ) + if ( ! $url ) return new WP_Error('http_no_url', __('Invalid URL Provided')); $tmpfname = wp_tempnam($url); - if( ! $tmpfname ) + if ( ! $tmpfname ) return new WP_Error('http_no_file', __('Could not create Temporary file')); - $handle = @fopen($tmpfname, 'w'); - if( ! $handle ) + $handle = @fopen($tmpfname, 'wb'); + if ( ! $handle ) return new WP_Error('http_no_file', __('Could not create Temporary file')); - require_once( ABSPATH . 'wp-includes/class-snoopy.php' ); - $snoopy = new Snoopy(); - $snoopy->fetch($url); + $response = wp_remote_get($url, array('timeout' => 30)); + + if ( is_wp_error($response) ) { + fclose($handle); + unlink($tmpfname); + return $response; + } - if( $snoopy->status != '200' ){ + if ( $response['response']['code'] != '200' ){ fclose($handle); unlink($tmpfname); - return new WP_Error('http_404', trim($snoopy->response_code)); + return new WP_Error('http_404', trim($response['response']['message'])); } - fwrite($handle, $snoopy->results); + + fwrite($handle, $response['body']); fclose($handle); return $tmpfname; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + * @param unknown_type $to + * @return unknown + */ function unzip_file($file, $to) { global $wp_filesystem; if ( ! $wp_filesystem || !is_object($wp_filesystem) ) return new WP_Error('fs_unavailable', __('Could not access filesystem.')); + // Unzip uses a lot of memory + @ini_set('memory_limit', '256M'); + $fs =& $wp_filesystem; require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php'); @@ -362,37 +492,56 @@ function unzip_file($file, $to) { if ( 0 == count($archive_files) ) return new WP_Error('empty_archive', __('Empty archive')); - $to = trailingslashit($to); - $path = explode('/', $to); - $tmppath = ''; - for ( $j = 0; $j < count($path) - 1; $j++ ) { - $tmppath .= $path[$j] . '/'; - if ( ! $fs->is_dir($tmppath) ) - $fs->mkdir($tmppath, 0755); + $path = explode('/', untrailingslashit($to)); + for ( $i = count($path); $i > 0; $i-- ) { //>0 = first element is empty allways for paths starting with '/' + $tmppath = implode('/', array_slice($path, 0, $i) ); + if ( $fs->is_dir($tmppath) ) { //Found the highest folder that exists, Create from here(ie +1) + for ( $i = $i + 1; $i <= count($path); $i++ ) { + $tmppath = implode('/', array_slice($path, 0, $i) ); + if ( ! $fs->mkdir($tmppath, FS_CHMOD_DIR) ) + return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath); + } + break; //Exit main for loop + } } + $to = trailingslashit($to); foreach ($archive_files as $file) { - $path = explode('/', $file['filename']); - $tmppath = ''; - - // Loop through each of the items and check that the folder exists. - for ( $j = 0; $j < count($path) - 1; $j++ ) { - $tmppath .= $path[$j] . '/'; - if ( ! $fs->is_dir($to . $tmppath) ) - if ( !$fs->mkdir($to . $tmppath, 0755) ) - return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $tmppath); + $path = $file['folder'] ? $file['filename'] : dirname($file['filename']); + $path = explode('/', $path); + for ( $i = count($path); $i >= 0; $i-- ) { //>=0 as the first element contains data + if ( empty($path[$i]) ) + continue; + $tmppath = $to . implode('/', array_slice($path, 0, $i) ); + if ( $fs->is_dir($tmppath) ) {//Found the highest folder that exists, Create from here + for ( $i = $i + 1; $i <= count($path); $i++ ) { //< count() no file component please. + $tmppath = $to . implode('/', array_slice($path, 0, $i) ); + if ( ! $fs->is_dir($tmppath) && ! $fs->mkdir($tmppath, FS_CHMOD_DIR) ) + return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath); + } + break; //Exit main for loop + } } // We've made sure the folders are there, so let's extract the file now: - if ( ! $file['folder'] ) + if ( ! $file['folder'] ) { if ( !$fs->put_contents( $to . $file['filename'], $file['content']) ) return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']); - $fs->chmod($to . $file['filename'], 0644); + $fs->chmod($to . $file['filename'], FS_CHMOD_FILE); + } } - return true; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $from + * @param unknown_type $to + * @return unknown + */ function copy_dir($from, $to) { global $wp_filesystem; @@ -403,12 +552,18 @@ function copy_dir($from, $to) { foreach ( (array) $dirlist as $filename => $fileinfo ) { if ( 'f' == $fileinfo['type'] ) { - if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) - return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename); - $wp_filesystem->chmod($to . $filename, 0644); + if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) { + // If copy failed, chmod file to 0644 and try again. + $wp_filesystem->chmod($to . $filename, 0644); + if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) + return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename); + } + $wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE); } elseif ( 'd' == $fileinfo['type'] ) { - if ( !$wp_filesystem->mkdir($to . $filename, 0755) ) - return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename); + if ( !$wp_filesystem->is_dir($to . $filename) ) { + if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) ) + return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename); + } $result = copy_dir($from . $filename, $to . $filename); if ( is_wp_error($result) ) return $result; @@ -416,17 +571,25 @@ function copy_dir($from, $to) { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $args + * @return unknown + */ function WP_Filesystem( $args = false ) { global $wp_filesystem; require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php'); - $method = get_filesystem_method(); + $method = get_filesystem_method($args); if ( ! $method ) return false; - $abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-'.$method.'.php', $method); + $abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method); if( ! file_exists($abstraction_file) ) return; @@ -441,10 +604,24 @@ function WP_Filesystem( $args = false ) { if ( !$wp_filesystem->connect() ) return false; //There was an erorr connecting to the server. + // Set the permission constants if not already set. + if ( ! defined('FS_CHMOD_DIR') ) + define('FS_CHMOD_DIR', 0755 ); + if ( ! defined('FS_CHMOD_FILE') ) + define('FS_CHMOD_FILE', 0644 ); + return true; } -function get_filesystem_method() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $args + * @return unknown + */ +function get_filesystem_method($args = array()) { $method = false; if( function_exists('getmyuid') && function_exists('fileowner') ){ $temp_file = wp_tempnam(); @@ -453,9 +630,140 @@ function get_filesystem_method() { unlink($temp_file); } + if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') ) $method = 'ssh2'; if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext'; if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread return apply_filters('filesystem_method', $method); } -?> \ No newline at end of file +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $form_post + * @param unknown_type $type + * @param unknown_type $error + * @return unknown + */ +function request_filesystem_credentials($form_post, $type = '', $error = false) { + $req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error); + if ( '' !== $req_cred ) + return $req_cred; + + if ( empty($type) ) + $type = get_filesystem_method(); + + if ( 'direct' == $type ) + return true; + + $credentials = get_option('ftp_credentials', array()); + // If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option) + $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']); + $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']); + $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']); + + // Check to see if we are setting the public/private keys for ssh + $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? $_POST['public_key'] : $credentials['public_key']); + $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? $_POST['private_key'] : $credentials['private_key']); + + if ( strpos($credentials['hostname'], ':') ) + list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2); + + if ( defined('FTP_SSH') || (isset($_POST['connection_type']) && 'ssh' == $_POST['connection_type']) ) + $credentials['connection_type'] = 'ssh'; + else if ( defined('FTP_SSL') || (isset($_POST['connection_type']) && 'ftps' == $_POST['connection_type']) ) + $credentials['connection_type'] = 'ftps'; + else if ( !isset($credentials['connection_type']) || (isset($_POST['connection_type']) && 'ftp' == $_POST['connection_type']) ) + $credentials['connection_type'] = 'ftp'; + + if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) { + $stored_credentials = $credentials; + unset($stored_credentials['password'], $stored_credentials['private_key'], $stored_credentials['public_key']); + update_option('ftp_credentials', $stored_credentials); + return $credentials; + } + $hostname = ''; + $username = ''; + $password = ''; + $connection_type = ''; + if ( !empty($credentials) ) + extract($credentials, EXTR_OVERWRITE); + if ( $error ) { + $error_string = __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.'); + if ( is_wp_error($error) ) + $error_string = $error->get_error_message(); + echo '<div id="message" class="error"><p>' . $error_string . '</p></div>'; + } +?> +<script type="text/javascript"> +<!-- +jQuery(function($){ + jQuery("#ssh").click(function () { + jQuery("#ssh_keys").show(); + }); + jQuery("#ftp, #ftps").click(function () { + jQuery("#ssh_keys").hide(); + }); +}); +--> +</script> +<form action="<?php echo $form_post ?>" method="post"> +<div class="wrap"> +<h2><?php _e('Connection Information') ?></h2> +<p><?php _e('To perform the requested action, connection information is required.') ?></p> + +<table class="form-table"> +<tr valign="top"> +<th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th> +<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td> +</tr> + +<tr valign="top"> +<th scope="row"><label for="username"><?php _e('Username') ?></label></th> +<td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td> +</tr> + +<tr valign="top"> +<th scope="row"><label for="password"><?php _e('Password') ?></label></th> +<td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td> +</tr> + +<tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>"> +<th scope="row"><?php _e('Authentication Keys') ?> +<div class="key-labels textright"> +<label for="public_key"><?php _e('Public Key:') ?></label ><br /> +<label for="private_key"><?php _e('Private Key:') ?></label> +</div></th> +<td><br /><input name="public_key" type="text" id="public_key" value=""<?php if( defined('FTP_PUBKEY') ) echo ' disabled="disabled"' ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value=""<?php if( defined('FTP_PRIKEY') ) echo ' disabled="disabled"' ?> size="40" /> +<div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td> +</tr> + +<tr valign="top"> +<th scope="row"><?php _e('Connection Type') ?></th> +<td> +<fieldset><legend class="hidden"><?php _e('Connection Type') ?></legend> +<label><input id="ftp" name="connection_type" type="radio" value="ftp" <?php checked('ftp', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('FTP') ?></label><br /> +<label><input id="ftps" name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); if ( defined('FTP_SSH') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('FTPS (SSL)') ?></label><br /> +<?php if ( extension_loaded('ssh2') ) { ?><label><input id="ssh" name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('SSH') ?></label><?php } ?> +</fieldset> +</td> +</tr> +</table> + +<?php if ( isset( $_POST['version'] ) ) : ?> +<input type="hidden" name="version" value="<?php echo attribute_escape($_POST['version']) ?>" /> +<?php endif; ?> +<?php if ( isset( $_POST['locale'] ) ) : ?> +<input type="hidden" name="locale" value="<?php echo attribute_escape($_POST['locale']) ?>" /> +<?php endif; ?> +<p class="submit"> +<input id="upgrade" name="upgrade" type="submit" class="button" value="<?php _e('Proceed'); ?>" /> +</p> +</div> +</form> +<?php + return false; +} + +?> wp-admin/includes/file.php @@ -3,41 +3,42 @@ * File contains all the administration image manipulation functions. * * @package WordPress + * @subpackage Administration */ /** - * wp_create_thumbnail() - Create a thumbnail from an Image given a maximum side size. + * Create a thumbnail from an Image given a maximum side size. * - * @package WordPress - * @param mixed $file Filename of the original image, Or attachment id - * @param int $max_side Maximum length of a single side for the thumbnail - * @return string Thumbnail path on success, Error string on failure + * This function can handle most image file formats which PHP supports. If PHP + * does not have the functionality to save in a file of the same format, the + * thumbnail will be created as a jpeg. + * + * @since 1.2.0 * - * This function can handle most image file formats which PHP supports. - * If PHP does not have the functionality to save in a file of the same format, the thumbnail will be created as a jpeg. + * @param mixed $file Filename of the original image, Or attachment id. + * @param int $max_side Maximum length of a single side for the thumbnail. + * @return string Thumbnail path on success, Error string on failure. */ function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) { - $thumbpath = image_resize( $file, $max_side, $max_side ); return apply_filters( 'wp_create_thumbnail', $thumbpath ); } /** - * wp_crop_image() - Crop an Image to a given size. + * Crop an Image to a given size. * - * @package WordPress - * @internal Missing Long Description - * @param int $src_file The source file - * @param int $src_x The start x position to crop from - * @param int $src_y The start y position to crop from - * @param int $src_w The width to crop - * @param int $src_h The height to crop - * @param int $dst_w The destination width - * @param int $dst_h The destination height - * @param int $src_abs If the source crop points are absolute - * @param int $dst_file The destination file to write to - * @return string New filepath on success, String error message on failure + * @since 2.1.0 * + * @param string|int $src_file The source file or Attachment ID. + * @param int $src_x The start x position to crop from. + * @param int $src_y The start y position to crop from. + * @param int $src_w The width to crop. + * @param int $src_h The height to crop. + * @param int $dst_w The destination width. + * @param int $dst_h The destination height. + * @param int $src_abs Optional. If the source crop points are absolute. + * @param string $dst_file Optional. The destination file to write to. + * @return string New filepath on success, String error message on failure. */ function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) { if ( is_numeric( $src_file ) ) // Handle int as attachment ID @@ -74,54 +75,62 @@ function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_ } /** - * wp_generate_attachment_metadata() - Generate post Image attachment Metadata + * Generate post image attachment meta data. * - * @package WordPress - * @internal Missing Long Description - * @param int $attachment_id Attachment Id to process - * @param string $file Filepath of the Attached image - * @return mixed Metadata for attachment + * @since 2.1.0 * + * @param int $attachment_id Attachment Id to process. + * @param string $file Filepath of the Attached image. + * @return mixed Metadata for attachment. */ function wp_generate_attachment_metadata( $attachment_id, $file ) { $attachment = get_post( $attachment_id ); $metadata = array(); if ( preg_match('!^image/!', get_post_mime_type( $attachment )) && file_is_displayable_image($file) ) { - $imagesize = getimagesize( $file ); + $full_path_file = $file; + $imagesize = getimagesize( $full_path_file ); $metadata['width'] = $imagesize[0]; $metadata['height'] = $imagesize[1]; list($uwidth, $uheight) = wp_shrink_dimensions($metadata['width'], $metadata['height']); $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'"; + + // Make the file path relative to the upload dir + if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { // Get upload directory + if ( 0 === strpos($file, $uploads['basedir']) ) {// Check that the upload base exists in the file path + $file = str_replace($uploads['basedir'], '', $file); // Remove upload dir from the file path + $file = ltrim($file, '/'); + } + } $metadata['file'] = $file; // make thumbnails and other intermediate sizes - $sizes = array('thumbnail', 'medium'); + $sizes = array('thumbnail', 'medium', 'large'); $sizes = apply_filters('intermediate_image_sizes', $sizes); - + foreach ($sizes as $size) { - $resized = image_make_intermediate_size( $file, get_option("{$size}_size_w"), get_option("{$size}_size_h"), get_option("{$size}_crop") ); + $resized = image_make_intermediate_size( $full_path_file, get_option("{$size}_size_w"), get_option("{$size}_size_h"), get_option("{$size}_crop") ); if ( $resized ) $metadata['sizes'][$size] = $resized; } - + // fetch additional metadata from exif/iptc - $image_meta = wp_read_image_metadata( $file ); + $image_meta = wp_read_image_metadata( $full_path_file ); if ($image_meta) $metadata['image_meta'] = $image_meta; } + return apply_filters( 'wp_generate_attachment_metadata', $metadata ); } /** - * wp_load_image() - Load an image which PHP Supports. + * Load an image from a string, if PHP supports it. * - * @package WordPress - * @internal Missing Long Description - * @param string $file Filename of the image to load - * @return resource The resulting image resource on success, Error string on failure. + * @since 2.1.0 * + * @param string $file Filename of the image to load. + * @return resource The resulting image resource on success, Error string on failure. */ function wp_load_image( $file ) { if ( is_numeric( $file ) ) @@ -144,36 +153,43 @@ function wp_load_image( $file ) { } /** - * get_udims() - Calculated the new dimentions for downsampled images + * Calculated the new dimentions for a downsampled image. * - * @package WordPress - * @internal Missing Description + * @since 2.0.0 * @see wp_shrink_dimensions() - * @param int $width Current width of the image - * @param int $height Current height of the image - * @return mixed Array(height,width) of shrunk dimensions. * + * @param int $width Current width of the image + * @param int $height Current height of the image + * @return mixed Array(height,width) of shrunk dimensions. */ function get_udims( $width, $height) { return wp_shrink_dimensions( $width, $height ); } + /** - * wp_shrink_dimensions() - Calculates the new dimentions for a downsampled image. + * Calculates the new dimentions for a downsampled image. * - * @package WordPress - * @internal Missing Long Description - * @param int $width Current width of the image - * @param int $height Current height of the image - * @param int $wmax Maximum wanted width - * @param int $hmax Maximum wanted height - * @return mixed Array(height,width) of shrunk dimensions. + * @since 2.0.0 + * @see wp_constrain_dimensions() * + * @param int $width Current width of the image + * @param int $height Current height of the image + * @param int $wmax Maximum wanted width + * @param int $hmax Maximum wanted height + * @return mixed Array(height,width) of shrunk dimensions. */ function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) { return wp_constrain_dimensions( $width, $height, $wmax, $hmax ); } -// convert a fraction string to a decimal +/** + * Convert a fraction string to a decimal. + * + * @since 2.5.0 + * + * @param string $str + * @return int|float + */ function wp_exif_frac2dec($str) { @list( $n, $d ) = explode( '/', $str ); if ( !empty($d) ) @@ -181,25 +197,47 @@ function wp_exif_frac2dec($str) { return $str; } -// convert the exif date format to a unix timestamp +/** + * Convert the exif date format to a unix timestamp. + * + * @since 2.5.0 + * + * @param string $str + * @return int + */ function wp_exif_date2ts($str) { - // seriously, who formats a date like 'YYYY:MM:DD hh:mm:ss'? @list( $date, $time ) = explode( ' ', trim($str) ); @list( $y, $m, $d ) = explode( ':', $date ); return strtotime( "{$y}-{$m}-{$d} {$time}" ); } -// get extended image metadata, exif or iptc as available +/** + * Get extended image metadata, exif or iptc as available. + * + * Retrieves the EXIF metadata aperture, credit, camera, caption, copyright, iso + * created_timestamp, focal_length, shutter_speed, and title. + * + * The IPTC metadata that is retrieved is APP13, credit, byline, created date + * and time, caption, copyright, and title. Also includes FNumber, Model, + * DateTimeDigitized, FocalLength, ISOSpeedRatings, and ExposureTime. + * + * @todo Try other exif libraries if available. + * @since 2.5.0 + * + * @param string $file + * @return bool|array False on failure. Image metadata array on success. + */ function wp_read_image_metadata( $file ) { if ( !file_exists( $file ) ) return false; list(,,$sourceImageType) = getimagesize( $file ); - // exif contains a bunch of data we'll probably never need formatted in ways that are difficult to use. - // We'll normalize it and just extract the fields that are likely to be useful. Fractions and numbers - // are converted to floats, dates to unix timestamps, and everything else to strings. + // exif contains a bunch of data we'll probably never need formatted in ways + // that are difficult to use. We'll normalize it and just extract the fields + // that are likely to be useful. Fractions and numbers are converted to + // floats, dates to unix timestamps, and everything else to strings. $meta = array( 'aperture' => 0, 'credit' => '', @@ -213,7 +251,8 @@ function wp_read_image_metadata( $file ) { 'title' => '', ); - // read iptc first, since it might contain data not available in exif such as caption, description etc + // read iptc first, since it might contain data not available in exif such + // as caption, description etc if ( is_callable('iptcparse') ) { getimagesize($file, $info); if ( !empty($info['APP13']) ) { @@ -222,7 +261,7 @@ function wp_read_image_metadata( $file ) { $meta['credit'] = utf8_encode(trim($iptc['2#110'][0])); elseif ( !empty($iptc['2#080'][0]) ) // byline $meta['credit'] = utf8_encode(trim($iptc['2#080'][0])); - if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created datee and time + if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created date and time $meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]); if ( !empty($iptc['2#120'][0]) ) // caption $meta['caption'] = utf8_encode(trim($iptc['2#120'][0])); @@ -249,33 +288,42 @@ function wp_read_image_metadata( $file ) { if (!empty($exif['ExposureTime'])) $meta['shutter_speed'] = wp_exif_frac2dec( $exif['ExposureTime'] ); } - // FIXME: try other exif libraries if available return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType ); } -// is the file a real image file? +/** + * Validate that file is an image. + * + * @since 2.5.0 + * + * @param string $path File path to test if valid image. + * @return bool True if valid image, false if not valid image. + */ function file_is_valid_image($path) { $size = @getimagesize($path); return !empty($size); } -// is the file an image suitable for displaying within a web page? +/** + * Validate that file is suitable for displaying within a web page. + * + * @since 2.5.0 + * @uses apply_filters() Calls 'file_is_displayable_image' on $result and $path. + * + * @param string $path File path to test. + * @return bool True if suitable, false if not suitable. + */ function file_is_displayable_image($path) { $info = @getimagesize($path); if ( empty($info) ) $result = false; - elseif ( !in_array($info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) ) - // only gif, jpeg and png images can reliably be displayed - $result = false; - elseif ( $info['channels'] > 0 && $info['channels'] != 3 ) { - // some web browsers can't display cmyk or grayscale jpegs + elseif ( !in_array($info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) ) // only gif, jpeg and png images can reliably be displayed $result = false; - } else $result = true; - + return apply_filters('file_is_displayable_image', $result, $path); } wp-admin/includes/image.php @@ -1,5 +1,18 @@ <?php +/** + * WordPress Administration Importer API. + * + * @package WordPress + * @subpackage Administration + */ +/** + * Retrieve list of importers. + * + * @since 2.0.0 + * + * @return array + */ function get_importers() { global $wp_importers; if ( is_array($wp_importers) ) @@ -7,6 +20,17 @@ function get_importers() { return $wp_importers; } +/** + * Register importer for WordPress. + * + * @since 2.0.0 + * + * @param string $id Importer tag. Used to uniquely identify importer. + * @param string $name Importer name and title. + * @param string $description Importer description. + * @param callback $callback Callback to run. + * @return WP_Error Returns WP_Error when $callback is WP_Error. + */ function register_importer( $id, $name, $description, $callback ) { global $wp_importers; if ( is_wp_error( $callback ) ) @@ -14,10 +38,26 @@ function register_importer( $id, $name, $description, $callback ) { $wp_importers[$id] = array ( $name, $description, $callback ); } +/** + * Cleanup importer. + * + * Removes attachment based on ID. + * + * @since 2.0.0 + * + * @param string $id Importer ID. + */ function wp_import_cleanup( $id ) { wp_delete_attachment( $id ); } +/** + * Handle importer uploading and add attachment. + * + * @since 2.0.0 + * + * @return array + */ function wp_import_handle_upload() { $overrides = array( 'test_form' => false, 'test_type' => false ); $_FILES['import']['name'] .= '.import'; wp-admin/includes/import.php @@ -1,30 +1,64 @@ <?php - +/** + * WordPress Administration Media API. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_tabs() { $_default_tabs = array( - 'type' => __('Choose File'), // handler action suffix => tab text + 'type' => __('From Computer'), // handler action suffix => tab text + 'type_url' => __('From URL'), 'gallery' => __('Gallery'), - 'library' => __('Media Library'), + 'library' => __('Media Library') ); return apply_filters('media_upload_tabs', $_default_tabs); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $tabs + * @return unknown + */ function update_gallery_tab($tabs) { global $wpdb; + if ( !isset($_REQUEST['post_id']) ) { unset($tabs['gallery']); return $tabs; } + if ( intval($_REQUEST['post_id']) ) $attachments = intval($wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $_REQUEST['post_id']))); + if ( empty($attachments) ) { + unset($tabs['gallery']); + return $tabs; + } + $tabs['gallery'] = sprintf(__('Gallery (%s)'), "<span id='attachments-count'>$attachments</span>"); return $tabs; } add_filter('media_upload_tabs', 'update_gallery_tab'); +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function the_media_upload_tabs() { global $redir_tab; $tabs = media_upload_tabs(); @@ -51,9 +85,25 @@ function the_media_upload_tabs() { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @param unknown_type $alt + * @param unknown_type $title + * @param unknown_type $align + * @param unknown_type $url + * @param unknown_type $rel + * @param unknown_type $size + * @return unknown + */ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') { - $html = get_image_tag($id, $alt, $title, $align, $size); + $htmlalt = ( empty($alt) ) ? $title : $alt; + + $html = get_image_tag($id, $htmlalt, $title, $align, $size); $rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : ''; @@ -65,6 +115,20 @@ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = fal return $html; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $html + * @param unknown_type $id + * @param unknown_type $alt + * @param unknown_type $title + * @param unknown_type $align + * @param unknown_type $url + * @param unknown_type $size + * @return unknown + */ function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html; @@ -77,6 +141,8 @@ function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { $html = preg_replace( '/align[^\s\'"]+\s?/', '', $html ); if ( empty($align) ) $align = 'none'; + $alt = ! empty($alt) ? addslashes($alt) : ''; + $shcode = '[caption id="' . $id . '" align="align' . $align . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/caption]'; @@ -84,8 +150,15 @@ function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { } add_filter( 'image_send_to_editor', 'image_add_caption', 20, 7 ); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $html + */ function media_send_to_editor($html) { - ?> +?> <script type="text/javascript"> /* <![CDATA[ */ var win = window.dialogArguments || opener || parent || top; @@ -96,10 +169,28 @@ win.send_to_editor('<?php echo addslashes($html); ?>'); exit; } -// this handles the file upload POST itself, creating the attachment post +/** + * {@internal Missing Short Description}} + * + * This handles the file upload POST itself, creating the attachment post. + * + * @since unknown + * + * @param unknown_type $file_id + * @param unknown_type $post_id + * @param unknown_type $post_data + * @return unknown + */ function media_handle_upload($file_id, $post_id, $post_data = array()) { $overrides = array('test_form'=>false); - $file = wp_handle_upload($_FILES[$file_id], $overrides); + + $time = current_time('mysql'); + if ( $post = get_post($post_id) ) { + if ( substr( $post->post_date, 0, 4 ) > 0 ) + $time = $post->post_date; + } + + $file = wp_handle_upload($_FILES[$file_id], $overrides, $time); if ( isset($file['error']) ) return new WP_Error( 'upload_error', $file['error'] ); @@ -128,7 +219,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { ), $post_data ); // Save the data - $id = wp_insert_attachment($attachment, $file, $post_parent); + $id = wp_insert_attachment($attachment, $file, $post_id); if ( !is_wp_error($id) ) { wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); } @@ -137,6 +228,17 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file_array + * @param unknown_type $post_id + * @param unknown_type $desc + * @param unknown_type $post_data + * @return unknown + */ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) { $overrides = array('test_form'=>false); $file = wp_handle_sideload($file_array, $overrides); @@ -170,7 +272,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = ), $post_data ); // Save the data - $id = wp_insert_attachment($attachment, $file, $post_parent); + $id = wp_insert_attachment($attachment, $file, $post_id); if ( !is_wp_error($id) ) { wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); return $url; @@ -178,9 +280,16 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = return $id; } - -// wrap iframe content (produced by $content_func) in a doctype, html head/body etc -// any additional function args will be passed to content_func +/** + * {@internal Missing Short Description}} + * + * Wrap iframe content (produced by $content_func) in a doctype, html head/body + * etc any additional function args will be passed to content_func. + * + * @since unknown + * + * @param unknown_type $content_func + */ function wp_iframe($content_func /* ... */) { ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -220,10 +329,15 @@ if ( is_string($content_func) ) <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function media_buttons() { global $post_ID, $temp_ID; $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); - $context = apply_filters('media_buttons_context', __('Add media: %s')); + $context = apply_filters('media_buttons_context', __('Upload/Insert %s')); $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID"; $media_title = __('Add Media'); $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&amp;type=image"); @@ -245,6 +359,13 @@ EOF; add_action( 'media_buttons', 'media_buttons' ); add_action('media_upload_media', 'media_upload_handler'); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_form_handler() { check_admin_referer('media-form'); @@ -258,6 +379,8 @@ function media_upload_form_handler() { $post['post_excerpt'] = $attachment['post_excerpt']; if ( isset($attachment['menu_order']) ) $post['menu_order'] = $attachment['menu_order']; + if ( isset($attachment['post_parent']) ) + $post['post_parent'] = $attachment['post_parent']; $post = apply_filters('attachment_fields_to_save', $post, $attachment); @@ -274,8 +397,16 @@ function media_upload_form_handler() { wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false); } - if ( isset($_POST['insert-gallery']) ) - return media_send_to_editor('[gallery]'); + if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?> + <script type="text/javascript"> + /* <![CDATA[ */ + var win = window.dialogArguments || opener || parent || top; + win.tb_remove(); + /* ]]> */ + </script> + <?php + exit; + } if ( isset($_POST['send']) ) { $keys = array_keys($_POST['send']); @@ -294,7 +425,17 @@ function media_upload_form_handler() { return $errors; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_image() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -333,15 +474,34 @@ function media_upload_image() { return media_upload_gallery(); } + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id ); + return wp_iframe( 'media_upload_type_form', 'image', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + * @param unknown_type $post_id + * @param unknown_type $desc + * @return unknown + */ function media_sideload_image($file, $post_id, $desc = null) { if (!empty($file) ) { $file_array['name'] = basename($file); - $file_array['tmp_name'] = download_url($file); + $tmp = download_url($file); + $file_array['tmp_name'] = $tmp; $desc = @$desc; + if ( is_wp_error($tmp) ) { + @unlink($file_array['tmp_name']); + $file_array['tmp_name'] = ''; + } + $id = media_handle_sideload($file_array, $post_id, $desc); $src = $id; @@ -358,7 +518,17 @@ function media_sideload_image($file, $post_id, $desc = null) { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_audio() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -395,10 +565,23 @@ function media_upload_audio() { return media_upload_gallery(); } + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id ); + return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_video() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -435,10 +618,23 @@ function media_upload_video() { return media_upload_gallery(); } + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id ); + return wp_iframe( 'media_upload_type_form', 'video', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_file() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -475,10 +671,22 @@ function media_upload_file() { return media_upload_gallery(); } + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id ); + return wp_iframe( 'media_upload_type_form', 'file', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_gallery() { + $errors = array(); + if ( !empty($_POST) ) { $return = media_upload_form_handler(); @@ -492,7 +700,15 @@ function media_upload_gallery() { return wp_iframe( 'media_upload_gallery_form', $errors ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_library() { + $errors = array(); if ( !empty($_POST) ) { $return = media_upload_form_handler(); @@ -505,6 +721,113 @@ function media_upload_library() { return wp_iframe( 'media_upload_library_form', $errors ); } +/** + * Retrieve HTML for the image alignment radio buttons with the specified one checked. + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $checked + * @return unknown + */ +function image_align_input_fields($post, $checked='') { + + $alignments = array('none' => 'None', 'left' => 'Left', 'center' => 'Center', 'right' => 'Right'); + if ( !array_key_exists($checked, $alignments) ) + $checked = 'none'; + + $out = array(); + foreach ($alignments as $name => $label) { + + $out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'". + ( $checked == $name ? " checked='checked'" : "" ) . + " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>" . __($label) . "</label>"; + } + return join("\n", $out); +} + +/** + * Retrieve HTML for the size radio buttons with the specified one checked. + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $checked + * @return unknown + */ +function image_size_input_fields($post, $checked='') { + + // get a list of the actual pixel dimensions of each possible intermediate version of this image + $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size')); + + foreach ( $size_names as $size => $name) { + $downsize = image_downsize($post->ID, $size); + + // is this size selectable? + $enabled = ( $downsize[3] || 'full' == $size ); + $css_id = "image-size-{$size}-{$post->ID}"; + // if this size is the default but that's not available, don't select it + if ( $checked && !$enabled ) + $checked = ''; + // if $checked was not specified, default to the first available size that's bigger than a thumbnail + if ( !$checked && $enabled && 'thumbnail' != $size ) + $checked = $size; + + $html = "<div class='image-size-item'><input type='radio' ".( $enabled ? '' : "disabled='disabled'")."name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'".( $checked == $size ? " checked='checked'" : '') ." />"; + + $html .= "<label for='{$css_id}'>" . __($name). "</label>"; + // only show the dimensions if that choice is available + if ( $enabled ) + $html .= " <label for='{$css_id}' class='help'>" . sprintf( __("(%d&nbsp;&times;&nbsp;%d)"), $downsize[1], $downsize[2] ). "</label>"; + + $html .= '</div>'; + + $out[] = $html; + } + + return array( + 'label' => __('Size'), + 'input' => 'html', + 'html' => join("\n", $out), + ); +} + +/** + * Retrieve HTML for the Link URL buttons with the default link type as specified. + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $url_type + * @return unknown + */ +function image_link_input_fields($post, $url_type='') { + + $file = wp_get_attachment_url($post->ID); + $link = get_attachment_link($post->ID); + + $url = ''; + if ( $url_type == 'file' ) + $url = $file; + elseif ( $url_type == 'post' ) + $url = $link; + + return "<input type='text' class='urlfield' name='attachments[$post->ID][url]' value='" . attribute_escape($url) . "' /><br /> + <button type='button' class='button urlnone' title=''>" . __('None') . "</button> + <button type='button' class='button urlfile' title='" . attribute_escape($file) . "'>" . __('File URL') . "</button> + <button type='button' class='button urlpost' title='" . attribute_escape($link) . "'>" . __('Post URL') . "</button> +"; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $form_fields + * @param unknown_type $post + * @return unknown + */ function image_attachment_fields_to_edit($form_fields, $post) { if ( substr($post->post_mime_type, 0, 5) == 'image' ) { $form_fields['post_title']['required'] = true; @@ -514,43 +837,42 @@ function image_attachment_fields_to_edit($form_fields, $post) { $form_fields['post_content']['label'] = __('Description'); - $thumb = wp_get_attachment_thumb_url($post->ID); - $form_fields['align'] = array( 'label' => __('Alignment'), 'input' => 'html', - 'html' => " - <input type='radio' name='attachments[$post->ID][align]' id='image-align-none-$post->ID' value='none' checked='checked' /> - <label for='image-align-none-$post->ID' class='align image-align-none-label'>" . __('None') . "</label> - <input type='radio' name='attachments[$post->ID][align]' id='image-align-left-$post->ID' value='left' /> - <label for='image-align-left-$post->ID' class='align image-align-left-label'>" . __('Left') . "</label> - <input type='radio' name='attachments[$post->ID][align]' id='image-align-center-$post->ID' value='center' /> - <label for='image-align-center-$post->ID' class='align image-align-center-label'>" . __('Center') . "</label> - <input type='radio' name='attachments[$post->ID][align]' id='image-align-right-$post->ID' value='right' /> - <label for='image-align-right-$post->ID' class='align image-align-right-label'>" . __('Right') . "</label>\n", - ); - $form_fields['image-size'] = array( - 'label' => __('Size'), - 'input' => 'html', - 'html' => " - " . ( $thumb ? "<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-thumb-$post->ID' value='thumbnail' /> - <label for='image-size-thumb-$post->ID'>" . __('Thumbnail') . "</label> - " : '' ) . "<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-medium-$post->ID' value='medium' checked='checked' /> - <label for='image-size-medium-$post->ID'>" . __('Medium') . "</label> - <input type='radio' name='attachments[$post->ID][image-size]' id='image-size-full-$post->ID' value='full' /> - <label for='image-size-full-$post->ID'>" . __('Full size') . "</label>", + 'html' => image_align_input_fields($post, get_option('image_default_align')), ); + + $form_fields['image-size'] = image_size_input_fields($post, get_option('image_default_size')); } return $form_fields; } add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $form_fields + * @param unknown_type $post + * @return unknown + */ function media_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']); return $form_fields; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $attachment + * @return unknown + */ function image_attachment_fields_to_save($post, $attachment) { if ( substr($post['post_mime_type'], 0, 5) == 'image' ) { if ( strlen(trim($post['post_title'])) == 0 ) { @@ -564,6 +886,16 @@ function image_attachment_fields_to_save($post, $attachment) { add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $html + * @param unknown_type $attachment_id + * @param unknown_type $attachment + * @return unknown + */ function image_media_send_to_editor($html, $attachment_id, $attachment) { $post =& get_post($attachment_id); if ( substr($post->post_mime_type, 0, 5) == 'image' ) { @@ -589,6 +921,15 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) { add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $errors + * @return unknown + */ function get_attachment_fields_to_edit($post, $errors = null) { if ( is_int($post) ) $post =& get_post($post); @@ -596,8 +937,6 @@ function get_attachment_fields_to_edit($post, $errors = null) { $post = (object) $post; $edit_post = sanitize_post($post, 'edit'); - $file = wp_get_attachment_url($post->ID); - $link = get_attachment_link($post->ID); $form_fields = array( 'post_title' => array( @@ -616,17 +955,10 @@ function get_attachment_fields_to_edit($post, $errors = null) { 'url' => array( 'label' => __('Link URL'), 'input' => 'html', - 'html' => " - <input type='text' name='attachments[$post->ID][url]' value='" . attribute_escape($file) . "' /><br /> - <button type='button' class='button url-$post->ID' title=''>" . __('None') . "</button> - <button type='button' class='button url-$post->ID' title='" . attribute_escape($file) . "'>" . __('File URL') . "</button> - <button type='button' class='button url-$post->ID' title='" . attribute_escape($link) . "'>" . __('Post URL') . "</button> - <script type='text/javascript'> - jQuery('button.url-$post->ID').bind('click', function(){jQuery(this).siblings('input').val(jQuery(this).attr('title'));}); - </script>\n", + 'html' => image_link_input_fields($post, get_option('image_default_link_type')), 'helps' => __('Enter a link URL or click above for presets.'), ), - 'menu_order' => array( + 'menu_order' => array( 'label' => __('Order'), 'value' => $edit_post->menu_order ), @@ -661,6 +993,19 @@ function get_attachment_fields_to_edit($post, $errors = null) { return $form_fields; } +/** + * Retrieve HTML for media items of post gallery. + * + * The HTML markup retrieved will be created for the progress of SWF Upload + * component. Will also create link for showing and hiding the form to modify + * the image attachment. + * + * @since unknown + * + * @param int $post_id Optional. Post ID. + * @param array $errors Errors for attachment, if any. + * @return string + */ function get_media_items( $post_id, $errors ) { if ( $post_id ) { $post = get_post($post_id); @@ -674,20 +1019,27 @@ function get_media_items( $post_id, $errors ) { $attachments[$attachment->ID] = $attachment; } - if ( empty($attachments) ) - return ''; - - foreach ( $attachments as $id => $attachment ) + $output = ''; + foreach ( (array) $attachments as $id => $attachment ) if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) ) $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress'><div class='bar'></div></div><div id='media-upload-error-$id'></div><div class='filename'></div>$item\n</div>"; return $output; } +/** + * Retrieve HTML form for modifying the image attachment. + * + * @since unknown + * + * @param int $attachment_id Attachment ID for modification. + * @param string|array $args Optional. Override defaults. + * @return string HTML form for attachment. + */ function get_media_item( $attachment_id, $args = null ) { global $redir_tab; - $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true ); + $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true ); $args = wp_parse_args( $args, $default_args ); extract( $args, EXTR_SKIP ); @@ -697,10 +1049,6 @@ function get_media_item( $attachment_id, $args = null ) { else return false; - $title_label = __('Title'); - $description_label = __('Description'); - $tags_label = __('Tags'); - $toggle_on = __('Show'); $toggle_off = __('Hide'); @@ -708,13 +1056,14 @@ function get_media_item( $attachment_id, $args = null ) { $filename = basename($post->guid); $title = attribute_escape($post->post_title); - $description = attribute_escape($post->post_content); + if ( $_tags = get_the_tags($attachment_id) ) { foreach ( $_tags as $tag ) $tags[] = $tag->name; $tags = attribute_escape(join(', ', $tags)); } + $type = ''; if ( isset($post_mime_types) ) { $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type)); $type = array_shift($keys); @@ -734,7 +1083,7 @@ function get_media_item( $attachment_id, $args = null ) { } $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case - $display_title = wp_html_excerpt($display_title, 60); + $display_title = $show_title ? "<div class='filename new'>" . wp_html_excerpt($display_title, 60) . "</div>" : ''; $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false; $order = ''; @@ -755,7 +1104,7 @@ function get_media_item( $attachment_id, $args = null ) { $type $toggle_links $order - <div class='filename new'>$display_title</div> + $display_title <table class='slidetoggle describe $class'> <thead class='media-item-info'> <tr> @@ -845,9 +1194,21 @@ function get_media_item( $attachment_id, $args = null ) { foreach ( $hidden_fields as $name => $value ) $item .= "\t<input type='hidden' name='$name' id='$name' value='" . attribute_escape( $value ) . "' />\n"; + if ( $post->post_parent < 1 && (int) $_REQUEST['post_id'] ) { + $parent = (int) $_REQUEST['post_id']; + $parent_name = "attachments[$attachment_id][post_parent]"; + + $item .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='" . $parent . "' />\n"; + } + return $item; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function media_upload_header() { ?> <script type="text/javascript">post_id = <?php echo intval($_REQUEST['post_id']); ?>;</script> @@ -857,6 +1218,13 @@ function media_upload_header() { <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $errors + */ function media_upload_form( $errors = null ) { global $type, $tab; @@ -868,7 +1236,7 @@ function media_upload_form( $errors = null ) { $flash = false; $flash = apply_filters('flash_uploader', $flash); - $post_id = intval($_REQUEST['post_id']); + $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; ?> <div id="media-upload-notice"> @@ -887,10 +1255,16 @@ function media_upload_form( $errors = null ) { <?php if ( $flash ) : ?> <script type="text/javascript"> <!-- -jQuery(function($){ +SWFUpload.onload = function() { swfu = new SWFUpload({ + button_text: '<span class="button"><?php _e('Select Files'); ?></span>', + button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; }', + button_height: "24", + button_width: "132", + button_image_url: '<?php echo includes_url('images/upload.png'); ?>', + button_placeholder_id: "flash-browse-button", upload_url : "<?php echo attribute_escape( $flash_action_url ); ?>", - flash_url : "<?php echo includes_url('js/swfupload/swfupload_f9.swf'); ?>", + flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>", file_post_name: "async-upload", file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>", post_params : { @@ -902,8 +1276,6 @@ jQuery(function($){ "short" : "1" }, file_size_limit : "<?php echo wp_max_upload_size(); ?>b", - swfupload_element_id : "flash-upload-ui", // id of the element displayed when swfupload is available - degraded_element_id : "html-upload-ui", // when swfupload is unavailable file_dialog_start_handler : fileDialogStart, file_queued_handler : fileQueued, upload_start_handler : uploadStart, @@ -913,17 +1285,22 @@ jQuery(function($){ upload_complete_handler : uploadComplete, file_queue_error_handler : fileQueueError, file_dialog_complete_handler : fileDialogComplete, - + swfupload_pre_load_handler: swfuploadPreLoad, + swfupload_load_failed_handler: swfuploadLoadFailed, + custom_settings : { + degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable + swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available + }, debug: false }); - $("#flash-browse-button").bind( "click", function(){swfu.selectFiles();}); -}); +}; //--> </script> <div id="flash-upload-ui"> <?php do_action('pre-flash-upload-ui'); ?> - <p><input id="flash-browse-button" type="button" value="<?php echo attribute_escape( __( 'Choose files to upload' ) ); ?>" class="button" /></p> + + <div><?php _e( 'Choose files to upload' ); ?> <div id="flash-browse-button"></div></div> <?php do_action('post-flash-upload-ui'); ?> <p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p> </div> @@ -932,9 +1309,10 @@ jQuery(function($){ <div id="html-upload-ui"> <?php do_action('pre-html-upload-ui'); ?> - <p> + <p id="async-upload-wrap"> <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onclick="return top.tb_remove();"><?php _e('Cancel'); ?></a> </p> + <br class="clear" /> <?php if ( is_lighttpd_before_150() ): ?> <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p> @@ -945,6 +1323,15 @@ jQuery(function($){ <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $type + * @param unknown_type $errors + * @param unknown_type $id + */ function media_upload_type_form($type = 'file', $errors = null, $id = null) { media_upload_header(); @@ -952,14 +1339,14 @@ function media_upload_type_form($type = 'file', $errors = null, $id = null) { $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id"); $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); - - $callback = "type_form_$type"; ?> <form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" /> <?php wp_nonce_field('media-form'); ?> -<h3><?php _e('From Computer'); ?></h3> + +<h3 class="media-title"><?php _e('Add media files from your computer'); ?></h3> + <?php media_upload_form( $errors ); ?> <script type="text/javascript"> @@ -973,18 +1360,49 @@ jQuery(function($){ }); --> </script> -<?php if ( $id && !is_wp_error($id) ) : ?> <div id="media-items"> -<?php echo get_media_items( $id, $errors ); ?> +<?php +if ( $id ) { + if ( !is_wp_error($id) ) { + echo get_media_items( $id, $errors ); + } else { + echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>'; + exit; + } +} +?> </div> <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" /> +<?php +} -<?php elseif ( is_callable($callback) ) : ?> +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $type + * @param unknown_type $errors + * @param unknown_type $id + */ +function media_upload_type_url_form($type = 'file', $errors = null, $id = null) { + media_upload_header(); -<div class="media-blank"> -<p style="text-align:center"><?php _e('&mdash; OR &mdash;'); ?></p> -<h3><?php _e('From URL'); ?></h3> -</div> + $post_id = intval($_REQUEST['post_id']); + + $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id"); + $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); + + $callback = "type_url_form_$type"; +?> + +<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form"> +<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" /> +<?php wp_nonce_field('media-form'); ?> + +<?php if ( is_callable($callback) ) { ?> + +<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3> <script type="text/javascript"> //<![CDATA[ @@ -1066,12 +1484,20 @@ var addExtImage = { <?php echo call_user_func($callback); ?> </div> </div> -<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" /> </form> <?php - endif; + } else { + wp_die( __('Unknown action.') ); + } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $errors + */ function media_upload_gallery_form($errors) { global $redir_tab; @@ -1097,7 +1523,7 @@ jQuery(function($){ <form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form validate" id="gallery-form"> <?php wp_nonce_field('media-form'); ?> <?php //media_upload_form( $errors ); ?> -<table class="widefat"> +<table class="widefat" cellspacing="0"> <thead><tr> <th><?php _e('Media'); ?></th> <th class="order-head"><?php _e('Order'); ?></th> @@ -1106,17 +1532,99 @@ jQuery(function($){ <div id="media-items"> <?php echo get_media_items($post_id, $errors); ?> </div> + <p class="ml-submit"> -<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" /> -<input type="submit" class="button insert-gallery" name="insert-gallery" value="<?php echo attribute_escape( __( 'Insert gallery into post' ) ); ?>" /> +<input type="submit" class="button savebutton" style="display:none;" name="save" id="save-all" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" /> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" /> <input type="hidden" name="type" value="<?php echo attribute_escape( $GLOBALS['type'] ); ?>" /> <input type="hidden" name="tab" value="<?php echo attribute_escape( $GLOBALS['tab'] ); ?>" /> </p> + +<div id="gallery-settings" style="display:none;"> +<div class="title"><?php _e('Gallery Settings'); ?></div> +<table id="basic" class="describe"><tbody> + <tr> + <th scope="row" class="label"> + <label> + <span class="alignleft"><?php _e('Link thumbnails to:'); ?></span> + </label> + </th> + <td class="field"> + <input type="radio" name="linkto" id="linkto-file" value="file" /> + <label for="linkto-file" class="radio"><?php _e('Image File'); ?></label> + + <input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" /> + <label for="linkto-post" class="radio"><?php _e('Attachment Page'); ?></label> + </td> + </tr> + + <tr> + <th scope="row" class="label"> + <label> + <span class="alignleft"><?php _e('Order images by:'); ?></span> + </label> + </th> + <td class="field"> + <select id="orderby" name="orderby"> + <option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option> + <option value="post_name"><?php _e('Name'); ?></option> + <option value="ID"><?php _e('Date/Time'); ?></option> + </select> + </td> + </tr> + + <tr> + <th scope="row" class="label"> + <label> + <span class="alignleft"><?php _e('Order:'); ?></span> + </label> + </th> + <td class="field"> + <input type="radio" checked="checked" name="order" id="order-asc" value="asc" /> + <label for="order-asc" class="radio"><?php _e('Ascending'); ?></label> + + <input type="radio" name="order" id="order-desc" value="desc" /> + <label for="order-desc" class="radio"><?php _e('Descending'); ?></label> + </td> + </tr> + + <tr> + <th scope="row" class="label"> + <label> + <span class="alignleft"><?php _e('Gallery columns:'); ?></span> + </label> + </th> + <td class="field"> + <select id="columns" name="columns"> + <option value="2"><?php _e('2'); ?></option> + <option value="3" selected="selected"><?php _e('3'); ?></option> + <option value="4"><?php _e('4'); ?></option> + <option value="5"><?php _e('5'); ?></option> + <option value="6"><?php _e('6'); ?></option> + <option value="7"><?php _e('7'); ?></option> + <option value="8"><?php _e('8'); ?></option> + <option value="9"><?php _e('9'); ?></option> + </select> + </td> + </tr> +</tbody></table> + +<p class="ml-submit"> +<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php echo attribute_escape( __( 'Insert gallery' ) ); ?>" /> +<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php echo attribute_escape( __( 'Update gallery settings' ) ); ?>" /> +</p> +</div> </form> <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $errors + */ function media_upload_library_form($errors) { global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types; @@ -1126,7 +1634,7 @@ function media_upload_library_form($errors) { $form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=library&post_id=$post_id"); - $_GET['paged'] = intval($_GET['paged']); + $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0; if ( $_GET['paged'] < 1 ) $_GET['paged'] = 1; $start = ( $_GET['paged'] - 1 ) * 10; @@ -1144,11 +1652,11 @@ function media_upload_library_form($errors) { <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" /> <input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" /> -<div id="search-filter"> - <label class="hidden" for="post-search-input"><?php _e('Search Media');?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" /> +<p id="media-search" class="search-box"> + <label class="hidden" for="media-search-input"><?php _e('Search Media');?>:</label> + <input type="text" id="media-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" /> <input type="submit" value="<?php echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" /> -</div> +</p> <ul class="subsubsub"> <?php @@ -1188,6 +1696,8 @@ unset($type_links); $page_links = paginate_links( array( 'base' => add_query_arg( 'paged', '%#%' ), 'format' => '', + 'prev_text' => __('&laquo;'), + 'next_text' => __('&raquo;'), 'total' => ceil($wp_query->found_posts / 10), 'current' => $_GET['paged'] )); @@ -1196,7 +1706,7 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> +<div class="alignleft actions"> <?php $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC"; @@ -1263,7 +1773,14 @@ jQuery(function($){ <?php } -function type_form_image() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_image() { if ( apply_filters( 'disable_captions', '' ) ) { $alt = __('Alternate Text'); @@ -1273,11 +1790,15 @@ function type_form_image() { $alt_help = __('Also used as alternate text for the image'); } + $default_align = get_option('image_default_align'); + if ( empty($default_align) ) + $default_align = 'none'; + return ' <table class="describe"><tbody> <tr> <th valign="top" scope="row" class="label" style="width:120px;"> - <span class="alignleft"><label for="src">' . __('Source') . '</label></span> + <span class="alignleft"><label for="src">' . __('Image URL') . '</label></span> <span class="alignright"><img id="status_img" src="images/required.gif" title="required" alt="required" /></span> </th> <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td> @@ -1302,20 +1823,20 @@ function type_form_image() { <tr class="align"> <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th> <td class="field"> - <input name="align" id="align-none" value="alignnone" onclick="addExtImage.align=this.value" type="radio" checked="checked" /> + <input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' /> <label for="align-none" class="align image-align-none-label">' . __('None') . '</label> - <input name="align" id="align-left" value="alignleft" onclick="addExtImage.align=this.value" type="radio" /> + <input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' /> <label for="align-left" class="align image-align-left-label">' . __('Left') . '</label> - <input name="align" id="align-center" value="aligncenter" onclick="addExtImage.align=this.value" type="radio" /> + <input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' /> <label for="align-center" class="align image-align-center-label">' . __('Center') . '</label> - <input name="align" id="align-right" value="alignright" onclick="addExtImage.align=this.value" type="radio" /> + <input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' /> <label for="align-right" class="align image-align-right-label">' . __('Right') . '</label> </td> </tr> <tr> <th valign="top" scope="row" class="label"> - <span class="alignleft"><label for="url">' . __('Link URL') . '</label></span> + <span class="alignleft"><label for="url">' . __('Link Image To:') . '</label></span> </th> <td class="field"><input id="url" name="url" value="" type="text" /><br /> @@ -1335,7 +1856,14 @@ function type_form_image() { } -function type_form_audio() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_audio() { return ' <table class="describe"><tbody> <tr> @@ -1363,7 +1891,14 @@ function type_form_audio() { '; } -function type_form_video() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_video() { return ' <table class="describe"><tbody> <tr> @@ -1391,7 +1926,14 @@ function type_form_video() { '; } -function type_form_file() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_file() { return ' <table class="describe"><tbody> <tr> @@ -1419,43 +1961,69 @@ function type_form_file() { '; } -// support a GET parameter for disabling the flash uploader +/** + * {@internal Missing Short Description}} + * + * Support a GET parameter for disabling the flash uploader. + * + * @since unknown + * + * @param unknown_type $flash + * @return unknown + */ function media_upload_use_flash($flash) { - if ( array_key_exists('flash', $_REQUEST) ) - $flash = !empty($_REQUEST['flash']); - return $flash; + if ( array_key_exists('flash', $_REQUEST) ) + $flash = !empty($_REQUEST['flash']); + return $flash; } add_filter('flash_uploader', 'media_upload_use_flash'); +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function media_upload_flash_bypass() { - echo '<p class="upload-flash-bypass">'; - printf( __('You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'), clean_url(add_query_arg('flash', 0)) ); - echo '</p>'; + echo '<p class="upload-flash-bypass">'; + printf( __('You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'), clean_url(add_query_arg('flash', 0)) ); + echo '</p>'; } -add_action('post-flash-upload-ui', 'media_upload_flash_bypass'); - +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function media_upload_html_bypass() { - echo '<p class="upload-html-bypass">'; - if ( array_key_exists('flash', $_REQUEST) ) - // the user manually selected the browser uploader, so let them switch back to Flash - printf( __('You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'), clean_url(add_query_arg('flash', 1)) ); - else - // the user probably doesn't have Flash - printf( __('You are using the Browser uploader.') ); - - echo '</p>'; + echo '<p class="upload-html-bypass">'; + if ( array_key_exists('flash', $_REQUEST) ) + // the user manually selected the browser uploader, so let them switch back to Flash + printf( __('You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'), clean_url(add_query_arg('flash', 1)) ); + else + // the user probably doesn't have Flash + printf( __('You are using the Browser uploader.') ); + + echo '</p>'; } add_action('post-flash-upload-ui', 'media_upload_flash_bypass'); add_action('post-html-upload-ui', 'media_upload_html_bypass'); -// make sure the GET parameter sticks when we submit a form +/** + * {@internal Missing Short Description}} + * + * Make sure the GET parameter sticks when we submit a form. + * + * @since unknown + * + * @param unknown_type $url + * @return unknown + */ function media_upload_bypass_url($url) { - if ( array_key_exists('flash', $_REQUEST) ) - $url = add_query_arg('flash', intval($_REQUEST['flash'])); - return $url; + if ( array_key_exists('flash', $_REQUEST) ) + $url = add_query_arg('flash', intval($_REQUEST['flash'])); + return $url; } add_filter('media_upload_form_url', 'media_upload_bypass_url'); wp-admin/includes/media.php @@ -1,12 +1,32 @@ <?php +/** + * Misc WordPress Administration API. + * + * @package WordPress + * @subpackage Administration + */ +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function got_mod_rewrite() { $got_rewrite = apache_mod_loaded('mod_rewrite', true); return apply_filters('got_rewrite', $got_rewrite); } -// Returns an array of strings from a file (.htaccess ) from between BEGIN -// and END markers. +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $filename + * @param unknown_type $marker + * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers. + */ function extract_from_markers( $filename, $marker ) { $result = array (); @@ -30,10 +50,20 @@ function extract_from_markers( $filename, $marker ) { return $result; } -// Inserts an array of strings into a file (.htaccess ), placing it between -// BEGIN and END markers. Replaces existing marked info. Retains surrounding -// data. Creates file if none exists. -// Returns true on write success, false on failure. +/** + * {@internal Missing Short Description}} + * + * Inserts an array of strings into a file (.htaccess ), placing it between + * BEGIN and END markers. Replaces existing marked info. Retains surrounding + * data. Creates file if none exists. + * + * @since unknown + * + * @param unknown_type $filename + * @param unknown_type $marker + * @param unknown_type $insertion + * @return bool True on write success, false on failure. + */ function insert_with_markers( $filename, $marker, $insertion ) { if (!file_exists( $filename ) || is_writeable( $filename ) ) { if (!file_exists( $filename ) ) { @@ -82,9 +112,11 @@ function insert_with_markers( $filename, $marker, $insertion ) { /** * Updates the htaccess file with the current rules if it is writable. * - * Always writes to the file if it exists and is writable to ensure that we blank out old rules. + * Always writes to the file if it exists and is writable to ensure that we + * blank out old rules. + * + * @since unknown */ - function save_mod_rewrite_rules() { global $wp_rewrite; @@ -103,6 +135,13 @@ function save_mod_rewrite_rules() { return false; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + */ function update_recently_edited( $file ) { $oldfiles = (array ) get_option( 'recently_edited' ); if ( $oldfiles ) { @@ -118,7 +157,14 @@ function update_recently_edited( $file ) { update_option( 'recently_edited', $oldfiles ); } -// If siteurl or home changed, flush rewrite rules. +/** + * If siteurl or home changed, flush rewrite rules. + * + * @since unknown + * + * @param unknown_type $old_value + * @param unknown_type $value + */ function update_home_siteurl( $old_value, $value ) { global $wp_rewrite; @@ -132,6 +178,14 @@ function update_home_siteurl( $old_value, $value ) { add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 ); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $url + * @return unknown + */ function url_shorten( $url ) { $short_url = str_replace( 'http://', '', stripslashes( $url )); $short_url = str_replace( 'www.', '', $short_url ); @@ -142,6 +196,13 @@ function url_shorten( $url ) { return $short_url; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $vars + */ function wp_reset_vars( $vars ) { for ( $i=0; $i<count( $vars ); $i += 1 ) { $var = $vars[$i]; @@ -160,4 +221,21 @@ function wp_reset_vars( $vars ) { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $message + */ +function show_message($message) { + if( is_wp_error($message) ){ + if( $message->get_error_data() ) + $message = $message->get_error_message() . ': ' . $message->get_error_data(); + else + $message = $message->get_error_message(); + } + echo "<p>$message</p>\n"; +} + ?> wp-admin/includes/misc.php @@ -1,44 +1,173 @@ <?php - -function get_plugin_data( $plugin_file ) { - $plugin_data = implode( '', file( $plugin_file )); - preg_match( '|Plugin Name:(.*)$|mi', $plugin_data, $plugin_name ); - preg_match( '|Plugin URI:(.*)$|mi', $plugin_data, $plugin_uri ); +/** + * WordPress Plugin Administration API + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Parse the plugin contents to retrieve plugin's metadata. + * + * The metadata of the plugin's data searches for the following in the plugin's + * header. All plugin data must be on its own line. For plugin description, it + * must not have any newlines or only parts of the description will be displayed + * and the same goes for the plugin data. The below is formatted for printing. + * + * <code> + * /* + * Plugin Name: Name of Plugin + * Plugin URI: Link to plugin information + * Description: Plugin Description + * Author: Plugin author's name + * Author URI: Link to the author's web site + * Version: Must be set in the plugin for WordPress 2.3+ + * Text Domain: Optional. Unique identifier, should be same as the one used in + * plugin_text_domain() + * Domain Path: Optional. Only useful if the translations are located in a + * folder above the plugin's base path. For example, if .mo files are + * located in the locale folder then Domain Path will be "/locale/" and + * must have the first slash. Defaults to the base folder the plugin is + * located in. + * * / # Remove the space to close comment + * </code> + * + * Plugin data returned array contains the following: + * 'Name' - Name of the plugin, must be unique. + * 'Title' - Title of the plugin and the link to the plugin's web site. + * 'Description' - Description of what the plugin does and/or notes + * from the author. + * 'Author' - The author's name + * 'AuthorURI' - The authors web site address. + * 'Version' - The plugin version number. + * 'PluginURI' - Plugin web site address. + * 'TextDomain' - Plugin's text domain for localization. + * 'DomainPath' - Plugin's relative directory path to .mo files. + * + * Some users have issues with opening large files and manipulating the contents + * for want is usually the first 1kiB or 2kiB. This function stops pulling in + * the plugin contents when it has all of the required plugin data. + * + * The first 8kiB of the file will be pulled in and if the plugin data is not + * within that first 8kiB, then the plugin author should correct their plugin + * and move the plugin data headers to the top. + * + * The plugin file is assumed to have permissions to allow for scripts to read + * the file. This is not checked however and the file is only opened for + * reading. + * + * @link http://trac.wordpress.org/ticket/5651 Previous Optimizations. + * @link http://trac.wordpress.org/ticket/7372 Further and better Optimizations. + * @since 1.5.0 + * + * @param string $plugin_file Path to the plugin file + * @param bool $markup If the returned data should have HTML markup applied + * @param bool $translate If the returned data should be translated + * @return array See above for description. + */ +function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { + // We don't need to write to the file, so just open for reading. + $fp = fopen($plugin_file, 'r'); + + // Pull only the first 8kiB of the file in. + $plugin_data = fread( $fp, 8192 ); + + // PHP will close file handle, but we are good citizens. + fclose($fp); + + preg_match( '|Plugin Name:(.*)$|mi', $plugin_data, $name ); + preg_match( '|Plugin URI:(.*)$|mi', $plugin_data, $uri ); + preg_match( '|Version:(.*)|i', $plugin_data, $version ); preg_match( '|Description:(.*)$|mi', $plugin_data, $description ); preg_match( '|Author:(.*)$|mi', $plugin_data, $author_name ); preg_match( '|Author URI:(.*)$|mi', $plugin_data, $author_uri ); + preg_match( '|Text Domain:(.*)$|mi', $plugin_data, $text_domain ); + preg_match( '|Domain Path:(.*)$|mi', $plugin_data, $domain_path ); - if ( preg_match( "|Version:(.*)|i", $plugin_data, $version )) - $version = trim( $version[1] ); - else - $version = ''; + foreach ( array( 'name', 'uri', 'version', 'description', 'author_name', 'author_uri', 'text_domain', 'domain_path' ) as $field ) { + if ( !empty( ${$field} ) ) + ${$field} = trim(${$field}[1]); + else + ${$field} = ''; + } - $description = wptexturize( trim( $description[1] )); + $plugin_data = array( + 'Name' => $name, 'Title' => $name, 'PluginURI' => $uri, 'Description' => $description, + 'Author' => $author_name, 'AuthorURI' => $author_uri, 'Version' => $version, + 'TextDomain' => $text_domain, 'DomainPath' => $domain_path + ); + if ( $markup || $translate ) + $plugin_data = _get_plugin_data_markup_translate($plugin_data, $markup, $translate); + return $plugin_data; +} + +function _get_plugin_data_markup_translate($plugin_data, $markup = true, $translate = true) { + + //Translate fields + if( $translate && ! empty($plugin_data['TextDomain']) ) { + if( ! empty( $plugin_data['DomainPath'] ) ) + load_plugin_textdomain($plugin_data['TextDomain'], dirname($plugin_file). $plugin_data['DomainPath']); + else + load_plugin_textdomain($plugin_data['TextDomain'], dirname($plugin_file)); - $name = $plugin_name[1]; - $name = trim( $name ); - $plugin = $name; - if ('' != trim($plugin_uri[1]) && '' != $name ) { - $plugin = '<a href="' . trim( $plugin_uri[1] ) . '" title="'.__( 'Visit plugin homepage' ).'">'.$plugin.'</a>'; + foreach ( array('Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version') as $field ) + $plugin_data[ $field ] = translate($plugin_data[ $field ], $plugin_data['TextDomain']); } - if ('' == $author_uri[1] ) { - $author = trim( $author_name[1] ); - } else { - $author = '<a href="' . trim( $author_uri[1] ) . '" title="'.__( 'Visit author homepage' ).'">' . trim( $author_name[1] ) . '</a>'; + //Apply Markup + if ( $markup ) { + if ( ! empty($plugin_data['PluginURI']) && ! empty($plugin_data['Name']) ) + $plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin homepage' ) . '">' . $plugin_data['Name'] . '</a>'; + else + $plugin_data['Title'] = $plugin_data['Name']; + + if ( ! empty($plugin_data['AuthorURI']) ) + $plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>'; + + $plugin_data['Description'] = wptexturize( $plugin_data['Description'] ); + if( ! empty($plugin_data['Author']) ) + $plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>'; } - return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version); + $plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()); + + // Sanitize all displayed data + $plugin_data['Title'] = wp_kses($plugin_data['Title'], $plugins_allowedtags); + $plugin_data['Version'] = wp_kses($plugin_data['Version'], $plugins_allowedtags); + $plugin_data['Description'] = wp_kses($plugin_data['Description'], $plugins_allowedtags); + $plugin_data['Author'] = wp_kses($plugin_data['Author'], $plugins_allowedtags); + + return $plugin_data; } +/** + * Check the plugins directory and retrieve all plugin files with plugin data. + * + * WordPress only supports plugin files in the base plugins directory + * (wp-content/plugins) and in one directory above the plugins directory + * (wp-content/plugins/my-plugin). The file it looks for has the plugin data and + * must be found in those two locations. It is recommended that do keep your + * plugin files in directories. + * + * The file with the plugin data is the file that will be included and therefore + * needs to have the main execution for the plugin. This does not mean + * everything must be contained in the file and it is recommended that the file + * be split for maintainability. Keep everything in one file for extreme + * optimization purposes. + * + * @since unknown + * + * @param string $plugin_folder Optional. Relative path to single plugin folder. + * @return array Key is the plugin file path and the value is an array of the plugin data. + */ function get_plugins($plugin_folder = '') { - + if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') ) $cache_plugins = array(); - + if ( isset($cache_plugins[ $plugin_folder ]) ) return $cache_plugins[ $plugin_folder ]; - + $wp_plugins = array (); $plugin_root = WP_PLUGIN_DIR; if( !empty($plugin_folder) ) @@ -76,7 +205,7 @@ function get_plugins($plugin_folder = '') { if ( !is_readable( "$plugin_root/$plugin_file" ) ) continue; - $plugin_data = get_plugin_data( "$plugin_root/$plugin_file" ); + $plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached. if ( empty ( $plugin_data['Name'] ) ) continue; @@ -86,39 +215,82 @@ function get_plugins($plugin_folder = '') { uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' )); - $cache_plugins[ $plugin_folder ] = $wp_plugins; - wp_cache_set('plugins', $cache_plugins, 'plugins'); + $cache_plugins[ $plugin_folder ] = $wp_plugins; + wp_cache_set('plugins', $cache_plugins, 'plugins'); return $wp_plugins; } -function is_plugin_active($plugin){ +/** + * Check whether the plugin is active by checking the active_plugins list. + * + * @since 2.5.0 + * + * @param string $plugin Base plugin path from plugins directory. + * @return bool True, if in the active plugins list. False, not in the list. + */ +function is_plugin_active($plugin) { return in_array($plugin, get_option('active_plugins')); } +/** + * Attempts activation of plugin in a "sandbox" and redirects on success. + * + * A plugin that is already activated will not attempt to be activated again. + * + * The way it works is by setting the redirection to the error before trying to + * include the plugin file. If the plugin fails, then the redirection will not + * be overwritten with the success message. Also, the options will not be + * updated and the activation hook will not be called on plugin error. + * + * It should be noted that in no way the below code will actually prevent errors + * within the file. The code should not be used elsewhere to replicate the + * "sandbox", which uses redirection to work. + * {@source 13 1} + * + * If any errors are found or text is outputted, then it will be captured to + * ensure that the success redirection will update the error redirection. + * + * @since unknown + * + * @param string $plugin Plugin path to main plugin file with plugin data. + * @param string $redirect Optional. URL to redirect to. + * @return WP_Error|null WP_Error on invalid file or null on success. + */ function activate_plugin($plugin, $redirect = '') { - $current = get_option('active_plugins'); - $plugin = trim($plugin); - - $valid = validate_plugin($plugin); - if ( is_wp_error($valid) ) - return $valid; - - if ( !in_array($plugin, $current) ) { - if ( !empty($redirect) ) - wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error - ob_start(); - @include(WP_PLUGIN_DIR . '/' . $plugin); - $current[] = $plugin; - sort($current); - update_option('active_plugins', $current); - do_action('activate_' . $plugin); - ob_end_clean(); - } + $current = get_option('active_plugins'); + $plugin = plugin_basename(trim($plugin)); - return null; + $valid = validate_plugin($plugin); + if ( is_wp_error($valid) ) + return $valid; + + if ( !in_array($plugin, $current) ) { + if ( !empty($redirect) ) + wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error + ob_start(); + @include(WP_PLUGIN_DIR . '/' . $plugin); + $current[] = $plugin; + sort($current); + update_option('active_plugins', $current); + do_action('activate_' . $plugin); + ob_end_clean(); + } + + return null; } +/** + * Deactivate a single plugin or multiple plugins. + * + * The deactivation hook is disabled by the plugin upgrader by using the $silent + * parameter. + * + * @since unknown + * + * @param string|array $plugins Single plugin or list of plugins to deactivate. + * @param bool $silent Optional, default is false. Prevent calling deactivate hook. + */ function deactivate_plugins($plugins, $silent= false) { $current = get_option('active_plugins'); @@ -126,6 +298,7 @@ function deactivate_plugins($plugins, $silent= false) { $plugins = array($plugins); foreach ( $plugins as $plugin ) { + $plugin = plugin_basename($plugin); if( ! is_plugin_active($plugin) ) continue; array_splice($current, array_search( $plugin, $current), 1 ); // Fixed Array-fu! @@ -136,6 +309,20 @@ function deactivate_plugins($plugins, $silent= false) { update_option('active_plugins', $current); } +/** + * Activate multiple plugins. + * + * When WP_Error is returned, it does not mean that one of the plugins had + * errors. It means that one or more of the plugins file path was invalid. + * + * The execution will be halted as soon as one of the plugins has an error. + * + * @since unknown + * + * @param string|array $plugins + * @param string $redirect Redirect to page after successful activation. + * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation. + */ function activate_plugins($plugins, $redirect = '') { if ( !is_array($plugins) ) $plugins = array($plugins); @@ -155,6 +342,18 @@ function activate_plugins($plugins, $redirect = '') { return true; } +/** + * Remove directory and files of a plugin for a single or list of plugin(s). + * + * If the plugins parameter list is empty, false will be returned. True when + * completed. + * + * @since unknown + * + * @param array $plugins List of plugin + * @param string $redirect Redirect to page when complete. + * @return mixed + */ function delete_plugins($plugins, $redirect = '' ) { global $wp_filesystem; @@ -206,26 +405,33 @@ function delete_plugins($plugins, $redirect = '' ) { $plugins_dir = $wp_filesystem->wp_plugins_dir(); if ( empty($plugins_dir) ) return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.')); - + $plugins_dir = trailingslashit( $plugins_dir ); $errors = array(); foreach( $plugins as $plugin_file ) { + // Run Uninstall hook + if ( is_uninstallable_plugin( $plugin_file ) ) + uninstall_plugin($plugin_file); + $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) ); // If plugin is in its own directory, recursively delete the directory. if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder $deleted = $wp_filesystem->delete($this_plugin_dir, true); else $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file); - + if ( ! $deleted ) $errors[] = $plugin_file; } - - if( ! empty($errors) ) + + if ( ! empty($errors) ) return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) ); - + + // Force refresh of plugin update information + delete_option('update_plugins'); + return true; } @@ -240,7 +446,7 @@ function validate_active_plugins() { } //Invalid is any plugin that is deactivated due to error. - $invalid = array(); + $invalid = array(); // If a plugin file does not exist, remove it from the list of active // plugins. @@ -254,25 +460,109 @@ function validate_active_plugins() { return $invalid; } +/** + * Validate the plugin path. + * + * Checks that the file exists and {@link validate_file() is valid file}. + * + * @since unknown + * + * @param string $plugin Plugin Path + * @return WP_Error|int 0 on success, WP_Error on failure. + */ function validate_plugin($plugin) { if ( validate_file($plugin) ) - return new WP_Error('plugin_invalid', __('Invalid plugin.')); + return new WP_Error('plugin_invalid', __('Invalid plugin path.')); if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) ) return new WP_Error('plugin_not_found', __('Plugin file does not exist.')); return 0; } +/** + * Whether the plugin can be uninstalled. + * + * @since 2.7.0 + * + * @param string $plugin Plugin path to check. + * @return bool Whether plugin can be uninstalled. + */ +function is_uninstallable_plugin($plugin) { + $file = plugin_basename($plugin); + + $uninstallable_plugins = (array) get_option('uninstall_plugins'); + if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) + return true; + + return false; +} + +/** + * Uninstall a single plugin. + * + * Calls the uninstall hook, if it is available. + * + * @since 2.7.0 + * + * @param string $plugin Relative plugin path from Plugin Directory. + */ +function uninstall_plugin($plugin) { + $file = plugin_basename($plugin); + + $uninstallable_plugins = (array) get_option('uninstall_plugins'); + if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) { + if ( isset( $uninstallable_plugins[$file] ) ) { + unset($uninstallable_plugins[$file]); + update_option('uninstall_plugins', $uninstallable_plugins); + } + unset($uninstallable_plugins); + + define('WP_UNINSTALL_PLUGIN', $file); + include WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php'; + + return true; + } + + if ( isset( $uninstallable_plugins[$file] ) ) { + $callable = $uninstallable_plugins[$file]; + unset($uninstallable_plugins[$file]); + update_option('uninstall_plugins', $uninstallable_plugins); + unset($uninstallable_plugins); + + include WP_PLUGIN_DIR . '/' . $file; + + add_action( 'uninstall_' . $file, $callable ); + do_action( 'uninstall_' . $file ); + } +} + // // Menu // -function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { +function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '' ) { global $menu, $admin_page_hooks; $file = plugin_basename( $file ); - $menu[] = array ( $menu_title, $access_level, $file, $page_title ); + $admin_page_hooks[$file] = sanitize_title( $menu_title ); + + $hookname = get_plugin_page_hookname( $file, '' ); + if (!empty ( $function ) && !empty ( $hookname )) + add_action( $hookname, $function ); + + if ( empty($icon_url) ) + $icon_url = 'images/generic.png'; + + $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); + + return $hookname; +} + +function add_object_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') { + global $menu, $admin_page_hooks, $_wp_last_object_menu; + + $file = plugin_basename( $file ); $admin_page_hooks[$file] = sanitize_title( $menu_title ); @@ -280,6 +570,34 @@ function add_menu_page( $page_title, $menu_title, $access_level, $file, $functio if (!empty ( $function ) && !empty ( $hookname )) add_action( $hookname, $function ); + if ( empty($icon_url) ) + $icon_url = 'images/generic.png'; + + $_wp_last_object_menu++; + + $menu[$_wp_last_object_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); + + return $hookname; +} + +function add_utility_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') { + global $menu, $admin_page_hooks, $_wp_last_utility_menu; + + $file = plugin_basename( $file ); + + $admin_page_hooks[$file] = sanitize_title( $menu_title ); + + $hookname = get_plugin_page_hookname( $file, '' ); + if (!empty ( $function ) && !empty ( $hookname )) + add_action( $hookname, $function ); + + if ( empty($icon_url) ) + $icon_url = 'images/generic.png'; + + $_wp_last_utility_menu++; + + $menu[$_wp_last_utility_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); + return $hookname; } @@ -320,8 +638,18 @@ function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $fi return $hookname; } +/** + * Add sub menu page to the tools main menu. + * + * @param string $page_title + * @param unknown_type $menu_title + * @param unknown_type $access_level + * @param unknown_type $file + * @param unknown_type $function + * @return unknown + */ function add_management_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { - return add_submenu_page( 'edit.php', $page_title, $menu_title, $access_level, $file, $function ); + return add_submenu_page( 'tools.php', $page_title, $menu_title, $access_level, $file, $function ); } function add_options_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { @@ -340,11 +668,35 @@ function add_users_page( $page_title, $menu_title, $access_level, $file, $functi return add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function ); } +function add_dashboard_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'index.php', $page_title, $menu_title, $access_level, $file, $function ); +} + +function add_posts_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'edit.php', $page_title, $menu_title, $access_level, $file, $function ); +} + +function add_media_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'upload.php', $page_title, $menu_title, $access_level, $file, $function ); +} + +function add_links_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $access_level, $file, $function ); +} + +function add_pages_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'edit-pages.php', $page_title, $menu_title, $access_level, $file, $function ); +} + +function add_comments_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $access_level, $file, $function ); +} + // // Pluggable Menu Support -- Private // -function get_admin_page_parent() { +function get_admin_page_parent( $parent = '' ) { global $parent_file; global $menu; global $submenu; @@ -354,12 +706,19 @@ function get_admin_page_parent() { global $_wp_menu_nopriv; global $_wp_submenu_nopriv; + if ( !empty ( $parent ) && 'admin.php' != $parent ) { + if ( isset( $_wp_real_parent_file[$parent] ) ) + $parent = $_wp_real_parent_file[$parent]; + return $parent; + } +/* if ( !empty ( $parent_file ) ) { if ( isset( $_wp_real_parent_file[$parent_file] ) ) $parent_file = $_wp_real_parent_file[$parent_file]; return $parent_file; } +*/ if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) { foreach ( $menu as $parent_menu ) { @@ -400,7 +759,8 @@ function get_admin_page_parent() { } } - $parent_file = ''; + if ( empty($parent_file) ) + $parent_file = ''; return ''; } @@ -418,6 +778,7 @@ function get_admin_page_title() { $hook = get_plugin_page_hook( $plugin_page, $pagenow ); $parent = $parent1 = get_admin_page_parent(); + if ( empty ( $parent) ) { foreach ( $menu as $menu_array ) { if ( isset( $menu_array[3] ) ) { @@ -473,17 +834,17 @@ function get_plugin_page_hook( $plugin_page, $parent_page ) { function get_plugin_page_hookname( $plugin_page, $parent_page ) { global $admin_page_hooks; - $parent = get_admin_page_parent(); + $parent = get_admin_page_parent( $parent_page ); $page_type = 'admin'; - if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) { - if ( isset( $admin_page_hooks[$plugin_page] )) + if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) { + if ( isset( $admin_page_hooks[$plugin_page] ) ) $page_type = 'toplevel'; else if ( isset( $admin_page_hooks[$parent] )) $page_type = $admin_page_hooks[$parent]; - } else if ( isset( $admin_page_hooks[$parent_page] ) ) { - $page_type = $admin_page_hooks[$parent_page]; + } else if ( isset( $admin_page_hooks[$parent] ) ) { + $page_type = $admin_page_hooks[$parent]; } $plugin_name = preg_replace( '!\.php!', '', $plugin_page ); @@ -551,4 +912,154 @@ function user_can_access_admin_page() { return true; } +/* Whitelist functions */ + +/** + * Register a setting and its sanitization callback + * + * @since 2.7.0 + * + * @param string $option_group A settings group name. Can be anything. + * @param string $option_name The name of an option to sanitize and save. + * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. + * @return unknown + */ +function register_setting($option_group, $option_name, $sanitize_callback = '') { + return add_option_update_handler($option_group, $option_name, $sanitize_callback); +} + +/** + * Unregister a setting + * + * @since 2.7.0 + * + * @param unknown_type $option_group + * @param unknown_type $option_name + * @param unknown_type $sanitize_callback + * @return unknown + */ +function unregister_setting($option_group, $option_name, $sanitize_callback = '') { + return remove_option_update_handler($option_group, $option_name, $sanitize_callback); +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $option_group + * @param unknown_type $option_name + * @param unknown_type $sanitize_callback + */ +function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') { + global $new_whitelist_options; + $new_whitelist_options[ $option_group ][] = $option_name; + if ( $sanitize_callback != '' ) + add_filter( "sanitize_option_{$option_name}", $sanitize_callback ); +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $option_group + * @param unknown_type $option_name + * @param unknown_type $sanitize_callback + */ +function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') { + global $new_whitelist_options; + $pos = array_search( $option_name, $new_whitelist_options ); + if ( $pos !== false ) + unset( $new_whitelist_options[ $option_group ][ $pos ] ); + if ( $sanitize_callback != '' ) + remove_filter( "sanitize_option_{$option_name}", $sanitize_callback ); +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $options + * @return unknown + */ +function option_update_filter( $options ) { + global $new_whitelist_options; + + if ( is_array( $new_whitelist_options ) ) + $options = add_option_whitelist( $new_whitelist_options, $options ); + + return $options; +} +add_filter( 'whitelist_options', 'option_update_filter' ); + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $new_options + * @param unknown_type $options + * @return unknown + */ +function add_option_whitelist( $new_options, $options = '' ) { + if( $options == '' ) { + global $whitelist_options; + } else { + $whitelist_options = $options; + } + foreach( $new_options as $page => $keys ) { + foreach( $keys as $key ) { + if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) { + $whitelist_options[ $page ] = array(); + $whitelist_options[ $page ][] = $key; + } else { + $pos = array_search( $key, $whitelist_options[ $page ] ); + if ( $pos === false ) + $whitelist_options[ $page ][] = $key; + } + } + } + return $whitelist_options; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $del_options + * @param unknown_type $options + * @return unknown + */ +function remove_option_whitelist( $del_options, $options = '' ) { + if( $options == '' ) { + global $whitelist_options; + } else { + $whitelist_options = $options; + } + foreach( $del_options as $page => $keys ) { + foreach( $keys as $key ) { + $pos = array_search( $key, $whitelist_options[ $page ] ); + if( $pos !== false ) + unset( $whitelist_options[ $page ][ $pos ] ); + } + } + return $whitelist_options; +} + +/** + * Output nonce, action, and option_page fields for a settings page. + * + * @since 2.7.0 + * + * @param string $option_group A settings group name. This should match the group name used in register_setting(). + */ +function settings_fields($option_group) { + echo "<input type='hidden' name='option_page' value='$option_group' />"; + echo '<input type="hidden" name="action" value="update" />'; + wp_nonce_field("$option_group-options"); +} + ?> wp-admin/includes/plugin.php @@ -1,36 +1,48 @@ <?php +/** + * WordPress Post Administration API. + * + * @package WordPress + * @subpackage Administration + */ /** - * _wp_translate_postdata() - Rename $_POST data from form names to DB post columns. + * Rename $_POST data from form names to DB post columns. * * Manipulates $_POST directly. * * @package WordPress - * @since 2.6 + * @since 2.6.0 * * @param bool $update Are we updating a pre-existing post? + * @param post_data array Array of post data. Defaults to the contents of $_POST. * @return object|bool WP_Error on failure, true on success. */ -function _wp_translate_postdata( $update = false ) { +function _wp_translate_postdata( $update = false, $post_data = null ) { + + if ( empty($post_data) ) + $post_data = &$_POST; + if ( $update ) - $_POST['ID'] = (int) $_POST['post_ID']; - $_POST['post_content'] = $_POST['content']; - $_POST['post_excerpt'] = $_POST['excerpt']; - $_POST['post_parent'] = isset($_POST['parent_id'])? $_POST['parent_id'] : ''; - $_POST['to_ping'] = $_POST['trackback_url']; - - if (!empty ( $_POST['post_author_override'] ) ) { - $_POST['post_author'] = (int) $_POST['post_author_override']; + $post_data['ID'] = (int) $post_data['post_ID']; + $post_data['post_content'] = isset($post_data['content']) ? $post_data['content'] : ''; + $post_data['post_excerpt'] = isset($post_data['excerpt']) ? $post_data['excerpt'] : ''; + $post_data['post_parent'] = isset($post_data['parent_id'])? $post_data['parent_id'] : ''; + if ( isset($post_data['trackback_url']) ) + $post_data['to_ping'] = $post_data['trackback_url']; + + if (!empty ( $post_data['post_author_override'] ) ) { + $post_data['post_author'] = (int) $post_data['post_author_override']; } else { - if (!empty ( $_POST['post_author'] ) ) { - $_POST['post_author'] = (int) $_POST['post_author']; + if (!empty ( $post_data['post_author'] ) ) { + $post_data['post_author'] = (int) $post_data['post_author']; } else { - $_POST['post_author'] = (int) $_POST['user_ID']; + $post_data['post_author'] = (int) $post_data['user_ID']; } } - if ( $_POST['post_author'] != $_POST['user_ID'] ) { - if ( 'page' == $_POST['post_type'] ) { + if ( isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID']) ) { + if ( 'page' == $post_data['post_type'] ) { if ( !current_user_can( 'edit_others_pages' ) ) { return new WP_Error( 'edit_others_pages', $update ? __( 'You are not allowed to edit pages as this user.' ) : @@ -48,51 +60,55 @@ function _wp_translate_postdata( $update = false ) { } // What to do based on which button they pressed - if ( isset($_POST['saveasdraft']) && '' != $_POST['saveasdraft'] ) - $_POST['post_status'] = 'draft'; - if ( isset($_POST['saveasprivate']) && '' != $_POST['saveasprivate'] ) - $_POST['post_status'] = 'private'; - if ( isset($_POST['publish']) && ( '' != $_POST['publish'] ) && ( $_POST['post_status'] != 'private' ) ) - $_POST['post_status'] = 'publish'; - if ( isset($_POST['advanced']) && '' != $_POST['advanced'] ) - $_POST['post_status'] = 'draft'; - - $previous_status = get_post_field('post_status', $_POST['ID']); - - // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. + if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) + $post_data['post_status'] = 'draft'; + if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] ) + $post_data['post_status'] = 'private'; + if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( $post_data['post_status'] != 'private' ) ) + $post_data['post_status'] = 'publish'; + if ( isset($post_data['advanced']) && '' != $post_data['advanced'] ) + $post_data['post_status'] = 'draft'; + if ( isset($post_data['pending']) && '' != $post_data['pending'] ) + $post_data['post_status'] = 'pending'; + + $previous_status = get_post_field('post_status', isset($post_data['ID']) ? $post_data['ID'] : $post_data['temp_ID']); + + // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts. - if ( 'page' == $_POST['post_type'] ) { - if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) ) - if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_pages') ) - $_POST['post_status'] = 'pending'; + if ( 'page' == $post_data['post_type'] ) { + $publish_cap = 'publish_pages'; + $edit_cap = 'edit_published_pages'; } else { - if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) ) : - // Stop attempts to publish new posts, but allow already published posts to be saved if appropriate. - if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_posts') ) - $_POST['post_status'] = 'pending'; - endif; + $publish_cap = 'publish_posts'; + $edit_cap = 'edit_published_posts'; } + if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $publish_cap )) ) + if ( $previous_status != 'publish' || !current_user_can( $edit_cap ) ) + $post_data['post_status'] = 'pending'; + + if ( ! isset($post_data['post_status']) ) + $post_data['post_status'] = $previous_status; - if (!isset( $_POST['comment_status'] )) - $_POST['comment_status'] = 'closed'; + if (!isset( $post_data['comment_status'] )) + $post_data['comment_status'] = 'closed'; - if (!isset( $_POST['ping_status'] )) - $_POST['ping_status'] = 'closed'; + if (!isset( $post_data['ping_status'] )) + $post_data['ping_status'] = 'closed'; foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) { - if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) { - $_POST['edit_date'] = '1'; + if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) { + $post_data['edit_date'] = '1'; break; } } - if ( !empty( $_POST['edit_date'] ) ) { - $aa = $_POST['aa']; - $mm = $_POST['mm']; - $jj = $_POST['jj']; - $hh = $_POST['hh']; - $mn = $_POST['mn']; - $ss = $_POST['ss']; + if ( !empty( $post_data['edit_date'] ) ) { + $aa = $post_data['aa']; + $mm = $post_data['mm']; + $jj = $post_data['jj']; + $hh = $post_data['hh']; + $mn = $post_data['mn']; + $ss = $post_data['ss']; $aa = ($aa <= 0 ) ? date('Y') : $aa; $mm = ($mm <= 0 ) ? date('n') : $mm; $jj = ($jj > 31 ) ? 31 : $jj; @@ -100,20 +116,29 @@ function _wp_translate_postdata( $update = false ) { $hh = ($hh > 23 ) ? $hh -24 : $hh; $mn = ($mn > 59 ) ? $mn -60 : $mn; $ss = ($ss > 59 ) ? $ss -60 : $ss; - $_POST['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss ); - $_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] ); + $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss ); + $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] ); } - return true; + return $post_data; } +/** + * Update an existing post with values provided in $_POST. + * + * @since unknown + * + * @param array $post_data Optional. + * @return int Post ID. + */ +function edit_post( $post_data = null ) { -// Update an existing post with values provided in $_POST. -function edit_post() { + if ( empty($post_data) ) + $post_data = &$_POST; - $post_ID = (int) $_POST['post_ID']; + $post_ID = (int) $post_data['post_ID']; - if ( 'page' == $_POST['post_type'] ) { + if ( 'page' == $post_data['post_type'] ) { if ( !current_user_can( 'edit_page', $post_ID ) ) wp_die( __('You are not allowed to edit this page.' )); } else { @@ -122,7 +147,7 @@ function edit_post() { } // Autosave shouldn't save too soon after a real save - if ( 'autosave' == $_POST['action'] ) { + if ( 'autosave' == $post_data['action'] ) { $post =& get_post( $post_ID ); $now = time(); $then = strtotime($post->post_date_gmt . ' +0000'); @@ -131,24 +156,40 @@ function edit_post() { return $post_ID; } - $translated = _wp_translate_postdata( true ); - if ( is_wp_error($translated) ) - wp_die( $translated->get_error_message() ); + $post_data = _wp_translate_postdata( true, $post_data ); + if ( is_wp_error($post_data) ) + wp_die( $post_data->get_error_message() ); + + if ( isset($post_data['visibility']) ) { + switch ( $post_data['visibility'] ) { + case 'public' : + $post_data['post_password'] = ''; + break; + case 'password' : + unset( $post_data['sticky'] ); + break; + case 'private' : + $post_data['post_status'] = 'private'; + $post_data['post_password'] = ''; + unset( $post_data['sticky'] ); + break; + } + } // Meta Stuff - if ( isset($_POST['meta']) && $_POST['meta'] ) { - foreach ( $_POST['meta'] as $key => $value ) + if ( isset($post_data['meta']) && $post_data['meta'] ) { + foreach ( $post_data['meta'] as $key => $value ) update_meta( $key, $value['key'], $value['value'] ); } - if ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) { - foreach ( $_POST['deletemeta'] as $key => $value ) + if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) { + foreach ( $post_data['deletemeta'] as $key => $value ) delete_meta( $key ); } add_meta( $post_ID ); - wp_update_post( $_POST ); + wp_update_post( $post_data ); // Reunite any orphaned attachments with their parent if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) @@ -161,10 +202,121 @@ function edit_post() { wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID ); + if ( current_user_can( 'edit_others_posts' ) ) { + if ( !empty($post_data['sticky']) ) + stick_post($post_ID); + else + unstick_post($post_ID); + } + return $post_ID; } -// Default post information to use when populating the "Write Post" form. +/** + * {@internal Missing Short Description}} + * + * Updates all bulk edited posts/pages, adding (but not removing) tags and + * categories. Skips pages when they would be their own parent or child. + * + * @since unknown + * + * @return array + */ +function bulk_edit_posts( $post_data = null ) { + global $wpdb; + + if ( empty($post_data) ) + $post_data = &$_POST; + + if ( 'page' == $post_data['post_type'] ) { + if ( ! current_user_can( 'edit_pages' ) ) + wp_die( __('You are not allowed to edit pages.') ); + } else { + if ( ! current_user_can( 'edit_posts' ) ) + wp_die( __('You are not allowed to edit posts.') ); + } + + $post_IDs = array_map( intval, (array) $post_data['post'] ); + + $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category', 'sticky' ); + foreach ( $reset as $field ) { + if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) + unset($post_data[$field]); + } + + if ( isset($post_data['post_category']) ) { + if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) ) + $new_cats = array_map( absint, $post_data['post_category'] ); + else + unset($post_data['post_category']); + } + + if ( isset($post_data['tags_input']) ) { + $new_tags = preg_replace( '/\s*,\s*/', ',', rtrim( trim($post_data['tags_input']), ' ,' ) ); + $new_tags = explode(',', $new_tags); + } + + if ( isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent']) ) { + $pages = $wpdb->get_results("SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'"); + $children = array(); + + for ( $i = 0; $i < 50 && $parent > 0; $i++ ) { + $children[] = $parent; + + foreach ( $pages as $page ) { + if ( $page->ID == $parent ) { + $parent = $page->post_parent; + break; + } + } + } + } + + $updated = $skipped = $locked = array(); + foreach ( $post_IDs as $post_ID ) { + + if ( isset($children) && in_array($post_ID, $children) ) { + $skipped[] = $post_ID; + continue; + } + + if ( wp_check_post_lock( $post_ID ) ) { + $locked[] = $post_ID; + continue; + } + + if ( isset($new_cats) ) { + $cats = (array) wp_get_post_categories($post_ID); + $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) ); + } + + if ( isset($new_tags) ) { + $tags = wp_get_post_tags($post_ID, array('fields' => 'names')); + $post_data['tags_input'] = array_unique( array_merge($tags, $new_tags) ); + } + + $post_data['ID'] = $post_ID; + $updated[] = wp_update_post( $post_data ); + + if ( current_user_can( 'edit_others_posts' ) && isset( $post_data['sticky'] ) ) { + if ( 'sticky' == $post_data['sticky'] ) + stick_post( $post_ID ); + else + unstick_post( $post_ID ); + } + + } + + return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked ); +} + +/** + * Default post information to use when populating the "Write Post" form. + * + * @since unknown + * + * @return unknown + */ function get_default_post_to_edit() { if ( !empty( $_REQUEST['post_title'] ) ) $post_title = wp_specialchars( stripslashes( $_REQUEST['post_title'] )); @@ -182,8 +334,8 @@ function get_default_post_to_edit() { $text = wp_specialchars( stripslashes( urldecode( $_REQUEST['text'] ) ) ); $text = funky_javascript_fix( $text); $popupurl = clean_url($_REQUEST['popupurl']); - $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text"; - } + $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text"; + } if ( !empty( $_REQUEST['excerpt'] ) ) $post_excerpt = wp_specialchars( stripslashes( $_REQUEST['excerpt'] )); @@ -194,6 +346,7 @@ function get_default_post_to_edit() { $post->post_name = ''; $post->post_author = ''; $post->post_date = ''; + $post->post_password = ''; $post->post_status = 'draft'; $post->post_type = 'post'; $post->to_ping = ''; @@ -212,13 +365,27 @@ function get_default_post_to_edit() { return $post; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function get_default_page_to_edit() { - $page = get_default_post_to_edit(); - $page->post_type = 'page'; - return $page; + $page = get_default_post_to_edit(); + $page->post_type = 'page'; + return $page; } -// Get an existing post and format it for editing. +/** + * Get an existing post and format it for editing. + * + * @since unknown + * + * @param unknown_type $id + * @return unknown + */ function get_post_to_edit( $id ) { $post = get_post( $id, OBJECT, 'edit' ); @@ -229,9 +396,23 @@ function get_post_to_edit( $id ) { return $post; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $title + * @param unknown_type $content + * @param unknown_type $post_date + * @return unknown + */ function post_exists($title, $content = '', $post_date = '') { global $wpdb; + $title = stripslashes($title); + $content = stripslashes($content); + $post_date = stripslashes($post_date); + if (!empty ($post_date)) $post_date = $wpdb->prepare("AND post_date = %s", $post_date); @@ -244,7 +425,13 @@ function post_exists($title, $content = '', $post_date = '') { return 0; } -// Creates a new post from the "Write Post" form using $_POST information. +/** + * Creates a new post from the "Write Post" form using $_POST information. + * + * @since unknown + * + * @return unknown + */ function wp_write_post() { global $user_ID; @@ -279,6 +466,22 @@ function wp_write_post() { if ( is_wp_error($translated) ) return $translated; + if ( isset($_POST['visibility']) ) { + switch ( $_POST['visibility'] ) { + case 'public' : + $_POST['post_password'] = ''; + break; + case 'password' : + unset( $_POST['sticky'] ); + break; + case 'private' : + $_POST['post_status'] = 'private'; + $_POST['post_password'] = ''; + unset( $_POST['sticky'] ); + break; + } + } + // Create the post. $post_ID = wp_insert_post( $_POST ); if ( is_wp_error( $post_ID ) ) @@ -311,6 +514,13 @@ function wp_write_post() { return $post_ID; } +/** + * Calls wp_write_post() and handles the errors. + * + * @since unknown + * + * @return unknown + */ function write_post() { $result = wp_write_post(); if( is_wp_error( $result ) ) @@ -323,16 +533,23 @@ function write_post() { // Post Meta // +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post_ID + * @return unknown + */ function add_meta( $post_ID ) { global $wpdb; $post_ID = (int) $post_ID; $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' ); - $metakeyselect = $wpdb->escape( stripslashes( trim( $_POST['metakeyselect'] ) ) ); - $metakeyinput = $wpdb->escape( stripslashes( trim( $_POST['metakeyinput'] ) ) ); - $metavalue = maybe_serialize( stripslashes( (trim( $_POST['metavalue'] ) ) )); - $metavalue = $wpdb->escape( $metavalue ); + $metakeyselect = isset($_POST['metakeyselect']) ? stripslashes( trim( $_POST['metakeyselect'] ) ) : ''; + $metakeyinput = isset($_POST['metakeyinput']) ? stripslashes( trim( $_POST['metakeyinput'] ) ) : ''; + $metavalue = isset($_POST['metavalue']) ? maybe_serialize( stripslashes( trim( $_POST['metavalue'] ) ) ) : ''; if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) { // We have a key/value pair. If both the select and the @@ -349,14 +566,20 @@ function add_meta( $post_ID ) { wp_cache_delete($post_ID, 'post_meta'); - $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta - (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", - $post_ID, $metakey, $metavalue) ); + $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) ); return $wpdb->insert_id; } return false; } // add_meta +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $mid + * @return unknown + */ function delete_meta( $mid ) { global $wpdb; $mid = (int) $mid; @@ -367,7 +590,13 @@ function delete_meta( $mid ) { return $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_id = %d", $mid) ); } -// Get a list of previously defined keys +/** + * Get a list of previously defined keys. + * + * @since unknown + * + * @return unknown + */ function get_meta_keys() { global $wpdb; @@ -380,6 +609,14 @@ function get_meta_keys() { return $keys; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $mid + * @return unknown + */ function get_post_meta_by_id( $mid ) { global $wpdb; $mid = (int) $mid; @@ -390,7 +627,16 @@ function get_post_meta_by_id( $mid ) { return $meta; } -// Some postmeta stuff +/** + * {@internal Missing Short Description}} + * + * Some postmeta stuff. + * + * @since unknown + * + * @param unknown_type $postid + * @return unknown + */ function has_meta( $postid ) { global $wpdb; @@ -400,6 +646,16 @@ function has_meta( $postid ) { } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $meta_id + * @param unknown_type $meta_key + * @param unknown_type $meta_value + * @return unknown + */ function update_meta( $meta_id, $meta_key, $meta_value ) { global $wpdb; @@ -413,7 +669,7 @@ function update_meta( $meta_id, $meta_key, $meta_value ) { $meta_value = maybe_serialize( stripslashes( $meta_value )); $meta_id = (int) $meta_id; - + $data = compact( 'meta_key', 'meta_value' ); $where = compact( 'meta_id' ); @@ -424,7 +680,15 @@ function update_meta( $meta_id, $meta_key, $meta_value ) { // Private // -// Replace hrefs of attachment anchors with up-to-date permalinks. +/** + * Replace hrefs of attachment anchors with up-to-date permalinks. + * + * @since unknown + * @access private + * + * @param unknown_type $post_ID + * @return unknown + */ function _fix_attachment_links( $post_ID ) { $post = & get_post( $post_ID, ARRAY_A ); @@ -465,7 +729,16 @@ function _fix_attachment_links( $post_ID ) { return wp_update_post( $post); } -// Move child posts to a new parent +/** + * Move child posts to a new parent. + * + * @since unknown + * @access private + * + * @param unknown_type $old_ID + * @param unknown_type $new_ID + * @return unknown + */ function _relocate_children( $old_ID, $new_ID ) { global $wpdb; $old_ID = (int) $old_ID; @@ -473,24 +746,39 @@ function _relocate_children( $old_ID, $new_ID ) { return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = %d WHERE post_parent = %d", $new_ID, $old_ID) ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $type + * @return unknown + */ function get_available_post_statuses($type = 'post') { $stati = wp_count_posts($type); return array_keys(get_object_vars($stati)); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $q + * @return unknown + */ function wp_edit_posts_query( $q = false ) { - global $wpdb; if ( false === $q ) $q = $_GET; - $q['m'] = (int) $q['m']; - $q['cat'] = (int) $q['cat']; + $q['m'] = isset($q['m']) ? (int) $q['m'] : 0; + $q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0; $post_stati = array( // array( adj, noun ) - 'publish' => array(__('Published'), __('Published posts'), __ngettext_noop('Published (%s)', 'Published (%s)')), - 'future' => array(__('Scheduled'), __('Scheduled posts'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')), - 'pending' => array(__('Pending Review'), __('Pending posts'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')), - 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')), - 'private' => array(__('Private'), __('Private posts'), __ngettext_noop('Private (%s)', 'Private (%s)')), + 'publish' => array(__('Published'), __('Published posts'), __ngettext_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>')), + 'future' => array(__('Scheduled'), __('Scheduled posts'), __ngettext_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')), + 'pending' => array(__('Pending Review'), __('Pending posts'), __ngettext_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>')), + 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')), + 'private' => array(__('Private'), __('Private posts'), __ngettext_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')), ); $post_stati = apply_filters('post_stati', $post_stati); @@ -503,10 +791,10 @@ function wp_edit_posts_query( $q = false ) { $post_status_q .= '&perm=readable'; } - if ( 'pending' === $q['post_status'] ) { + if ( isset($q['post_status']) && 'pending' === $q['post_status'] ) { $order = 'ASC'; $orderby = 'modified'; - } elseif ( 'draft' === $q['post_status'] ) { + } elseif ( isset($q['post_status']) && 'draft' === $q['post_status'] ) { $order = 'DESC'; $orderby = 'modified'; } else { @@ -519,6 +807,14 @@ function wp_edit_posts_query( $q = false ) { return array($post_stati, $avail_post_stati); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $type + * @return unknown + */ function get_available_post_mime_types($type = 'attachment') { global $wpdb; @@ -526,19 +822,27 @@ function get_available_post_mime_types($type = 'attachment') { return $types; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $q + * @return unknown + */ function wp_edit_attachments_query( $q = false ) { - global $wpdb; if ( false === $q ) $q = $_GET; - $q['m'] = (int) $q['m']; - $q['cat'] = (int) $q['cat']; + + $q['m'] = isset( $q['m'] ) ? (int) $q['m'] : 0; + $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0; $q['post_type'] = 'attachment'; $q['post_status'] = 'any'; $q['posts_per_page'] = 15; $post_mime_types = array( // array( adj, noun ) - 'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image (%s)', 'Images (%s)')), - 'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio (%s)', 'Audio (%s)')), - 'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video (%s)', 'Video (%s)')), + 'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')), + 'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')), + 'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')), ); $post_mime_types = apply_filters('post_mime_types', $post_mime_types); @@ -552,17 +856,37 @@ function wp_edit_attachments_query( $q = false ) { return array($post_mime_types, $avail_post_mime_types); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @param unknown_type $page + * @return unknown + */ function postbox_classes( $id, $page ) { + if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) + return ''; $current_user = wp_get_current_user(); - if ( $closed = get_usermeta( $current_user->ID, 'closedpostboxes_'.$page ) ) { + if ( $closed = get_user_option('closedpostboxes_'.$page, 0, false ) ) { if ( !is_array( $closed ) ) return ''; return in_array( $id, $closed )? 'if-js-closed' : ''; } else { - if ( 'tagsdiv' == $id || 'categorydiv' == $id ) return ''; - else return 'if-js-closed'; + return ''; } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @param unknown_type $title + * @param unknown_type $name + * @return unknown + */ function get_sample_permalink($id, $title=null, $name = null) { $post = &get_post($id); if (!$post->ID) { @@ -576,8 +900,7 @@ function get_sample_permalink($id, $title=null, $name = null) { // drafts, so we will fake, that our post is published if (in_array($post->post_status, array('draft', 'pending'))) { $post->post_status = 'publish'; - $post->post_date = date('Y-m-d H:i:s'); - $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID); + $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID); } // If the user wants to set a new name -- override the current one @@ -606,6 +929,16 @@ function get_sample_permalink($id, $title=null, $name = null) { return $permalink; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @param unknown_type $new_title + * @param unknown_type $new_slug + * @return unknown + */ function get_sample_permalink_html($id, $new_title=null, $new_slug=null) { $post = &get_post($id); list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug); @@ -613,20 +946,34 @@ function get_sample_permalink_html($id, $new_title=null, $new_slug=null) { return ''; } $title = __('Click to edit this part of the permalink'); - if (strlen($post_name) > 30) { - $post_name_abridged = substr($post_name, 0, 14). '&hellip;' . substr($post_name, -14); + if (function_exists('mb_strlen')) { + if (mb_strlen($post_name) > 30) { + $post_name_abridged = mb_substr($post_name, 0, 14). '&hellip;' . mb_substr($post_name, -14); + } else { + $post_name_abridged = $post_name; + } } else { - $post_name_abridged = $post_name; + if (strlen($post_name) > 30) { + $post_name_abridged = substr($post_name, 0, 14). '&hellip;' . substr($post_name, -14); + } else { + $post_name_abridged = $post_name; + } } $post_name_html = '<span id="editable-post-name" title="'.$title.'">'.$post_name_abridged.'</span><span id="editable-post-name-full">'.$post_name.'</span>'; $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink); $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $display_link . "</span>\n"; - $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug" onclick="edit_permalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n"; + $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button" onclick="edit_permalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n"; return $return; } -// false: not locked or locked by current user -// int: user ID of user with lock +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post_id + * @return bool|int False: not locked or locked by current user. Int: user ID of user with lock. + */ function wp_check_post_lock( $post_id ) { global $current_user; @@ -643,6 +990,14 @@ function wp_check_post_lock( $post_id ) { return false; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post_id + * @return unknown + */ function wp_set_post_lock( $post_id ) { global $current_user; if ( !$post = get_post( $post_id ) ) @@ -659,11 +1014,11 @@ function wp_set_post_lock( $post_id ) { } /** - * wp_create_post_autosave() - creates autosave data for the specified post from $_POST data + * Creates autosave data for the specified post from $_POST data. * * @package WordPress - * @subpackage Post Revisions - * @since 2.6 + * @subpackage Post_Revisions + * @since 2.6.0 * * @uses _wp_translate_postdata() * @uses _wp_post_revision_fields() @@ -683,3 +1038,312 @@ function wp_create_post_autosave( $post_id ) { // Otherwise create the new autosave as a special post revision return _wp_put_post_revision( $_POST, true ); } + +/** + * Save draft or manually autosave for showing preview. + * + * @package WordPress + * @since 2.7 + * + * @uses wp_write_post() + * @uses edit_post() + * @uses get_post() + * @uses current_user_can() + * @uses wp_create_post_autosave() + * + * @return str URL to redirect to show the preview + */ +function post_preview() { + + $post_ID = (int) $_POST['post_ID']; + if ( $post_ID < 1 ) + wp_die( __('Preview not available. Please save as a draft first.') ); + + if ( isset($_POST['catslist']) ) + $_POST['post_category'] = explode(",", $_POST['catslist']); + + if ( isset($_POST['tags_input']) ) + $_POST['tags_input'] = explode(",", $_POST['tags_input']); + + if ( $_POST['post_type'] == 'page' || empty($_POST['post_category']) ) + unset($_POST['post_category']); + + $_POST['ID'] = $post_ID; + $post = get_post($post_ID); + + if ( 'page' == $post->post_type ) { + if ( !current_user_can('edit_page', $post_ID) ) + wp_die(__('You are not allowed to edit this page.')); + } else { + if ( !current_user_can('edit_post', $post_ID) ) + wp_die(__('You are not allowed to edit this post.')); + } + + if ( 'draft' == $post->post_status ) { + $id = edit_post(); + } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. + $id = wp_create_post_autosave( $post->ID ); + if ( ! is_wp_error($id) ) + $id = $post->ID; + } + + if ( is_wp_error($id) ) + wp_die( $id->get_error_message() ); + + if ( $_POST['post_status'] == 'draft' ) { + $url = add_query_arg( 'preview', 'true', get_permalink($id) ); + } else { + $nonce = wp_create_nonce('post_preview_' . $id); + $url = add_query_arg( array( 'preview' => 'true', 'preview_id' => $id, 'preview_nonce' => $nonce ), get_permalink($id) ); + } + + return $url; +} + +/** + * Adds the TinyMCE editor used on the Write and Edit screens. + * + * Has option to output a trimmed down version used in Press This. + * + * @package WordPress + * @since 2.7 + */ +function wp_tiny_mce( $teeny = false ) { + if ( ! user_can_richedit() ) + return; + + $baseurl = includes_url('js/tinymce'); + + $mce_css = $baseurl . '/wordpress.css'; + $mce_css = apply_filters('mce_css', $mce_css); + + $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1 + + /* + The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu. + By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server. + The + sign marks the default language. More information: + http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker + */ + $mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv'); + + if ( $teeny ) { + $plugins = apply_filters( 'teeny_mce_plugins', array('safari', 'inlinepopups', 'media', 'autosave', 'fullscreen') ); + $ext_plugins = ''; + } else { + $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage', 'wpgallery' ); + + /* + The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'. + It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin. + The url should be absolute and should include the js file name to be loaded. Example: + array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' ) + If the plugin uses a button, it should be added with one of the "$mce_buttons" filters. + */ + $mce_external_plugins = apply_filters('mce_external_plugins', array()); + + $ext_plugins = "\n"; + if ( ! empty($mce_external_plugins) ) { + + /* + The following filter loads external language files for TinyMCE plugins. + It takes an associative array 'plugin_name' => 'path', where path is the + include path to the file. The language file should follow the same format as + /tinymce/langs/wp-langs.php and should define a variable $strings that + holds all translated strings. + When this filter is not used, the function will try to load {mce_locale}.js. + If that is not found, en.js will be tried next. + */ + $mce_external_languages = apply_filters('mce_external_languages', array()); + + $loaded_langs = array(); + $strings = ''; + + if ( ! empty($mce_external_languages) ) { + foreach ( $mce_external_languages as $name => $path ) { + if ( is_file($path) && is_readable($path) ) { + include_once($path); + $ext_plugins .= $strings; + $loaded_langs[] = $name; + } + } + } + + foreach ( $mce_external_plugins as $name => $url ) { + + if ( is_ssl() ) $url = str_replace('http://', 'https://', $url); + + $plugins[] = '-' . $name; + + $plugurl = dirname($url); + $strings = $str1 = $str2 = ''; + if ( ! in_array($name, $loaded_langs) ) { + $path = str_replace( WP_PLUGIN_URL, '', $plugurl ); + $path = WP_PLUGIN_DIR . $path . '/langs/'; + + if ( function_exists('realpath') ) + $path = trailingslashit( realpath($path) ); + + if ( is_file($path . $mce_locale . '.js') ) + $strings .= @file_get_contents($path . $mce_locale . '.js'); + + if ( is_file($path . $mce_locale . '_dlg.js') ) + $strings .= @file_get_contents($path . $mce_locale . '_dlg.js'); + + if ( 'en' != $mce_locale && empty($strings) ) { + if ( is_file($path . 'en.js') ) { + $str1 = @file_get_contents($path . 'en.js'); + $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ); + } + + if ( is_file($path . 'en_dlg.js') ) { + $str2 = @file_get_contents($path . 'en_dlg.js'); + $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ); + } + } + + if ( ! empty($strings) ) + $ext_plugins .= "\n" . $strings . "\n"; + } + + $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n"; + $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n"; + } + } + } + + $plugins = implode($plugins, ','); + + if ( $teeny ) { + $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold, italic, underline, blockquote, separator, strikethrough, bullist, numlist,justifyleft, justifycenter, justifyright, undo, redo, link, unlink, fullscreen') ); + $mce_buttons = implode($mce_buttons, ','); + $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = ''; + } else { + $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' )); + $mce_buttons = implode($mce_buttons, ','); + + $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' )); + $mce_buttons_2 = implode($mce_buttons_2, ','); + + $mce_buttons_3 = apply_filters('mce_buttons_3', array()); + $mce_buttons_3 = implode($mce_buttons_3, ','); + + $mce_buttons_4 = apply_filters('mce_buttons_4', array()); + $mce_buttons_4 = implode($mce_buttons_4, ','); + } + $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false; + + // TinyMCE init settings + $initArray = array ( + 'mode' => 'none', + 'onpageload' => 'switchEditors.edInit', + 'width' => '100%', + 'theme' => 'advanced', + 'skin' => 'wp_theme', + 'theme_advanced_buttons1' => "$mce_buttons", + 'theme_advanced_buttons2' => "$mce_buttons_2", + 'theme_advanced_buttons3' => "$mce_buttons_3", + 'theme_advanced_buttons4' => "$mce_buttons_4", + 'language' => "$mce_locale", + 'spellchecker_languages' => "$mce_spellchecker_languages", + 'theme_advanced_toolbar_location' => 'top', + 'theme_advanced_toolbar_align' => 'left', + 'theme_advanced_statusbar_location' => 'bottom', + 'theme_advanced_resizing' => true, + 'theme_advanced_resize_horizontal' => false, + 'dialog_type' => 'modal', + 'relative_urls' => false, + 'remove_script_host' => false, + 'convert_urls' => false, + 'apply_source_formatting' => false, + 'remove_linebreaks' => true, + 'paste_convert_middot_lists' => true, + 'paste_remove_spans' => true, + 'paste_remove_styles' => true, + 'gecko_spellcheck' => true, + 'entities' => '38,amp,60,lt,62,gt', + 'accessibility_focus' => true, + 'tab_focus' => ':prev,:next', + 'content_css' => "$mce_css", + 'save_callback' => 'switchEditors.saveCallback', + 'wpeditimage_disable_captions' => $no_captions, + 'plugins' => "$plugins" + ); + + // For people who really REALLY know what they're doing with TinyMCE + // You can modify initArray to add, remove, change elements of the config before tinyMCE.init + // Setting "valid_elements", "invalid_elements" and "extended_valid_elements" can be done through "tiny_mce_before_init". + // Best is to use the default cleanup by not specifying valid_elements, as TinyMCE contains full set of XHTML 1.0. + if ( $teeny ) { + $initArray = apply_filters('teeny_mce_before_init', $initArray); + } else { + $initArray = apply_filters('tiny_mce_before_init', $initArray); + } + + $language = $initArray['language']; + + $ver = apply_filters('tiny_mce_version', '3101'); + + if ( 'en' != $language ) + include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php'); + + $mce_options = ''; + foreach ( $initArray as $k => $v ) + $mce_options .= $k . ':"' . $v . '", '; + + $mce_options = rtrim( trim($mce_options), '\n\r,' ); ?> + +<script type="text/javascript"> +/* <![CDATA[ */ +tinyMCEPreInit = { + base : "<?php echo $baseurl; ?>", + suffix : "", + query : "ver=<?php echo $ver; ?>", + mceInit : {<?php echo $mce_options; ?>}, + + go : function() { + var t = this, sl = tinymce.ScriptLoader, ln = t.mceInit.language, th = t.mceInit.theme, pl = t.mceInit.plugins; + + sl.markDone(t.base + '/langs/' + ln + '.js'); + + sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '.js'); + sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '_dlg.js'); + + tinymce.each(pl.split(','), function(n) { + if (n && n.charAt(0) != '-') { + sl.markDone(t.base + '/plugins/' + n + '/langs/' + ln + '.js'); + sl.markDone(t.base + '/plugins/' + n + '/langs/' + ln + '_dlg.js'); + } + }); + }, + + load_ext : function(url,lang) { + var sl = tinymce.ScriptLoader; + + sl.markDone(url + '/langs/' + lang + '.js'); + sl.markDone(url + '/langs/' + lang + '_dlg.js'); + } +}; +/* ]]> */ +</script> +<script type="text/javascript" src="<?php echo $baseurl; ?>/tiny_mce.js?ver=<?php echo $ver; ?>"></script> +<?php if ( 'en' != $language && isset($lang) ) { ?> +<script type="text/javascript"> +<?php echo $lang; ?> +</script> +<?php } else { ?> +<script type="text/javascript" src="<?php echo $baseurl; ?>/langs/wp-langs-en.js?ver=<?php echo $ver; ?>"></script> +<?php } ?> +<script type="text/javascript"> +<?php if ( $ext_plugins ) echo $ext_plugins; ?> + +// Mark translations as done +tinyMCEPreInit.go(); + +// Init +tinyMCE.init(tinyMCEPreInit.mceInit); +</script> + +<?php +} +?> \ No newline at end of file wp-admin/includes/post.php @@ -1,19 +1,33 @@ <?php -// Here we keep the DB structure and option values - +/** + * WordPress Administration Scheme API + * + * Here we keep the DB structure and option values. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * The database character collate. + * @var string + * @global string + * @name $charset_collate + */ $charset_collate = ''; // Declare these as global in case schema.php is included from a function. global $wpdb, $wp_queries; -if ( $wpdb->supports_collation() ) { +if ( $wpdb->has_cap( 'collation' ) ) { if ( ! empty($wpdb->charset) ) $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset"; if ( ! empty($wpdb->collate) ) $charset_collate .= " COLLATE $wpdb->collate"; } -$wp_queries="CREATE TABLE $wpdb->terms ( +/** Create WordPress database tables SQL */ +$wp_queries = "CREATE TABLE $wpdb->terms ( term_id bigint(20) NOT NULL auto_increment, name varchar(200) NOT NULL default '', slug varchar(200) NOT NULL default '', @@ -125,7 +139,8 @@ CREATE TABLE $wpdb->posts ( comment_count bigint(20) NOT NULL default '0', PRIMARY KEY (ID), KEY post_name (post_name), - KEY type_status_date (post_type,post_status,post_date,ID) + KEY type_status_date (post_type,post_status,post_date,ID), + KEY post_parent (post_parent) ) $charset_collate; CREATE TABLE $wpdb->users ( ID bigint(20) unsigned NOT NULL auto_increment, @@ -152,13 +167,20 @@ CREATE TABLE $wpdb->usermeta ( KEY meta_key (meta_key) ) $charset_collate;"; +/** + * Create WordPress options and set the default values. + * + * @since 1.5.0 + * @uses $wpdb + * @uses $wp_db_version + */ function populate_options() { global $wpdb, $wp_db_version; - + $guessurl = wp_guess_url(); - + do_action('populate_options'); - + add_option('siteurl', $guessurl); add_option('blogname', __('My Blog')); add_option('blogdescription', __('Just another WordPress weblog')); @@ -257,7 +279,29 @@ function populate_options() { add_option('avatar_default', 'mystery'); add_option('enable_app', 0); add_option('enable_xmlrpc', 0); - + + // 2.7 + add_option('large_size_w', 1024); + add_option('large_size_h', 1024); + add_option('image_default_link_type', 'file'); + add_option('image_default_size', ''); + add_option('image_default_align', ''); + add_option('close_comments_for_old_posts', 0); + add_option('close_comments_days_old', 14); + add_option('thread_comments', 0); + add_option('thread_comments_depth', 5); + add_option('page_comments', 1); + add_option('comments_per_page', 50); + add_option('default_comments_page', 'newest'); + add_option('comment_order', 'asc'); + add_option('use_ssl', 0); + add_option('sticky_posts', array()); + add_option('widget_categories', array()); + add_option('widget_text', array()); + add_option('widget_rss', array()); + add_option('update_core', array()); + add_option('dismissed_update_core', array()); + // Delete unused options $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins'); foreach ($unusedoptions as $option) : @@ -271,14 +315,25 @@ function populate_options() { endforeach; } +/** + * Execute WordPress role creation for the various WordPress versions. + * + * @since 2.0.0 + */ function populate_roles() { populate_roles_160(); populate_roles_210(); populate_roles_230(); populate_roles_250(); populate_roles_260(); + populate_roles_270(); } +/** + * Create the roles for WordPress 2.0 + * + * @since 2.0.0 + */ function populate_roles_160() { // Add roles @@ -374,6 +429,11 @@ function populate_roles_160() { $role->add_cap('level_0'); } +/** + * Create and modify WordPress roles for WordPress 2.1. + * + * @since 2.1.0 + */ function populate_roles_210() { $roles = array('administrator', 'editor'); foreach ($roles as $role) { @@ -416,6 +476,11 @@ function populate_roles_210() { } } +/** + * Create and modify WordPress roles for WordPress 2.3. + * + * @since 2.3.0 + */ function populate_roles_230() { $role = get_role( 'administrator' ); @@ -424,6 +489,11 @@ function populate_roles_230() { } } +/** + * Create and modify WordPress roles for WordPress 2.5. + * + * @since 2.5.0 + */ function populate_roles_250() { $role = get_role( 'administrator' ); @@ -432,6 +502,11 @@ function populate_roles_250() { } } +/** + * Create and modify WordPress roles for WordPress 2.6. + * + * @since 2.6.0 + */ function populate_roles_260() { $role = get_role( 'administrator' ); @@ -441,4 +516,18 @@ function populate_roles_260() { } } +/** + * Create and modify WordPress roles for WordPress 2.7. + * + * @since 2.7.0 + */ +function populate_roles_270() { + $role = get_role( 'administrator' ); + + if ( !empty( $role ) ) { + $role->add_cap( 'install_plugins' ); + $role->add_cap( 'update_themes' ); + } +} + ?> wp-admin/includes/schema.php @@ -1,9 +1,23 @@ <?php +/** + * WordPress Taxonomy Administration API. + * + * @package WordPress + * @subpackage Administration + */ // // Category // +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $cat_name + * @return unknown + */ function category_exists($cat_name) { $id = is_term($cat_name, 'category'); if ( is_array($id) ) @@ -11,11 +25,28 @@ function category_exists($cat_name) { return $id; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @return unknown + */ function get_category_to_edit( $id ) { $category = get_category( $id, OBJECT, 'edit' ); return $category; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $cat_name + * @param unknown_type $parent + * @return unknown + */ function wp_create_category( $cat_name, $parent = 0 ) { if ( $id = category_exists($cat_name) ) return $id; @@ -23,6 +54,15 @@ function wp_create_category( $cat_name, $parent = 0 ) { return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $categories + * @param unknown_type $post_id + * @return unknown + */ function wp_create_categories($categories, $post_id = '') { $cat_ids = array (); foreach ($categories as $category) { @@ -39,6 +79,14 @@ function wp_create_categories($categories, $post_id = '') { return $cat_ids; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $cat_ID + * @return unknown + */ function wp_delete_category($cat_ID) { $cat_ID = (int) $cat_ID; $default = get_option('default_category'); @@ -50,9 +98,18 @@ function wp_delete_category($cat_ID) { return wp_delete_term($cat_ID, 'category', array('default' => $default)); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $catarr + * @param unknown_type $wp_error + * @return unknown + */ function wp_insert_category($catarr, $wp_error = false) { $cat_defaults = array('cat_ID' => 0, 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => ''); - $cat_arr = wp_parse_args($cat_arr, $cat_defaults); + $catarr = wp_parse_args($catarr, $cat_defaults); extract($catarr, EXTR_SKIP); if ( trim( $cat_name ) == '' ) { @@ -99,10 +156,18 @@ function wp_insert_category($catarr, $wp_error = false) { return $cat_ID['term_id']; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $catarr + * @return unknown + */ function wp_update_category($catarr) { $cat_ID = (int) $catarr['cat_ID']; - if ( $cat_ID == $catarr['category_parent'] ) + if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) ) return false; // First, get all of the original fields @@ -121,6 +186,14 @@ function wp_update_category($catarr) { // Tags // +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post_id + * @return unknown + */ function get_tags_to_edit( $post_id ) { $post_id = (int) $post_id; if ( !$post_id ) @@ -139,10 +212,26 @@ function get_tags_to_edit( $post_id ) { return $tags_to_edit; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $tag_name + * @return unknown + */ function tag_exists($tag_name) { return is_term($tag_name, 'post_tag'); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $tag_name + * @return unknown + */ function wp_create_tag($tag_name) { if ( $id = tag_exists($tag_name) ) return $id; wp-admin/includes/taxonomy.php @@ -1,15 +1,43 @@ <?php - -// -// Big Mess -// +/** + * Template WordPress Administration API. + * + * A Big Mess. Also some neat functions that are nicely written. + * + * @package WordPress + * @subpackage Administration + */ // Ugly recursive category stuff. +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $parent + * @param unknown_type $level + * @param unknown_type $categories + * @param unknown_type $page + * @param unknown_type $per_page + */ function cat_rows( $parent = 0, $level = 0, $categories = 0, $page = 1, $per_page = 20 ) { $count = 0; _cat_rows($categories, $count, $parent, $level, $page, $per_page); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $categories + * @param unknown_type $count + * @param unknown_type $parent + * @param unknown_type $level + * @param unknown_type $page + * @param unknown_type $per_page + * @return unknown + */ function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $per_page = 20 ) { if ( empty($categories) ) { $args = array('hide_empty' => 0); @@ -39,7 +67,6 @@ function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $p // If the page starts in a subtree, print the parents. if ( $count == $start && $category->parent > 0 ) { $my_parents = array(); - $my_parent = $category->parent; while ( $my_parent) { $my_parent = get_category($my_parent); $my_parents[] = $my_parent; @@ -57,7 +84,7 @@ function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $p if ( $count >= $start ) echo "\t" . _cat_row( $category, $level ); - unset($categories[$i]); // Prune the working set + unset($categories[$i]); // Prune the working set $count++; if ( isset($children[$category->term_id]) ) @@ -68,83 +95,284 @@ function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $p $output = ob_get_contents(); ob_end_clean(); - $output = apply_filters('cat_rows', $output); - echo $output; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $category + * @param unknown_type $level + * @param unknown_type $name_override + * @return unknown + */ function _cat_row( $category, $level, $name_override = false ) { - global $class; + static $row_class = ''; - $category = get_category( $category ); + $category = get_category( $category, OBJECT, 'display' ); + $default_cat_id = (int) get_option( 'default_category' ); $pad = str_repeat( '&#8212; ', $level ); $name = ( $name_override ? $name_override : $pad . ' ' . $category->name ); + $edit_link = "categories.php?action=edit&amp;cat_ID=$category->term_id"; if ( current_user_can( 'manage_categories' ) ) { - $edit = "<a class='row-title' href='categories.php?action=edit&amp;cat_ID=$category->term_id' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>$name</a>"; + $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>" . attribute_escape( $name ) . '</a><br />'; + $actions = array(); + $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; + $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; + if ( $default_cat_id != $category->term_id ) + $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + $action_count = count($actions); + $i = 0; + $edit .= '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + $edit .= "<span class='$action'>$link$sep</span>"; + } + $edit .= '</div>'; } else { $edit = $name; } - $class = " class='alternate'" == $class ? '' : " class='alternate'"; + $row_class = 'alternate' == $row_class ? '' : 'alternate'; + $qe_data = get_category_to_edit($category->term_id); $category->count = number_format_i18n( $category->count ); $posts_count = ( $category->count > 0 ) ? "<a href='edit.php?cat=$category->term_id'>$category->count</a>" : $category->count; - $output = "<tr id='cat-$category->term_id'$class> - <th scope='row' class='check-column'>"; - if ( absint(get_option( 'default_category' ) ) != $category->term_id ) { - $output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />"; - } else { - $output .= "&nbsp;"; + $output = "<tr id='cat-$category->term_id' class='iedit $row_class'>"; + + $columns = get_column_headers('categories'); + $hidden = get_hidden_columns('categories'); + foreach ( $columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; + + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; + + switch ($column_name) { + case 'cb': + $output .= "<th scope='row' class='check-column'>"; + if ( $default_cat_id != $category->term_id ) { + $output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />"; + } else { + $output .= "&nbsp;"; + } + $output .= '</th>'; + break; + case 'name': + $output .= "<td $attributes>$edit"; + $output .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">'; + $output .= '<div class="name">' . $qe_data->name . '</div>'; + $output .= '<div class="slug">' . $qe_data->slug . '</div>'; + $output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>'; + break; + case 'description': + $output .= "<td $attributes>$category->description</td>"; + break; + case 'slug': + $output .= "<td $attributes>$category->slug</td>"; + break; + case 'posts': + $attributes = 'class="posts column-posts num"' . $style; + $output .= "<td $attributes>$posts_count</td>\n"; + } } - $output .= "</th> - <td>$edit</td> - <td>$category->description</td> - <td class='num'>$posts_count</td>\n\t</tr>\n"; + $output .= '</tr>'; - return apply_filters('cat_row', $output); + return $output; } -function link_cat_row( $category ) { - global $class; +/** + * {@internal Missing Short Description}} + * + * @since 2.7 + * + * Outputs the HTML for the hidden table rows used in Categories, Link Caregories and Tags quick edit. + * + * @param string $type "tag", "category" or "link-category" + * @return + */ +function inline_edit_term_row($type) { + + if ( ! current_user_can( 'manage_categories' ) ) + return; + + $is_tag = $type == 'edit-tags'; + $columns = get_column_headers($type); + $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) ); + $col_count = count($columns) - count($hidden); + ?> + +<form method="get" action=""><table style="display: none"><tbody id="inlineedit"> + <tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>"> + + <fieldset><div class="inline-edit-col"> + <h4><?php _e( 'Quick Edit' ); ?></h4> + + <label> + <span class="title"><?php _e( 'Name' ); ?></span> + <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span> + </label> + + <label> + <span class="title"><?php _e( 'Slug' ); ?></span> + <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span> + </label> + +<?php if ( 'category' == $type ) : ?> + + <label> + <span class="title"><?php _e( 'Parent' ); ?></span> + <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?> + </label> + +<?php endif; // $type ?> + + </div></fieldset> - if ( !$category = get_term( $category, 'link_category' ) ) +<?php + + $core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true ); + + foreach ( $columns as $column_name => $column_display_name ) { + if ( isset( $core_columns[$column_name] ) ) + continue; + do_action( 'quick_edit_custom_box', $column_name, $type ); + } + +?> + + <p class="inline-edit-save submit"> + <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a> + <?php $update_text = ( $is_tag ) ? __( 'Update Tag' ) : __( 'Update Category' ); ?> + <a accesskey="s" href="#inline-edit" title="<?php echo attribute_escape( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a> + <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /> + <span class="error" style="display:none;"></span> + <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?> + <br class="clear" /> + </p> + </td></tr> + </tbody></table></form> +<?php +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $category + * @param unknown_type $name_override + * @return unknown + */ +function link_cat_row( $category, $name_override = false ) { + static $row_class = ''; + + if ( !$category = get_term( $category, 'link_category', OBJECT, 'display' ) ) return false; if ( is_wp_error( $category ) ) return $category; + $default_cat_id = (int) get_option( 'default_link_category' ); $name = ( $name_override ? $name_override : $category->name ); + $edit_link = "link-category.php?action=edit&amp;cat_ID=$category->term_id"; if ( current_user_can( 'manage_categories' ) ) { - $edit = "<a class='row-title' href='link-category.php?action=edit&amp;cat_ID=$category->term_id' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "' class='edit'>$name</a>"; - $default_cat_id = (int) get_option( 'default_link_category' ); + $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>$name</a><br />"; + $actions = array(); + $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; + $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; + if ( $default_cat_id != $category->term_id ) + $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + $action_count = count($actions); + $i = 0; + $edit .= '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + $edit .= "<span class='$action'>$link$sep</span>"; + } + $edit .= '</div>'; } else { $edit = $name; } - $class = " class='alternate'" == $class ? '' : " class='alternate'"; + $row_class = 'alternate' == $row_class ? '' : 'alternate'; + $qe_data = get_term_to_edit($category->term_id, 'link_category'); $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' class='check-column'>"; - if ( absint( get_option( 'default_link_category' ) ) != $category->term_id ) { - $output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />"; - } else { - $output .= "&nbsp;"; + $output = "<tr id='link-cat-$category->term_id' class='iedit $row_class'>"; + $columns = get_column_headers('edit-link-categories'); + $hidden = get_hidden_columns('edit-link-categories'); + foreach ( $columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; + + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; + + switch ($column_name) { + case 'cb': + $output .= "<th scope='row' class='check-column'>"; + if ( absint( get_option( 'default_link_category' ) ) != $category->term_id ) { + $output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />"; + } else { + $output .= "&nbsp;"; + } + $output .= "</th>"; + break; + case 'name': + $output .= "<td $attributes>$edit"; + $output .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">'; + $output .= '<div class="name">' . $qe_data->name . '</div>'; + $output .= '<div class="slug">' . $qe_data->slug . '</div>'; + $output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>'; + break; + case 'description': + $output .= "<td $attributes>$category->description</td>"; + break; + case 'slug': + $output .= "<td $attributes>$category->slug</td>"; + break; + case 'links': + $attributes = 'class="links column-links num"' . $style; + $output .= "<td $attributes>$count</td>"; + } } - $output .= "</th> - <td>$edit</td> - <td>$category->description</td> - <td class='num'>$count</td></tr>"; + $output .= '</tr>'; - return apply_filters( 'link_cat_row', $output ); + return $output; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $checked + * @param unknown_type $current + */ function checked( $checked, $current) { if ( $checked == $current) echo ' checked="checked"'; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $selected + * @param unknown_type $current + */ function selected( $selected, $current) { if ( $selected == $current) echo ' selected="selected"'; @@ -154,12 +382,27 @@ function selected( $selected, $current) { // Category Checklists // -// Deprecated. Use wp_link_category_checklist +/** + * {@internal Missing Short Description}} + * + * @since unknown + * @deprecated Use {@link wp_link_category_checklist()} + * @see wp_link_category_checklist() + * + * @param unknown_type $default + * @param unknown_type $parent + * @param unknown_type $popular_ids + */ function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) { global $post_ID; wp_category_checklist($post_ID); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ class Walker_Category_Checklist extends Walker { var $tree_type = 'category'; var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this @@ -178,7 +421,7 @@ class Walker_Category_Checklist extends Walker { extract($args); $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : ''; - $output .= "\n<li id='category-$category->term_id'$class>" . '<label for="in-category-' . $category->term_id . '" class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="post_category[]" id="in-category-' . $category->term_id . '"' . (in_array( $category->term_id, $selected_cats ) ? ' checked="checked"' : "" ) . '/> ' . wp_specialchars( apply_filters('the_category', $category->name )) . '</label>'; + $output .= "\n<li id='category-$category->term_id'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="post_category[]" id="in-category-' . $category->term_id . '"' . (in_array( $category->term_id, $selected_cats ) ? ' checked="checked"' : "" ) . '/> ' . wp_specialchars( apply_filters('the_category', $category->name )) . '</label>'; } function end_el(&$output, $category, $depth, $args) { @@ -186,12 +429,22 @@ class Walker_Category_Checklist extends Walker { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post_id + * @param unknown_type $descendants_and_self + * @param unknown_type $selected_cats + * @param unknown_type $popular_cats + */ function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false ) { $walker = new Walker_Category_Checklist; $descendants_and_self = (int) $descendants_and_self; $args = array(); - + if ( is_array( $selected_cats ) ) $args['selected_cats'] = $selected_cats; elseif ( $post_id ) @@ -227,6 +480,17 @@ function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $select echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args)); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $taxonomy + * @param unknown_type $default + * @param unknown_type $number + * @param unknown_type $echo + * @return unknown + */ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) { global $post_ID; if ( $post_ID ) @@ -244,7 +508,7 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech ?> <li id="<?php echo $id; ?>" class="popular-category"> - <label class="selectit" for="in-<?php echo $id; ?>"> + <label class="selectit"> <input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" /> <?php echo wp_specialchars( apply_filters( 'the_category', $category->name ) ); ?> </label> @@ -255,14 +519,31 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech return $popular_ids; } -// Deprecated. Use wp_link_category_checklist +/** + * {@internal Missing Short Description}} + * + * @since unknown + * @deprecated Use {@link wp_link_category_checklist()} + * @see wp_link_category_checklist() + * + * @param unknown_type $default + */ function dropdown_link_categories( $default = 0 ) { global $link_id; wp_link_category_checklist($link_id); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $link_id + */ function wp_link_category_checklist( $link_id = 0 ) { + $default = 1; + if ( $link_id ) { $checked_categories = wp_get_link_cats($link_id); @@ -291,18 +572,68 @@ function wp_link_category_checklist( $link_id = 0 ) { // Returns a single tag row (see tag_rows below) // Note: this is also used in admin-ajax.php! +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $tag + * @param unknown_type $class + * @return unknown + */ function _tag_row( $tag, $class = '' ) { $count = number_format_i18n( $tag->count ); $count = ( $count > 0 ) ? "<a href='edit.php?tag=$tag->slug'>$count</a>" : $count; $name = apply_filters( 'term_name', $tag->name ); + $qe_data = get_term($tag->term_id, 'post_tag', object, 'edit'); + $edit_link = "edit-tags.php?action=edit&amp;tag_ID=$tag->term_id"; $out = ''; $out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>'; - $out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>'; - $out .= '<td><strong><a class="row-title" href="edit-tags.php?action=edit&amp;tag_ID=' . $tag->term_id . '" title="' . attribute_escape(sprintf(__('Edit "%s"'), $name)) . '">' . - $name . '</a></td>'; + $columns = get_column_headers('edit-tags'); + $hidden = get_hidden_columns('edit-tags'); + foreach ( $columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; + + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; + + switch ($column_name) { + case 'cb': + $out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>'; + break; + case 'name': + $out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . attribute_escape(sprintf(__('Edit "%s"'), $name)) . '">' . $name . '</a></strong><br />'; + $actions = array(); + $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; + $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; + $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this tag '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + $action_count = count($actions); + $i = 0; + $out .= '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + $out .= "<span class='$action'>$link$sep</span>"; + } + $out .= '</div>'; + $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">'; + $out .= '<div class="name">' . $qe_data->name . '</div>'; + $out .= '<div class="slug">' . $qe_data->slug . '</div></div></td>'; + break; + case 'slug': + $out .= "<td $attributes>$tag->slug</td>"; + break; + case 'posts': + $attributes = 'class="posts column-posts num"' . $style; + $out .= "<td $attributes>$count</td>"; + break; + } + } - $out .= "<td class='num'>$count</td>"; $out .= '</tr>'; return $out; @@ -311,6 +642,16 @@ function _tag_row( $tag, $class = '' ) { // Outputs appropriate rows for the Nth page of the Tag Management screen, // assuming M tags displayed at a time on the page // Returns the number of tags displayed +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + * @param unknown_type $pagesize + * @param unknown_type $searchterms + * @return unknown + */ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '' ) { // Get a page worth of tags @@ -326,81 +667,846 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '' ) { // convert it to table rows $out = ''; - $class = ''; $count = 0; foreach( $tags as $tag ) - $out .= _tag_row( $tag, ++$count % 2 ? ' class="alternate"' : '' ); + $out .= _tag_row( $tag, ++$count % 2 ? ' class="iedit alternate"' : ' class="iedit"' ); // filter and send to screen - $out = apply_filters('tag_rows', $out); echo $out; return $count; } // define the columns to display, the syntax is 'internal name' => 'display name' +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function wp_manage_posts_columns() { $posts_columns = array(); $posts_columns['cb'] = '<input type="checkbox" />'; - if ( 'draft' === $_GET['post_status'] ) - $posts_columns['modified'] = __('Modified'); - elseif ( 'pending' === $_GET['post_status'] ) - $posts_columns['modified'] = __('Submitted'); - else - $posts_columns['date'] = __('Date'); - $posts_columns['title'] = __('Title'); + $posts_columns['title'] = _c('Post|noun'); $posts_columns['author'] = __('Author'); $posts_columns['categories'] = __('Categories'); $posts_columns['tags'] = __('Tags'); - if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) + if ( !isset($_GET['post_status']) || !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>'; - $posts_columns['status'] = __('Status'); + $posts_columns['date'] = __('Date'); $posts_columns = apply_filters('manage_posts_columns', $posts_columns); return $posts_columns; } // define the columns to display, the syntax is 'internal name' => 'display name' +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function wp_manage_media_columns() { $posts_columns = array(); $posts_columns['cb'] = '<input type="checkbox" />'; $posts_columns['icon'] = ''; - $posts_columns['media'] = _c('Media|media column header'); - $posts_columns['desc'] = _c('Description|media column header'); - $posts_columns['date'] = _c('Date Added|media column header'); - $posts_columns['parent'] = _c('Appears with|media column header'); + $posts_columns['media'] = _c('File|media column header'); + $posts_columns['author'] = __('Author'); + //$posts_columns['tags'] = _c('Tags|media column header'); + $posts_columns['parent'] = _c('Attached to|media column header'); $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>'; - $posts_columns['location'] = _c('Location|media column header'); + //$posts_columns['comments'] = __('Comments'); + $posts_columns['date'] = _c('Date|media column header'); $posts_columns = apply_filters('manage_media_columns', $posts_columns); return $posts_columns; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function wp_manage_pages_columns() { $posts_columns = array(); $posts_columns['cb'] = '<input type="checkbox" />'; - if ( 'draft' === $_GET['post_status'] ) - $posts_columns['modified'] = __('Modified'); - elseif ( 'pending' === $_GET['post_status'] ) - $posts_columns['modified'] = __('Submitted'); - else - $posts_columns['date'] = __('Date'); $posts_columns['title'] = __('Title'); $posts_columns['author'] = __('Author'); - if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) + $post_status = 'all'; + if ( !empty($_GET['post_status']) ) + $post_status = $_GET['post_status']; + if ( !in_array($post_status, array('pending', 'draft', 'future')) ) $posts_columns['comments'] = '<div class="vers"><img alt="" src="images/comment-grey-bubble.png" /></div>'; - $posts_columns['status'] = __('Status'); + $posts_columns['date'] = __('Date'); $posts_columns = apply_filters('manage_pages_columns', $posts_columns); return $posts_columns; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + * @return unknown + */ +function get_column_headers($page) { + global $_wp_column_headers; + + if ( !isset($_wp_column_headers) ) + $_wp_column_headers = array(); + + // Store in static to avoid running filters on each call + if ( isset($_wp_column_headers[$page]) ) + return $_wp_column_headers[$page]; + + switch ($page) { + case 'edit': + $_wp_column_headers[$page] = wp_manage_posts_columns(); + break; + case 'edit-pages': + $_wp_column_headers[$page] = wp_manage_pages_columns(); + break; + case 'edit-comments': + $_wp_column_headers[$page] = array( + 'cb' => '<input type="checkbox" />', + 'author' => __('Author'), + 'comment' => _c('Comment|noun'), + //'date' => __('Submitted'), + 'response' => __('In Response To') + ); + + break; + case 'link-manager': + $_wp_column_headers[$page] = array( + 'cb' => '<input type="checkbox" />', + 'name' => __('Name'), + 'url' => __('URL'), + 'categories' => __('Categories'), + 'rel' => __('rel'), + 'visible' => __('Visible') + ); + + break; + case 'upload': + $_wp_column_headers[$page] = wp_manage_media_columns(); + break; + case 'categories': + $_wp_column_headers[$page] = array( + 'cb' => '<input type="checkbox" />', + 'name' => __('Name'), + 'description' => __('Description'), + 'slug' => __('Slug'), + 'posts' => __('Posts') + ); + + break; + case 'edit-link-categories': + $_wp_column_headers[$page] = array( + 'cb' => '<input type="checkbox" />', + 'name' => __('Name'), + 'description' => __('Description'), + 'slug' => __('Slug'), + 'links' => __('Links') + ); + + break; + case 'edit-tags': + $_wp_column_headers[$page] = array( + 'cb' => '<input type="checkbox" />', + 'name' => __('Name'), + 'slug' => __('Slug'), + 'posts' => __('Posts') + ); + + break; + case 'users': + $_wp_column_headers[$page] = array( + 'cb' => '<input type="checkbox" />', + 'username' => __('Username'), + 'name' => __('Name'), + 'email' => __('E-mail'), + 'role' => __('Role'), + 'posts' => __('Posts') + ); + break; + default : + $_wp_column_headers[$page] = array(); + } + + $_wp_column_headers[$page] = apply_filters('manage_' . $page . '_columns', $_wp_column_headers[$page]); + return $_wp_column_headers[$page]; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $type + * @param unknown_type $id + */ +function print_column_headers( $type, $id = true ) { + $type = str_replace('.php', '', $type); + $columns = get_column_headers( $type ); + $hidden = get_hidden_columns($type); + $styles = array(); +// $styles['tag']['posts'] = 'width: 90px;'; +// $styles['link-category']['links'] = 'width: 90px;'; +// $styles['category']['posts'] = 'width: 90px;'; +// $styles['link']['visible'] = 'text-align: center;'; + + foreach ( $columns as $column_key => $column_display_name ) { + $class = ' class="manage-column'; + + $class .= " column-$column_key"; + + if ( 'cb' == $column_key ) + $class .= ' check-column'; + elseif ( in_array($column_key, array('posts', 'comments', 'links')) ) + $class .= ' num'; + + $class .= '"'; + + $style = ''; + if ( in_array($column_key, $hidden) ) + $style = 'display:none;'; + + if ( isset($styles[$type]) && isset($styles[$type][$column_key]) ) + $style .= ' ' . $styles[$type][$column_key]; + $style = ' style="' . $style . '"'; +?> + <th scope="col" <?php echo $id ? "id=\"$column_key\"" : ""; echo $class; echo $style; ?>><?php echo $column_display_name; ?></th> +<?php } +} + +/** + * Register column headers for a particular screen. The header names will be listed in the Screen Options. + * + * @since 2.7.0 + * + * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. + * @param array $columns An array of columns with column IDs as the keys and translated column names as the values + * @see get_column_headers(), print_column_headers(), get_hidden_columns() + */ +function register_column_headers($screen, $columns) { + global $_wp_column_headers; + + if ( !isset($_wp_column_headers) ) + $_wp_column_headers = array(); + + $_wp_column_headers[$screen] = $columns; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + */ +function get_hidden_columns($page) { + $page = str_replace('.php', '', $page); + return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false ); +} + +/** + * {@internal Missing Short Description}} + * + * Outputs the quick edit and bulk edit table rows for posts and pages + * + * @since 2.7 + * + * @param string $type 'post' or 'page' + */ +function inline_edit_row( $type ) { + global $current_user, $mode; + + $is_page = 'page' == $type; + if ( $is_page ) { + $screen = 'edit-pages'; + $post = get_default_page_to_edit(); + } else { + $screen = 'edit'; + $post = get_default_post_to_edit(); + } + + $columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns(); + $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) ); + $col_count = count($columns) - count($hidden); + $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list'; + $can_publish = current_user_can("publish_{$type}s"); + $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true ); + +?> + +<form method="get" action=""><table style="display: none"><tbody id="inlineedit"> + <?php + $bulk = 0; + while ( $bulk < 2 ) { ?> + + <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type "; + echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type"; + ?>" style="display: none"><td colspan="<?php echo $col_count; ?>"> + + <fieldset class="inline-edit-col-left"><div class="inline-edit-col"> + <h4><?php echo $bulk ? ( $is_page ? __( 'Bulk Edit Pages' ) : __( 'Bulk Edit Posts' ) ) : __( 'Quick Edit' ); ?></h4> + + +<?php if ( $bulk ) : ?> + <div id="bulk-title-div"> + <div id="bulk-titles"></div> + </div> + +<?php else : // $bulk ?> + + <label> + <span class="title"><?php _e( 'Title' ); ?></span> + <span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span> + </label> + +<?php endif; // $bulk ?> + + +<?php if ( !$bulk ) : ?> + + <label> + <span class="title"><?php _e( 'Slug' ); ?></span> + <span class="input-text-wrap"><input type="text" name="post_name" value="" /></span> + </label> + + <label><span class="title"><?php _e( 'Date' ); ?></span></label> + <div class="inline-edit-date"> + <?php touch_time(1, 1, 4, 1); ?> + </div> + <br class="clear" /> + +<?php endif; // $bulk + + ob_start(); + $authors = get_editable_user_ids( $current_user->id, true, $type ); // TODO: ROLE SYSTEM + if ( $authors && count( $authors ) > 1 ) : + $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1); + if ( $bulk ) + $users_opt['show_option_none'] = __('- No Change -'); +?> + <label> + <span class="title"><?php _e( 'Author' ); ?></span> + <?php wp_dropdown_users( $users_opt ); ?> + </label> + +<?php + endif; // authors + $authors_dropdown = ob_get_clean(); +?> + +<?php if ( !$bulk ) : echo $authors_dropdown; ?> + + <div class="inline-edit-group"> + <label class="alignleft"> + <span class="title"><?php _e( 'Password' ); ?></span> + <span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span> + </label> + + <em style="margin:5px 10px 0 0" class="alignleft"><?php echo _c( '&ndash;OR&ndash;|Between password field and private checkbox on post quick edit interface' ); ?></em> + + <label class="alignleft inline-edit-private"> + <input type="checkbox" name="keep_private" value="private" /> + <span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span> + </label> + </div> + +<?php endif; ?> + + </div></fieldset> + +<?php if ( !$is_page && !$bulk ) : ?> + + <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col"> + <span class="title inline-edit-categories-label"><?php _e( 'Categories' ); ?> + <span class="catshow"><?php _e('[more]'); ?></span> + <span class="cathide" style="display:none;"><?php _e('[less]'); ?></span> + </span> + <ul class="cat-checklist"> + <?php wp_category_checklist(); ?> + </ul> + </div></fieldset> + +<?php endif; // !$is_page && !$bulk ?> + + <fieldset class="inline-edit-col-right"><div class="inline-edit-col"> + +<?php + if ( $bulk ) + echo $authors_dropdown; +?> + +<?php if ( $is_page ) : ?> + + <label> + <span class="title"><?php _e( 'Parent' ); ?></span> +<?php + $dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title'); + if ( $bulk ) + $dropdown_args['show_option_no_change'] = __('- No Change -'); + $dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args); + wp_dropdown_pages($dropdown_args); +?> + </label> + +<?php if ( !$bulk ) : ?> + + <label> + <span class="title"><?php _e( 'Order' ); ?></span> + <span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span> + </label> + +<?php endif; // !$bulk ?> + + <label> + <span class="title"><?php _e( 'Template' ); ?></span> + <select name="page_template"> +<?php if ( $bulk ) : ?> + <option value="-1"><?php _e('- No Change -'); ?></option> +<?php endif; // $bulk ?> + <option value="default"><?php _e( 'Default Template' ); ?></option> + <?php page_template_dropdown() ?> + </select> + </label> + +<?php elseif ( !$bulk ) : // $is_page ?> + + <label class="inline-edit-tags"> + <span class="title"><?php _e( 'Tags' ); ?></span> + <textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea> + </label> + +<?php endif; // $is_page ?> + +<?php if ( $bulk ) : ?> + + <div class="inline-edit-group"> + <label class="alignleft"> + <span class="title"><?php _e( 'Comments' ); ?></span> + <select name="comment_status"> + <option value=""><?php _e('- No Change -'); ?></option> + <option value="open"><?php _e('Allow'); ?></option> + <option value="closed"><?php _e('Do not allow'); ?></option> + </select> + </label> + + <label class="alignright"> + <span class="title"><?php _e( 'Pings' ); ?></span> + <select name="ping_status"> + <option value=""><?php _e('- No Change -'); ?></option> + <option value="open"><?php _e('Allow'); ?></option> + <option value="closed"><?php _e('Do not allow'); ?></option> + </select> + </label> + </div> + +<?php else : // $bulk ?> + + <div class="inline-edit-group"> + <label class="alignleft"> + <input type="checkbox" name="comment_status" value="open" /> + <span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span> + </label> + + <label class="alignleft"> + <input type="checkbox" name="ping_status" value="open" /> + <span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span> + </label> + </div> + +<?php endif; // $bulk ?> + + + <div class="inline-edit-group"> + <label class="inline-edit-status alignleft"> + <span class="title"><?php _e( 'Status' ); ?></span> + <select name="_status"> +<?php if ( $bulk ) : ?> + <option value="-1"><?php _e('- No Change -'); ?></option> +<?php endif; // $bulk ?> + <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?> + <option value="publish"><?php _e( 'Published' ); ?></option> + <option value="future"><?php _e( 'Scheduled' ); ?></option> +<?php if ( $bulk ) : ?> + <option value="private"><?php _e('Private') ?></option> +<?php endif; // $bulk ?> + <?php endif; ?> + <option value="pending"><?php _e( 'Pending Review' ); ?></option> + <option value="draft"><?php _e( 'Unpublished' ); ?></option> + </select> + </label> + +<?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?> + +<?php if ( $bulk ) : ?> + + <label class="alignright"> + <span class="title"><?php _e( 'Sticky' ); ?></span> + <select name="sticky"> + <option value="-1"><?php _e( '- No Change -' ); ?></option> + <option value="sticky"><?php _e( 'Sticky' ); ?></option> + <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option> + </select> + </label> + +<?php else : // $bulk ?> + + <label class="alignleft"> + <input type="checkbox" name="sticky" value="sticky" /> + <span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span> + </label> + +<?php endif; // $bulk ?> + +<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ?> + + </div> + + </div></fieldset> + +<?php + foreach ( $columns as $column_name => $column_display_name ) { + if ( isset( $core_columns[$column_name] ) ) + continue; + do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $type); + } +?> + <p class="submit inline-edit-save"> + <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a> + <?php if ( ! $bulk ) { + wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); + $update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' ); + ?> + <a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo attribute_escape( $update_text ); ?></a> + <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /> + <?php } else { + $update_text = ( $is_page ) ? __( 'Update Pages' ) : __( 'Update Posts' ); + ?> + <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo attribute_escape( $update_text ); ?>" /> + <?php } ?> + <input type="hidden" name="post_view" value="<?php echo $m; ?>" /> + <br class="clear" /> + </p> + </td></tr> +<?php + $bulk++; + } ?> + </tbody></table></form> +<?php +} + +// adds hidden fields with the data for use in the inline editor for posts and pages +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post + */ +function get_inline_data($post) { + + if ( ! current_user_can('edit_' . $post->post_type, $post->ID) ) + return; + + $title = attribute_escape($post->post_title); + + echo ' +<div class="hidden" id="inline_' . $post->ID . '"> + <div class="post_title">' . $title . '</div> + <div class="post_name">' . $post->post_name . '</div> + <div class="post_author">' . $post->post_author . '</div> + <div class="comment_status">' . $post->comment_status . '</div> + <div class="ping_status">' . $post->ping_status . '</div> + <div class="_status">' . $post->post_status . '</div> + <div class="jj">' . mysql2date( 'd', $post->post_date ) . '</div> + <div class="mm">' . mysql2date( 'm', $post->post_date ) . '</div> + <div class="aa">' . mysql2date( 'Y', $post->post_date ) . '</div> + <div class="hh">' . mysql2date( 'H', $post->post_date ) . '</div> + <div class="mn">' . mysql2date( 'i', $post->post_date ) . '</div> + <div class="ss">' . mysql2date( 's', $post->post_date ) . '</div> + <div class="post_password">' . wp_specialchars($post->post_password, 1) . '</div>'; + + if( $post->post_type == 'page' ) + echo ' + <div class="post_parent">' . $post->post_parent . '</div> + <div class="page_template">' . wp_specialchars(get_post_meta( $post->ID, '_wp_page_template', true ), 1) . '</div> + <div class="menu_order">' . $post->menu_order . '</div>'; + + if( $post->post_type == 'post' ) + echo ' + <div class="tags_input">' . wp_specialchars( str_replace( ',', ', ', get_tags_to_edit($post->ID) ), 1) . '</div> + <div class="post_category">' . implode( ',', wp_get_post_categories( $post->ID ) ) . '</div> + <div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>'; + + echo '</div>'; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $posts + */ +function post_rows( $posts = array() ) { + global $wp_query, $post, $mode; + + add_filter('the_title','wp_specialchars'); + + // Create array of post IDs. + $post_ids = array(); + + if ( empty($posts) ) + $posts = &$wp_query->posts; + + foreach ( $posts as $a_post ) + $post_ids[] = $a_post->ID; + + $comment_pending_count = get_pending_comments_num($post_ids); + if ( empty($comment_pending_count) ) + $comment_pending_count = array(); + + foreach ( $posts as $post ) { + if ( empty($comment_pending_count[$post->ID]) ) + $comment_pending_count[$post->ID] = 0; + + _post_row($post, $comment_pending_count[$post->ID], $mode); + } +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $a_post + * @param unknown_type $pending_comments + * @param unknown_type $mode + */ +function _post_row($a_post, $pending_comments, $mode) { + global $post; + static $rowclass; + + $global_post = $post; + $post = $a_post; + setup_postdata($post); + + $rowclass = 'alternate' == $rowclass ? '' : 'alternate'; + global $current_user; + $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); + $edit_link = get_edit_post_link( $post->ID ); + $title = _draft_or_post_title(); +?> + <tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top"> +<?php + $posts_columns = get_column_headers('edit'); + $hidden = get_hidden_columns('edit'); + foreach ( $posts_columns as $column_name=>$column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; + + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; + + switch ($column_name) { + + case 'cb': + ?> + <th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th> + <?php + break; + + case 'date': + if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) { + $t_time = $h_time = __('Unpublished'); + } else { + $t_time = get_the_time(__('Y/m/d g:i:s A')); + $m_time = $post->post_date; + $time = get_post_time('G', true, $post); + + $time_diff = time() - $time; + + if ( ( 'future' == $post->post_status) ) { + if ( $time_diff <= 0 ) { + $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); + } else { + $h_time = $t_time; + $missed = true; + } + } else { + + if ( $time_diff > 0 && $time_diff < 24*60*60 ) + $h_time = sprintf( __('%s ago'), human_time_diff( $time ) ); + else + $h_time = mysql2date(__('Y/m/d'), $m_time); + } + } + + echo '<td ' . $attributes . '>'; + if ( 'excerpt' == $mode ) + echo apply_filters('post_date_column_time', $t_time, $post, $column_name, $mode); + else + echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $post, $column_name, $mode) . '</abbr>'; + echo '<br />'; + if ( 'publish' == $post->post_status ) { + _e('Published'); + } elseif ( 'future' == $post->post_status ) { + if ( isset($missed) ) + echo '<strong class="attention">' . __('Missed schedule') . '</strong>'; + else + _e('Scheduled'); + } else { + _e('Last Modified'); + } + echo '</td>'; + break; + + case 'title': + $attributes = 'class="post-title column-title"' . $style; + ?> + <td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; }; _post_states($post); ?></strong> + <?php + if ( 'excerpt' == $mode ) + the_excerpt(); + + $actions = array(); + if ( current_user_can('edit_post', $post->ID) ) { + $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . attribute_escape(__('Edit this post')) . '">' . __('Edit') . '</a>'; + $actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . attribute_escape(__('Edit this post inline')) . '">' . __('Quick&nbsp;Edit') . '</a>'; + $actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this post')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + } + if ( in_array($post->post_status, array('pending', 'draft')) ) { + if ( current_user_can('edit_post', $post->ID) ) + $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('Preview "%s"'), $title)) . '" rel="permalink">' . __('Preview') . '</a>'; + } else { + $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>'; + } + $action_count = count($actions); + $i = 0; + echo '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + echo "<span class='$action'>$link$sep</span>"; + } + echo '</div>'; + + get_inline_data($post); + ?> + </td> + <?php + break; + + case 'categories': + ?> + <td <?php echo $attributes ?>><?php + $categories = get_the_category(); + if ( !empty( $categories ) ) { + $out = array(); + foreach ( $categories as $c ) + $out[] = "<a href='edit.php?category_name=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>"; + echo join( ', ', $out ); + } else { + _e('Uncategorized'); + } + ?></td> + <?php + break; + + case 'tags': + ?> + <td <?php echo $attributes ?>><?php + $tags = get_the_tags($post->ID); + if ( !empty( $tags ) ) { + $out = array(); + foreach ( $tags as $c ) + $out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>"; + echo join( ', ', $out ); + } else { + _e('No Tags'); + } + ?></td> + <?php + break; + + case 'comments': + ?> + <td <?php echo $attributes ?>><div class="post-com-count-wrapper"> + <?php + $pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) ); + if ( $pending_comments ) + echo '<strong>'; + comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); + if ( $pending_comments ) + echo '</strong>'; + ?> + </div></td> + <?php + break; + + case 'author': + ?> + <td <?php echo $attributes ?>><a href="edit.php?author=<?php the_author_ID(); ?>"><?php the_author() ?></a></td> + <?php + break; + + case 'control_view': + ?> + <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td> + <?php + break; + + case 'control_edit': + ?> + <td><?php if ( current_user_can('edit_post', $post->ID) ) { echo "<a href='$edit_link' class='edit'>" . __('Edit') . "</a>"; } ?></td> + <?php + break; + + case 'control_delete': + ?> + <td><?php if ( current_user_can('delete_post', $post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td> + <?php + break; + + default: + ?> + <td <?php echo $attributes ?>><?php do_action('manage_posts_custom_column', $column_name, $post->ID); ?></td> + <?php + break; + } +} +?> + </tr> +<?php + $post = $global_post; +} + /* * display one row if the page doesn't have any children * otherwise, display the row and its children in subsequent rows */ +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + * @param unknown_type $level + */ function display_page_row( $page, $level = 0 ) { global $post; - static $class; + static $rowclass; $post = $page; setup_postdata($page); @@ -408,40 +1514,38 @@ function display_page_row( $page, $level = 0 ) { $page->post_title = wp_specialchars( $page->post_title ); $pad = str_repeat( '&#8212; ', $level ); $id = (int) $page->ID; - $class = ('alternate' == $class ) ? '' : 'alternate'; - $posts_columns = wp_manage_pages_columns(); - $title = get_the_title(); - if ( empty($title) ) - $title = __('(no title)'); + $rowclass = 'alternate' == $rowclass ? '' : 'alternate'; + $posts_columns = get_column_headers('edit-pages'); + $hidden = get_hidden_columns('edit-pages'); + $title = _draft_or_post_title(); ?> - <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'> +<tr id="page-<?php echo $id; ?>" class="<?php echo $rowclass; ?> iedit"> +<?php +foreach ($posts_columns as $column_name=>$column_display_name) { + $class = "class=\"$column_name column-$column_name\""; - <?php + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; -foreach ($posts_columns as $column_name=>$column_display_name) { + $attributes = "$class$style"; switch ($column_name) { case 'cb': ?> - <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /></th> + <th scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></th> <?php break; - case 'modified': case 'date': if ( '0000-00-00 00:00:00' == $page->post_date && 'date' == $column_name ) { $t_time = $h_time = __('Unpublished'); } else { - if ( 'modified' == $column_name ) { - $t_time = get_the_modified_time(__('Y/m/d g:i:s A')); - $m_time = $page->post_modified; - $time = get_post_modified_time('G', true); - } else { - $t_time = get_the_time(__('Y/m/d g:i:s A')); - $m_time = $page->post_date; - $time = get_post_time('G', true); - } + $t_time = get_the_time(__('Y/m/d g:i:s A')); + $m_time = $page->post_date; + $time = get_post_time('G', true); + if ( ( abs(time() - $time) ) < 86400 ) { if ( ( 'future' == $page->post_status) ) $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); @@ -451,26 +1555,57 @@ foreach ($posts_columns as $column_name=>$column_display_name) { $h_time = mysql2date(__('Y/m/d'), $m_time); } } - ?> - <td><abbr title="<?php echo $t_time ?>"><?php echo $h_time ?></abbr></td> - <?php + echo '<td ' . $attributes . '>'; + echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $page, $column_name, '') . '</abbr>'; + echo '<br />'; + if ( 'publish' == $page->post_status || 'future' == $page->post_status ) + _e('Published'); + else + _e('Last Modified'); + echo '</td>'; break; case 'title': + $attributes = 'class="post-title page-title column-title"' . $style; + $edit_link = get_edit_post_link( $page->ID ); ?> - <td><strong><a class="row-title" href="page.php?action=edit&amp;post=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $pad; echo $title ?></a></strong> - <?php if ('private' == $page->post_status) _e(' &#8212; <strong>Private</strong>'); ?></td> + <td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $page->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); ?></strong> <?php + $actions = array(); + if ( current_user_can('edit_page', $page->ID) ) { + $actions['edit'] = '<a href="' . $edit_link . '" title="' . attribute_escape(__('Edit this page')) . '">' . __('Edit') . '</a>'; + $actions['inline'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; + $actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this page')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + } + if ( in_array($post->post_status, array('pending', 'draft')) ) { + if ( current_user_can('edit_page', $page->ID) ) + $actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . attribute_escape(sprintf(__('Preview "%s"'), $title)) . '" rel="permalink">' . __('Preview') . '</a>'; + } else { + $actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>'; + } + $action_count = count($actions); + + $i = 0; + echo '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + echo "<span class='$action'>$link$sep</span>"; + } + echo '</div>'; + + get_inline_data($post); + echo '</td>'; break; case 'comments': ?> - <td class="num"><div class="post-com-count-wrapper"> + <td <?php echo $attributes ?>><div class="post-com-count-wrapper"> <?php $left = get_pending_comments_num( $page->ID ); $pending_phrase = sprintf( __('%s pending'), number_format( $left ) ); if ( $left ) echo '<strong>'; - comments_number("<a href='edit-pages.php?page_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-pages.php?page_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-pages.php?page_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); + comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); if ( $left ) echo '</strong>'; ?> @@ -480,46 +1615,20 @@ foreach ($posts_columns as $column_name=>$column_display_name) { case 'author': ?> - <td><a href="edit-pages.php?author=<?php the_author_ID(); ?>"><?php the_author() ?></a></td> - <?php - break; - - case 'status': - ?> - <td> - <a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink"> - <?php - switch ( $page->post_status ) { - case 'publish' : - case 'private' : - _e('Published'); - break; - case 'future' : - _e('Scheduled'); - break; - case 'pending' : - _e('Pending Review'); - break; - case 'draft' : - _e('Unpublished'); - break; - } - ?> - </a> - </td> + <td <?php echo $attributes ?>><a href="edit-pages.php?author=<?php the_author_ID(); ?>"><?php the_author() ?></a></td> <?php break; default: ?> - <td><?php do_action('manage_pages_custom_column', $column_name, $id); ?></td> + <td <?php echo $attributes ?>><?php do_action('manage_pages_custom_column', $column_name, $id); ?></td> <?php break; } } - ?> +?> - </tr> +</tr> <?php } @@ -527,7 +1636,19 @@ foreach ($posts_columns as $column_name=>$column_display_name) { /* * displays pages in hierarchical order with paging support */ +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $pages + * @param unknown_type $pagenum + * @param unknown_type $per_page + * @return unknown + */ function page_rows($pages, $pagenum = 1, $per_page = 20) { + global $wpdb; + $level = 0; if ( ! $pages ) { @@ -537,27 +1658,27 @@ function page_rows($pages, $pagenum = 1, $per_page = 20) { return false; } - /* + /* * arrange pages into two parts: top level pages and children_pages - * children_pages is two dimensional array, eg. - * children_pages[10][] contains all sub-pages whose parent is 10. + * children_pages is two dimensional array, eg. + * children_pages[10][] contains all sub-pages whose parent is 10. * It only takes O(N) to arrange this and it takes O(1) for subsequent lookup operations * If searching, ignore hierarchy and treat everything as top level */ - if ( empty($_GET['s']) ) { - + if ( empty($_GET['s']) ) { + $top_level_pages = array(); - $children_pages = array(); - + $children_pages = array(); + foreach ( $pages as $page ) { - + // catch and repair bad pages if ( $page->post_parent == $page->ID ) { $page->post_parent = 0; $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = '0' WHERE ID = %d", $page->ID) ); clean_page_cache( $page->ID ); } - + if ( 0 == $page->post_parent ) $top_level_pages[] = $page; else @@ -570,7 +1691,7 @@ function page_rows($pages, $pagenum = 1, $per_page = 20) { $count = 0; $start = ($pagenum - 1) * $per_page; $end = $start + $per_page; - + foreach ( $pages as $page ) { if ( $count >= $end ) break; @@ -583,7 +1704,7 @@ function page_rows($pages, $pagenum = 1, $per_page = 20) { if ( isset($children_pages) ) _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page ); } - + // if it is the last pagenum and there are orphaned pages, display them with paging as well if ( isset($children_pages) && $count < $end ){ foreach( $children_pages as $orphans ){ @@ -602,19 +1723,31 @@ function page_rows($pages, $pagenum = 1, $per_page = 20) { * Given a top level page ID, display the nested hierarchy of sub-pages * together with paging support */ +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $children_pages + * @param unknown_type $count + * @param unknown_type $parent + * @param unknown_type $level + * @param unknown_type $pagenum + * @param unknown_type $per_page + */ function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) { - + if ( ! isset( $children_pages[$parent] ) ) - return; - + return; + $start = ($pagenum - 1) * $per_page; $end = $start + $per_page; - + foreach ( $children_pages[$parent] as $page ) { - + if ( $count >= $end ) break; - + // If the page starts in a subtree, print the parents. if ( $count == $start && $page->post_parent > 0 ) { $my_parents = array(); @@ -635,20 +1768,30 @@ function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_ if ( $count >= $start ) echo "\t" . display_page_row( $page, $level ); - + $count++; _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page ); } - + unset( $children_pages[$parent] ); //required in order to keep track of orphans } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $user_object + * @param unknown_type $style + * @param unknown_type $role + * @return unknown + */ function user_row( $user_object, $style = '', $role = '' ) { global $wp_roles; $current_user = wp_get_current_user(); - + if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) ) $user_object = new WP_User( (int) $user_object ); $email = $user_object->user_email; @@ -658,42 +1801,98 @@ function user_row( $user_object, $style = '', $role = '' ) { if ('/' == substr( $short_url, -1 )) $short_url = substr( $short_url, 0, -1 ); if ( strlen( $short_url ) > 35 ) - $short_url = substr( $short_url, 0, 32 ).'...'; + $short_url = substr( $short_url, 0, 32 ).'...'; $numposts = get_usernumposts( $user_object->ID ); if ( current_user_can( 'edit_user', $user_object->ID ) ) { if ($current_user->ID == $user_object->ID) { - $edit = 'profile.php'; + $edit_link = 'profile.php'; } else { - $edit = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) ); + $edit_link = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) ); } - $edit = "<a href=\"$edit\">$user_object->user_login</a>"; + $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />"; + $actions = array(); + $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; + if ( $current_user->ID != $user_object->ID ) + $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>"; + $action_count = count($actions); + $i = 0; + $edit .= '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + $edit .= "<span class='$action'>$link$sep</span>"; + } + $edit .= '</div>'; } else { - $edit = $user_object->user_login; + $edit = '<strong>' . $user_object->user_login . '</strong>'; } - $role_name = $wp_roles->role_names[$role] ? translate_with_context($wp_roles->role_names[$role]) : __('None'); - $r = "<tr id='user-$user_object->ID'$style> - <th scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></th> - <td><strong>$edit</strong></td> - <td>$user_object->first_name $user_object->last_name</td> - <td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td> - <td>$role_name</td>"; - $r .= "\n\t\t<td class='num'>"; - if ( $numposts > 0 ) { - $r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>"; - $r .= $numposts; - $r .= '</a>'; - } else { - $r .= 0; + $role_name = isset($wp_roles->role_names[$role]) ? translate_with_context($wp_roles->role_names[$role]) : __('None'); + $r = "<tr id='user-$user_object->ID'$style>"; + $columns = get_column_headers('users'); + $hidden = get_hidden_columns('users'); + $avatar = get_avatar( $user_object->user_email, 32 ); + foreach ( $columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; + + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; + + switch ($column_name) { + case 'cb': + $r .= "<th scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></th>"; + break; + case 'username': + $r .= "<td $attributes>$avatar $edit</td>"; + break; + case 'name': + $r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>"; + break; + case 'email': + $r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>"; + break; + case 'role': + $r .= "<td $attributes>$role_name</td>"; + break; + case 'posts': + $attributes = 'class="posts column-posts num"' . $style; + $r .= "<td $attributes>"; + if ( $numposts > 0 ) { + $r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>"; + $r .= $numposts; + $r .= '</a>'; + } else { + $r .= 0; + } + $r .= "</td>"; + } } - $r .= "</td>\n\t</tr>"; + $r .= '</tr>'; + return $r; } -function _wp_get_comment_list( $status = '', $s = false, $start, $num ) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $status + * @param unknown_type $s + * @param unknown_type $start + * @param unknown_type $num + * @param unknown_type $post + * @param unknown_type $type + * @return unknown + */ +function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0, $type = '' ) { global $wpdb; $start = abs( (int) $start ); $num = (int) $num; + $post = (int) $post; if ( 'moderated' == $status ) $approved = "comment_approved = '0'"; @@ -704,6 +1903,25 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num ) { else $approved = "( comment_approved = '0' OR comment_approved = '1' )"; + if ( $post ) { + $post = " AND comment_post_ID = '$post'"; + $orderby = "ORDER BY comment_date_gmt ASC LIMIT $start, $num"; + } else { + $post = ''; + $orderby = "ORDER BY comment_date_gmt DESC LIMIT $start, $num"; + } + + if ( 'comment' == $type ) + $typesql = "AND comment_type = ''"; + elseif ( 'pingback' == $type ) + $typesql = "AND comment_type = 'pingback'"; + elseif ( 'trackback' == $type ) + $typesql = "AND comment_type = 'trackback'"; + elseif ( 'pings' == $type ) + $typesql = "AND ( comment_type = 'pingback' OR comment_type = 'trackback' )"; + else + $typesql = ''; + if ( $s ) { $s = $wpdb->escape($s); $comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE @@ -713,9 +1931,10 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num ) { comment_author_IP LIKE ('%$s%') OR comment_content LIKE ('%$s%') ) AND $approved - ORDER BY comment_date_gmt DESC LIMIT $start, $num"); + $typesql + $orderby"); } else { - $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num" ); + $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved $post $typesql $orderby" ); } update_comment_cache($comments); @@ -725,30 +1944,28 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num ) { return array($comments, $total); } -function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true ) { - global $comment, $post; +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $comment_id + * @param unknown_type $mode + * @param unknown_type $comment_status + * @param unknown_type $checkbox + */ +function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true, $from_ajax = false ) { + global $comment, $post, $_comment_pending_count; $comment = get_comment( $comment_id ); $post = get_post($comment->comment_post_ID); - $authordata = get_userdata($post->post_author); $the_comment_status = wp_get_comment_status($comment->comment_ID); - $class = ('unapproved' == $the_comment_status) ? 'unapproved' : ''; - - if ( current_user_can( 'edit_post', $post->ID ) ) { - $post_link = "<a href='" . get_comment_link() . "'>"; - $post_link .= get_the_title($comment->comment_post_ID) . '</a>'; - - $edit_link_start = "<a class='row-title' href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>"; - $edit_link_end = '</a>'; - } else { - $post_link = get_the_title($comment->comment_post_ID); - $edit_link_start = $edit_link_end =''; - } - $author_url = get_comment_author_url(); if ( 'http://' == $author_url ) $author_url = ''; $author_url_display = $author_url; + $author_url_display = str_replace('http://www.', '', $author_url_display); + $author_url_display = str_replace('http://', '', $author_url_display); if ( strlen($author_url_display) > 50 ) $author_url_display = substr($author_url_display, 0, 49) . '...'; @@ -758,62 +1975,235 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true else $ptime = mysql2date(__('Y/m/d \a\t g:i A'), $comment->comment_date ); - $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); - $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) ); - $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) ); - $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); + $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$post->ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); + $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$post->ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) ); + $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$post->ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) ); + $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$post->ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); -?> - <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'> -<?php if ( $checkbox ) : ?> - <td class="check-column"><?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> -<?php endif; ?> - <td class="comment"> - <p class="comment-author"><strong><?php echo $edit_link_start; comment_author(); echo $edit_link_end; ?></strong><br /> - <?php if ( !empty($author_url) ) : ?> - <a href="<?php echo $author_url ?>"><?php echo $author_url_display; ?></a> | - <?php endif; ?> - <?php if ( current_user_can( 'edit_post', $post->ID ) ) : ?> - <?php if ( !empty($comment->comment_author_email) ): ?> - <?php comment_author_email_link() ?> | - <?php endif; ?> - <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=detail"><?php comment_author_IP() ?></a> - <?php endif; //current_user_can?> - </p> - <?php if ( 'detail' == $mode ) comment_text(); ?> - <p><?php printf(__('From %1$s, %2$s'), $post_link, $ptime) ?></p> - </td> - <td><?php comment_date(__('Y/m/d')); ?></td> - <td class="action-links"> -<?php + echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>"; + $columns = get_column_headers('edit-comments'); + $hidden = get_hidden_columns('edit-comments'); + foreach ( $columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; + + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; - $actions = array(); + $attributes = "$class$style"; - if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | '; - $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | '; + switch ($column_name) { + case 'cb': + if ( !$checkbox ) break; + echo '<th scope="row" class="check-column">'; + if ( current_user_can('edit_post', $post->ID) ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />"; + echo '</th>'; + break; + case 'comment': + echo "<td $attributes>"; + echo '<div id="submitted-on">'; + printf(__('Submitted on <a href="%1$s">%2$s at %3$s</a>'), get_comment_link($comment->comment_ID), get_comment_date(__('Y/m/d')), get_comment_date(__('g:ia'))); + echo '</div>'; + comment_text(); ?> + <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden"> + <textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea> + <div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div> + <div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div> + <div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div> + <div class="comment_status"><?php echo $comment->comment_approved; ?></div> + </div> + <?php + $actions = array(); + + if ( current_user_can('edit_post', $post->ID) ) { + $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>'; + $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>'; + if ( $comment_status ) { // not looking at all comments + if ( 'approved' == $the_comment_status ) { + $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>'; + unset($actions['approve']); + } else { + $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>'; + unset($actions['unapprove']); + } + } + if ( 'spam' != $the_comment_status ) + $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>'; + $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>'; + $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>'; + $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>'; + if ( 'spam' != $the_comment_status ) + $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>'; + + $actions = apply_filters( 'comment_row_actions', $actions, $comment ); + + $i = 0; + echo '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; + + // Reply and quickedit need a hide-if-no-js span when not added with ajax + if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax ) + $action .= ' hide-if-no-js'; + + echo "<span class='$action'>$sep$link</span>"; + } + echo '</div>'; + } - // we're looking at list of only approved or only unapproved comments - if ( 'moderated' == $comment_status ) { - $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=approved' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | '; - unset($actions['unapprove']); - } elseif ( 'approved' == $comment_status ) { - $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | '; - unset($actions['approve']); + echo '</td>'; + break; + case 'author': + echo "<td $attributes><strong>"; comment_author(); echo '</strong><br />'; + if ( !empty($author_url) ) + echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />"; + if ( current_user_can( 'edit_post', $post->ID ) ) { + if ( !empty($comment->comment_author_email) ) { + comment_author_email_link(); + echo '<br />'; + } + echo '<a href="edit-comments.php?s='; + comment_author_IP(); + echo '&amp;mode=detail'; + if ( 'spam' == $comment_status ) + echo '&amp;comment_status=spam'; + echo '">'; + comment_author_IP(); + echo '</a>'; + } //current_user_can + echo '</td>'; + break; + case 'date': + echo "<td $attributes>" . get_comment_date(__('Y/m/d \a\t g:ia')) . '</td>'; + break; + case 'response': + if ( 'single' !== $mode ) { + if ( isset( $_comment_pending_count[$post->ID] ) ) { + $pending_comments = absint( $_comment_pending_count[$post->ID] ); + } else { + $_comment_pending_count_temp = (array) get_pending_comments_num( array( $post->ID ) ); + $pending_comments = $_comment_pending_count[$post->ID] = $_comment_pending_count_temp[$post->ID]; + } + if ( current_user_can( 'edit_post', $post->ID ) ) { + $post_link = "<a href='" . get_edit_post_link($post->ID) . "'>"; + $post_link .= get_the_title($post->ID) . '</a>'; + } else { + $post_link = get_the_title($post->ID); + } + echo "<td $attributes>\n"; + echo $post_link; + + echo '<div class="response-links"><span class="post-com-count-wrapper">'; + $pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) ); + if ( $pending_comments ) + echo '<strong>'; + comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); + if ( $pending_comments ) + echo '</strong>'; + echo '</span> '; + echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>"; + echo '</div></td>'; + } } + } + echo "</tr>\n"; +} - $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a> | '; - $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . '</a>'; - $actions = apply_filters( 'comment_row_actions', $actions, $comment ); - foreach ( $actions as $action => $link ) - echo "<span class='$action'>$link</span>"; +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $position + * @param unknown_type $checkbox + * @param unknown_type $mode + */ +function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) { + global $current_user; + + // allow plugin to replace the popup content + $content = apply_filters( 'wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode) ); + + if ( ! empty($content) ) { + echo $content; + return; } - ?> - </td> - </tr> - <?php + + $columns = get_column_headers('edit-comments'); + $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns('edit-comments') ) ); + $col_count = count($columns) - count($hidden); + +?> +<form method="get" action=""> +<?php if ( $table_row ) : ?> +<table style="display:none;"><tbody id="com-reply"><tr id="replyrow"><td colspan="<?php echo $col_count; ?>"> +<?php else : ?> +<div id="com-reply" style="display:none;"><div id="replyrow"> +<?php endif; ?> + <div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div> + + <div id="edithead" style="display:none;"> + <div class="inside"> + <label for="author"><?php _e('Name') ?></label> + <input type="text" name="newcomment_author" size="50" value="" tabindex="101" id="author" /> + </div> + + <div class="inside"> + <label for="author-email"><?php _e('E-mail') ?></label> + <input type="text" name="newcomment_author_email" size="50" value="" tabindex="102" id="author-email" /> + </div> + + <div class="inside"> + <label for="author-url"><?php _e('URL') ?></label> + <input type="text" id="author-url" name="newcomment_author_url" size="103" value="" tabindex="103" /> + </div> + <div style="clear:both;"></div> + </div> + + <div id="replycontainer"><textarea rows="8" cols="40" name="replycontent" tabindex="104" id="replycontent"></textarea></div> + + <p id="replysubmit" class="submit"> + <a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a> + <a href="#comments-form" class="save button-primary alignright" tabindex="104"> + <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span> + <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a> + <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /> + <span class="error" style="display:none;"></span> + <br class="clear" /> + </p> + + <input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" /> + <input type="hidden" name="action" id="action" value="" /> + <input type="hidden" name="comment_ID" id="comment_ID" value="" /> + <input type="hidden" name="comment_post_ID" id="comment_post_ID" value="" /> + <input type="hidden" name="status" id="status" value="" /> + <input type="hidden" name="position" id="position" value="<?php echo $position; ?>" /> + <input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" /> + <input type="hidden" name="mode" id="mode" value="<?php echo $mode; ?>" /> + <?php wp_nonce_field( 'replyto-comment', '_ajax_nonce', false ); ?> + <?php wp_comment_form_unfiltered_html_nonce(); ?> +<?php if ( $table_row ) : ?> +</td></tr></tbody></table> +<?php else : ?> +</div></div> +<?php endif; ?> +</form> +<?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $currentcat + * @param unknown_type $currentparent + * @param unknown_type $parent + * @param unknown_type $level + * @param unknown_type $categories + * @return unknown + */ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) { if (!$categories ) $categories = get_categories( array('hide_empty' => 0) ); @@ -835,28 +2225,58 @@ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $le } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $meta + */ function list_meta( $meta ) { // Exit if no meta - if (!$meta ) { - echo '<tbody id="the-list" class="list:meta"><tr style="display: none;"><td>&nbsp;</td></tr></tbody>'; //TBODY needed for list-manipulation JS + if ( ! $meta ) { + echo ' +<table id="list-table" style="display: none;"> + <thead> + <tr> + <th class="left">' . __( 'Name' ) . '</th> + <th>' . __( 'Value' ) . '</th> + </tr> + </thead> + <tbody id="the-list" class="list:meta"> + <tr><td></td></tr> + </tbody> +</table>'; //TBODY needed for list-manipulation JS return; } $count = 0; ?> +<table id="list-table"> <thead> <tr> - <th><?php _e( 'Key' ) ?></th> + <th class="left"><?php _e( 'Name' ) ?></th> <th><?php _e( 'Value' ) ?></th> - <th colspan='2'><?php _e( 'Action' ) ?></th> </tr> </thead> <tbody id='the-list' class='list:meta'> <?php foreach ( $meta as $entry ) echo _list_meta_row( $entry, $count ); - echo "\n\t</tbody>"; +?> + </tbody> +</table> +<?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $entry + * @param unknown_type $count + * @return unknown + */ function _list_meta_row( $entry, &$count ) { static $update_nonce = false; if ( !$update_nonce ) @@ -882,23 +2302,30 @@ function _list_meta_row( $entry, &$count ) { } } - $entry['meta_key'] = attribute_escape($entry['meta_key']); + $entry['meta_key'] = attribute_escape($entry['meta_key']); $entry['meta_value'] = htmlspecialchars($entry['meta_value']); // using a <textarea /> $entry['meta_id'] = (int) $entry['meta_id']; $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] ); $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>"; - $r .= "\n\t\t<td valign='top'><label class='hidden' for='meta[{$entry['meta_id']}][key]'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>"; - $r .= "\n\t\t<td><label class='hidden' for='meta[{$entry['meta_id']}][value]'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>"; - $r .= "\n\t\t<td style='text-align: center;'><input name='updatemeta' type='submit' tabindex='6' value='".attribute_escape(__( 'Update' ))."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /><br />"; - $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' "; + $r .= "\n\t\t<td class='left'><label class='hidden' for='meta[{$entry['meta_id']}][key]'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' />"; + + $r .= "\n\t\t<div class='submit'><input name='deletemeta[{$entry['meta_id']}]' type='submit' "; $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='".attribute_escape(__( 'Delete' ))."' />"; + $r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='".attribute_escape(__( 'Update' ))."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /></div>"; $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false ); - $r .= "</td>\n\t</tr>"; + $r .= "</td>"; + + $r .= "\n\t\t<td><label class='hidden' for='meta[{$entry['meta_id']}][value]'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>"; return $r; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function meta_form() { global $wpdb; $limit = (int) apply_filters( 'postmeta_form_limit', 30 ); @@ -912,40 +2339,61 @@ function meta_form() { if ( $keys ) natcasesort($keys); ?> -<p><strong><?php _e( 'Add a new custom field:' ) ?></strong></p> -<table id="newmeta" cellspacing="3" cellpadding="3"> - <tr> -<th colspan="2"><label <?php if ( $keys ) : ?> for="metakeyselect" <?php else : ?> for="metakeyinput" <?php endif; ?>><?php _e( 'Key' ) ?></label></th> +<p><strong><?php _e( 'Add new custom field:' ) ?></strong></p> +<table id="newmeta"> +<thead> +<tr> +<th class="left"><label for="metakeyselect"><?php _e( 'Name' ) ?></label></th> <th><label for="metavalue"><?php _e( 'Value' ) ?></label></th> </tr> - <tr valign="top"> - <td style="width: 18%;" class="textright"> -<?php if ( $keys ) : ?> +</thead> + +<tbody> +<tr> +<td id="newmetaleft" class="left"> +<?php if ( $keys ) { ?> <select id="metakeyselect" name="metakeyselect" tabindex="7"> <option value="#NONE#"><?php _e( '- Select -' ); ?></option> <?php foreach ( $keys as $key ) { $key = attribute_escape( $key ); - echo "\n\t<option value='$key'>$key</option>"; + echo "\n<option value='$key'>$key</option>"; } ?> -</select> <label for="metakeyinput"><?php _e( 'or' ); ?></label> -<?php endif; ?> +</select> +<input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" /> +<a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;"> +<span id="enternew"><?php _e('Enter new'); ?></span> +<span id="cancelnew" class="hidden"><?php _e('Cancel'); ?></span></a> +<?php } else { ?> +<input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" /> +<?php } ?> </td> -<td><input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td> - <td><textarea id="metavalue" name="metavalue" rows="3" cols="25" tabindex="8"></textarea></td> - </tr> -<tr class="submit"><td colspan="3"> - <?php wp_nonce_field( 'add-meta', '_ajax_nonce', false ); ?> - <input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _e( 'Add Custom Field' ) ?>" /> +<td><textarea id="metavalue" name="metavalue" rows="2" cols="25" tabindex="8"></textarea></td> +</tr> + +<tr><td colspan="2" class="submit"> +<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _e( 'Add Custom Field' ) ?>" /> +<?php wp_nonce_field( 'add-meta', '_ajax_nonce', false ); ?> </td></tr> +</tbody> </table> <?php } -function touch_time( $edit = 1, $for_post = 1, $tab_index = 0 ) { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $edit + * @param unknown_type $for_post + * @param unknown_type $tab_index + * @param unknown_type $multi + */ +function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { global $wp_locale, $post, $comment; if ( $for_post ) @@ -966,29 +2414,55 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0 ) { $mn = ($edit) ? mysql2date( 'i', $post_date ) : gmdate( 'i', $time_adj ); $ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj ); - $month = "<select id=\"mm\" name=\"mm\"$tab_index_attribute>\n"; + $cur_jj = gmdate( 'd', $time_adj ); + $cur_mm = gmdate( 'm', $time_adj ); + $cur_aa = gmdate( 'Y', $time_adj ); + $cur_hh = gmdate( 'H', $time_adj ); + $cur_mn = gmdate( 'i', $time_adj ); + + $month = "<select " . ( $multi ? '' : 'id="mm" ' ) . "name=\"mm\"$tab_index_attribute>\n"; for ( $i = 1; $i < 13; $i = $i +1 ) { $month .= "\t\t\t" . '<option value="' . zeroise($i, 2) . '"'; if ( $i == $mm ) $month .= ' selected="selected"'; - $month .= '>' . $wp_locale->get_month( $i ) . "</option>\n"; + $month .= '>' . $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) . "</option>\n"; } $month .= '</select>'; - $day = '<input type="text" id="jj" name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />'; - $year = '<input type="text" id="aa" name="aa" value="' . $aa . '" size="4" maxlength="5"' . $tab_index_attribute . ' autocomplete="off" />'; - $hour = '<input type="text" id="hh" name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />'; - $minute = '<input type="text" id="mn" name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />'; - printf(_c('%1$s%2$s, %3$s <br />@ %4$s : %5$s|1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input'), $month, $day, $year, $hour, $minute); + $day = '<input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />'; + $year = '<input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="5"' . $tab_index_attribute . ' autocomplete="off" />'; + $hour = '<input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />'; + $minute = '<input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />'; + printf(_c('%1$s%2$s, %3$s @ %4$s : %5$s|1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input'), $month, $day, $year, $hour, $minute); + + echo '<input type="hidden" id="ss" name="ss" value="' . $ss . '" />'; + + if ( $multi ) return; + echo "\n\n"; - foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit ) + foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit ) { echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $$timeunit . '" />' . "\n"; + $cur_timeunit = 'cur_' . $timeunit; + echo '<input type="hidden" id="'. $cur_timeunit . '" name="'. $cur_timeunit . '" value="' . $$cur_timeunit . '" />' . "\n"; + } ?> <input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" /> + +<p> +<a href="#edit_timestamp" class="save-timestamp hide-if-no-js button"><?php _e('OK'); ?></a> +<a href="#edit_timestamp" class="cancel-timestamp hide-if-no-js"><?php _e('Cancel'); ?></a> +</p> <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $default + */ function page_template_dropdown( $default = '' ) { $templates = get_page_templates(); ksort( $templates ); @@ -1001,6 +2475,16 @@ function page_template_dropdown( $default = '' ) { endforeach; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $default + * @param unknown_type $parent + * @param unknown_type $level + * @return unknown + */ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) { global $wpdb, $post_ID; $items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) ); @@ -1019,7 +2503,7 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) { else $current = ''; - echo "\n\t<option value='$item->ID'$current>$pad " . wp_specialchars($item->post_title) . "</option>"; + echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . wp_specialchars($item->post_title) . "</option>"; parent_dropdown( $default, $item->ID, $level +1 ); } } else { @@ -1027,16 +2511,26 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) { } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function browse_happy() { $getit = __( 'WordPress recommends a better browser' ); echo ' - <span id="bh" class="alignright"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></span> - '; + <div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></div> +'; } -if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) - add_action( 'in_admin_footer', 'browse_happy' ); - +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @return unknown + */ function the_attachment_links( $id = false ) { $id = (int) $id; $post = & get_post( $id ); @@ -1068,7 +2562,7 @@ function the_attachment_links( $id = false ) { <?php else : ?> <tr> <th scope="row"><?php _e( 'Link to file' ) ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>" class="attachmentlink"><?php echo basename( wp_get_attachment_url() ); ?></a></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>" class="attachmentlink"><?php echo basename( wp_get_attachment_url() ); ?></a></textarea></td> </tr> <tr> <th scope="row"><?php _e( 'Link to page' ) ?></th> @@ -1080,8 +2574,16 @@ function the_attachment_links( $id = false ) { <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $default + */ function wp_dropdown_roles( $default = false ) { global $wp_roles; + $p = ''; $r = ''; foreach( $wp_roles->role_names as $role => $name ) { $name = translate_with_context($name); @@ -1093,6 +2595,14 @@ function wp_dropdown_roles( $default = false ) { echo $p . $r; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $size + * @return unknown + */ function wp_convert_hr_to_bytes( $size ) { $size = strtolower($size); $bytes = (int) $size; @@ -1105,6 +2615,14 @@ function wp_convert_hr_to_bytes( $size ) { return $bytes; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $bytes + * @return unknown + */ function wp_convert_bytes_to_hr( $bytes ) { $units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB' ); $log = log( $bytes, 1024 ); @@ -1113,6 +2631,13 @@ function wp_convert_bytes_to_hr( $bytes ) { return $size . $units[$power]; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function wp_max_upload_size() { $u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) ); $p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) ); @@ -1120,6 +2645,13 @@ function wp_max_upload_size() { return $bytes; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $action + */ function wp_import_upload_form( $action ) { $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() ); $size = wp_convert_bytes_to_hr( $bytes ); @@ -1139,6 +2671,11 @@ function wp_import_upload_form( $action ) { <?php } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function wp_remember_old_slug() { global $post; $name = attribute_escape($post->post_name); // just in case @@ -1147,53 +2684,60 @@ function wp_remember_old_slug() { } /** - * add_meta_box() - Add a meta box to an edit form + * Add a meta box to an edit form. * - * @since 2.5 + * @since 2.5.0 * * @param string $id String for use in the 'id' attribute of tags. - * @param string $title Title of the meta box - * @param string $callback Function that fills the box with the desired content. The function should echo its output. - * @param string $page The type of edit page on which to show the box (post, page, link) - * @param string $context The context within the page where the boxes should show ('normal', 'advanced') - * @param string $priority The priority within the context where the boxes should show ('high', 'low') + * @param string $title Title of the meta box. + * @param string $callback Function that fills the box with the desired content. The function should echo its output. + * @param string $page The type of edit page on which to show the box (post, page, link). + * @param string $context The context within the page where the boxes should show ('normal', 'advanced'). + * @param string $priority The priority within the context where the boxes should show ('high', 'low'). */ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $priority = 'default') { global $wp_meta_boxes; - - if ( !isset($wp_meta_boxes) ) + if ( !isset($wp_meta_boxes) ) $wp_meta_boxes = array(); if ( !isset($wp_meta_boxes[$page]) ) $wp_meta_boxes[$page] = array(); if ( !isset($wp_meta_boxes[$page][$context]) ) $wp_meta_boxes[$page][$context] = array(); + foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) { foreach ( array('high', 'core', 'default', 'low') as $a_priority ) { - if ( !isset($wp_meta_boxes[$page][$context][$a_priority][$id]) ) + if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) ) continue; + // If a core box was previously added or removed by a plugin, don't add. if ( 'core' == $priority ) { // If core box previously deleted, don't add - if ( false === $wp_meta_boxes[$page][$context][$a_priority][$id] ) + if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) return; // If box was added with default priority, give it core priority to maintain sort order if ( 'default' == $a_priority ) { - $wp_meta_boxes[$page][$context]['core'][$id] = $wp_meta_boxes[$page][$context]['default'][$id]; - unset($wp_meta_boxes[$page][$context]['default'][$id]); + $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id]; + unset($wp_meta_boxes[$page][$a_context]['default'][$id]); } return; } // If no priority given and id already present, use existing priority - if ( empty($priority) ) + if ( empty($priority) ) { $priority = $a_priority; - // An id can be in only one priority - if ( $priority != $a_priority ) - unset($wp_meta_boxes[$page][$context][$a_priority][$id]); + // else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority. + } elseif ( 'sorted' == $priority ) { + $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title']; + $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback']; + } + // An id can be in only one priority and one context + if ( $priority != $a_priority || $context != $a_context ) + unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]); + } } if ( empty($priority) ) - $priority = low; + $priority = 'low'; if ( !isset($wp_meta_boxes[$page][$context][$priority]) ) $wp_meta_boxes[$page][$context][$priority] = array(); @@ -1201,41 +2745,80 @@ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $pri $wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + * @param unknown_type $context + * @param unknown_type $object + * @return int number of meta_boxes + */ function do_meta_boxes($page, $context, $object) { global $wp_meta_boxes; + static $already_sorted = false; - do_action('do_meta_boxes', $page, $context, $object); + //do_action('do_meta_boxes', $page, $context, $object); - if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) ) - return; + $hidden = get_hidden_meta_boxes($page); - foreach ( array('high', 'core', 'default', 'low') as $priority ) { - foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) { - if ( false === $box ) - continue; - echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '">' . "\n"; - echo "<h3>{$box['title']}</h3>\n"; - echo '<div class="inside">' . "\n"; - call_user_func($box['callback'], $object, $box); - echo "</div>\n"; - echo "</div>\n"; + echo "<div id='$context-sortables' class='meta-box-sortables'>\n"; + + $i = 0; + do { + // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose + if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page", 0, false ) ) { + foreach ( $sorted as $box_context => $ids ) + foreach ( explode(',', $ids) as $id ) + if ( $id ) + add_meta_box( $id, null, null, $page, $box_context, 'sorted' ); } - } + $already_sorted = true; + + if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) ) + break; + + foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) { + if ( isset($wp_meta_boxes[$page][$context][$priority]) ) { + foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) { + if ( false == $box || ! $box['title'] ) + continue; + $i++; + $style = ''; + if ( in_array($box['id'], $hidden) ) + $style = 'style="display:none;"'; + echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '" ' . $style . '>' . "\n"; + echo '<div class="handlediv" title="' . __('Click to toggle') . '"><br /></div>'; + echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n"; + echo '<div class="inside">' . "\n"; + call_user_func($box['callback'], $object, $box); + echo "</div>\n"; + echo "</div>\n"; + } + } + } + } while(0); + + echo "</div>"; + + return $i; + } /** - * remove_meta_box() - Remove a meta box from an edit form + * Remove a meta box from an edit form. * - * @since 2.6 + * @since 2.6.0 * * @param string $id String for use in the 'id' attribute of tags. - * @param string $page The type of edit page on which to show the box (post, page, link) - * @param string $context The context within the page where the boxes should show ('normal', 'advanced') + * @param string $page The type of edit page on which to show the box (post, page, link). + * @param string $context The context within the page where the boxes should show ('normal', 'advanced'). */ function remove_meta_box($id, $page, $context) { global $wp_meta_boxes; - if ( !isset($wp_meta_boxes) ) + if ( !isset($wp_meta_boxes) ) $wp_meta_boxes = array(); if ( !isset($wp_meta_boxes[$page]) ) $wp_meta_boxes[$page] = array(); @@ -1246,4 +2829,621 @@ function remove_meta_box($id, $page, $context) { $wp_meta_boxes[$page][$context][$priority][$id] = false; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + */ +function meta_box_prefs($page) { + global $wp_meta_boxes; + + if ( empty($wp_meta_boxes[$page]) ) + return; + + $hidden = get_hidden_meta_boxes($page); + + foreach ( array_keys($wp_meta_boxes[$page]) as $context ) { + foreach ( array_keys($wp_meta_boxes[$page][$context]) as $priority ) { + foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) { + if ( false == $box || ! $box['title'] ) + continue; + // Submit box cannot be hidden + if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) + continue; + $box_id = $box['id']; + echo '<label for="' . $box_id . '-hide">'; + echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />'; + echo "{$box['title']}</label>\n"; + } + } + } +} + +function get_hidden_meta_boxes($page) { + $hidden = (array) get_user_option( "meta-box-hidden_$page", 0, false ); + + // Hide slug boxes by default + if ( empty($hidden[0]) ) { + if ( 'page' == $page ) + $hidden = array('pageslugdiv'); + elseif ( 'post' == $page ) + $hidden = array('slugdiv'); + } + + return $hidden; +} + +/** + * Add a new section to a settings page. + * + * @since 2.7.0 + * + * @param string $id String for use in the 'id' attribute of tags. + * @param string $title Title of the section. + * @param string $callback Function that fills the section with the desired content. The function should echo its output. + * @param string $page The type of settings page on which to show the section (general, reading, writing, ...). + */ +function add_settings_section($id, $title, $callback, $page) { + global $wp_settings_sections; + + if ( !isset($wp_settings_sections) ) + $wp_settings_sections = array(); + if ( !isset($wp_settings_sections[$page]) ) + $wp_settings_sections[$page] = array(); + if ( !isset($wp_settings_sections[$page][$id]) ) + $wp_settings_sections[$page][$id] = array(); + + $wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback); +} + +/** + * Add a new field to a settings page. + * + * @since 2.7.0 + * + * @param string $id String for use in the 'id' attribute of tags. + * @param string $title Title of the field. + * @param string $callback Function that fills the field with the desired content. The function should echo its output. + * @param string $page The type of settings page on which to show the field (general, reading, writing, ...). + * @param string $section The section of the settingss page in which to show the box (default, ...). + * @param array $args Additional arguments + */ +function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) { + global $wp_settings_fields; + + if ( !isset($wp_settings_fields) ) + $wp_settings_fields = array(); + if ( !isset($wp_settings_fields[$page]) ) + $wp_settings_fields[$page] = array(); + if ( !isset($wp_settings_fields[$page][$section]) ) + $wp_settings_fields[$page][$section] = array(); + + $wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args); +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + */ +function do_settings_sections($page) { + global $wp_settings_sections, $wp_settings_fields; + + if ( !isset($wp_settings_sections) || !isset($wp_settings_sections[$page]) ) + return; + + foreach ( (array) $wp_settings_sections[$page] as $section ) { + echo "<h3>{$section['title']}</h3>\n"; + call_user_func($section['callback'], $section); + if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section['id']]) ) + continue; + echo '<table class="form-table">'; + do_settings_fields($page, $section['id']); + echo '</table>'; + } +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + * @param unknown_type $section + */ +function do_settings_fields($page, $section) { + global $wp_settings_fields; + + if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section]) ) + return; + + foreach ( (array) $wp_settings_fields[$page][$section] as $field ) { + echo '<tr valign="top">'; + if ( !empty($field['args']['label_for']) ) + echo '<th scope="row"><label for="' . $field['args']['label_for'] . '">' . $field['title'] . '</label></th>'; + else + echo '<th scope="row">' . $field['title'] . '</th>'; + echo '<td>'; + call_user_func($field['callback']); + echo '</td>'; + echo '</tr>'; + } +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $page + */ +function manage_columns_prefs($page) { + $columns = get_column_headers($page); + + $hidden = get_hidden_columns($page); + + foreach ( $columns as $column => $title ) { + // Can't hide these + if ( 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column || 'comment' == $column ) + continue; + if ( empty($title) ) + continue; + + if ( 'comments' == $column ) + $title = __('Comments'); + $id = "$column-hide"; + echo '<label for="' . $id . '">'; + echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . (! in_array($column, $hidden) ? ' checked="checked"' : '') . ' />'; + echo "$title</label>\n"; + } +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $found_action + */ +function find_posts_div($found_action = '') { +?> + <div id="find-posts" class="find-box" style="display:none;"> + <div id="find-posts-head" class="find-box-head"><?php _e('Find Posts or Pages'); ?></div> + <div class="find-box-inside"> + <div class="find-box-search"> + <?php if ( $found_action ) { ?> + <input type="hidden" name="found_action" value="<?php echo $found_action; ?>" /> + <?php } ?> + + <input type="hidden" name="affected" id="affected" value="" /> + <?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?> + <label class="hidden" for="find-posts-input"><?php _e( 'Search' ); ?></label> + <input type="text" id="find-posts-input" class="search-input" name="ps" value="" /> + <input type="button" onclick="findPosts.send();" value="<?php _e( 'Search' ); ?>" class="button" /><br /> + + <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" /> + <label for="find-posts-posts"><?php _e( 'Posts' ); ?></label> + <input type="radio" name="find-posts-what" id="find-posts-pages" value="pages" /> + <label for="find-posts-pages"><?php _e( 'Pages' ); ?></label> + </div> + <div id="find-posts-response"></div> + </div> + <div class="find-box-buttons"> + <input type="button" class="button" onclick="findPosts.close();" value="<?php _e('Close'); ?>" /> + <input id="find-posts-submit" type="submit" class="button" value="<?php _e('Select'); ?>" /> + </div> + </div> + <script type="text/javascript"> + /* <![CDATA[ */ + (function($){ + findPosts = { + open : function(af_name, af_val) { + var st = document.documentElement.scrollTop || $(document).scrollTop(); + + if ( af_name && af_val ) + $('#affected').attr('name', af_name).val(af_val); + + $('#find-posts').show().draggable({ + handle: '#find-posts-head' + }).resizable({ + handles: 'all', + minHeight: 150, + minWidth: 280 + }).css({'top':st+'px','left':'50%','marginLeft':'-200px'}); + + $('.ui-resizable-handle').css({ + 'backgroundColor': '#e5e5e5' + }); + + $('.ui-resizable-se').css({ + 'border': '0 none', + 'width': '15px', + 'height': '16px', + 'background': 'transparent url(images/se.png) no-repeat scroll 0 0' + }); + + $('#find-posts-input').focus().keyup(function(e){ + if (e.which == 27) findPosts.close(); // close on Escape + }); + + return false; + }, + + close : function() { + $('#find-posts-response').html(''); + $('#find-posts').draggable('destroy').resizable('destroy').hide(); + }, + + send : function() { + var post = {}; + + post['ps'] = $('#find-posts-input').val(); + post['action'] = 'find_posts'; + post['_ajax_nonce'] = $('#_ajax_nonce').val(); + + if ( $('#find-posts-pages:checked').val() ) + post['pages'] = 1; + else + post['posts'] = 1; + + $.ajax({ + type : 'POST', + url : '<?php echo admin_url('admin-ajax.php'); ?>', + data : post, + success : function(x) { findPosts.show(x); }, + error : function(r) { findPosts.error(r); } + }); + }, + + show : function(x) { + + if ( typeof(x) == 'string' ) { + this.error({'responseText': x}); + return; + } + + var r = wpAjax.parseAjaxResponse(x); + + if ( r.errors ) + this.error({'responseText': wpAjax.broken}); + + r = r.responses[0]; + $('#find-posts-response').html(r.data); + }, + + error : function(r) { + var er = r.statusText; + + if ( r.responseText ) + er = r.responseText.replace( /<.[^<>]*?>/g, '' ); + + if ( er ) + $('#find-posts-response').html(er); + } + }; + + $(document).ready(function(){ + $('#find-posts-submit').click(function(e) { + if ( '' == $('#find-posts-response').html() ) + e.preventDefault(); + }); + }); + })(jQuery); + /* ]]> */ + </script> +<?php +} + +/** + * Display the post password. + * + * The password is passed through {@link attribute_escape()} to ensure that it + * is safe for placing in an html attribute. + * + * @uses attribute_escape + * @since 2.7.0 + */ +function the_post_password() { + global $post; + if ( isset( $post->post_password ) ) echo attribute_escape( $post->post_password ); +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ +function favorite_actions() { + $actions = array( + 'post-new.php' => array(__('New Post'), 'edit_posts'), + 'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'), + 'page-new.php' => array(__('New Page'), 'edit_pages'), + 'media-new.php' => array(__('Upload'), 'upload_files'), + 'edit-comments.php' => array(__('Comments'), 'moderate_comments') + ); + + $actions = apply_filters('favorite_actions', $actions); + + $allowed_actions = array(); + foreach ( $actions as $action => $data ) { + if ( current_user_can($data[1]) ) + $allowed_actions[$action] = $data[0]; + } + + if ( empty($allowed_actions) ) + return; + + $first = array_keys($allowed_actions); + $first = $first[0]; + echo '<div id="favorite-actions">'; + echo '<div id="favorite-first"><a href="' . $first . '">' . $allowed_actions[$first] . '</a></div><div id="favorite-toggle"><br /></div>'; + echo '<div id="favorite-inside">'; + + array_shift($allowed_actions); + + foreach ( $allowed_actions as $action => $label) { + echo "<div class='favorite-action'><a href='$action'>"; + echo $label; + echo "</a></div>\n"; + } + echo "</div></div>\n"; +} + +/** + * Get the post title. + * + * The post title is fetched and if it is blank then a default string is + * returned. + * + * @since 2.7.0 + * @param int $id The post id. If not supplied the global $post is used. + * + */ +function _draft_or_post_title($post_id = 0) +{ + $title = get_the_title($post_id); + if ( empty($title) ) + $title = __('(no title)'); + return $title; +} + +/** + * Display the search query. + * + * A simple wrapper to display the "s" parameter in a GET URI. This function + * should only be used when {@link the_search_query()} cannot. + * + * @uses attribute_escape + * @since 2.7.0 + * + */ +function _admin_search_query() { + echo isset($_GET['s']) ? attribute_escape( stripslashes( $_GET['s'] ) ) : ''; +} + +/** + * Generic Iframe header for use with Thickbox + * + * @since 2.7.0 + * @param string $title Title of the Iframe page. + * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued). + * + */ +function iframe_header( $title = '', $limit_styles = false) { +?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>> +<head> +<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> +<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title> +<?php +wp_enqueue_style( 'global' ); +wp_enqueue_style( 'colors' ); +if ( ! $limit_styles ) + wp_enqueue_style( 'wp-admin' ); +?> +<script type="text/javascript"> +//<![CDATA[ +function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}} +//]]> +</script> +<?php +do_action('admin_print_styles'); +do_action('admin_print_scripts'); +do_action('admin_head'); +?> +</head> +<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>> +<?php +} + +/** + * Generic Iframe footer for use with Thickbox + * + * @since 2.7.0 + * + */ +function iframe_footer() { + echo ' + </body> +</html>'; +} + +function _post_states($post) { + $post_states = array(); + if ( isset($_GET['post_status']) ) + $post_status = $_GET['post_status']; + else + $post_status = ''; + + if ( !empty($post->post_password) ) + $post_states[] = __('Password protected'); + if ( 'private' == $post->post_status && 'private' != $post_status ) + $post_states[] = __('Private'); + if ( 'draft' == $post->post_status && 'draft' != $post_status ) + $post_states[] = __('Draft'); + if ( 'pending' == $post->post_status && 'pending' != $post_status ) + $post_states[] = __('Pending'); + + if ( ! empty($post_states) ) { + $state_count = count($post_states); + $i = 0; + echo ' - '; + foreach ( $post_states as $state ) { + ++$i; + ( $i == $state_count ) ? $sep = '' : $sep = ', '; + echo "<span class='post-state'>$state$sep</span>"; + } + } +} + +function screen_meta($screen) { + global $wp_meta_boxes, $_wp_contextual_help; + + $screen = str_replace('.php', '', $screen); + $screen = str_replace('-new', '', $screen); + $screen = str_replace('-add', '', $screen); + $screen = apply_filters('screen_meta_screen', $screen); + + $column_screens = get_column_headers($screen); + $meta_screens = array('index' => 'dashboard'); + + if ( isset($meta_screens[$screen]) ) + $screen = $meta_screens[$screen]; + $show_screen = false; + if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) + $show_screen = true; +?> +<div id="screen-meta"> +<?php + if ( $show_screen ) : +?> +<div id="screen-options-wrap" class="hidden"> + <h5><?php _e('Show on screen') ?></h5> + <form id="adv-settings" action="" method="get"> + <div class="metabox-prefs"> +<?php + if ( !meta_box_prefs($screen) && isset($column_screens) ) { + manage_columns_prefs($screen); + wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); + } +?> + <br class="clear" /> + </div></form> +</div> + +<?php + endif; + + global $title; + + if ( !isset($_wp_contextual_help) ) + $_wp_contextual_help = array(); + + if ( !isset($_wp_contextual_help['post']) ) { + $help = drag_drop_help(); + $help .= '<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Writing Posts</a>') . '</p>'; + $_wp_contextual_help['post'] = $help; + } + + if ( !isset($_wp_contextual_help['page']) ) { + $help = drag_drop_help(); + $_wp_contextual_help['page'] = $help; + } + + if ( !isset($_wp_contextual_help['dashboard']) ) { + $help = drag_drop_help(); + $_wp_contextual_help['dashboard'] = $help; + } + + if ( !isset($_wp_contextual_help['link']) ) { + $help = drag_drop_help(); + $_wp_contextual_help['link'] = $help; + } + + if ( !isset($_wp_contextual_help['options-general']) ) + $_wp_contextual_help['options-general'] = __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>'); + + $_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen); + ?> + <div id="contextual-help-wrap" class="hidden"> + <?php + $contextual_help = ''; + if ( isset($_wp_contextual_help[$screen]) ) { + if ( !empty($title) ) + $contextual_help .= '<h5>' . sprintf(__('Get help with "%s"'), $title) . '</h5>'; + else + $contextual_help .= '<h5>' . __('Get help with this page') . '</h5>'; + $contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen] . "</div>\n"; + + $contextual_help .= '<h5>' . __('Other Help') . '</h5>'; + } else { + $contextual_help .= '<h5>' . __('Help') . '</h5>'; + } + + $contextual_help .= '<div class="metabox-prefs">'; + $contextual_help .= __('<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>'); + $contextual_help .= '<br />'; + $contextual_help .= __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>'); + $contextual_help .= "</div>\n"; + echo apply_filters('contextual_help', $contextual_help, $screen); + ?> + </div> + +<div id="screen-meta-links"> +<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle"> +<a href="#contextual-help" id="contextual-help-link" class="show-settings"><?php _e('Help') ?></a> +</div> +<?php if ( $show_screen ) { ?> +<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle"> +<a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a> +</div> +<?php } ?> +</div> +</div> +<?php +} + +/** + * Add contextual help text for a page + * + * @since 2.7.0 + * + * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. + * @param string $help Arbitrary help text + */ +function add_contextual_help($screen, $help) { + global $_wp_contextual_help; + + if ( !isset($_wp_contextual_help) ) + $_wp_contextual_help = array(); + + $_wp_contextual_help[$screen] = $help; +} + +function drag_drop_help() { + return ' + <p>' . __('Most of the modules on this screen can be moved. If you hover your mouse over the title bar of a module you’ll notice the 4 arrow cursor appears to let you know it is movable. Click on it, hold down the mouse button and start dragging the module to a new location. As you drag the module, notice the dotted gray box that also moves. This box indicates where the module will be placed when you release the mouse button.') . '</p> + <p>' . __('The same modules can be expanded and collapsed by clicking once on their title bar and also completely hidden from the Screen Options tab.') . '</p> +'; +} + +function screen_icon($name = '') { + global $parent_file, $hook_suffix; + + if ( empty($name) ) { + if ( isset($parent_file) && !empty($parent_file) ) + $name = substr($parent_file, 0, -4); + else + $name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix); + } + unset($hook_suffix); +?> + <div id="icon-<?php echo $name; ?>" class="icon32"><br /></div> +<?php +} + ?> wp-admin/includes/template.php @@ -1,5 +1,18 @@ <?php +/** + * WordPress Theme Administration API + * + * @package WordPress + * @subpackage Administration + */ +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function current_theme_info() { $themes = get_themes(); $current_theme = get_current_theme(); @@ -18,6 +31,13 @@ function current_theme_info() { return $ct; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function get_broken_themes() { global $wp_broken_themes; @@ -25,6 +45,13 @@ function get_broken_themes() { return $wp_broken_themes; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function get_page_templates() { $themes = get_themes(); $theme = get_current_theme(); @@ -35,11 +62,13 @@ function get_page_templates() { foreach ( $templates as $template ) { $template_data = implode( '', file( WP_CONTENT_DIR.$template )); - preg_match( '|Template Name:(.*)$|mi', $template_data, $name ); - preg_match( '|Description:(.*)$|mi', $template_data, $description ); + $name = ''; + if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) + $name = $name[1]; - $name = $name[1]; - $description = $description[1]; + $description = ''; + if( preg_match( '|Description:(.*)$|mi', $template_data, $description ) ) + $description = $description[1]; if ( !empty( $name ) ) { $page_templates[trim( $name )] = basename( $template ); wp-admin/includes/theme.php @@ -1,42 +1,134 @@ <?php +/** + * WordPress Administration Update API + * + * @package WordPress + * @subpackage Admin + */ // The admin side of our 1.1 update system +/** + * Selects the first update version from the update_core option + * + * @return object the response from the API + */ +function get_preferred_from_update_core() { + $updates = get_core_updates(); + if ( !is_array( $updates ) ) + return false; + if ( empty( $updates ) ) + return (object)array('response' => 'latest'); + return $updates[0]; +} + +/** + * Get available core updates + * + * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, + * set $options['available'] to false to skip not-dimissed updates. + * @return array Array of the update objects + */ +function get_core_updates( $options = array() ) { + $options = array_merge( array('available' => true, 'dismissed' => false ), $options ); + $dismissed = get_option( 'dismissed_update_core' ); + if ( !is_array( $dismissed ) ) $dismissed = array(); + $from_api = get_option( 'update_core' ); + if ( empty($from_api) ) + return false; + if ( !is_array( $from_api->updates ) ) return false; + $updates = $from_api->updates; + if ( !is_array( $updates ) ) return false; + $result = array(); + foreach($updates as $update) { + if ( array_key_exists( $update->current.'|'.$update->locale, $dismissed ) ) { + if ( $options['dismissed'] ) { + $update->dismissed = true; + $result[]= $update; + } + } else { + if ( $options['available'] ) { + $update->dismissed = false; + $result[]= $update; + } + } + } + return $result; +} + +function dismiss_core_update( $update ) { + $dismissed = get_option( 'dismissed_update_core' ); + $dismissed[ $update->current.'|'.$update->locale ] = true; + return update_option( 'dismissed_update_core', $dismissed ); +} + +function undismiss_core_update( $version, $locale ) { + $dismissed = get_option( 'dismissed_update_core' ); + $key = $version.'|'.$locale; + if ( !isset( $dismissed[$key] ) ) return false; + unset( $dismissed[$key] ); + return update_option( 'dismissed_update_core', $dismissed ); +} + +function find_core_update( $version, $locale ) { + $from_api = get_option( 'update_core' ); + if ( !is_array( $from_api->updates ) ) return false; + $updates = $from_api->updates; + foreach($updates as $update) { + if ( $update->current == $version && $update->locale == $locale ) + return $update; + } + return false; +} + function core_update_footer( $msg = '' ) { if ( !current_user_can('manage_options') ) return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); - $cur = get_option( 'update_core' ); + $cur = get_preferred_from_update_core(); + if ( ! isset( $cur->current ) ) + $cur->current = ''; + + if ( ! isset( $cur->url ) ) + $cur->url = ''; + + if ( ! isset( $cur->response ) ) + $cur->response = ''; switch ( $cur->response ) { case 'development' : - return sprintf( '| '.__( 'You are using a development version (%s). Cool! Please <a href="%s">stay updated</a>.' ), $GLOBALS['wp_version'], $cur->url, $cur->current ); + return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update-core.php'); break; case 'upgrade' : if ( current_user_can('manage_options') ) { - return sprintf( '| <strong>'.__( '<a href="%2$s">Get Version %3$s</a>' ).'</strong>', $GLOBALS['wp_version'], $cur->url, $cur->current ); + return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current); break; } case 'latest' : default : - return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'], $cur->url, $cur->current ); + return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); break; } } add_filter( 'update_footer', 'core_update_footer' ); function update_nag() { - $cur = get_option( 'update_core' ); + global $pagenow; + + if ( 'update-core.php' == $pagenow ) + return; + + $cur = get_preferred_from_update_core(); if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) return false; if ( current_user_can('manage_options') ) - $msg = sprintf( __('WordPress %2$s is available! <a href="%1$s">Please update now</a>.'), $cur->url, $cur->current ); + $msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' ); else - $msg = sprintf( __('WordPress %2$s is available! Please notify the site administrator.'), $cur->url, $cur->current ); + $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); echo "<div id='update-nag'>$msg</div>"; } @@ -44,11 +136,11 @@ add_action( 'admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { - $cur = get_option( 'update_core' ); + $cur = get_preferred_from_update_core(); - $msg = sprintf( __('This is WordPress version %s.'), $GLOBALS['wp_version'] ); + $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] ); if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') ) - $msg .= " <a href='$cur->url' class='rbutton'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>'; + $msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>'; echo "<span id='wp-version-message'>$msg</span>"; } @@ -60,14 +152,16 @@ function wp_plugin_update_row( $file, $plugin_data ) { $r = $current->response[ $file ]; + $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); + echo '<tr><td colspan="5" class="plugin-update">'; if ( ! current_user_can('update_plugins') ) - printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a>.'), $plugin_data['Name'], $r->url, $r->new_version); + printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a>.'), $plugin_data['Name'], $details_url, $r->new_version); else if ( empty($r->package) ) - printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_data['Name'], $r->url, $r->new_version); + printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_data['Name'], $details_url, $r->new_version); else - printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $r->url, $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&amp;plugin=' . $file, 'upgrade-plugin_' . $file) ); - + printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $details_url, $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&amp;plugin=' . $file, 'upgrade-plugin_' . $file) ); + echo '</td></tr>'; } add_action( 'after_plugin_row', 'wp_plugin_update_row', 10, 2 ); @@ -102,7 +196,7 @@ function wp_update_plugin($plugin, $feedback = '') { $content_dir = $wp_filesystem->wp_content_dir(); if( empty($content_dir) ) return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - + $plugins_dir = trailingslashit( $plugins_dir ); $content_dir = trailingslashit( $content_dir ); @@ -129,10 +223,10 @@ function wp_update_plugin($plugin, $feedback = '') { apply_filters('update_feedback', __('Unpacking the update')); // Unzip package to working directory $result = unzip_file($download_file, $working_dir); - + // Once extracted, delete the package unlink($download_file); - + if ( is_wp_error($result) ) { $wp_filesystem->delete($working_dir, true); return $result; @@ -147,7 +241,7 @@ function wp_update_plugin($plugin, $feedback = '') { // Remove the existing plugin. apply_filters('update_feedback', __('Removing the old version of the plugin')); $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); - + // If plugin is in its own directory, recursively delete the directory. if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder $deleted = $wp_filesystem->delete($this_plugin_dir, true); @@ -163,7 +257,7 @@ function wp_update_plugin($plugin, $feedback = '') { // Copy new version of plugin into place. $result = copy_dir($working_dir, $plugins_dir); if ( is_wp_error($result) ) { - //$wp_filesystem->delete($working_dir, true); //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails. + $wp_filesystem->delete($working_dir, true); return $result; } @@ -175,10 +269,10 @@ function wp_update_plugin($plugin, $feedback = '') { // Force refresh of plugin update information delete_option('update_plugins'); - + if( empty($filelist) ) return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. - + $folder = $filelist[0]; $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list @@ -186,4 +280,213 @@ function wp_update_plugin($plugin, $feedback = '') { return $folder . '/' . $pluginfiles[0]; } +function wp_update_theme($theme, $feedback = '') { + global $wp_filesystem; + + if ( !empty($feedback) ) + add_filter('update_feedback', $feedback); + + // Is an update available? + $current = get_option( 'update_themes' ); + if ( !isset( $current->response[ $theme ] ) ) + return new WP_Error('up_to_date', __('The theme is at the latest version.')); + + $r = $current->response[ $theme ]; + + $themes = get_themes(); + foreach ( (array) $themes as $this_theme ) { + if ( $this_theme['Stylesheet'] == $theme ) { + $theme_directory = preg_replace('!^/themes/!i', '', $this_theme['Stylesheet Dir']); + break; + } + } + unset($themes); + + if ( empty($theme_directory) ) + return new WP_Error('theme_non_existant', __('Theme does not exist.')); + + // Is a filesystem accessor setup? + if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) + WP_Filesystem(); + + if ( ! is_object($wp_filesystem) ) + return new WP_Error('fs_unavailable', __('Could not access filesystem.')); + + if ( $wp_filesystem->errors->get_error_code() ) + return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); + + //Get the base plugin folder + $themes_dir = $wp_filesystem->wp_themes_dir(); + if ( empty($themes_dir) ) + return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress Theme directory.')); + + //And the same for the Content directory. + $content_dir = $wp_filesystem->wp_content_dir(); + if( empty($content_dir) ) + return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); + + $themes_dir = trailingslashit( $themes_dir ); + $content_dir = trailingslashit( $content_dir ); + + if ( empty($r->package) ) + return new WP_Error('no_package', __('Upgrade package not available.')); + + // Download the package + apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $r['package'])); + $download_file = download_url($r['package']); + + if ( is_wp_error($download_file) ) + return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); + + $working_dir = $content_dir . 'upgrade/' . basename($theme_directory); + + // Clean up working directory + if ( $wp_filesystem->is_dir($working_dir) ) + $wp_filesystem->delete($working_dir, true); + + apply_filters('update_feedback', __('Unpacking the update')); + // Unzip package to working directory + $result = unzip_file($download_file, $working_dir); + + // Once extracted, delete the package + unlink($download_file); + + if ( is_wp_error($result) ) { + $wp_filesystem->delete($working_dir, true); + return $result; + } + + //TODO: Is theme currently active? If so, set default theme + /* + if ( is_plugin_active($plugin) ) { + //Deactivate the plugin silently, Prevent deactivation hooks from running. + apply_filters('update_feedback', __('Deactivating the plugin')); + deactivate_plugins($plugin, true); + }*/ + + // Remove the existing plugin. + apply_filters('update_feedback', __('Removing the old version of the theme')); + $deleted = $wp_filesystem->delete($themes_dir . $theme_directory, true); + + if ( ! $deleted ) { + $wp_filesystem->delete($working_dir, true); + return new WP_Error('delete_failed', __('Could not remove the old plugin')); + } + + apply_filters('update_feedback', __('Installing the latest version')); + // Copy new version of plugin into place. + $result = copy_dir($working_dir, $themes_dir); + if ( is_wp_error($result) ) { + $wp_filesystem->delete($working_dir, true); + return $result; + } + + //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin + //$filelist = array_keys( $wp_filesystem->dirlist($working_dir) ); + + // Remove working directory + $wp_filesystem->delete($working_dir, true); + + // Force refresh of plugin update information + delete_option('update_themes'); + + /*if( empty($filelist) ) + return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. + + $folder = $filelist[0]; + $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash + $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list + + return $folder . '/' . $pluginfiles[0];*/ +} + + +function wp_update_core($current, $feedback = '') { + global $wp_filesystem; + + @set_time_limit( 300 ); + + if ( !empty($feedback) ) + add_filter('update_feedback', $feedback); + + // Is an update available? + if ( !isset( $current->response ) || $current->response == 'latest' ) + return new WP_Error('up_to_date', __('WordPress is at the latest version.')); + + // Is a filesystem accessor setup? + if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) + WP_Filesystem(); + + if ( ! is_object($wp_filesystem) ) + return new WP_Error('fs_unavailable', __('Could not access filesystem.')); + + if ( $wp_filesystem->errors->get_error_code() ) + return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); + + // Get the base WP folder + $wp_dir = $wp_filesystem->abspath(); + if ( empty($wp_dir) ) + return new WP_Error('fs_no_wp_dir', __('Unable to locate WordPress directory.')); + + // And the same for the Content directory. + $content_dir = $wp_filesystem->wp_content_dir(); + if( empty($content_dir) ) + return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); + + $wp_dir = trailingslashit( $wp_dir ); + $content_dir = trailingslashit( $content_dir ); + + // Get the URL to the zip file + $package = $current->package; + + // Download the package + apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package)); + $download_file = download_url($package); + + if ( is_wp_error($download_file) ) + return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); + + $working_dir = $content_dir . 'upgrade/core'; + // Clean up working directory + if ( $wp_filesystem->is_dir($working_dir) ) { + $wp_filesystem->delete($working_dir, true); + } + + apply_filters('update_feedback', __('Unpacking the core update')); + // Unzip package to working directory + $result = unzip_file($download_file, $working_dir); + // Once extracted, delete the package + unlink($download_file); + + if ( is_wp_error($result) ) { + $wp_filesystem->delete($working_dir, true); + return $result; + } + + // Copy update-core.php from the new version into place. + if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) { + $wp_filesystem->delete($working_dir, true); + return new WP_Error('copy_failed', __('Could not copy files')); + } + $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE); + + require(ABSPATH . 'wp-admin/includes/update-core.php'); + + return update_core($working_dir, $wp_dir); +} + +function maintenance_nag() { + global $upgrading; + if ( ! isset( $upgrading ) ) + return false; + + if ( current_user_can('manage_options') ) + $msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' ); + else + $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.'); + + echo "<div id='update-nag'>$msg</div>"; +} +add_action( 'admin_notices', 'maintenance_nag' ); + ?> wp-admin/includes/update.php @@ -1,11 +1,38 @@ <?php +/** + * WordPress Upgrade API + * + * Most of the functions are pluggable and can be overwritten + * + * @package WordPress + * @subpackage Administration + */ +/** Include user install customize script. */ if ( file_exists(WP_CONTENT_DIR . '/install.php') ) require (WP_CONTENT_DIR . '/install.php'); + +/** WordPress Administration API */ require_once(ABSPATH . 'wp-admin/includes/admin.php'); + +/** WordPress Schema API */ require_once(ABSPATH . 'wp-admin/includes/schema.php'); if ( !function_exists('wp_install') ) : +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param string $blog_title Blog title. + * @param string $user_name User's username. + * @param string $user_email User's email. + * @param bool $public Whether blog is public. + * @param null $deprecated Optional. Not used. + * @return array Array keys 'url', 'user_id', 'password'. + */ function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') { global $wp_rewrite; @@ -53,6 +80,15 @@ function wp_install($blog_title, $user_name, $user_email, $public, $deprecated=' endif; if ( !function_exists('wp_install_defaults') ) : +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param int $user_id User ID. + */ function wp_install_defaults($user_id) { global $wpdb; @@ -107,6 +143,18 @@ function wp_install_defaults($user_id) { endif; if ( !function_exists('wp_new_blog_notification') ) : +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param string $blog_title Blog title. + * @param string $blog_url Blog url. + * @param int $user_id User ID. + * @param string $password User's Password. + */ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) { $user = new WP_User($user_id); $email = $user->user_email; @@ -132,6 +180,15 @@ http://wordpress.org/ endif; if ( !function_exists('wp_upgrade') ) : +/** + * Run WordPress Upgrade functions. + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @return null + */ function wp_upgrade() { global $wp_current_db_version, $wp_db_version; @@ -141,6 +198,9 @@ function wp_upgrade() { if ( $wp_db_version == $wp_current_db_version ) return; + if( ! is_blog_installed() ) + return; + wp_check_mysql_version(); wp_cache_flush(); make_db_current_silent(); @@ -149,7 +209,13 @@ function wp_upgrade() { } endif; -// Functions to be called in install and upgrade scripts +/** + * Functions to be called in install and upgrade scripts. + * + * {@internal Missing Long Description}} + * + * @since unknown + */ function upgrade_all() { global $wp_current_db_version, $wp_db_version, $wp_rewrite; $wp_current_db_version = __get_option('db_version'); @@ -207,6 +273,9 @@ function upgrade_all() { if ( $wp_current_db_version < 8201 ) upgrade_260(); + if ( $wp_current_db_version < 8989 ) + upgrade_270(); + maybe_disable_automattic_widgets(); $wp_rewrite->flush_rules(); @@ -214,6 +283,11 @@ function upgrade_all() { update_option('db_version', $wp_db_version); } +/** + * Execute changes made in WordPress 1.0. + * + * @since 1.0.0 + */ function upgrade_100() { global $wpdb; @@ -236,7 +310,6 @@ function upgrade_100() { } } - $wpdb->query("UPDATE $wpdb->options SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/') WHERE option_name LIKE 'links_rating_image%' AND option_value LIKE 'wp-links/links-images/%'"); @@ -266,6 +339,11 @@ function upgrade_100() { endif; } +/** + * Execute changes made in WordPress 1.0.1. + * + * @since 1.0.1 + */ function upgrade_101() { global $wpdb; @@ -279,7 +357,11 @@ function upgrade_101() { add_clean_index($wpdb->links , 'link_visible'); } - +/** + * Execute changes made in WordPress 1.2. + * + * @since 1.2.0 + */ function upgrade_110() { global $wpdb; @@ -299,7 +381,6 @@ function upgrade_110() { } } - // Get the GMT offset, we'll use that later on $all_options = get_alloptions_110(); @@ -336,6 +417,11 @@ function upgrade_110() { } +/** + * Execute changes made in WordPress 1.5. + * + * @since 1.5.0 + */ function upgrade_130() { global $wpdb; @@ -413,6 +499,11 @@ function upgrade_130() { make_site_theme(); } +/** + * Execute changes made in WordPress 2.0. + * + * @since 2.0.0 + */ function upgrade_160() { global $wpdb, $wp_current_db_version; @@ -491,6 +582,11 @@ function upgrade_160() { } } +/** + * Execute changes made in WordPress 2.1. + * + * @since 2.1.0 + */ function upgrade_210() { global $wpdb, $wp_current_db_version; @@ -530,6 +626,11 @@ function upgrade_210() { } } +/** + * Execute changes made in WordPress 2.3. + * + * @since 2.3.0 + */ function upgrade_230() { global $wp_current_db_version, $wpdb; @@ -568,7 +669,7 @@ function upgrade_230() { } } - $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES + $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES (%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) ); $count = 0; @@ -700,6 +801,11 @@ function upgrade_230() { } } +/** + * Remove old options from the database. + * + * @since 2.3.0 + */ function upgrade_230_options_table() { global $wpdb; $old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' ); @@ -709,6 +815,11 @@ function upgrade_230_options_table() { $wpdb->show_errors(); } +/** + * Remove old categories, link2cat, and post2cat database tables. + * + * @since 2.3.0 + */ function upgrade_230_old_tables() { global $wpdb; $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories'); @@ -716,22 +827,36 @@ function upgrade_230_old_tables() { $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat'); } +/** + * Upgrade old slugs made in version 2.2. + * + * @since 2.2.0 + */ function upgrade_old_slugs() { // upgrade people who were using the Redirect Old Slugs plugin global $wpdb; $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'"); } - +/** + * Execute changes made in WordPress 2.5.0. + * + * @since 2.5.0 + */ function upgrade_250() { global $wp_current_db_version; if ( $wp_current_db_version < 6689 ) { populate_roles_250(); } - + } +/** + * Execute changes made in WordPress 2.5.1. + * + * @since 2.5.1 + */ function upgrade_251() { global $wp_current_db_version; @@ -739,13 +864,25 @@ function upgrade_251() { update_option('secret', wp_generate_password(64)); } +/** + * Execute changes made in WordPress 2.5.2. + * + * @since 2.5.2 + */ function upgrade_252() { global $wpdb; $wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''"); } +/** + * Execute changes made in WordPress 2.6. + * + * @since 2.6.0 + */ function upgrade_260() { + global $wp_current_db_version; + if ( $wp_current_db_version < 8000 ) populate_roles_260(); @@ -755,9 +892,38 @@ function upgrade_260() { } } +/** + * Execute changes made in WordPress 2.7. + * + * @since 2.7.0 + */ +function upgrade_270() { + global $wpdb, $wp_current_db_version; + + if ( $wp_current_db_version < 8980 ) + populate_roles_270(); + + // Update post_date for unpublished posts with empty timestamp + if ( $wp_current_db_version < 8921 ) + $wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" ); +} + + // The functions we use to actually do stuff // General + +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param string $table_name Database table name to create. + * @param string $create_ddl SQL statement to create table. + * @return bool If table already exists or was created by function. + */ function maybe_create_table($table_name, $create_ddl) { global $wpdb; foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { @@ -776,6 +942,17 @@ function maybe_create_table($table_name, $create_ddl) { return false; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param string $table Database table name. + * @param string $index Index name to drop. + * @return bool True, when finished. + */ function drop_index($table, $index) { global $wpdb; $wpdb->hide_errors(); @@ -788,6 +965,17 @@ function drop_index($table, $index) { return true; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param string $table Database table name. + * @param string $index Database table index column. + * @return bool True, when done with execution. + */ function add_clean_index($table, $index) { global $wpdb; drop_index($table, $index); @@ -820,8 +1008,13 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { return false; } - -// get_alloptions as it was for 1.2. +/** + * Retrieve all options as it was for 1.2. + * + * @since 1.2.0 + * + * @return array List of options. + */ function get_alloptions_110() { global $wpdb; if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) { @@ -837,7 +1030,15 @@ function get_alloptions_110() { return $all_options; } -// Version of get_option that is private to install/upgrade. +/** + * Version of get_option that is private to install/upgrade. + * + * @since unknown + * @access private + * + * @param string $setting Option name. + * @return mixed + */ function __get_option($setting) { global $wpdb; @@ -864,6 +1065,16 @@ function __get_option($setting) { return $option; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param string $content + * @return string + */ function deslash($content) { // Note: \\\ inside a regex denotes a single backslash. @@ -881,6 +1092,17 @@ function deslash($content) { return $content; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param unknown_type $queries + * @param unknown_type $execute + * @return unknown + */ function dbDelta($queries, $execute = true) { global $wpdb; @@ -1082,6 +1304,13 @@ function dbDelta($queries, $execute = true) { return $for_update; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + */ function make_db_current() { global $wp_queries; @@ -1091,12 +1320,30 @@ function make_db_current() { echo "</ol>\n"; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + */ function make_db_current_silent() { global $wp_queries; $alterations = dbDelta($wp_queries); } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param unknown_type $theme_name + * @param unknown_type $template + * @return unknown + */ function make_site_theme_from_oldschool($theme_name, $template) { $home_path = get_home_path(); $site_dir = WP_CONTENT_DIR . "/themes/$template"; @@ -1165,6 +1412,17 @@ function make_site_theme_from_oldschool($theme_name, $template) { return true; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param unknown_type $theme_name + * @param unknown_type $template + * @return unknown + */ function make_site_theme_from_default($theme_name, $template) { $site_dir = WP_CONTENT_DIR . "/themes/$template"; $default_dir = WP_CONTENT_DIR . '/themes/default'; @@ -1220,6 +1478,15 @@ function make_site_theme_from_default($theme_name, $template) { } // Create a site theme from the default theme. +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @return unknown + */ function make_site_theme() { // Name the theme after the blog. $theme_name = __get_option('blogname'); @@ -1261,6 +1528,14 @@ function make_site_theme() { return $template; } +/** + * Translate user level to user role name. + * + * @since unknown + * + * @param int $level User level. + * @return string User role name. + */ function translate_level_to_role($level) { switch ($level) { case 10: @@ -1282,6 +1557,13 @@ function translate_level_to_role($level) { } } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + */ function wp_check_mysql_version() { global $wpdb; $result = $wpdb->check_database_version(); @@ -1289,6 +1571,13 @@ function wp_check_mysql_version() { die( $result->get_error_message() ); } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + */ function maybe_disable_automattic_widgets() { $plugins = __get_option( 'active_plugins' ); wp-admin/includes/upgrade.php @@ -1,6 +1,21 @@ <?php - -// Creates a new user from the "Users" form using $_POST information. +/** + * WordPress user administration API. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Creates a new user from the "Users" form using $_POST information. + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param int $user_id Optional. User ID. + * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters. + */ function add_user() { if ( func_num_args() ) { // The hackiest hack that ever did hack global $current_user, $wp_roles; @@ -18,6 +33,16 @@ function add_user() { } } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param int $user_id Optional. User ID. + * @return unknown + */ function edit_user( $user_id = 0 ) { global $current_user, $wp_roles, $wpdb; if ( $user_id != 0 ) { @@ -71,7 +96,13 @@ function edit_user( $user_id = 0 ) { else if ( isset( $_POST['rich_editing'] ) ) $user->rich_editing = $_POST['rich_editing']; else - $user->rich_editing = 'false'; + $user->rich_editing = 'true'; + + $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] )? $_POST['comment_shortcuts'] : ''; + + $user->use_ssl = 0; + if ( !empty($_POST['use_ssl']) ) + $user->use_ssl = 1; if ( !$update ) $user->admin_color = 'fresh'; // Default to fresh for new users. @@ -138,12 +169,31 @@ function edit_user( $user_id = 0 ) { return $user_id; } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @return array List of user IDs. + */ function get_author_user_ids() { global $wpdb; $level_key = $wpdb->prefix . 'user_level'; return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) ); } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param int $user_id User ID. + * @return array|bool List of editable authors. False if no editable users. + */ function get_editable_authors( $user_id ) { global $wpdb; @@ -159,13 +209,24 @@ function get_editable_authors( $user_id ) { return apply_filters('get_editable_authors', $authors); } -function get_editable_user_ids( $user_id, $exclude_zeros = true ) { +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @param int $user_id User ID. + * @param bool $exclude_zeros Optional, default is true. Whether to exclude zeros. + * @return unknown + */ +function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) { global $wpdb; $user = new WP_User( $user_id ); - if ( ! $user->has_cap('edit_others_posts') ) { - if ( $user->has_cap('edit_posts') || $exclude_zeros == false ) + if ( ! $user->has_cap("edit_others_{$post_type}s") ) { + if ( $user->has_cap("edit_{$post_type}s") || $exclude_zeros == false ) return array($user->id); else return false; @@ -180,6 +241,15 @@ function get_editable_user_ids( $user_id, $exclude_zeros = true ) { return $wpdb->get_col( $query ); } +/** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * + * @return unknown + */ function get_nonauthor_user_ids() { global $wpdb; $level_key = $wpdb->prefix . 'user_level'; @@ -187,6 +257,15 @@ function get_nonauthor_user_ids() { return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) ); } +/** + * Retrieve editable posts from other users. + * + * @since unknown + * + * @param int $user_id User ID to not retrieve posts from. + * @param string $type Optional, defaults to 'any'. Post type to retrieve, can be 'draft' or 'pending'. + * @return array List of posts from others. + */ function get_others_unpublished_posts($user_id, $type='any') { global $wpdb; @@ -209,14 +288,38 @@ function get_others_unpublished_posts($user_id, $type='any') { return apply_filters('get_others_drafts', $other_unpubs); } +/** + * Retrieve drafts from other users. + * + * @since unknown + * + * @param int $user_id User ID. + * @return array List of drafts from other users. + */ function get_others_drafts($user_id) { return get_others_unpublished_posts($user_id, 'draft'); } +/** + * Retrieve pending review posts from other users. + * + * @since unknown + * + * @param int $user_id User ID. + * @return array List of posts with pending review post type from other users. + */ function get_others_pending($user_id) { return get_others_unpublished_posts($user_id, 'pending'); } +/** + * Retrieve user data and filter it. + * + * @since unknown + * + * @param int $user_id User ID. + * @return object WP_User object with user data. + */ function get_user_to_edit( $user_id ) { $user = new WP_User( $user_id ); $user->user_login = attribute_escape($user->user_login); @@ -226,14 +329,22 @@ function get_user_to_edit( $user_id ) { $user->last_name = attribute_escape($user->last_name); $user->display_name = attribute_escape($user->display_name); $user->nickname = attribute_escape($user->nickname); - $user->aim = attribute_escape($user->aim); - $user->yim = attribute_escape($user->yim); - $user->jabber = attribute_escape($user->jabber); - $user->description = wp_specialchars($user->description); + $user->aim = isset( $user->aim ) && !empty( $user->aim ) ? attribute_escape($user->aim) : ''; + $user->yim = isset( $user->yim ) && !empty( $user->yim ) ? attribute_escape($user->yim) : ''; + $user->jabber = isset( $user->jabber ) && !empty( $user->jabber ) ? attribute_escape($user->jabber) : ''; + $user->description = isset( $user->description ) && !empty( $user->description ) ? wp_specialchars($user->description) : ''; return $user; } +/** + * Retrieve the user's drafts. + * + * @since unknown + * + * @param int $user_id User ID. + * @return array + */ function get_users_drafts( $user_id ) { global $wpdb; $query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id); @@ -241,6 +352,20 @@ function get_users_drafts( $user_id ) { return $wpdb->get_results( $query ); } +/** + * Remove user and optionally reassign posts and links to another user. + * + * If the $reassign parameter is not assigned to an User ID, then all posts will + * be deleted of that user. The action 'delete_user' that is passed the User ID + * being deleted will be run after the posts are either reassigned or deleted. + * The user meta will also be deleted that are for that User ID. + * + * @since unknown + * + * @param int $id User ID. + * @param int $reassign Optional. Reassign posts and links to new User ID. + * @return bool True when finished. + */ function wp_delete_user($id, $reassign = 'novalue') { global $wpdb; @@ -275,6 +400,13 @@ function wp_delete_user($id, $reassign = 'novalue') { return true; } +/** + * Remove all capabilities from user. + * + * @since unknown + * + * @param int $id User ID. + */ function wp_revoke_user($id) { $id = (int) $id; @@ -282,27 +414,161 @@ function wp_revoke_user($id) { $user->remove_all_caps(); } -// WP_User_Search class -// by Mark Jaquith - if ( !class_exists('WP_User_Search') ) : +/** + * WordPress User Search class. + * + * @since unknown + * @author Mark Jaquith + */ class WP_User_Search { + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $results; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $search_term; + + /** + * Page number. + * + * @since unknown + * @access private + * @var int + */ var $page; + + /** + * Role name that users have. + * + * @since unknown + * @access private + * @var string + */ var $role; + + /** + * Raw page number. + * + * @since unknown + * @access private + * @var int|bool + */ var $raw_page; + + /** + * Amount of users to display per page. + * + * @since unknown + * @access public + * @var int + */ var $users_per_page = 50; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $first_user; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var int + */ var $last_user; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $query_limit; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $query_sort; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $query_from_where; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var int + */ var $total_users_for_query = 0; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var bool + */ var $too_many_total_users = false; + + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ var $search_errors; - function WP_User_Search ($search_term = '', $page = '', $role = '') { // constructor + /** + * {@internal Missing Description}} + * + * @since unknown + * @access private + * @var unknown_type + */ + var $paging_text; + + /** + * PHP4 Constructor - Sets up the object properties. + * + * @since unknown + * + * @param string $search_term Search terms string. + * @param int $page Optional. Page ID. + * @param string $role Role name. + * @return WP_User_Search + */ + function WP_User_Search ($search_term = '', $page = '', $role = '') { $this->search_term = $search_term; $this->raw_page = ( '' == $page ) ? false : (int) $page; $this->page = (int) ( '' == $page ) ? 1 : $page; @@ -314,6 +580,14 @@ class WP_User_Search { $this->do_paging(); } + /** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * @access public + */ function prepare_query() { global $wpdb; $this->first_user = ($this->page - 1) * $this->users_per_page; @@ -338,6 +612,14 @@ class WP_User_Search { } + /** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * @access public + */ function query() { global $wpdb; $this->results = $wpdb->get_col('SELECT ID ' . $this->query_from_where . $this->query_sort . $this->query_limit); @@ -348,10 +630,26 @@ class WP_User_Search { $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!')); } + /** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * @access public + */ function prepare_vars_for_template_usage() { $this->search_term = stripslashes($this->search_term); // done with DB, from now on we want slashes gone } + /** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * @access public + */ function do_paging() { if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results $args = array(); @@ -367,23 +665,67 @@ class WP_User_Search { 'format' => 'userspage=%#%', 'add_args' => $args ) ); + if ( $this->paging_text ) { + $this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s', + number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ), + number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ), + number_format_i18n( $this->total_users_for_query ), + $this->paging_text + ); + } } } + /** + * {@internal Missing Short Description}} + * + * {@internal Missing Long Description}} + * + * @since unknown + * @access public + * + * @return unknown + */ function get_results() { return (array) $this->results; } + /** + * Displaying paging text. + * + * @see do_paging() Builds paging text. + * + * @since unknown + * @access public + */ function page_links() { echo $this->paging_text; } + /** + * Whether paging is enabled. + * + * @see do_paging() Builds paging text. + * + * @since unknown + * @access public + * + * @return bool + */ function results_are_paged() { if ( $this->paging_text ) return true; return false; } + /** + * Whether there are search terms. + * + * @since unknown + * @access public + * + * @return bool + */ function is_search() { if ( $this->search_term ) return true; wp-admin/includes/user.php @@ -1,6 +1,21 @@ <?php +/** + * WordPress Widgets Administration API + * + * @package WordPress + * @subpackage Administration + */ -// $_search is unsanitized +/** + * Display list of widgets, either all or matching search. + * + * The search parameter are search terms separated by spaces. + * + * @since unknown + * + * @param string $show Optional, default is all. What to display, can be 'all', 'unused', or 'used'. + * @param string $_search Optional. Search for widgets. Should be unsanitized. + */ function wp_list_widgets( $show = 'all', $_search = false ) { global $wp_registered_widgets, $sidebars_widgets, $wp_registered_widget_controls; if ( $_search ) { @@ -46,9 +61,11 @@ function wp_list_widgets( $show = 'all', $_search = false ) { if ( ( 'unused' == $show && $sidebar ) || ( 'used' == $show && !$sidebar ) ) continue; + if ( ! isset( $widget['params'][0] ) ) + $widget['params'][0] = array(); ob_start(); - $args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template', '_show' => $show ), 1 => $widget['params'][0] ) ); - $sidebar_args = call_user_func_array( 'wp_widget_control', $args ); + $args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template', '_show' => $show ), 1 => $widget['params'][0] ) ); + $sidebar_args = call_user_func_array( 'wp_widget_control', $args ); $widget_control_template = ob_get_contents(); ob_end_clean(); @@ -84,7 +101,7 @@ function wp_list_widgets( $show = 'all', $_search = false ) { 'edit' => $widget['id'], 'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ), ) ) ); - + $widget_control_template = '<textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea>'; } @@ -148,8 +165,13 @@ function wp_list_widgets( $show = 'all', $_search = false ) { <?php } - - +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param string $sidebar + */ function wp_list_widget_controls( $sidebar ) { add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' ); ?> @@ -163,7 +185,14 @@ function wp_list_widget_controls( $sidebar ) { <?php } - +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param array $params + * @return array + */ function wp_list_widget_controls_dynamic_sidebar( $params ) { global $wp_registered_widgets; static $i = 0; @@ -182,15 +211,22 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) { return $params; } -/* - * Meta widget used to display the control form for a widget. Called from dynamic_sidebar() +/** + * Meta widget used to display the control form for a widget. + * + * Called from dynamic_sidebar(). + * + * @since unknown + * + * @param array $sidebar_args + * @return array */ function wp_widget_control( $sidebar_args ) { global $wp_registered_widgets, $wp_registered_widget_controls, $sidebars_widgets, $edit_widget; $widget_id = $sidebar_args['widget_id']; $sidebar_id = isset($sidebar_args['id']) ? $sidebar_args['id'] : false; - $control = $wp_registered_widget_controls[$widget_id]; + $control = isset($wp_registered_widget_controls[$widget_id]) ? $wp_registered_widget_controls[$widget_id] : 0; $widget = $wp_registered_widgets[$widget_id]; $key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[$sidebar_id] ) : 'no-key'; // position of widget in sidebar @@ -198,6 +234,13 @@ function wp_widget_control( $sidebar_args ) { $edit = -1 < $edit_widget && is_numeric($key) && $edit_widget === $key; // (bool) are we currently editing this widget $id_format = $widget['id']; + + if ( ! isset( $sidebar_args['_show'] ) ) + $sidebar_args['_show'] = ''; + + if ( ! isset( $sidebar_args['_display'] ) ) + $sidebar_args['_display'] = ''; + // We aren't showing a widget control, we're outputing a template for a mult-widget control if ( 'all' == $sidebar_args['_show'] && 'template' == $sidebar_args['_display'] && isset($control['params'][0]['number']) ) { // number == -1 implies a template where id numbers are replaced by a generic '%i%' @@ -262,11 +305,11 @@ function wp_widget_control( $sidebar_args ) { <?php if ( $control ) : ?> - <a class="widget-action widget-control-save wp-no-js-hidden edit alignleft" href="#save:<?php echo $id_format; ?>"><?php _e('Change'); ?></a> + <a class="button widget-action widget-control-save hide-if-no-js edit alignleft" href="#save:<?php echo $id_format; ?>"><?php _e('Done'); ?></a> <?php endif; ?> - <a class="widget-action widget-control-remove delete alignright" href="<?php echo clean_url( wp_nonce_url( add_query_arg( array( 'remove' => $id_format, 'key' => $key ) ), "remove-widget_$widget[id]" ) ); ?>"><?php _e('Remove'); ?></a> + <a class="button widget-action widget-control-remove alignright" href="<?php echo clean_url( wp_nonce_url( add_query_arg( array( 'remove' => $id_format, 'key' => $key ) ), "remove-widget_$widget[id]" ) ); ?>"><?php _e('Remove'); ?></a> <br class="clear" /> </div> </div> @@ -276,6 +319,14 @@ function wp_widget_control( $sidebar_args ) { return $sidebar_args; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param string $string + * @return string + */ function wp_widget_control_ob_filter( $string ) { if ( false === $beg = strpos( $string, '%BEG_OF_TITLE%' ) ) return ''; @@ -286,4 +337,4 @@ function wp_widget_control_ob_filter( $string ) { return trim( wp_specialchars( strip_tags( $string ) ) ); } -?> +?> \ No newline at end of file wp-admin/includes/widgets.php @@ -1,28 +1,40 @@ <?php +/** + * Handle default dashboard widgets options AJAX. + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once('admin.php'); + +/** Load WordPress Administration Dashboard API */ require( 'inclu