From b7bde3492d8f45f5039151f858d1865a26c7ff9d Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 27 Jan 2010 13:48:37 +0000 Subject: [PATCH] Whitespace cleanup and inline docs. Props nacin. see #12027 git-svn-id: http://svn.automattic.com/wordpress/trunk@12865 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network.php | 178 ++++++++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 71 deletions(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index 31ba4208c9..cf93115f6d 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -2,30 +2,28 @@ /** * Network settings administration panel. * - * @since 3.0 + * A multi-step process allowing the user to enable a network of WordPress sites. + * + * @since 3.0.0 * * @package WordPress * @subpackage Administration */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( './admin.php' ); if ( ! is_super_admin() ) - wp_die(__('You do not have sufficient permissions to manage options for this blog.')); + wp_die( __( 'You do not have sufficient permissions to manage options for this blog.' ) ); -$title = __('Network Settings'); +$title = __( 'Network Settings' ); $parent_file = 'tools.php'; -add_contextual_help($current_screen, __('Network Settings')); +add_contextual_help( $current_screen, __( 'Network Settings') ); -include('./admin-header.php'); -/* -This option panel does not save data to the options table. -It contains a multi-step process allowing the user to enable a network of WordPress sites. -*/ +include( './admin-header.php' ); -$dirs = array( substr( ABSPATH, 0, -1), ABSPATH . "wp-content" ); +$dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' ); ?>
@@ -33,91 +31,107 @@ $dirs = array( substr( ABSPATH, 0, -1), ABSPATH . "wp-content" );
-

-

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

+

+

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); - } + 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 ) ); + 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 ) ) { + 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 ) ); + 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:'); ?>

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

  • -

    -

    +

    +

    -

    +

    • -
    • README for further details."); ?>
    • +
    • 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." ) . '

    '; + $mod_rewrite_msg = "\n

    " . __( '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; + echo '

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

    ' . $mod_rewrite_msg; else $rewrite_enabled = true; } else { @@ -126,11 +140,17 @@ function step1() { 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' ) ) ); + $weblog_title = sprintf( __( '%s Sites' ), ucfirst( get_option( 'blogname' ) ) ); $email = get_option( 'admin_email' ); $hostname = get_clean_basedomain(); - if( substr( $hostname, 0, 4 ) == 'www.' ) + if ( substr( $hostname, 0, 4 ) == 'www.' ) $nowww = substr( $hostname, 4 ); wp_nonce_field( 'install-network-1' ); @@ -138,12 +158,12 @@ function printstep1form( $rewrite_enabled = false ) {

    - -

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

    + +

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

    -
    - +
    +

    @@ -182,6 +202,11 @@ function printstep1form( $rewrite_enabled = false ) {

    @@ -194,14 +219,19 @@ function step2() { base_prefix; $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms'; - if ( !file_exists( $config_sample ) ) + 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 ); @@ -209,35 +239,35 @@ function step2_config() {
  • wp-config.php with the following:' ); ?>