X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..refs/tags/wordpress-4.3:/wp-admin/includes/ms.php
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 1b2c7e78..ffed184b 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -25,9 +25,8 @@ function check_upload_size( $file ) {
if ( defined( 'WP_IMPORTING' ) )
return $file;
- $space_allowed = 1048576 * get_space_allowed();
- $space_used = get_dirsize( BLOGUPLOADDIR );
- $space_left = $space_allowed - $space_used;
+ $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 ) );
@@ -36,34 +35,41 @@ function check_upload_size( $file ) {
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']) )
+ if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
wp_die( $file['error'] . ' ' . __( 'Back' ) . '' );
+ }
return $file;
}
-add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
/**
- * Delete a blog
+ * Delete a blog.
*
* @since 3.0.0
*
- * @param int $blog_id Blog ID
- * @param bool $drop True if blog's table should be dropped. Default is false.
- * @return void
+ * @global wpdb $wpdb
+ *
+ * @param int $blog_id Blog ID.
+ * @param bool $drop True if blog's table should be dropped. Default is false.
*/
function wpmu_delete_blog( $blog_id, $drop = false ) {
- global $wpdb, $current_site;
+ global $wpdb;
$switch = false;
- if ( $blog_id != $wpdb->blogid ) {
+ if ( get_current_blog_id() != $blog_id ) {
$switch = true;
switch_to_blog( $blog_id );
- $blog = get_blog_details( $blog_id );
- } else {
- $blog = $GLOBALS['current_blog'];
}
+ $blog = get_blog_details( $blog_id );
+ /**
+ * Fires before a blog 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.
+ */
do_action( 'delete_blog', $blog_id, $drop );
$users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
@@ -77,27 +83,61 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
update_blog_status( $blog_id, 'deleted', 1 );
+ $current_site = get_current_site();
+
+ // If a full blog object is not available, do not destroy anything.
+ if ( $drop && ! $blog ) {
+ $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_site->path && $blog->domain == $current_site->domain ) ) ) {
$drop = false;
+ }
- if ( $drop ) {
+ $upload_path = trim( get_option( 'upload_path' ) );
+
+ // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
+ if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+ $drop = false;
+ }
- $drop_tables = apply_filters( 'wpmu_drop_tables', $wpdb->tables( 'blog' ) );
+ if ( $drop ) {
+ $uploads = wp_upload_dir();
+
+ $tables = $wpdb->tables( 'blog' );
+ /**
+ * Filter the tables to drop when the blog 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.
+ */
+ $drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $blog_id );
foreach ( (array) $drop_tables as $table ) {
$wpdb->query( "DROP TABLE IF EXISTS `$table`" );
}
- $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
- $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id );
+ $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
+
+ /**
+ * Filter the upload base directory to delete when the blog is deleted.
+ *
+ * @since MU
+ *
+ * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
+ * @param int $blog_id The blog ID.
+ */
+ $dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
$dir = rtrim( $dir, DIRECTORY_SEPARATOR );
$top_dir = $dir;
$stack = array($dir);
$index = 0;
while ( $index < count( $stack ) ) {
- # Get indexed directory from stack
+ // Get indexed directory from stack
$dir = $stack[$index];
$dh = @opendir( $dir );
@@ -106,32 +146,64 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
if ( $file == '.' || $file == '..' )
continue;
- if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) )
+ if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
$stack[] = $dir . DIRECTORY_SEPARATOR . $file;
- else if ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) )
+ } elseif ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) ) {
@unlink( $dir . DIRECTORY_SEPARATOR . $file );
+ }
}
+ @closedir( $dh );
}
$index++;
}
- $stack = array_reverse( $stack ); // Last added dirs are deepest
+ $stack = array_reverse( $stack ); // Last added dirs are deepest
foreach( (array) $stack as $dir ) {
if ( $dir != $top_dir)
@rmdir( $dir );
}
+
+ clean_blog_cache( $blog );
}
if ( $switch )
restore_current_blog();
}
-// @todo Merge with wp_delete_user() ?
+/**
+ * Delete a user from the network and remove from all sites.
+ *
+ * @since 3.0.0
+ *
+ * @todo Merge with wp_delete_user() ?
+ *
+ * @global wpdb $wpdb
+ *
+ * @param int $id The user ID.
+ * @return bool True if the user was deleted, otherwise false.
+ */
function wpmu_delete_user( $id ) {
global $wpdb;
$id = (int) $id;
+ $user = new WP_User( $id );
+ if ( !$user->exists() )
+ return false;
+
+ // Global super-administrators are protected, and cannot be deleted.
+ $_super_admins = get_super_admins();
+ if ( in_array( $user->user_login, $_super_admins, true ) ) {
+ return false;
+ }
+
+ /**
+ * Fires before a user is deleted from the network.
+ *
+ * @since MU
+ *
+ * @param int $id ID of the user about to be deleted from the network.
+ */
do_action( 'wpmu_delete_user', $id );
$blogs = get_blogs_of_user( $id );
@@ -158,48 +230,29 @@ function wpmu_delete_user( $id ) {
}
}
- $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->users WHERE ID = %d", $id ) );
- $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+ $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+ foreach ( $meta as $mid )
+ delete_metadata_by_mid( 'user', $mid );
- clean_user_cache( $id );
+ $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
- // allow for commit transaction
+ clean_user_cache( $user );
+
+ /** This action is documented in wp-admin/includes/user.php */
do_action( 'deleted_user', $id );
return true;
}
-function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
- $themes = get_themes();
-
- if ( $blog_id != 0 )
- switch_to_blog( $blog_id );
-
- $blog_allowed_themes = get_option( 'allowedthemes' );
- if ( !is_array( $blog_allowed_themes ) || empty( $blog_allowed_themes ) ) { // convert old allowed_themes to new allowedthemes
- $blog_allowed_themes = get_option( 'allowed_themes' );
-
- if ( is_array( $blog_allowed_themes ) ) {
- foreach( (array) $themes as $key => $theme ) {
- $theme_key = esc_html( $theme['Stylesheet'] );
- if ( isset( $blog_allowed_themes[$key] ) == true ) {
- $blog_allowedthemes[$theme_key] = 1;
- }
- }
- $blog_allowed_themes = $blog_allowedthemes;
- add_option( 'allowedthemes', $blog_allowed_themes );
- delete_option( 'allowed_themes' );
- }
- }
-
- if ( $blog_id != 0 )
- restore_current_blog();
-
- return $blog_allowed_themes;
-}
-
+/**
+ * Sends an email when a site administrator email address is changed.
+ *
+ * @since 3.0.0
+ *
+ * @param string $old_value The old email address. Not currently used.
+ * @param string $value The new email address.
+ */
function update_option_new_admin_email( $old_value, $value ) {
- $email = get_option( 'admin_email' );
if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
return;
@@ -210,10 +263,12 @@ function update_option_new_admin_email( $old_value, $value ) {
);
update_option( 'adminhash', $new_admin_email );
- $content = apply_filters( 'new_admin_email_content', __( "Dear user,
+ /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
+ $email_text = __( 'Howdy ###USERNAME###,
You recently requested to have the administration email address on
your site changed.
+
If this is correct, please click on the following link to change it:
###ADMIN_URL###
@@ -224,18 +279,43 @@ This email has been sent to ###EMAIL###
Regards,
All at ###SITENAME###
-###SITEURL### "), $new_admin_email );
+###SITEURL###' );
+
+ /**
+ * Filter 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.
+ * ###ADMIN_URL### The link to click on to confirm the email change.
+ * ###EMAIL### The new email.
+ * ###SITENAME### The name of the site.
+ * ###SITEURL### The URL to the site.
+ *
+ * @since MU
+ *
+ * @param string $email_text Text in the email.
+ * @param string $new_admin_email New admin email that the current administration email was changed to.
+ */
+ $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
+ $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( '###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' ), get_option( 'blogname' ) ), $content );
+ wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
}
-add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
-add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+/**
+ * Sends an email when an email address change is requested.
+ *
+ * @since 3.0.0
+ *
+ * @global object $errors WP_Error object.
+ * @global object $wpdb WordPress database object.
+ */
function send_confirmation_on_profile_email() {
global $errors, $wpdb;
$current_user = wp_get_current_user();
@@ -247,12 +327,12 @@ function send_confirmation_on_profile_email() {
if ( $current_user->user_email != $_POST['email'] ) {
if ( !is_email( $_POST['email'] ) ) {
- $errors->add( 'user_email', __( "ERROR: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
+ $errors->add( 'user_email', __( "ERROR: The email address isn’t correct." ), array( 'form-field' => 'email' ) );
return;
}
if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
- $errors->add( 'user_email', __( "ERROR: The e-mail address is already used." ), array( 'form-field' => 'email' ) );
+ $errors->add( 'user_email', __( "ERROR: The email address is already used." ), array( 'form-field' => 'email' ) );
delete_option( $current_user->ID . '_new_email' );
return;
}
@@ -264,9 +344,11 @@ function send_confirmation_on_profile_email() {
);
update_option( $current_user->ID . '_new_email', $new_user_email );
- $content = apply_filters( 'new_user_email_content', __( "Dear user,
+ /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
+ $email_text = __( 'Howdy ###USERNAME###,
You recently requested to have the email address on your account changed.
+
If this is correct, please click on the following link to change it:
###ADMIN_URL###
@@ -277,187 +359,221 @@ This email has been sent to ###EMAIL###
Regards,
All at ###SITENAME###
-###SITEURL###" ), $new_user_email );
-
+###SITEURL###' );
+
+ /**
+ * Filter 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.
+ * ###ADMIN_URL### The link to click on to confirm the email change.
+ * ###EMAIL### The new email.
+ * ###SITENAME### The name of the site.
+ * ###SITEURL### The URL to the site.
+ *
+ * @since MU
+ *
+ * @param string $email_text Text in the email.
+ * @param string $new_user_email New user email that the current user has changed to.
+ */
+ $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( '###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' ), get_option( 'blogname' ) ), $content );
+ wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
$_POST['email'] = $current_user->user_email;
}
}
-add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
-
-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'] ) . "
";
-}
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
-
-function get_site_allowed_themes() {
- $themes = get_themes();
- $allowed_themes = get_site_option( 'allowedthemes' );
- if ( !is_array( $allowed_themes ) || empty( $allowed_themes ) ) {
- $allowed_themes = get_site_option( 'allowed_themes' ); // convert old allowed_themes format
- if ( !is_array( $allowed_themes ) ) {
- $allowed_themes = array();
- } else {
- foreach( (array) $themes as $key => $theme ) {
- $theme_key = esc_html( $theme['Stylesheet'] );
- if ( isset( $allowed_themes[ $key ] ) == true ) {
- $allowedthemes[ $theme_key ] = 1;
- }
- }
- $allowed_themes = $allowedthemes;
- }
- }
- return $allowed_themes;
-}
/**
- * Determines if there is any upload space left in the current blog's quota.
+ * Adds an admin notice alerting the user to check for confirmation email
+ * after email address change.
*
* @since 3.0.0
- * @return bool True if space is available, false otherwise.
*/
-function is_upload_space_available() {
- if ( get_site_option( 'upload_space_check_disabled' ) )
- return true;
-
- if ( !( $space_allowed = get_upload_space_available() ) )
- return false;
-
- return true;
+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'] ) . "
";
}
/**
- * @since 3.0.0
+ * Check whether a blog has used its allotted upload space.
*
- * @return int of upload size limit in bytes
- */
-function upload_size_limit_filter( $size ) {
- $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
- if ( get_site_option( 'upload_space_check_disabled' ) )
- return min( $size, $fileupload_maxk );
-
- return min( $size, $fileupload_maxk, get_upload_space_available() );
-}
-/**
- * Determines if there is any upload space left in the current blog's quota.
+ * @since MU
*
- * @return int of upload space available in bytes
+ * @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true.
+ * @return bool True if user is over upload space quota, otherwise false.
*/
-function get_upload_space_available() {
- $space_allowed = get_space_allowed() * 1024 * 1024;
+function upload_is_user_over_quota( $echo = true ) {
if ( get_site_option( 'upload_space_check_disabled' ) )
- return $space_allowed;
+ return false;
- $dir_name = trailingslashit( BLOGUPLOADDIR );
- if ( !( is_dir( $dir_name) && is_readable( $dir_name ) ) )
- return $space_allowed;
+ $space_allowed = get_space_allowed();
+ if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
+ $space_allowed = 10; // Default space allowed is 10 MB
- $dir = dir( $dir_name );
- $size = 0;
+ $space_used = get_space_used();
- while ( $file = $dir->read() ) {
- if ( $file != '.' && $file != '..' ) {
- if ( is_dir( $dir_name . $file) ) {
- $size += get_dirsize( $dir_name . $file );
- } else {
- $size += filesize( $dir_name . $file );
- }
- }
+ if ( ( $space_allowed - $space_used ) < 0 ) {
+ if ( $echo )
+ _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+ return true;
+ } else {
+ return false;
}
- $dir->close();
-
- if ( ( $space_allowed - $size ) <= 0 )
- return 0;
-
- return $space_allowed - $size;
}
/**
- * Returns the upload quota for the current blog.
+ * Displays the amount of disk space used by the current blog. Not used in core.
*
- * @return int Quota
+ * @since MU
*/
-function get_space_allowed() {
- $space_allowed = get_option( 'blog_upload_space' );
- if ( $space_allowed === false )
- $space_allowed = get_site_option( 'blog_upload_space' );
- if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
- $space_allowed = 50;
-
- return $space_allowed;
-}
-
function display_space_usage() {
- $space = get_space_allowed();
- $used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
+ $space_allowed = get_space_allowed();
+ $space_used = get_space_used();
- $percentused = ( $used / $space ) * 100;
+ $percent_used = ( $space_used / $space_allowed ) * 100;
- if ( $space > 1000 ) {
- $space = number_format( $space / 1024 );
+ if ( $space_allowed > 1000 ) {
+ $space = number_format( $space_allowed / 1024 );
/* translators: Gigabytes */
$space .= __( 'GB' );
} else {
+ $space = number_format( $space_allowed );
/* translators: Megabytes */
$space .= __( 'MB' );
}
?>
-
+
-
-
+
+
+
+
+
update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
+ $wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
- clean_user_cache( $id );
+ $user = new WP_User( $id );
+ clean_user_cache( $user );
if ( $pref == 'spam' ) {
- if ( $value == 1 )
+ if ( $value == 1 ) {
+ /**
+ * Fires after the user is marked as a SPAM user.
+ *
+ * @since 3.0.0
+ *
+ * @param int $id ID of the user marked as SPAM.
+ */
do_action( 'make_spam_user', $id );
- else
+ } else {
+ /**
+ * Fires after the user is marked as a HAM user. Opposite of SPAM.
+ *
+ * @since 3.0.0
+ *
+ * @param int $id ID of the user marked as HAM.
+ */
do_action( 'make_ham_user', $id );
+ }
}
return $value;
}
+/**
+ * Cleans the user cache for a specific user.
+ *
+ * @since 3.0.0
+ *
+ * @param int $id The user ID.
+ * @return bool|int The ID of the refreshed user or false if the user does not exist.
+ */
function refresh_user_details( $id ) {
$id = (int) $id;
if ( !$user = get_userdata( $id ) )
return false;
- clean_user_cache( $id );
+ clean_user_cache( $user );
return $id;
}
+/**
+ * Returns the language for a language code.
+ *
+ * @since 3.0.0
+ *
+ * @param string $code Optional. The two-letter language code. Default empty.
+ * @return string The language corresponding to $code if it exists. If it does not exist,
+ * then the first two letters of $code is returned.
+ */
function format_code_lang( $code = '' ) {
$code = strtolower( substr( $code, 0, 2 ) );
$lang_codes = array(
@@ -472,10 +588,31 @@ function format_code_lang( $code = '' ) {
'sg' => 'Sango', 'sa' => 'Sanskrit', 'sr' => 'Serbian', 'hr' => 'Croatian', 'si' => 'Sinhala; Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho, Southern', 'es' => 'Spanish; Castilian', 'sc' => 'Sardinian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili',
'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'bo' => 'Tibetan', 'ti' => 'Tigrinya', 'to' => 'Tonga (Tonga Islands)', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur; Uyghur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek',
'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.
+ *
+ * @since MU
+ *
+ * @param array $lang_codes Key/value pair of language codes where key is the short version.
+ * @param string $code A two-letter designation of the language.
+ */
$lang_codes = apply_filters( 'lang_codes', $lang_codes, $code );
return strtr( $code, $lang_codes );
}
+/**
+ * Synchronize category and post tag slugs when global terms are enabled.
+ *
+ * @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
+ * 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()}
+ * if $taxonomy is 'category' or 'post_tag'.
+ */
function sync_category_tag_slugs( $term, $taxonomy ) {
if ( global_terms_enabled() && ( $taxonomy == 'category' || $taxonomy == 'post_tag' ) ) {
if ( is_object( $term ) ) {
@@ -486,8 +623,14 @@ function sync_category_tag_slugs( $term, $taxonomy ) {
}
return $term;
}
-add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
+/**
+ * Displays an access denied message when a user tries to view a site's dashboard they
+ * do not have access to.
+ *
+ * @since 3.2.0
+ * @access private
+ */
function _access_denied_splash() {
if ( ! is_user_logged_in() || is_network_admin() )
return;
@@ -500,7 +643,7 @@ function _access_denied_splash() {
$blog_name = get_bloginfo( 'name' );
if ( empty( $blogs ) )
- wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) );
+ wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
$output = '
' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '
';
$output .= '
' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '
';
- wp_die( $output );
+ wp_die( $output, 403 );
}
-add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
+/**
+ * Checks if the current user has permissions to import new users.
+ *
+ * @since 3.0.0
+ *
+ * @param string $permission A permission to be checked. Currently not used.
+ * @return bool True if the user has proper permissions, false if they do not.
+ */
function check_import_new_users( $permission ) {
if ( !is_super_admin() )
return false;
return true;
}
-add_filter( 'import_allow_create_users', 'check_import_new_users' );
// See "import_allow_fetch_attachments" and "import_attachment_size_limit" filters too.
+/**
+ * Generates and displays a drop-down of available languages.
+ *
+ * @since 3.0.0
+ *
+ * @param array $lang_files Optional. An array of the language files. Default empty array.
+ * @param string $current Optional. The current language code. Default empty.
+ */
function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
$flag = false;
$output = array();
@@ -549,7 +704,7 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
$output[$be] = '';
} else {
$translated = format_code_lang( $code_lang );
- $output[$translated] = '';
+ $output[$translated] = '';
}
}
@@ -560,40 +715,49 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
// Order by name
uksort( $output, 'strnatcasecmp' );
+ /**
+ * Filter the languages available in the dropdown.
+ *
+ * @since MU
+ *
+ * @param array $output HTML output of the dropdown.
+ * @param array $lang_files Available language files.
+ * @param string $current The current language code.
+ */
$output = apply_filters( 'mu_dropdown_languages', $output, $lang_files, $current );
- echo implode( "\n\t", $output );
-}
-/* Warn the admin if SECRET SALT information is missing from wp-config.php */
-function secret_salt_warning() {
- if ( !is_super_admin() )
- return;
- $secret_keys = array( 'AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT' );
- $out = '';
- foreach( $secret_keys as $key ) {
- if ( ! defined( $key ) )
- $out .= "define( '$key', '" . esc_html( wp_generate_password( 64, true, true ) ) . "' ); ";
- }
- if ( $out != '' ) {
- $msg = __( 'Warning! WordPress encrypts user cookies, but you must add the following lines to wp-config.php for it to be more secure.' );
- $msg .= ' ' . __( "Before the line /* That's all, stop editing! Happy blogging. */ please add this code:" );
- $msg .= "
$out";
-
- echo "
$msg
";
- }
+ echo implode( "\n\t", $output );
}
-add_action( 'network_admin_notices', 'secret_salt_warning' );
+/**
+ * Displays an admin notice to upgrade all sites after a core upgrade.
+ *
+ * @since 3.0.0
+ *
+ * @global int $wp_db_version The version number of the database.
+ *
+ * @return false False if the current user is not a super admin.
+ */
function site_admin_notice() {
global $wp_db_version;
if ( !is_super_admin() )
return false;
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
- echo "
" . sprintf( __( 'Thank you for Updating! Please visit the Update Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "
";
+ echo "
" . sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "
";
}
-add_action( 'admin_notices', 'site_admin_notice' );
-add_action( 'network_admin_notices', 'site_admin_notice' );
+/**
+ * Avoids a collision between a site slug and a permalink slug.
+ *
+ * In a subdirectory install this will make sure that a site and a post do not use the
+ * same subdirectory by checking for a site with the same name as a new post.
+ *
+ * @since 3.0.0
+ *
+ * @param array $data An array of post data.
+ * @param array $postarr An array of posts. Not currently used.
+ * @return array The new array of post data after checking for collisions.
+ */
function avoid_blog_page_permalink_collision( $data, $postarr ) {
if ( is_subdomain_install() )
return $data;
@@ -615,14 +779,21 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) {
}
return $data;
}
-add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );
+/**
+ * Handles the display of choosing a user's primary site.
+ *
+ * This displays the user's primary site and allows the user to choose
+ * which site is primary.
+ *
+ * @since 3.0.0
+ */
function choose_primary_blog() {
?>