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