Index: wp-admin/network.php =================================================================== --- wp-admin/network.php (revision 15769) +++ wp-admin/network.php (working copy) @@ -26,6 +26,177 @@ $wpdb->$table = $prefixed_table; /** + * @param string $base configuration + * @param bool $subdomain_install configuration + * @return string htaccess file content (mod_rewrite directives); + */ +function network_admin_generate_htaccess_file_content($base, $subdomain_install ) { + + $uploaded_files = sprintf( + '^%sfiles/(.+) wp-includes/ms-files.php?file=$1', + $subdomain_install ? '' : '[_0-9a-zA-Z-]+/' + ); + + // $htaccess_comment_if_a_subdomain_install + $comment_if = $subdomain_install ? '# ' : ''; + + $content = +'RewriteEngine On +RewriteBase ' . $base . ' +RewriteRule ^index\.php$ - [L] + +# uploaded files +RewriteRule ' . $uploaded_files . ' [L] + +# add a trailing slash to /wp-admin (commented if a subdomain install) +' . $comment_if . 'RewriteRule ^([_0-9a-zA-Z-]+/)wp-admin$ $1wp-admin/ [R=301,L] + +RewriteCond %{REQUEST_FILENAME} -f [OR] +RewriteCond %{REQUEST_FILENAME} -d +RewriteRule ^ - [L] + +# serach for non-existent files (commented if a subdomain install) +' . $comment_if . 'RewriteRule ^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*) $1 [L] +' . $comment_if . 'RewriteRule ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L] + +RewriteRule . index.php [L] +'; + + return $content; +} + +/** + * @return array array-keys as the key constant names and array-values as the according value. + */ +function network_admin_generate_key_salts() { + $key_names = array('AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT'); + $key_existing_names = array_filter( $key_names, 'defined' ); + $key_inexist = array_diff( $key_names, $key_existing_names ); + $keys_count = count($key_inexist); + if ( 0 === $keys_count ) + return array(); + + $keys_salts = array_combine( $key_inexist, array_fill( 0, $keys_count, '' ) ); + + $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); + if ( is_wp_error( $from_api ) ) { + foreach ( $keys_salts as $c => $v ) { + $keys_salts[ $c ] = wp_generate_password( 64, true, true ); + } + } else { + $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) ); + foreach ( $keys_salts as $c => $v ) { + $keys_salts[ $c ] = substr( array_shift( $from_api ), 28, 64 ); + } + } + + return $key_salts; +} + +/** + * @return string web config content + */ +function network_admin_web_config_content_subdirecotry_install() { + return +' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +'; +} + +/** + * @return string web config content + */ +function network_admin_web_config_content_subdomain_install() { + return +' + + + + + + + + + + + + + + + + + + + + + + + + + + + +'; +} + +/** + * @param string $base path of current site configuration + * @param string $hostname domain current site configuration + * @param bool $subdomain_install configuration + * @return string file content + */ +function network_admin_generate_wpconfig_file_content( $base, $hostname, $subdomain_install ) { + $subdomain = $subdomain_install ? 'true' : 'false'; + return +"define( 'MULTISITE', true ); +define( 'SUBDOMAIN_INSTALL', {$subdomain} ); +\$base = '{$base}'; +define( 'DOMAIN_CURRENT_SITE', '{$hostname}' ); +define( 'PATH_CURRENT_SITE', '{$base}' ); +define( 'SITE_ID_CURRENT_SITE', 1 ); +define( 'BLOG_ID_CURRENT_SITE', 1 ); +"; +} + +/** * Check for an existing network. * * @since 3.0.0 @@ -328,157 +499,51 @@ if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' ) echo ' ' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '

-

  • wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:' ), ABSPATH ); ?>

    + +
  • +

    wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:' ), ABSPATH ); ?>

    + + + +

    + wp-config.php file.', 'These unique authentication keys are also missing from your wp-config.php file.', $num_keys_salts ); ?> +

    + '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' ); - foreach ( $keys_salts as $c => $v ) { - if ( defined( $c ) ) - unset( $keys_salts[ $c ] ); } - if ( ! empty( $keys_salts ) ) { - $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); - if ( is_wp_error( $from_api ) ) { - foreach ( $keys_salts as $c => $v ) { - $keys_salts[ $c ] = wp_generate_password( 64, true, true ); - } - } else { - $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) ); - foreach ( $keys_salts as $c => $v ) { - $keys_salts[ $c ] = substr( array_shift( $from_api ), 28, 64 ); - } - } - $num_keys_salts = count( $keys_salts ); ?> -

    wp-config.php file.', 'These unique authentication keys are also missing from your wp-config.php file.', $num_keys_salts ); ?>

    - -
    • - - - - - - - - - - - - - - - - - - - - - - - - - - - -'; - } else { - $web_config_file = -' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -'; - } + if ( $subdomain_install ) { + $file_content = network_admin_web_config_content_subdomain_install(); + } else { + $file_content = network_admin_web_config_content_subdirecotry_install(); + } ?>

  • web.config file in %s, replacing other WordPress rules:' ), ABSPATH ); ?>

  • .htaccess file in %s, replacing other WordPress rules:' ), ABSPATH ); ?>

    • +