<!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>[55974] trunk/src: Administration: Hide password in options/writing.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/55974">55974</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55974","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-22 00:30:41 +0000 (Thu, 22 Jun 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Administration: Hide password in options/writing.
Hide the password for the "Post via e-mail" settings in writing options. Use the same password hiding mechanisms in use elsewhere in core.
Props mastrup, denis-de-bernardy, ryan, brookedot, wojtek.szkutnik, dd32, sabreuse, sergeybiryukov, costdev, peterwilsoncc, zgrkaralar, clorith, renyot, sabernhardt, boniu91, ironprogrammer, bgoewert.
Fixes <a href="https://core.trac.wordpress.org/ticket/9883">#9883</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminuserprofilejs">trunk/src/js/_enqueues/admin/user-profile.js</a></li>
<li><a href="#trunksrcwpadmincssformscss">trunk/src/wp-admin/css/forms.css</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminuserprofilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/user-profile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/user-profile.js 2023-06-21 22:53:02 UTC (rev 55973)
+++ trunk/src/js/_enqueues/admin/user-profile.js 2023-06-22 00:30:41 UTC (rev 55974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#pw-weak-text-label' ).text( __( 'Confirm use of weak password' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Focus the password field.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( $pass1 ).trigger( 'focus' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'mailserver_pass' !== $pass1.prop('id' ) ) {
+ $( $pass1 ).trigger( 'focus' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function bindPass1() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var $generateButton,
</span><span class="cx" style="display: block; padding: 0 10px"> $cancelButton;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pass1Row = $( '.user-pass1-wrap, .user-pass-wrap, .reset-pass-submit' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pass1Row = $( '.user-pass1-wrap, .user-pass-wrap, .mailserver-pass-wrap, .reset-pass-submit' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide the confirm password field when JavaScript support is enabled.
</span><span class="cx" style="display: block; padding: 0 10px"> $('.user-pass2-wrap').hide();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submitButtons.prop( 'disabled', ! $weakCheckbox.prop( 'checked' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pass1 = $('#pass1');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pass1 = $('#pass1, #mailserver_pass');
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $pass1.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bindPass1();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,23 +316,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function showOrHideWeakPasswordCheckbox() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var passStrength = $('#pass-strength-result')[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var passStrengthResult = $('#pass-strength-result');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( passStrength.className ) {
- $pass1.addClass( passStrength.className );
- if ( $( passStrength ).is( '.short, .bad' ) ) {
- if ( ! $weakCheckbox.prop( 'checked' ) ) {
- $submitButtons.prop( 'disabled', true );
- }
- $weakRow.show();
- } else {
- if ( $( passStrength ).is( '.empty' ) ) {
- $submitButtons.prop( 'disabled', true );
- $weakCheckbox.prop( 'checked', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( passStrengthResult.length ) {
+ var passStrength = passStrengthResult[0];
+
+ if ( passStrength.className ) {
+ $pass1.addClass( passStrength.className );
+ if ( $( passStrength ).is( '.short, .bad' ) ) {
+ if ( ! $weakCheckbox.prop( 'checked' ) ) {
+ $submitButtons.prop( 'disabled', true );
+ }
+ $weakRow.show();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submitButtons.prop( 'disabled', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $( passStrength ).is( '.empty' ) ) {
+ $submitButtons.prop( 'disabled', true );
+ $weakCheckbox.prop( 'checked', false );
+ } else {
+ $submitButtons.prop( 'disabled', false );
+ }
+ $weakRow.hide();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $weakRow.hide();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincssformscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/forms.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/forms.css 2023-06-21 22:53:02 UTC (rev 55973)
+++ trunk/src/wp-admin/css/forms.css 2023-06-22 00:30:41 UTC (rev 55974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,8 +551,56 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-pwd {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 1em;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ position: relative;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.mailserver-pass-wrap .wp-pwd {
+ display: inline-block;
+ margin-top: 0;
+}
+
+/* rtl:ignore */
+#mailserver_pass {
+ direction: ltr;
+ padding-right: 2.5rem;
+}
+
+/* rtl:ignore */
+.mailserver-pass-wrap .button.wp-hide-pw {
+ background: transparent;
+ border: 1px solid transparent;
+ box-shadow: none;
+ font-size: 14px;
+ line-height: 2;
+ width: 2.5rem;
+ min-width: 40px;
+ margin: 0;
+ padding: 0 9px;
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+
+.mailserver-pass-wrap .button.wp-hide-pw:hover {
+ background: transparent;
+ border-color: transparent;
+}
+
+.mailserver-pass-wrap .button.wp-hide-pw:focus {
+ background: transparent;
+ border-color: #3582c4;
+ border-radius: 4px;
+ box-shadow: 0 0 0 1px #3582c4;
+ /* Only visible in Windows High Contrast mode */
+ outline: 2px solid transparent;
+}
+
+.mailserver-pass-wrap .button.wp-hide-pw:active {
+ background: transparent;
+ box-shadow: none;
+ transform: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #misc-publishing-actions label {
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: baseline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-writing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-writing.php 2023-06-21 22:53:02 UTC (rev 55973)
+++ trunk/src/wp-admin/options-writing.php 2023-06-22 00:30:41 UTC (rev 55974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +54,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_script( 'user-profile' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,11 +170,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="mailserver_login"><?php _e( 'Login Name' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option( 'mailserver_login' ); ?>" class="regular-text ltr" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr>
-<th scope="row"><label for="mailserver_pass"><?php _e( 'Password' ); ?></label></th>
-<td>
-<input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option( 'mailserver_pass' ); ?>" class="regular-text ltr" />
-</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<tr class="mailserver-pass-wrap">
+ <th scope="row">
+ <label for="mailserver_pass">
+ <?php _e( 'Password' ); ?>
+ </label>
+ </th>
+ <td>
+ <input type="hidden" value=" " /><!-- #24364 workaround -->
+ <span class="wp-pwd">
+ <input type="text" name="mailserver_pass" id="mailserver_pass" class="regular-text ltr" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( get_option( 'mailserver_pass' ) ); ?>" />
+ <button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" data-start-masked="1" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+ <span class="dashicons dashicons-visibility" aria-hidden="true"></span>
+ </button>
+ </span>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="default_email_category"><?php _e( 'Default Mail Category' ); ?></label></th>
</span></span></pre>
</div>
</div>
</body>
</html>