From 1dd97280293614381f255a4b473dde0befe604a8 Mon Sep 17 00:00:00 2001 From: dd32 Date: Sun, 31 Jan 2010 11:55:39 +0000 Subject: [PATCH] set svn:eol-style native on new files git-svn-id: http://svn.automattic.com/wordpress/trunk@12910 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network.php | 700 +++++++++++++++++++++---------------------- 1 file changed, 350 insertions(+), 350 deletions(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index 584843f8fb..a968142096 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -1,350 +1,350 @@ -Network Settings') ); - -include( './admin-header.php' ); - -$dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' ); -?> -
- -

- -
- -

-

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

-
-

- -

-
-
-
-
-
- -

-
-"; -} - -/** - * Prints .htaccess component of step 2 for network settings. - * - * @since 3.0.0 - */ -function step2_htaccess() { - global $base; - - // 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 ) ); - } - - //@todo: check for super-cache in use -?> -

  • .htaccess with the following:' ); ?>

    - -
    • - -

    -

    - -

    -
      -
      • -
      • -
    • README for further details." ); ?>
      • -
    - " . __( '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; - } else { - echo '

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

    ' . $mod_rewrite_msg; - } - 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' ); - ?> - -

    -

    - -

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

    - -

    -
    - -

    - -

    - -

    %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 ); ?>

    - - - - - - -
    - - %s.' ), $hostname ); ?> - - - localhost as your server address.' ); ?> - -
    - -

    - - - - - - - - - -
    - -
    -
    - -
    -
    - -

    ' />

    - - -

    -

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

    -
      -
    1. blogs.dir directory in your wp-content directory. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ); ?>
      2. - - -
    -base_prefix; - - $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms'; - 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 ) ); - - $wp_config_file = file( $config_sample ); -?> -

  • wp-config.php with the following:' ); ?>

    - -
    • - - -
    - - +Network Settings') ); + +include( './admin-header.php' ); + +$dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' ); +?> +
    + +

    + +
    + +

    +

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

    +
    +

    + +

    +
    +
    +
    +
    +
    + +

    +
    +"; +} + +/** + * Prints .htaccess component of step 2 for network settings. + * + * @since 3.0.0 + */ +function step2_htaccess() { + global $base; + + // 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 ) ); + } + + //@todo: check for super-cache in use +?> +

  • .htaccess with the following:' ); ?>

    + +
    • + +

    +

    + +

    +
      +
      • +
      • +
    • README for further details." ); ?>
      • +
    + " . __( '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; + } else { + echo '

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

    ' . $mod_rewrite_msg; + } + 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' ); + ?> + +

    +

    + +

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

    + +

    +
    + +

    + +

    + +

    %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 ); ?>

    + + + + + + +
    + + %s.' ), $hostname ); ?> + + + localhost as your server address.' ); ?> + +
    + +

    + + + + + + + + + +
    + +
    +
    + +
    +
    + +

    ' />

    + + +

    +

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

    +
      +
    1. blogs.dir directory in your wp-content directory. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ); ?>
      2. + + +
    +base_prefix; + + $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms'; + 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 ) ); + + $wp_config_file = file( $config_sample ); +?> +

  • wp-config.php with the following:' ); ?>

    + +
    • + + +
    + +