Skip to content

Support profile - move security settings onto separate screen #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iandunn wants to merge 1 commit into from
Closed

Support profile - move security settings onto separate screen #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 184 additions & 0 deletions wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
<?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>
3 changes: 0 additions & 3 deletions wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,13 @@
</li>
<?php endif; ?>

<?php // todo remove the condition when launch for all users ?>
<?php if ( \WordPressdotorg\Two_Factor\is_2fa_beta_tester() ) : ?>
<li class="<?php if ( wporg_bbp_is_single_user_edit_account() ) : ?>current<?php endif; ?>">
<span class="bbp-user-edit-account-link">
<a href="<?php bbp_user_profile_edit_url(); ?>account/">
<?php esc_html_e( 'Edit Account', 'wporg-forums' ); ?>
</a>
</span>
</li>
<?php endif; ?>

<li class="<?php if ( bbp_is_single_user_edit() ) :?>current<?php endif; ?>">
<span class="bbp-user-edit-link">
Expand Down