<!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>[16746] trunk/wp-admin/network.php: Optimize the keys/salts textarea.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16746">16746</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-06 15:26:30 +0000 (Mon, 06 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize the keys/salts textarea. fixes <a href="http://trac.wordpress.org/ticket/15092">#15092</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.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 (16745 => 16746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-12-06 15:15:09 UTC (rev 16745)
+++ trunk/wp-admin/network.php 2010-12-06 15:26:30 UTC (rev 16746)
</span><span class="lines">@@ -365,27 +365,24 @@
</span><span class="cx"> if ( defined( $c ) )
</span><span class="cx"> unset( $keys_salts[ $c ] );
</span><span class="cx"> }
</span><del>- if ( ! empty( $keys_salts ) ) {
</del><ins>+ if ( ! empty( $keys_salts ) ) {
+ $keys_salts_str = '';
</ins><span class="cx"> $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
</span><span class="cx"> if ( is_wp_error( $from_api ) ) {
</span><span class="cx"> foreach ( $keys_salts as $c => $v ) {
</span><del>- $keys_salts[ $c ] = wp_generate_password( 64, true, true );
</del><ins>+ $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
</span><span class="cx"> foreach ( $keys_salts as $c => $v ) {
</span><del>- $keys_salts[ $c ] = substr( array_shift( $from_api ), 28, 64 );
</del><ins>+ $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $num_keys_salts = count( $keys_salts );
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php
</span><span class="cx"> 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>
</span><del>- <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php
- foreach ( $keys_salts as $c => $v ) {
- echo "\ndefine( '$c', '" . esc_textarea( $v ) . "' );";
- }
-?></textarea>
</del><ins>+ <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>