<!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>[15134] branches/iis/parameters.xml: Fix regex for matching auth.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15134">15134</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2010-06-03 23:44:26 +0000 (Thu, 03 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix regex for matching auth. key strings in wp-config-sample.php, remove extra fields for salts (we generate them automatically in wp_salt())</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesiisparametersxml">branches/iis/parameters.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesiisparametersxml"></a>
<div class="modfile"><h4>Modified: branches/iis/parameters.xml (15133 => 15134)</h4>
<pre class="diff"><span>
<span class="info">--- branches/iis/parameters.xml 2010-06-03 21:54:59 UTC (rev 15133)
+++ branches/iis/parameters.xml 2010-06-03 23:44:26 UTC (rev 15134)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> />
</span><span class="cx"> <parameterEntry
</span><span class="cx"> type="TextFile"
</span><del>- match="(?&lt;=AUTH_KEY&#039;, &#039;)put your unique phrase here"
</del><ins>+ match="(?&lt;=AUTH_KEY&#039;,[ ]+&#039;)put your unique phrase here"
</ins><span class="cx"> scope="wordpress\\wp-config.php"
</span><span class="cx"> />
</span><span class="cx"> </parameter>
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> <parameterEntry
</span><span class="cx"> type="TextFile"
</span><span class="cx"> scope="wordpress\\wp-config.php"
</span><del>- match="(?&lt;=SECURE_AUTH_KEY&#039;, &#039;)put your unique phrase here"
</del><ins>+ match="(?&lt;=SECURE_AUTH_KEY&#039;,[ ]+&#039;)put your unique phrase here"
</ins><span class="cx"> />
</span><span class="cx"> </parameter>
</span><span class="cx">
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> <parameterEntry
</span><span class="cx"> type="TextFile"
</span><span class="cx"> scope="wordpress\\wp-config.php"
</span><del>- match="(?&lt;=LOGGED_IN_KEY&#039;, &#039;)put your unique phrase here"
</del><ins>+ match="(?&lt;=LOGGED_IN_KEY&#039;,[ ]+&#039;)put your unique phrase here"
</ins><span class="cx"> />
</span><span class="cx"> </parameter>
</span><span class="cx">
</span><span class="lines">@@ -282,83 +282,10 @@
</span><span class="cx"> <parameterEntry
</span><span class="cx"> type="TextFile"
</span><span class="cx"> scope="wordpress\\wp-config.php"
</span><del>- match="(?&lt;=NONCE_KEY&#039;, &#039;)put your unique phrase here"
</del><ins>+ match="(?&lt;=NONCE_KEY&#039;,[ ]+&#039;)put your unique phrase here"
</ins><span class="cx"> />
</span><span class="cx"> </parameter>
</span><span class="cx">
</span><del>-<parameter
- name="Key5"
- friendlyName="Unique Salt for Passwords"
- description="Unique phrase used to strengthen your password hash."
- defaultValue="put your unique phrase here"
- tags="PHP"
- >
- <parameterValidation
- type="RegularExpression"
- validationString="^[^&#039;\\]+$"
- />
- <parameterEntry
- type="TextFile"
- match="(?&lt;=AUTH_SALT&#039;, &#039;)put your unique phrase here"
- scope="wordpress\\wp-config.php"
- />
-</parameter>
-
-<parameter
- name="Key6"
- friendlyName="Unique Salt for Secure Passwords"
- description="Different unique phrase used to strengthen SSL password hashes."
- defaultValue="put your unique phrase here"
- tags="PHP"
- >
- <parameterValidation
- type="RegularExpression"
- validationString="^[^&#039;\\]+$"
- />
- <parameterEntry
- type="TextFile"
- scope="wordpress\\wp-config.php"
- match="(?&lt;=SECURE_AUTH_SALT&#039;, &#039;)put your unique phrase here"
- />
-</parameter>
-
-<parameter
- name="Key7"
- friendlyName="Unique Salt for Authentication"
- description="Different unique phrase used to strengthen authentication."
- defaultValue="put your unique phrase here"
- tags="PHP"
- >
- <parameterValidation
- type="RegularExpression"
- validationString="^[^&#039;\\]+$"
- />
- <parameterEntry
- type="TextFile"
- scope="wordpress\\wp-config.php"
- match="(?&lt;=LOGGED_IN_SALT&#039;, &#039;)put your unique phrase here"
- />
-</parameter>
-
-<parameter
- name="Key8"
- friendlyName="Second Unique Salt for Authentication"
- description="Another unique phrase used to strengthen authentication."
- defaultValue="put your unique phrase here"
- tags="PHP"
- >
- <parameterValidation
- type="RegularExpression"
- validationString="^[^&#039;\\]+$"
- />
- <parameterEntry
- type="TextFile"
- scope="wordpress\\wp-config.php"
- match="(?&lt;=NONCE_SALT&#039;, &#039;)put your unique phrase here"
- />
-</parameter>
-
-
</del><span class="cx"> <!-- Set the correct path for the ACL based on the AppPath selected
</span><span class="cx"> by the user.
</span><span class="cx"> -->
</span></span></pre>
</div>
</div>
</body>
</html>