<!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>[12896] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress: Support: Enable new Account page for email, password, 2FA</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="http://meta.trac.wordpress.org/changeset/12896">12896</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12896","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-09-18 23:06:05 +0000 (Mon, 18 Sep 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'>Support: Enable new Account page for email, password, 2FA
Closes https://github.com/WordPress/wordpress.org/pull/114</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserdetailsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformusereditphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformusereditphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit.php 2023-09-18 23:06:05 UTC (rev 12896)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,184 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * The Account section has been modified so that email and password link to the `/edit/account/` page, which is
+ * the canonical locations for those settings.
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+?>
+
+<form id="bbp-your-profile" method="post" enctype="multipart/form-data">
+
+ <h2 class="entry-title"><?php esc_html_e( 'Name', 'bbpress' ); ?></h2>
+
+ <?php do_action( 'bbp_user_edit_before' ); ?>
+
+ <fieldset class="bbp-form">
+ <legend><?php esc_html_e( 'Name', 'bbpress' ); ?></legend>
+
+ <?php do_action( 'bbp_user_edit_before_name' ); ?>
+
+ <div>
+ <label for="first_name"><?php esc_html_e( 'First Name', 'bbpress' ); ?></label>
+ <input type="text" name="first_name" id="first_name" value="<?php bbp_displayed_user_field( 'first_name', 'edit' ); ?>" class="regular-text" />
+ </div>
+
+ <div>
+ <label for="last_name"><?php esc_html_e( 'Last Name', 'bbpress' ); ?></label>
+ <input type="text" name="last_name" id="last_name" value="<?php bbp_displayed_user_field( 'last_name', 'edit' ); ?>" class="regular-text" />
+ </div>
+
+ <div>
+ <label for="nickname"><?php esc_html_e( 'Nickname', 'bbpress' ); ?></label>
+ <input type="text" name="nickname" id="nickname" value="<?php bbp_displayed_user_field( 'nickname', 'edit' ); ?>" class="regular-text" />
+ </div>
+
+ <div>
+ <label for="display_name"><?php esc_html_e( 'Display Name', 'bbpress' ); ?></label>
+
+ <?php bbp_edit_user_display_name(); ?>
+
+ </div>
+
+ <?php do_action( 'bbp_user_edit_after_name' ); ?>
+
+ </fieldset>
+
+ <h2 class="entry-title"><?php esc_html_e( 'Contact Info', 'bbpress' ); ?></h2>
+
+ <fieldset class="bbp-form">
+ <legend><?php esc_html_e( 'Contact Info', 'bbpress' ); ?></legend>
+
+ <?php do_action( 'bbp_user_edit_before_contact' ); ?>
+
+ <div>
+ <label for="url"><?php esc_html_e( 'Website', 'bbpress' ); ?></label>
+ <input type="text" name="url" id="url" value="<?php bbp_displayed_user_field( 'user_url', 'edit' ); ?>" maxlength="200" class="regular-text code" />
+ </div>
+
+ <?php foreach ( bbp_edit_user_contact_methods() as $name => $desc ) : ?>
+
+ <div>
+ <label for="<?php echo esc_attr( $name ); ?>"><?php echo apply_filters( 'user_' . $name . '_label', $desc ); ?></label>
+ <input type="text" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ); ?>" value="<?php bbp_displayed_user_field( $name, 'edit' ); ?>" class="regular-text" />
+ </div>
+
+ <?php endforeach; ?>
+
+ <?php do_action( 'bbp_user_edit_after_contact' ); ?>
+
+ </fieldset>
+
+ <h2 class="entry-title"><?php bbp_is_user_home_edit()
+ ? esc_html_e( 'About Yourself', 'bbpress' )
+ : esc_html_e( 'About the user', 'bbpress' );
+ ?></h2>
+
+ <fieldset class="bbp-form">
+ <legend><?php bbp_is_user_home_edit()
+ ? esc_html_e( 'About Yourself', 'bbpress' )
+ : esc_html_e( 'About the user', 'bbpress' );
+ ?></legend>
+
+ <?php do_action( 'bbp_user_edit_before_about' ); ?>
+
+ <div>
+ <label for="description"><?php esc_html_e( 'Biographical Info', 'bbpress' ); ?></label>
+ <textarea name="description" id="description" rows="5" cols="30"><?php bbp_displayed_user_field( 'description', 'edit' ); ?></textarea>
+ </div>
+
+ <?php do_action( 'bbp_user_edit_after_about' ); ?>
+
+ </fieldset>
+
+ <h2 class="entry-title"><?php esc_html_e( 'Account', 'bbpress' ); ?></h2>
+
+ <fieldset class="bbp-form">
+ <legend><?php esc_html_e( 'Account', 'bbpress' ); ?></legend>
+
+ <?php do_action( 'bbp_user_edit_before_account' ); ?>
+
+ <div>
+ <label for="user_login"><?php esc_html_e( 'Username', 'bbpress' ); ?></label>
+ <input type="text" name="user_login" id="user_login" value="<?php bbp_displayed_user_field( 'user_login', 'edit' ); ?>" maxlength="100" disabled="disabled" class="regular-text" />
+ </div>
+
+ <div>
+ <label for="email"><?php esc_html_e( 'Email', 'bbpress' ); ?></label>
+ <?php bbp_displayed_user_field( 'user_email', 'edit' ); ?>
+ (<a href="<?php bbp_user_profile_edit_url(); ?>account/">edit</a>)
+ </div>
+
+ <div>
+ <label for="security">
+ <?php echo esc_html_x( 'Security', "A category of security settings", 'wporg' ); ?>
+ </label>
+
+ <p id="security">
+ <?php printf(
+ __( 'Your password and two-factor authentication settings can be changed in <a href="%s">the Account section</a>.', 'wporg' ),
+ bbp_get_user_profile_edit_url() . '/edit/account/'
+ ); ?>
+ </p>
+ </div>
+
+ <div>
+ <label for="locale"><?php esc_html_e( 'Language', 'bbpress' ); ?></label>
+
+ <?php bbp_edit_user_language(); ?>
+ </div>
+
+ <?php do_action( 'bbp_user_edit_after_account' ); ?>
+ </fieldset>
+
+ <?php if ( ! bbp_is_user_home_edit() && current_user_can( 'promote_user', bbp_get_displayed_user_id() ) ) : ?>
+
+ <h2 class="entry-title"><?php esc_html_e( 'User Role', 'bbpress' ); ?></h2>
+
+ <fieldset class="bbp-form">
+ <legend><?php esc_html_e( 'User Role', 'bbpress' ); ?></legend>
+
+ <?php do_action( 'bbp_user_edit_before_role' ); ?>
+
+ <?php if ( is_multisite() && is_super_admin() && current_user_can( 'manage_network_options' ) ) : ?>
+
+ <div>
+ <label for="super_admin"><?php esc_html_e( 'Network Role', 'bbpress' ); ?></label>
+ <label>
+ <input class="checkbox" type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( bbp_get_displayed_user_id() ) ); ?> />
+ <?php esc_html_e( 'Grant this user super admin privileges for the Network.', 'bbpress' ); ?>
+ </label>
+ </div>
+
+ <?php endif; ?>
+
+ <?php bbp_get_template_part( 'form', 'user-roles' ); ?>
+
+ <?php do_action( 'bbp_user_edit_after_role' ); ?>
+
+ </fieldset>
+
+ <?php endif; ?>
+
+ <?php do_action( 'bbp_user_edit_after' ); ?>
+
+ <fieldset class="submit">
+ <legend><?php esc_html_e( 'Save Changes', 'bbpress' ); ?></legend>
+ <div>
+ <?php bbp_edit_user_form_fields(); ?>
+
+ <?php
+ // The email field was moved to the `/edit/account/` screen, but this is necessary to pass the
+ // validation in `bbp_get_displayed_user_field()`.
+ ?>
+ <input type="hidden" name="email" value="<?php bbp_displayed_user_field( 'user_email', 'edit' ); ?>" />
+
+ <button type="submit" id="bbp_user_edit_submit" name="bbp_user_edit_submit" class="button submit user-submit"><?php bbp_is_user_home_edit()
+ ? esc_html_e( 'Update Profile', 'bbpress' )
+ : esc_html_e( 'Update User', 'bbpress' );
+ ?></button>
+ </div>
+ </fieldset>
+</form>
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserdetailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php 2023-09-18 22:14:23 UTC (rev 12895)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php 2023-09-18 23:06:05 UTC (rev 12896)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,8 +115,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // todo remove the condition when launch for all users ?>
- <?php if ( \WordPressdotorg\Two_Factor\is_2fa_beta_tester() ) : ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <li class="<?php if ( wporg_bbp_is_single_user_edit_account() ) : ?>current<?php endif; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="bbp-user-edit-account-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php bbp_user_profile_edit_url(); ?>account/">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +122,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="<?php if ( bbp_is_single_user_edit() ) :?>current<?php endif; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="bbp-user-edit-link">
</span></span></pre>
</div>
</div>
</body>
</html>