X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..refs/heads/pristine:/wp-admin/includes/ms.php diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index ffed184b..0edc3083 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -28,14 +28,21 @@ function check_upload_size( $file ) { $space_left = get_upload_space_available(); $file_size = filesize( $file['tmp_name'] ); - if ( $space_left < $file_size ) - $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) ); - if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) - $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) ); + if ( $space_left < $file_size ) { + /* translators: 1: Required disk space in kilobytes */ + $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) ); + } + + if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) { + /* translators: 1: Maximum allowed file size in kilobytes */ + $file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) ); + } + if ( upload_is_user_over_quota( false ) ) { $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' ); } - if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) { + + if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) { wp_die( $file['error'] . ' ' . __( 'Back' ) . '' ); } @@ -43,14 +50,14 @@ function check_upload_size( $file ) { } /** - * Delete a blog. + * Delete a site. * * @since 3.0.0 * - * @global wpdb $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * - * @param int $blog_id Blog ID. - * @param bool $drop True if blog's table should be dropped. Default is false. + * @param int $blog_id Site ID. + * @param bool $drop True if site's database tables should be dropped. Default is false. */ function wpmu_delete_blog( $blog_id, $drop = false ) { global $wpdb; @@ -61,14 +68,14 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { switch_to_blog( $blog_id ); } - $blog = get_blog_details( $blog_id ); + $blog = get_site( $blog_id ); /** - * Fires before a blog is deleted. + * Fires before a site is deleted. * * @since MU * - * @param int $blog_id The blog ID. - * @param bool $drop True if blog's table should be dropped. Default is false. + * @param int $blog_id The site ID. + * @param bool $drop True if site's table should be dropped. Default is false. */ do_action( 'delete_blog', $blog_id, $drop ); @@ -83,7 +90,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { update_blog_status( $blog_id, 'deleted', 1 ); - $current_site = get_current_site(); + $current_network = get_network(); // If a full blog object is not available, do not destroy anything. if ( $drop && ! $blog ) { @@ -91,7 +98,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { } // Don't destroy the initial, main, or root blog. - if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) { + if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) { $drop = false; } @@ -103,16 +110,16 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { } if ( $drop ) { - $uploads = wp_upload_dir(); + $uploads = wp_get_upload_dir(); $tables = $wpdb->tables( 'blog' ); /** - * Filter the tables to drop when the blog is deleted. + * Filters the tables to drop when the site is deleted. * * @since MU * - * @param array $tables The blog tables to be dropped. - * @param int $blog_id The ID of the blog to drop tables for. + * @param array $tables The site tables to be dropped. + * @param int $blog_id The ID of the site to drop tables for. */ $drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $blog_id ); @@ -123,12 +130,12 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) ); /** - * Filter the upload base directory to delete when the blog is deleted. + * Filters the upload base directory to delete when the site is deleted. * * @since MU * * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir() - * @param int $blog_id The blog ID. + * @param int $blog_id The site ID. */ $dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id ); $dir = rtrim( $dir, DIRECTORY_SEPARATOR ); @@ -158,7 +165,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { } $stack = array_reverse( $stack ); // Last added dirs are deepest - foreach( (array) $stack as $dir ) { + foreach ( (array) $stack as $dir ) { if ( $dir != $top_dir) @rmdir( $dir ); } @@ -177,7 +184,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { * * @todo Merge with wp_delete_user() ? * - * @global wpdb $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $id The user ID. * @return bool True if the user was deleted, otherwise false. @@ -185,6 +192,10 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { function wpmu_delete_user( $id ) { global $wpdb; + if ( ! is_numeric( $id ) ) { + return false; + } + $id = (int) $id; $user = new WP_User( $id ); @@ -263,6 +274,8 @@ function update_option_new_admin_email( $old_value, $value ) { ); update_option( 'adminhash', $new_admin_email ); + $switched_locale = switch_to_locale( get_user_locale() ); + /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */ $email_text = __( 'Howdy ###USERNAME###, @@ -282,7 +295,7 @@ All at ###SITENAME### ###SITEURL###' ); /** - * Filter the email text sent when the site admin email is changed. + * Filters the email text sent when the site admin email is changed. * * The following strings have a special meaning and will get replaced dynamically: * ###USERNAME### The current user's username. @@ -300,12 +313,16 @@ All at ###SITENAME### $current_user = wp_get_current_user(); $content = str_replace( '###USERNAME###', $current_user->user_login, $content ); - $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content ); + $content = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $value, $content ); $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); $content = str_replace( '###SITEURL###', network_home_url(), $content ); wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content ); + + if ( $switched_locale ) { + restore_previous_locale(); + } } /** @@ -313,8 +330,8 @@ All at ###SITENAME### * * @since 3.0.0 * - * @global object $errors WP_Error object. - * @global object $wpdb WordPress database object. + * @global WP_Error $errors WP_Error object. + * @global wpdb $wpdb WordPress database object. */ function send_confirmation_on_profile_email() { global $errors, $wpdb; @@ -333,16 +350,18 @@ function send_confirmation_on_profile_email() { if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) { $errors->add( 'user_email', __( "ERROR: The email address is already used." ), array( 'form-field' => 'email' ) ); - delete_option( $current_user->ID . '_new_email' ); + delete_user_meta( $current_user->ID, '_new_email' ); return; } $hash = md5( $_POST['email'] . time() . mt_rand() ); $new_user_email = array( - 'hash' => $hash, - 'newemail' => $_POST['email'] - ); - update_option( $current_user->ID . '_new_email', $new_user_email ); + 'hash' => $hash, + 'newemail' => $_POST['email'] + ); + update_user_meta( $current_user->ID, '_new_email', $new_user_email ); + + $switched_locale = switch_to_locale( get_user_locale() ); /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */ $email_text = __( 'Howdy ###USERNAME###, @@ -362,7 +381,7 @@ All at ###SITENAME### ###SITEURL###' ); /** - * Filter the email text sent when a user changes emails. + * Filters the email text sent when a user changes emails. * * The following strings have a special meaning and will get replaced dynamically: * ###USERNAME### The current user's username. @@ -379,13 +398,17 @@ All at ###SITENAME### $content = apply_filters( 'new_user_email_content', $email_text, $new_user_email ); $content = str_replace( '###USERNAME###', $current_user->user_login, $content ); - $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content ); + $content = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'profile.php?newuseremail=' . $hash ) ), $content ); $content = str_replace( '###EMAIL###', $_POST['email'], $content); $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); $content = str_replace( '###SITEURL###', network_home_url(), $content ); wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content ); $_POST['email'] = $current_user->user_email; + + if ( $switched_locale ) { + restore_previous_locale(); + } } } @@ -394,14 +417,19 @@ All at ###SITENAME### * after email address change. * * @since 3.0.0 + * + * @global string $pagenow */ function new_user_email_admin_notice() { - if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) - echo "
" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "
"; + global $pagenow; + if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) && $email = get_user_meta( get_current_user_id(), '_new_email', true ) ) { + /* translators: %s: New email address */ + echo '

' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), '' . esc_html( $email['newemail'] ) . '' ) . '

'; + } } /** - * Check whether a blog has used its allotted upload space. + * Check whether a site has used its allotted upload space. * * @since MU * @@ -413,9 +441,9 @@ function upload_is_user_over_quota( $echo = true ) { return false; $space_allowed = get_space_allowed(); - if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) ) + if ( ! is_numeric( $space_allowed ) ) { $space_allowed = 10; // Default space allowed is 10 MB - + } $space_used = get_space_used(); if ( ( $space_allowed - $space_used ) < 0 ) { @@ -428,7 +456,7 @@ function upload_is_user_over_quota( $echo = true ) { } /** - * Displays the amount of disk space used by the current blog. Not used in core. + * Displays the amount of disk space used by the current site. Not used in core. * * @since MU */ @@ -439,7 +467,7 @@ function display_space_usage() { $percent_used = ( $space_used / $space_allowed ) * 100; if ( $space_allowed > 1000 ) { - $space = number_format( $space_allowed / 1024 ); + $space = number_format( $space_allowed / KB_IN_BYTES ); /* translators: Gigabytes */ $space .= __( 'GB' ); } else { @@ -448,12 +476,15 @@ function display_space_usage() { $space .= __( 'MB' ); } ?> - + update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) ); @@ -590,7 +621,7 @@ function format_code_lang( $code = '' ) { 've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh','wa' => 'Walloon','wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' ); /** - * Filter the language codes. + * Filters the language codes. * * @since MU * @@ -607,10 +638,10 @@ function format_code_lang( $code = '' ) { * @since 3.0.0 * * @param object $term The term. - * @param string $taxonomy The taxonomy for $term. Should be 'category' or 'post_tag', as these are + * @param string $taxonomy The taxonomy for `$term`. Should be 'category' or 'post_tag', as these are * the only taxonomies which are processed by this function; anything else * will be returned untouched. - * @return object|array Returns `$term`, after filtering the 'slug' field with {@see sanitize_title()} + * @return object|array Returns `$term`, after filtering the 'slug' field with sanitize_title() * if $taxonomy is 'category' or 'post_tag'. */ function sync_category_tag_slugs( $term, $taxonomy ) { @@ -716,7 +747,7 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) { uksort( $output, 'strnatcasecmp' ); /** - * Filter the languages available in the dropdown. + * Filters the languages available in the dropdown. * * @since MU * @@ -734,16 +765,25 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) { * * @since 3.0.0 * - * @global int $wp_db_version The version number of the database. + * @global int $wp_db_version The version number of the database. + * @global string $pagenow * * @return false False if the current user is not a super admin. */ function site_admin_notice() { - global $wp_db_version; - if ( !is_super_admin() ) + global $wp_db_version, $pagenow; + + if ( ! is_super_admin() ) { return false; - if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) + } + + if ( 'upgrade.php' == $pagenow ) { + return; + } + + if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) { echo "
" . sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "
"; + } } /** @@ -802,7 +842,7 @@ function choose_primary_blog() { $found = false; ?> + ID ) . '">' . $current_user->user_login . ''; ?> + + ID ) ) { + wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) ); + } + + if ( in_array( $delete_user->user_login, $site_admins ) ) { + wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '' . $delete_user->user_login . '' ) ); + } + ?> + + + + "; + } else { + ?> + + +
user_login; ?> + ' . "\n"; ?> +

' . $delete_user->user_login . '' + ); ?>

+ $details ) { + $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) ); + if ( is_array( $blog_users ) && !empty( $blog_users ) ) { + $user_site = "{$details->blogname}"; + $user_dropdown = ''; + $user_dropdown .= "\n"; + ?> +
    +
    • +
    • +
  • +
    • +
+

+ +
+ +

+ +

+ + + + + array( 'label' => __( 'Info' ), 'url' => 'site-info.php', 'cap' => 'manage_sites' ), + 'site-users' => array( 'label' => __( 'Users' ), 'url' => 'site-users.php', 'cap' => 'manage_sites' ), + 'site-themes' => array( 'label' => __( 'Themes' ), 'url' => 'site-themes.php', 'cap' => 'manage_sites' ), + 'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php', 'cap' => 'manage_sites' ) + ) ); + + // Parse arguments + $r = wp_parse_args( $args, array( + 'blog_id' => isset( $_GET['blog_id'] ) ? (int) $_GET['blog_id'] : 0, + 'links' => $links, + 'selected' => 'site-info', + ) ); + + // Setup the links array + $screen_links = array(); + + // Loop through tabs + foreach ( $r['links'] as $link_id => $link ) { + + // Skip link if user can't access + if ( ! current_user_can( $link['cap'], $r['blog_id'] ) ) { + continue; + } + + // Link classes + $classes = array( 'nav-tab' ); + + // Selected is set by the parent OR assumed by the $pagenow global + if ( $r['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) { + $classes[] = 'nav-tab-active'; + } + + // Escape each class + $esc_classes = implode( ' ', $classes ); + + // Get the URL for this link + $url = add_query_arg( array( 'id' => $r['blog_id'] ), network_admin_url( $link['url'] ) ); + + // Add link to nav links + $screen_links[ $link_id ] = '' . esc_html( $link['label'] ) . ''; + } + + // All done! + echo '

'; + echo implode( '', $screen_links ); + echo '

'; +}