Make setup-config purtier. Props Potter_System. fixes #2618
git-svn-id: http://svn.automattic.com/wordpress/trunk@3673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
6130dcb0d6
commit
33210aaf9e
|
@ -1,68 +1,94 @@
|
||||||
<?php
|
<?php
|
||||||
define('WP_INSTALLING', true);
|
define('WP_INSTALLING', true);
|
||||||
|
|
||||||
if (file_exists('../wp-config.php'))
|
|
||||||
die("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 <a href='install.php'>installing now</a>.");
|
|
||||||
|
|
||||||
if (!file_exists('../wp-config-sample.php'))
|
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.');
|
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');
|
$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.");
|
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' );
|
||||||
|
?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
<title>WordPress › Setup Configuration File</title>
|
<title>WordPress › Setup Configuration File</title>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
<style media="screen" type="text/css">
|
<style media="screen" type="text/css">
|
||||||
<!--
|
<!--
|
||||||
|
html {
|
||||||
|
background: #eee;
|
||||||
|
}
|
||||||
body {
|
body {
|
||||||
|
background: #fff;
|
||||||
|
color: #000;
|
||||||
font-family: Georgia, "Times New Roman", Times, serif;
|
font-family: Georgia, "Times New Roman", Times, serif;
|
||||||
margin-left: 15%;
|
margin-left: 20%;
|
||||||
margin-right: 15%;
|
margin-right: 20%;
|
||||||
|
padding: .2em 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
color: #006;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: lighter;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
p, li, dt {
|
||||||
|
line-height: 140%;
|
||||||
|
padding-bottom: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
ul, ol {
|
||||||
|
padding: 5px 5px 5px 20px;
|
||||||
}
|
}
|
||||||
#logo {
|
#logo {
|
||||||
margin: 0;
|
margin-bottom: 2em;
|
||||||
padding: 0;
|
|
||||||
background-image: url(http://wordpress.org/images/logo.png);
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
height: 60px;
|
|
||||||
border-bottom: 4px solid #333;
|
|
||||||
}
|
}
|
||||||
#logo a {
|
.step a, .step input {
|
||||||
display: block;
|
font-size: 2em;
|
||||||
height: 60px;
|
|
||||||
}
|
}
|
||||||
#logo a span {
|
td input {
|
||||||
display: none;
|
font-size: 1.5em;
|
||||||
}
|
}
|
||||||
p, li {
|
.step, th {
|
||||||
line-height: 140%;
|
text-align: right;
|
||||||
}
|
}
|
||||||
-->
|
#footer {
|
||||||
|
text-align: center;
|
||||||
|
border-top: 1px solid #ccc;
|
||||||
|
padding-top: 1em;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
-->
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<h1 id="logo"><a href="http://wordpress.org/"><span>WordPress</span></a></h1>
|
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
|
||||||
<?php
|
<?php
|
||||||
}
|
// Check if wp-config.php has been created
|
||||||
|
if (file_exists('../wp-config.php'))
|
||||||
|
die("<p>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 <a href='install.php'>installing now</a>.</p></body></html>");
|
||||||
|
|
||||||
switch($step) {
|
switch($step) {
|
||||||
case 0:
|
case 0:
|
||||||
setup_header();
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
|
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
|
||||||
<ol>
|
<ol>
|
||||||
<li>Database name</li>
|
<li>Database name</li>
|
||||||
<li>Database username</li>
|
<li>Database username</li>
|
||||||
<li>Database password</li>
|
<li>Database password</li>
|
||||||
<li>Database host</li>
|
<li>Database host</li>
|
||||||
<li>Table prefix (if you want to run more than one WordPress in a single database) </li>
|
<li>Table prefix (if you want to run more than one WordPress in a single database) </li>
|
||||||
</ol>
|
</ol>
|
||||||
|
@ -72,39 +98,40 @@ switch($step) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
setup_header();
|
|
||||||
?>
|
?>
|
||||||
</p>
|
</p>
|
||||||
<form method="post" action="setup-config.php?step=2">
|
<form method="post" action="setup-config.php?step=2">
|
||||||
<p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
|
<p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">Database Name</th>
|
<th scope="row">Database Name</th>
|
||||||
<td><input name="dbname" type="text" size="45" value="wordpress" /></td>
|
<td><input name="dbname" type="text" size="25" value="wordpress" /></td>
|
||||||
<td>The name of the database you want to run WP in. </td>
|
<td>The name of the database you want to run WP in. </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">User Name</th>
|
<th scope="row">User Name</th>
|
||||||
<td><input name="uname" type="text" size="45" value="username" /></td>
|
<td><input name="uname" type="text" size="25" value="username" /></td>
|
||||||
<td>Your MySQL username</td>
|
<td>Your MySQL username</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">Password</th>
|
<th scope="row">Password</th>
|
||||||
<td><input name="pwd" type="text" size="45" value="password" /></td>
|
<td><input name="pwd" type="text" size="25" value="password" /></td>
|
||||||
<td>...and MySQL password.</td>
|
<td>...and MySQL password.</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">Database Host</th>
|
<th scope="row">Database Host</th>
|
||||||
<td><input name="dbhost" type="text" size="45" value="localhost" /></td>
|
<td><input name="dbhost" type="text" size="25" value="localhost" /></td>
|
||||||
<td>99% chance you won't need to change this value.</td>
|
<td>99% chance you won't need to change this value.</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">Table Prefix</th>
|
<th scope="row">Table Prefix</th>
|
||||||
<td><input name="prefix" type="text" id="prefix" value="wp_" size="45" /></td>
|
<td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
|
||||||
<td>If you want to run multiple WordPress installations in a single database, change this.</td>
|
<td>If you want to run multiple WordPress installations in a single database, change this.</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<input name="submit" type="submit" value="Submit" />
|
<h2 class="step">
|
||||||
|
<input name="submit" type="submit" value="Submit" />
|
||||||
|
</h2>
|
||||||
</form>
|
</form>
|
||||||
<?php
|
<?php
|
||||||
break;
|
break;
|
||||||
|
@ -150,13 +177,12 @@ switch($step) {
|
||||||
}
|
}
|
||||||
fclose($handle);
|
fclose($handle);
|
||||||
chmod('../wp-config.php', 0666);
|
chmod('../wp-config.php', 0666);
|
||||||
setup_header();
|
|
||||||
?>
|
?>
|
||||||
<p>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 <a href="install.php">run the install!</a></p>
|
<p>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 <a href="install.php">run the install!</a></p>
|
||||||
<?php
|
<?php
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
<p id="footer"><a href="http://wordpress.org/">WordPress</a>, personal publishing platform.</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
Loading…
Reference in New Issue