diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/ms.php --- a/wp/wp-admin/includes/ms.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/includes/ms.php Mon Oct 14 18:28:13 2019 +0200 @@ -16,26 +16,29 @@ * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise. */ function check_upload_size( $file ) { - if ( get_site_option( 'upload_space_check_disabled' ) ) + if ( get_site_option( 'upload_space_check_disabled' ) ) { return $file; + } - if ( $file['error'] != '0' ) // there's already an error + if ( $file['error'] != '0' ) { // there's already an error return $file; + } - if ( defined( 'WP_IMPORTING' ) ) + if ( defined( 'WP_IMPORTING' ) ) { return $file; + } $space_left = get_upload_space_available(); $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 ) ); + /* translators: %s: required disk space in kilobytes */ + $file['error'] = sprintf( __( 'Not enough space to upload. %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 ) ); + /* translators: %s: maximum allowed file size in kilobytes */ + $file['error'] = sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) ); } if ( upload_is_user_over_quota( false ) ) { @@ -53,6 +56,7 @@ * Delete a site. * * @since 3.0.0 + * @since 5.1.0 Use wp_delete_site() internally to delete the site row from the database. * * @global wpdb $wpdb WordPress database abstraction object. * @@ -69,26 +73,6 @@ } $blog = get_site( $blog_id ); - /** - * Fires before a site is deleted. - * - * @since MU (3.0.0) - * - * @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 ); - - $users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) ); - - // Remove users from this blog. - if ( ! empty( $users ) ) { - foreach ( $users as $user_id ) { - remove_user_from_blog( $user_id, $blog_id ); - } - } - - update_blog_status( $blog_id, 'deleted', 1 ); $current_network = get_network(); @@ -110,81 +94,34 @@ } if ( $drop ) { - $uploads = wp_get_upload_dir(); + wp_delete_site( $blog_id ); + } else { + /** This action is documented in wp-includes/ms-blogs.php */ + do_action_deprecated( 'delete_blog', array( $blog_id, false ), '5.1.0' ); - $tables = $wpdb->tables( 'blog' ); - /** - * Filters the tables to drop when the site is deleted. - * - * @since MU (3.0.0) - * - * @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 ); + $users = get_users( + array( + 'blog_id' => $blog_id, + 'fields' => 'ids', + ) + ); - foreach ( (array) $drop_tables as $table ) { - $wpdb->query( "DROP TABLE IF EXISTS `$table`" ); + // Remove users from this blog. + if ( ! empty( $users ) ) { + foreach ( $users as $user_id ) { + remove_user_from_blog( $user_id, $blog_id ); + } } - $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) ); - - /** - * Filters the upload base directory to delete when the site is deleted. - * - * @since MU (3.0.0) - * - * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir() - * @param int $blog_id The site 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 - $dir = $stack[$index]; + update_blog_status( $blog_id, 'deleted', 1 ); - $dh = @opendir( $dir ); - if ( $dh ) { - while ( ( $file = @readdir( $dh ) ) !== false ) { - if ( $file == '.' || $file == '..' ) - continue; - - if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) { - $stack[] = $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 - foreach ( (array) $stack as $dir ) { - if ( $dir != $top_dir) - @rmdir( $dir ); - } - - clean_blog_cache( $blog ); + /** This action is documented in wp-includes/ms-blogs.php */ + do_action_deprecated( 'deleted_blog', array( $blog_id, false ), '5.1.0' ); } - /** - * Fires after the site is deleted from the network. - * - * @since 4.8.0 - * - * @param int $blog_id The site ID. - * @param bool $drop True if site's tables should be dropped. Default is false. - */ - do_action( 'deleted_blog', $blog_id, $drop ); - - if ( $switch ) + if ( $switch ) { restore_current_blog(); + } } /** @@ -206,11 +143,12 @@ return false; } - $id = (int) $id; + $id = (int) $id; $user = new WP_User( $id ); - if ( !$user->exists() ) + if ( ! $user->exists() ) { return false; + } // Global super-administrators are protected, and cannot be deleted. $_super_admins = get_super_admins(); @@ -243,8 +181,9 @@ $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) ); if ( $link_ids ) { - foreach ( $link_ids as $link_id ) + foreach ( $link_ids as $link_id ) { wp_delete_link( $link_id ); + } } restore_current_blog(); @@ -252,8 +191,9 @@ } $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) ); - foreach ( $meta as $mid ) + foreach ( $meta as $mid ) { delete_metadata_by_mid( 'user', $mid ); + } $wpdb->delete( $wpdb->users, array( 'ID' => $id ) ); @@ -274,8 +214,9 @@ * @return bool True if user is over upload space quota, otherwise false. */ function upload_is_user_over_quota( $echo = true ) { - if ( get_site_option( 'upload_space_check_disabled' ) ) + if ( get_site_option( 'upload_space_check_disabled' ) ) { return false; + } $space_allowed = get_space_allowed(); if ( ! is_numeric( $space_allowed ) ) { @@ -284,8 +225,13 @@ $space_used = get_space_used(); if ( ( $space_allowed - $space_used ) < 0 ) { - if ( $echo ) - _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); + if ( $echo ) { + printf( + /* translators: %s: allowed space allocation */ + __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ), + size_format( $space_allowed * MB_IN_BYTES ) + ); + } return true; } else { return false; @@ -299,7 +245,7 @@ */ function display_space_usage() { $space_allowed = get_space_allowed(); - $space_used = get_space_used(); + $space_used = get_space_used(); $percent_used = ( $space_used / $space_allowed ) * 100; @@ -313,10 +259,12 @@ $space .= __( 'MB' ); } ?> - + + ?> + @@ -381,8 +330,9 @@ function update_user_status( $id, $pref, $value, $deprecated = null ) { global $wpdb; - if ( null !== $deprecated ) + if ( null !== $deprecated ) { _deprecated_argument( __FUNCTION__, '3.0.2' ); + } $wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) ); @@ -425,8 +375,9 @@ function refresh_user_details( $id ) { $id = (int) $id; - if ( !$user = get_userdata( $id ) ) + if ( ! $user = get_userdata( $id ) ) { return false; + } clean_user_cache( $user ); @@ -443,43 +394,218 @@ * then the first two letters of $code is returned. */ function format_code_lang( $code = '' ) { - $code = strtolower( substr( $code, 0, 2 ) ); + $code = strtolower( substr( $code, 0, 2 ) ); $lang_codes = array( - 'aa' => 'Afar', 'ab' => 'Abkhazian', 'af' => 'Afrikaans', 'ak' => 'Akan', 'sq' => 'Albanian', 'am' => 'Amharic', 'ar' => 'Arabic', 'an' => 'Aragonese', 'hy' => 'Armenian', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'eu' => 'Basque', 'be' => 'Belarusian', 'bn' => 'Bengali', - 'bh' => 'Bihari', 'bi' => 'Bislama', 'bs' => 'Bosnian', 'br' => 'Breton', 'bg' => 'Bulgarian', 'my' => 'Burmese', 'ca' => 'Catalan; Valencian', 'ch' => 'Chamorro', 'ce' => 'Chechen', 'zh' => 'Chinese', 'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree', - 'cs' => 'Czech', 'da' => 'Danish', 'dv' => 'Divehi; Dhivehi; Maldivian', 'nl' => 'Dutch; Flemish', 'dz' => 'Dzongkha', 'en' => 'English', 'eo' => 'Esperanto', 'et' => 'Estonian', 'ee' => 'Ewe', 'fo' => 'Faroese', 'fj' => 'Fijjian', 'fi' => 'Finnish', 'fr' => 'French', 'fy' => 'Western Frisian', 'ff' => 'Fulah', 'ka' => 'Georgian', 'de' => 'German', 'gd' => 'Gaelic; Scottish Gaelic', - 'ga' => 'Irish', 'gl' => 'Galician', 'gv' => 'Manx', 'el' => 'Greek, Modern', 'gn' => 'Guarani', 'gu' => 'Gujarati', 'ht' => 'Haitian; Haitian Creole', 'ha' => 'Hausa', 'he' => 'Hebrew', 'hz' => 'Herero', 'hi' => 'Hindi', 'ho' => 'Hiri Motu', 'hu' => 'Hungarian', 'ig' => 'Igbo', 'is' => 'Icelandic', 'io' => 'Ido', 'ii' => 'Sichuan Yi', 'iu' => 'Inuktitut', 'ie' => 'Interlingue', - 'ia' => 'Interlingua (International Auxiliary Language Association)', 'id' => 'Indonesian', 'ik' => 'Inupiaq', 'it' => 'Italian', 'jv' => 'Javanese', 'ja' => 'Japanese', 'kl' => 'Kalaallisut; Greenlandic', 'kn' => 'Kannada', 'ks' => 'Kashmiri', 'kr' => 'Kanuri', 'kk' => 'Kazakh', 'km' => 'Central Khmer', 'ki' => 'Kikuyu; Gikuyu', 'rw' => 'Kinyarwanda', 'ky' => 'Kirghiz; Kyrgyz', - 'kv' => 'Komi', 'kg' => 'Kongo', 'ko' => 'Korean', 'kj' => 'Kuanyama; Kwanyama', 'ku' => 'Kurdish', 'lo' => 'Lao', 'la' => 'Latin', 'lv' => 'Latvian', 'li' => 'Limburgan; Limburger; Limburgish', 'ln' => 'Lingala', 'lt' => 'Lithuanian', 'lb' => 'Luxembourgish; Letzeburgesch', 'lu' => 'Luba-Katanga', 'lg' => 'Ganda', 'mk' => 'Macedonian', 'mh' => 'Marshallese', 'ml' => 'Malayalam', - 'mi' => 'Maori', 'mr' => 'Marathi', 'ms' => 'Malay', 'mg' => 'Malagasy', 'mt' => 'Maltese', 'mo' => 'Moldavian', 'mn' => 'Mongolian', 'na' => 'Nauru', 'nv' => 'Navajo; Navaho', 'nr' => 'Ndebele, South; South Ndebele', 'nd' => 'Ndebele, North; North Ndebele', 'ng' => 'Ndonga', 'ne' => 'Nepali', 'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian', 'nb' => 'Bokmål, Norwegian, Norwegian Bokmål', - 'no' => 'Norwegian', 'ny' => 'Chichewa; Chewa; Nyanja', 'oc' => 'Occitan, Provençal', 'oj' => 'Ojibwa', 'or' => 'Oriya', 'om' => 'Oromo', 'os' => 'Ossetian; Ossetic', 'pa' => 'Panjabi; Punjabi', 'fa' => 'Persian', 'pi' => 'Pali', 'pl' => 'Polish', 'pt' => 'Portuguese', 'ps' => 'Pushto', 'qu' => 'Quechua', 'rm' => 'Romansh', 'ro' => 'Romanian', 'rn' => 'Rundi', 'ru' => 'Russian', - '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' ); + 'aa' => 'Afar', + 'ab' => 'Abkhazian', + 'af' => 'Afrikaans', + 'ak' => 'Akan', + 'sq' => 'Albanian', + 'am' => 'Amharic', + 'ar' => 'Arabic', + 'an' => 'Aragonese', + 'hy' => 'Armenian', + 'as' => 'Assamese', + 'av' => 'Avaric', + 'ae' => 'Avestan', + 'ay' => 'Aymara', + 'az' => 'Azerbaijani', + 'ba' => 'Bashkir', + 'bm' => 'Bambara', + 'eu' => 'Basque', + 'be' => 'Belarusian', + 'bn' => 'Bengali', + 'bh' => 'Bihari', + 'bi' => 'Bislama', + 'bs' => 'Bosnian', + 'br' => 'Breton', + 'bg' => 'Bulgarian', + 'my' => 'Burmese', + 'ca' => 'Catalan; Valencian', + 'ch' => 'Chamorro', + 'ce' => 'Chechen', + 'zh' => 'Chinese', + 'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', + 'cv' => 'Chuvash', + 'kw' => 'Cornish', + 'co' => 'Corsican', + 'cr' => 'Cree', + 'cs' => 'Czech', + 'da' => 'Danish', + 'dv' => 'Divehi; Dhivehi; Maldivian', + 'nl' => 'Dutch; Flemish', + 'dz' => 'Dzongkha', + 'en' => 'English', + 'eo' => 'Esperanto', + 'et' => 'Estonian', + 'ee' => 'Ewe', + 'fo' => 'Faroese', + 'fj' => 'Fijjian', + 'fi' => 'Finnish', + 'fr' => 'French', + 'fy' => 'Western Frisian', + 'ff' => 'Fulah', + 'ka' => 'Georgian', + 'de' => 'German', + 'gd' => 'Gaelic; Scottish Gaelic', + 'ga' => 'Irish', + 'gl' => 'Galician', + 'gv' => 'Manx', + 'el' => 'Greek, Modern', + 'gn' => 'Guarani', + 'gu' => 'Gujarati', + 'ht' => 'Haitian; Haitian Creole', + 'ha' => 'Hausa', + 'he' => 'Hebrew', + 'hz' => 'Herero', + 'hi' => 'Hindi', + 'ho' => 'Hiri Motu', + 'hu' => 'Hungarian', + 'ig' => 'Igbo', + 'is' => 'Icelandic', + 'io' => 'Ido', + 'ii' => 'Sichuan Yi', + 'iu' => 'Inuktitut', + 'ie' => 'Interlingue', + 'ia' => 'Interlingua (International Auxiliary Language Association)', + 'id' => 'Indonesian', + 'ik' => 'Inupiaq', + 'it' => 'Italian', + 'jv' => 'Javanese', + 'ja' => 'Japanese', + 'kl' => 'Kalaallisut; Greenlandic', + 'kn' => 'Kannada', + 'ks' => 'Kashmiri', + 'kr' => 'Kanuri', + 'kk' => 'Kazakh', + 'km' => 'Central Khmer', + 'ki' => 'Kikuyu; Gikuyu', + 'rw' => 'Kinyarwanda', + 'ky' => 'Kirghiz; Kyrgyz', + 'kv' => 'Komi', + 'kg' => 'Kongo', + 'ko' => 'Korean', + 'kj' => 'Kuanyama; Kwanyama', + 'ku' => 'Kurdish', + 'lo' => 'Lao', + 'la' => 'Latin', + 'lv' => 'Latvian', + 'li' => 'Limburgan; Limburger; Limburgish', + 'ln' => 'Lingala', + 'lt' => 'Lithuanian', + 'lb' => 'Luxembourgish; Letzeburgesch', + 'lu' => 'Luba-Katanga', + 'lg' => 'Ganda', + 'mk' => 'Macedonian', + 'mh' => 'Marshallese', + 'ml' => 'Malayalam', + 'mi' => 'Maori', + 'mr' => 'Marathi', + 'ms' => 'Malay', + 'mg' => 'Malagasy', + 'mt' => 'Maltese', + 'mo' => 'Moldavian', + 'mn' => 'Mongolian', + 'na' => 'Nauru', + 'nv' => 'Navajo; Navaho', + 'nr' => 'Ndebele, South; South Ndebele', + 'nd' => 'Ndebele, North; North Ndebele', + 'ng' => 'Ndonga', + 'ne' => 'Nepali', + 'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian', + 'nb' => 'Bokmål, Norwegian, Norwegian Bokmål', + 'no' => 'Norwegian', + 'ny' => 'Chichewa; Chewa; Nyanja', + 'oc' => 'Occitan, Provençal', + 'oj' => 'Ojibwa', + 'or' => 'Oriya', + 'om' => 'Oromo', + 'os' => 'Ossetian; Ossetic', + 'pa' => 'Panjabi; Punjabi', + 'fa' => 'Persian', + 'pi' => 'Pali', + 'pl' => 'Polish', + 'pt' => 'Portuguese', + 'ps' => 'Pushto', + 'qu' => 'Quechua', + 'rm' => 'Romansh', + 'ro' => 'Romanian', + 'rn' => 'Rundi', + 'ru' => 'Russian', + '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', + ); /** * Filters the language codes. * * @since MU (3.0.0) * - * @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. + * @param string[] $lang_codes Array of key/value pairs 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. + * Synchronizes 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 sanitize_title() - * if $taxonomy is 'category' or 'post_tag'. + * @param WP_Term|array $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 WP_Term|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 ) { if ( global_terms_enabled() && ( $taxonomy == 'category' || $taxonomy == 'post_tag' ) ) { @@ -500,30 +626,33 @@ * @access private */ function _access_denied_splash() { - if ( ! is_user_logged_in() || is_network_admin() ) + if ( ! is_user_logged_in() || is_network_admin() ) { return; + } $blogs = get_blogs_of_user( get_current_user_id() ); - if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) ) + if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) ) { return; + } $blog_name = get_bloginfo( 'name' ); - if ( empty( $blogs ) ) + 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 ), 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 = '

' . 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.' ) . '

'; - $output .= '

' . __('Your Sites') . '

'; + $output .= '

' . __( 'Your Sites' ) . '

'; $output .= ''; foreach ( $blogs as $blog ) { $output .= ''; $output .= ""; $output .= ''; + '' . __( 'View Site' ) . ''; $output .= ''; } @@ -554,33 +683,33 @@ * * @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. + * @param string[] $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; + $flag = false; $output = array(); foreach ( (array) $lang_files as $val ) { $code_lang = basename( $val, '.mo' ); if ( $code_lang == 'en_US' ) { // American English - $flag = true; - $ae = __( 'American English' ); - $output[$ae] = ''; + $flag = true; + $ae = __( 'American English' ); + $output[ $ae ] = ''; } elseif ( $code_lang == 'en_GB' ) { // British English - $flag = true; - $be = __( 'British English' ); - $output[$be] = ''; + $flag = true; + $be = __( 'British English' ); + $output[ $be ] = ''; } else { - $translated = format_code_lang( $code_lang ); - $output[$translated] = ''; + $translated = format_code_lang( $code_lang ); + $output[ $translated ] = ''; } - } - if ( $flag === false ) // WordPress english - $output[] = '"; + if ( $flag === false ) { // WordPress english + $output[] = ''; + } // Order by name uksort( $output, 'strnatcasecmp' ); @@ -590,9 +719,9 @@ * * @since MU (3.0.0) * - * @param array $output HTML output of the dropdown. - * @param array $lang_files Available language files. - * @param string $current The current language code. + * @param string[] $output Array of HTML output for the dropdown. + * @param string[] $lang_files Array of available language files. + * @param string $current The current language code. */ $output = apply_filters( 'mu_dropdown_languages', $output, $lang_files, $current ); @@ -621,7 +750,7 @@ } 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' ) ) ) . "
"; + echo "
" . sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . '
'; } } @@ -638,18 +767,22 @@ * @return array The new array of post data after checking for collisions. */ function avoid_blog_page_permalink_collision( $data, $postarr ) { - if ( is_subdomain_install() ) + if ( is_subdomain_install() ) { return $data; - if ( $data['post_type'] != 'page' ) + } + if ( $data['post_type'] != 'page' ) { return $data; - if ( !isset( $data['post_name'] ) || $data['post_name'] == '' ) + } + if ( ! isset( $data['post_name'] ) || $data['post_name'] == '' ) { return $data; - if ( !is_main_site() ) + } + if ( ! is_main_site() ) { return $data; + } $post_name = $data['post_name']; - $c = 0; - while( $c < 10 && get_id_from_blogname( $post_name ) ) { + $c = 0; + while ( $c < 10 && get_id_from_blogname( $post_name ) ) { $post_name .= mt_rand( 1, 10 ); $c ++; } @@ -669,36 +802,42 @@ */ function choose_primary_blog() { ?> -
{$blog->blogname}' . __( 'Visit Dashboard' ) . ' | ' . - '' . __( 'View Site' ) . '
+
@@ -719,10 +858,11 @@ * @return bool True if network can be edited, otherwise false. */ function can_edit_network( $network_id ) { - if ( $network_id == get_current_network_id() ) + if ( $network_id == get_current_network_id() ) { $result = true; - else + } else { $result = false; + } /** * Filters whether this network can be edited from this page. @@ -743,15 +883,14 @@ * @access private */ function _thickbox_path_admin_subfolder() { -?> + ?> -ID ) . '">' . $current_user->user_login . ''; ?> - - ID ) . '">' . $current_user->user_login . ''; + ?> +
+ user_login; ?> ' . "\n"; ?> - - "; + echo ''; } else { ?> - - + if ( 1 == count( $users ) ) : + ?>

- + ?> - 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' ) - ) ); + $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', - ) ); + $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(); @@ -943,9 +1118,13 @@ // Link classes $classes = array( 'nav-tab' ); + // Aria-current attribute. + $aria_current = ''; + // 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'; + $classes[] = 'nav-tab-active'; + $aria_current = ' aria-current="page"'; } // Escape each class @@ -955,13 +1134,13 @@ $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'] ) . ''; + $screen_links[ $link_id ] = '' . esc_html( $link['label'] ) . ''; } // All done! - echo '

'; + echo '

'; + echo ''; } /** @@ -974,13 +1153,13 @@ function get_site_screen_help_tab_args() { return array( 'id' => 'overview', - 'title' => __('Overview'), + 'title' => __( 'Overview' ), 'content' => - '

' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '

' . - '

' . __('Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '

' . - '

' . __('Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '

' . - '

' . sprintf( __('Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . - '

' . __('Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '

' + '

' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '

' . + '

' . __( 'Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '

' . + '

' . __( 'Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '

' . + '

' . sprintf( __( 'Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '

' . + '

' . __( 'Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '

', ); } @@ -992,7 +1171,7 @@ * @return string Help sidebar content. */ function get_site_screen_help_sidebar_content() { - return '

' . __('For more information:') . '

' . - '

' . __('Documentation on Site Management') . '

' . - '

' . __('Support Forums') . '

'; + return '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Site Management' ) . '

' . + '

' . __( 'Support Forums' ) . '

'; }