Index: wp-admin/admin-footer.php =================================================================== --- wp-admin/admin-footer.php (revision 13557) +++ wp-admin/admin-footer.php (working copy) @@ -29,7 +29,7 @@

$msg

"; include('admin-footer.php'); die; Index: wp-admin/includes/network.php =================================================================== --- wp-admin/includes/network.php (revision 0) +++ wp-admin/includes/network.php (revision 0) @@ -0,0 +1,78 @@ +get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) + return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" ); + + return false; +} + +/** + * Prints summary of server statistics in preparation for setting up a network. + * + * @since 3.0.0 + */ +function filestats( $err ) { +?> +

+

http://wordpress.org/support/ then copy and paste the following information into your message:' ); ?>

+
+

+ +

+
+
+
+
+
+ +

+
+"; +} \ No newline at end of file Index: wp-admin/network.php =================================================================== --- wp-admin/network.php (revision 13557) +++ wp-admin/network.php (working copy) @@ -1,6 +1,6 @@ tables( 'ms_global' ) as $table => $prefixed_table ) $wpdb->$table = $prefixed_table; -$title = __( 'Network Settings' ); +$title = __( 'Create a Network of WordPress Sites' ); $parent_file = 'tools.php'; add_contextual_help( $current_screen, __( 'Network Settings') ); @@ -36,251 +38,150 @@
Network + * should not be a sudden "Welcome to a new install process! Fill this out and click here." + * * @since 3.0.0 */ -function filestats( $err ) { -?> -

-

http://wordpress.org/support/ then copy and paste the following information into your message:' ); ?>

-
-

- -

-
-
-
-
-
- -

-
- Network when is_multisite(), and wp_die() at the top of this file. + if ( is_multisite() ) { + _e( 'Network already enabled.' ); + include( './admin-footer.php' ); + die(); } - echo "
"; -} -/** - * Prints .htaccess component of step 2 for network settings. - * - * @since 3.0.0 - */ -function step2_htaccess() { - global $base; + $active_plugins = get_option( 'active_plugins' ); + if ( ! empty( $active_plugins ) ) { + printf( '

' . __( 'Please deactivate your plugins before enabling WordPress Sites. Once WordPress Sites are enabled, you may reactivate your plugins.' ) . '

', admin_url( 'plugins.php' ) ); + include( './admin-footer.php' ); + die(); + } - // remove ending slash from $base and $url - $htaccess = ''; - if ( substr( $base, -1 ) == '/' ) - $base = substr( $base, 0, -1 ); - - $htaccess_sample = ABSPATH . 'wp-admin/includes/htaccess.ms'; - if ( ! file_exists( $htaccess_sample ) ) - wp_die( sprintf( __( 'Sorry, I need a %s to work from. Please re-upload this file to your WordPress installation.' ), $htaccess_sample ) ); - - $htaccess_file = file( $htaccess_sample ); - $fp = @fopen( $htaccess_sample, "r" ); - if ( $fp ) { - while ( ! feof( $fp ) ) { - $htaccess .= fgets( $fp, 4096 ); - } - fclose( $fp ); - $htaccess_file = str_replace( "BASE", $base, $htaccess ); - } else { - wp_die( sprintf( __( 'Sorry, I need to be able to read %s. Please check the permissions on this file.' ), $htaccess_sample ) ); + $hostname = get_clean_basedomain(); + if ( 'localhost' == $hostname || preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname ) ) { + echo '

' . __('You cannot install a network of sites with your server address.' ) . '

'; + echo '

' . __('You cannot use an IP address such as 127.0.0.1 or a single-word hostname like localhost.' ) . '

'; + if ( 'localhost' == $hostname ) + echo '

' . __('Consider using localhost.localdomain.') . '

'; + include( './admin-footer.php' ); + die(); } -?> -

  • %s.htaccess with the following:' ), ABSPATH ); ?>

    - -
    • - -

    -

    - -

    - +

    +

    " . __( 'If the mod_rewrite module is disabled ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ) . '

    '; - if ( function_exists( 'apache_get_modules' ) ) { - $modules = apache_get_modules(); - if ( ! in_array( 'mod_rewrite', $modules ) ) - echo '

    ' . __( 'Warning! It looks like mod_rewrite is not installed.' ) . '

    ' . $mod_rewrite_msg; - else - $rewrite_enabled = true; + if ( apache_mod_loaded('mod_rewrite') ) { // assume nothing + $rewrite_enabled = true; } else { - echo '

    ' . __( 'Please make sure mod_rewrite is installed as it will be activated at the end of this install.' ) . '

    ' . $mod_rewrite_msg; + $rewrite_enabled = false; + if ( got_mod_rewrite() ) // dangerous assumptions + echo '

    ' . __( 'Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this install.' ) . '

    '; + else + echo '

    ' . __( 'Warning! It looks like Apache mod_rewrite module is not installed.' ) . '

    '; + echo '

    ' . __( 'If mod_rewrite is disabled ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ) . '

    '; } - return $rewrite_enabled; -} -/** - * Prints most of step 1 for network settings. - * - * @since 3.0.0 - * @param bool $rewrite_enabled Whether mod_rewrite is enabled. Default false. - */ -function printstep1form( $rewrite_enabled = false ) { - $weblog_title = sprintf( __( '%s Sites' ), ucfirst( get_option( 'blogname' ) ) ); - $email = get_option( 'admin_email' ); - $hostname = get_clean_basedomain(); - $invalid_host = false; - if ( 'localhost' == $hostname || preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname, $match ) ) - $invalid_host = true; - if ( substr( $hostname, 0, 4 ) == 'www.' ) - $nowww = substr( $hostname, 4 ); - wp_nonce_field( 'install-network-1' ); if ( network_domain_check() ) { ?>

    -
    +

    - + -

    -

    +

    + +

    You cannot change this later.' ); ?>

    +

    +

    Note It looks like mod_rewrite is not installed.' ); ?>

    -

    -
    - -

    + + + + + + + + + +
    blog1.example.com and blog2.example.com'); ?>
    example.com/blog1 and example.com/blog2'); ?>
    -

    - -

    %1$s before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like %2$s but any links will not have the "www" prefix.' ), $nowww, $hostname ); ?>

    - + +

    +

    %1$s before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like %2$s but any links will not have the "www" prefix.' ), substr( $hostname, 4 ), $hostname ); ?>
    - - %s.' ), $hostname ); ?> + %s.' ), $hostname ); ?> - - localhost as your server address.' ); ?> -
    + -

    +

    + - + + - + + + + +
    - -
    + %s.' ), $hostname ); ?>
    - + ' /> +
    +
    + ' />
    - -

    ' />

    - - ' />

    + -

    -

    deactivate your plugins before enabling WordPress Sites. Once WordPress Sites are enabled, you may reactivate your plugins.' ), admin_url( 'plugins.php' ) ); ?>

    -get_var( "SHOW TABLES LIKE '$wpdb->site'" ) == $wpdb->site ) - return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" ); - - return false; -} - -/** - * Prints step 2 for network settings. - * - * @since 3.0.0 - */ function step2() { + global $base, $wpdb; ?> -

    +

    Note: We recommend you make a backup copy of your existing wp-config.php and .htaccess files.' ); ?>

    1. %s/blogs.dir directory. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); ?>
      2. - - -
    base_prefix; - $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms'; + $config_sample = ABSPATH . 'wp-admin/includes/ms-config-sample.php'; if ( ! file_exists( $config_sample ) ) wp_die( sprintf( __( 'Sorry, I need a %s to work from. Please re-upload this file to your WordPress installation.' ), $config_sample ) ); @@ -341,57 +242,58 @@ +

  • %s.htaccess with the following:' ), ABSPATH ); ?>

    + +
    • + +