return $file;
}
-add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
/**
* Delete a blog.
*
* @since 3.0.0
*
+ * @global wpdb $wpdb
+ *
* @param int $blog_id Blog ID.
* @param bool $drop True if blog's table should be dropped. Default is false.
*/
$index = 0;
while ( $index < count( $stack ) ) {
- # Get indexed directory from stack
+ // Get indexed directory from stack
$dir = $stack[$index];
$dh = @opendir( $dir );
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 );
}
*
* @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.
*/
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.
*
);
update_option( 'adminhash', $new_admin_email );
- $email_text = __( '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###
* Filter the email text sent when the site admin email is changed.
*
* The following strings have a special meaning and will get replaced dynamically:
- * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
+ * ###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.
*/
$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 );
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.
);
update_option( $current_user->ID . '_new_email', $new_user_email );
- $email_text = __( '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###
* Filter the email text sent when a user changes emails.
*
* The following strings have a special meaning and will get replaced dynamically:
- * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
- * ###EMAIL### The new email.
- * ###SITENAME### The name of the site.
- * ###SITEURL### The URL to the site.
+ * ###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
*
*/
$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 );
$_POST['email'] = $current_user->user_email;
}
}
-add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
/**
* Adds an admin notice alerting the user to check for confirmation email
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>";
}
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
/**
* Check whether a blog has used its allotted upload space.
* @return int Max size in bytes
*/
function fix_import_form_size( $size ) {
- if ( upload_is_user_over_quota( false ) == true )
+ if ( upload_is_user_over_quota( false ) ) {
return 0;
-
+ }
$available = get_upload_space_available();
return min( $size, $available );
}
?>
<tr>
- <th><?php _e( 'Site Upload Space Quota '); ?></th>
- <td><input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" value="<?php echo $quota; ?>" /> <?php _e( 'MB (Leave blank for network default)' ); ?></td>
+ <th><label for="blog-upload-space-number"><?php _e( 'Site Upload Space Quota' ); ?></label></th>
+ <td>
+ <input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" id="blog-upload-space-number" aria-describedby="blog-upload-space-desc" value="<?php echo $quota; ?>" />
+ <span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e( 'Size in megabytes' ); ?></span> <?php _e( 'MB (Leave blank for network default)' ); ?></span>
+ </td>
</tr>
<?php
}
-add_action( 'wpmueditblogaction', 'upload_space_setting' );
/**
* Update the status of a user in the database.
*
* @since 3.0.0
*
+ * @global wpdb $wpdb
+ *
* @param int $id The user ID.
* @param string $pref The column in the wp_users table to update the user's status
* in (presumably user_status, spam, or deleted).
*
* @since 3.0.0
*
- * @param $term The term.
- * @param $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.
+ * @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'.
*/
}
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
$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 = '<p>' . 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 ) . '</p>';
$output .= '<p>' . __( '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.' ) . '</p>';
$output .= '</table>';
- 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.
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.
/**
* @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 ( 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>";
}
-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.
}
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.
<table class="form-table">
<tr>
<?php /* translators: My sites label */ ?>
- <th scope="row"><?php _e( 'Primary Site' ); ?></th>
+ <th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
<td>
<?php
$all_blogs = get_blogs_of_user( get_current_user_id() );
if ( count( $all_blogs ) > 1 ) {
$found = false;
?>
- <select name="primary_blog">
+ <select name="primary_blog" id="primary_blog">
<?php foreach( (array) $all_blogs as $blog ) {
if ( $primary_blog == $blog->userblog_id )
$found = true;
</select>
<?php
if ( !$found ) {
- $blog = array_shift( $all_blogs );
+ $blog = reset( $all_blogs );
update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
}
} elseif ( count( $all_blogs ) == 1 ) {
- $blog = array_shift( $all_blogs );
- echo $blog->domain;
+ $blog = reset( $all_blogs );
+ echo esc_url( get_home_url( $blog->userblog_id ) );
if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
} else {
*
* @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.
*
* @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.
*
* @since 3.1.0
*
+ * @global wpdb $wpdb
+ *
* @param int $site_id The network/site ID to check.
* @return bool True if network can be edited, otherwise false.
*/
function _thickbox_path_admin_subfolder() {
?>
<script type="text/javascript">
-//<![CDATA[
var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ); ?>";
-//]]>
</script>
<?php
}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff