Skip to content

Commit

Permalink
Merge branch 'update/freemius-sdk-&-php-compatibility-PSMEL-320' into…
Browse files Browse the repository at this point in the history
… beta/custom-logs-table
  • Loading branch information
smusmanobjects committed Apr 3, 2023
2 parents 89db5e3 + a95721d commit c4c4353
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -562,12 +562,12 @@ public function outputWizardContent() {

print( '<div class="ps-ib ps-w-50">' );
printf( '<label for="postman_options[sender_name]">%s</label>', esc_html__( 'Name', 'post-smtp' ) );
print wp_kses( $this->settingsRegistry->sender_name_callback(), $this->allowed_tags );
print wp_kses( $this->settingsRegistry->sender_name_callback( false ), $this->allowed_tags );
print( '</div>' );

print( '<div class="ps-ib ps-w-50">' );
printf( '<label for="postman_options[sender_email]">%s</label>', esc_html__( 'Email Address', 'post-smtp' ) );
print wp_kses( $this->settingsRegistry->from_email_callback(), $this->allowed_tags );
print wp_kses( $this->settingsRegistry->from_email_callback( false ), $this->allowed_tags );
print( '</div>' );

print( '<div class="clear"></div>' );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private function registerSettings() {
add_settings_field( PostmanOptions::MESSAGE_SENDER_EMAIL, __( 'Email Address', 'post-smtp' ), array(
$this,
'from_email_callback',
), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION );
), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION, array( true ) );

add_settings_field( PostmanOptions::PREVENT_MESSAGE_SENDER_EMAIL_OVERRIDE, '', array(
$this,
Expand All @@ -66,7 +66,7 @@ private function registerSettings() {
add_settings_field( PostmanOptions::MESSAGE_SENDER_NAME, __( 'Name', 'post-smtp' ), array(
$this,
'sender_name_callback',
), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION );
), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION, array( true ) );

add_settings_field( PostmanOptions::PREVENT_MESSAGE_SENDER_NAME_OVERRIDE, '', array(
$this,
Expand Down Expand Up @@ -283,8 +283,19 @@ public function smtp_mailer_callback() {
/**
* Get the settings option array and print one of its values
*/
public function sender_name_callback() {
return sprintf( '<input type="text" id="input_sender_name" class="ps-input ps-w-75" name="postman_options[sender_name]" value="%s" size="40" />', null !== $this->options->getMessageSenderName() ? esc_attr( $this->options->getMessageSenderName() ) : '' );
public function sender_name_callback( $_echo = true ) {

if( $_echo ) {

printf( '<input type="text" id="input_sender_name" class="ps-input ps-w-75" name="postman_options[sender_name]" value="%s" size="40" />', null !== $this->options->getMessageSenderName() ? esc_attr( $this->options->getMessageSenderName() ) : '' );

}
else {

return sprintf( '<input type="text" id="input_sender_name" class="ps-input ps-w-75" name="postman_options[sender_name]" value="%s" size="40" />', null !== $this->options->getMessageSenderName() ? esc_attr( $this->options->getMessageSenderName() ) : '' );

}

}

/**
Expand All @@ -297,8 +308,19 @@ public function prevent_from_name_override_callback() {
/**
* Get the settings option array and print one of its values
*/
public function from_email_callback() {
return sprintf( '<input type="email" id="input_sender_email" class="ps-input ps-w-75" name="postman_options[sender_email]" value="%s" size="40" class="required" placeholder="%s"/>', null !== $this->options->getMessageSenderEmail() ? esc_attr( $this->options->getMessageSenderEmail() ) : '', __( 'Required', 'post-smtp' ) );
public function from_email_callback( $_echo = true ) {

if( $_echo ) {

printf( '<input type="email" id="input_sender_email" class="ps-input ps-w-75" name="postman_options[sender_email]" value="%s" size="40" class="required" placeholder="%s"/>', null !== $this->options->getMessageSenderEmail() ? esc_attr( $this->options->getMessageSenderEmail() ) : '', __( 'Required', 'post-smtp' ) );

}
else {

return sprintf( '<input type="email" id="input_sender_email" class="ps-input ps-w-75" name="postman_options[sender_email]" value="%s" size="40" class="required" placeholder="%s"/>', null !== $this->options->getMessageSenderEmail() ? esc_attr( $this->options->getMessageSenderEmail() ) : '', __( 'Required', 'post-smtp' ) );

}

}

/**
Expand Down

0 comments on commit c4c4353

Please sign in to comment.