<!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>[20661] trunk/wp-admin/setup-config.php: setup-config.php cleanups</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/20661">20661</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-04-30 21:56:32 +0000 (Mon, 30 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>setup-config.php cleanups
* Don't allow an empty prefix
* Make slashing consistent and sane
Props SergeyBiryukov
Fixes <a href="http://core.trac.wordpress.org/ticket/13839">#13839</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 (20660 => 20661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2012-04-30 21:53:09 UTC (rev 20660)
+++ trunk/wp-admin/setup-config.php 2012-04-30 21:56:32 UTC (rev 20661)
</span><span class="lines">@@ -160,17 +160,17 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 2:
</span><del>- $dbname = trim($_POST['dbname']);
- $uname = trim($_POST['uname']);
- $passwrd = trim($_POST['pwd']);
- $dbhost = trim($_POST['dbhost']);
- $prefix = trim($_POST['prefix']);
- if ( empty($prefix) )
- $prefix = 'wp_';
</del><ins>+ foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
+ $$key = trim( stripslashes( $_POST[ $key ] ) );
</ins><span class="cx">
</span><del>- // Validate $prefix: it can only contain letters, numbers and underscores
</del><ins>+ $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">' . __( 'Try Again' ) . '</a>';
+
+ if ( empty( $prefix ) )
+ wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+
+ // Validate $prefix: it can only contain letters, numbers and underscores.
</ins><span class="cx"> if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
</span><del>- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) );
</del><ins>+ wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
</ins><span class="cx">
</span><span class="cx"> // Test the db connection.
</span><span class="cx"> /**#@+
</span><span class="lines">@@ -178,16 +178,14 @@
</span><span class="cx"> */
</span><span class="cx"> define('DB_NAME', $dbname);
</span><span class="cx"> define('DB_USER', $uname);
</span><del>- define('DB_PASSWORD', $passwrd);
</del><ins>+ define('DB_PASSWORD', $pwd);
</ins><span class="cx"> define('DB_HOST', $dbhost);
</span><span class="cx"> /**#@-*/
</span><span class="cx">
</span><span class="cx"> // We'll fail here if the values are no good.
</span><span class="cx"> require_wp_db();
</span><del>- if ( ! empty( $wpdb->error ) ) {
- $back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">' . __( 'Try Again' ) . '</a></p>';
- wp_die( $wpdb->error->get_error_message() . $back );
- }
</del><ins>+ if ( ! empty( $wpdb->error ) )
+ wp_die( $wpdb->error->get_error_message() . $tryagain_link );
</ins><span class="cx">
</span><span class="cx"> // Fetch or generate keys and salts.
</span><span class="cx"> $no_api = isset( $_POST['noapi'] );
</span><span class="lines">@@ -221,7 +219,7 @@
</span><span class="cx"> $key = 0;
</span><span class="cx"> foreach ( $config_file as &$line ) {
</span><span class="cx"> if ( '$table_prefix =' == substr( $line, 0, 16 ) ) {
</span><del>- $line = '$table_prefix = \'' . $prefix . "';\r\n";
</del><ins>+ $line = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,7 +234,7 @@
</span><span class="cx"> case 'DB_USER' :
</span><span class="cx"> case 'DB_PASSWORD' :
</span><span class="cx"> case 'DB_HOST' :
</span><del>- $line = "define('" . $constant . "'," . $padding . "'" . constant( $constant ) . "');\r\n";
</del><ins>+ $line = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
</ins><span class="cx"> break;
</span><span class="cx"> case 'AUTH_KEY' :
</span><span class="cx"> case 'SECURE_AUTH_KEY' :
</span></span></pre>
</div>
</div>
</body>
</html>