<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19701] trunk/wp-admin/setup-config.php: Use regex to fill in config-sample.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19701">19701</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-01-06 18:23:51 +0000 (Fri, 06 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use regex to fill in config-sample. Prevents translators from needing to manually translate 'database_name_here' (and friends). see <a href="http://core.trac.wordpress.org/ticket/18180">#18180</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (19700 => 19701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2012-01-06 18:08:45 UTC (rev 19700)
+++ trunk/wp-admin/setup-config.php 2012-01-06 18:23:51 UTC (rev 19701)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> if (!file_exists(ABSPATH . 'wp-config-sample.php'))
</span><span class="cx"> wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
</span><span class="cx">
</span><del>-$configFile = file(ABSPATH . 'wp-config-sample.php');
</del><ins>+$config_file = file(ABSPATH . 'wp-config-sample.php');
</ins><span class="cx">
</span><span class="cx"> // Check if wp-config.php has been created
</span><span class="cx"> if (file_exists(ABSPATH . 'wp-config.php'))
</span><span class="lines">@@ -210,44 +210,48 @@
</span><span class="cx"> $secret_keys[$k] = substr( $v, 28, 64 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $key = 0;
</span><ins>+ foreach ( $config_file as &$line ) {
+ if ( '$table_prefix =' == substr( $line, 0, 16 ) ) {
+ $line = '$table_prefix = \'' . $prefix . "';\r\n";
+ continue;
+ }
</ins><span class="cx">
</span><del>- foreach ($configFile as $line_num => $line) {
- switch (substr($line,0,16)) {
- case "define('DB_NAME'":
- $configFile[$line_num] = str_replace("database_name_here", $dbname, $line);
</del><ins>+ if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+ continue;
+
+ $constant = $match[1];
+ $padding = $match[2];
+
+ switch ( $constant ) {
+ case 'DB_NAME' :
+ case 'DB_USER' :
+ case 'DB_PASSWORD' :
+ case 'DB_HOST' :
+ $line = "define('" . $constant . "'," . $padding . "'" . constant( $constant ) . "');\r\n";
</ins><span class="cx"> break;
</span><del>- case "define('DB_USER'":
- $configFile[$line_num] = str_replace("'username_here'", "'$uname'", $line);
</del><ins>+ case 'AUTH_KEY' :
+ case 'SECURE_AUTH_KEY' :
+ case 'LOGGED_IN_KEY' :
+ case 'NONCE_KEY' :
+ case 'AUTH_SALT' :
+ case 'SECURE_AUTH_SALT' :
+ case 'LOGGED_IN_SALT' :
+ case 'NONCE_SALT' :
+ $line = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
</ins><span class="cx"> break;
</span><del>- case "define('DB_PASSW":
- $configFile[$line_num] = str_replace("'password_here'", "'$passwrd'", $line);
- break;
- case "define('DB_HOST'":
- $configFile[$line_num] = str_replace("localhost", $dbhost, $line);
- break;
- case '$table_prefix =':
- $configFile[$line_num] = str_replace('wp_', $prefix, $line);
- break;
- case "define('AUTH_KEY":
- case "define('SECURE_A":
- case "define('LOGGED_I":
- case "define('NONCE_KE":
- case "define('AUTH_SAL":
- case "define('SECURE_A":
- case "define('LOGGED_I":
- case "define('NONCE_SA":
- $configFile[$line_num] = str_replace('put your unique phrase here', $secret_keys[$key++], $line );
- break;
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ unset( $line );
+
</ins><span class="cx"> if ( ! is_writable(ABSPATH) ) :
</span><span class="cx"> display_header();
</span><span class="cx"> ?>
</span><span class="cx"> <p>Sorry, but I can't write the <code>wp-config.php</code> file.</p>
</span><span class="cx"> <p>You can create the <code>wp-config.php</code> manually and paste the following text into it.</p>
</span><span class="cx"> <textarea cols="98" rows="15" class="code"><?php
</span><del>- foreach( $configFile as $line ) {
</del><ins>+ foreach( $config_file as $line ) {
</ins><span class="cx"> echo htmlentities($line, ENT_COMPAT, 'UTF-8');
</span><span class="cx"> }
</span><span class="cx"> ?></textarea>
</span><span class="lines">@@ -256,7 +260,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> else :
</span><span class="cx"> $handle = fopen(ABSPATH . 'wp-config.php', 'w');
</span><del>- foreach( $configFile as $line ) {
</del><ins>+ foreach( $config_file as $line ) {
</ins><span class="cx"> fwrite($handle, $line);
</span><span class="cx"> }
</span><span class="cx"> fclose($handle);
</span></span></pre>
</div>
</div>
</body>
</html>