$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 );
}
);
update_option( 'adminhash', $new_admin_email );
- $email_text = __( 'Dear user,
+ $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 );
+ $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 );
);
update_option( $current_user->ID . '_new_email', $new_user_email );
- $email_text = __( 'Dear user,
+ $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 );
?>
<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
}
*
* @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'.
*/
$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 );
<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 );
+ $blog = reset( $all_blogs );
echo $blog->domain;
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 );
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