| @@ -4,35 +4,13 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmFormsController { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * Track the form that opened the redirect URL in a new tab. This is used to check if we should show the default | |
| 10 | - * message in the current tab. | |
| 11 | - * | |
| 12 | - * @since 6.2 | |
| 13 | - * | |
| 14 | - * @var array Keys are form IDs and values are 1. | |
| 15 | - */ | |
| 16 | - private static $redirected_in_new_tab = array(); | |
| 17 | - | |
| 18 | - /** | |
| 19 | - * The HTML for the Formdiable TinyMCE button (That triggers a popup to insert shortcodes) | |
| 20 | - * is stored here and re-used as an optimization. | |
| 21 | - * | |
| 22 | - * @since 6.11 | |
| 23 | - * | |
| 24 | - * @var string|null | |
| 25 | - */ | |
| 26 | - private static $formidable_tinymce_button; | |
| 27 | - | |
| 28 | 8 | public static function menu() { |
| 29 | 9 | $menu_label = __( 'Forms', 'formidable' ); |
| 30 | - | |
| 31 | 10 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 32 | 11 | $menu_label .= ' (Lite)'; |
| 33 | 12 | } |
| 34 | - | |
| 35 | 13 | add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' ); |
| 36 | 14 | |
| 37 | 15 | self::maybe_load_listing_hooks(); |
| 38 | 16 | } |
| @@ -66,12 +44,12 @@ | ||
| 66 | 44 | */ |
| 67 | 45 | public static function logic_tip() { |
| 68 | 46 | $images_url = FrmAppHelper::plugin_url() . '/images/'; |
| 69 | 47 | $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' ); |
| 70 | - $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 71 | - echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 72 | - esc_html_e( 'Conditional Logic', 'formidable' ); | |
| 73 | - FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) ); | |
| 48 | + $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; | |
| 49 | + echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; | |
| 50 | + FrmAppHelper::icon_by_class( 'frmfont frm_swap_icon' ); | |
| 51 | + esc_html_e( 'Add Conditional Logic', 'formidable' ); | |
| 74 | 52 | echo '</a>'; |
| 75 | 53 | } |
| 76 | 54 | |
| 77 | 55 | /** |
| @@ -78,15 +56,12 @@ | ||
| 78 | 56 | * By default, Divi processes form shortcodes on the edit post page. |
| 79 | 57 | * Now that won't do. |
| 80 | 58 | * |
| 81 | 59 | * @since 3.01 |
| 82 | - * | |
| 83 | - * @param array $shortcodes List of shortcodes to process. | |
| 84 | - * | |
| 85 | - * @return array | |
| 86 | 60 | */ |
| 87 | 61 | public static function prevent_divi_conflict( $shortcodes ) { |
| 88 | 62 | $shortcodes[] = 'formidable'; |
| 63 | + | |
| 89 | 64 | return $shortcodes; |
| 90 | 65 | } |
| 91 | 66 | |
| 92 | 67 | /** |
| @@ -97,14 +72,12 @@ | ||
| 97 | 72 | |
| 98 | 73 | $message = ''; |
| 99 | 74 | $params = FrmForm::list_page_params(); |
| 100 | 75 | $errors = self::process_bulk_form_actions( array() ); |
| 101 | - | |
| 102 | 76 | if ( isset( $errors['message'] ) ) { |
| 103 | 77 | $message = $errors['message']; |
| 104 | 78 | unset( $errors['message'] ); |
| 105 | 79 | } |
| 106 | - | |
| 107 | 80 | $errors = apply_filters( 'frm_admin_list_form_action', $errors ); |
| 108 | 81 | |
| 109 | 82 | self::display_forms_list( $params, $message, $errors ); |
| 110 | 83 | } |
| @@ -113,123 +86,28 @@ | ||
| 113 | 86 | * Create the default email action |
| 114 | 87 | * |
| 115 | 88 | * @since 2.02.11 |
| 116 | 89 | * |
| 117 | - * @param int|object $form | |
| 118 | - * | |
| 119 | - * @return void | |
| 90 | + * @param object|int $form | |
| 120 | 91 | */ |
| 121 | 92 | private static function create_default_email_action( $form ) { |
| 122 | 93 | FrmForm::maybe_get_form( $form ); |
| 123 | - | |
| 124 | - if ( ! is_object( $form ) ) { | |
| 125 | - return; | |
| 126 | - } | |
| 127 | - | |
| 128 | 94 | $create_email = apply_filters( 'frm_create_default_email_action', true, $form ); |
| 129 | 95 | |
| 130 | - if ( ! $create_email ) { | |
| 131 | - return; | |
| 96 | + if ( $create_email ) { | |
| 97 | + $action_control = FrmFormActionsController::get_form_actions( 'email' ); | |
| 98 | + $action_control->create( $form->id ); | |
| 132 | 99 | } |
| 133 | - | |
| 134 | - /** | |
| 135 | - * @var FrmFormAction | |
| 136 | - */ | |
| 137 | - $action_control = FrmFormActionsController::get_form_actions( 'email' ); | |
| 138 | - $action_control->create( $form->id ); | |
| 139 | 100 | } |
| 140 | 101 | |
| 141 | - /** | |
| 142 | - * Create the default On submit action | |
| 143 | - * | |
| 144 | - * @since 6.0.0 | |
| 145 | - * | |
| 146 | - * @param int|object $form Form object or ID. | |
| 147 | - * | |
| 148 | - * @return void | |
| 149 | - */ | |
| 150 | - private static function create_default_on_submit_action( $form ) { | |
| 151 | - FrmForm::maybe_get_form( $form ); | |
| 152 | - | |
| 153 | - if ( ! is_object( $form ) ) { | |
| 154 | - return; | |
| 155 | - } | |
| 156 | - | |
| 157 | - /** | |
| 158 | - * Enable or disable the default On Submit action. | |
| 159 | - * | |
| 160 | - * @since 6.0.0 | |
| 161 | - * | |
| 162 | - * @param bool $create Set to `false` if you want to disable. | |
| 163 | - * @param object $form Form object. | |
| 164 | - */ | |
| 165 | - $create = apply_filters( 'frm_create_default_on_submit_action', true, $form ); | |
| 166 | - | |
| 167 | - if ( ! $create ) { | |
| 168 | - return; | |
| 169 | - } | |
| 170 | - | |
| 171 | - /** | |
| 172 | - * @var FrmFormAction | |
| 173 | - */ | |
| 174 | - $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug ); | |
| 175 | - $action_control->create( $form->id ); | |
| 176 | - } | |
| 177 | - | |
| 178 | - /** | |
| 179 | - * Creates submit button field. | |
| 180 | - * | |
| 181 | - * @since 6.9 | |
| 182 | - * | |
| 183 | - * @param int|object $form Form ID or object. | |
| 184 | - * | |
| 185 | - * @return void | |
| 186 | - */ | |
| 187 | - private static function create_submit_button_field( $form ) { | |
| 188 | - FrmForm::maybe_get_form( $form ); | |
| 189 | - | |
| 190 | - if ( ! is_object( $form ) ) { | |
| 191 | - return; | |
| 192 | - } | |
| 193 | - | |
| 194 | - if ( FrmSubmitHelper::get_submit_field( $form->id ) ) { | |
| 195 | - // Do not create submit button field if it exists. | |
| 196 | - return; | |
| 197 | - } | |
| 198 | - | |
| 199 | - FrmField::create( | |
| 200 | - array( | |
| 201 | - 'type' => FrmSubmitHelper::FIELD_TYPE, | |
| 202 | - 'name' => __( 'Submit', 'formidable' ), | |
| 203 | - 'field_order' => FrmSubmitHelper::DEFAULT_ORDER, | |
| 204 | - 'form_id' => $form->id, | |
| 205 | - 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ), | |
| 206 | - 'description' => '', | |
| 207 | - 'default_value' => '', | |
| 208 | - 'options' => array(), | |
| 209 | - ) | |
| 210 | - ); | |
| 211 | - } | |
| 212 | - | |
| 213 | - /** | |
| 214 | - * @param array|false $values | |
| 215 | - * | |
| 216 | - * @return void | |
| 217 | - */ | |
| 218 | 102 | public static function edit( $values = false ) { |
| 219 | 103 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 220 | 104 | |
| 221 | 105 | $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 222 | 106 | |
| 223 | - self::get_edit_vars( $id ); | |
| 107 | + return self::get_edit_vars( $id ); | |
| 224 | 108 | } |
| 225 | 109 | |
| 226 | - /** | |
| 227 | - * @param mixed $id | |
| 228 | - * @param string $message | |
| 229 | - * | |
| 230 | - * @return void | |
| 231 | - */ | |
| 232 | 110 | public static function settings( $id = false, $message = '' ) { |
| 233 | 111 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 234 | 112 | |
| 235 | 113 | if ( ! $id || ! is_numeric( $id ) ) { |
| @@ -235,35 +113,21 @@ | ||
| 235 | 113 | if ( ! $id || ! is_numeric( $id ) ) { |
| 236 | 114 | $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 237 | 115 | } |
| 238 | 116 | |
| 239 | - FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id ); | |
| 240 | - | |
| 241 | - self::get_settings_vars( $id, array(), $message ); | |
| 117 | + return self::get_settings_vars( $id, array(), $message ); | |
| 242 | 118 | } |
| 243 | 119 | |
| 244 | 120 | public static function update_settings() { |
| 245 | 121 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 246 | - $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' ); | |
| 247 | 122 | |
| 248 | - if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) { | |
| 249 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 250 | - $error_args = array( | |
| 251 | - 'title' => __( 'Verification failed', 'formidable' ), | |
| 252 | - 'body' => $frm_settings->admin_permission, | |
| 253 | - 'cancel_text' => __( 'Cancel', 'formidable' ), | |
| 254 | - ); | |
| 255 | - FrmAppController::show_error_modal( $error_args ); | |
| 256 | - return; | |
| 257 | - } | |
| 123 | + $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); | |
| 258 | 124 | |
| 259 | - $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); | |
| 260 | - $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 125 | + $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 261 | 126 | $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 262 | 127 | |
| 263 | 128 | if ( count( $errors ) > 0 ) { |
| 264 | - self::get_settings_vars( $id, $errors, compact( 'warnings' ) ); | |
| 265 | - return; | |
| 129 | + return self::get_settings_vars( $id, $errors, compact( 'warnings' ) ); | |
| 266 | 130 | } |
| 267 | 131 | |
| 268 | 132 | do_action( 'frm_before_update_form_settings', $id ); |
| 269 | 133 | |
| @@ -271,9 +135,8 @@ | ||
| 271 | 135 | |
| 272 | 136 | FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 273 | 137 | |
| 274 | 138 | $antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 275 | - | |
| 276 | 139 | if ( $antispam_is_on !== $antispam_was_on ) { |
| 277 | 140 | FrmAntiSpam::clear_caches(); |
| 278 | 141 | } |
| 279 | 142 | |
| @@ -278,14 +141,13 @@ | ||
| 278 | 141 | } |
| 279 | 142 | |
| 280 | 143 | $message = __( 'Settings Successfully Updated', 'formidable' ); |
| 281 | 144 | |
| 282 | - self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) ); | |
| 145 | + return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) ); | |
| 283 | 146 | } |
| 284 | 147 | |
| 285 | 148 | /** |
| 286 | 149 | * @param int $form_id |
| 287 | - * | |
| 288 | 150 | * @return bool |
| 289 | 151 | */ |
| 290 | 152 | private static function antispam_was_on( $form_id ) { |
| 291 | 153 | $form = FrmForm::getOne( $form_id ); |
| @@ -291,15 +153,10 @@ | ||
| 291 | 153 | $form = FrmForm::getOne( $form_id ); |
| 292 | 154 | return ! empty( $form->options['antispam'] ); |
| 293 | 155 | } |
| 294 | 156 | |
| 295 | - /** | |
| 296 | - * @param array $values | |
| 297 | - * | |
| 298 | - * @return void | |
| 299 | - */ | |
| 300 | 157 | public static function update( $values = array() ) { |
| 301 | - if ( ! $values ) { | |
| 158 | + if ( empty( $values ) ) { | |
| 302 | 159 | $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 303 | 160 | } |
| 304 | 161 | |
| 305 | 162 | // Set radio button and checkbox meta equal to "other" value. |
| @@ -308,9 +165,8 @@ | ||
| 308 | 165 | } |
| 309 | 166 | |
| 310 | 167 | $errors = FrmForm::validate( $values ); |
| 311 | 168 | $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' ); |
| 312 | - | |
| 313 | 169 | if ( $permission_error !== false ) { |
| 314 | 170 | $errors['form'] = $permission_error; |
| 315 | 171 | } |
| 316 | 172 | |
| @@ -316,93 +172,65 @@ | ||
| 316 | 172 | |
| 317 | 173 | $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 318 | 174 | |
| 319 | 175 | if ( count( $errors ) > 0 ) { |
| 320 | - self::get_edit_vars( $id, $errors ); | |
| 321 | - return; | |
| 322 | - } | |
| 176 | + return self::get_edit_vars( $id, $errors ); | |
| 177 | + } else { | |
| 178 | + FrmForm::update( $id, $values ); | |
| 179 | + $message = __( 'Form was successfully updated.', 'formidable' ); | |
| 323 | 180 | |
| 324 | - self::maybe_remove_draft_option_from_fields( $id ); | |
| 181 | + if ( self::is_too_long( $values ) ) { | |
| 182 | + $message .= '<br/> ' . sprintf( | |
| 183 | + /* translators: %1$s: Start link HTML, %2$s: end link HTML */ | |
| 184 | + __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ), | |
| 185 | + '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">', | |
| 186 | + '</a>' | |
| 187 | + ); | |
| 188 | + } | |
| 325 | 189 | |
| 326 | - FrmForm::update( $id, $values ); | |
| 327 | - $message = __( 'Form was successfully updated.', 'formidable' ); | |
| 190 | + if ( defined( 'DOING_AJAX' ) ) { | |
| 191 | + wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 192 | + } | |
| 328 | 193 | |
| 329 | - if ( self::is_too_long( $values ) ) { | |
| 330 | - $message .= '<br/> ' . sprintf( | |
| 331 | - /* translators: %1$s: Start link HTML, %2$s: end link HTML */ | |
| 332 | - __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ), | |
| 333 | - '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">', | |
| 334 | - '</a>' | |
| 335 | - ); | |
| 194 | + return self::get_edit_vars( $id, array(), $message ); | |
| 336 | 195 | } |
| 337 | - | |
| 338 | - if ( defined( 'DOING_AJAX' ) ) { | |
| 339 | - wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 340 | - } | |
| 341 | - | |
| 342 | - self::get_edit_vars( $id, array(), $message ); | |
| 343 | 196 | } |
| 344 | 197 | |
| 345 | 198 | /** |
| 346 | - * @since 6.25.1 | |
| 199 | + * Check if the value at the end of the form was included. | |
| 200 | + * If it's missing, it means other values at the end of the form | |
| 201 | + * were likely not saved either. | |
| 347 | 202 | * |
| 348 | - * @return string | |
| 203 | + * @since 3.06.01 | |
| 349 | 204 | */ |
| 350 | - private static function get_form_too_long_docs_url() { | |
| 351 | - $utm = array( | |
| 352 | - 'campaign' => 'builder', | |
| 353 | - 'content' => 'form-too-long', | |
| 354 | - ); | |
| 355 | - return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' ); | |
| 205 | + private static function is_too_long( $values ) { | |
| 206 | + return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] ); | |
| 356 | 207 | } |
| 357 | 208 | |
| 358 | 209 | /** |
| 359 | - * Remove the draft flag from any new fields from this current session. | |
| 210 | + * Redirect to the url for creating from a template | |
| 211 | + * Also delete the current form | |
| 360 | 212 | * |
| 361 | - * @since 6.8 | |
| 362 | - * | |
| 363 | - * @param int $form_id | |
| 364 | - * | |
| 365 | - * @return void | |
| 213 | + * @since 2.0 | |
| 214 | + * @deprecated 3.06 | |
| 366 | 215 | */ |
| 367 | - private static function maybe_remove_draft_option_from_fields( $form_id ) { | |
| 368 | - $draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' ); | |
| 216 | + public static function _create_from_template() { | |
| 217 | + _deprecated_function( __FUNCTION__, '3.06' ); | |
| 369 | 218 | |
| 370 | - if ( ! $draft_field_ids_csv ) { | |
| 371 | - // If the draft_fields input is empty there are no new fields in the session. | |
| 372 | - return; | |
| 373 | - } | |
| 219 | + FrmAppHelper::permission_check( 'frm_edit_forms' ); | |
| 220 | + check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 374 | 221 | |
| 375 | - $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' ); | |
| 222 | + $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' ); | |
| 223 | + $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); | |
| 376 | 224 | |
| 377 | - if ( ! $draft_field_ids ) { | |
| 378 | - // Exit early if the draft fields input is invalid. It should be a CSV of integer values. | |
| 379 | - return; | |
| 225 | + if ( $current_form ) { | |
| 226 | + FrmForm::destroy( $current_form ); | |
| 380 | 227 | } |
| 381 | 228 | |
| 382 | - $draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids ); | |
| 383 | - | |
| 384 | - foreach ( $draft_field_rows as $row ) { | |
| 385 | - $row->field_options['draft'] = 0; | |
| 386 | - FrmField::update( $row->id, array( 'field_options' => $row->field_options ) ); | |
| 387 | - } | |
| 229 | + echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) ); | |
| 230 | + wp_die(); | |
| 388 | 231 | } |
| 389 | 232 | |
| 390 | - /** | |
| 391 | - * Check if the value at the end of the form was included. | |
| 392 | - * If it's missing, it means other values at the end of the form | |
| 393 | - * were likely not saved either. | |
| 394 | - * | |
| 395 | - * @since 3.06.01 | |
| 396 | - * | |
| 397 | - * @param array $values | |
| 398 | - * | |
| 399 | - * @return bool | |
| 400 | - */ | |
| 401 | - private static function is_too_long( $values ) { | |
| 402 | - return empty( $values['frm_end'] ); | |
| 403 | - } | |
| 404 | - | |
| 405 | 233 | public static function duplicate() { |
| 406 | 234 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 407 | 235 | $nonce = FrmAppHelper::simple_get( '_wpnonce' ); |
| 408 | 236 | |
| @@ -416,11 +244,10 @@ | ||
| 416 | 244 | $url = admin_url( 'admin.php?page=formidable' ); |
| 417 | 245 | $message = 'form_duplicate_error'; |
| 418 | 246 | |
| 419 | 247 | if ( $form ) { |
| 420 | - $new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : ''; | |
| 421 | - $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template ); | |
| 422 | - $message = 'form_duplicated'; | |
| 248 | + $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) ); | |
| 249 | + $message = 'form_duplicated'; | |
| 423 | 250 | } |
| 424 | 251 | |
| 425 | 252 | $url .= '&message=' . $message; |
| 426 | 253 | |
| @@ -428,45 +255,27 @@ | ||
| 428 | 255 | exit(); |
| 429 | 256 | } |
| 430 | 257 | |
| 431 | 258 | /** |
| 432 | - * @return string|null | |
| 259 | + * @return string | |
| 433 | 260 | */ |
| 434 | 261 | public static function page_preview() { |
| 435 | 262 | $params = FrmForm::list_page_params(); |
| 436 | - | |
| 437 | - if ( ! $params['form'] || is_numeric( $params['form'] ) ) { | |
| 438 | - return null; | |
| 263 | + if ( ! $params['form'] ) { | |
| 264 | + return; | |
| 439 | 265 | } |
| 440 | 266 | |
| 441 | - self::maybe_block_preview( $params['form'] ); | |
| 442 | - | |
| 443 | 267 | $form = FrmForm::getOne( $params['form'] ); |
| 444 | - | |
| 445 | - if ( ! $form ) { | |
| 446 | - return null; | |
| 268 | + if ( $form ) { | |
| 269 | + return self::show_form( $form->id, '', 'auto', 'auto' ); | |
| 447 | 270 | } |
| 448 | - | |
| 449 | - return self::show_form( $form->id, '', 'auto', 'auto' ); | |
| 450 | 271 | } |
| 451 | 272 | |
| 452 | 273 | /** |
| 453 | 274 | * @since 3.0 |
| 454 | - * | |
| 455 | - * @return void | |
| 456 | 275 | */ |
| 457 | 276 | public static function show_page_preview() { |
| 458 | - $preview = self::page_preview(); | |
| 459 | - | |
| 460 | - if ( is_null( $preview ) ) { | |
| 461 | - wp_die( | |
| 462 | - '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>', | |
| 463 | - '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>', | |
| 464 | - 404 | |
| 465 | - ); | |
| 466 | - } | |
| 467 | - | |
| 468 | - echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 277 | + echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 469 | 278 | } |
| 470 | 279 | |
| 471 | 280 | /** |
| 472 | 281 | * @return void |
| @@ -477,19 +286,9 @@ | ||
| 477 | 286 | |
| 478 | 287 | global $frm_vars; |
| 479 | 288 | $frm_vars['preview'] = true; |
| 480 | 289 | |
| 481 | - // print_emoji_styles is deprecated. | |
| 482 | - remove_action( 'wp_print_styles', 'print_emoji_styles' ); | |
| 483 | - | |
| 484 | - if ( FrmTestModeController::should_add_test_mode_container() ) { | |
| 485 | - do_action( 'frm_test_mode_init' ); | |
| 486 | - add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' ); | |
| 487 | - add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 ); | |
| 488 | - } | |
| 489 | - | |
| 490 | 290 | $include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' ); |
| 491 | - | |
| 492 | 291 | if ( $include_theme ) { |
| 493 | 292 | self::set_preview_query(); |
| 494 | 293 | self::load_theme_preview(); |
| 495 | 294 | } else { |
| @@ -512,9 +311,8 @@ | ||
| 512 | 311 | 'post_type' => 'page', |
| 513 | 312 | ); |
| 514 | 313 | |
| 515 | 314 | $page_for_posts = get_option( 'page_for_posts' ); |
| 516 | - | |
| 517 | 315 | if ( is_numeric( $page_for_posts ) ) { |
| 518 | 316 | // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms. |
| 519 | 317 | $page_query['post__not_in'] = array( $page_for_posts ); |
| 520 | 318 | } |
| @@ -519,20 +317,13 @@ | ||
| 519 | 317 | $page_query['post__not_in'] = array( $page_for_posts ); |
| 520 | 318 | } |
| 521 | 319 | |
| 522 | 320 | $random_page = get_posts( $page_query ); |
| 523 | - | |
| 524 | 321 | if ( ! $random_page ) { |
| 525 | 322 | return; |
| 526 | 323 | } |
| 527 | 324 | |
| 528 | 325 | $random_page = reset( $random_page ); |
| 529 | - | |
| 530 | - if ( ! is_a( $random_page, 'WP_Post' ) ) { | |
| 531 | - // The return type can also be int. | |
| 532 | - return; | |
| 533 | - } | |
| 534 | - | |
| 535 | 326 | query_posts( |
| 536 | 327 | array( |
| 537 | 328 | 'post_type' => 'page', |
| 538 | 329 | 'page_id' => $random_page->ID, |
| @@ -548,10 +339,9 @@ | ||
| 548 | 339 | * Set the WP $post global object. Used for in-theme preview when defining a page. |
| 549 | 340 | * |
| 550 | 341 | * @since 5.5.2 |
| 551 | 342 | * |
| 552 | - * @param WP_Post $page The page object. | |
| 553 | - * | |
| 343 | + * @param WP_Post $post | |
| 554 | 344 | * @return void |
| 555 | 345 | */ |
| 556 | 346 | private static function set_post_global( $page ) { |
| 557 | 347 | global $post; |
| @@ -559,10 +349,8 @@ | ||
| 559 | 349 | } |
| 560 | 350 | |
| 561 | 351 | /** |
| 562 | 352 | * @since 3.0 |
| 563 | - * | |
| 564 | - * @return void | |
| 565 | 353 | */ |
| 566 | 354 | private static function load_theme_preview() { |
| 567 | 355 | add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 ); |
| 568 | 356 | add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 ); |
| @@ -570,144 +358,61 @@ | ||
| 570 | 358 | add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' ); |
| 571 | 359 | add_filter( 'is_active_sidebar', '__return_false' ); |
| 572 | 360 | FrmStylesController::enqueue_css( 'enqueue', true ); |
| 573 | 361 | |
| 574 | - if ( false !== get_template_part( 'page' ) ) { | |
| 575 | - return; | |
| 362 | + if ( false === get_template_part( 'page' ) ) { | |
| 363 | + self::fallback_when_page_template_part_is_not_supported_by_theme(); | |
| 576 | 364 | } |
| 577 | - | |
| 578 | - if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) { | |
| 579 | - add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' ); | |
| 580 | - } | |
| 581 | - self::fallback_when_page_template_part_is_not_supported_by_theme(); | |
| 582 | 365 | } |
| 583 | 366 | |
| 584 | 367 | /** |
| 585 | - * Add padding to the body for block themes. | |
| 586 | - * | |
| 587 | - * @since 6.5.2 | |
| 588 | - * | |
| 589 | - * @param array $classes The body classes list. | |
| 590 | - * | |
| 591 | - * @return array | |
| 592 | - */ | |
| 593 | - public static function preview_block_theme_body_classnames( $classes ) { | |
| 594 | - $classes[] = 'has-global-padding'; | |
| 595 | - return $classes; | |
| 596 | - } | |
| 597 | - | |
| 598 | - /** | |
| 599 | 368 | * Not every theme supports get_template_part( 'page' ). |
| 600 | 369 | * When this is not supported, false is returned, and we can handle a fallback. |
| 601 | - * | |
| 602 | - * @return void | |
| 603 | 370 | */ |
| 604 | 371 | private static function fallback_when_page_template_part_is_not_supported_by_theme() { |
| 605 | - if ( ! have_posts() ) { | |
| 606 | - return; | |
| 372 | + if ( have_posts() ) { | |
| 373 | + the_post(); | |
| 374 | + get_header( '' ); | |
| 375 | + // add some generic class names to the container to add some natural padding to the content. | |
| 376 | + // .entry-content catches the WordPress TwentyTwenty theme. | |
| 377 | + // .container catches Customizr content. | |
| 378 | + echo '<div class="container entry-content">'; | |
| 379 | + the_content(); | |
| 380 | + echo '</div>'; | |
| 381 | + get_footer(); | |
| 607 | 382 | } |
| 608 | - | |
| 609 | - the_post(); | |
| 610 | - self::get_template( 'header' ); | |
| 611 | - | |
| 612 | - // Add some generic class names to the container to add some natural padding to the content. | |
| 613 | - // .entry-content catches the WordPress TwentyTwenty theme. | |
| 614 | - // .container catches Customizr content. | |
| 615 | - echo '<div class="container entry-content">'; | |
| 616 | - the_content(); | |
| 617 | - echo '</div>'; | |
| 618 | - | |
| 619 | - // Prevent extra unexpected forms in the footer. | |
| 620 | - // For some reason this happens in the Twenty Twenty Five theme. | |
| 621 | - add_filter( 'frm_filter_final_form', '__return_empty_string' ); | |
| 622 | - | |
| 623 | - self::get_template( 'footer' ); | |
| 624 | 383 | } |
| 625 | 384 | |
| 626 | 385 | /** |
| 627 | - * Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call | |
| 628 | - * and renders required html fragments calling required functions. | |
| 386 | + * Set the page title for the theme preview page | |
| 629 | 387 | * |
| 630 | - * @since 6.7.1 | |
| 631 | - * | |
| 632 | - * @param string $template | |
| 633 | - * | |
| 634 | - * @return void | |
| 388 | + * @since 3.0 | |
| 635 | 389 | */ |
| 636 | - private static function get_template( $template ) { | |
| 637 | - if ( self::should_try_getting_template( $template ) ) { | |
| 638 | - call_user_func( 'get_' . $template ); | |
| 639 | - return; | |
| 390 | + public static function preview_page_title( $title ) { | |
| 391 | + if ( in_the_loop() ) { | |
| 392 | + $title = self::preview_title( $title ); | |
| 640 | 393 | } |
| 641 | 394 | |
| 642 | - if ( 'header' === $template ) { | |
| 643 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/header.php'; | |
| 644 | - return; | |
| 645 | - } | |
| 646 | - | |
| 647 | - if ( 'footer' === $template ) { | |
| 648 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/footer.php'; | |
| 649 | - } | |
| 395 | + return $title; | |
| 650 | 396 | } |
| 651 | 397 | |
| 652 | 398 | /** |
| 653 | - * Returns true if calling a template function doesn't trigger deprecation warnings. | |
| 654 | - * | |
| 655 | - * @since 6.7.1 | |
| 656 | - * | |
| 657 | - * @param string $template | |
| 658 | - * | |
| 659 | - * @return bool | |
| 660 | - */ | |
| 661 | - private static function should_try_getting_template( $template ) { | |
| 662 | - $stylesheet_path = get_stylesheet_directory(); | |
| 663 | - $template_path = get_template_directory(); | |
| 664 | - $is_child_theme = $stylesheet_path !== $template_path; | |
| 665 | - $template_name = $template . '.php'; | |
| 666 | - | |
| 667 | - return file_exists( $stylesheet_path . '/' . $template_name ) || $is_child_theme && file_exists( $template_path . '/' . $template_name ); | |
| 668 | - } | |
| 669 | - | |
| 670 | - /** | |
| 671 | 399 | * Set the page title for the theme preview page |
| 672 | 400 | * |
| 673 | 401 | * @since 3.0 |
| 674 | - * | |
| 675 | - * @param string $title | |
| 676 | - * | |
| 677 | - * @return string | |
| 678 | 402 | */ |
| 679 | - public static function preview_page_title( $title ) { | |
| 680 | - return in_the_loop() ? self::preview_title( $title ) : $title; | |
| 681 | - } | |
| 682 | - | |
| 683 | - /** | |
| 684 | - * Set the page title for the theme preview page. | |
| 685 | - * | |
| 686 | - * @since 3.0 | |
| 687 | - * | |
| 688 | - * @param string $title | |
| 689 | - * | |
| 690 | - * @return string | |
| 691 | - */ | |
| 692 | 403 | public static function preview_title( $title ) { |
| 693 | 404 | return __( 'Form Preview', 'formidable' ); |
| 694 | 405 | } |
| 695 | 406 | |
| 696 | 407 | /** |
| 697 | - * Set the page content for the theme preview page. | |
| 408 | + * Set the page content for the theme preview page | |
| 698 | 409 | * |
| 699 | 410 | * @since 3.0 |
| 700 | - * | |
| 701 | - * @param string $content | |
| 702 | - * | |
| 703 | - * @return string | |
| 704 | 411 | */ |
| 705 | 412 | public static function preview_content( $content ) { |
| 706 | 413 | if ( in_the_loop() ) { |
| 707 | - self::show_page_preview(); | |
| 708 | - // Clear the content for the page we're using. | |
| 709 | - $content = ''; | |
| 414 | + $content = self::show_page_preview(); | |
| 710 | 415 | } |
| 711 | 416 | |
| 712 | 417 | return $content; |
| 713 | 418 | } |
| @@ -715,111 +420,36 @@ | ||
| 715 | 420 | /** |
| 716 | 421 | * @since 3.0 |
| 717 | 422 | */ |
| 718 | 423 | private static function load_direct_preview() { |
| 424 | + header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) ); | |
| 425 | + | |
| 719 | 426 | $key = FrmAppHelper::simple_get( 'form', 'sanitize_title' ); |
| 720 | - | |
| 721 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 722 | 427 | if ( $key == '' ) { |
| 723 | 428 | $key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' ); |
| 724 | 429 | } |
| 725 | 430 | |
| 726 | - if ( ! $key ) { | |
| 727 | - $error = __( 'Form key is missing', 'formidable' ); | |
| 728 | - wp_die( | |
| 729 | - '<h1>' . esc_html( $error ) . '</h1>', | |
| 730 | - '<p>' . esc_html( $error ) . '</p>', | |
| 731 | - 404 | |
| 732 | - ); | |
| 733 | - } | |
| 734 | - | |
| 735 | - self::maybe_block_preview( $key ); | |
| 736 | - | |
| 737 | 431 | $form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 ); |
| 738 | - | |
| 739 | - if ( ! $form ) { | |
| 740 | - $error = __( 'Form does not exist', 'formidable' ); | |
| 741 | - wp_die( | |
| 742 | - '<h1>' . esc_html( $error ) . '</h1>', | |
| 743 | - '<p>' . esc_html( $error ) . '</p>', | |
| 744 | - 404 | |
| 745 | - ); | |
| 432 | + if ( empty( $form ) ) { | |
| 433 | + $form = FrmForm::getAll( array(), '', 1 ); | |
| 746 | 434 | } |
| 747 | 435 | |
| 748 | - header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) ); | |
| 749 | - | |
| 750 | - self::fix_deprecated_null_param_warning(); | |
| 751 | - | |
| 752 | - require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php'; | |
| 436 | + require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' ); | |
| 753 | 437 | } |
| 754 | 438 | |
| 755 | - /** | |
| 756 | - * Block the form preview for the contact form by default if the user cannot view forms. | |
| 757 | - * This is to prevent the contact form being exploited. | |
| 758 | - * Since this form is added by default and every site uses the same key, it is too easy | |
| 759 | - * to guess this form. | |
| 760 | - * | |
| 761 | - * @since 6.20 | |
| 762 | - * | |
| 763 | - * @param string $form_key Form key. | |
| 764 | - * | |
| 765 | - * @return void | |
| 766 | - */ | |
| 767 | - public static function maybe_block_preview( $form_key ) { | |
| 768 | - if ( FrmFormsHelper::should_block_preview( $form_key ) ) { | |
| 769 | - $error = __( 'You do not have permission to view this form', 'formidable' ); | |
| 770 | - wp_die( | |
| 771 | - '<h1>' . esc_html( $error ) . '</h1>', | |
| 772 | - '<p>' . esc_html( $error ) . '</p>', | |
| 773 | - 403 | |
| 774 | - ); | |
| 775 | - } | |
| 776 | - } | |
| 777 | - | |
| 778 | - /** | |
| 779 | - * Some themes have a null $src value. | |
| 780 | - * This function adds a filter to ensure that $src is not null. | |
| 781 | - * WP will call str_starts_with with the null value triggering a deprecated message otherwise. | |
| 782 | - * | |
| 783 | - * @since 6.10 | |
| 784 | - * | |
| 785 | - * @return void | |
| 786 | - */ | |
| 787 | - private static function fix_deprecated_null_param_warning() { | |
| 788 | - add_filter( | |
| 789 | - 'script_loader_src', | |
| 790 | - /** | |
| 791 | - * @param string|null $src | |
| 792 | - * | |
| 793 | - * @return string | |
| 794 | - */ | |
| 795 | - function ( $src ) { | |
| 796 | - return is_null( $src ) ? '' : $src; | |
| 797 | - } | |
| 798 | - ); | |
| 799 | - } | |
| 800 | - | |
| 801 | 439 | public static function untrash() { |
| 802 | 440 | self::change_form_status( 'untrash' ); |
| 803 | 441 | } |
| 804 | 442 | |
| 805 | - /** | |
| 806 | - * @param array $ids | |
| 807 | - * | |
| 808 | - * @return string | |
| 809 | - */ | |
| 810 | 443 | public static function bulk_untrash( $ids ) { |
| 811 | 444 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 812 | 445 | |
| 813 | 446 | $count = FrmForm::set_status( $ids, 'published' ); |
| 814 | 447 | |
| 815 | - if ( ! $count ) { | |
| 816 | - // Don't show "0 forms restored" on refresh. | |
| 817 | - return ''; | |
| 818 | - } | |
| 448 | + /* translators: %1$s: Number of forms */ | |
| 449 | + $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 ); | |
| 819 | 450 | |
| 820 | - /* translators: %1$s: Number of forms */ | |
| 821 | - return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count ); | |
| 451 | + return $message; | |
| 822 | 452 | } |
| 823 | 453 | |
| 824 | 454 | /** |
| 825 | 455 | * @since 3.06 |
| @@ -860,15 +490,14 @@ | ||
| 860 | 490 | FrmAppHelper::permission_check( $available_status[ $status ]['permission'] ); |
| 861 | 491 | |
| 862 | 492 | $params = FrmForm::list_page_params(); |
| 863 | 493 | |
| 864 | - // Check nonce url. | |
| 494 | + //check nonce url | |
| 865 | 495 | check_admin_referer( $status . '_form_' . $params['id'] ); |
| 866 | 496 | |
| 867 | 497 | $count = 0; |
| 868 | - | |
| 869 | 498 | if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) { |
| 870 | - ++$count; | |
| 499 | + $count ++; | |
| 871 | 500 | } |
| 872 | 501 | |
| 873 | 502 | $form_type = FrmAppHelper::get_simple_request( |
| 874 | 503 | array( |
| @@ -880,9 +509,9 @@ | ||
| 880 | 509 | /* translators: %1$s: Number of forms */ |
| 881 | 510 | $available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count ); |
| 882 | 511 | |
| 883 | 512 | /* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */ |
| 884 | - $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 513 | + $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); | |
| 885 | 514 | |
| 886 | 515 | $message = $available_status[ $status ]['message']; |
| 887 | 516 | |
| 888 | 517 | self::display_forms_list( $params, $message ); |
| @@ -887,28 +516,18 @@ | ||
| 887 | 516 | |
| 888 | 517 | self::display_forms_list( $params, $message ); |
| 889 | 518 | } |
| 890 | 519 | |
| 891 | - /** | |
| 892 | - * @param array $ids | |
| 893 | - * | |
| 894 | - * @return string | |
| 895 | - */ | |
| 896 | 520 | public static function bulk_trash( $ids ) { |
| 897 | 521 | FrmAppHelper::permission_check( 'frm_delete_forms' ); |
| 898 | 522 | |
| 899 | 523 | $count = 0; |
| 900 | - | |
| 901 | 524 | foreach ( $ids as $id ) { |
| 902 | 525 | if ( FrmForm::trash( $id ) ) { |
| 903 | - ++$count; | |
| 526 | + $count ++; | |
| 904 | 527 | } |
| 905 | 528 | } |
| 906 | 529 | |
| 907 | - if ( ! $count ) { | |
| 908 | - return ''; | |
| 909 | - } | |
| 910 | - | |
| 911 | 530 | $current_page = FrmAppHelper::get_simple_request( |
| 912 | 531 | array( |
| 913 | 532 | 'param' => 'form_type', |
| 914 | 533 | 'type' => 'request', |
| @@ -913,16 +532,17 @@ | ||
| 913 | 532 | 'param' => 'form_type', |
| 914 | 533 | 'type' => 'request', |
| 915 | 534 | ) |
| 916 | 535 | ); |
| 917 | - | |
| 918 | - return sprintf( | |
| 536 | + $message = sprintf( | |
| 919 | 537 | /* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */ |
| 920 | 538 | _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), |
| 921 | 539 | $count, |
| 922 | - '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 540 | + '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', | |
| 923 | 541 | '</a>' |
| 924 | 542 | ); |
| 543 | + | |
| 544 | + return $message; | |
| 925 | 545 | } |
| 926 | 546 | |
| 927 | 547 | public static function destroy() { |
| 928 | 548 | FrmAppHelper::permission_check( 'frm_delete_forms' ); |
| @@ -932,11 +552,10 @@ | ||
| 932 | 552 | // Check nonce url. |
| 933 | 553 | check_admin_referer( 'destroy_form_' . $params['id'] ); |
| 934 | 554 | |
| 935 | 555 | $count = 0; |
| 936 | - | |
| 937 | 556 | if ( FrmForm::destroy( $params['id'] ) ) { |
| 938 | - ++$count; | |
| 557 | + $count ++; | |
| 939 | 558 | } |
| 940 | 559 | |
| 941 | 560 | /* translators: %1$s: Number of forms */ |
| 942 | 561 | $message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count ); |
| @@ -943,52 +562,40 @@ | ||
| 943 | 562 | |
| 944 | 563 | self::display_forms_list( $params, $message ); |
| 945 | 564 | } |
| 946 | 565 | |
| 947 | - /** | |
| 948 | - * @param array $ids | |
| 949 | - * | |
| 950 | - * @return string | |
| 951 | - */ | |
| 952 | 566 | public static function bulk_destroy( $ids ) { |
| 953 | 567 | FrmAppHelper::permission_check( 'frm_delete_forms' ); |
| 954 | 568 | |
| 955 | 569 | $count = 0; |
| 956 | - | |
| 957 | 570 | foreach ( $ids as $id ) { |
| 958 | 571 | $d = FrmForm::destroy( $id ); |
| 959 | - | |
| 960 | 572 | if ( $d ) { |
| 961 | - ++$count; | |
| 573 | + $count ++; | |
| 962 | 574 | } |
| 963 | 575 | } |
| 964 | 576 | |
| 965 | - if ( $count ) { | |
| 966 | - /* translators: %1$s: Number of forms */ | |
| 967 | - return sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count ); | |
| 968 | - } | |
| 577 | + /* translators: %1$s: Number of forms */ | |
| 578 | + $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count ); | |
| 969 | 579 | |
| 970 | - return ''; | |
| 580 | + return $message; | |
| 971 | 581 | } |
| 972 | 582 | |
| 973 | - /** | |
| 974 | - * @since 6.7.1 Function went from private to public. | |
| 975 | - */ | |
| 976 | - public static function delete_all() { | |
| 583 | + private static function delete_all() { | |
| 977 | 584 | // Check nonce url. |
| 978 | 585 | $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' ); |
| 979 | - | |
| 980 | 586 | if ( $permission_error !== false ) { |
| 981 | 587 | self::display_forms_list( array(), '', array( $permission_error ) ); |
| 588 | + | |
| 982 | 589 | return; |
| 983 | 590 | } |
| 984 | 591 | |
| 985 | - $count = FrmForm::scheduled_delete( time() ); | |
| 986 | - $url = remove_query_arg( array( 'delete_all' ) ); | |
| 987 | - $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count; | |
| 592 | + $count = FrmForm::scheduled_delete( time() ); | |
| 988 | 593 | |
| 989 | - wp_safe_redirect( $url ); | |
| 990 | - die(); | |
| 594 | + /* translators: %1$s: Number of forms */ | |
| 595 | + $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count ); | |
| 596 | + | |
| 597 | + self::display_forms_list( array(), $message ); | |
| 991 | 598 | } |
| 992 | 599 | |
| 993 | 600 | /** |
| 994 | 601 | * Create a new form from the modal. |
| @@ -995,8 +602,10 @@ | ||
| 995 | 602 | * |
| 996 | 603 | * @since 4.0 |
| 997 | 604 | */ |
| 998 | 605 | public static function build_new_form() { |
| 606 | + global $wpdb; | |
| 607 | + | |
| 999 | 608 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 1000 | 609 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1001 | 610 | |
| 1002 | 611 | $new_values = self::get_modal_values(); |
| @@ -1001,10 +610,9 @@ | ||
| 1001 | 610 | |
| 1002 | 611 | $new_values = self::get_modal_values(); |
| 1003 | 612 | $new_values['form_key'] = $new_values['name']; |
| 1004 | 613 | $new_values['options'] = array( |
| 1005 | - 'antispam' => 1, | |
| 1006 | - 'on_submit_migrated' => 1, | |
| 614 | + 'antispam' => 1, | |
| 1007 | 615 | ); |
| 1008 | 616 | |
| 1009 | 617 | /** |
| 1010 | 618 | * Allows changing form values before creating from the modal. |
| @@ -1022,14 +630,12 @@ | ||
| 1022 | 630 | * @param int $form_id |
| 1023 | 631 | */ |
| 1024 | 632 | do_action( 'frm_build_new_form', $form_id ); |
| 1025 | 633 | |
| 1026 | - self::create_submit_button_field( $form_id ); | |
| 1027 | - self::create_default_on_submit_action( $form_id ); | |
| 1028 | 634 | self::create_default_email_action( $form_id ); |
| 1029 | 635 | |
| 1030 | 636 | $response = array( |
| 1031 | - 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true', | |
| 637 | + 'redirect' => FrmForm::get_edit_link( $form_id ), | |
| 1032 | 638 | ); |
| 1033 | 639 | |
| 1034 | 640 | echo wp_json_encode( $response ); |
| 1035 | 641 | wp_die(); |
| @@ -1035,15 +641,46 @@ | ||
| 1035 | 641 | wp_die(); |
| 1036 | 642 | } |
| 1037 | 643 | |
| 1038 | 644 | /** |
| 645 | + * Create a custom template from a form | |
| 646 | + * | |
| 647 | + * @since 3.06 | |
| 648 | + */ | |
| 649 | + public static function build_template() { | |
| 650 | + global $wpdb; | |
| 651 | + | |
| 652 | + FrmAppHelper::permission_check( 'frm_edit_forms' ); | |
| 653 | + check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 654 | + | |
| 655 | + $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' ); | |
| 656 | + $new_form_id = FrmForm::duplicate( $form_id, 1, true ); | |
| 657 | + if ( ! $new_form_id ) { | |
| 658 | + $response = array( | |
| 659 | + 'message' => __( 'There was an error creating a template.', 'formidable' ), | |
| 660 | + ); | |
| 661 | + } else { | |
| 662 | + $new_values = self::get_modal_values(); | |
| 663 | + $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) ); | |
| 664 | + if ( $query_results ) { | |
| 665 | + FrmForm::clear_form_cache(); | |
| 666 | + } | |
| 667 | + | |
| 668 | + $response = array( | |
| 669 | + 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(), | |
| 670 | + ); | |
| 671 | + } | |
| 672 | + | |
| 673 | + echo wp_json_encode( $response ); | |
| 674 | + wp_die(); | |
| 675 | + } | |
| 676 | + | |
| 677 | + /** | |
| 1039 | 678 | * Before creating a new form, get the name and description from the modal. |
| 1040 | 679 | * |
| 1041 | 680 | * @since 4.0 |
| 1042 | - * | |
| 1043 | - * @return array<string,string> | |
| 1044 | 681 | */ |
| 1045 | - public static function get_modal_values() { | |
| 682 | + private static function get_modal_values() { | |
| 1046 | 683 | $name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' ); |
| 1047 | 684 | $desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' ); |
| 1048 | 685 | |
| 1049 | 686 | return array( |
| @@ -1056,27 +693,18 @@ | ||
| 1056 | 693 | * Inserts Formidable button |
| 1057 | 694 | * Hook exists since 2.5.0 |
| 1058 | 695 | * |
| 1059 | 696 | * @since 2.0.15 |
| 1060 | - * | |
| 1061 | - * @return void | |
| 1062 | 697 | */ |
| 1063 | 698 | public static function insert_form_button() { |
| 1064 | - if ( ! current_user_can( 'frm_view_forms' ) ) { | |
| 1065 | - return; | |
| 1066 | - } | |
| 1067 | - | |
| 1068 | - // Store the result in memory and re-use it when this function is called multiple times. | |
| 1069 | - // This helps speed up the form builder when there are a lot of HTML fields, where this | |
| 1070 | - // Button is inserted once per HTML field. | |
| 1071 | - // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally. | |
| 1072 | - if ( ! isset( self::$formidable_tinymce_button ) ) { | |
| 699 | + if ( current_user_can( 'frm_view_forms' ) ) { | |
| 1073 | 700 | FrmAppHelper::load_admin_wide_js(); |
| 1074 | - $menu_name = FrmAppHelper::get_menu_name(); | |
| 1075 | - $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() ); | |
| 1076 | - self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 701 | + $menu_name = FrmAppHelper::get_menu_name(); | |
| 702 | + $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() ); | |
| 703 | + echo '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . | |
| 704 | + FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 705 | + ' ' . esc_html( $menu_name ) . '</a>'; | |
| 1077 | 706 | } |
| 1078 | - echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1079 | 707 | } |
| 1080 | 708 | |
| 1081 | 709 | /** |
| 1082 | 710 | * @return void |
| @@ -1097,21 +725,17 @@ | ||
| 1097 | 725 | $shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes ); |
| 1098 | 726 | |
| 1099 | 727 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php'; |
| 1100 | 728 | |
| 1101 | - if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) { | |
| 1102 | - return; | |
| 729 | + if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) { | |
| 730 | + // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit | |
| 731 | + require ABSPATH . WPINC . '/class-wp-editor.php'; | |
| 732 | + ?> | |
| 733 | + <div class="frm_hidden"> | |
| 734 | + <?php wp_editor( '', 'frm_description_placeholder', array() ); ?> | |
| 735 | + </div> | |
| 736 | + <?php | |
| 1103 | 737 | } |
| 1104 | - | |
| 1105 | - // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit | |
| 1106 | - require ABSPATH . WPINC . '/class-wp-editor.php'; | |
| 1107 | - // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 1108 | - ?> | |
| 1109 | - <div class="frm_hidden"> | |
| 1110 | - <?php wp_editor( '', 'frm_description_placeholder', array() ); ?> | |
| 1111 | - </div> | |
| 1112 | - <?php | |
| 1113 | - // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 1114 | 738 | } |
| 1115 | 739 | |
| 1116 | 740 | /** |
| 1117 | 741 | * Check the page being loaded, determine if this is a page that should include the form popup. |
| @@ -1123,9 +747,8 @@ | ||
| 1123 | 747 | private static function should_insert_form_popup() { |
| 1124 | 748 | if ( FrmAppHelper::is_form_builder_page() ) { |
| 1125 | 749 | return true; |
| 1126 | 750 | } |
| 1127 | - | |
| 1128 | 751 | $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) ); |
| 1129 | 752 | return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true ); |
| 1130 | 753 | } |
| 1131 | 754 | |
| @@ -1133,10 +756,9 @@ | ||
| 1133 | 756 | FrmAppHelper::permission_check( 'frm_view_forms' ); |
| 1134 | 757 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1135 | 758 | |
| 1136 | 759 | $shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' ); |
| 1137 | - | |
| 1138 | - if ( ! $shortcode ) { | |
| 760 | + if ( empty( $shortcode ) ) { | |
| 1139 | 761 | wp_die(); |
| 1140 | 762 | } |
| 1141 | 763 | |
| 1142 | 764 | echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">'; |
| @@ -1161,18 +783,17 @@ | ||
| 1161 | 783 | 'label' => __( 'Minimize form HTML', 'formidable' ), |
| 1162 | 784 | ), |
| 1163 | 785 | ); |
| 1164 | 786 | } |
| 1165 | - | |
| 1166 | 787 | $opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode ); |
| 1167 | 788 | |
| 1168 | 789 | if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) { |
| 1169 | - // Allow other shortcodes to use the required form id option | |
| 790 | + // allow other shortcodes to use the required form id option | |
| 1170 | 791 | $form_id = $opts['form_id']; |
| 1171 | 792 | unset( $opts['form_id'] ); |
| 1172 | 793 | } |
| 1173 | 794 | |
| 1174 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php'; | |
| 795 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' ); | |
| 1175 | 796 | |
| 1176 | 797 | echo '</div>'; |
| 1177 | 798 | |
| 1178 | 799 | wp_die(); |
| @@ -1183,9 +804,8 @@ | ||
| 1183 | 804 | * |
| 1184 | 805 | * @param array $params |
| 1185 | 806 | * @param string $message |
| 1186 | 807 | * @param array $errors |
| 1187 | - * | |
| 1188 | 808 | * @return void |
| 1189 | 809 | */ |
| 1190 | 810 | public static function display_forms_list( $params = array(), $message = '', $errors = array() ) { |
| 1191 | 811 | FrmAppHelper::permission_check( 'frm_view_forms' ); |
| @@ -1202,45 +822,50 @@ | ||
| 1202 | 822 | * @param string $table_class Class name for List Helper. |
| 1203 | 823 | */ |
| 1204 | 824 | $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' ); |
| 1205 | 825 | $wp_list_table = new $table_class( compact( 'params' ) ); |
| 1206 | - $pagenum = $wp_list_table->get_pagenum(); | |
| 1207 | 826 | |
| 827 | + $pagenum = $wp_list_table->get_pagenum(); | |
| 828 | + | |
| 1208 | 829 | $wp_list_table->prepare_items(); |
| 1209 | 830 | |
| 1210 | 831 | $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' ); |
| 1211 | - | |
| 1212 | 832 | if ( $pagenum > $total_pages && $total_pages > 0 ) { |
| 1213 | - wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) ); | |
| 833 | + wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) ); | |
| 1214 | 834 | die(); |
| 1215 | 835 | } |
| 1216 | 836 | |
| 1217 | - $error = FrmInbox::check_for_error(); | |
| 1218 | - | |
| 1219 | - if ( $error ) { | |
| 1220 | - $show_messages = array( $error['subject'] . '. ' . $error['message'] ); | |
| 1221 | - } | |
| 1222 | - | |
| 1223 | 837 | require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php'; |
| 1224 | 838 | } |
| 1225 | 839 | |
| 1226 | 840 | /** |
| 1227 | 841 | * @param array<string,string> $columns |
| 1228 | - * | |
| 1229 | 842 | * @return array<string,string> |
| 1230 | 843 | */ |
| 1231 | 844 | public static function get_columns( $columns ) { |
| 1232 | - $columns['cb'] = '<input type="checkbox" />'; | |
| 1233 | - $columns['name'] = esc_html__( 'Form Title', 'formidable' ); | |
| 1234 | - $columns['entries'] = esc_html__( 'Entries', 'formidable' ); | |
| 1235 | - $columns['id'] = 'ID'; | |
| 1236 | - $columns['form_key'] = esc_html__( 'Key', 'formidable' ); | |
| 845 | + $columns['cb'] = '<input type="checkbox" />'; | |
| 846 | + $columns['id'] = 'ID'; | |
| 1237 | 847 | |
| 1238 | - if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) { | |
| 1239 | - $columns['shortcode'] = esc_html__( 'Actions', 'formidable' ); | |
| 848 | + $type = FrmAppHelper::get_simple_request( | |
| 849 | + array( | |
| 850 | + 'param' => 'form_type', | |
| 851 | + 'type' => 'request', | |
| 852 | + 'default' => 'published', | |
| 853 | + ) | |
| 854 | + ); | |
| 855 | + | |
| 856 | + if ( 'template' === $type ) { | |
| 857 | + $columns['name'] = __( 'Template Name', 'formidable' ); | |
| 858 | + $columns['type'] = __( 'Type', 'formidable' ); | |
| 859 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 860 | + } else { | |
| 861 | + $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 862 | + $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 863 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 864 | + $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 1240 | 865 | } |
| 1241 | 866 | |
| 1242 | - $columns['created_at'] = esc_html__( 'Date', 'formidable' ); | |
| 867 | + $columns['created_at'] = __( 'Date', 'formidable' ); | |
| 1243 | 868 | |
| 1244 | 869 | add_screen_option( |
| 1245 | 870 | 'per_page', |
| 1246 | 871 | array( |
| @@ -1252,11 +877,8 @@ | ||
| 1252 | 877 | |
| 1253 | 878 | return $columns; |
| 1254 | 879 | } |
| 1255 | 880 | |
| 1256 | - /** | |
| 1257 | - * @return array<string,string> | |
| 1258 | - */ | |
| 1259 | 881 | public static function get_sortable_columns() { |
| 1260 | 882 | return array( |
| 1261 | 883 | 'id' => 'id', |
| 1262 | 884 | 'name' => 'name', |
| @@ -1265,18 +887,9 @@ | ||
| 1265 | 887 | 'created_at' => 'created_at', |
| 1266 | 888 | ); |
| 1267 | 889 | } |
| 1268 | 890 | |
| 1269 | - /** | |
| 1270 | - * @param mixed $hidden_columns | |
| 1271 | - * | |
| 1272 | - * @return array | |
| 1273 | - */ | |
| 1274 | 891 | public static function hidden_columns( $hidden_columns ) { |
| 1275 | - if ( ! is_array( $hidden_columns ) ) { | |
| 1276 | - $hidden_columns = array(); | |
| 1277 | - } | |
| 1278 | - | |
| 1279 | 892 | $type = FrmAppHelper::get_simple_request( |
| 1280 | 893 | array( |
| 1281 | 894 | 'param' => 'form_type', |
| 1282 | 895 | 'type' => 'request', |
| @@ -1290,79 +903,167 @@ | ||
| 1290 | 903 | |
| 1291 | 904 | return $hidden_columns; |
| 1292 | 905 | } |
| 1293 | 906 | |
| 907 | + public static function save_per_page( $save, $option, $value ) { | |
| 908 | + if ( $option == 'formidable_page_formidable_per_page' ) { | |
| 909 | + $save = (int) $value; | |
| 910 | + } | |
| 911 | + | |
| 912 | + return $save; | |
| 913 | + } | |
| 914 | + | |
| 1294 | 915 | /** |
| 1295 | - * @param mixed $save | |
| 1296 | - * @param string $option | |
| 1297 | - * @param int|string $value | |
| 916 | + * @return bool | |
| 917 | + */ | |
| 918 | + public static function expired() { | |
| 919 | + global $frm_expired; | |
| 920 | + return $frm_expired; | |
| 921 | + } | |
| 922 | + | |
| 923 | + /** | |
| 924 | + * Get data from api before rendering it so that we can flag the modal as expired | |
| 1298 | 925 | * |
| 1299 | - * @return mixed | |
| 926 | + * @return void | |
| 1300 | 927 | */ |
| 1301 | - public static function save_per_page( $save, $option, $value ) { | |
| 1302 | - if ( $option === 'formidable_page_formidable_per_page' ) { | |
| 1303 | - return (int) $value; | |
| 928 | + public static function before_list_templates() { | |
| 929 | + global $frm_templates; | |
| 930 | + global $frm_expired; | |
| 931 | + global $frm_license_type; | |
| 932 | + | |
| 933 | + $api = new FrmFormTemplateApi(); | |
| 934 | + $frm_templates = $api->get_api_info(); | |
| 935 | + $expired = false; | |
| 936 | + $license_type = ''; | |
| 937 | + if ( isset( $frm_templates['error'] ) ) { | |
| 938 | + $error = $frm_templates['error']['message']; | |
| 939 | + $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error ); | |
| 940 | + $expired = 'expired' === $frm_templates['error']['code']; | |
| 941 | + $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : ''; | |
| 942 | + unset( $frm_templates['error'] ); | |
| 1304 | 943 | } |
| 1305 | 944 | |
| 1306 | - return $save; | |
| 945 | + $frm_expired = $expired; | |
| 946 | + $frm_license_type = $license_type; | |
| 1307 | 947 | } |
| 1308 | 948 | |
| 1309 | 949 | /** |
| 1310 | - * @param int|string $id | |
| 1311 | - * @param array $errors | |
| 1312 | - * @param string $message | |
| 1313 | - * @param bool $create_link | |
| 1314 | - * | |
| 1315 | 950 | * @return void |
| 1316 | 951 | */ |
| 1317 | - private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) { | |
| 1318 | - global $frm_vars; | |
| 952 | + public static function list_templates() { | |
| 953 | + global $frm_templates; | |
| 954 | + global $frm_license_type; | |
| 1319 | 955 | |
| 1320 | - $form = FrmForm::getOne( $id ); | |
| 1321 | - $error_args = array( | |
| 1322 | - 'title' => __( 'You can\'t edit the form', 'formidable' ), | |
| 1323 | - 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ), | |
| 1324 | - 'cancel_url' => admin_url( 'admin.php?page=formidable' ), | |
| 1325 | - 'continue_url' => add_query_arg( | |
| 1326 | - array( | |
| 1327 | - 'page' => 'formidable', | |
| 1328 | - ) | |
| 1329 | - ), | |
| 956 | + $templates = $frm_templates; | |
| 957 | + $custom_templates = array(); | |
| 958 | + $templates_by_category = array(); | |
| 959 | + | |
| 960 | + self::add_user_templates( $custom_templates ); | |
| 961 | + | |
| 962 | + foreach ( $templates as $template ) { | |
| 963 | + if ( ! isset( $template['categories'] ) ) { | |
| 964 | + continue; | |
| 965 | + } | |
| 966 | + | |
| 967 | + foreach ( $template['categories'] as $category ) { | |
| 968 | + if ( ! isset( $templates_by_category[ $category ] ) ) { | |
| 969 | + $templates_by_category[ $category ] = array(); | |
| 970 | + } | |
| 971 | + | |
| 972 | + $templates_by_category[ $category ][] = $template; | |
| 973 | + } | |
| 974 | + } | |
| 975 | + unset( $template ); | |
| 976 | + | |
| 977 | + // Subcategories that are included elsewhere. | |
| 978 | + $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' ); | |
| 979 | + | |
| 980 | + $categories = array_keys( $templates_by_category ); | |
| 981 | + $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() ); | |
| 982 | + $categories = array_diff( $categories, $redundant_cats ); | |
| 983 | + sort( $categories ); | |
| 984 | + | |
| 985 | + array_walk( | |
| 986 | + $custom_templates, | |
| 987 | + function( &$template ) { | |
| 988 | + $template['custom'] = true; | |
| 989 | + } | |
| 1330 | 990 | ); |
| 1331 | 991 | |
| 1332 | - if ( ! $form ) { | |
| 1333 | - FrmAppController::show_error_modal( $error_args ); | |
| 1334 | - return; | |
| 992 | + $my_templates_translation = __( 'My Templates', 'formidable' ); | |
| 993 | + $categories = array_merge( array( $my_templates_translation ), $categories ); | |
| 994 | + $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' ); | |
| 995 | + $license_type = $frm_license_type; | |
| 996 | + $args = compact( 'pricing', 'license_type' ); | |
| 997 | + $where = apply_filters( 'frm_forms_dropdown', array(), '' ); | |
| 998 | + $forms = FrmForm::get_published_forms( $where ); | |
| 999 | + $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/'; | |
| 1000 | + | |
| 1001 | + $templates_by_category[ $my_templates_translation ] = $custom_templates; | |
| 1002 | + | |
| 1003 | + unset( $pricing, $license_type, $where ); | |
| 1004 | + wp_enqueue_script( 'accordion' ); // register accordion for template groups | |
| 1005 | + require $view_path . 'list-templates.php'; | |
| 1006 | + } | |
| 1007 | + | |
| 1008 | + /** | |
| 1009 | + * @since 4.03.01 | |
| 1010 | + */ | |
| 1011 | + private static function get_template_categories( $templates ) { | |
| 1012 | + $categories = array(); | |
| 1013 | + foreach ( $templates as $template ) { | |
| 1014 | + if ( isset( $template['categories'] ) ) { | |
| 1015 | + $categories = array_merge( $categories, $template['categories'] ); | |
| 1016 | + } | |
| 1335 | 1017 | } |
| 1018 | + $exclude_cats = FrmFormsHelper::ignore_template_categories(); | |
| 1019 | + $categories = array_unique( $categories ); | |
| 1020 | + $categories = array_diff( $categories, $exclude_cats ); | |
| 1021 | + sort( $categories ); | |
| 1022 | + return $categories; | |
| 1023 | + } | |
| 1336 | 1024 | |
| 1337 | - if ( 'trash' === $form->status ) { | |
| 1338 | - $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' ); | |
| 1339 | - $error_args['continue_url'] = add_query_arg( | |
| 1340 | - array( | |
| 1341 | - 'page' => 'formidable', | |
| 1342 | - '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ), | |
| 1343 | - 'form_type' => 'trash', | |
| 1344 | - 'frm_action' => 'untrash', | |
| 1345 | - 'id' => $id, | |
| 1346 | - ) | |
| 1025 | + private static function add_user_templates( &$templates ) { | |
| 1026 | + $user_templates = array( | |
| 1027 | + 'is_template' => 1, | |
| 1028 | + 'default_template' => 0, | |
| 1029 | + ); | |
| 1030 | + $user_templates = FrmForm::getAll( $user_templates, 'name' ); | |
| 1031 | + foreach ( $user_templates as $template ) { | |
| 1032 | + $template = array( | |
| 1033 | + 'id' => $template->id, | |
| 1034 | + 'name' => $template->name, | |
| 1035 | + 'key' => $template->form_key, | |
| 1036 | + 'description' => $template->description, | |
| 1037 | + 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ), | |
| 1038 | + 'released' => $template->created_at, | |
| 1039 | + 'installed' => 1, | |
| 1347 | 1040 | ); |
| 1348 | - $error_args['continue_text'] = __( 'Restore form', 'formidable' ); | |
| 1349 | - FrmAppController::show_error_modal( $error_args ); | |
| 1350 | - return; | |
| 1041 | + array_unshift( $templates, $template ); | |
| 1042 | + unset( $template ); | |
| 1351 | 1043 | } |
| 1044 | + } | |
| 1352 | 1045 | |
| 1046 | + private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) { | |
| 1047 | + global $frm_vars; | |
| 1048 | + | |
| 1049 | + $form = FrmForm::getOne( $id ); | |
| 1050 | + if ( ! $form ) { | |
| 1051 | + wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) ); | |
| 1052 | + } | |
| 1053 | + | |
| 1353 | 1054 | if ( $form->parent_form_id ) { |
| 1354 | 1055 | /* translators: %1$s: Start link HTML, %2$s: End link HTML */ |
| 1355 | - wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 1056 | + wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) ); | |
| 1356 | 1057 | } |
| 1357 | 1058 | |
| 1358 | 1059 | $frm_field_selection = FrmField::field_selection(); |
| 1359 | - $fields = FrmField::get_all_for_form( $form->id ); | |
| 1360 | 1060 | |
| 1061 | + $fields = FrmField::get_all_for_form( $form->id ); | |
| 1062 | + | |
| 1361 | 1063 | // Automatically add end section fields if they don't exist (2.0 migration). |
| 1362 | 1064 | $reset_fields = false; |
| 1363 | 1065 | FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields ); |
| 1364 | - FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields ); | |
| 1365 | 1066 | |
| 1366 | 1067 | if ( $reset_fields ) { |
| 1367 | 1068 | $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' ); |
| 1368 | 1069 | } |
| @@ -1382,30 +1083,25 @@ | ||
| 1382 | 1083 | */ |
| 1383 | 1084 | $values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) ); |
| 1384 | 1085 | |
| 1385 | 1086 | $edit_message = __( 'Form was successfully updated.', 'formidable' ); |
| 1386 | - | |
| 1387 | - if ( $form->is_template && $message === $edit_message ) { | |
| 1087 | + if ( $form->is_template && $message == $edit_message ) { | |
| 1388 | 1088 | $message = __( 'Template was successfully updated.', 'formidable' ); |
| 1389 | 1089 | } |
| 1390 | 1090 | |
| 1391 | 1091 | self::maybe_update_form_builder_message( $message ); |
| 1392 | 1092 | |
| 1393 | - $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] ); | |
| 1093 | + $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' ); | |
| 1094 | + $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] ); | |
| 1394 | 1095 | |
| 1395 | 1096 | if ( defined( 'DOING_AJAX' ) ) { |
| 1396 | 1097 | wp_die(); |
| 1098 | + } else { | |
| 1099 | + require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' ); | |
| 1397 | 1100 | } |
| 1398 | - | |
| 1399 | - require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php'; | |
| 1400 | 1101 | } |
| 1401 | 1102 | |
| 1402 | - /** | |
| 1403 | - * @param array $fields | |
| 1404 | - * | |
| 1405 | - * @return array | |
| 1406 | - */ | |
| 1407 | - public static function update_form_builder_fields( $fields ) { | |
| 1103 | + public static function update_form_builder_fields( $fields, $form ) { | |
| 1408 | 1104 | foreach ( $fields as $field ) { |
| 1409 | 1105 | $field->do_not_include_icons = true; |
| 1410 | 1106 | } |
| 1411 | 1107 | return $fields; |
| @@ -1410,13 +1106,8 @@ | ||
| 1410 | 1106 | } |
| 1411 | 1107 | return $fields; |
| 1412 | 1108 | } |
| 1413 | 1109 | |
| 1414 | - /** | |
| 1415 | - * @param string $message | |
| 1416 | - * | |
| 1417 | - * @return void | |
| 1418 | - */ | |
| 1419 | 1110 | public static function maybe_update_form_builder_message( &$message ) { |
| 1420 | 1111 | if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) { |
| 1421 | 1112 | $message = __( 'Form was Successfully Copied', 'formidable' ); |
| 1422 | 1113 | } |
| @@ -1421,22 +1112,13 @@ | ||
| 1421 | 1112 | $message = __( 'Form was Successfully Copied', 'formidable' ); |
| 1422 | 1113 | } |
| 1423 | 1114 | } |
| 1424 | 1115 | |
| 1425 | - /** | |
| 1426 | - * @param int|string $id | |
| 1427 | - * @param array $errors | |
| 1428 | - * @param array|string $args | |
| 1429 | - * | |
| 1430 | - * @return void | |
| 1431 | - */ | |
| 1432 | 1116 | public static function get_settings_vars( $id, $errors = array(), $args = array() ) { |
| 1433 | 1117 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 1434 | 1118 | |
| 1435 | 1119 | global $frm_vars; |
| 1436 | 1120 | |
| 1437 | - self::maybe_print_media_templates(); | |
| 1438 | - | |
| 1439 | 1121 | if ( ! is_array( $args ) ) { |
| 1440 | 1122 | // For reverse compatibility. |
| 1441 | 1123 | $args = array( |
| 1442 | 1124 | 'message' => $args, |
| @@ -1449,12 +1131,13 @@ | ||
| 1449 | 1131 | ); |
| 1450 | 1132 | $args = array_merge( $defaults, $args ); |
| 1451 | 1133 | $message = $args['message']; |
| 1452 | 1134 | $warnings = $args['warnings']; |
| 1453 | - $form = FrmForm::getOne( $id ); | |
| 1454 | - $fields = FrmField::get_all_for_form( $id ); | |
| 1455 | - $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true ); | |
| 1456 | 1135 | |
| 1136 | + $form = FrmForm::getOne( $id ); | |
| 1137 | + $fields = FrmField::get_all_for_form( $id ); | |
| 1138 | + $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true ); | |
| 1139 | + | |
| 1457 | 1140 | /** |
| 1458 | 1141 | * Allows changing fields in the form settings. |
| 1459 | 1142 | * |
| 1460 | 1143 | * @since 5.0.04 |
| @@ -1468,42 +1151,17 @@ | ||
| 1468 | 1151 | |
| 1469 | 1152 | $sections = self::get_settings_tabs( $values ); |
| 1470 | 1153 | $current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' ); |
| 1471 | 1154 | |
| 1472 | - require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php'; | |
| 1155 | + require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' ); | |
| 1473 | 1156 | } |
| 1474 | 1157 | |
| 1475 | 1158 | /** |
| 1476 | - * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked. | |
| 1477 | - * | |
| 1478 | - * @since 6.10 | |
| 1479 | - * | |
| 1480 | - * @return void | |
| 1481 | - */ | |
| 1482 | - private static function maybe_print_media_templates() { | |
| 1483 | - if ( FrmAppHelper::pro_is_included() ) { | |
| 1484 | - // This issue does not exist when Pro is active so exit early. | |
| 1485 | - return; | |
| 1486 | - } | |
| 1487 | - | |
| 1488 | - add_action( | |
| 1489 | - 'wp_enqueue_editor', | |
| 1490 | - function () { | |
| 1491 | - wp_print_media_templates(); | |
| 1492 | - } | |
| 1493 | - ); | |
| 1494 | - } | |
| 1495 | - | |
| 1496 | - /** | |
| 1497 | 1159 | * @since 4.0 |
| 1498 | - * | |
| 1499 | - * @param array $atts | |
| 1500 | - * | |
| 1501 | - * @return void | |
| 1502 | 1160 | */ |
| 1503 | 1161 | public static function form_publish_button( $atts ) { |
| 1504 | 1162 | $values = $atts['values']; |
| 1505 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php'; | |
| 1163 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' ); | |
| 1506 | 1164 | } |
| 1507 | 1165 | |
| 1508 | 1166 | /** |
| 1509 | 1167 | * Get a list of all the settings tabs for the form settings page. |
| @@ -1510,9 +1168,8 @@ | ||
| 1510 | 1168 | * |
| 1511 | 1169 | * @since 4.0 |
| 1512 | 1170 | * |
| 1513 | 1171 | * @param array $values |
| 1514 | - * | |
| 1515 | 1172 | * @return array |
| 1516 | 1173 | */ |
| 1517 | 1174 | private static function get_settings_tabs( $values ) { |
| 1518 | 1175 | $sections = array( |
| @@ -1518,20 +1175,20 @@ | ||
| 1518 | 1175 | $sections = array( |
| 1519 | 1176 | 'advanced' => array( |
| 1520 | 1177 | 'name' => __( 'General', 'formidable' ), |
| 1521 | 1178 | 'title' => __( 'General Form Settings', 'formidable' ), |
| 1522 | - 'function' => array( self::class, 'advanced_settings' ), | |
| 1523 | - 'icon' => 'frmfont frm_settings_icon', | |
| 1179 | + 'function' => array( __CLASS__, 'advanced_settings' ), | |
| 1180 | + 'icon' => 'frm_icon_font frm_settings_icon', | |
| 1524 | 1181 | ), |
| 1525 | 1182 | 'email' => array( |
| 1526 | 1183 | 'name' => __( 'Actions & Notifications', 'formidable' ), |
| 1527 | 1184 | 'function' => array( 'FrmFormActionsController', 'email_settings' ), |
| 1528 | 1185 | 'id' => 'frm_notification_settings', |
| 1529 | - 'icon' => 'frmfont frm_mail_bulk_icon', | |
| 1186 | + 'icon' => 'frm_icon_font frm_mail_bulk_icon', | |
| 1530 | 1187 | ), |
| 1531 | 1188 | 'permissions' => array( |
| 1532 | 1189 | 'name' => __( 'Form Permissions', 'formidable' ), |
| 1533 | - 'icon' => 'frmfont frm_lock_closed_icon', | |
| 1190 | + 'icon' => 'frm_icon_font frm_lock_icon', | |
| 1534 | 1191 | 'html_class' => 'frm_show_upgrade_tab frm_noallow', |
| 1535 | 1192 | 'data' => array( |
| 1536 | 1193 | 'medium' => 'permissions', |
| 1537 | 1194 | 'upgrade' => __( 'Form Permissions', 'formidable' ), |
| @@ -1536,37 +1193,35 @@ | ||
| 1536 | 1193 | 'medium' => 'permissions', |
| 1537 | 1194 | 'upgrade' => __( 'Form Permissions', 'formidable' ), |
| 1538 | 1195 | 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ), |
| 1539 | 1196 | 'screenshot' => 'permissions.png', |
| 1540 | - 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ), | |
| 1541 | 1197 | ), |
| 1542 | 1198 | ), |
| 1543 | - 'scheduling' => array( | |
| 1199 | + 'scheduling' => array( | |
| 1544 | 1200 | 'name' => __( 'Form Scheduling', 'formidable' ), |
| 1545 | - 'icon' => 'frmfont frm_calendar_icon', | |
| 1201 | + 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 1546 | 1202 | 'html_class' => 'frm_show_upgrade_tab frm_noallow', |
| 1547 | 1203 | 'data' => array( |
| 1548 | 1204 | 'medium' => 'scheduling', |
| 1549 | 1205 | 'upgrade' => __( 'Form scheduling settings', 'formidable' ), |
| 1550 | 1206 | 'screenshot' => 'scheduling.png', |
| 1551 | - 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ), | |
| 1552 | 1207 | ), |
| 1553 | 1208 | ), |
| 1554 | 1209 | 'buttons' => array( |
| 1555 | - 'name' => __( 'Buttons', 'formidable' ), | |
| 1556 | - 'class' => self::class, | |
| 1210 | + 'name' => __( 'Styling & Buttons', 'formidable' ), | |
| 1211 | + 'class' => __CLASS__, | |
| 1557 | 1212 | 'function' => 'buttons_settings', |
| 1558 | - 'icon' => 'frmfont frm_button_icon', | |
| 1213 | + 'icon' => 'frm_icon_font frm_pallet_icon', | |
| 1559 | 1214 | ), |
| 1560 | 1215 | 'landing' => array( |
| 1561 | 1216 | 'name' => __( 'Form Landing Page', 'formidable' ), |
| 1562 | - 'icon' => 'frmfont frm_file_text_icon', | |
| 1217 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 1563 | 1218 | 'html_class' => 'frm_show_upgrade_tab frm_noallow', |
| 1564 | 1219 | 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(), |
| 1565 | 1220 | ), |
| 1566 | 1221 | 'chat' => array( |
| 1567 | 1222 | 'name' => __( 'Conversational Forms', 'formidable' ), |
| 1568 | - 'icon' => 'frmfont frm_chat_forms_icon', | |
| 1223 | + 'icon' => 'frm_icon_font frm_chat_forms_icon', | |
| 1569 | 1224 | 'html_class' => 'frm_show_upgrade_tab frm_noallow', |
| 1570 | 1225 | 'data' => FrmAppHelper::get_upgrade_data_params( |
| 1571 | 1226 | 'chat', |
| 1572 | 1227 | array( |
| @@ -1572,45 +1227,37 @@ | ||
| 1572 | 1227 | array( |
| 1573 | 1228 | 'upgrade' => __( 'Conversational Forms', 'formidable' ), |
| 1574 | 1229 | 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ), |
| 1575 | 1230 | 'screenshot' => 'chat.png', |
| 1576 | - 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ), | |
| 1577 | 1231 | ) |
| 1578 | 1232 | ), |
| 1579 | 1233 | ), |
| 1580 | - 'abandonment' => array( | |
| 1581 | - 'name' => __( 'Form Abandonment', 'formidable' ), | |
| 1582 | - 'icon' => 'frmfont frm_abandoned_icon', | |
| 1583 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1584 | - 'data' => FrmAppHelper::get_upgrade_data_params( | |
| 1585 | - 'abandonment', | |
| 1586 | - array( | |
| 1587 | - 'upgrade' => __( 'Form abandonment settings', 'formidable' ), | |
| 1588 | - 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ), | |
| 1589 | - 'screenshot' => 'abandonment.png', | |
| 1590 | - 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ), | |
| 1591 | - ) | |
| 1592 | - ), | |
| 1593 | - ), | |
| 1594 | 1234 | 'html' => array( |
| 1595 | 1235 | 'name' => __( 'Customize HTML', 'formidable' ), |
| 1596 | - 'class' => self::class, | |
| 1236 | + 'class' => __CLASS__, | |
| 1597 | 1237 | 'function' => 'html_settings', |
| 1598 | - 'icon' => 'frmfont frm_code_icon', | |
| 1238 | + 'icon' => 'frm_icon_font frm_code_icon', | |
| 1599 | 1239 | ), |
| 1600 | 1240 | ); |
| 1601 | 1241 | |
| 1602 | - if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) { | |
| 1603 | - unset( $sections['buttons'] ); | |
| 1242 | + foreach ( array( 'landing', 'chat' ) as $feature ) { | |
| 1243 | + if ( ! FrmAppHelper::show_new_feature( $feature ) ) { | |
| 1244 | + unset( $sections[ $feature ] ); | |
| 1245 | + } | |
| 1604 | 1246 | } |
| 1605 | 1247 | |
| 1606 | 1248 | $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values ); |
| 1607 | 1249 | |
| 1250 | + if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) { | |
| 1251 | + // Prevent settings from showing in 2 spots. | |
| 1252 | + unset( $sections['permissions'], $sections['scheduling'] ); | |
| 1253 | + } | |
| 1254 | + | |
| 1608 | 1255 | foreach ( $sections as $key => $section ) { |
| 1609 | 1256 | $defaults = array( |
| 1610 | 1257 | 'html_class' => '', |
| 1611 | 1258 | 'name' => ucfirst( $key ), |
| 1612 | - 'icon' => 'frmfont frm_settings_icon', | |
| 1259 | + 'icon' => 'frm_icon_font frm_settings_icon', | |
| 1613 | 1260 | ); |
| 1614 | 1261 | |
| 1615 | 1262 | $section = array_merge( $defaults, $section ); |
| 1616 | 1263 | |
| @@ -1616,9 +1263,8 @@ | ||
| 1616 | 1263 | |
| 1617 | 1264 | if ( ! isset( $section['anchor'] ) ) { |
| 1618 | 1265 | $section['anchor'] = $key; |
| 1619 | 1266 | } |
| 1620 | - | |
| 1621 | 1267 | $section['anchor'] .= '_settings'; |
| 1622 | 1268 | |
| 1623 | 1269 | if ( ! isset( $section['title'] ) ) { |
| 1624 | 1270 | $section['title'] = $section['name']; |
| @@ -1628,9 +1274,9 @@ | ||
| 1628 | 1274 | $section['id'] = $section['anchor']; |
| 1629 | 1275 | } |
| 1630 | 1276 | |
| 1631 | 1277 | $sections[ $key ] = $section; |
| 1632 | - }//end foreach | |
| 1278 | + } | |
| 1633 | 1279 | |
| 1634 | 1280 | return $sections; |
| 1635 | 1281 | } |
| 1636 | 1282 | |
| @@ -1637,26 +1283,23 @@ | ||
| 1637 | 1283 | /** |
| 1638 | 1284 | * @since 4.0 |
| 1639 | 1285 | * |
| 1640 | 1286 | * @param array $values |
| 1641 | - * | |
| 1642 | - * @return void | |
| 1643 | 1287 | */ |
| 1644 | 1288 | public static function advanced_settings( $values ) { |
| 1645 | 1289 | $first_h3 = 'frm_first_h3'; |
| 1290 | + | |
| 1646 | 1291 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php'; |
| 1647 | 1292 | } |
| 1648 | 1293 | |
| 1649 | 1294 | /** |
| 1650 | 1295 | * @param array $values |
| 1651 | - * | |
| 1652 | - * @return void | |
| 1653 | 1296 | */ |
| 1654 | - public static function render_spam_settings( $values ) { | |
| 1297 | + private static function render_spam_settings( $values ) { | |
| 1655 | 1298 | if ( function_exists( 'akismet_http_post' ) ) { |
| 1656 | 1299 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php'; |
| 1657 | 1300 | } |
| 1658 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php'; | |
| 1301 | + include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php'; | |
| 1659 | 1302 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php'; |
| 1660 | 1303 | } |
| 1661 | 1304 | |
| 1662 | 1305 | /** |
| @@ -1662,13 +1305,16 @@ | ||
| 1662 | 1305 | /** |
| 1663 | 1306 | * @since 4.0 |
| 1664 | 1307 | * |
| 1665 | 1308 | * @param array $values |
| 1666 | - * | |
| 1667 | - * @return void | |
| 1668 | 1309 | */ |
| 1669 | 1310 | public static function buttons_settings( $values ) { |
| 1670 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php'; | |
| 1311 | + $styles = apply_filters( 'frm_get_style_opts', array() ); | |
| 1312 | + | |
| 1313 | + $frm_settings = FrmAppHelper::get_settings(); | |
| 1314 | + $no_global_style = $frm_settings->load_style === 'none'; | |
| 1315 | + | |
| 1316 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' ); | |
| 1671 | 1317 | } |
| 1672 | 1318 | |
| 1673 | 1319 | /** |
| 1674 | 1320 | * @since 4.0 |
| @@ -1673,13 +1319,11 @@ | ||
| 1673 | 1319 | /** |
| 1674 | 1320 | * @since 4.0 |
| 1675 | 1321 | * |
| 1676 | 1322 | * @param array $values |
| 1677 | - * | |
| 1678 | - * @return void | |
| 1679 | 1323 | */ |
| 1680 | 1324 | public static function html_settings( $values ) { |
| 1681 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php'; | |
| 1325 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' ); | |
| 1682 | 1326 | } |
| 1683 | 1327 | |
| 1684 | 1328 | /** |
| 1685 | 1329 | * Replace old Submit Button href with new href to avoid errors in Chrome |
| @@ -1685,11 +1329,9 @@ | ||
| 1685 | 1329 | * Replace old Submit Button href with new href to avoid errors in Chrome |
| 1686 | 1330 | * |
| 1687 | 1331 | * @since 2.03.08 |
| 1688 | 1332 | * |
| 1689 | - * @param array|bool $values | |
| 1690 | - * | |
| 1691 | - * @return void | |
| 1333 | + * @param array|boolean $values | |
| 1692 | 1334 | */ |
| 1693 | 1335 | private static function clean_submit_html( &$values ) { |
| 1694 | 1336 | if ( is_array( $values ) && isset( $values['submit_html'] ) ) { |
| 1695 | 1337 | $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] ); |
| @@ -1695,33 +1337,9 @@ | ||
| 1695 | 1337 | $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] ); |
| 1696 | 1338 | } |
| 1697 | 1339 | } |
| 1698 | 1340 | |
| 1699 | - /** | |
| 1700 | - * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme. | |
| 1701 | - * | |
| 1702 | - * @param array $classes | |
| 1703 | - * | |
| 1704 | - * @return array | |
| 1705 | - */ | |
| 1706 | - public static function update_button_classes( $classes ) { | |
| 1707 | - if ( function_exists( 'twenty_twenty_one_setup' ) ) { | |
| 1708 | - $classes[] = 'has-text-color has-background'; | |
| 1709 | - } | |
| 1710 | - | |
| 1711 | - return $classes; | |
| 1712 | - } | |
| 1713 | - | |
| 1714 | - /** | |
| 1715 | - * @since 6.27 Added $template_path parameter. | |
| 1716 | - * | |
| 1717 | - * @param int|string $form_id | |
| 1718 | - * @param string $class | |
| 1719 | - * @param string $template_path The path to a template file to use instead of the default. | |
| 1720 | - * | |
| 1721 | - * @return void | |
| 1722 | - */ | |
| 1723 | - public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) { | |
| 1341 | + public static function mb_tags_box( $form_id, $class = '' ) { | |
| 1724 | 1342 | $fields = FrmField::get_all_for_form( $form_id, '', 'include' ); |
| 1725 | 1343 | |
| 1726 | 1344 | /** |
| 1727 | 1345 | * Allows modifying the list of fields in the tags box. |
| @@ -1730,30 +1348,23 @@ | ||
| 1730 | 1348 | * |
| 1731 | 1349 | * @param array $fields The list of fields. |
| 1732 | 1350 | * @param array $args The arguments. Contains `form_id`. |
| 1733 | 1351 | */ |
| 1734 | - $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) ); | |
| 1735 | - $linked_forms = array(); | |
| 1736 | - $col = 'one'; | |
| 1737 | - $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ); | |
| 1352 | + $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) ); | |
| 1353 | + $linked_forms = array(); | |
| 1354 | + $col = 'one'; | |
| 1355 | + $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false; | |
| 1356 | + | |
| 1738 | 1357 | $cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() ); |
| 1739 | 1358 | $entry_shortcodes = self::get_shortcode_helpers( $settings_tab ); |
| 1359 | + | |
| 1740 | 1360 | $advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) ); |
| 1741 | 1361 | |
| 1742 | - if ( 'default' === $template_path || ! file_exists( $template_path ) ) { | |
| 1743 | - include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php'; | |
| 1744 | - return; | |
| 1745 | - } | |
| 1746 | - | |
| 1747 | - include $template_path; | |
| 1362 | + include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' ); | |
| 1748 | 1363 | } |
| 1749 | 1364 | |
| 1750 | 1365 | /** |
| 1751 | 1366 | * @since 3.04.01 |
| 1752 | - * | |
| 1753 | - * @param array $atts | |
| 1754 | - * | |
| 1755 | - * @return array | |
| 1756 | 1367 | */ |
| 1757 | 1368 | private static function advanced_helpers( $atts ) { |
| 1758 | 1369 | $advanced_helpers = array( |
| 1759 | 1370 | 'default' => array( |
| @@ -1762,12 +1373,10 @@ | ||
| 1762 | 1373 | ), |
| 1763 | 1374 | ); |
| 1764 | 1375 | |
| 1765 | 1376 | $user_fields = self::user_shortcodes(); |
| 1766 | - | |
| 1767 | - if ( $user_fields ) { | |
| 1377 | + if ( ! empty( $user_fields ) ) { | |
| 1768 | 1378 | $user_helpers = array(); |
| 1769 | - | |
| 1770 | 1379 | foreach ( $user_fields as $uk => $uf ) { |
| 1771 | 1380 | $user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf; |
| 1772 | 1381 | unset( $uk, $uf ); |
| 1773 | 1382 | } |
| @@ -1772,9 +1381,9 @@ | ||
| 1772 | 1381 | unset( $uk, $uf ); |
| 1773 | 1382 | } |
| 1774 | 1383 | |
| 1775 | 1384 | $advanced_helpers['user_id'] = array( |
| 1776 | - 'codes' => $user_helpers, | |
| 1385 | + 'codes' => $user_helpers, | |
| 1777 | 1386 | ); |
| 1778 | 1387 | } |
| 1779 | 1388 | |
| 1780 | 1389 | /** |
| @@ -1792,10 +1401,8 @@ | ||
| 1792 | 1401 | * Get an array of the options to display in the advanced tab |
| 1793 | 1402 | * of the customization panel |
| 1794 | 1403 | * |
| 1795 | 1404 | * @since 2.0.6 |
| 1796 | - * | |
| 1797 | - * @return array | |
| 1798 | 1405 | */ |
| 1799 | 1406 | private static function get_advanced_shortcodes() { |
| 1800 | 1407 | $adv_shortcodes = array( |
| 1801 | 1408 | 'x sep=", "' => array( |
| @@ -1812,18 +1419,17 @@ | ||
| 1812 | 1419 | 'label' => __( 'No Auto P', 'formidable' ), |
| 1813 | 1420 | 'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ), |
| 1814 | 1421 | ), |
| 1815 | 1422 | ); |
| 1423 | + $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes ); | |
| 1816 | 1424 | |
| 1817 | 1425 | // __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1 |
| 1818 | 1426 | |
| 1819 | - return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes ); | |
| 1427 | + return $adv_shortcodes; | |
| 1820 | 1428 | } |
| 1821 | 1429 | |
| 1822 | 1430 | /** |
| 1823 | 1431 | * @since 3.04.01 |
| 1824 | - * | |
| 1825 | - * @return array | |
| 1826 | 1432 | */ |
| 1827 | 1433 | private static function user_shortcodes() { |
| 1828 | 1434 | $options = array( |
| 1829 | 1435 | 'ID' => __( 'User ID', 'formidable' ), |
| @@ -1842,12 +1448,8 @@ | ||
| 1842 | 1448 | /** |
| 1843 | 1449 | * Get an array of the helper shortcodes to display in the customization panel |
| 1844 | 1450 | * |
| 1845 | 1451 | * @since 2.0.6 |
| 1846 | - * | |
| 1847 | - * @param bool $settings_tab | |
| 1848 | - * | |
| 1849 | - * @return array | |
| 1850 | 1452 | */ |
| 1851 | 1453 | private static function get_shortcode_helpers( $settings_tab ) { |
| 1852 | 1454 | $entry_shortcodes = array( |
| 1853 | 1455 | 'id' => __( 'Entry ID', 'formidable' ), |
| @@ -1858,35 +1460,34 @@ | ||
| 1858 | 1460 | 'updated-at' => __( 'Entry updated', 'formidable' ), |
| 1859 | 1461 | '' => '', |
| 1860 | 1462 | 'siteurl' => __( 'Site URL', 'formidable' ), |
| 1861 | 1463 | 'sitename' => __( 'Site Name', 'formidable' ), |
| 1862 | - 'form_name' => __( 'Form Name', 'formidable' ), | |
| 1863 | 1464 | ); |
| 1864 | 1465 | |
| 1865 | - $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes ); | |
| 1866 | - | |
| 1867 | 1466 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 1868 | 1467 | unset( $entry_shortcodes['post_id'] ); |
| 1869 | 1468 | } |
| 1870 | 1469 | |
| 1470 | + if ( $settings_tab ) { | |
| 1471 | + $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' ); | |
| 1472 | + $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' ); | |
| 1473 | + $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' ); | |
| 1474 | + $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' ); | |
| 1475 | + } | |
| 1476 | + | |
| 1871 | 1477 | /** |
| 1872 | 1478 | * Use this hook to add or remove buttons in the helpers section |
| 1873 | 1479 | * in the customization panel |
| 1874 | 1480 | * |
| 1875 | 1481 | * @since 2.0.6 |
| 1876 | - * | |
| 1877 | - * @param array $entry_shortcodes | |
| 1878 | - * @param bool $settings_tab | |
| 1879 | 1482 | */ |
| 1880 | - return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab ); | |
| 1483 | + $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab ); | |
| 1484 | + | |
| 1485 | + return $entry_shortcodes; | |
| 1881 | 1486 | } |
| 1882 | 1487 | |
| 1883 | 1488 | /** |
| 1884 | - * Insert the form class setting into the form. | |
| 1885 | - * | |
| 1886 | - * @param stdClass $form | |
| 1887 | - * | |
| 1888 | - * @return void | |
| 1489 | + * Insert the form class setting into the form | |
| 1889 | 1490 | */ |
| 1890 | 1491 | public static function form_classes( $form ) { |
| 1891 | 1492 | if ( isset( $form->options['form_class'] ) ) { |
| 1892 | 1493 | echo esc_attr( sanitize_text_field( $form->options['form_class'] ) ); |
| @@ -1895,12 +1496,8 @@ | ||
| 1895 | 1496 | if ( ! empty( $form->options['js_validate'] ) ) { |
| 1896 | 1497 | echo ' frm_js_validate '; |
| 1897 | 1498 | self::add_js_validate_form_to_global_vars( $form ); |
| 1898 | 1499 | } |
| 1899 | - | |
| 1900 | - if ( FrmForm::is_ajax_on( $form ) ) { | |
| 1901 | - echo ' frm_ajax_submit '; | |
| 1902 | - } | |
| 1903 | 1500 | } |
| 1904 | 1501 | |
| 1905 | 1502 | /** |
| 1906 | 1503 | * @since 5.0.03 |
| @@ -1908,9 +1505,8 @@ | ||
| 1908 | 1505 | * @param stdClass $form |
| 1909 | 1506 | */ |
| 1910 | 1507 | public static function add_js_validate_form_to_global_vars( $form ) { |
| 1911 | 1508 | global $frm_vars; |
| 1912 | - | |
| 1913 | 1509 | if ( ! isset( $frm_vars['js_validate_forms'] ) ) { |
| 1914 | 1510 | $frm_vars['js_validate_forms'] = array(); |
| 1915 | 1511 | } |
| 1916 | 1512 | $frm_vars['js_validate_forms'][ $form->id ] = $form; |
| @@ -1921,11 +1517,11 @@ | ||
| 1921 | 1517 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1922 | 1518 | |
| 1923 | 1519 | echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 1924 | 1520 | array( |
| 1925 | - 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1521 | + 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), | |
| 1926 | 1522 | 'default_email' => true, |
| 1927 | - 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1523 | + 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), | |
| 1928 | 1524 | ) |
| 1929 | 1525 | ); |
| 1930 | 1526 | wp_die(); |
| 1931 | 1527 | } |
| @@ -1931,11 +1527,10 @@ | ||
| 1931 | 1527 | } |
| 1932 | 1528 | |
| 1933 | 1529 | /** |
| 1934 | 1530 | * @param string $content |
| 1935 | - * @param int|stdClass|string $form | |
| 1936 | - * @param false|int|stdClass|string $entry | |
| 1937 | - * | |
| 1531 | + * @param stdClass|string|int $form | |
| 1532 | + * @param stdClass|string|int|false $entry | |
| 1938 | 1533 | * @return string |
| 1939 | 1534 | */ |
| 1940 | 1535 | public static function filter_content( $content, $form, $entry = false ) { |
| 1941 | 1536 | $content = self::replace_form_name_shortcodes( $content, $form ); |
| @@ -1940,9 +1535,8 @@ | ||
| 1940 | 1535 | public static function filter_content( $content, $form, $entry = false ) { |
| 1941 | 1536 | $content = self::replace_form_name_shortcodes( $content, $form ); |
| 1942 | 1537 | |
| 1943 | 1538 | self::get_entry_by_param( $entry ); |
| 1944 | - | |
| 1945 | 1539 | if ( ! $entry ) { |
| 1946 | 1540 | return $content; |
| 1947 | 1541 | } |
| 1948 | 1542 | |
| @@ -1949,19 +1543,12 @@ | ||
| 1949 | 1543 | if ( is_object( $form ) ) { |
| 1950 | 1544 | $form = $form->id; |
| 1951 | 1545 | } |
| 1952 | 1546 | |
| 1953 | - /* | |
| 1954 | - * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty, | |
| 1955 | - * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work. | |
| 1956 | - */ | |
| 1957 | - if ( ! empty( $entry->parent_entry ) ) { | |
| 1958 | - $form = $entry->parent_entry->form_id; | |
| 1959 | - } | |
| 1960 | - | |
| 1961 | 1547 | $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form ); |
| 1548 | + $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes ); | |
| 1962 | 1549 | |
| 1963 | - return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes ); | |
| 1550 | + return $content; | |
| 1964 | 1551 | } |
| 1965 | 1552 | |
| 1966 | 1553 | /** |
| 1967 | 1554 | * Replace any [form_name] shortcodes in a string. |
| @@ -1967,22 +1554,17 @@ | ||
| 1967 | 1554 | * Replace any [form_name] shortcodes in a string. |
| 1968 | 1555 | * |
| 1969 | 1556 | * @since 5.5 |
| 1970 | 1557 | * |
| 1971 | - * @param array|string $string | |
| 1972 | - * @param int|stdClass|string $form | |
| 1973 | - * | |
| 1974 | - * @return array|string | |
| 1558 | + * @param string $string | |
| 1559 | + * @param stdClass|string|int $form | |
| 1560 | + * @return string | |
| 1975 | 1561 | */ |
| 1976 | 1562 | public static function replace_form_name_shortcodes( $string, $form ) { |
| 1977 | - if ( ! is_string( $string ) ) { | |
| 1563 | + if ( false === strpos( $string, '[form_name]' ) ) { | |
| 1978 | 1564 | return $string; |
| 1979 | 1565 | } |
| 1980 | 1566 | |
| 1981 | - if ( ! str_contains( $string, '[form_name]' ) ) { | |
| 1982 | - return $string; | |
| 1983 | - } | |
| 1984 | - | |
| 1985 | 1567 | if ( ! is_object( $form ) ) { |
| 1986 | 1568 | $form = FrmForm::getOne( $form ); |
| 1987 | 1569 | } |
| 1988 | 1570 | |
| @@ -1990,10 +1572,9 @@ | ||
| 1990 | 1572 | return str_replace( '[form_name]', $form_name, $string ); |
| 1991 | 1573 | } |
| 1992 | 1574 | |
| 1993 | 1575 | /** |
| 1994 | - * @param false|int|stdClass|string $entry | |
| 1995 | - * | |
| 1576 | + * @param stdClass|string|int|false $entry | |
| 1996 | 1577 | * @return void |
| 1997 | 1578 | */ |
| 1998 | 1579 | private static function get_entry_by_param( &$entry ) { |
| 1999 | 1580 | if ( ! $entry || ! is_object( $entry ) ) { |
| @@ -2004,24 +1585,12 @@ | ||
| 2004 | 1585 | FrmEntry::maybe_get_entry( $entry ); |
| 2005 | 1586 | } |
| 2006 | 1587 | } |
| 2007 | 1588 | |
| 2008 | - /** | |
| 2009 | - * @param string $content | |
| 2010 | - * @param false|object $entry | |
| 2011 | - * @param array $shortcodes | |
| 2012 | - * | |
| 2013 | - * @return string | |
| 2014 | - */ | |
| 2015 | 1589 | public static function replace_content_shortcodes( $content, $entry, $shortcodes ) { |
| 2016 | 1590 | return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes ); |
| 2017 | 1591 | } |
| 2018 | 1592 | |
| 2019 | - /** | |
| 2020 | - * @param array $errors | |
| 2021 | - * | |
| 2022 | - * @return array | |
| 2023 | - */ | |
| 2024 | 1593 | public static function process_bulk_form_actions( $errors ) { |
| 2025 | 1594 | if ( ! $_REQUEST ) { |
| 2026 | 1595 | return $errors; |
| 2027 | 1596 | } |
| @@ -2026,30 +1595,29 @@ | ||
| 2026 | 1595 | return $errors; |
| 2027 | 1596 | } |
| 2028 | 1597 | |
| 2029 | 1598 | $bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' ); |
| 2030 | - | |
| 2031 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 2032 | 1599 | if ( $bulkaction == - 1 ) { |
| 2033 | 1600 | $bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' ); |
| 2034 | 1601 | } |
| 2035 | 1602 | |
| 2036 | - if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) { | |
| 1603 | + if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) { | |
| 2037 | 1604 | FrmAppHelper::remove_get_action(); |
| 1605 | + | |
| 2038 | 1606 | $bulkaction = str_replace( 'bulk_', '', $bulkaction ); |
| 2039 | 1607 | } |
| 2040 | 1608 | |
| 2041 | 1609 | $ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' ); |
| 1610 | + if ( empty( $ids ) ) { | |
| 1611 | + $errors[] = __( 'No forms were specified', 'formidable' ); | |
| 2042 | 1612 | |
| 2043 | - if ( ! $ids ) { | |
| 2044 | - $errors[] = __( 'No forms were specified', 'formidable' ); | |
| 2045 | 1613 | return $errors; |
| 2046 | 1614 | } |
| 2047 | 1615 | |
| 2048 | 1616 | $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' ); |
| 2049 | - | |
| 2050 | 1617 | if ( $permission_error !== false ) { |
| 2051 | 1618 | $errors[] = $permission_error; |
| 1619 | + | |
| 2052 | 1620 | return $errors; |
| 2053 | 1621 | } |
| 2054 | 1622 | |
| 2055 | 1623 | if ( ! is_array( $ids ) ) { |
| @@ -2066,9 +1634,9 @@ | ||
| 2066 | 1634 | case 'untrash': |
| 2067 | 1635 | $message = self::bulk_untrash( $ids ); |
| 2068 | 1636 | } |
| 2069 | 1637 | |
| 2070 | - if ( ! empty( $message ) ) { | |
| 1638 | + if ( isset( $message ) && ! empty( $message ) ) { | |
| 2071 | 1639 | $errors['message'] = $message; |
| 2072 | 1640 | } |
| 2073 | 1641 | |
| 2074 | 1642 | return $errors; |
| @@ -2073,24 +1641,9 @@ | ||
| 2073 | 1641 | |
| 2074 | 1642 | return $errors; |
| 2075 | 1643 | } |
| 2076 | 1644 | |
| 2077 | - /** | |
| 2078 | - * Includes html that shows a message when the device is too small to use Formidable Forms admin pages. | |
| 2079 | - * | |
| 2080 | - * @since 6.20 | |
| 2081 | - * | |
| 2082 | - * @return void | |
| 2083 | - */ | |
| 2084 | - public static function include_device_too_small_message() { | |
| 2085 | - if ( ! FrmAppHelper::is_formidable_admin() ) { | |
| 2086 | - return; | |
| 2087 | - } | |
| 2088 | - | |
| 2089 | - include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php'; | |
| 2090 | - } | |
| 2091 | - | |
| 2092 | - public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded | |
| 1645 | + public static function route() { | |
| 2093 | 1646 | $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; |
| 2094 | 1647 | $vars = array(); |
| 2095 | 1648 | FrmAppHelper::include_svg(); |
| 2096 | 1649 | |
| @@ -2100,14 +1653,12 @@ | ||
| 2100 | 1653 | // Javascript needs to be allowed in some field settings. |
| 2101 | 1654 | // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing |
| 2102 | 1655 | $json_vars = htmlspecialchars_decode( nl2br( str_replace( '"', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) ); |
| 2103 | 1656 | $json_vars = json_decode( $json_vars, true ); |
| 2104 | - | |
| 2105 | - if ( ! $json_vars ) { | |
| 2106 | - // Json decoding failed so we should return an error message. | |
| 1657 | + if ( empty( $json_vars ) ) { | |
| 1658 | + // json decoding failed so we should return an error message. | |
| 2107 | 1659 | $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ); |
| 2108 | - | |
| 2109 | - if ( 'edit' === $action ) { | |
| 1660 | + if ( 'edit' == $action ) { | |
| 2110 | 1661 | $action = 'update'; |
| 2111 | 1662 | } |
| 2112 | 1663 | |
| 2113 | 1664 | add_filter( 'frm_validate_form', 'FrmFormsController::json_error' ); |
| @@ -2119,19 +1670,20 @@ | ||
| 2119 | 1670 | $_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 2120 | 1671 | } |
| 2121 | 1672 | } else { |
| 2122 | 1673 | $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ); |
| 2123 | - | |
| 2124 | 1674 | if ( isset( $_REQUEST['delete_all'] ) ) { |
| 2125 | 1675 | // Override the action for this page. |
| 2126 | 1676 | $action = 'delete_all'; |
| 2127 | 1677 | } |
| 2128 | - }//end if | |
| 1678 | + } | |
| 2129 | 1679 | |
| 2130 | 1680 | add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' ); |
| 2131 | 1681 | FrmAppHelper::trigger_hook_load( 'form' ); |
| 2132 | 1682 | |
| 2133 | 1683 | switch ( $action ) { |
| 1684 | + case 'new': | |
| 1685 | + return self::new_form( $vars ); | |
| 2134 | 1686 | case 'create': |
| 2135 | 1687 | case 'edit': |
| 2136 | 1688 | case 'update': |
| 2137 | 1689 | case 'trash': |
| @@ -2136,112 +1688,59 @@ | ||
| 2136 | 1688 | case 'update': |
| 2137 | 1689 | case 'trash': |
| 2138 | 1690 | case 'untrash': |
| 2139 | 1691 | case 'destroy': |
| 1692 | + case 'delete_all': | |
| 2140 | 1693 | case 'settings': |
| 2141 | 1694 | case 'update_settings': |
| 2142 | 1695 | return self::$action( $vars ); |
| 2143 | 1696 | case 'lite-reports': |
| 2144 | - self::no_reports( $vars ); | |
| 2145 | - return null; | |
| 1697 | + return self::no_reports( $vars ); | |
| 2146 | 1698 | case 'views': |
| 2147 | - self::no_views( $vars ); | |
| 2148 | - return null; | |
| 1699 | + return self::no_views( $vars ); | |
| 2149 | 1700 | default: |
| 2150 | 1701 | do_action( 'frm_form_action_' . $action ); |
| 2151 | - | |
| 2152 | 1702 | if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) { |
| 2153 | - return null; | |
| 1703 | + return; | |
| 2154 | 1704 | } |
| 2155 | 1705 | |
| 2156 | 1706 | $action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' ); |
| 2157 | - | |
| 2158 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 2159 | 1707 | if ( $action == - 1 ) { |
| 2160 | 1708 | $action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' ); |
| 2161 | 1709 | } |
| 2162 | 1710 | |
| 2163 | - if ( str_starts_with( $action, 'bulk_' ) ) { | |
| 1711 | + if ( strpos( $action, 'bulk_' ) === 0 ) { | |
| 2164 | 1712 | FrmAppHelper::remove_get_action(); |
| 2165 | 1713 | |
| 2166 | 1714 | self::list_form(); |
| 2167 | - return null; | |
| 1715 | + return; | |
| 2168 | 1716 | } |
| 2169 | 1717 | |
| 2170 | 1718 | $message = FrmAppHelper::get_param( 'message' ); |
| 2171 | - | |
| 2172 | 1719 | if ( 'form_duplicate_error' === $message ) { |
| 2173 | 1720 | self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) ); |
| 2174 | - return null; | |
| 1721 | + return; | |
| 2175 | 1722 | } |
| 2176 | 1723 | |
| 2177 | - if ( 'forms_permanently_deleted' === $message ) { | |
| 2178 | - $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' ); | |
| 2179 | - /* translators: %1$s: Number of forms */ | |
| 2180 | - $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count ); | |
| 2181 | - self::display_forms_list( array(), $message, '' ); | |
| 2182 | - return null; | |
| 2183 | - } | |
| 2184 | - | |
| 2185 | 1724 | self::display_forms_list(); |
| 2186 | 1725 | |
| 2187 | - return null; | |
| 2188 | - }//end switch | |
| 1726 | + return; | |
| 1727 | + } | |
| 2189 | 1728 | } |
| 2190 | 1729 | |
| 2191 | - /** | |
| 2192 | - * Rename a form. | |
| 2193 | - * | |
| 2194 | - * Handles the AJAX request for renaming a form. | |
| 2195 | - * | |
| 2196 | - * @since 6.7 | |
| 2197 | - * | |
| 2198 | - * @return void | |
| 2199 | - */ | |
| 2200 | - public static function rename_form() { | |
| 2201 | - // Check permission and nonce | |
| 2202 | - FrmAppHelper::permission_check( 'frm_edit_forms' ); | |
| 2203 | - check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 1730 | + public static function json_error( $errors ) { | |
| 1731 | + $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' ); | |
| 2204 | 1732 | |
| 2205 | - // Get posted data | |
| 2206 | - $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' ); | |
| 2207 | - $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' ); | |
| 2208 | - $form = FrmForm::getOne( $form_id ); | |
| 2209 | - | |
| 2210 | - if ( ! $form ) { | |
| 2211 | - wp_send_json_error( __( 'Form not found', 'formidable' ) ); | |
| 2212 | - } | |
| 2213 | - | |
| 2214 | - if ( $name === $form->name ) { | |
| 2215 | - // Nothing to change so exit early. | |
| 2216 | - wp_send_json_success(); | |
| 2217 | - } | |
| 2218 | - | |
| 2219 | - $to_update = array( | |
| 2220 | - 'name' => $name, | |
| 2221 | - ); | |
| 2222 | - | |
| 2223 | - if ( '' !== $name ) { | |
| 2224 | - // Only update form_key if name is not empty. | |
| 2225 | - $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' ); | |
| 2226 | - $to_update['form_key'] = $form_key; | |
| 2227 | - } else { | |
| 2228 | - $form_key = $form->form_key; | |
| 2229 | - } | |
| 2230 | - | |
| 2231 | - FrmForm::update( $form_id, $to_update ); | |
| 2232 | - | |
| 2233 | - wp_send_json_success( compact( 'form_key' ) ); | |
| 1733 | + return $errors; | |
| 2234 | 1734 | } |
| 2235 | 1735 | |
| 2236 | 1736 | /** |
| 2237 | - * @param array $errors | |
| 1737 | + * Education for premium features. | |
| 2238 | 1738 | * |
| 2239 | - * @return array | |
| 1739 | + * @since 4.05 | |
| 2240 | 1740 | */ |
| 2241 | - public static function json_error( $errors ) { | |
| 2242 | - $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' ); | |
| 2243 | - return $errors; | |
| 1741 | + public static function add_form_style_tab_options() { | |
| 1742 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' ); | |
| 2244 | 1743 | } |
| 2245 | 1744 | |
| 2246 | 1745 | /** |
| 2247 | 1746 | * Add education about views. |
| @@ -2246,12 +1745,8 @@ | ||
| 2246 | 1745 | /** |
| 2247 | 1746 | * Add education about views. |
| 2248 | 1747 | * |
| 2249 | 1748 | * @since 4.07 |
| 2250 | - * | |
| 2251 | - * @param array $values | |
| 2252 | - * | |
| 2253 | - * @return void | |
| 2254 | 1749 | */ |
| 2255 | 1750 | public static function no_views( $values = array() ) { |
| 2256 | 1751 | FrmAppHelper::include_svg(); |
| 2257 | 1752 | $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' ); |
| @@ -2263,12 +1758,8 @@ | ||
| 2263 | 1758 | /** |
| 2264 | 1759 | * Add education about reports. |
| 2265 | 1760 | * |
| 2266 | 1761 | * @since 4.07 |
| 2267 | - * | |
| 2268 | - * @param array $values | |
| 2269 | - * | |
| 2270 | - * @return void | |
| 2271 | 1762 | */ |
| 2272 | 1763 | public static function no_reports( $values = array() ) { |
| 2273 | 1764 | $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' ); |
| 2274 | 1765 | $form = $id ? FrmForm::getOne( $id ) : false; |
| @@ -2275,11 +1766,9 @@ | ||
| 2275 | 1766 | |
| 2276 | 1767 | include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php'; |
| 2277 | 1768 | } |
| 2278 | 1769 | |
| 2279 | - /** | |
| 2280 | - * FRONT-END FORMS. | |
| 2281 | - */ | |
| 1770 | + /* FRONT-END FORMS */ | |
| 2282 | 1771 | public static function admin_bar_css() { |
| 2283 | 1772 | if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) { |
| 2284 | 1773 | return; |
| 2285 | 1774 | } |
| @@ -2294,9 +1783,8 @@ | ||
| 2294 | 1783 | * @since 4.05.02 |
| 2295 | 1784 | */ |
| 2296 | 1785 | private static function move_menu_to_footer() { |
| 2297 | 1786 | $settings = FrmAppHelper::get_settings(); |
| 2298 | - | |
| 2299 | 1787 | if ( empty( $settings->admin_bar ) ) { |
| 2300 | 1788 | remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 ); |
| 2301 | 1789 | } |
| 2302 | 1790 | } |
| @@ -2302,15 +1790,13 @@ | ||
| 2302 | 1790 | } |
| 2303 | 1791 | |
| 2304 | 1792 | public static function admin_bar_configure() { |
| 2305 | 1793 | global $frm_vars; |
| 2306 | - | |
| 2307 | 1794 | if ( empty( $frm_vars['forms_loaded'] ) ) { |
| 2308 | 1795 | return; |
| 2309 | 1796 | } |
| 2310 | 1797 | |
| 2311 | 1798 | $actions = array(); |
| 2312 | - | |
| 2313 | 1799 | foreach ( $frm_vars['forms_loaded'] as $form ) { |
| 2314 | 1800 | if ( is_object( $form ) ) { |
| 2315 | 1801 | $actions[ $form->id ] = $form->name; |
| 2316 | 1802 | } |
| @@ -2316,9 +1802,9 @@ | ||
| 2316 | 1802 | } |
| 2317 | 1803 | unset( $form ); |
| 2318 | 1804 | } |
| 2319 | 1805 | |
| 2320 | - if ( ! $actions ) { | |
| 1806 | + if ( empty( $actions ) ) { | |
| 2321 | 1807 | return; |
| 2322 | 1808 | } |
| 2323 | 1809 | |
| 2324 | 1810 | self::add_menu_to_admin_bar(); |
| @@ -2344,12 +1830,8 @@ | ||
| 2344 | 1830 | } |
| 2345 | 1831 | |
| 2346 | 1832 | /** |
| 2347 | 1833 | * @since 2.05.07 |
| 2348 | - * | |
| 2349 | - * @param array $actions | |
| 2350 | - * | |
| 2351 | - * @return void | |
| 2352 | 1834 | */ |
| 2353 | 1835 | private static function add_forms_to_admin_bar( $actions ) { |
| 2354 | 1836 | global $wp_admin_bar; |
| 2355 | 1837 | |
| @@ -2355,13 +1837,14 @@ | ||
| 2355 | 1837 | |
| 2356 | 1838 | asort( $actions ); |
| 2357 | 1839 | |
| 2358 | 1840 | foreach ( $actions as $form_id => $name ) { |
| 1841 | + | |
| 2359 | 1842 | $wp_admin_bar->add_node( |
| 2360 | 1843 | array( |
| 2361 | 1844 | 'parent' => 'frm-forms', |
| 2362 | 1845 | 'id' => 'edit_form_' . $form_id, |
| 2363 | - 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(), | |
| 1846 | + 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name, | |
| 2364 | 1847 | 'href' => FrmForm::get_edit_link( $form_id ), |
| 2365 | 1848 | ) |
| 2366 | 1849 | ); |
| 2367 | 1850 | } |
| @@ -2370,16 +1853,14 @@ | ||
| 2370 | 1853 | /** |
| 2371 | 1854 | * The formidable shortcode |
| 2372 | 1855 | * |
| 2373 | 1856 | * @param array $atts The params from the shortcode. |
| 2374 | - * | |
| 2375 | 1857 | * @return string |
| 2376 | 1858 | */ |
| 2377 | 1859 | public static function get_form_shortcode( $atts ) { |
| 2378 | 1860 | global $frm_vars; |
| 2379 | - | |
| 2380 | - if ( ! empty( $frm_vars['skip_shortcode'] ) ) { | |
| 2381 | - $sc = '[formidable'; | |
| 1861 | + if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) { | |
| 1862 | + $sc = '[formidable'; | |
| 2382 | 1863 | $sc .= FrmAppHelper::array_to_html_params( $atts ); |
| 2383 | 1864 | return $sc . ']'; |
| 2384 | 1865 | } |
| 2385 | 1866 | |
| @@ -2404,12 +1885,11 @@ | ||
| 2404 | 1885 | |
| 2405 | 1886 | /** |
| 2406 | 1887 | * @since 5.2.01 |
| 2407 | 1888 | * |
| 2408 | - * @param false|int|string $id | |
| 2409 | - * @param false|string $key | |
| 2410 | - * | |
| 2411 | - * @return false|stdClass | |
| 1889 | + * @param string|int|false $id | |
| 1890 | + * @param string|false $key | |
| 1891 | + * @return stdClass|false | |
| 2412 | 1892 | */ |
| 2413 | 1893 | private static function maybe_get_form_by_id_or_key( $id, $key ) { |
| 2414 | 1894 | if ( ! $id ) { |
| 2415 | 1895 | $id = $key; |
| @@ -2417,14 +1897,13 @@ | ||
| 2417 | 1897 | return self::maybe_get_form_to_show( $id ); |
| 2418 | 1898 | } |
| 2419 | 1899 | |
| 2420 | 1900 | /** |
| 2421 | - * @param false|int|string $id | |
| 2422 | - * @param false|string $key | |
| 2423 | - * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0. | |
| 2424 | - * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0. | |
| 1901 | + * @param string|int|false $id | |
| 1902 | + * @param string|false $key | |
| 1903 | + * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0. | |
| 1904 | + * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0. | |
| 2425 | 1905 | * @param array $atts |
| 2426 | - * | |
| 2427 | 1906 | * @return string |
| 2428 | 1907 | */ |
| 2429 | 1908 | public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) { |
| 2430 | 1909 | $form = self::maybe_get_form_by_id_or_key( $id, $key ); |
| @@ -2445,13 +1924,14 @@ | ||
| 2445 | 1924 | |
| 2446 | 1925 | add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' ); |
| 2447 | 1926 | FrmAppHelper::trigger_hook_load( 'form', $form ); |
| 2448 | 1927 | |
| 2449 | - $form = apply_filters( 'frm_pre_display_form', $form ); | |
| 1928 | + $form = apply_filters( 'frm_pre_display_form', $form ); | |
| 1929 | + | |
| 2450 | 1930 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 2451 | 1931 | |
| 2452 | 1932 | if ( self::is_viewable_draft_form( $form ) ) { |
| 2453 | - // Don't show a draft form on a page | |
| 1933 | + // don't show a draft form on a page | |
| 2454 | 1934 | $form = __( 'Please select a valid form', 'formidable' ); |
| 2455 | 1935 | } elseif ( ! FrmForm::is_visible_to_user( $form ) ) { |
| 2456 | 1936 | $form = do_shortcode( $frm_settings->login_msg ); |
| 2457 | 1937 | } else { |
| @@ -2470,19 +1950,16 @@ | ||
| 2470 | 1950 | return $form; |
| 2471 | 1951 | } |
| 2472 | 1952 | |
| 2473 | 1953 | /** |
| 2474 | - * @param false|int|string $id | |
| 2475 | - * | |
| 2476 | - * @return false|stdClass | |
| 1954 | + * @param string|int|false $id | |
| 1955 | + * @return stdClass|false | |
| 2477 | 1956 | */ |
| 2478 | 1957 | private static function maybe_get_form_to_show( $id ) { |
| 2479 | 1958 | $form = false; |
| 2480 | 1959 | |
| 2481 | - if ( $id ) { | |
| 2482 | - // Form id or key is set. | |
| 1960 | + if ( ! empty( $id ) ) { // form id or key is set | |
| 2483 | 1961 | $form = FrmForm::getOne( $id ); |
| 2484 | - | |
| 2485 | 1962 | if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) { |
| 2486 | 1963 | $form = false; |
| 2487 | 1964 | } |
| 2488 | 1965 | } |
| @@ -2489,25 +1966,12 @@ | ||
| 2489 | 1966 | |
| 2490 | 1967 | return $form; |
| 2491 | 1968 | } |
| 2492 | 1969 | |
| 2493 | - /** | |
| 2494 | - * @param object $form | |
| 2495 | - * | |
| 2496 | - * @return bool | |
| 2497 | - */ | |
| 2498 | 1970 | private static function is_viewable_draft_form( $form ) { |
| 2499 | 1971 | return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page(); |
| 2500 | 1972 | } |
| 2501 | 1973 | |
| 2502 | - /** | |
| 2503 | - * @param object $form | |
| 2504 | - * @param bool $title | |
| 2505 | - * @param bool $description | |
| 2506 | - * @param array $atts | |
| 2507 | - * | |
| 2508 | - * @return string | |
| 2509 | - */ | |
| 2510 | 1974 | public static function get_form( $form, $title, $description, $atts = array() ) { |
| 2511 | 1975 | ob_start(); |
| 2512 | 1976 | |
| 2513 | 1977 | do_action( 'frm_before_get_form', $atts ); |
| @@ -2514,9 +1978,10 @@ | ||
| 2514 | 1978 | |
| 2515 | 1979 | self::get_form_contents( $form, $title, $description, $atts ); |
| 2516 | 1980 | self::enqueue_scripts( FrmForm::get_params( $form ) ); |
| 2517 | 1981 | |
| 2518 | - $contents = ob_get_clean(); | |
| 1982 | + $contents = ob_get_contents(); | |
| 1983 | + ob_end_clean(); | |
| 2519 | 1984 | |
| 2520 | 1985 | self::maybe_minimize_form( $atts, $contents ); |
| 2521 | 1986 | |
| 2522 | 1987 | return $contents; |
| @@ -2521,25 +1986,12 @@ | ||
| 2521 | 1986 | |
| 2522 | 1987 | return $contents; |
| 2523 | 1988 | } |
| 2524 | 1989 | |
| 2525 | - /** | |
| 2526 | - * @param array $params | |
| 2527 | - * | |
| 2528 | - * @return void | |
| 2529 | - */ | |
| 2530 | 1990 | public static function enqueue_scripts( $params ) { |
| 2531 | 1991 | do_action( 'frm_enqueue_form_scripts', $params ); |
| 2532 | 1992 | } |
| 2533 | 1993 | |
| 2534 | - /** | |
| 2535 | - * @param object $form | |
| 2536 | - * @param bool $title | |
| 2537 | - * @param bool $description | |
| 2538 | - * @param array $atts | |
| 2539 | - * | |
| 2540 | - * @return void | |
| 2541 | - */ | |
| 2542 | 1994 | public static function get_form_contents( $form, $title, $description, $atts ) { |
| 2543 | 1995 | $params = FrmForm::get_params( $form ); |
| 2544 | 1996 | $errors = self::get_saved_errors( $form, $params ); |
| 2545 | 1997 | $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors ); |
| @@ -2545,32 +1997,29 @@ | ||
| 2545 | 1997 | $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors ); |
| 2546 | 1998 | $reset = false; |
| 2547 | 1999 | $pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' ); |
| 2548 | 2000 | |
| 2549 | - $pass_args['action'] = $params['action']; | |
| 2550 | - // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons | |
| 2551 | - $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; | |
| 2001 | + $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 2552 | 2002 | |
| 2553 | 2003 | if ( ! $handle_process_here ) { |
| 2554 | - FrmFormState::set_initial_value( 'title', $title ); | |
| 2555 | - FrmFormState::set_initial_value( 'description', $description ); | |
| 2556 | - | |
| 2557 | 2004 | do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description ); |
| 2558 | - | |
| 2559 | 2005 | if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) { |
| 2560 | 2006 | self::show_form_after_submit( $pass_args ); |
| 2561 | 2007 | } |
| 2562 | - } elseif ( $errors ) { | |
| 2008 | + } elseif ( ! empty( $errors ) ) { | |
| 2563 | 2009 | self::show_form_after_submit( $pass_args ); |
| 2010 | + | |
| 2564 | 2011 | } else { |
| 2012 | + | |
| 2565 | 2013 | do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description ); |
| 2566 | 2014 | |
| 2567 | 2015 | if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) { |
| 2568 | - $entry_id = self::just_created_entry( $form->id ); | |
| 2569 | - $pass_args['entry_id'] = $entry_id; | |
| 2570 | - $pass_args['reset'] = true; | |
| 2016 | + $entry_id = self::just_created_entry( $form->id ); | |
| 2017 | + $pass_args['entry_id'] = $entry_id; | |
| 2018 | + $pass_args['reset'] = true; | |
| 2019 | + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) ); | |
| 2571 | 2020 | |
| 2572 | - self::run_on_submit_actions( $pass_args ); | |
| 2021 | + self::run_success_action( $pass_args ); | |
| 2573 | 2022 | |
| 2574 | 2023 | do_action( |
| 2575 | 2024 | 'frm_after_entry_processed', |
| 2576 | 2025 | array( |
| @@ -2578,9 +2027,9 @@ | ||
| 2578 | 2027 | 'form' => $form, |
| 2579 | 2028 | ) |
| 2580 | 2029 | ); |
| 2581 | 2030 | } |
| 2582 | - }//end if | |
| 2031 | + } | |
| 2583 | 2032 | } |
| 2584 | 2033 | |
| 2585 | 2034 | /** |
| 2586 | 2035 | * If the form was processed earlier (init), get the generated errors |
| @@ -2585,19 +2034,13 @@ | ||
| 2585 | 2034 | /** |
| 2586 | 2035 | * If the form was processed earlier (init), get the generated errors |
| 2587 | 2036 | * |
| 2588 | 2037 | * @since 2.05 |
| 2589 | - * | |
| 2590 | - * @param object $form | |
| 2591 | - * @param array $params | |
| 2592 | - * | |
| 2593 | - * @return array | |
| 2594 | 2038 | */ |
| 2595 | 2039 | private static function get_saved_errors( $form, $params ) { |
| 2596 | 2040 | global $frm_vars; |
| 2597 | 2041 | |
| 2598 | - // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons | |
| 2599 | - if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { | |
| 2042 | + if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 2600 | 2043 | $errors = $frm_vars['created_entries'][ $form->id ]['errors']; |
| 2601 | 2044 | } else { |
| 2602 | 2045 | $errors = array(); |
| 2603 | 2046 | } |
| @@ -2614,62 +2057,30 @@ | ||
| 2614 | 2057 | } |
| 2615 | 2058 | |
| 2616 | 2059 | /** |
| 2617 | 2060 | * @since 2.2.7 |
| 2618 | - * | |
| 2619 | - * @param int|string $form_id | |
| 2620 | - * | |
| 2621 | - * @return int | |
| 2622 | 2061 | */ |
| 2623 | 2062 | public static function just_created_entry( $form_id ) { |
| 2624 | 2063 | global $frm_vars; |
| 2625 | - return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 2064 | + | |
| 2065 | + return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; | |
| 2626 | 2066 | } |
| 2627 | 2067 | |
| 2628 | 2068 | /** |
| 2629 | - * Gets confirmation method. | |
| 2630 | - * | |
| 2631 | 2069 | * @since 3.0 |
| 2632 | - * @since 6.0 This method can return an array of met On Submit actions. | |
| 2633 | - * | |
| 2634 | - * @param array $atts { | |
| 2635 | - * Atts. | |
| 2636 | - * | |
| 2637 | - * @type object $form Form object. | |
| 2638 | - * @type int $entry_id Entry ID. | |
| 2639 | - * } | |
| 2640 | - * | |
| 2641 | - * @return array|string | |
| 2642 | 2070 | */ |
| 2643 | 2071 | private static function get_confirmation_method( $atts ) { |
| 2644 | - $action = FrmOnSubmitHelper::current_event( $atts ); | |
| 2645 | - $opt = 'update' === $action ? 'edit_action' : 'success_action'; | |
| 2646 | - $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message'; | |
| 2072 | + $opt = 'success_action'; | |
| 2073 | + $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; | |
| 2074 | + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' ); | |
| 2647 | 2075 | |
| 2648 | - if ( ! empty( $atts['entry_id'] ) ) { | |
| 2649 | - $met_actions = self::get_met_on_submit_actions( $atts, $action ); | |
| 2650 | - | |
| 2651 | - if ( $met_actions ) { | |
| 2652 | - $method = $met_actions; | |
| 2653 | - } | |
| 2076 | + if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { | |
| 2077 | + $method = 'message'; | |
| 2654 | 2078 | } |
| 2655 | 2079 | |
| 2656 | - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action ); | |
| 2657 | - | |
| 2658 | - if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { | |
| 2659 | - return 'message'; | |
| 2660 | - } | |
| 2661 | - | |
| 2662 | 2080 | return $method; |
| 2663 | 2081 | } |
| 2664 | 2082 | |
| 2665 | - /** | |
| 2666 | - * @param object $form | |
| 2667 | - * @param array $params | |
| 2668 | - * @param array $args | |
| 2669 | - * | |
| 2670 | - * @return void | |
| 2671 | - */ | |
| 2672 | 2083 | public static function maybe_trigger_redirect( $form, $params, $args ) { |
| 2673 | 2084 | if ( ! isset( $params['id'] ) ) { |
| 2674 | 2085 | global $frm_vars; |
| 2675 | 2086 | $params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id']; |
| @@ -2678,46 +2089,16 @@ | ||
| 2678 | 2089 | $conf_method = self::get_confirmation_method( |
| 2679 | 2090 | array( |
| 2680 | 2091 | 'form' => $form, |
| 2681 | 2092 | 'entry_id' => $params['id'], |
| 2682 | - 'action' => FrmOnSubmitHelper::current_event( $params ), | |
| 2683 | 2093 | ) |
| 2684 | 2094 | ); |
| 2685 | 2095 | |
| 2686 | - self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ); | |
| 2687 | - } | |
| 2688 | - | |
| 2689 | - /** | |
| 2690 | - * Maybe trigger redirect with the new Confirmation action. | |
| 2691 | - * | |
| 2692 | - * @since 6.1.1 | |
| 2693 | - * | |
| 2694 | - * @param array|string $conf_method Array of confirmation actions or the action type string. | |
| 2695 | - * @param object $form Form object. | |
| 2696 | - * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2697 | - * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2698 | - */ | |
| 2699 | - public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) { | |
| 2700 | - if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) { | |
| 2701 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { | |
| 2702 | - $event = FrmOnSubmitHelper::current_event( $params ); | |
| 2703 | - FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event ); | |
| 2704 | - $conf_method = 'redirect'; | |
| 2705 | - } | |
| 2706 | - } | |
| 2707 | - | |
| 2708 | 2096 | if ( 'redirect' === $conf_method ) { |
| 2709 | 2097 | self::trigger_redirect( $form, $params, $args ); |
| 2710 | 2098 | } |
| 2711 | 2099 | } |
| 2712 | 2100 | |
| 2713 | - /** | |
| 2714 | - * @param object $form | |
| 2715 | - * @param array $params | |
| 2716 | - * @param array $args | |
| 2717 | - * | |
| 2718 | - * @return void | |
| 2719 | - */ | |
| 2720 | 2101 | public static function trigger_redirect( $form, $params, $args ) { |
| 2721 | 2102 | $success_args = array( |
| 2722 | 2103 | 'action' => $params['action'], |
| 2723 | 2104 | 'conf_method' => 'redirect', |
| @@ -2735,33 +2116,18 @@ | ||
| 2735 | 2116 | /** |
| 2736 | 2117 | * Used when the success action is not 'message' |
| 2737 | 2118 | * |
| 2738 | 2119 | * @since 2.05 |
| 2739 | - * @since 6.0 `$args['force_delay_redirect']` is added. | |
| 2740 | - * | |
| 2741 | - * @param array $args { | |
| 2742 | - * The args. | |
| 2743 | - * | |
| 2744 | - * @type string $conf_method The method. | |
| 2745 | - * @type object $form Form object. | |
| 2746 | - * @type int $entry_id Entry ID. | |
| 2747 | - * @type string $action The action event. Accepts `create` or `update`. | |
| 2748 | - * @type array $fields The array of fields. | |
| 2749 | - * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs. | |
| 2750 | - * } | |
| 2751 | 2120 | */ |
| 2752 | 2121 | public static function run_success_action( $args ) { |
| 2753 | - global $frm_vars; | |
| 2754 | 2122 | $extra_args = $args; |
| 2755 | 2123 | unset( $extra_args['form'] ); |
| 2756 | 2124 | |
| 2757 | 2125 | do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args ); |
| 2758 | 2126 | |
| 2759 | - $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit'; | |
| 2127 | + $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit'; | |
| 2760 | 2128 | |
| 2761 | 2129 | $args['success_opt'] = $opt; |
| 2762 | - $args['ajax'] = ! empty( $frm_vars['ajax'] ); | |
| 2763 | - | |
| 2764 | 2130 | if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) { |
| 2765 | 2131 | self::load_page_after_submit( $args ); |
| 2766 | 2132 | } elseif ( $args['conf_method'] === 'redirect' ) { |
| 2767 | 2133 | self::redirect_after_submit( $args ); |
| @@ -2770,272 +2136,29 @@ | ||
| 2770 | 2136 | } |
| 2771 | 2137 | } |
| 2772 | 2138 | |
| 2773 | 2139 | /** |
| 2774 | - * Gets met On Submit actions. | |
| 2775 | - * | |
| 2776 | - * @since 6.0 | |
| 2777 | - * | |
| 2778 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2779 | - * @param string $event Form event. Default is `create`. | |
| 2780 | - * | |
| 2781 | - * @return array Array of actions that meet the conditional logics. | |
| 2782 | - */ | |
| 2783 | - public static function get_met_on_submit_actions( $args, $event = 'create' ) { | |
| 2784 | - if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) { | |
| 2785 | - return array(); | |
| 2786 | - } | |
| 2787 | - | |
| 2788 | - // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab. | |
| 2789 | - if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) { | |
| 2790 | - return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) ); | |
| 2791 | - } | |
| 2792 | - | |
| 2793 | - $entry = FrmEntry::getOne( $args['entry_id'], true ); | |
| 2794 | - $actions = FrmOnSubmitHelper::get_actions( $args['form']->id ); | |
| 2795 | - $met_actions = array(); | |
| 2796 | - $has_redirect = false; | |
| 2797 | - | |
| 2798 | - foreach ( $actions as $action ) { | |
| 2799 | - if ( ! in_array( $event, $action->post_content['event'], true ) ) { | |
| 2800 | - continue; | |
| 2801 | - } | |
| 2802 | - | |
| 2803 | - if ( FrmFormAction::action_conditions_met( $action, $entry ) ) { | |
| 2804 | - continue; | |
| 2805 | - } | |
| 2806 | - | |
| 2807 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2808 | - | |
| 2809 | - if ( 'redirect' === $action_type ) { | |
| 2810 | - if ( $has_redirect ) { | |
| 2811 | - // Do not process because we run the first redirect action only. | |
| 2812 | - continue; | |
| 2813 | - } | |
| 2814 | - } | |
| 2815 | - | |
| 2816 | - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) { | |
| 2817 | - continue; | |
| 2818 | - } | |
| 2819 | - | |
| 2820 | - if ( 'redirect' === $action_type ) { | |
| 2821 | - $has_redirect = true; | |
| 2822 | - } | |
| 2823 | - | |
| 2824 | - $met_actions[] = $action; | |
| 2825 | - unset( $action ); | |
| 2826 | - }//end foreach | |
| 2827 | - | |
| 2828 | - $args['event'] = $event; | |
| 2829 | - | |
| 2830 | - /** | |
| 2831 | - * Filters the On Submit actions that meet the conditional logics. | |
| 2832 | - * | |
| 2833 | - * @since 6.0 | |
| 2834 | - * | |
| 2835 | - * @param array $met_actions Actions that meet the conditional logics. | |
| 2836 | - * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added. | |
| 2837 | - */ | |
| 2838 | - $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args ); | |
| 2839 | - | |
| 2840 | - if ( ! $met_actions ) { | |
| 2841 | - return array( FrmOnSubmitHelper::get_fallback_action( $event ) ); | |
| 2842 | - } | |
| 2843 | - | |
| 2844 | - return $met_actions; | |
| 2845 | - } | |
| 2846 | - | |
| 2847 | - /** | |
| 2848 | - * Checks if a Confirmation action has the valid data. | |
| 2849 | - * | |
| 2850 | - * @since 6.1.2 | |
| 2851 | - * | |
| 2852 | - * @param object $action Form action object. | |
| 2853 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2854 | - * @param string $event Form event. Default is `create`. | |
| 2855 | - * | |
| 2856 | - * @return bool | |
| 2857 | - */ | |
| 2858 | - private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) { | |
| 2859 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2860 | - | |
| 2861 | - if ( 'redirect' === $action_type ) { | |
| 2862 | - // Run through frm_redirect_url filter. This is used for the valid action check. | |
| 2863 | - $action->post_content['success_url'] = apply_filters( | |
| 2864 | - 'frm_redirect_url', | |
| 2865 | - $action->post_content['success_url'], | |
| 2866 | - $args['form'], | |
| 2867 | - $args + array( 'action' => $event ) | |
| 2868 | - ); | |
| 2869 | - | |
| 2870 | - return ! empty( $action->post_content['success_url'] ); | |
| 2871 | - } | |
| 2872 | - | |
| 2873 | - if ( 'page' === $action_type ) { | |
| 2874 | - if ( empty( $action->post_content['success_page_id'] ) ) { | |
| 2875 | - return false; | |
| 2876 | - } | |
| 2877 | - | |
| 2878 | - $page = get_post( $action->post_content['success_page_id'] ); | |
| 2879 | - | |
| 2880 | - if ( ! $page || 'trash' === $page->post_status ) { | |
| 2881 | - return false; | |
| 2882 | - } | |
| 2883 | - } | |
| 2884 | - | |
| 2885 | - return true; | |
| 2886 | - } | |
| 2887 | - | |
| 2888 | - /** | |
| 2889 | - * Runs On Submit actions. | |
| 2890 | - * | |
| 2891 | - * @since 6.0 | |
| 2892 | - * | |
| 2893 | - * @param array $args See inside {@see FrmFormsController::get_form_contents()} method. | |
| 2894 | - */ | |
| 2895 | - public static function run_on_submit_actions( $args ) { | |
| 2896 | - $args['conf_method'] = self::get_confirmation_method( | |
| 2897 | - array( | |
| 2898 | - 'form' => $args['form'], | |
| 2899 | - 'entry_id' => $args['entry_id'], | |
| 2900 | - 'action' => FrmOnSubmitHelper::current_event( $args ), | |
| 2901 | - ) | |
| 2902 | - ); | |
| 2903 | - | |
| 2904 | - if ( ! is_array( $args['conf_method'] ) ) { | |
| 2905 | - self::run_success_action( $args ); | |
| 2906 | - return; | |
| 2907 | - } | |
| 2908 | - | |
| 2909 | - // If conf_method is an array, run On Submit actions. | |
| 2910 | - if ( ! $args['conf_method'] ) { | |
| 2911 | - // Use default message. | |
| 2912 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options ); | |
| 2913 | - self::run_success_action( $args ); | |
| 2914 | - } elseif ( 1 === count( $args['conf_method'] ) ) { | |
| 2915 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) ); | |
| 2916 | - $args['conf_method'] = $args['form']->options['success_action']; | |
| 2917 | - self::run_success_action( $args ); | |
| 2918 | - } else { | |
| 2919 | - self::run_multi_on_submit_actions( $args ); | |
| 2920 | - } | |
| 2921 | - } | |
| 2922 | - | |
| 2923 | - /** | |
| 2924 | - * Runs multiple success actions. | |
| 2925 | - * | |
| 2926 | - * @since 6.0 | |
| 2927 | - * | |
| 2928 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2929 | - */ | |
| 2930 | - public static function run_multi_on_submit_actions( $args ) { | |
| 2931 | - $redirect_action = null; | |
| 2932 | - | |
| 2933 | - foreach ( $args['conf_method'] as $action ) { | |
| 2934 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) { | |
| 2935 | - // We catch the redirect action to run it last. | |
| 2936 | - $redirect_action = $action; | |
| 2937 | - continue; | |
| 2938 | - } | |
| 2939 | - | |
| 2940 | - self::run_single_on_submit_action( $args, $action ); | |
| 2941 | - | |
| 2942 | - unset( $action ); | |
| 2943 | - } | |
| 2944 | - | |
| 2945 | - if ( ! $redirect_action ) { | |
| 2946 | - return; | |
| 2947 | - } | |
| 2948 | - | |
| 2949 | - // Show script to delay the redirection. | |
| 2950 | - $args['force_delay_redirect'] = true; | |
| 2951 | - self::run_single_on_submit_action( $args, $redirect_action ); | |
| 2952 | - } | |
| 2953 | - | |
| 2954 | - /** | |
| 2955 | - * Runs single On Submit action. | |
| 2956 | - * | |
| 2957 | - * @since 6.0 | |
| 2958 | - * | |
| 2959 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2960 | - * @param object $action On Submit action object. | |
| 2961 | - */ | |
| 2962 | - public static function run_single_on_submit_action( $args, $action ) { | |
| 2963 | - $new_args = self::get_run_success_action_args( $args, $action ); | |
| 2964 | - self::run_success_action( $new_args ); | |
| 2965 | - } | |
| 2966 | - | |
| 2967 | - /** | |
| 2968 | - * Gets run_success_action() args from the On Submit action. | |
| 2969 | - * | |
| 2970 | - * @since 6.0 | |
| 2971 | - * | |
| 2972 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2973 | - * @param object $action On Submit action object. | |
| 2974 | - * | |
| 2975 | - * @return array | |
| 2976 | - */ | |
| 2977 | - private static function get_run_success_action_args( $args, $action ) { | |
| 2978 | - $new_args = $args; | |
| 2979 | - | |
| 2980 | - FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] ); | |
| 2981 | - | |
| 2982 | - $opt = 'update' === $args['action'] ? 'edit_' : 'success_'; | |
| 2983 | - $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ]; | |
| 2984 | - | |
| 2985 | - /** | |
| 2986 | - * Filters the run success action args. | |
| 2987 | - * | |
| 2988 | - * @since 6.0 | |
| 2989 | - * | |
| 2990 | - * @param array $new_args The new args. | |
| 2991 | - * @param array $args The old args. See {@see FrmFormsController::run_success_action()}. | |
| 2992 | - * @param object $action On Submit action object. | |
| 2993 | - */ | |
| 2994 | - return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action ); | |
| 2995 | - } | |
| 2996 | - | |
| 2997 | - /** | |
| 2998 | 2140 | * @since 3.0 |
| 2999 | - * | |
| 3000 | - * @param array $args | |
| 3001 | - * | |
| 3002 | - * @return void | |
| 3003 | 2141 | */ |
| 3004 | 2142 | private static function load_page_after_submit( $args ) { |
| 3005 | 2143 | global $post; |
| 3006 | 2144 | $opt = $args['success_opt']; |
| 3007 | - | |
| 3008 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 3009 | 2145 | if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) { |
| 3010 | 2146 | $page = get_post( $args['form']->options[ $opt . '_page_id' ] ); |
| 3011 | 2147 | $old_post = $post; |
| 3012 | 2148 | $post = $page; |
| 3013 | 2149 | $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] ); |
| 3014 | - | |
| 3015 | - // Fix the On Submit page content doesn't show when previewing In theme. | |
| 3016 | - $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' ); | |
| 3017 | - | |
| 3018 | - if ( $has_preview_filter ) { | |
| 3019 | - remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 3020 | - } | |
| 3021 | - | |
| 3022 | 2150 | echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 3023 | - | |
| 3024 | - if ( $has_preview_filter ) { | |
| 3025 | - add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 3026 | - } | |
| 3027 | - | |
| 3028 | 2151 | $post = $old_post; |
| 3029 | - }//end if | |
| 2152 | + } | |
| 3030 | 2153 | } |
| 3031 | 2154 | |
| 3032 | 2155 | /** |
| 3033 | 2156 | * @since 3.0 |
| 3034 | - * | |
| 3035 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 3036 | 2157 | */ |
| 3037 | 2158 | private static function redirect_after_submit( $args ) { |
| 2159 | + global $frm_vars; | |
| 2160 | + | |
| 3038 | 2161 | add_filter( 'frm_use_wpautop', '__return_false' ); |
| 3039 | 2162 | |
| 3040 | 2163 | $opt = $args['success_opt']; |
| 3041 | 2164 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| @@ -3041,155 +2164,31 @@ | ||
| 3041 | 2164 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| 3042 | 2165 | $success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] ); |
| 3043 | 2166 | $success_url = do_shortcode( $success_url ); |
| 3044 | 2167 | |
| 2168 | + $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' ); | |
| 2169 | + | |
| 2170 | + $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args ); | |
| 2171 | + | |
| 3045 | 2172 | $args['id'] = $args['entry_id']; |
| 3046 | 2173 | FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args ); |
| 3047 | 2174 | |
| 3048 | 2175 | add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' ); |
| 3049 | 2176 | $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args ); |
| 3050 | - $doing_ajax = FrmAppHelper::doing_ajax(); | |
| 3051 | 2177 | |
| 3052 | - if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { | |
| 3053 | - // Is AJAX submit and there is just one Redirect action runs. | |
| 3054 | - echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) ); | |
| 2178 | + $doing_ajax = FrmAppHelper::doing_ajax(); | |
| 2179 | + | |
| 2180 | + if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) { | |
| 2181 | + echo json_encode( array( 'redirect' => $success_url ) ); | |
| 3055 | 2182 | wp_die(); |
| 3056 | - } | |
| 3057 | - | |
| 3058 | - if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) { | |
| 3059 | - // Not AJAX submit, no headers sent, and there is just one Redirect action runs. | |
| 3060 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 3061 | - self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ); | |
| 3062 | - self::$redirected_in_new_tab[ $args['form']->id ] = 1; | |
| 3063 | - return; | |
| 3064 | - } | |
| 3065 | - | |
| 2183 | + } elseif ( ! headers_sent() ) { | |
| 3066 | 2184 | wp_redirect( esc_url_raw( $success_url ) ); |
| 3067 | - // Do not use wp_die or redirect fails. | |
| 3068 | - die(); | |
| 3069 | - } | |
| 3070 | - | |
| 3071 | - // Redirect with a delay. | |
| 3072 | - self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) ); | |
| 3073 | - } | |
| 3074 | - | |
| 3075 | - /** | |
| 3076 | - * Prints open in new tab js with fallback handler. | |
| 3077 | - * | |
| 3078 | - * @since 6.3.1 | |
| 3079 | - * | |
| 3080 | - * @param string $success_url Success URL. | |
| 3081 | - * @param array $args See {@see FrmFormsController::redirect_after_submit()}. | |
| 3082 | - */ | |
| 3083 | - private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) { | |
| 3084 | - echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");'; | |
| 3085 | - echo 'if ( ! newTab ) {'; | |
| 3086 | - | |
| 3087 | - $data = array( | |
| 3088 | - 'formId' => intval( $args['form']->id ), | |
| 3089 | - 'message' => self::get_redirect_fallback_message( $success_url, $args ), | |
| 3090 | - ); | |
| 3091 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 3092 | - echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';'; | |
| 3093 | - echo '}</script>'; | |
| 3094 | - } | |
| 3095 | - | |
| 3096 | - /** | |
| 3097 | - * Gets response data for redirect action when AJAX submitting. | |
| 3098 | - * | |
| 3099 | - * @since 6.3.1 | |
| 3100 | - * | |
| 3101 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 3102 | - * | |
| 3103 | - * @return array | |
| 3104 | - */ | |
| 3105 | - private static function get_ajax_redirect_response_data( $args ) { | |
| 3106 | - $response_data = array( | |
| 3107 | - 'redirect' => $args['success_url'], | |
| 3108 | - 'content' => '', | |
| 3109 | - ); | |
| 3110 | - $unset_content = true; | |
| 3111 | - | |
| 3112 | - if ( ! empty( $args['form']->options['redirect_delay'] ) ) { | |
| 3113 | - $response_data['delay'] = $args['form']->options['redirect_delay_time']; | |
| 3114 | - $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args ); | |
| 3115 | - $unset_content = false; | |
| 3116 | - } | |
| 3117 | - | |
| 3118 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 3119 | - $response_data['openInNewTab'] = 1; | |
| 3120 | - | |
| 3121 | - // Only show open in new tab text if there is no delay. | |
| 3122 | - if ( empty( $response_data['content'] ) ) { | |
| 3123 | - $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg(); | |
| 3124 | - | |
| 3125 | - $args['form']->options['success_msg'] = $args['message']; | |
| 3126 | - $args['form']->options['edit_msg'] = $args['message']; | |
| 3127 | - | |
| 3128 | - if ( ! isset( $args['fields'] ) ) { | |
| 3129 | - $args['fields'] = FrmField::get_all_for_form( $args['form']->id ); | |
| 3130 | - } | |
| 3131 | - | |
| 3132 | - $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args ); | |
| 3133 | - | |
| 3134 | - ob_start(); | |
| 3135 | - self::show_lone_success_message( $args ); | |
| 3136 | - $response_data['content'] .= ob_get_clean(); | |
| 3137 | - $unset_content = false; | |
| 3138 | - }//end if | |
| 3139 | - | |
| 3140 | - $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args ); | |
| 3141 | - }//end if | |
| 3142 | - | |
| 3143 | - if ( $unset_content && '' === $response_data['content'] ) { | |
| 3144 | - unset( $response_data['content'] ); | |
| 3145 | - } | |
| 3146 | - | |
| 3147 | - return $response_data; | |
| 3148 | - } | |
| 3149 | - | |
| 3150 | - /** | |
| 3151 | - * Redirects after submitting using JS. This is used when showing message before redirecting. | |
| 3152 | - * | |
| 3153 | - * @since 6.0 | |
| 3154 | - * | |
| 3155 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 3156 | - */ | |
| 3157 | - private static function redirect_after_submit_using_js( $args ) { | |
| 3158 | - $success_msg = $args['form']->options['redirect_delay_msg']; | |
| 3159 | - $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args ); | |
| 3160 | - $success_url = esc_url_raw( $args['success_url'] ); | |
| 3161 | - | |
| 3162 | - /** | |
| 3163 | - * Filters the delay time before redirecting when On Submit Redirect action is delayed. | |
| 3164 | - * | |
| 3165 | - * @since 6.0 | |
| 3166 | - * | |
| 3167 | - * @param int $delay_time Delay time in milliseconds. | |
| 3168 | - */ | |
| 3169 | - $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] ); | |
| 3170 | - | |
| 3171 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 3172 | - $redirect_js = 'window.open("' . $success_url . '", "_blank")'; | |
| 2185 | + die(); // do not use wp_die or redirect fails | |
| 3173 | 2186 | } else { |
| 3174 | - $redirect_js = 'window.location="' . $success_url . '";'; | |
| 2187 | + add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2188 | + echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2189 | + echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>"; | |
| 3175 | 2190 | } |
| 3176 | - | |
| 3177 | - add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 3178 | - | |
| 3179 | - echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 3180 | - echo '<script>'; | |
| 3181 | - | |
| 3182 | - if ( empty( $args['doing_ajax'] ) ) { | |
| 3183 | - // Not AJAX submit, delay JS until window.load. | |
| 3184 | - echo 'window.onload=function(){'; | |
| 3185 | - } | |
| 3186 | - echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 3187 | - | |
| 3188 | - if ( empty( $args['doing_ajax'] ) ) { | |
| 3189 | - echo '};'; | |
| 3190 | - } | |
| 3191 | - echo '</script>'; | |
| 3192 | 2191 | } |
| 3193 | 2192 | |
| 3194 | 2193 | /** |
| 3195 | 2194 | * @since 3.0 |
| @@ -3195,19 +2194,15 @@ | ||
| 3195 | 2194 | * @since 3.0 |
| 3196 | 2195 | * |
| 3197 | 2196 | * @param string $success_url |
| 3198 | 2197 | * @param string $success_msg |
| 3199 | - * @param array $args | |
| 2198 | + * @param array $args | |
| 3200 | 2199 | */ |
| 3201 | 2200 | private static function get_redirect_message( $success_url, $success_msg, $args ) { |
| 3202 | - $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] ); | |
| 3203 | - $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) ); | |
| 3204 | - | |
| 3205 | - // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 3206 | - $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 3207 | - self::get_redirect_fallback_message( $success_url, $args ) . | |
| 2201 | + $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg frm_message" role="status">' . $success_msg . '<br/>' . | |
| 2202 | + /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2203 | + sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) . | |
| 3208 | 2204 | '</div></div>'; |
| 3209 | - // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 3210 | 2205 | |
| 3211 | 2206 | $redirect_args = array( |
| 3212 | 2207 | 'entry_id' => $args['entry_id'], |
| 3213 | 2208 | 'form_id' => $args['form']->id, |
| @@ -3217,59 +2212,19 @@ | ||
| 3217 | 2212 | return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args ); |
| 3218 | 2213 | } |
| 3219 | 2214 | |
| 3220 | 2215 | /** |
| 3221 | - * Gets fallback message when redirecting failed. | |
| 3222 | - * | |
| 3223 | - * @since 6.3.1 | |
| 3224 | - * | |
| 3225 | - * @param string $success_url Redirect URL. | |
| 3226 | - * @param array $args Contains `form` object. | |
| 3227 | - * | |
| 3228 | - * @return string | |
| 3229 | - */ | |
| 3230 | - private static function get_redirect_fallback_message( $success_url, $args ) { | |
| 3231 | - $target = ''; | |
| 3232 | - | |
| 3233 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 3234 | - $target = ' target="_blank"'; | |
| 3235 | - } | |
| 3236 | - | |
| 3237 | - return sprintf( | |
| 3238 | - /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 3239 | - __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), | |
| 3240 | - '<a href="' . esc_url( $success_url ) . '"' . $target . '>', | |
| 3241 | - '</a>' | |
| 3242 | - ); | |
| 3243 | - } | |
| 3244 | - | |
| 3245 | - /** | |
| 3246 | 2216 | * Prepare to show the success message and empty form after submit |
| 3247 | 2217 | * |
| 3248 | 2218 | * @since 2.05 |
| 3249 | - * | |
| 3250 | - * @param array $atts | |
| 3251 | - * | |
| 3252 | - * @return void | |
| 3253 | 2219 | */ |
| 3254 | 2220 | public static function show_message_after_save( $atts ) { |
| 3255 | - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts ); | |
| 2221 | + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] ); | |
| 3256 | 2222 | |
| 3257 | 2223 | if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) { |
| 3258 | - if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) { | |
| 3259 | - $entry = FrmEntry::getOne( $atts['entry_id'] ); | |
| 3260 | - | |
| 3261 | - if ( $entry ) { | |
| 3262 | - // This is copied from the Pro plugin. | |
| 3263 | - $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts ); | |
| 3264 | - $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] ); | |
| 3265 | - FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts ); | |
| 3266 | - } | |
| 3267 | - } else { | |
| 3268 | - self::show_form_after_submit( $atts ); | |
| 3269 | - } | |
| 2224 | + self::show_form_after_submit( $atts ); | |
| 3270 | 2225 | } else { |
| 3271 | - self::show_lone_success_message( $atts ); | |
| 2226 | + self::show_lone_success_messsage( $atts ); | |
| 3272 | 2227 | } |
| 3273 | 2228 | } |
| 3274 | 2229 | |
| 3275 | 2230 | /** |
| @@ -3275,12 +2230,8 @@ | ||
| 3275 | 2230 | /** |
| 3276 | 2231 | * Show an empty form |
| 3277 | 2232 | * |
| 3278 | 2233 | * @since 2.05 |
| 3279 | - * | |
| 3280 | - * @param array $args | |
| 3281 | - * | |
| 3282 | - * @return void | |
| 3283 | 2234 | */ |
| 3284 | 2235 | private static function show_form_after_submit( $args ) { |
| 3285 | 2236 | self::fill_atts_for_form_display( $args ); |
| 3286 | 2237 | |
| @@ -3299,11 +2250,12 @@ | ||
| 3299 | 2250 | } |
| 3300 | 2251 | unset( $args ); |
| 3301 | 2252 | |
| 3302 | 2253 | $include_form_tag = apply_filters( 'frm_include_form_tag', true, $form ); |
| 3303 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 3304 | - $submit = $form->options['submit_value'] ?? $frm_settings->submit_value; | |
| 3305 | 2254 | |
| 2255 | + $frm_settings = FrmAppHelper::get_settings(); | |
| 2256 | + $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value; | |
| 2257 | + | |
| 3306 | 2258 | global $frm_vars; |
| 3307 | 2259 | self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] ); |
| 3308 | 2260 | |
| 3309 | 2261 | $message_placement = self::message_placement( $form, $message ); |
| @@ -3311,36 +2263,27 @@ | ||
| 3311 | 2263 | include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php'; |
| 3312 | 2264 | } |
| 3313 | 2265 | |
| 3314 | 2266 | /** |
| 3315 | - * Gets message placement. | |
| 2267 | + * @return string - 'before', 'after', or 'submit' | |
| 3316 | 2268 | * |
| 3317 | 2269 | * @since 4.05.02 |
| 3318 | - * @since 6.26 This method changed from `private` to `public`. | |
| 3319 | - * | |
| 3320 | - * @param object $form Form object. | |
| 3321 | - * @param string $message The message. | |
| 3322 | - * | |
| 3323 | - * @return string Accepts 'before', 'after', or 'submit'. | |
| 3324 | 2270 | */ |
| 3325 | - public static function message_placement( $form, $message ) { | |
| 2271 | + private static function message_placement( $form, $message ) { | |
| 3326 | 2272 | $place = 'before'; |
| 3327 | 2273 | |
| 3328 | 2274 | if ( $message && isset( $form->options['form_class'] ) ) { |
| 3329 | - if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) { | |
| 2275 | + if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) { | |
| 3330 | 2276 | $place = 'after'; |
| 3331 | - } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) { | |
| 2277 | + } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) { | |
| 3332 | 2278 | $place = 'submit'; |
| 3333 | 2279 | } |
| 3334 | 2280 | } |
| 3335 | 2281 | |
| 3336 | 2282 | /** |
| 3337 | - * Filter the message placement. | |
| 2283 | + * @return string - 'before' or 'after' | |
| 3338 | 2284 | * |
| 3339 | 2285 | * @since 4.05.02 |
| 3340 | - * | |
| 3341 | - * @param string $place Accepts 'before', 'after', or 'submit'. | |
| 3342 | - * @param array $args Args. | |
| 3343 | 2286 | */ |
| 3344 | 2287 | return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) ); |
| 3345 | 2288 | } |
| 3346 | 2289 | |
| @@ -3347,22 +2290,10 @@ | ||
| 3347 | 2290 | /** |
| 3348 | 2291 | * Get all the values needed on the new.php entry page |
| 3349 | 2292 | * |
| 3350 | 2293 | * @since 2.05 |
| 3351 | - * | |
| 3352 | - * @param array $args | |
| 3353 | - * | |
| 3354 | - * @return void | |
| 3355 | 2294 | */ |
| 3356 | 2295 | private static function fill_atts_for_form_display( &$args ) { |
| 3357 | - if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) { | |
| 3358 | - $args['title'] = $args['show_title']; | |
| 3359 | - } | |
| 3360 | - | |
| 3361 | - if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) { | |
| 3362 | - $args['description'] = $args['show_description']; | |
| 3363 | - } | |
| 3364 | - | |
| 3365 | 2296 | $defaults = array( |
| 3366 | 2297 | 'errors' => array(), |
| 3367 | 2298 | 'message' => '', |
| 3368 | 2299 | 'fields' => array(), |
| @@ -3377,24 +2308,21 @@ | ||
| 3377 | 2308 | /** |
| 3378 | 2309 | * Show the success message without the form |
| 3379 | 2310 | * |
| 3380 | 2311 | * @since 2.05 |
| 3381 | - * | |
| 3382 | - * @param array $atts | |
| 3383 | - * | |
| 3384 | - * @return void | |
| 3385 | 2312 | */ |
| 3386 | - private static function show_lone_success_message( $atts ) { | |
| 2313 | + private static function show_lone_success_messsage( $atts ) { | |
| 3387 | 2314 | global $frm_vars; |
| 3388 | 2315 | $values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true ); |
| 3389 | 2316 | self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] ); |
| 3390 | 2317 | |
| 3391 | 2318 | $include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values ); |
| 3392 | - $errors = array(); | |
| 3393 | - $form = $atts['form']; | |
| 3394 | - $message = $atts['message']; | |
| 3395 | 2319 | |
| 3396 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php'; | |
| 2320 | + $errors = array(); | |
| 2321 | + $form = $atts['form']; | |
| 2322 | + $message = $atts['message']; | |
| 2323 | + | |
| 2324 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' ); | |
| 3397 | 2325 | } |
| 3398 | 2326 | |
| 3399 | 2327 | /** |
| 3400 | 2328 | * Prepare the success message before it's shown |
| @@ -3399,22 +2327,14 @@ | ||
| 3399 | 2327 | /** |
| 3400 | 2328 | * Prepare the success message before it's shown |
| 3401 | 2329 | * |
| 3402 | 2330 | * @since 2.05 |
| 3403 | - * @since 6.0.x Added the third parameter. | |
| 3404 | - * | |
| 3405 | - * @param object $form Form object. | |
| 3406 | - * @param int|string $entry_id Entry ID. | |
| 3407 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 3408 | - * | |
| 3409 | - * @return string | |
| 3410 | 2331 | */ |
| 3411 | - private static function prepare_submit_message( $form, $entry_id, $args = array() ) { | |
| 2332 | + private static function prepare_submit_message( $form, $entry_id ) { | |
| 3412 | 2333 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 3413 | - $opt = $args['success_opt'] ?? 'success'; | |
| 3414 | 2334 | |
| 3415 | 2335 | if ( $entry_id && is_numeric( $entry_id ) ) { |
| 3416 | - $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg; | |
| 2336 | + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg; | |
| 3417 | 2337 | $class = 'frm_message'; |
| 3418 | 2338 | } else { |
| 3419 | 2339 | $message = $frm_settings->failed_msg; |
| 3420 | 2340 | $class = FrmFormsHelper::form_error_class(); |
| @@ -3424,16 +2344,13 @@ | ||
| 3424 | 2344 | |
| 3425 | 2345 | return apply_filters( 'frm_main_feedback', $message, $form, $entry_id ); |
| 3426 | 2346 | } |
| 3427 | 2347 | |
| 3428 | - /** | |
| 3429 | - * @return void | |
| 3430 | - */ | |
| 3431 | 2348 | public static function front_head() { |
| 3432 | 2349 | $version = FrmAppHelper::plugin_version(); |
| 3433 | 2350 | $suffix = FrmAppHelper::js_suffix(); |
| 3434 | 2351 | |
| 3435 | - if ( $suffix && self::has_combo_js_file() ) { | |
| 2352 | + if ( ! empty( $suffix ) && self::has_combo_js_file() ) { | |
| 3436 | 2353 | wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true ); |
| 3437 | 2354 | } else { |
| 3438 | 2355 | wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true ); |
| 3439 | 2356 | } |
| @@ -3440,9 +2357,9 @@ | ||
| 3440 | 2357 | |
| 3441 | 2358 | add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 ); |
| 3442 | 2359 | |
| 3443 | 2360 | if ( FrmAppHelper::is_admin() ) { |
| 3444 | - // Don't load this in back-end | |
| 2361 | + // don't load this in back-end | |
| 3445 | 2362 | return; |
| 3446 | 2363 | } |
| 3447 | 2364 | |
| 3448 | 2365 | FrmAppHelper::localize_script( 'front' ); |
| @@ -3455,15 +2372,8 @@ | ||
| 3455 | 2372 | public static function has_combo_js_file() { |
| 3456 | 2373 | return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' ); |
| 3457 | 2374 | } |
| 3458 | 2375 | |
| 3459 | - /** | |
| 3460 | - * @param object $form | |
| 3461 | - * @param int|string $this_load | |
| 3462 | - * @param bool $global_load | |
| 3463 | - * | |
| 3464 | - * @return void | |
| 3465 | - */ | |
| 3466 | 2376 | public static function maybe_load_css( $form, $this_load, $global_load ) { |
| 3467 | 2377 | $load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load ); |
| 3468 | 2378 | |
| 3469 | 2379 | if ( ! $load_css ) { |
| @@ -3493,9 +2403,8 @@ | ||
| 3493 | 2403 | return; |
| 3494 | 2404 | } |
| 3495 | 2405 | |
| 3496 | 2406 | global $wp_styles; |
| 3497 | - | |
| 3498 | 2407 | if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) { |
| 3499 | 2408 | wp_print_styles( 'formidable' ); |
| 3500 | 2409 | } |
| 3501 | 2410 | } |
| @@ -3510,52 +2419,32 @@ | ||
| 3510 | 2419 | private static function should_load_late() { |
| 3511 | 2420 | return ! function_exists( 'aioseo' ); |
| 3512 | 2421 | } |
| 3513 | 2422 | |
| 3514 | - /** | |
| 3515 | - * @param string $tag | |
| 3516 | - * @param string $handle | |
| 3517 | - * | |
| 3518 | - * @return string | |
| 3519 | - */ | |
| 3520 | 2423 | public static function defer_script_loading( $tag, $handle ) { |
| 3521 | - if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) { | |
| 3522 | - return str_replace( ' src', ' defer="defer" async="async" src', $tag ); | |
| 2424 | + if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2425 | + $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag ); | |
| 3523 | 2426 | } |
| 3524 | 2427 | |
| 3525 | 2428 | return $tag; |
| 3526 | 2429 | } |
| 3527 | 2430 | |
| 3528 | - /** | |
| 3529 | - * @param string $location | |
| 3530 | - * | |
| 3531 | - * @return void | |
| 3532 | - */ | |
| 3533 | 2431 | public static function footer_js( $location = 'footer' ) { |
| 3534 | 2432 | global $frm_vars; |
| 3535 | 2433 | |
| 3536 | 2434 | FrmStylesController::enqueue_css(); |
| 3537 | 2435 | |
| 3538 | - if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) { | |
| 3539 | - return; | |
| 2436 | + if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) { | |
| 2437 | + // load formidable js | |
| 2438 | + wp_enqueue_script( 'formidable' ); | |
| 3540 | 2439 | } |
| 3541 | - | |
| 3542 | - // Load formidable js | |
| 3543 | - wp_enqueue_script( 'formidable' ); | |
| 3544 | - | |
| 3545 | - FrmHoneypot::maybe_print_honeypot_js(); | |
| 3546 | 2440 | } |
| 3547 | 2441 | |
| 3548 | 2442 | /** |
| 3549 | 2443 | * @since 2.0.8 |
| 3550 | - * | |
| 3551 | - * @param array $atts | |
| 3552 | - * @param string $content | |
| 3553 | - * | |
| 3554 | - * @return void | |
| 3555 | 2444 | */ |
| 3556 | 2445 | private static function maybe_minimize_form( $atts, &$content ) { |
| 3557 | - // Check if minimizing is turned on | |
| 2446 | + // check if minimizing is turned on | |
| 3558 | 2447 | if ( self::is_minification_on( $atts ) ) { |
| 3559 | 2448 | $content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content ); |
| 3560 | 2449 | } |
| 3561 | 2450 | } |
| @@ -3561,15 +2450,12 @@ | ||
| 3561 | 2450 | } |
| 3562 | 2451 | |
| 3563 | 2452 | /** |
| 3564 | 2453 | * @since 2.0.8 |
| 3565 | - * | |
| 3566 | - * @param array $atts | |
| 3567 | - * | |
| 3568 | - * @return bool | |
| 2454 | + * @return boolean | |
| 3569 | 2455 | */ |
| 3570 | 2456 | private static function is_minification_on( $atts ) { |
| 3571 | - return ! empty( $atts['minimize'] ); | |
| 2457 | + return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] ); | |
| 3572 | 2458 | } |
| 3573 | 2459 | |
| 3574 | 2460 | /** |
| 3575 | 2461 | * @since 5.0.16 |
| @@ -3577,13 +2463,11 @@ | ||
| 3577 | 2463 | * @return void |
| 3578 | 2464 | */ |
| 3579 | 2465 | public static function landing_page_preview_option() { |
| 3580 | 2466 | $dir = apply_filters( 'frm_landing_page_preview_option', false ); |
| 3581 | - | |
| 3582 | 2467 | if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) { |
| 3583 | 2468 | $dir = self::get_form_views_path(); |
| 3584 | 2469 | } |
| 3585 | - | |
| 3586 | 2470 | include $dir . 'landing-page-preview-option.php'; |
| 3587 | 2471 | } |
| 3588 | 2472 | |
| 3589 | 2473 | /** |
| @@ -3599,9 +2483,9 @@ | ||
| 3599 | 2483 | * Create a page with an embedded formidable Gutenberg block. |
| 3600 | 2484 | * |
| 3601 | 2485 | * @since 5.2 |
| 3602 | 2486 | * |
| 3603 | - * @return void | |
| 2487 | + * @return never | |
| 3604 | 2488 | */ |
| 3605 | 2489 | public static function create_page_with_shortcode() { |
| 3606 | 2490 | if ( ! current_user_can( 'publish_posts' ) ) { |
| 3607 | 2491 | die( 0 ); |
| @@ -3609,15 +2493,13 @@ | ||
| 3609 | 2493 | |
| 3610 | 2494 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 3611 | 2495 | |
| 3612 | 2496 | $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' ); |
| 3613 | - | |
| 3614 | 2497 | if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) { |
| 3615 | 2498 | die( 0 ); |
| 3616 | 2499 | } |
| 3617 | 2500 | |
| 3618 | 2501 | $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' ); |
| 3619 | - | |
| 3620 | 2502 | if ( ! $object_id ) { |
| 3621 | 2503 | die( 0 ); |
| 3622 | 2504 | } |
| 3623 | 2505 | |
| @@ -3629,15 +2511,13 @@ | ||
| 3629 | 2511 | $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id ); |
| 3630 | 2512 | } |
| 3631 | 2513 | |
| 3632 | 2514 | $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' ); |
| 3633 | - | |
| 3634 | 2515 | if ( $name ) { |
| 3635 | 2516 | $postarr['post_title'] = $name; |
| 3636 | 2517 | } |
| 3637 | 2518 | |
| 3638 | 2519 | $success = wp_insert_post( $postarr ); |
| 3639 | - | |
| 3640 | 2520 | if ( ! is_numeric( $success ) || ! $success ) { |
| 3641 | 2521 | die( 0 ); |
| 3642 | 2522 | } |
| 3643 | 2523 | |
| @@ -3650,10 +2530,10 @@ | ||
| 3650 | 2530 | |
| 3651 | 2531 | /** |
| 3652 | 2532 | * @since 5.3 |
| 3653 | 2533 | * |
| 3654 | - * @param int $form_id | |
| 3655 | - * | |
| 2534 | + * @param string $content | |
| 2535 | + * @param int $form_id | |
| 3656 | 2536 | * @return string |
| 3657 | 2537 | */ |
| 3658 | 2538 | private static function get_page_shortcode_content_for_form( $form_id ) { |
| 3659 | 2539 | $shortcode = '[formidable id="' . $form_id . '"]'; |
| @@ -3664,9 +2544,9 @@ | ||
| 3664 | 2544 | |
| 3665 | 2545 | /** |
| 3666 | 2546 | * Get page dropdown for AJAX request for embedding form in an existing page. |
| 3667 | 2547 | * |
| 3668 | - * @return void | |
| 2548 | + * @return never | |
| 3669 | 2549 | */ |
| 3670 | 2550 | public static function get_page_dropdown() { |
| 3671 | 2551 | if ( ! current_user_can( 'publish_posts' ) ) { |
| 3672 | 2552 | die( 0 ); |
| @@ -3674,9 +2554,9 @@ | ||
| 3674 | 2554 | |
| 3675 | 2555 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 3676 | 2556 | |
| 3677 | 2557 | $html = FrmAppHelper::clip( |
| 3678 | - function () { | |
| 2558 | + function() { | |
| 3679 | 2559 | FrmAppHelper::maybe_autocomplete_pages_options( |
| 3680 | 2560 | array( |
| 3681 | 2561 | 'field_name' => 'frm_page_dropdown', |
| 3682 | 2562 | 'page_id' => '', |
| @@ -3695,14 +2575,65 @@ | ||
| 3695 | 2575 | } |
| 3696 | 2576 | |
| 3697 | 2577 | /** |
| 3698 | 2578 | * @deprecated 4.0 |
| 3699 | - * | |
| 3700 | - * @param array $values | |
| 3701 | - * | |
| 3702 | - * @return void | |
| 3703 | 2579 | */ |
| 2580 | + public static function new_form( $values = array() ) { | |
| 2581 | + FrmDeprecated::new_form( $values ); | |
| 2582 | + } | |
| 2583 | + | |
| 2584 | + /** | |
| 2585 | + * @deprecated 4.0 | |
| 2586 | + */ | |
| 3704 | 2587 | public static function create( $values = array() ) { |
| 3705 | 2588 | _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' ); |
| 3706 | 2589 | self::update( $values ); |
| 2590 | + } | |
| 2591 | + | |
| 2592 | + /** | |
| 2593 | + * @deprecated 1.07.05 | |
| 2594 | + * @codeCoverageIgnore | |
| 2595 | + */ | |
| 2596 | + public static function add_default_templates( $path, $default = true, $template = true ) { | |
| 2597 | + FrmDeprecated::add_default_templates( $path, $default, $template ); | |
| 2598 | + } | |
| 2599 | + | |
| 2600 | + /** | |
| 2601 | + * @deprecated 3.0 | |
| 2602 | + * @codeCoverageIgnore | |
| 2603 | + */ | |
| 2604 | + public static function bulk_create_template( $ids ) { | |
| 2605 | + return FrmDeprecated::bulk_create_template( $ids ); | |
| 2606 | + } | |
| 2607 | + | |
| 2608 | + /** | |
| 2609 | + * @deprecated 2.03 | |
| 2610 | + * @codeCoverageIgnore | |
| 2611 | + */ | |
| 2612 | + public static function register_pro_scripts() { | |
| 2613 | + FrmDeprecated::register_pro_scripts(); | |
| 2614 | + } | |
| 2615 | + | |
| 2616 | + /** | |
| 2617 | + * @deprecated 3.0 | |
| 2618 | + * @codeCoverageIgnore | |
| 2619 | + */ | |
| 2620 | + public static function edit_key() { | |
| 2621 | + FrmDeprecated::edit_key(); | |
| 2622 | + } | |
| 2623 | + | |
| 2624 | + /** | |
| 2625 | + * @deprecated 3.0 | |
| 2626 | + * @codeCoverageIgnore | |
| 2627 | + */ | |
| 2628 | + public static function edit_description() { | |
| 2629 | + FrmDeprecated::edit_description(); | |
| 2630 | + } | |
| 2631 | + | |
| 2632 | + /** | |
| 2633 | + * @deprecated 4.08 | |
| 2634 | + * @since 3.06 | |
| 2635 | + */ | |
| 2636 | + public static function add_new() { | |
| 2637 | + _deprecated_function( __FUNCTION__, '4.08' ); | |
| 3707 | 2638 | } |
| 3708 | 2639 | } |
