$file_size = filesize( $file['tmp_name'] );
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 ) );
}
$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'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
}
}
/**
- * Delete a blog.
+ * Delete a site.
*
* @since 3.0.0
*
* @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;
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 );
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 ) {
}
// 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;
}
}
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 );
$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 );
);
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###,
###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.
$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();
+ }
}
/**
if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
$errors->add( 'user_email', __( "<strong>ERROR</strong>: 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###,
###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.
$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();
+ }
}
}
* 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 "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
+ 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 '<div class="notice notice-info"><p>' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), '<code>' . esc_html( $email['newemail'] ) . '</code>' ) . '</p></div>';
+ }
}
/**
- * Check whether a blog has used its allotted upload space.
+ * Check whether a site has used its allotted upload space.
*
* @since MU
*
}
/**
- * 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
*/
$space .= __( 'MB' );
}
?>
- <strong><?php printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space ); ?></strong>
+ <strong><?php
+ /* translators: Storage space that's been used. 1: Percentage of used space, 2: Total space allowed in megabytes or gigabytes */
+ printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space );
+ ?></strong>
<?php
}
/**
- * Get the remaining upload space for this blog.
+ * Get the remaining upload space for this site.
*
* @since MU
*
}
/**
- * Displays the edit blog upload space setting form on the Edit Blog screen.
+ * Displays the site upload space quota setting form on the Edit Site Settings screen.
*
* @since 3.0.0
*
- * @param int $id The ID of the blog to display the setting for.
+ * @param int $id The ID of the site to display the setting for.
*/
function upload_space_setting( $id ) {
switch_to_blog( $id );
global $wpdb;
if ( null !== $deprecated )
- _deprecated_argument( __FUNCTION__, '3.1' );
+ _deprecated_argument( __FUNCTION__, '3.0.2' );
$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
'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
*
* @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 ) {
uksort( $output, 'strnatcasecmp' );
/**
- * Filter the languages available in the dropdown.
+ * Filters the languages available in the dropdown.
*
* @since MU
*
*
* @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 "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
+ }
}
/**
<?php
}
-/**
- * Grants Super Admin privileges.
- *
- * @since 3.0.0
- *
- * @global array $super_admins
- *
- * @param int $user_id ID of the user to be granted Super Admin privileges.
- * @return bool True on success, false on failure. This can fail when the user is
- * already a super admin or when the `$super_admins` global is defined.
- */
-function grant_super_admin( $user_id ) {
- // If global super_admins override is defined, there is nothing to do here.
- if ( isset( $GLOBALS['super_admins'] ) ) {
- return false;
- }
-
- /**
- * Fires before the user is granted Super Admin privileges.
- *
- * @since 3.0.0
- *
- * @param int $user_id ID of the user that is about to be granted Super Admin privileges.
- */
- do_action( 'grant_super_admin', $user_id );
-
- // Directly fetch site_admins instead of using get_super_admins()
- $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-
- $user = get_userdata( $user_id );
- if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
- $super_admins[] = $user->user_login;
- update_site_option( 'site_admins' , $super_admins );
-
- /**
- * Fires after the user is granted Super Admin privileges.
- *
- * @since 3.0.0
- *
- * @param int $user_id ID of the user that was granted Super Admin privileges.
- */
- do_action( 'granted_super_admin', $user_id );
- return true;
- }
- return false;
-}
-
-/**
- * Revokes Super Admin privileges.
- *
- * @since 3.0.0
- *
- * @global array $super_admins
- *
- * @param int $user_id ID of the user Super Admin privileges to be revoked from.
- * @return bool True on success, false on failure. This can fail when the user's email
- * is the network admin email or when the `$super_admins` global is defined.
- */
-function revoke_super_admin( $user_id ) {
- // If global super_admins override is defined, there is nothing to do here.
- if ( isset( $GLOBALS['super_admins'] ) ) {
- return false;
- }
-
- /**
- * Fires before the user's Super Admin privileges are revoked.
- *
- * @since 3.0.0
- *
- * @param int $user_id ID of the user Super Admin privileges are being revoked from.
- */
- do_action( 'revoke_super_admin', $user_id );
-
- // Directly fetch site_admins instead of using get_super_admins()
- $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-
- $user = get_userdata( $user_id );
- if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
- if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
- unset( $super_admins[$key] );
- update_site_option( 'site_admins', $super_admins );
-
- /**
- * Fires after the user's Super Admin privileges are revoked.
- *
- * @since 3.0.0
- *
- * @param int $user_id ID of the user Super Admin privileges were revoked from.
- */
- do_action( 'revoked_super_admin', $user_id );
- return true;
- }
- }
- return false;
-}
-
/**
* Whether or not we can edit this network from this page.
*
$result = false;
/**
- * Filter whether this network can be edited from this page.
+ * Filters whether this network can be edited from this page.
*
* @since 3.1.0
*
</table>
<?php
/** This action is documented in wp-admin/users.php */
- do_action( 'delete_user_form', $current_user );
+ do_action( 'delete_user_form', $current_user, $allusers );
if ( 1 == count( $users ) ) : ?>
<p><?php _e( 'Once you hit “Confirm Deletion”, the user will be permanently removed.' ); ?></p>
* Print JavaScript in the header on the Network Settings screen.
*
* @since 4.1.0
-*/
+ */
function network_settings_add_js() {
?>
<script type="text/javascript">
</script>
<?php
}
+
+/**
+ * Outputs the HTML for a network's "Edit Site" tabular interface.
+ *
+ * @since 4.6.0
+ *
+ * @param $args {
+ * Optional. Array or string of Query parameters. Default empty array.
+ *
+ * @type int $blog_id The site ID. Default is the current site.
+ * @type array $links The tabs to include with (label|url|cap) keys.
+ * @type string $selected The ID of the selected link.
+ * }
+ */
+function network_edit_site_nav( $args = array() ) {
+
+ /**
+ * Filters the links that appear on site-editing network pages.
+ *
+ * Default links: 'site-info', 'site-users', 'site-themes', and 'site-settings'.
+ *
+ * @since 4.6.0
+ *
+ * @param array $links {
+ * An array of link data representing individual network admin pages.
+ *
+ * @type array $link_slug {
+ * An array of information about the individual link to a page.
+ *
+ * $type string $label Label to use for the link.
+ * $type string $url URL, relative to `network_admin_url()` to use for the link.
+ * $type string $cap Capability required to see the link.
+ * }
+ * }
+ */
+ $links = apply_filters( 'network_edit_site_nav_links', array(
+ 'site-info' => 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 ] = '<a href="' . esc_url( $url ) . '" id="' . esc_attr( $link_id ) . '" class="' . $esc_classes . '">' . esc_html( $link['label'] ) . '</a>';
+ }
+
+ // All done!
+ echo '<h2 class="nav-tab-wrapper wp-clearfix">';
+ echo implode( '', $screen_links );
+ echo '</h2>';
+}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff