10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development/2.6.1' into development/2.6.1

Browse Source
This commit is contained in:
Mykyta Synelnikov
2023-05-23 13:58:17 +03:00
parent a460146958 1a69783ca0
commit 1c0e4e1adc
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-settings.php
+16 -12
View File
@@ -3432,18 +3432,22 @@ Blacklist Words: <?php echo count( explode("\n",UM()->options()->get('bl
--- UM Email Configurations ---
Mail appears from: <?php $mail_from = UM()->options()->get('mail_from'); if( ! empty( $mail_from ) ){echo UM()->options()->get('mail_from');}else{echo "-";}; echo "\n";?>
Mail appears from address: <?php $mail_from_addr = UM()->options()->get('mail_from_addr'); if( ! empty( $mail_from_addr ) ){echo UM()->options()->get('mail_from_addr');}else{echo "-";}; echo "\n";?>
Use HTML for E-mails: <?php echo $this->info_value( UM()->options()->get('email_html'), 'yesno', true ); ?>
Account Welcome Email: <?php echo $this->info_value( UM()->options()->get('welcome_email_on'), 'yesno', true ); ?>
Account Activation Email: <?php echo $this->info_value( UM()->options()->get('checkmail_email_on'), 'yesno', true ); ?>
Pending Review Email: <?php echo $this->info_value( UM()->options()->get('pending_email_on'), 'yesno', true ); ?>
Account Approved Email: <?php echo $this->info_value( UM()->options()->get('approved_email_on'), 'yesno', true ); ?>
Account Rejected Email: <?php echo $this->info_value( UM()->options()->get('rejected_email_on'), 'yesno', true ); ?>
Account Deactivated Email: <?php echo $this->info_value( UM()->options()->get('inactive_email_on'), 'yesno', true ); ?>
Account Deleted Email: <?php echo $this->info_value( UM()->options()->get('deletion_email_on'), 'yesno', true ); ?>
Password Reset Email: <?php echo $this->info_value( UM()->options()->get('resetpw_email_on'), 'yesno', true ); ?>
Password Changed Email: <?php echo $this->info_value( UM()->options()->get('changedpw_email_on'), 'yesno', true ); ?>
Mail appears from: <?php $mail_from = UM()->options()->get( 'mail_from' ); if ( ! empty( $mail_from ) ){ echo UM()->options()->get( 'mail_from' ); } else { echo "-"; }; echo "\n"; ?>
Mail appears from address: <?php $mail_from_addr = UM()->options()->get( 'mail_from_addr' ); if ( ! empty( $mail_from_addr ) ) { echo UM()->options()->get( 'mail_from_addr' ); } else { echo "-"; }; echo "\n"; ?>
Use HTML for E-mails: <?php echo $this->info_value( UM()->options()->get( 'email_html' ), 'yesno', true ); ?>
Account Welcome Email: <?php echo $this->info_value( UM()->options()->get( 'welcome_email_on' ), 'yesno', true ); ?>
Account Activation Email: <?php echo $this->info_value( UM()->options()->get( 'checkmail_email_on' ), 'yesno', true ); ?>
Pending Review Email: <?php echo $this->info_value( UM()->options()->get( 'pending_email_on' ), 'yesno', true ); ?>
Account Approved Email: <?php echo $this->info_value( UM()->options()->get( 'approved_email_on' ), 'yesno', true ); ?>
Account Rejected Email: <?php echo $this->info_value( UM()->options()->get( 'rejected_email_on' ), 'yesno', true ); ?>
Account Deactivated Email: <?php echo $this->info_value( UM()->options()->get( 'inactive_email_on' ), 'yesno', true ); ?>
Account Deleted Email: <?php echo $this->info_value( UM()->options()->get( 'deletion_email_on' ), 'yesno', true ); ?>
Password Reset Email: <?php echo $this->info_value( UM()->options()->get( 'resetpw_email_on' ), 'yesno', true ); ?>
Password Changed Email: <?php echo $this->info_value( UM()->options()->get( 'changedpw_email_on' ), 'yesno', true ); ?>
Account Updated Email: <?php echo $this->info_value( UM()->options()->get( 'changedaccount_email_on' ), 'yesno', true ); ?>
New User Notification: <?php echo $this->info_value( UM()->options()->get( 'notification_new_user_on' ), 'yesno', true ); ?>
Account Needs Review Notification: <?php echo $this->info_value( UM()->options()->get( 'notification_review_on' ), 'yesno', true ); ?>
Account Deletion Notification: <?php echo $this->info_value( UM()->options()->get( 'notification_deletion_on' ), 'yesno', true ); ?>
--- UM Total Users ---
includes/core/class-fields.php
+11 -1
View File
@@ -2123,7 +2123,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if ( empty( $_um_profile_id ) ) {
$_um_profile_id = um_user( 'ID' );
}
if ( ! is_user_logged_in() ) {
if ( ! is_user_logged_in() && isset( $data['is_block'] ) && 1 === (int) $data['is_block'] ) {
$_um_profile_id = 0;
}
@@ -4234,6 +4235,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$col1_fields = $this->get_fields_in_column( $subrow_fields, 1 );
if ( $col1_fields ) {
foreach ( $col1_fields as $key => $data ) {
if ( ! empty( $args['is_block'] ) ) {
$data['is_block'] = 1;
}
$output .= $this->edit_field( $key, $data );
}
}
@@ -4245,6 +4249,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$col1_fields = $this->get_fields_in_column( $subrow_fields, 1 );
if ( $col1_fields ) {
foreach ( $col1_fields as $key => $data ) {
if ( ! empty( $args['is_block'] ) ) {
$data['is_block'] = 1;
}
$output .= $this->edit_field( $key, $data );
}
}
@@ -4254,6 +4261,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$col2_fields = $this->get_fields_in_column( $subrow_fields, 2 );
if ( $col2_fields ) {
foreach ( $col2_fields as $key => $data ) {
if ( ! empty( $args['is_block'] ) ) {
$data['is_block'] = 1;
}
$output .= $this->edit_field( $key, $data );
}
}