X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..e8f61417994be715a90671aa87f1cd70d8ba132a:/wp-admin/edit-tags.php diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index fdb64c24..b953da68 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! $taxnow ) wp_die( __( 'Invalid taxonomy' ) ); @@ -17,8 +17,24 @@ $tax = get_taxonomy( $taxnow ); if ( ! $tax ) wp_die( __( 'Invalid taxonomy' ) ); -if ( ! current_user_can( $tax->cap->manage_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); +if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) { + wp_die( __( 'You are not allowed to manage these items.' ) ); +} + +if ( ! current_user_can( $tax->cap->manage_terms ) ) { + wp_die( + '
' . __( 'You are not allowed to manage these items.' ) . '
', + 403 + ); +} + +/** + * $post_type is set when the WP_Terms_List_Table instance is created + * + * @global string $post_type + */ +global $post_type; $wp_list_table = _get_list_table('WP_Terms_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -26,9 +42,9 @@ $pagenum = $wp_list_table->get_pagenum(); $title = $tax->labels->name; if ( 'post' != $post_type ) { - $parent_file = "edit.php?post_type=$post_type"; + $parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type"; $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; -} else if ( 'link_category' == $tax->name ) { +} elseif ( 'link_category' == $tax->name ) { $parent_file = 'link-manager.php'; $submenu_file = 'edit-tags.php?taxonomy=link_category'; } else { @@ -36,7 +52,15 @@ if ( 'post' != $post_type ) { $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; } -add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') ); +add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); + +get_current_screen()->set_screen_reader_content( array( + 'heading_pagination' => $tax->labels->items_list_navigation, + 'heading_list' => $tax->labels->items_list, +) ); + +$location = false; +$referer = wp_get_referer(); switch ( $wp_list_table->current_action() ) { @@ -44,60 +68,70 @@ case 'add-tag': check_admin_referer( 'add-tag', '_wpnonce_add-tag' ); - if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '' . __( 'You are not allowed to add this item.' ) . '
', + 403 + ); + } $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST ); $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 1, $location ); else - $location = add_query_arg( 'message', 4, $location ); - wp_redirect( $location ); - exit; -break; + $location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location ); + + break; case 'delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } - if ( !isset( $_REQUEST['tag_ID'] ) ) { - wp_redirect( $location ); - exit; + if ( ! isset( $_REQUEST['tag_ID'] ) ) { + break; } $tag_ID = (int) $_REQUEST['tag_ID']; - check_admin_referer( 'delete-tag_' . $tag_ID ); - - if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + check_admin_referer( 'delete-tag_' . $tag_ID ); + + if ( ! current_user_can( $tax->cap->delete_terms ) ) { + wp_die( + '' . __( 'You are not allowed to delete this item.' ) . '
', + 403 + ); + } wp_delete_term( $tag_ID, $taxonomy ); $location = add_query_arg( 'message', 2, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'bulk-delete': check_admin_referer( 'bulk-tags' ); - if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->delete_terms ) ) { + wp_die( + '' . __( 'You are not allowed to delete these items.' ) . '
', + 403 + ); + } $tags = (array) $_REQUEST['delete_tags']; foreach ( $tags as $tag_ID ) { @@ -107,36 +141,40 @@ case 'bulk-delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } $location = add_query_arg( 'message', 6, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'edit': - $title = $tax->labels->edit_item; + if ( ! isset( $_REQUEST['tag_ID'] ) ) { + break; + } - $tag_ID = (int) $_REQUEST['tag_ID']; + $term_id = (int) $_REQUEST['tag_ID']; + $term = get_term( $term_id ); - $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' ); - if ( ! $tag ) + if ( ! $term instanceof WP_Term ) { wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); - require_once ( 'admin-header.php' ); - include( './edit-tag-form.php' ); + } -break; + wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) ); + exit; case 'editedtag': $tag_ID = (int) $_POST['tag_ID']; check_admin_referer( 'update-tag_' . $tag_ID ); - if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '' . __( 'You are not allowed to edit this item.' ) . '
', + 403 + ); + } $tag = get_term( $tag_ID, $taxonomy ); if ( ! $tag ) @@ -148,27 +186,25 @@ case 'editedtag': if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 3, $location ); else - $location = add_query_arg( 'message', 5, $location ); - - wp_redirect( $location ); - exit; -break; - -default: -if ( ! empty($_REQUEST['_wp_http_referer']) ) { - $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ); + $location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location ); + break; +} - if ( ! empty( $_REQUEST['paged'] ) ) - $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); +if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) { + $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ); +} +if ( $location ) { + if ( ! empty( $_REQUEST['paged'] ) ) { + $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location ); + } wp_redirect( $location ); exit; } @@ -195,7 +231,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '' . __( 'You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '
'; if ( 'link_category' == $taxonomy ) - $help .= '' . __( 'You can delete Link Categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
'; + $help .= '' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
'; else $help .='' . __( 'What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '
'; @@ -212,15 +248,15 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '' . __( 'When adding a new tag on this screen, you’ll fill in the following fields:' ) . '
'; $help .= '' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '
'; @@ -234,47 +270,58 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '' . __( 'For more information:' ) . '
'; if ( 'category' == $taxonomy ) - $help .= '' . __( 'Documentation on Categories' ) . '
'; + $help .= '' . __( 'Documentation on Categories' ) . '
'; elseif ( 'link_category' == $taxonomy ) - $help .= '' . __( 'Documentation on Link Categories' ) . '
'; + $help .= '' . __( 'Documentation on Link Categories' ) . '
'; else - $help .= '' . __( 'Documentation on Tags' ) . '
'; + $help .= '' . __( 'Documentation on Tags' ) . '
'; - $help .= '' . __('Support Forums') . '
'; + $help .= '' . __('Support Forums') . '
'; get_current_screen()->set_help_sidebar( $help ); unset( $help ); } -require_once ('admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); -if ( !current_user_can($tax->cap->edit_terms) ) - wp_die( __('You are not allowed to edit this item.') ); +if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '' . __( 'You are not allowed to edit this item.' ) . '
', + 403 + ); +} -$messages[1] = __('Item added.'); -$messages[2] = __('Item deleted.'); -$messages[3] = __('Item updated.'); -$messages[4] = __('Item not added.'); -$messages[5] = __('Item not updated.'); -$messages[6] = __('Items deleted.'); +/** Also used by the Edit Tag form */ +require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' ); + +$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated'; + +if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) { + $import_link = admin_url( 'admin.php?import=wpcat2tag' ); +} else { + $import_link = admin_url( 'import.php' ); +} ?>