Strategy11 / formidable-forms

classes/views/frm-forms/settings.php

Spacing +34 added lines, -34 removed lines

@@ -26,9 +26,9 @@ 
         <div class="contextual-help-tabs">
         <ul class="frm-category-tabs frm-form-setting-tabs">
 			<?php $a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' ); ?>
-        	<li <?php echo ($a == 'advanced_settings') ? 'class="tabs active"' : '' ?>><a href="#advanced_settings"><?php _e( 'General', 'formidable' ) ?></a></li>
-        	<li <?php echo ($a == 'email_settings') ? 'class="tabs active"' : '' ?>><a href="#email_settings"><?php _e( 'Form Actions', 'formidable' ); ?></a></li>
-            <li <?php echo ($a == 'html_settings') ? 'class="tabs active"' : '' ?>><a href="#html_settings"><?php _e( 'Customize HTML', 'formidable' ) ?></a></li>
+        	<li <?php echo ( $a == 'advanced_settings' ) ? 'class="tabs active"' : '' ?>><a href="#advanced_settings"><?php _e( 'General', 'formidable' ) ?></a></li>
+        	<li <?php echo ( $a == 'email_settings' ) ? 'class="tabs active"' : '' ?>><a href="#email_settings"><?php _e( 'Form Actions', 'formidable' ); ?></a></li>
+            <li <?php echo ( $a == 'html_settings' ) ? 'class="tabs active"' : '' ?>><a href="#html_settings"><?php _e( 'Customize HTML', 'formidable' ) ?></a></li>
             <?php foreach ( $sections as $key => $section ) {
 				if ( isset( $section['name'] ) ) {
 					$sec_name = $section['name'];
@@ -42,7 +42,7 @@ 
             <?php } ?>
         </ul>
         </div>
-        <div class="advanced_settings tabs-panel <?php echo ($a == 'advanced_settings') ? 'frm_block' : 'frm_hidden' ?>">
+        <div class="advanced_settings tabs-panel <?php echo ( $a == 'advanced_settings' ) ? 'frm_block' : 'frm_hidden' ?>">
 			<?php FrmTipsHelper::pro_tip( 'get_form_settings_tip', 'p' ); ?>
 
 			<h3 class="frm_first_h3"><?php _e( 'On Submit', 'formidable' ); ?>
@@ -57,19 +57,19 @@ 
                 <tr>
                     <td class="frm_175_width">
                         <select name="options[success_action]" id="success_action">
-                            <option value="message" <?php selected($values['success_action'], 'message') ?>><?php _e( 'Show Message', 'formidable' )?></option>
+                            <option value="message" <?php selected( $values['success_action'], 'message' ) ?>><?php _e( 'Show Message', 'formidable' )?></option>
                             <?php if ( FrmAppHelper::pro_is_installed() ) { ?>
-                                <option value="redirect" <?php selected($values['success_action'], 'redirect');
+                                <option value="redirect" <?php selected( $values['success_action'], 'redirect' );
                                 ?>><?php _e( 'Redirect to URL', 'formidable' ) ?></option>
-                                <option value="page" <?php selected($values['success_action'], 'page');
+                                <option value="page" <?php selected( $values['success_action'], 'page' );
 								?>><?php _e( 'Show Page Content', 'formidable' ) ?></option>
                             <?php } else { ?>
-                            <option value="redirect" disabled="disabled" <?php selected($values['success_action'], 'redirect');
+                            <option value="redirect" disabled="disabled" <?php selected( $values['success_action'], 'redirect' );
 							?>>
 								<?php _e( 'Redirect to URL', 'formidable' ); ?>
 								<?php _e( '(Premium feature)', 'formidable' ); ?>
 							</option>
-							<option value="page" disabled="disabled" <?php selected($values['success_action'], 'page');
+							<option value="page" disabled="disabled" <?php selected( $values['success_action'], 'page' );
                             ?>>
 								<?php _e( 'Show Page Content', 'formidable' ); ?>
 								<?php _e( '(Premium feature)', 'formidable' ); ?>
@@ -78,7 +78,7 @@ 
                         </select>
                     </td>
                     <td>
-                        <span class="success_action_redirect_box success_action_box<?php echo ($values['success_action'] == 'redirect') ? '' : ' frm_hidden'; ?>">
+                        <span class="success_action_redirect_box success_action_box<?php echo ( $values['success_action'] == 'redirect' ) ? '' : ' frm_hidden'; ?>">
                             <input type="text" name="options[success_url]" id="success_url" value="<?php
 							if ( isset( $values['success_url'] ) ) {
 								echo esc_attr( $values['success_url'] );
@@ -86,23 +86,23 @@ 
                         </span>
 
 						<?php if ( FrmAppHelper::pro_is_installed() ) { ?>
-                        <span class="success_action_page_box success_action_box<?php echo ($values['success_action'] == 'page') ? '' : ' frm_hidden'; ?>">
+                        <span class="success_action_page_box success_action_box<?php echo ( $values['success_action'] == 'page' ) ? '' : ' frm_hidden'; ?>">
                             <label><?php _e( 'Use Content from Page', 'formidable' ) ?></label>
                             <?php FrmAppHelper::wp_pages_dropdown( 'options[success_page_id]', $values['success_page_id'] ) ?>
                         </span>
                         <?php } ?>
                     </td>
                 </tr>
-                <tr class="frm_show_form_opt success_action_message_box success_action_box<?php echo ($values['success_action'] == 'message') ? '' : ' frm_hidden'; ?>">
+                <tr class="frm_show_form_opt success_action_message_box success_action_box<?php echo ( $values['success_action'] == 'message' ) ? '' : ' frm_hidden'; ?>">
                     <td colspan="2">
 						<label for="show_form"><input type="checkbox" name="options[show_form]" id="show_form" value="1" <?php checked( $values['show_form'], 1 ) ?> /> <?php _e( 'Show the form with the confirmation message', 'formidable' ) ?></label>
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="2"><label for="no_save"><input type="checkbox" name="options[no_save]" id="no_save" value="1" <?php checked($values['no_save'], 1); ?> /> <?php _e( 'Do not store entries submitted from this form', 'formidable' ) ?></label>
+                    <td colspan="2"><label for="no_save"><input type="checkbox" name="options[no_save]" id="no_save" value="1" <?php checked( $values['no_save'], 1 ); ?> /> <?php _e( 'Do not store entries submitted from this form', 'formidable' ) ?></label>
                     </td>
                 </tr>
-                <?php if ( function_exists( 'akismet_http_post') ) { ?>
+                <?php if ( function_exists( 'akismet_http_post' ) ) { ?>
                 <tr>
                     <td colspan="2"><?php _e( 'Use Akismet to check entries for spam for', 'formidable' ) ?>
                         <select name="options[akismet]">
@@ -128,11 +128,11 @@ 
 						<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Recommended for long forms.', 'formidable' ) ?>" ></span>
                     </td>
                 </tr>
-                <?php do_action('frm_add_form_ajax_options', $values); ?>
+                <?php do_action( 'frm_add_form_ajax_options', $values ); ?>
             </table>
 
             <!--Permissions Section-->
-	        <?php do_action('frm_add_form_perm_options', $values); ?>
+	        <?php do_action( 'frm_add_form_perm_options', $values ); ?>
 
             <!--Styling & Buttons Section-->
 			<h3><?php _e( 'Styling & Buttons', 'formidable' ) ?>
@@ -153,7 +153,7 @@ 
                 </tr>
                 <tr>
                     <td><label><?php _e( 'Submit Button Text', 'formidable' ) ?></label></td>
-                    <td><input type="text" name="options[submit_value]" value="<?php echo esc_attr($values['submit_value']); ?>" /></td>
+                    <td><input type="text" name="options[submit_value]" value="<?php echo esc_attr( $values['submit_value'] ); ?>" /></td>
                 </tr>
 				<?php do_action( 'frm_add_form_button_options', $values ); ?>
             </table>
@@ -163,27 +163,27 @@ 
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Set up your confirmation messages.', 'formidable' ) ?>" ></span>
 			</h3>
             <table class="form-table">
-                <tr class="success_action_message_box success_action_box<?php echo ($values['success_action'] == 'message') ? '' : ' frm_hidden'; ?>">
+                <tr class="success_action_message_box success_action_box<?php echo ( $values['success_action'] == 'message' ) ? '' : ' frm_hidden'; ?>">
                     <td>
                         <div><?php _e( 'On Submit', 'formidable' ) ?></div>
-                        <textarea id="success_msg" name="options[success_msg]" cols="50" rows="2" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea($values['success_msg']); ?></textarea>
+                        <textarea id="success_msg" name="options[success_msg]" cols="50" rows="2" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea( $values['success_msg'] ); ?></textarea>
                     </td>
                 </tr>
-                <?php do_action('frm_add_form_msg_options', $values); ?>
+                <?php do_action( 'frm_add_form_msg_options', $values ); ?>
             </table>
 
 			<!--Misc Section-->
 			<?php if ( has_action( 'frm_additional_form_options' ) ) { ?>
 				<h3><?php _e( 'Miscellaneous', 'formidable' ); ?></h3>
 				<table class="form-table">
-					<?php do_action('frm_additional_form_options', $values); ?>
+					<?php do_action( 'frm_additional_form_options', $values ); ?>
 				</table>
 				<?php } ?>
 
 		</div>
 
 
-        <div id="frm_notification_settings" class="frm_email_settings email_settings tabs-panel widgets-holder-wrap <?php echo ($a == 'email_settings') ? ' frm_block' : ' frm_hidden'; ?>">
+        <div id="frm_notification_settings" class="frm_email_settings email_settings tabs-panel widgets-holder-wrap <?php echo ( $a == 'email_settings' ) ? ' frm_block' : ' frm_hidden'; ?>">
 			<?php FrmTipsHelper::pro_tip( 'get_form_action_tip', 'p' ); ?>
             <div id="frm_email_addon_menu" class="manage-menus">
                 <h3><?php _e( 'Add New Action', 'formidable' ) ?></h3>
@@ -194,11 +194,11 @@ 
                 foreach ( $action_controls as $action_control ) {
                     ?>
                     <li><a href="javascript:void(0)" class="frm_<?php echo esc_attr( $action_control->id_base ) ?>_action frm_bstooltip <?php
-                    echo ( isset($action_control->action_options['active']) && $action_control->action_options['active']) ? 'frm_active_action ' : 'frm_inactive_action ';
+                    echo ( isset( $action_control->action_options['active'] ) && $action_control->action_options['active'] ) ? 'frm_active_action ' : 'frm_inactive_action ';
                     echo esc_attr( $action_control->action_options['classes'] );
-                    ?>" title="<?php echo esc_attr($action_control->action_options['tooltip']) ?>" data-limit="<?php echo isset($action_control->action_options['limit']) ? esc_attr( $action_control->action_options['limit'] ) : '99' ?>" data-actiontype="<?php echo esc_attr($action_control->id_base) ?>"></a></li>
+                    ?>" title="<?php echo esc_attr( $action_control->action_options['tooltip'] ) ?>" data-limit="<?php echo isset( $action_control->action_options['limit'] ) ? esc_attr( $action_control->action_options['limit'] ) : '99' ?>" data-actiontype="<?php echo esc_attr( $action_control->id_base ) ?>"></a></li>
 <?php
-                    unset($actions_icon);
+                    unset( $actions_icon );
                 }
                 ?>
                 </ul>
@@ -210,19 +210,19 @@ 
                     <?php _e( 'Click an action to add it to this form', 'formidable' ) ?>
                 </div>
             </div>
-            <?php FrmFormActionsController::list_actions($form, $values); ?>
+            <?php FrmFormActionsController::list_actions( $form, $values ); ?>
         </div>
 
-        <div id="html_settings" class="tabs-panel <?php echo ($a == 'html_settings') ? ' frm_block' : ' frm_hidden'; ?>">
+        <div id="html_settings" class="tabs-panel <?php echo ( $a == 'html_settings' ) ? ' frm_block' : ' frm_hidden'; ?>">
 
             <div class="frm_field_html_box frm_top_container">
                 <p><label><?php _e( 'Form Classes', 'formidable' ) ?></label>
-                    <input type="text" name="options[form_class]" value="<?php echo esc_attr($values['form_class']) ?>" />
+                    <input type="text" name="options[form_class]" value="<?php echo esc_attr( $values['form_class'] ) ?>" />
                 </p>
                 <div class="clear"></div>
 
                 <p><label><?php _e( 'Before Fields', 'formidable' ) ?></label>
-                <textarea name="options[before_html]" rows="4" id="before_html" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea($values['before_html']) ?></textarea></p>
+                <textarea name="options[before_html]" rows="4" id="before_html" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea( $values['before_html'] ) ?></textarea></p>
 
                 <div id="add_html_fields">
                     <?php
@@ -230,18 +230,18 @@ 
 						foreach ( $values['fields'] as $field ) {
 							if ( apply_filters( 'frm_show_custom_html', true, $field['type'] ) ) { ?>
                                 <p><label><?php echo esc_html( $field['name'] ) ?></label>
-                                <textarea name="field_options[custom_html_<?php echo esc_attr( $field['id'] ) ?>]" rows="7" id="custom_html_<?php echo esc_attr( $field['id'] ) ?>" class="field_custom_html frm_long_input"><?php echo FrmAppHelper::esc_textarea($field['custom_html']) ?></textarea></p>
+                                <textarea name="field_options[custom_html_<?php echo esc_attr( $field['id'] ) ?>]" rows="7" id="custom_html_<?php echo esc_attr( $field['id'] ) ?>" class="field_custom_html frm_long_input"><?php echo FrmAppHelper::esc_textarea( $field['custom_html'] ) ?></textarea></p>
                             <?php }
-                            unset($field);
+                            unset( $field );
                         }
                     } ?>
                 </div>
 
                 <p><label><?php _e( 'After Fields', 'formidable' ) ?></label>
-                <textarea name="options[after_html]" rows="3" id="after_html" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea($values['after_html']) ?></textarea></p>
+                <textarea name="options[after_html]" rows="3" id="after_html" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea( $values['after_html'] ) ?></textarea></p>
 
                 <p><label><?php _e( 'Submit Button', 'formidable' ) ?></label>
-                <textarea name="options[submit_html]" rows="3" id="submit_html" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea($values['submit_html']) ?></textarea></p>
+                <textarea name="options[submit_html]" rows="3" id="submit_html" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea( $values['submit_html'] ) ?></textarea></p>
             </div>
         </div>
 
@@ -260,7 +260,7 @@ 
             </div>
         <?php } ?>
 
-        <?php do_action('frm_add_form_option_section', $values); ?>
+        <?php do_action( 'frm_add_form_option_section', $values ); ?>
         <div class="clear"></div>
         </div>
         </div>

classes/views/frm-form-actions/_email_settings.php

Spacing +21 added lines, -21 removed lines

@@ -1,63 +1,63 @@
 <table class="form-table frm-no-margin">
 <tr>
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('email_to') ?>><?php _e( 'To', 'formidable' ) ?></label>
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'email_to' ) ?>><?php _e( 'To', 'formidable' ) ?></label>
     </th>
-    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name('email_to') ) ?>" value="<?php echo esc_attr( $form_action->post_content['email_to'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip('email_to', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('email_to') ) ?>" />
+    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name( 'email_to' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['email_to'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip( 'email_to', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'email_to' ) ) ?>" />
     </td>
     <td class="frm_bcc_cc_container">
         <a href="javascript:void(0)" class="button frm_email_buttons frm_cc_button <?php
-        echo ( ! empty($form_action->post_content['cc'])  ? 'frm_hidden' : '' );
+        echo ( ! empty( $form_action->post_content['cc'] ) ? 'frm_hidden' : '' );
         ?>" data-emailrow="cc"><?php _e( 'CC', 'formidable' ) ?></a>
 	    <a href="javascript:void(0)" class="button frm_email_buttons frm_bcc_button <?php
-	    echo ( ! empty($form_action->post_content['bcc'])  ? 'frm_hidden' : '' );
+	    echo ( ! empty( $form_action->post_content['bcc'] ) ? 'frm_hidden' : '' );
 	    ?>" data-emailrow="bcc"><?php _e( 'BCC', 'formidable' ) ?></a>
     </td>
 </tr>
-<tr class="frm_cc_row<?php echo empty( $form_action->post_content['cc'] )  ? ' frm_hidden' : ''; ?>" >
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('cc') ?>><?php _e( 'CC', 'formidable' ) ?></label>
+<tr class="frm_cc_row<?php echo empty( $form_action->post_content['cc'] ) ? ' frm_hidden' : ''; ?>" >
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'cc' ) ?>><?php _e( 'CC', 'formidable' ) ?></label>
     </th>
     <td class="frm_right_addon">
-        <input type="text" name="<?php echo esc_attr( $this->get_field_name('cc') ) ?>" value="<?php echo esc_attr( $form_action->post_content['cc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip('cc', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('cc') ) ?>" />
+        <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'cc' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['cc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip( 'cc', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'cc' ) ) ?>" />
         <a href="javascript:void(0)" class="frm_icon_font frm_remove_field frm_cancel1_icon" data-emailrow="cc"></a>
     </td>
     <td></td>
 </tr>
-<tr class="frm_bcc_row<?php echo empty( $form_action->post_content['bcc'] )  ? ' frm_hidden' : ''; ?>" >
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('bcc') ?>><?php _e( 'BCC', 'formidable' ) ?></label>
+<tr class="frm_bcc_row<?php echo empty( $form_action->post_content['bcc'] ) ? ' frm_hidden' : ''; ?>" >
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'bcc' ) ?>><?php _e( 'BCC', 'formidable' ) ?></label>
     </th>
     <td class="frm_right_addon">
-        <input type="text" name="<?php echo esc_attr( $this->get_field_name('bcc') ) ?>" value="<?php echo esc_attr( $form_action->post_content['bcc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip('bcc', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('bcc') ) ?>" />
+        <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'bcc' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['bcc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip( 'bcc', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'bcc' ) ) ?>" />
         <a href="javascript:void(0)" class="frm_icon_font frm_remove_field frm_cancel1_icon" data-emailrow="bcc"></a>
     </td>
     <td></td>
 </tr>
-<tr class="frm_reply_to_row<?php echo empty( $form_action->post_content['reply_to'] )  ? ' frm_hidden' : ''; ?>">
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('reply_to') ?>><?php _e( 'Reply to', 'formidable' ) ?></label>
+<tr class="frm_reply_to_row<?php echo empty( $form_action->post_content['reply_to'] ) ? ' frm_hidden' : ''; ?>">
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'reply_to' ) ?>><?php _e( 'Reply to', 'formidable' ) ?></label>
     </th>
     <td class="frm_right_addon">
-        <input type="text" name="<?php echo esc_attr( $this->get_field_name('reply_to') ) ?>" value="<?php echo esc_attr( $form_action->post_content['reply_to'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip('reply_to', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('reply_to') ) ?>" />
+        <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'reply_to' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['reply_to'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip( 'reply_to', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'reply_to' ) ) ?>" />
         <a href="javascript:void(0)" class="frm_icon_font frm_remove_field frm_cancel1_icon" data-emailrow="reply_to"></a>
     </td>
     <td></td>
 </tr>
 <tr>
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('from') ?>><?php _e( 'From', 'formidable' ) ?></label></th>
-    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name('from') ) ?>" value="<?php echo esc_attr( $form_action->post_content['from'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip('from', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('from') ) ?>" />
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'from' ) ?>><?php _e( 'From', 'formidable' ) ?></label></th>
+    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name( 'from' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['from'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip( 'from', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'from' ) ) ?>" />
     </td>
-    <td><a href="javascript:void(0)" class="button frm_email_buttons frm_reply_to_button <?php echo ( ! empty( $form_action->post_content['reply_to'] )  ? 'frm_hidden' : '' ) ?>" data-emailrow="reply_to"><?php _e( 'Reply To', 'formidable' ) ?></a></td>
+    <td><a href="javascript:void(0)" class="button frm_email_buttons frm_reply_to_button <?php echo ( ! empty( $form_action->post_content['reply_to'] ) ? 'frm_hidden' : '' ) ?>" data-emailrow="reply_to"><?php _e( 'Reply To', 'formidable' ) ?></a></td>
 </tr>
  <tr>
      <td colspan="3" class="frm_no_top_padding">
-         <p><label <?php FrmAppHelper::maybe_add_tooltip('email_subject', '', $form->name) ?>><?php _e( 'Subject', 'formidable' ) ?></label><br/>
-         <input type="text" name="<?php echo esc_attr( $this->get_field_name('email_subject') ) ?>" class="frm_not_email_subject large-text <?php FrmAppHelper::maybe_add_tooltip('email_subject', 'open', $form->name) ?>" id="<?php echo esc_attr( $this->get_field_id('email_subject') ) ?>" size="55" value="<?php echo esc_attr( $form_action->post_content['email_subject'] ); ?>" /></p>
+         <p><label <?php FrmAppHelper::maybe_add_tooltip( 'email_subject', '', $form->name ) ?>><?php _e( 'Subject', 'formidable' ) ?></label><br/>
+         <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'email_subject' ) ) ?>" class="frm_not_email_subject large-text <?php FrmAppHelper::maybe_add_tooltip( 'email_subject', 'open', $form->name ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'email_subject' ) ) ?>" size="55" value="<?php echo esc_attr( $form_action->post_content['email_subject'] ); ?>" /></p>
 
         <p><label><?php _e( 'Message', 'formidable' ) ?> </label><br/>
-        <textarea name="<?php echo esc_attr( $this->get_field_name('email_message') ) ?>" class="frm_not_email_message large-text" id="<?php echo esc_attr( $this->get_field_id('email_message') ) ?>" cols="50" rows="5"><?php echo FrmAppHelper::esc_textarea($form_action->post_content['email_message']) ?></textarea></p>
+        <textarea name="<?php echo esc_attr( $this->get_field_name( 'email_message' ) ) ?>" class="frm_not_email_message large-text" id="<?php echo esc_attr( $this->get_field_id( 'email_message' ) ) ?>" cols="50" rows="5"><?php echo FrmAppHelper::esc_textarea( $form_action->post_content['email_message'] ) ?></textarea></p>
 
         <h4><?php _e( 'Options', 'formidable' ) ?> </h4>
-            <label for="<?php echo esc_attr( $this->get_field_id('inc_user_info') ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name('inc_user_info') ) ?>" class="frm_not_inc_user_info" id="<?php echo esc_attr( $this->get_field_id('inc_user_info') ) ?>" value="1" <?php checked( $form_action->post_content['inc_user_info'], 1 ); ?> /> <?php _e( 'Append IP Address, Browser, and Referring URL to message', 'formidable' ) ?></label>
+            <label for="<?php echo esc_attr( $this->get_field_id( 'inc_user_info' ) ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name( 'inc_user_info' ) ) ?>" class="frm_not_inc_user_info" id="<?php echo esc_attr( $this->get_field_id( 'inc_user_info' ) ) ?>" value="1" <?php checked( $form_action->post_content['inc_user_info'], 1 ); ?> /> <?php _e( 'Append IP Address, Browser, and Referring URL to message', 'formidable' ) ?></label>
 
-        <p><label for="<?php echo esc_attr( $this->get_field_id('plain_text') ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name('plain_text') ) ?>" id="<?php echo esc_attr( $this->get_field_id('plain_text') ) ?>" value="1" <?php checked( $form_action->post_content['plain_text'], 1 ); ?> /> <?php _e( 'Send Emails in Plain Text', 'formidable' ) ?></label></p>
+        <p><label for="<?php echo esc_attr( $this->get_field_id( 'plain_text' ) ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name( 'plain_text' ) ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'plain_text' ) ) ?>" value="1" <?php checked( $form_action->post_content['plain_text'], 1 ); ?> /> <?php _e( 'Send Emails in Plain Text', 'formidable' ) ?></label></p>
     </td>
 </tr>
 </table>