<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13614] trunk/wp-admin: Add nag for missing authentication keys in network.
php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13614">13614</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-06 21:01:58 +0000 (Sat, 06 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add nag for missing authentication keys in network.php. See <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13613 => 13614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-06 20:11:18 UTC (rev 13613)
+++ trunk/wp-admin/network.php 2010-03-06 21:01:58 UTC (rev 13614)
</span><span class="lines">@@ -179,8 +179,39 @@
</span><span class="cx"> define( 'DOMAIN_CURRENT_SITE', '<?php echo get_clean_basedomain(); ?>' );
</span><span class="cx"> define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' );
</span><span class="cx"> define( 'SITE_ID_CURRENT_SITE', 1 );
</span><del>-define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea></li>
</del><ins>+define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea>
</ins><span class="cx"> <?php
</span><ins>+ $keys_salts = array( 'AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
+ foreach ( $keys_salts as $c => $v ) {
+ if ( defined( $c ) )
+ unset( $keys_salts[ $c ] );
+ }
+ if ( ! empty( $keys_salts ) ) {
+ $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+ if ( is_wp_error( $from_api ) ) {
+ foreach ( $keys_salts as $c => $v ) {
+ $keys_salts[ $c ] = wp_generate_password( 64, true, true );
+ }
+ } else {
+ $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
+ foreach ( $keys_salts as $c => $v ) {
+ $keys_salts[ $c ] = substr( array_shift( $from_api ), 28, 64 );
+ }
+ }
+ $num_keys_salts = count( $keys_salts );
+?>
+ <p><?php
+ echo _n( 'This unique authentication key is also missing from your <code>wp-config.php</code> file.', 'These unique authentication keys are also missing from your <code>wp-config.php</code> file.', $num_keys_salts ); ?> <?php _e( 'To make your installation more secure, you should also add:' ) ?></p>
+ <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php
+ foreach ( $keys_salts as $c => $v ) {
+ echo "\ndefine( '$c', '$v' );";
+ }
+?></textarea>
+<?php
+ }
+?>
+</li>
+<?php
</ins><span class="cx">
</span><span class="cx"> // remove ending slash from $base and $url
</span><span class="cx"> $htaccess = '';
</span><span class="lines">@@ -210,6 +241,7 @@
</span><span class="cx"> <?php echo wp_htmledit_pre( $htaccess_file ); ?>
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span><ins>+ <p>Once you complete these steps, your network is enabled and configured. <a href="<?php echo esc_url( admin_url() ); ?>">Return to Dashboard</a></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (13613 => 13614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2010-03-06 20:11:18 UTC (rev 13613)
+++ trunk/wp-admin/setup-config.php 2010-03-06 21:01:58 UTC (rev 13614)
</span><span class="lines">@@ -193,12 +193,14 @@
</span><span class="cx"> if ( $no_api || is_wp_error( $secret_keys ) ) {
</span><span class="cx"> $secret_keys = array();
</span><span class="cx"> require_once( ABSPATH . WPINC . '/pluggable.php' );
</span><del>- for ( $i = 0; $i < 8; $i++ )
</del><ins>+ for ( $i = 0; $i < 8; $i++ ) {
</ins><span class="cx"> $secret_keys[] = wp_generate_password( 64, true, true );
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
</span><del>- foreach ( $secret_keys as $k => $v )
</del><ins>+ foreach ( $secret_keys as $k => $v ) {
</ins><span class="cx"> $secret_keys[$k] = substr( $v, 28, 64 );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> $key = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>