Skip to content

ENHANCEMENT: Improve admin UX for Email Confirmation status #61

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

Open
flintfromthebasement wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

ENHANCEMENT: Improve admin UX for Email Confirmation status #61

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
52 changes: 52 additions & 0 deletions css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/**
* Email Confirmation Add On - Admin Styles
*/

/* Status badges in tables and panels */
.pmpro-email-confirmation-status {
display: inline-block;
padding: 3px 8px;
border-radius: 3px;
font-size: 12px;
font-weight: 600;
line-height: 1.4;
}

.pmpro-email-confirmation-status.confirmed {
background-color: #d4edda;
color: #155724;
border: 1px solid #c3e6cb;
}

.pmpro-email-confirmation-status.pending {
background-color: #fff3cd;
color: #856404;
border: 1px solid #ffeaa7;
}

.pmpro-email-confirmation-status.not-required {
background-color: #e9ecef;
color: #6c757d;
border: 1px solid #dee2e6;
}

/* Panel specific styles */
#pmpro-member-edit-email-confirmation-panel .pmpro-email-confirmation-status {
padding: 5px 12px;
font-size: 14px;
}

#pmpro-member-edit-email-confirmation-panel ul {
margin: 5px 0;
padding-left: 20px;
}

#pmpro-member-edit-email-confirmation-panel ul li {
margin: 3px 0;
}

#pmpro-member-edit-email-confirmation-panel .description {
margin-top: 8px;
color: #666;
font-style: italic;
}
223 changes: 223 additions & 0 deletions includes/class-pmpro-member-edit-panel-email-confirmation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
<?php
/**
* Email Confirmation panel for Edit Member screen
*
* @since 1.0
*/
class PMProEC_Member_Edit_Panel_Email_Confirmation extends PMPro_Member_Edit_Panel {
/**
* Set up the panel.
*/
public function __construct() {
$this->slug = 'email-confirmation';
$this->title = __( 'Email Confirmation', 'pmpro-email-confirmation' );
$this->submit_text = __( 'Save Changes', 'pmpro-email-confirmation' );
}

/**
* Display the panel contents.
*/
protected function display_panel_contents() {
$user = self::get_user();

// Get confirmation key
$validation_key = get_user_meta( $user->ID, 'pmpro_email_confirmation_key', true );

// Determine status
if ( empty( $validation_key ) ) {
$status = __( 'Not Required', 'pmpro-email-confirmation' );
$status_class = 'not-required';
} elseif ( $validation_key === 'validated' ) {
$status = __( 'Confirmed', 'pmpro-email-confirmation' );
$status_class = 'confirmed';
} else {
$status = __( 'Pending', 'pmpro-email-confirmation' );
$status_class = 'pending';
}

// Get member's levels
$member_levels = pmpro_getMembershipLevelsForUser( $user->ID );
$confirmation_required_levels = array();
$confirmation_not_required_levels = array();

if ( ! empty( $member_levels ) ) {
foreach ( $member_levels as $level ) {
if ( pmproec_isEmailConfirmationLevel( $level->id ) ) {
$confirmation_required_levels[] = $level;
} else {
$confirmation_not_required_levels[] = $level;
}
}
}

?>
<table class="form-table">
<tbody>
<tr>
<th scope="row">
<label><?php esc_html_e( 'Status', 'pmpro-email-confirmation' ); ?></label>
</th>
<td>
<span class="pmpro-email-confirmation-status <?php echo esc_attr( $status_class ); ?>">
<?php echo esc_html( $status ); ?>
</span>
</td>
</tr>
<tr>
<th scope="row">
<label><?php esc_html_e( 'Email Address', 'pmpro-email-confirmation' ); ?></label>
</th>
<td>
<?php echo esc_html( $user->user_email ); ?>
</td>
</tr>
<?php if ( ! empty( $confirmation_required_levels ) ) { ?>
<tr>
<th scope="row">
<label><?php esc_html_e( 'Levels Requiring Confirmation', 'pmpro-email-confirmation' ); ?></label>
</th>
<td>
<ul>
<?php foreach ( $confirmation_required_levels as $level ) { ?>
<li><?php echo esc_html( $level->name ); ?></li>
<?php } ?>
</ul>
</td>
</tr>
<?php } ?>
<?php if ( ! empty( $confirmation_not_required_levels ) ) { ?>
<tr>
<th scope="row">
<label><?php esc_html_e( 'Levels Not Requiring Confirmation', 'pmpro-email-confirmation' ); ?></label>
</th>
<td>
<ul>
<?php foreach ( $confirmation_not_required_levels as $level ) { ?>
<li><?php echo esc_html( $level->name ); ?></li>
<?php } ?>
</ul>
</td>
</tr>
<?php } ?>
<?php if ( ! empty( $confirmation_required_levels ) ) { ?>
<tr>
<th scope="row">
<label><?php esc_html_e( 'Actions', 'pmpro-email-confirmation' ); ?></label>
</th>
<td>
<?php if ( $validation_key !== 'validated' && ! empty( $validation_key ) ) { ?>
<input type="submit" name="pmproec_validate_now" class="button" value="<?php esc_attr_e( 'Validate Now', 'pmpro-email-confirmation' ); ?>" />
<input type="submit" name="pmproec_resend_email" class="button" value="<?php esc_attr_e( 'Resend Confirmation Email', 'pmpro-email-confirmation' ); ?>" />
<?php } elseif ( $validation_key === 'validated' ) { ?>
<input type="submit" name="pmproec_require_reconfirmation" class="button" value="<?php esc_attr_e( 'Require Re-confirmation', 'pmpro-email-confirmation' ); ?>" />
<?php } else { ?>
<input type="submit" name="pmproec_send_confirmation" class="button" value="<?php esc_attr_e( 'Send Confirmation Email', 'pmpro-email-confirmation' ); ?>" />
<?php } ?>
<p class="description">
<?php
if ( $validation_key !== 'validated' && ! empty( $validation_key ) ) {
esc_html_e( 'Validate Now: Mark this user as confirmed without requiring them to click the confirmation link.', 'pmpro-email-confirmation' );
echo '<br>';
esc_html_e( 'Resend Confirmation Email: Send a new confirmation email to the user.', 'pmpro-email-confirmation' );
} elseif ( $validation_key === 'validated' ) {
esc_html_e( 'Require Re-confirmation: Generate a new confirmation key and require the user to confirm their email again.', 'pmpro-email-confirmation' );
} else {
esc_html_e( 'Send Confirmation Email: Generate a confirmation key and send the confirmation email to the user.', 'pmpro-email-confirmation' );
}
?>
</p>
</td>
</tr>
<?php } ?>
</tbody>
</table>
<?php
}

/**
* Save the panel.
*/
public function save() {
// Check nonce
if ( ! isset( $_POST['pmpro_member_edit_saved_panel_nonce'] ) ||
! wp_verify_nonce( $_POST['pmpro_member_edit_saved_panel_nonce'], 'pmpro_member_edit_saved_panel_' . $this->slug ) ) {
return;
}

// Check capability
$cap = apply_filters( 'pmproec_validate_user_cap', 'edit_users' );
if ( ! current_user_can( $cap ) ) {
return;
}

$user = self::get_user();
$user_id = $user->ID;

// Handle validate now action
if ( isset( $_POST['pmproec_validate_now'] ) ) {
update_user_meta( $user_id, 'pmpro_email_confirmation_key', 'validated' );

// Activate membership if they have pending membership that was awaiting confirmation
$level_id = get_user_meta( $user_id, 'pmpro_email_confirmation_pending_level_id', true );
if ( ! empty( $level_id ) ) {
do_action( 'pmproec_activation', $user_id, $level_id );
delete_user_meta( $user_id, 'pmpro_email_confirmation_pending_level_id' );
}

pmpro_add_message( __( 'User has been validated.', 'pmpro-email-confirmation' ), 'success' );
}

// Handle resend email action
if ( isset( $_POST['pmproec_resend_email'] ) ) {
pmproec_resend_confirmation_email( $user_id );
pmpro_add_message( __( 'Confirmation email has been resent.', 'pmpro-email-confirmation' ), 'success' );
}

// Handle require re-confirmation action
if ( isset( $_POST['pmproec_require_reconfirmation'] ) ) {
pmproec_generateNewKey( $user_id );
pmproec_resend_confirmation_email( $user_id );
pmpro_add_message( __( 'A new confirmation key has been generated and the confirmation email has been sent.', 'pmpro-email-confirmation' ), 'success' );
}

// Handle send confirmation action (for users who never had one)
if ( isset( $_POST['pmproec_send_confirmation'] ) ) {
pmproec_generateNewKey( $user_id );
pmproec_resend_confirmation_email( $user_id );
pmpro_add_message( __( 'Confirmation email has been sent.', 'pmpro-email-confirmation' ), 'success' );
}
}

/**
* Only show this panel if at least one of the user's levels requires confirmation.
*/
public function should_show() {
// First check parent capability
if ( ! parent::should_show() ) {
return false;
}

$user = self::get_user();

// Always show if user doesn't exist yet (creating new user)
if ( empty( $user->ID ) ) {
return false;
}

// Get member's levels
$member_levels = pmpro_getMembershipLevelsForUser( $user->ID );

if ( empty( $member_levels ) ) {
return false;
}

// Check if any level requires confirmation
foreach ( $member_levels as $level ) {
if ( pmproec_isEmailConfirmationLevel( $level->id ) ) {
return true;
}
}

return false;
}
}
Loading