From 33210aaf9e59898cf600a3ea6a53705a1d7ab24c Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 1 Apr 2006 22:59:31 +0000 Subject: [PATCH] Make setup-config purtier. Props Potter_System. fixes #2618 git-svn-id: http://svn.automattic.com/wordpress/trunk@3673 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/setup-config.php | 108 +++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 41 deletions(-) diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 2d6d92d056..c3bc45c943 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -1,68 +1,94 @@ installing now."); - if (!file_exists('../wp-config-sample.php')) die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); + $configFile = file('../wp-config-sample.php'); if (!is_writable('../')) die("Sorry, I can't write to the directory. You'll have to either change the permissions on your WordPress directory or create your wp-config.php manually."); -$step = 0; -if(isset($_GET['step'])) $step = $_GET['step']; -header( 'Content-Type: text/html; charset=utf-8' ); -function setup_header() { ?> +if (isset($_GET['step'])) + $step = $_GET['step']; +else + $step = 0; +header( 'Content-Type: text/html; charset=utf-8' ); +?> WordPress › Setup Configuration File - -

WordPress

+ +

WordPress

The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); switch($step) { case 0: - setup_header(); ?>

Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.

  1. Database name
  2. Database username
    3. -
  3. Database password
    4. +
  4. Database password
  5. Database host
  6. Table prefix (if you want to run more than one WordPress in a single database)
@@ -72,39 +98,40 @@ switch($step) { break; case 1: - setup_header(); ?>

-
+

Below you should enter your database connection details. If you're not sure about these, contact your host.

- + - + - + - + - + -
Database Name The name of the database you want to run WP in.
User Name Your MySQL username
Password ...and MySQL password.
Database Host 99% chance you won't need to change this value.
Table Prefix If you want to run multiple WordPress installations in a single database, change this.
- + +

+ +

All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to run the install!

+?> +