| @@ -62,24 +62,49 @@ | ||
| 62 | 62 | <?php esc_html_e( 'On Submit', 'formidable' ); ?> |
| 63 | 63 | <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Choose what will happen after the user submits this form.', 'formidable' ); ?>"></span> |
| 64 | 64 | </h3> |
| 65 | 65 | |
| 66 | -<input type="hidden" name="options[on_submit_migrated]" value="<?php echo empty( $values['on_submit_migrated'] ) ? '' : intval( $values['on_submit_migrated'] ); ?>" /> | |
| 66 | +<!--On Submit Section--> | |
| 67 | 67 | |
| 68 | -<?php | |
| 69 | -// Show a temporary message. This can be removed after the date is passed. | |
| 70 | -if ( time() < strtotime( '2023-03-07' ) ) { | |
| 71 | - FrmTipsHelper::show_tip( | |
| 72 | - array( | |
| 73 | - 'tip' => __( 'New: The form confirmation settings have moved.', 'formidable' ), | |
| 74 | - 'call' => __( 'Go to the Form Actions', 'formidable' ), | |
| 75 | - 'page' => add_query_arg( 't', 'email_settings' ), | |
| 76 | - ), | |
| 77 | - 'p' | |
| 78 | - ); | |
| 79 | -} | |
| 80 | -?> | |
| 68 | +<p class="frm4 frm_form_field"> | |
| 69 | + <select name="options[success_action]" id="success_action"> | |
| 70 | + <option value="message" <?php selected( $values['success_action'], 'message' ); ?>> | |
| 71 | + <?php esc_html_e( 'Show Message', 'formidable' ); ?> | |
| 72 | + </option> | |
| 73 | + <option value="redirect" <?php selected( $values['success_action'], 'redirect' ); ?>> | |
| 74 | + <?php esc_html_e( 'Redirect to URL', 'formidable' ); ?> | |
| 75 | + </option> | |
| 76 | + <option value="page" <?php selected( $values['success_action'], 'page' ); ?>> | |
| 77 | + <?php esc_html_e( 'Show Page Content', 'formidable' ); ?> | |
| 78 | + </option> | |
| 79 | + </select> | |
| 80 | +</p> | |
| 81 | +<p class="frm8 frm_form_field"> | |
| 82 | + <span class="frm_has_shortcodes success_action_redirect_box success_action_box<?php echo ( $values['success_action'] == 'redirect' ) ? '' : ' frm_hidden'; ?>"> | |
| 83 | + <input type="text" name="options[success_url]" id="success_url" value="<?php echo esc_attr( isset( $values['success_url'] ) ? $values['success_url'] : '' ); ?>" placeholder="http://example.com" /> | |
| 84 | + </span> | |
| 81 | 85 | |
| 86 | + <span class="success_action_page_box success_action_box<?php echo esc_attr( $values['success_action'] === 'page' ? '' : ' frm_hidden' ); ?>"> | |
| 87 | + | |
| 88 | + <?php | |
| 89 | + FrmAppHelper::maybe_autocomplete_pages_options( | |
| 90 | + array( | |
| 91 | + 'field_name' => 'options[success_page_id]', | |
| 92 | + 'page_id' => isset( $values['success_page_id'] ) ? $values['success_page_id'] : '', | |
| 93 | + 'placeholder' => __( 'Select a Page', 'formidable' ), | |
| 94 | + ) | |
| 95 | + ); | |
| 96 | + ?> | |
| 97 | + </span> | |
| 98 | +</p> | |
| 99 | + | |
| 100 | +<p class="frm_show_form_opt success_action_message_box success_action_box<?php echo esc_attr( $values['success_action'] == 'message' ? '' : ' frm_hidden' ); ?>"> | |
| 101 | + <label for="show_form" class="frm_inline_block"> | |
| 102 | + <input type="checkbox" name="options[show_form]" id="show_form" value="1" <?php checked( $values['show_form'], 1 ); ?> /> | |
| 103 | + <?php esc_html_e( 'Show the form with the confirmation message', 'formidable' ); ?> | |
| 104 | + </label> | |
| 105 | +</p> | |
| 106 | + | |
| 82 | 107 | <p class="frm8 frm_form_field"> |
| 83 | 108 | <label for="no_save" class="frm_inline_block"> |
| 84 | 109 | <input type="checkbox" name="options[no_save]" id="no_save" value="1" <?php checked( $values['no_save'], 1 ); ?> /> |
| 85 | 110 | <?php esc_html_e( 'Do not store entries submitted from this form', 'formidable' ); ?> |
| @@ -86,9 +111,9 @@ | ||
| 86 | 111 | </label> |
| 87 | 112 | </p> |
| 88 | 113 | |
| 89 | 114 | <?php |
| 90 | -is_callable( 'FrmFormsController::render_spam_settings' ) && FrmFormsController::render_spam_settings( $values ); | |
| 115 | +is_callable( 'self::render_spam_settings' ) && self::render_spam_settings( $values ); | |
| 91 | 116 | FrmTipsHelper::pro_tip( 'get_form_settings_tip', 'p' ); |
| 92 | 117 | ?> |
| 93 | 118 | |
| 94 | 119 | <!--AJAX Section--> |
| @@ -105,14 +130,14 @@ | ||
| 105 | 130 | </label> |
| 106 | 131 | </td> |
| 107 | 132 | </tr> |
| 108 | 133 | <?php do_action( 'frm_add_form_ajax_options', $values ); ?> |
| 109 | - <?php if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() ) { ?> | |
| 134 | + <?php if ( ! FrmAppHelper::pro_is_installed() ) { ?> | |
| 110 | 135 | <tr> |
| 111 | 136 | <td> |
| 112 | - <label for="ajax_submit"> | |
| 113 | - <input type="checkbox" name="options[ajax_submit]" id="ajax_submit" value="1" <?php checked( $values['ajax_submit'], 1 ); ?> /> | |
| 114 | - <?php esc_html_e( 'Submit this form with AJAX', 'formidable' ); ?> | |
| 137 | + <label data-upgrade="<?php esc_attr_e( 'AJAX Form Submissions', 'formidable' ); ?>" data-medium="ajax" data-message="<?php esc_attr_e( 'Want to submit forms without reloading the page?', 'formidable' ); ?>"> | |
| 138 | + <input type="checkbox" disabled="disabled" /> | |
| 139 | + <span class="frm_noallow"><?php esc_html_e( 'Submit this form with AJAX', 'formidable' ); ?></span> | |
| 115 | 140 | <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Submit the form without refreshing the page.', 'formidable' ); ?>"></span> |
| 116 | 141 | </label> |
| 117 | 142 | </td> |
| 118 | 143 | </tr> |
| @@ -130,19 +155,22 @@ | ||
| 130 | 155 | |
| 131 | 156 | <!--Permissions Section--> |
| 132 | 157 | <?php do_action( 'frm_add_form_perm_options', $values ); ?> |
| 133 | 158 | |
| 134 | -<?php | |
| 135 | -/* | |
| 136 | - * We keep this section to make the frm_add_form_msg_options hook still work after we moved the Success message option | |
| 137 | - * to the On Submit action, and moved the Draft message option to the below of its checkbox. | |
| 138 | - */ | |
| 139 | -if ( has_action( 'frm_add_form_msg_options' ) ) : | |
| 140 | - ?> | |
| 141 | - <table class="form-table frm-fields"> | |
| 142 | - <?php do_action( 'frm_add_form_msg_options', $values ); ?> | |
| 143 | - </table> | |
| 144 | -<?php endif; ?> | |
| 159 | +<!--Message Section--> | |
| 160 | +<h3 id="frm_messages_header" class="<?php echo esc_attr( ( ( isset( $values['edit_action'] ) && $values['edit_action'] === 'message' && isset( $values['editable'] ) && $values['editable'] == 1 ) || $values['success_action'] === 'message' || isset( $values['save_draft'] ) && $values['save_draft'] == 1 ) ? '' : 'frm_hidden' ); ?>"> | |
| 161 | + <?php esc_html_e( 'Messages', 'formidable' ); ?> | |
| 162 | + <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Set up your confirmation messages.', 'formidable' ); ?>" ></span> | |
| 163 | +</h3> | |
| 164 | +<table class="form-table frm-fields"> | |
| 165 | + <tr class="success_action_message_box success_action_box<?php echo esc_attr( $values['success_action'] === 'message' ? '' : ' frm_hidden' ); ?>"> | |
| 166 | + <td class="frm_has_shortcodes frm_has_textarea"> | |
| 167 | + <label for="success_msg"><?php esc_html_e( 'On Submit', 'formidable' ); ?></label> | |
| 168 | + <textarea id="success_msg" name="options[success_msg]" cols="50" rows="2" class="frm_long_input"><?php echo FrmAppHelper::esc_textarea( $values['success_msg'] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></textarea> | |
| 169 | + </td> | |
| 170 | + </tr> | |
| 171 | + <?php do_action( 'frm_add_form_msg_options', $values ); ?> | |
| 172 | +</table> | |
| 145 | 173 | |
| 146 | 174 | <!--Misc Section--> |
| 147 | 175 | <?php if ( has_action( 'frm_additional_form_options' ) ) { ?> |
| 148 | 176 | <h3><?php esc_html_e( 'Miscellaneous', 'formidable' ); ?></h3> |
