Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewlimaza
andrewlimaza committed Nov 29, 2023
2 parents 1234fd8 + 01e190e commit 58914b7
Show file tree
Hide file tree
Showing 6 changed files with 449 additions and 42 deletions.
38 changes: 19 additions & 19 deletions adminpages/userinfo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@
} else {
echo PMPro_Approvals::getUserApprovalStatus( $user->ID, $l, false );
?>
[<a href="javascript:askfirst('Are you sure you want to reset approval for <?php echo esc_attr( $user->user_login ); ?>?', '?page=pmpro-approvals&user_id=<?php echo $user->ID; ?>&unapprove=<?php echo $user->ID; ?>&l=<?php echo $l ?>');">X</a>]
[<a href="javascript:askfirst('Are you sure you want to reset approval for <?php echo esc_attr( $user->user_login ); ?>?', '?page=pmpro-approvals&user_id=<?php echo esc_attr( $user->ID ); ?>&unapprove=<?php echo esc_attr( $user->ID ); ?>&l=<?php echo esc_attr( $l ) ?>');">X</a>]
<?php
} // end of email confirmation check.
} else {
?>

<a href="?page=pmpro-approvals&user_id=<?php echo $user->ID; ?>&approve=<?php echo $user->ID; ?>&l=<?php echo $l ?>"><?php esc_html_e( 'Approve', 'pmpro-approvals' ); ?></a> |
<a href="?page=pmpro-approvals&user_id=<?php echo $user->ID; ?>&deny=<?php echo $user->ID; ?>&l=<?php echo $l ?>"><?php esc_html_e( 'Deny', 'pmpro-approvals' ); ?></a>
<a href="?page=pmpro-approvals&user_id=<?php echo esc_attr( $user->ID ); ?>&approve=<?php echo esc_attr( $user->ID ); ?>&l=<?php echo esc_attr( $l ) ?>"><?php esc_html_e( 'Approve', 'pmpro-approvals' ); ?></a> |
<a href="?page=pmpro-approvals&user_id=<?php echo esc_attr( $user->ID ); ?>&deny=<?php echo esc_attr( $user->ID ); ?>&l=<?php echo esc_attr( $l ) ?>"><?php esc_html_e( 'Deny', 'pmpro-approvals' ); ?></a>
<?php
}
?>
Expand All @@ -99,13 +99,13 @@
</table>

<?php
if ( function_exists( 'pmprorh_getProfileFields' ) ) {
global $pmprorh_registration_fields, $pmprorh_checkout_boxes;
if ( function_exists( 'pmpro_get_user_fields_for_profile' ) ) {
global $pmpro_user_fields, $pmprorh_checkout_boxes;

//show the fields
if ( ! empty( $pmprorh_registration_fields ) ) {
foreach ( $pmprorh_registration_fields as $where => $fields ) {
$box = pmprorh_getCheckoutBoxByName( $where );
if ( ! empty( $pmpro_user_fields ) ) {
foreach ( $pmpro_user_fields as $where => $fields ) {
$box = pmpro_get_field_group_by_name( $where );
?>
<?php if ( isset( $box->label ) ) { ?>
<h3><?php echo esc_html( $box->label ); ?></h3>
Expand All @@ -120,7 +120,7 @@
if ( false != $field->profile ) {

// Check to see if level is set for the field.
if ( isset( $field->levels ) && ! in_array( $level_details->ID, $field->levels ) ) {
if ( ! empty( $field->levels ) && ! in_array( $level_details->ID, $field->levels ) ) {
continue;
}

Expand All @@ -136,23 +136,23 @@


<?php } else {
$register_helper_fields = get_user_meta( $user->ID, $field->name, true );
$user_field = get_user_meta( $user->ID, $field->name, true );

// Get all array option values and break up the array into readable content.
if ( is_array( $register_helper_fields ) ) {
$rh_field_string = '';
foreach( $register_helper_fields as $key => $value ) {
$rh_field_string .= $value . ', ';
if ( is_array( $user_field ) ) {
$user_field_string = '';
foreach( $user_field as $key => $value ) {
$user_field_string .= $value . ', ';
}

// remove trailing comma from string.
echo '<td>' . esc_html( rtrim( $rh_field_string, ', ' ) ) . '</td>';
echo '<td>' . esc_html( rtrim( $user_field_string, ', ' ) ) . '</td>';
} else {
// If Register Helper field is a valid URL, then let's make it clickable.
if ( wp_http_validate_url( $register_helper_fields ) ) {
echo '<td><a href="' . esc_url_raw( $register_helper_fields ) . '" target="_blank">' . esc_url( $register_helper_fields ) . '</a></td>';
if ( wp_http_validate_url( $user_field ) ) {
echo '<td><a href="' . esc_url_raw( $user_field ) . '" target="_blank">' . esc_url( $user_field ) . '</a></td>';
} else {
echo '<td>' . esc_html( $register_helper_fields ) . '</td>';
echo '<td>' . esc_html( $user_field ) . '</td>';
}
}

Expand All @@ -168,5 +168,5 @@
}
}
?>
<a href="?page=pmpro-approvals" class="">&laquo; <?php _e( 'Back to Approvals', 'pmpro-approvals' ); ?></a>
<a href="?page=pmpro-approvals" class="">&laquo; <?php esc_html_e( 'Back to Approvals', 'pmpro-approvals' ); ?></a>
</div>
30 changes: 15 additions & 15 deletions classes/class.approvalemails.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ public function sendMemberApproved( $member, $level_id = null ) {
'sitename' => get_option( 'blogname' ),
'membership_id' => $level->id,
'membership_level_name' => $level->name,
'siteemail' => pmpro_getOption( 'from_email' ),
'siteemail' => get_option( 'pmpro_from_email' ),
'login_link' => wp_login_url(),
);
$this->from = pmpro_getOption( 'from' );
$this->fromname = pmpro_getOption( 'from_name' );
$this->from = get_option( 'pmpro_from' );
$this->fromname = get_option( 'pmpro_from_name' );

$this->data = apply_filters( 'pmpro_approvals_member_approved_email_data', $this->data, $member, $level );

Expand Down Expand Up @@ -92,11 +92,11 @@ public function sendMemberDenied( $member, $level_id = null ) {
'sitename' => get_option( 'blogname' ),
'membership_id' => $level->id,
'membership_level_name' => $level->name,
'siteemail' => pmpro_getOption( 'from_email' ),
'siteemail' => get_option( 'pmpro_from_email' ),
'login_link' => wp_login_url(),
);
$this->from = pmpro_getOption( 'from' );
$this->fromname = pmpro_getOption( 'from_name' );
$this->from = get_option( 'pmpro_from' );
$this->fromname = get_option( 'pmpro_from_name' );

$this->data = apply_filters( 'pmpro_approvals_member_denied_email_data', $this->data, $member, $level );

Expand Down Expand Up @@ -128,11 +128,11 @@ public function sendAdminPending( $member = null, $admin = null, $level_id = nul
'name' => isset( $admin->display_name ) ? $admin->display_name : "",
'user_login' => isset( $admin->user_login ) ? $admin->user_login : "",
'sitename' => get_option( 'blogname' ),
'siteemail' => pmpro_getOption( 'from_email' ),
'siteemail' => get_option( 'pmpro_from_email' ),
'login_link' => wp_login_url(),
);
$this->from = pmpro_getOption( 'from' );
$this->fromname = pmpro_getOption( 'from_name' );
$this->from = get_option( 'pmpro_from' );
$this->fromname = get_option( 'pmpro_from_name' );

if ( ! empty( $member ) ) {

Expand Down Expand Up @@ -186,11 +186,11 @@ public function sendAdminApproval( $member = null, $admin = null, $level_id = nu
'name' => $admin->display_name,
'user_login' => $admin->user_login,
'sitename' => get_option( 'blogname' ),
'siteemail' => pmpro_getOption( 'from_email' ),
'siteemail' => get_option( 'pmpro_from_email' ),
'login_link' => wp_login_url(),
);
$this->from = pmpro_getOption( 'from' );
$this->fromname = pmpro_getOption( 'from_name' );
$this->from = get_option( 'pmpro_from' );
$this->fromname = get_option( 'pmpro_from_name' );

// Let's add in the user approval data if it's available.
if ( ! empty( $member ) ) {
Expand Down Expand Up @@ -243,11 +243,11 @@ public function sendAdminDenied( $member = null, $admin = null, $level_id = null
'name' => $admin->display_name,
'user_login' => $admin->user_login,
'sitename' => get_option( 'blogname' ),
'siteemail' => pmpro_getOption( 'from_email' ),
'siteemail' => get_option( 'pmpro_from_email' ),
'login_link' => wp_login_url(),
);
$this->from = pmpro_getOption( 'from' );
$this->fromname = pmpro_getOption( 'from_name' );
$this->from = get_option( 'pmpro_from' );
$this->fromname = get_option( 'pmpro_from_name' );

// Let's add in the user approval data if it's available.
if ( ! empty( $member ) ) {
Expand Down
Binary file added languages/pmpro-approvals-it_IT.mo
View file
Binary file not shown.
Loading

0 comments on commit 58914b7

Please sign in to comment.