| @@ -6,10 +6,9 @@ | ||
| 6 | 6 | class FrmForm { |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * @param array $values |
| 10 | - * | |
| 11 | - * @return bool|int id on success or false on failure. | |
| 10 | + * @return int|boolean id on success or false on failure | |
| 12 | 11 | */ |
| 13 | 12 | public static function create( $values ) { |
| 14 | 13 | global $wpdb; |
| 15 | 14 | |
| @@ -18,22 +17,22 @@ | ||
| 18 | 17 | $new_values = array( |
| 19 | 18 | 'form_key' => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ), |
| 20 | 19 | 'name' => $values['name'], |
| 21 | 20 | 'description' => $values['description'], |
| 22 | - 'status' => $values['status'] ?? 'published', | |
| 23 | - 'logged_in' => $values['logged_in'] ?? 0, | |
| 21 | + 'status' => isset( $values['status'] ) ? $values['status'] : 'published', | |
| 22 | + 'logged_in' => isset( $values['logged_in'] ) ? $values['logged_in'] : 0, | |
| 24 | 23 | 'is_template' => isset( $values['is_template'] ) ? (int) $values['is_template'] : 0, |
| 25 | 24 | 'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0, |
| 26 | 25 | 'editable' => isset( $values['editable'] ) ? (int) $values['editable'] : 0, |
| 27 | - 'created_at' => $values['created_at'] ?? current_time( 'mysql', 1 ), | |
| 26 | + 'created_at' => isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 ), | |
| 28 | 27 | ); |
| 29 | 28 | |
| 30 | 29 | $options = isset( $values['options'] ) ? (array) $values['options'] : array(); |
| 31 | 30 | FrmFormsHelper::fill_form_options( $options, $values ); |
| 32 | 31 | |
| 33 | - $options['before_html'] = $values['options']['before_html'] ?? FrmFormsHelper::get_default_html( 'before' ); | |
| 34 | - $options['after_html'] = $values['options']['after_html'] ?? FrmFormsHelper::get_default_html( 'after' ); | |
| 35 | - $options['submit_html'] = $values['options']['submit_html'] ?? FrmFormsHelper::get_default_html( 'submit' ); | |
| 32 | + $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' ); | |
| 33 | + $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' ); | |
| 34 | + $options['submit_html'] = isset( $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' ); | |
| 36 | 35 | |
| 37 | 36 | /** |
| 38 | 37 | * Allows modifying form options before updating or creating. |
| 39 | 38 | * |
| @@ -60,9 +59,8 @@ | ||
| 60 | 59 | /** |
| 61 | 60 | * @since 5.0.08 |
| 62 | 61 | * |
| 63 | 62 | * @param array $options |
| 64 | - * | |
| 65 | 63 | * @return array |
| 66 | 64 | */ |
| 67 | 65 | private static function maybe_filter_form_options( $options ) { |
| 68 | 66 | if ( ! FrmAppHelper::allow_unfiltered_html() && ! empty( $options['submit_html'] ) ) { |
| @@ -71,22 +69,14 @@ | ||
| 71 | 69 | return FrmAppHelper::maybe_filter_array( $options, array( 'submit_value', 'success_msg', 'before_html', 'after_html' ) ); |
| 72 | 70 | } |
| 73 | 71 | |
| 74 | 72 | /** |
| 75 | - * Duplicate a form. | |
| 76 | - * | |
| 77 | - * @param int $id Form ID to duplicate. | |
| 78 | - * @param bool $template Whether the duplicated form is a template. | |
| 79 | - * @param bool $copy_keys Whether to copy the original form key. | |
| 80 | - * @param false|int $blog_id Blog ID when duplicating across sites, or false for current site. | |
| 81 | - * | |
| 82 | - * @return bool|int ID on success or false on failure | |
| 73 | + * @return int|boolean ID on success or false on failure | |
| 83 | 74 | */ |
| 84 | 75 | public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) { |
| 85 | 76 | global $wpdb; |
| 86 | 77 | |
| 87 | 78 | $values = self::getOne( $id, $blog_id ); |
| 88 | - | |
| 89 | 79 | if ( ! $values ) { |
| 90 | 80 | return false; |
| 91 | 81 | } |
| 92 | 82 | |
| @@ -103,10 +93,10 @@ | ||
| 103 | 93 | 'is_template' => $template ? 1 : 0, |
| 104 | 94 | ); |
| 105 | 95 | |
| 106 | 96 | if ( $blog_id ) { |
| 107 | - $new_values['status'] = 'published'; | |
| 108 | - $new_options = $values->options; | |
| 97 | + $new_values['status'] = 'published'; | |
| 98 | + $new_options = $values->options; | |
| 109 | 99 | FrmAppHelper::unserialize_or_decode( $new_options ); |
| 110 | 100 | $new_options['email_to'] = get_option( 'admin_email' ); |
| 111 | 101 | $new_options['copy'] = false; |
| 112 | 102 | $new_values['options'] = $new_options; |
| @@ -126,9 +116,9 @@ | ||
| 126 | 116 | |
| 127 | 117 | $form_id = $wpdb->insert_id; |
| 128 | 118 | FrmField::duplicate( $id, $form_id, $copy_keys, $blog_id ); |
| 129 | 119 | |
| 130 | - // Update form settings after fields are created | |
| 120 | + // update form settings after fields are created | |
| 131 | 121 | do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) ); |
| 132 | 122 | |
| 133 | 123 | return $form_id; |
| 134 | 124 | } |
| @@ -135,16 +125,10 @@ | ||
| 135 | 125 | |
| 136 | 126 | return false; |
| 137 | 127 | } |
| 138 | 128 | |
| 139 | - /** | |
| 140 | - * @param int $form_id | |
| 141 | - * @param array $values | |
| 142 | - * | |
| 143 | - * @return void | |
| 144 | - */ | |
| 145 | 129 | public static function after_duplicate( $form_id, $values ) { |
| 146 | - $new_opts = $values['options']; | |
| 130 | + $new_opts = $values['options']; | |
| 147 | 131 | FrmAppHelper::unserialize_or_decode( $new_opts ); |
| 148 | 132 | $values['options'] = $new_opts; |
| 149 | 133 | |
| 150 | 134 | if ( isset( $new_opts['success_msg'] ) ) { |
| @@ -152,9 +136,8 @@ | ||
| 152 | 136 | } |
| 153 | 137 | |
| 154 | 138 | $new_opts = apply_filters( 'frm_after_duplicate_form_values', $new_opts, $form_id ); |
| 155 | 139 | |
| 156 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 157 | 140 | if ( $new_opts != $values['options'] ) { |
| 158 | 141 | global $wpdb; |
| 159 | 142 | $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $new_opts ) ), array( 'id' => $form_id ) ); |
| 160 | 143 | } |
| @@ -167,10 +150,8 @@ | ||
| 167 | 150 | * |
| 168 | 151 | * @since 5.3 |
| 169 | 152 | * |
| 170 | 153 | * @param int $form_id Form ID. |
| 171 | - * | |
| 172 | - * @return void | |
| 173 | 154 | */ |
| 174 | 155 | private static function switch_field_ids_in_fields( $form_id ) { |
| 175 | 156 | global $wpdb; |
| 176 | 157 | |
| @@ -176,11 +157,10 @@ | ||
| 176 | 157 | |
| 177 | 158 | // Keys of fields that you want to check to replace field ID. |
| 178 | 159 | $keys = array( 'default_value', 'field_options' ); |
| 179 | 160 | $sql_cols = 'fi.id'; |
| 180 | - | |
| 181 | 161 | foreach ( $keys as $key ) { |
| 182 | - $sql_cols .= ',fi.' . $key; | |
| 162 | + $sql_cols .= ( ',fi.' . $key ); | |
| 183 | 163 | } |
| 184 | 164 | |
| 185 | 165 | $fields = FrmDb::get_results( |
| 186 | 166 | "{$wpdb->prefix}frm_fields AS fi LEFT OUTER JOIN {$wpdb->prefix}frm_forms AS fr ON fi.form_id = fr.id", |
| @@ -206,14 +186,11 @@ | ||
| 206 | 186 | * |
| 207 | 187 | * @since 5.3 |
| 208 | 188 | * |
| 209 | 189 | * @param array $field Field array. |
| 210 | - * | |
| 211 | - * @return void | |
| 212 | 190 | */ |
| 213 | 191 | private static function switch_field_ids_in_field( $field ) { |
| 214 | 192 | $new_values = array(); |
| 215 | - | |
| 216 | 193 | foreach ( $field as $key => $value ) { |
| 217 | 194 | if ( 'id' === $key || ! $value ) { |
| 218 | 195 | continue; |
| 219 | 196 | } |
| @@ -233,23 +210,17 @@ | ||
| 233 | 210 | |
| 234 | 211 | if ( $new_val !== $value ) { |
| 235 | 212 | $new_values[ $key ] = $new_val; |
| 236 | 213 | } |
| 237 | - }//end foreach | |
| 214 | + } | |
| 238 | 215 | |
| 239 | - if ( $new_values ) { | |
| 216 | + if ( ! empty( $new_values ) ) { | |
| 240 | 217 | FrmField::update( $field['id'], $new_values ); |
| 241 | 218 | } |
| 242 | 219 | } |
| 243 | 220 | |
| 244 | 221 | /** |
| 245 | - * Update a form. | |
| 246 | - * | |
| 247 | - * @param int $id Form ID. | |
| 248 | - * @param array $values Form values to update. | |
| 249 | - * @param bool $create_link Whether this is being called from link creation. | |
| 250 | - * | |
| 251 | - * @return bool|int | |
| 222 | + * @return int|boolean | |
| 252 | 223 | */ |
| 253 | 224 | public static function update( $id, $values, $create_link = false ) { |
| 254 | 225 | global $wpdb; |
| 255 | 226 | |
| @@ -263,23 +234,23 @@ | ||
| 263 | 234 | $values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id ); |
| 264 | 235 | } |
| 265 | 236 | |
| 266 | 237 | $form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' ); |
| 267 | - $new_values = self::set_update_options( array(), $values, array( 'form_id' => $id ) ); | |
| 268 | 238 | |
| 239 | + $new_values = self::set_update_options( array(), $values, array( 'form_id' => $id ) ); | |
| 240 | + | |
| 269 | 241 | foreach ( $values as $value_key => $value ) { |
| 270 | - if ( $value_key && in_array( $value_key, $form_fields, true ) ) { | |
| 242 | + if ( $value_key && in_array( $value_key, $form_fields ) ) { | |
| 271 | 243 | $new_values[ $value_key ] = $value; |
| 272 | 244 | } |
| 273 | 245 | } |
| 274 | 246 | |
| 275 | - if ( ! empty( $values['new_status'] ) ) { | |
| 247 | + if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) { | |
| 276 | 248 | $new_values['status'] = $values['new_status']; |
| 277 | 249 | } |
| 278 | 250 | |
| 279 | - if ( $new_values ) { | |
| 251 | + if ( ! empty( $new_values ) ) { | |
| 280 | 252 | $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $id ) ); |
| 281 | - | |
| 282 | 253 | if ( $query_results ) { |
| 283 | 254 | self::clear_form_cache(); |
| 284 | 255 | } |
| 285 | 256 | } else { |
| @@ -298,9 +269,8 @@ | ||
| 298 | 269 | /** |
| 299 | 270 | * @param array $new_values |
| 300 | 271 | * @param array $values |
| 301 | 272 | * @param array $args |
| 302 | - * | |
| 303 | 273 | * @return array |
| 304 | 274 | */ |
| 305 | 275 | public static function set_update_options( $new_values, $values, $args = array() ) { |
| 306 | 276 | if ( ! isset( $values['options'] ) ) { |
| @@ -306,16 +276,21 @@ | ||
| 306 | 276 | if ( ! isset( $values['options'] ) ) { |
| 307 | 277 | return $new_values; |
| 308 | 278 | } |
| 309 | 279 | |
| 310 | - $options = ! empty( $values['options'] ) ? (array) $values['options'] : array(); | |
| 280 | + $options = isset( $values['options'] ) ? (array) $values['options'] : array(); | |
| 311 | 281 | FrmFormsHelper::fill_form_options( $options, $values ); |
| 312 | 282 | |
| 313 | - $options['custom_style'] = $values['options']['custom_style'] ?? 0; | |
| 314 | - $options['before_html'] = $values['options']['before_html'] ?? FrmFormsHelper::get_default_html( 'before' ); | |
| 315 | - $options['after_html'] = $values['options']['after_html'] ?? FrmFormsHelper::get_default_html( 'after' ); | |
| 316 | - $options['submit_html'] = isset( $values['options']['submit_html'] ) && '' !== $values['options']['submit_html'] ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 283 | + $options['custom_style'] = isset( $values['options']['custom_style'] ) ? $values['options']['custom_style'] : 0; | |
| 284 | + $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' ); | |
| 285 | + $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' ); | |
| 286 | + $options['submit_html'] = ( isset( $values['options']['submit_html'] ) && '' !== $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' ); | |
| 317 | 287 | |
| 288 | + if ( ! empty( $options['success_url'] ) && ! empty( $args['form_id'] ) ) { | |
| 289 | + $options['success_url'] = FrmFormsHelper::maybe_add_sanitize_url_attr( $options['success_url'], (int) $args['form_id'] ); | |
| 290 | + $values['options']['success_url'] = $options['success_url']; | |
| 291 | + } | |
| 292 | + | |
| 318 | 293 | /** |
| 319 | 294 | * Allows modifying form options before updating or creating. |
| 320 | 295 | * |
| 321 | 296 | * @since 5.4 Added the third param. |
| @@ -331,14 +306,11 @@ | ||
| 331 | 306 | return $new_values; |
| 332 | 307 | } |
| 333 | 308 | |
| 334 | 309 | /** |
| 335 | - * @param int $id Form ID. | |
| 336 | - * @param array $values Form values array. | |
| 337 | - * | |
| 338 | 310 | * @return array |
| 339 | 311 | */ |
| 340 | - public static function update_fields( $id, $values ) { // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh | |
| 312 | + public static function update_fields( $id, $values ) { | |
| 341 | 313 | |
| 342 | 314 | if ( ! isset( $values['item_meta'] ) && ! isset( $values['field_options'] ) ) { |
| 343 | 315 | return $values; |
| 344 | 316 | } |
| @@ -343,10 +315,9 @@ | ||
| 343 | 315 | return $values; |
| 344 | 316 | } |
| 345 | 317 | |
| 346 | 318 | $all_fields = FrmField::get_all_for_form( $id ); |
| 347 | - | |
| 348 | - if ( ! $all_fields ) { | |
| 319 | + if ( empty( $all_fields ) ) { | |
| 349 | 320 | return $values; |
| 350 | 321 | } |
| 351 | 322 | |
| 352 | 323 | if ( ! isset( $values['item_meta'] ) ) { |
| @@ -354,28 +325,28 @@ | ||
| 354 | 325 | } |
| 355 | 326 | |
| 356 | 327 | $field_array = array(); |
| 357 | 328 | $existing_keys = array_keys( $values['item_meta'] ); |
| 358 | - | |
| 359 | 329 | foreach ( $all_fields as $fid ) { |
| 360 | - // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 361 | 330 | if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) { |
| 362 | 331 | $values['item_meta'][ $fid->id ] = ''; |
| 363 | 332 | } |
| 364 | - | |
| 365 | 333 | $field_array[ $fid->id ] = $fid; |
| 366 | 334 | } |
| 367 | 335 | unset( $all_fields ); |
| 368 | 336 | |
| 369 | 337 | foreach ( $values['item_meta'] as $field_id => $default_value ) { |
| 370 | - $field = $field_array[ $field_id ] ?? FrmField::getOne( $field_id ); | |
| 338 | + if ( isset( $field_array[ $field_id ] ) ) { | |
| 339 | + $field = $field_array[ $field_id ]; | |
| 340 | + } else { | |
| 341 | + $field = FrmField::getOne( $field_id ); | |
| 342 | + } | |
| 371 | 343 | |
| 372 | 344 | if ( ! $field ) { |
| 373 | 345 | continue; |
| 374 | 346 | } |
| 375 | 347 | |
| 376 | - $is_settings_page = isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ); | |
| 377 | - | |
| 348 | + $is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ); | |
| 378 | 349 | if ( $is_settings_page ) { |
| 379 | 350 | self::get_settings_page_html( $values, $field ); |
| 380 | 351 | |
| 381 | 352 | if ( ! defined( 'WP_IMPORTING' ) ) { |
| @@ -382,20 +353,15 @@ | ||
| 382 | 353 | continue; |
| 383 | 354 | } |
| 384 | 355 | } |
| 385 | 356 | |
| 386 | - // Updating the form. | |
| 357 | + //updating the form | |
| 387 | 358 | $update_options = FrmFieldsHelper::get_default_field_options_from_field( $field ); |
| 388 | - // Don't check for POST html. | |
| 389 | - unset( $update_options['custom_html'] ); | |
| 359 | + unset( $update_options['custom_html'] ); // don't check for POST html | |
| 390 | 360 | $update_options = apply_filters( 'frm_field_options_to_update', $update_options ); |
| 391 | 361 | |
| 392 | - if ( ! is_array( $field->field_options ) ) { | |
| 393 | - $field->field_options = array(); | |
| 394 | - } | |
| 395 | - | |
| 396 | 362 | foreach ( $update_options as $opt => $default ) { |
| 397 | - $field->field_options[ $opt ] = $values['field_options'][ $opt . '_' . $field_id ] ?? $default; | |
| 363 | + $field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default; | |
| 398 | 364 | self::sanitize_field_opt( $opt, $field->field_options[ $opt ] ); |
| 399 | 365 | } |
| 400 | 366 | |
| 401 | 367 | $field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values ); |
| @@ -404,100 +370,44 @@ | ||
| 404 | 370 | 'field_options' => $field->field_options, |
| 405 | 371 | 'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '', |
| 406 | 372 | ); |
| 407 | 373 | |
| 408 | - if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 409 | - foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) { | |
| 410 | - if ( is_array( $option ) ) { | |
| 411 | - foreach ( $option as $key => $item ) { | |
| 412 | - $values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' ); | |
| 413 | - } | |
| 414 | - } | |
| 415 | - } | |
| 416 | - } | |
| 417 | - | |
| 418 | 374 | self::prepare_field_update_values( $field, $values, $new_field ); |
| 419 | - self::maybe_update_max_option( $field, $values, $new_field ); | |
| 420 | 375 | |
| 421 | 376 | FrmField::update( $field_id, $new_field ); |
| 422 | 377 | |
| 423 | 378 | FrmField::delete_form_transient( $field->form_id ); |
| 424 | - }//end foreach | |
| 379 | + } | |
| 425 | 380 | self::clear_form_cache(); |
| 426 | 381 | |
| 427 | 382 | return $values; |
| 428 | 383 | } |
| 429 | 384 | |
| 430 | - /** | |
| 431 | - * Resets the 'max' option of a field when changing paragraph field type to other field types like text, email etc. | |
| 432 | - * | |
| 433 | - * @since 6.7 | |
| 434 | - * | |
| 435 | - * @param object $field | |
| 436 | - * @param array $values | |
| 437 | - * @param array $new_field | |
| 438 | - * | |
| 439 | - * @return void | |
| 440 | - */ | |
| 441 | - private static function maybe_update_max_option( $field, $values, &$new_field ) { | |
| 442 | - if ( $field->type === 'textarea' && | |
| 443 | - ! empty( $values['field_options'][ 'type_' . $field->id ] ) && | |
| 444 | - in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) { | |
| 445 | - $new_field['field_options']['max'] = ''; | |
| 446 | - | |
| 447 | - /** | |
| 448 | - * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads. | |
| 449 | - * FrmFieldsHelper::fill_default_field_opts populates field options by calling self::get_posted_field_setting. | |
| 450 | - */ | |
| 451 | - $_POST['field_options'][ 'max_' . $field->id ] = ''; | |
| 452 | - } | |
| 453 | - } | |
| 454 | - | |
| 455 | - /** | |
| 456 | - * @param string $opt | |
| 457 | - * @param mixed $value | |
| 458 | - * | |
| 459 | - * @return void | |
| 460 | - */ | |
| 461 | 385 | private static function sanitize_field_opt( $opt, &$value ) { |
| 462 | - if ( ! is_string( $value ) ) { | |
| 463 | - return; | |
| 386 | + if ( is_string( $value ) ) { | |
| 387 | + if ( $opt === 'calc' ) { | |
| 388 | + $value = self::sanitize_calc( $value ); | |
| 389 | + } else { | |
| 390 | + $value = FrmAppHelper::kses( $value, 'all' ); | |
| 391 | + } | |
| 392 | + $value = trim( $value ); | |
| 464 | 393 | } |
| 465 | - | |
| 466 | - /** | |
| 467 | - * Allow the option to turn off sanitization for a field. This way a custom rule can be used instead. | |
| 468 | - * Make sure to add custom sanitization using the frm_update_field_options filter as the data will no longer be sanitized. | |
| 469 | - * | |
| 470 | - * @since 6.0 | |
| 471 | - * | |
| 472 | - * @param bool $should_sanitize | |
| 473 | - * @param string $opt | |
| 474 | - */ | |
| 475 | - $should_sanitize = apply_filters( 'frm_should_sanitize_field_opt_string', true, $opt ); | |
| 476 | - | |
| 477 | - if ( ! $should_sanitize ) { | |
| 478 | - return; | |
| 479 | - } | |
| 480 | - | |
| 481 | - $value = $opt === 'calc' ? self::sanitize_calc( $value ) : FrmAppHelper::kses( $value, 'all' ); | |
| 482 | - $value = trim( $value ); | |
| 483 | 394 | } |
| 484 | 395 | |
| 485 | 396 | /** |
| 486 | 397 | * @param string $value |
| 487 | - * | |
| 488 | 398 | * @return string |
| 489 | 399 | */ |
| 490 | 400 | private static function sanitize_calc( $value ) { |
| 491 | - if ( str_contains( $value, '<' ) ) { | |
| 401 | + if ( false !== strpos( $value, '<' ) ) { | |
| 492 | 402 | $value = self::normalize_calc_spaces( $value ); |
| 493 | 403 | } |
| 494 | - // Allow <= and >=. | |
| 495 | - $allow = array( '<= ', ' >=' ); | |
| 404 | + $allow = array( '<= ', ' >=' ); // Allow <= and >= | |
| 496 | 405 | $temp = array( '< = ', ' > =' ); |
| 497 | 406 | $value = str_replace( $allow, $temp, $value ); |
| 498 | 407 | $value = strip_tags( $value ); |
| 499 | - return str_replace( $temp, $allow, $value ); | |
| 408 | + $value = str_replace( $temp, $allow, $value ); | |
| 409 | + return $value; | |
| 500 | 410 | } |
| 501 | 411 | |
| 502 | 412 | /** |
| 503 | 413 | * Format a comparison like 5<10 to 5 < 10. Also works on 5< 10, 5 <10, 5<=10 variations. |
| @@ -503,58 +413,41 @@ | ||
| 503 | 413 | * Format a comparison like 5<10 to 5 < 10. Also works on 5< 10, 5 <10, 5<=10 variations. |
| 504 | 414 | * This is to avoid an issue with unspaced calculations being recognized as HTML that gets removed when strip_tags is called. |
| 505 | 415 | * |
| 506 | 416 | * @param string $calc |
| 507 | - * | |
| 508 | 417 | * @return string |
| 509 | 418 | */ |
| 510 | 419 | private static function normalize_calc_spaces( $calc ) { |
| 511 | 420 | // Check for a pattern with 5 parts |
| 512 | - // $1 \d|\] the first comparison digit or the end of a comparison shortcode. | |
| 421 | + // $1 \d the first comparison digit. | |
| 513 | 422 | // $2 a space (optional). |
| 514 | 423 | // $3 an equals sign (optional) that follows the < operator for <= comparisons. |
| 515 | 424 | // $4 another space (optional). |
| 516 | - // $5 \d|\[ the second comparison digit or the start of a comparison shortcode. | |
| 517 | - return preg_replace( '/(\d|\])( ){0,1}<(=){0,1}( ){0,1}(\d|\[)/', '$1 <$3 $5', $calc ); | |
| 425 | + // $5 \d the second comparison digit. | |
| 426 | + return preg_replace( '/(\d)( ){0,1}<(=){0,1}( ){0,1}(\d)/', '$1 <$3 $5', $calc ); | |
| 518 | 427 | } |
| 519 | 428 | |
| 520 | 429 | /** |
| 521 | 430 | * Updating the settings page |
| 522 | - * | |
| 523 | - * @param array $values Form values array. | |
| 524 | - * @param object $field Field object, passed by reference. | |
| 525 | - * | |
| 526 | - * @return void | |
| 527 | 431 | */ |
| 528 | 432 | private static function get_settings_page_html( $values, &$field ) { |
| 529 | 433 | if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) { |
| 530 | 434 | $prev_opts = array(); |
| 531 | - $fallback_html = $field->field_options['custom_html'] ?? FrmFieldsHelper::get_default_html( $field->type ); | |
| 435 | + $fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ); | |
| 532 | 436 | |
| 533 | - $field->field_options['custom_html'] = $values['field_options'][ 'custom_html_' . $field->id ] ?? $fallback_html; | |
| 534 | - } elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) { | |
| 437 | + $field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html; | |
| 438 | + } elseif ( $field->type == 'hidden' || $field->type == 'user_id' ) { | |
| 535 | 439 | $prev_opts = $field->field_options; |
| 536 | 440 | } |
| 537 | 441 | |
| 538 | - if ( ! isset( $prev_opts ) ) { | |
| 539 | - return; | |
| 442 | + if ( isset( $prev_opts ) ) { | |
| 443 | + $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values ); | |
| 444 | + if ( $prev_opts != $field->field_options ) { | |
| 445 | + FrmField::update( $field->id, array( 'field_options' => $field->field_options ) ); | |
| 446 | + } | |
| 540 | 447 | } |
| 541 | - | |
| 542 | - $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values ); | |
| 543 | - | |
| 544 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 545 | - if ( $prev_opts != $field->field_options ) { | |
| 546 | - FrmField::update( $field->id, array( 'field_options' => $field->field_options ) ); | |
| 547 | - } | |
| 548 | 448 | } |
| 549 | 449 | |
| 550 | - /** | |
| 551 | - * @param object $field | |
| 552 | - * @param array $values | |
| 553 | - * @param array $new_field | |
| 554 | - * | |
| 555 | - * @return void | |
| 556 | - */ | |
| 557 | 450 | private static function prepare_field_update_values( $field, $values, &$new_field ) { |
| 558 | 451 | $field_cols = array( |
| 559 | 452 | 'field_order' => 0, |
| 560 | 453 | 'field_key' => '', |
| @@ -563,16 +456,12 @@ | ||
| 563 | 456 | 'description' => '', |
| 564 | 457 | 'options' => '', |
| 565 | 458 | 'name' => '', |
| 566 | 459 | ); |
| 567 | - | |
| 568 | 460 | foreach ( $field_cols as $col => $default ) { |
| 569 | - $default = $default === '' ? $field->{$col} : $default; | |
| 570 | - $new_field[ $col ] = $values['field_options'][ $col . '_' . $field->id ] ?? $default; | |
| 571 | - } | |
| 461 | + $default = ( $default === '' ) ? $field->{$col} : $default; | |
| 572 | 462 | |
| 573 | - if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) { | |
| 574 | - $new_field['field_order'] = $field->field_order; | |
| 463 | + $new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default; | |
| 575 | 464 | } |
| 576 | 465 | |
| 577 | 466 | // Don't save the template option. |
| 578 | 467 | if ( is_array( $new_field['options'] ) && isset( $new_field['options']['000'] ) ) { |
| @@ -584,12 +473,9 @@ | ||
| 584 | 473 | * Get a list of all form settings that should be translated |
| 585 | 474 | * on a multilingual site. |
| 586 | 475 | * |
| 587 | 476 | * @since 3.06.01 |
| 588 | - * | |
| 589 | - * @param object $form The form object. | |
| 590 | - * | |
| 591 | - * @return array | |
| 477 | + * @param object $form - The form object | |
| 592 | 478 | */ |
| 593 | 479 | public static function translatable_strings( $form ) { |
| 594 | 480 | $strings = array( |
| 595 | 481 | 'name', |
| @@ -606,21 +492,19 @@ | ||
| 606 | 492 | return apply_filters( 'frm_form_strings', $strings, $form ); |
| 607 | 493 | } |
| 608 | 494 | |
| 609 | 495 | /** |
| 610 | - * @param array|int $id | |
| 611 | - * @param string $status | |
| 496 | + * @param string $status | |
| 612 | 497 | * |
| 613 | - * @return bool|int | |
| 498 | + * @return int|boolean | |
| 614 | 499 | */ |
| 615 | 500 | public static function set_status( $id, $status ) { |
| 616 | - if ( 'trash' === $status ) { | |
| 501 | + if ( 'trash' == $status ) { | |
| 617 | 502 | return self::trash( $id ); |
| 618 | 503 | } |
| 619 | 504 | |
| 620 | 505 | $statuses = array( 'published', 'draft', 'trash' ); |
| 621 | - | |
| 622 | - if ( ! in_array( $status, $statuses, true ) ) { | |
| 506 | + if ( ! in_array( $status, $statuses ) ) { | |
| 623 | 507 | return false; |
| 624 | 508 | } |
| 625 | 509 | |
| 626 | 510 | global $wpdb; |
| @@ -633,9 +517,9 @@ | ||
| 633 | 517 | ); |
| 634 | 518 | FrmDb::get_where_clause_and_values( $where ); |
| 635 | 519 | array_unshift( $where['values'], $status ); |
| 636 | 520 | |
| 637 | - $query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 521 | + $query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared | |
| 638 | 522 | } else { |
| 639 | 523 | $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'id' => $id ) ); |
| 640 | 524 | $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'parent_form_id' => $id ) ); |
| 641 | 525 | } |
| @@ -647,11 +531,9 @@ | ||
| 647 | 531 | return $query_results; |
| 648 | 532 | } |
| 649 | 533 | |
| 650 | 534 | /** |
| 651 | - * @param int|string $id Form ID. | |
| 652 | - * | |
| 653 | - * @return bool|int | |
| 535 | + * @return int|boolean | |
| 654 | 536 | */ |
| 655 | 537 | public static function trash( $id ) { |
| 656 | 538 | if ( ! EMPTY_TRASH_DAYS ) { |
| 657 | 539 | return self::destroy( $id ); |
| @@ -657,17 +539,12 @@ | ||
| 657 | 539 | return self::destroy( $id ); |
| 658 | 540 | } |
| 659 | 541 | |
| 660 | 542 | $form = self::getOne( $id ); |
| 661 | - | |
| 662 | 543 | if ( ! $form ) { |
| 663 | 544 | return false; |
| 664 | 545 | } |
| 665 | 546 | |
| 666 | - if ( $form->status === 'trash' ) { | |
| 667 | - return false; | |
| 668 | - } | |
| 669 | - | |
| 670 | 547 | $options = $form->options; |
| 671 | 548 | $options['trash_time'] = time(); |
| 672 | 549 | |
| 673 | 550 | global $wpdb; |
| @@ -700,26 +577,21 @@ | ||
| 700 | 577 | return $query_results; |
| 701 | 578 | } |
| 702 | 579 | |
| 703 | 580 | /** |
| 704 | - * @param int|string $id Form ID. | |
| 705 | - * | |
| 706 | - * @return bool|int | |
| 581 | + * @return int|boolean | |
| 707 | 582 | */ |
| 708 | 583 | public static function destroy( $id ) { |
| 709 | 584 | global $wpdb; |
| 710 | 585 | |
| 711 | 586 | $form = self::getOne( $id ); |
| 712 | - | |
| 713 | 587 | if ( ! $form ) { |
| 714 | 588 | return false; |
| 715 | 589 | } |
| 716 | - | |
| 717 | 590 | $id = $form->id; |
| 718 | 591 | |
| 719 | 592 | // Disconnect the entries from this form |
| 720 | - $entries = FrmDb::get_col( 'frm_items', array( 'form_id' => $id ) ); | |
| 721 | - | |
| 593 | + $entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) ); | |
| 722 | 594 | foreach ( $entries as $entry_id ) { |
| 723 | 595 | FrmEntry::destroy( $entry_id ); |
| 724 | 596 | unset( $entry_id ); |
| 725 | 597 | } |
| @@ -724,29 +596,23 @@ | ||
| 724 | 596 | unset( $entry_id ); |
| 725 | 597 | } |
| 726 | 598 | |
| 727 | 599 | // Disconnect the fields from this form |
| 728 | - $wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 600 | + $wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) ); | |
| 729 | 601 | |
| 730 | 602 | $query_results = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_forms WHERE id=%d OR parent_form_id=%d', $id, $id ) ); |
| 603 | + if ( $query_results ) { | |
| 604 | + // Delete all form actions linked to this form | |
| 605 | + $action_control = FrmFormActionsController::get_form_actions( 'email' ); | |
| 606 | + $action_control->destroy( $id, 'all' ); | |
| 731 | 607 | |
| 732 | - if ( ! $query_results ) { | |
| 733 | - return $query_results; | |
| 608 | + // Clear form caching | |
| 609 | + self::clear_form_cache(); | |
| 610 | + | |
| 611 | + do_action( 'frm_destroy_form', $id ); | |
| 612 | + do_action( 'frm_destroy_form_' . $id ); | |
| 734 | 613 | } |
| 735 | 614 | |
| 736 | - // Delete all form actions linked to this form | |
| 737 | - /** | |
| 738 | - * @var FrmFormAction | |
| 739 | - */ | |
| 740 | - $action_control = FrmFormActionsController::get_form_actions( 'email' ); | |
| 741 | - $action_control->destroy( $id, 'all' ); | |
| 742 | - | |
| 743 | - // Clear form caching | |
| 744 | - self::clear_form_cache(); | |
| 745 | - | |
| 746 | - do_action( 'frm_destroy_form', $id ); | |
| 747 | - do_action( 'frm_destroy_form_' . $id ); | |
| 748 | - | |
| 749 | 615 | return $query_results; |
| 750 | 616 | } |
| 751 | 617 | |
| 752 | 618 | /** |
| @@ -751,34 +617,29 @@ | ||
| 751 | 617 | |
| 752 | 618 | /** |
| 753 | 619 | * Delete trashed forms based on how long they have been trashed |
| 754 | 620 | * |
| 755 | - * @param int|string $delete_timestamp Timestamp cutoff for deletion. | |
| 756 | - * | |
| 757 | 621 | * @return int The number of forms deleted |
| 758 | 622 | */ |
| 759 | 623 | public static function scheduled_delete( $delete_timestamp = '' ) { |
| 760 | - $trash_forms = FrmDb::get_results( 'frm_forms', array( 'status' => 'trash' ), 'id, parent_form_id, options' ); | |
| 624 | + global $wpdb; | |
| 761 | 625 | |
| 626 | + $trash_forms = FrmDb::get_results( $wpdb->prefix . 'frm_forms', array( 'status' => 'trash' ), 'id, options' ); | |
| 627 | + | |
| 762 | 628 | if ( ! $trash_forms ) { |
| 763 | 629 | return 0; |
| 764 | 630 | } |
| 765 | 631 | |
| 766 | - if ( ! $delete_timestamp ) { | |
| 632 | + if ( empty( $delete_timestamp ) ) { | |
| 767 | 633 | $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS ); |
| 768 | 634 | } |
| 769 | 635 | |
| 770 | 636 | $count = 0; |
| 771 | - | |
| 772 | 637 | foreach ( $trash_forms as $form ) { |
| 773 | 638 | FrmAppHelper::unserialize_or_decode( $form->options ); |
| 774 | - | |
| 775 | 639 | if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) { |
| 776 | 640 | self::destroy( $form->id ); |
| 777 | - | |
| 778 | - if ( empty( $form->parent_form_id ) ) { | |
| 779 | - ++$count; | |
| 780 | - } | |
| 641 | + $count ++; | |
| 781 | 642 | } |
| 782 | 643 | |
| 783 | 644 | unset( $form ); |
| 784 | 645 | } |
| @@ -786,24 +647,23 @@ | ||
| 786 | 647 | return $count; |
| 787 | 648 | } |
| 788 | 649 | |
| 789 | 650 | /** |
| 790 | - * @param int|string $id Form ID or key. | |
| 791 | - * | |
| 792 | 651 | * @return string form name |
| 793 | 652 | */ |
| 794 | 653 | public static function getName( $id ) { |
| 795 | 654 | $form = FrmDb::check_cache( $id, 'frm_form' ); |
| 655 | + if ( $form ) { | |
| 656 | + $r = stripslashes( $form->name ); | |
| 796 | 657 | |
| 797 | - if ( $form ) { | |
| 798 | - return stripslashes( $form->name ); | |
| 658 | + return $r; | |
| 799 | 659 | } |
| 800 | 660 | |
| 801 | 661 | $query_key = is_numeric( $id ) ? 'id' : 'form_key'; |
| 802 | 662 | $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' ); |
| 663 | + $r = stripslashes( $r ); | |
| 803 | 664 | |
| 804 | - // An empty form name can result in a null value. | |
| 805 | - return is_null( $r ) ? '' : stripslashes( $r ); | |
| 665 | + return $r; | |
| 806 | 666 | } |
| 807 | 667 | |
| 808 | 668 | /** |
| 809 | 669 | * @since 3.0 |
| @@ -818,9 +678,9 @@ | ||
| 818 | 678 | |
| 819 | 679 | /** |
| 820 | 680 | * @since 3.0 |
| 821 | 681 | * |
| 822 | - * @param int|string $id | |
| 682 | + * @param int $id | |
| 823 | 683 | * |
| 824 | 684 | * @return string form key |
| 825 | 685 | */ |
| 826 | 686 | public static function get_key_by_id( $id ) { |
| @@ -825,57 +685,59 @@ | ||
| 825 | 685 | */ |
| 826 | 686 | public static function get_key_by_id( $id ) { |
| 827 | 687 | $id = (int) $id; |
| 828 | 688 | $cache = FrmDb::check_cache( $id, 'frm_form' ); |
| 829 | - | |
| 830 | 689 | if ( $cache ) { |
| 831 | 690 | return $cache->form_key; |
| 832 | 691 | } |
| 833 | 692 | |
| 834 | - return FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' ); | |
| 693 | + $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' ); | |
| 694 | + | |
| 695 | + return $key; | |
| 835 | 696 | } |
| 836 | 697 | |
| 837 | 698 | /** |
| 838 | 699 | * If $form is numeric, get the form object |
| 839 | 700 | * |
| 701 | + * @param object|int $form | |
| 702 | + * | |
| 840 | 703 | * @since 2.0.9 |
| 841 | - * | |
| 842 | - * @param array|int|object $form | |
| 843 | - * | |
| 844 | - * @return void | |
| 845 | 704 | */ |
| 846 | 705 | public static function maybe_get_form( &$form ) { |
| 847 | - if ( ! is_object( $form ) && ! is_array( $form ) && $form ) { | |
| 706 | + if ( ! is_object( $form ) && ! is_array( $form ) && ! empty( $form ) ) { | |
| 848 | 707 | $form = self::getOne( $form ); |
| 849 | 708 | } |
| 850 | 709 | } |
| 851 | 710 | |
| 852 | 711 | /** |
| 853 | - * @param int|string $id | |
| 854 | - * @param false|int $blog_id | |
| 855 | - * | |
| 856 | - * @return stdClass|null | |
| 712 | + * @return object form | |
| 857 | 713 | */ |
| 858 | 714 | public static function getOne( $id, $blog_id = false ) { |
| 859 | 715 | global $wpdb; |
| 860 | 716 | |
| 861 | 717 | if ( $blog_id && is_multisite() ) { |
| 862 | - $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 718 | + global $wpmuBaseTablePrefix; | |
| 719 | + $prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id ); | |
| 720 | + | |
| 863 | 721 | $table_name = $prefix . 'frm_forms'; |
| 864 | 722 | } else { |
| 865 | 723 | $table_name = $wpdb->prefix . 'frm_forms'; |
| 866 | 724 | $cache = wp_cache_get( $id, 'frm_form' ); |
| 867 | - | |
| 868 | 725 | if ( $cache ) { |
| 869 | 726 | if ( isset( $cache->options ) ) { |
| 870 | 727 | FrmAppHelper::unserialize_or_decode( $cache->options ); |
| 871 | 728 | } |
| 872 | 729 | |
| 873 | - return self::prepare_form_row_data( $cache ); | |
| 730 | + return wp_unslash( $cache ); | |
| 874 | 731 | } |
| 875 | 732 | } |
| 876 | 733 | |
| 877 | - $where = is_numeric( $id ) ? array( 'id' => $id ) : array( 'form_key' => $id ); | |
| 734 | + if ( is_numeric( $id ) ) { | |
| 735 | + $where = array( 'id' => $id ); | |
| 736 | + } else { | |
| 737 | + $where = array( 'form_key' => $id ); | |
| 738 | + } | |
| 739 | + | |
| 878 | 740 | $results = FrmDb::get_row( $table_name, $where ); |
| 879 | 741 | |
| 880 | 742 | if ( isset( $results->options ) ) { |
| 881 | 743 | FrmDb::set_cache( $results->id, $results, 'frm_form' ); |
| @@ -881,50 +743,18 @@ | ||
| 881 | 743 | FrmDb::set_cache( $results->id, $results, 'frm_form' ); |
| 882 | 744 | FrmAppHelper::unserialize_or_decode( $results->options ); |
| 883 | 745 | } |
| 884 | 746 | |
| 885 | - return self::prepare_form_row_data( $results ); | |
| 747 | + return apply_filters( 'frm_form_object', wp_unslash( $results ) ); | |
| 886 | 748 | } |
| 887 | 749 | |
| 888 | 750 | /** |
| 889 | - * Make sure that if $row is an object, that $row->options is an array and not a string. | |
| 890 | - * | |
| 891 | - * @since 6.8.3 | |
| 892 | - * | |
| 893 | - * @param stdClass|null $row The database row for a target form. | |
| 894 | - * | |
| 895 | - * @return stdClass|null | |
| 751 | + * @return object|array of objects | |
| 896 | 752 | */ |
| 897 | - private static function prepare_form_row_data( $row ) { | |
| 898 | - $row = wp_unslash( $row ); | |
| 899 | - | |
| 900 | - if ( ! is_object( $row ) ) { | |
| 901 | - return $row; | |
| 902 | - } | |
| 903 | - | |
| 904 | - if ( ! is_array( $row->options ) ) { | |
| 905 | - $row->options = FrmFormsHelper::get_default_opts(); | |
| 906 | - } | |
| 907 | - | |
| 908 | - /** | |
| 909 | - * @since 4.03.02 | |
| 910 | - * | |
| 911 | - * @param stdClass $row | |
| 912 | - */ | |
| 913 | - return apply_filters( 'frm_form_object', $row ); | |
| 914 | - } | |
| 915 | - | |
| 916 | - /** | |
| 917 | - * @param array|string $where Where conditions array or raw WHERE string. | |
| 918 | - * @param string $order_by Order by clause. | |
| 919 | - * @param int|string $limit Limit clause or number. | |
| 920 | - * | |
| 921 | - * @return array|object Array of objects. If $limit is 1, a single object is returned. | |
| 922 | - */ | |
| 923 | 753 | public static function getAll( $where = array(), $order_by = '', $limit = '' ) { |
| 924 | - if ( is_array( $where ) && $where ) { | |
| 925 | - if ( ! empty( $where['is_template'] ) && ! isset( $where['status'] ) && ! isset( $where['status !'] ) ) { | |
| 926 | - // Don't get trashed templates | |
| 754 | + if ( is_array( $where ) && ! empty( $where ) ) { | |
| 755 | + if ( isset( $where['is_template'] ) && $where['is_template'] && ! isset( $where['status'] ) && ! isset( $where['status !'] ) ) { | |
| 756 | + // don't get trashed templates | |
| 927 | 757 | $where['status'] = array( null, '', 'published' ); |
| 928 | 758 | } |
| 929 | 759 | |
| 930 | 760 | $results = FrmDb::get_results( 'frm_forms', $where, '*', compact( 'order_by', 'limit' ) ); |
| @@ -930,10 +760,10 @@ | ||
| 930 | 760 | $results = FrmDb::get_results( 'frm_forms', $where, '*', compact( 'order_by', 'limit' ) ); |
| 931 | 761 | } else { |
| 932 | 762 | global $wpdb; |
| 933 | 763 | |
| 934 | - // The query has already been prepared if this is not an array. | |
| 935 | - $query = 'SELECT * FROM ' . $wpdb->prefix . 'frm_forms' . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . FrmDb::esc_order( $order_by ) . FrmDb::esc_limit( $limit ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 764 | + // the query has already been prepared if this is not an array | |
| 765 | + $query = 'SELECT * FROM ' . $wpdb->prefix . 'frm_forms' . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . FrmDb::esc_order( $order_by ) . FrmDb::esc_limit( $limit ); | |
| 936 | 766 | $results = $wpdb->get_results( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 937 | 767 | } |
| 938 | 768 | |
| 939 | 769 | if ( $results ) { |
| @@ -942,10 +772,10 @@ | ||
| 942 | 772 | FrmAppHelper::unserialize_or_decode( $result->options ); |
| 943 | 773 | } |
| 944 | 774 | } |
| 945 | 775 | |
| 946 | - if ( $limit === ' LIMIT 1' || (int) $limit === 1 ) { | |
| 947 | - // Return the first form object if we are only getting one form | |
| 776 | + if ( $limit == ' LIMIT 1' || $limit == 1 ) { | |
| 777 | + // return the first form object if we are only getting one form | |
| 948 | 778 | $results = reset( $results ); |
| 949 | 779 | } |
| 950 | 780 | |
| 951 | 781 | return wp_unslash( $results ); |
| @@ -954,24 +784,20 @@ | ||
| 954 | 784 | /** |
| 955 | 785 | * Get all published forms |
| 956 | 786 | * |
| 957 | 787 | * @since 2.0 |
| 958 | - * | |
| 959 | - * @param array $query | |
| 960 | - * @param int $limit | |
| 961 | - * @param string $inc_children | |
| 962 | - * | |
| 963 | - * @return array|object Array of forms. A single form object is returned if $limit is set to 1. | |
| 788 | + * @return array of forms | |
| 964 | 789 | */ |
| 965 | 790 | public static function get_published_forms( $query = array(), $limit = 999, $inc_children = 'exclude' ) { |
| 966 | 791 | $query['is_template'] = 0; |
| 967 | 792 | $query['status'] = array( null, '', 'published' ); |
| 968 | - | |
| 969 | - if ( $inc_children === 'exclude' ) { | |
| 793 | + if ( $inc_children == 'exclude' ) { | |
| 970 | 794 | $query['parent_form_id'] = array( null, 0 ); |
| 971 | 795 | } |
| 972 | 796 | |
| 973 | - return self::getAll( $query, 'name', $limit ); | |
| 797 | + $forms = self::getAll( $query, 'name', $limit ); | |
| 798 | + | |
| 799 | + return $forms; | |
| 974 | 800 | } |
| 975 | 801 | |
| 976 | 802 | /** |
| 977 | 803 | * @return object count of forms |
| @@ -976,16 +802,18 @@ | ||
| 976 | 802 | /** |
| 977 | 803 | * @return object count of forms |
| 978 | 804 | */ |
| 979 | 805 | public static function get_count() { |
| 806 | + global $wpdb; | |
| 807 | + | |
| 980 | 808 | $cache_key = 'frm_form_counts'; |
| 981 | - $counts = wp_cache_get( $cache_key, 'frm_form' ); | |
| 982 | 809 | |
| 810 | + $counts = wp_cache_get( $cache_key, 'frm_form' ); | |
| 983 | 811 | if ( false !== $counts ) { |
| 984 | 812 | return $counts; |
| 985 | 813 | } |
| 986 | 814 | |
| 987 | - $results = FrmDb::get_results( | |
| 815 | + $results = (array) FrmDb::get_results( | |
| 988 | 816 | 'frm_forms', |
| 989 | 817 | array( |
| 990 | 818 | 'or' => 1, |
| 991 | 819 | 'parent_form_id' => null, |
| @@ -997,20 +825,20 @@ | ||
| 997 | 825 | $statuses = array( 'published', 'draft', 'template', 'trash' ); |
| 998 | 826 | $counts = array_fill_keys( $statuses, 0 ); |
| 999 | 827 | |
| 1000 | 828 | foreach ( $results as $row ) { |
| 1001 | - if ( 'trash' !== $row->status ) { | |
| 829 | + if ( 'trash' != $row->status ) { | |
| 1002 | 830 | if ( $row->is_template ) { |
| 1003 | - ++$counts['template']; | |
| 831 | + $counts['template'] ++; | |
| 1004 | 832 | } else { |
| 1005 | - ++$counts['published']; | |
| 833 | + $counts['published'] ++; | |
| 1006 | 834 | } |
| 1007 | 835 | } else { |
| 1008 | - ++$counts['trash']; | |
| 836 | + $counts['trash'] ++; | |
| 1009 | 837 | } |
| 1010 | 838 | |
| 1011 | - if ( 'draft' === $row->status ) { | |
| 1012 | - ++$counts['draft']; | |
| 839 | + if ( 'draft' == $row->status ) { | |
| 840 | + $counts['draft'] ++; | |
| 1013 | 841 | } |
| 1014 | 842 | |
| 1015 | 843 | unset( $row ); |
| 1016 | 844 | } |
| @@ -1026,10 +854,8 @@ | ||
| 1026 | 854 | * Called when a form is created, updated, duplicated, or deleted |
| 1027 | 855 | * or when the form status is changed |
| 1028 | 856 | * |
| 1029 | 857 | * @since 2.0.4 |
| 1030 | - * | |
| 1031 | - * @return void | |
| 1032 | 858 | */ |
| 1033 | 859 | public static function clear_form_cache() { |
| 1034 | 860 | FrmDb::cache_delete_group( 'frm_form' ); |
| 1035 | 861 | } |
| @@ -1034,22 +860,16 @@ | ||
| 1034 | 860 | FrmDb::cache_delete_group( 'frm_form' ); |
| 1035 | 861 | } |
| 1036 | 862 | |
| 1037 | 863 | /** |
| 1038 | - * @param array $values Form values to validate. | |
| 1039 | - * | |
| 1040 | 864 | * @return array of errors |
| 1041 | 865 | */ |
| 1042 | 866 | public static function validate( $values ) { |
| 1043 | 867 | $errors = array(); |
| 868 | + | |
| 1044 | 869 | return apply_filters( 'frm_validate_form', $errors, $values ); |
| 1045 | 870 | } |
| 1046 | 871 | |
| 1047 | - /** | |
| 1048 | - * @param object|null $form | |
| 1049 | - * | |
| 1050 | - * @return array | |
| 1051 | - */ | |
| 1052 | 872 | public static function get_params( $form = null ) { |
| 1053 | 873 | global $frm_vars; |
| 1054 | 874 | |
| 1055 | 875 | if ( ! $form ) { |
| @@ -1079,18 +899,16 @@ | ||
| 1079 | 899 | ); |
| 1080 | 900 | |
| 1081 | 901 | $values = array(); |
| 1082 | 902 | $values['posted_form_id'] = FrmAppHelper::get_param( 'form_id', '', 'get', 'absint' ); |
| 1083 | - | |
| 1084 | 903 | if ( ! $values['posted_form_id'] ) { |
| 1085 | 904 | $values['posted_form_id'] = FrmAppHelper::get_param( 'form', '', 'get', 'absint' ); |
| 1086 | 905 | } |
| 1087 | 906 | |
| 1088 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 1089 | 907 | if ( $form->id == $values['posted_form_id'] ) { |
| 1090 | - // If there are two forms on the same page, make sure not to submit both. | |
| 908 | + //if there are two forms on the same page, make sure not to submit both | |
| 1091 | 909 | foreach ( $default_values as $var => $default ) { |
| 1092 | - if ( $var === 'action' ) { | |
| 910 | + if ( $var == 'action' ) { | |
| 1093 | 911 | $values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' ); |
| 1094 | 912 | } else { |
| 1095 | 913 | $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' ); |
| 1096 | 914 | } |
| @@ -1102,9 +920,9 @@ | ||
| 1102 | 920 | unset( $var, $default ); |
| 1103 | 921 | } |
| 1104 | 922 | } |
| 1105 | 923 | |
| 1106 | - if ( in_array( $values['action'], array( 'create', 'update' ), true ) && | |
| 924 | + if ( in_array( $values['action'], array( 'create', 'update' ) ) && | |
| 1107 | 925 | ( ! $_POST || ( ! isset( $_POST['action'] ) && ! isset( $_POST['frm_action'] ) ) ) // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 1108 | 926 | ) { |
| 1109 | 927 | $values['action'] = 'new'; |
| 1110 | 928 | } |
| @@ -1111,11 +929,8 @@ | ||
| 1111 | 929 | |
| 1112 | 930 | return $values; |
| 1113 | 931 | } |
| 1114 | 932 | |
| 1115 | - /** | |
| 1116 | - * @return array | |
| 1117 | - */ | |
| 1118 | 933 | public static function list_page_params() { |
| 1119 | 934 | $values = array(); |
| 1120 | 935 | $defaults = array( |
| 1121 | 936 | 'template' => 0, |
| @@ -1125,9 +940,8 @@ | ||
| 1125 | 940 | 'search' => '', |
| 1126 | 941 | 'sort' => '', |
| 1127 | 942 | 'sdir' => '', |
| 1128 | 943 | ); |
| 1129 | - | |
| 1130 | 944 | foreach ( $defaults as $var => $default ) { |
| 1131 | 945 | $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' ); |
| 1132 | 946 | } |
| 1133 | 947 | |
| @@ -1133,16 +947,10 @@ | ||
| 1133 | 947 | |
| 1134 | 948 | return $values; |
| 1135 | 949 | } |
| 1136 | 950 | |
| 1137 | - /** | |
| 1138 | - * @param int|object|string|null $form | |
| 1139 | - * | |
| 1140 | - * @return array | |
| 1141 | - */ | |
| 1142 | 951 | public static function get_admin_params( $form = null ) { |
| 1143 | 952 | $form_id = $form; |
| 1144 | - | |
| 1145 | 953 | if ( $form === null ) { |
| 1146 | 954 | $form_id = self::get_current_form_id(); |
| 1147 | 955 | } elseif ( $form && is_object( $form ) ) { |
| 1148 | 956 | $form_id = $form->id; |
| @@ -1160,9 +968,8 @@ | ||
| 1160 | 968 | 'sdir' => '', |
| 1161 | 969 | 'fid' => '', |
| 1162 | 970 | 'keep_post' => '', |
| 1163 | 971 | ); |
| 1164 | - | |
| 1165 | 972 | foreach ( $defaults as $var => $default ) { |
| 1166 | 973 | $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' ); |
| 1167 | 974 | } |
| 1168 | 975 | |
| @@ -1168,55 +975,47 @@ | ||
| 1168 | 975 | |
| 1169 | 976 | return $values; |
| 1170 | 977 | } |
| 1171 | 978 | |
| 1172 | - /** | |
| 1173 | - * @param string $default_form | |
| 1174 | - * | |
| 1175 | - * @return int|string | |
| 1176 | - */ | |
| 1177 | 979 | public static function get_current_form_id( $default_form = 'none' ) { |
| 1178 | - $form = 'first' === $default_form ? self::get_current_form() : self::maybe_get_current_form(); | |
| 1179 | - return $form ? $form->id : 0; | |
| 980 | + if ( 'first' == $default_form ) { | |
| 981 | + $form = self::get_current_form(); | |
| 982 | + } else { | |
| 983 | + $form = self::maybe_get_current_form(); | |
| 984 | + } | |
| 985 | + $form_id = $form ? $form->id : 0; | |
| 986 | + | |
| 987 | + return $form_id; | |
| 1180 | 988 | } |
| 1181 | 989 | |
| 1182 | - /** | |
| 1183 | - * @param int|string $form_id | |
| 1184 | - * | |
| 1185 | - * @return false|int|object|string | |
| 1186 | - */ | |
| 1187 | 990 | public static function maybe_get_current_form( $form_id = 0 ) { |
| 1188 | 991 | global $frm_vars; |
| 1189 | 992 | |
| 1190 | - if ( ! empty( $frm_vars['current_form'] ) && ( ! $form_id || (int) $form_id === (int) $frm_vars['current_form']->id ) ) { | |
| 993 | + if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && ( ! $form_id || $form_id == $frm_vars['current_form']->id ) ) { | |
| 1191 | 994 | return $frm_vars['current_form']; |
| 1192 | 995 | } |
| 1193 | 996 | |
| 1194 | 997 | $form_id = FrmAppHelper::get_param( 'form', $form_id, 'get', 'absint' ); |
| 998 | + if ( $form_id ) { | |
| 999 | + $form_id = self::set_current_form( $form_id ); | |
| 1000 | + } | |
| 1195 | 1001 | |
| 1196 | - return $form_id ? self::set_current_form( $form_id ) : $form_id; | |
| 1002 | + return $form_id; | |
| 1197 | 1003 | } |
| 1198 | 1004 | |
| 1199 | - /** | |
| 1200 | - * @param int $form_id | |
| 1201 | - * | |
| 1202 | - * @return false|object | |
| 1203 | - */ | |
| 1204 | 1005 | public static function get_current_form( $form_id = 0 ) { |
| 1205 | 1006 | $form = self::maybe_get_current_form( $form_id ); |
| 1206 | - return is_numeric( $form ) ? self::set_current_form( $form ) : $form; | |
| 1007 | + if ( is_numeric( $form ) ) { | |
| 1008 | + $form = self::set_current_form( $form ); | |
| 1009 | + } | |
| 1010 | + | |
| 1011 | + return $form; | |
| 1207 | 1012 | } |
| 1208 | 1013 | |
| 1209 | - /** | |
| 1210 | - * @param int $form_id | |
| 1211 | - * | |
| 1212 | - * @return false|object | |
| 1213 | - */ | |
| 1214 | 1014 | public static function set_current_form( $form_id ) { |
| 1215 | 1015 | global $frm_vars; |
| 1216 | 1016 | |
| 1217 | 1017 | $query = array(); |
| 1218 | - | |
| 1219 | 1018 | if ( $form_id ) { |
| 1220 | 1019 | $query['id'] = $form_id; |
| 1221 | 1020 | } |
| 1222 | 1021 | |
| @@ -1224,19 +1023,11 @@ | ||
| 1224 | 1023 | |
| 1225 | 1024 | return $frm_vars['current_form']; |
| 1226 | 1025 | } |
| 1227 | 1026 | |
| 1228 | - /** | |
| 1229 | - * @param object $form | |
| 1230 | - * @param int|string $this_load | |
| 1231 | - * @param bool $global_load | |
| 1232 | - * | |
| 1233 | - * @return bool | |
| 1234 | - */ | |
| 1235 | 1027 | public static function is_form_loaded( $form, $this_load, $global_load ) { |
| 1236 | 1028 | global $frm_vars; |
| 1237 | 1029 | $small_form = new stdClass(); |
| 1238 | - | |
| 1239 | 1030 | foreach ( array( 'id', 'form_key', 'name' ) as $var ) { |
| 1240 | 1031 | $small_form->{$var} = $form->{$var}; |
| 1241 | 1032 | unset( $var ); |
| 1242 | 1033 | } |
| @@ -1242,14 +1033,14 @@ | ||
| 1242 | 1033 | } |
| 1243 | 1034 | |
| 1244 | 1035 | $frm_vars['forms_loaded'][] = $small_form; |
| 1245 | 1036 | |
| 1246 | - if ( $this_load && ! $global_load ) { | |
| 1037 | + if ( $this_load && empty( $global_load ) ) { | |
| 1247 | 1038 | $global_load = true; |
| 1248 | 1039 | $frm_vars['load_css'] = true; |
| 1249 | 1040 | } |
| 1250 | 1041 | |
| 1251 | - return empty( $frm_vars['css_loaded'] ) && $global_load; | |
| 1042 | + return ( ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) && $global_load ); | |
| 1252 | 1043 | } |
| 1253 | 1044 | |
| 1254 | 1045 | /** |
| 1255 | 1046 | * @since 4.06.03 |
| @@ -1257,9 +1048,9 @@ | ||
| 1257 | 1048 | * @param object $form |
| 1258 | 1049 | * |
| 1259 | 1050 | * @return bool |
| 1260 | 1051 | */ |
| 1261 | - public static function is_visible_to_user( $form ) { | |
| 1052 | + public static function &is_visible_to_user( $form ) { | |
| 1262 | 1053 | if ( $form->logged_in && isset( $form->options['logged_in_role'] ) ) { |
| 1263 | 1054 | $visible = FrmAppHelper::user_has_permission( $form->options['logged_in_role'] ); |
| 1264 | 1055 | } else { |
| 1265 | 1056 | $visible = true; |
| @@ -1264,39 +1055,26 @@ | ||
| 1264 | 1055 | } else { |
| 1265 | 1056 | $visible = true; |
| 1266 | 1057 | } |
| 1267 | 1058 | |
| 1268 | - /** | |
| 1269 | - * @since 6.25 | |
| 1270 | - * | |
| 1271 | - * @param bool $visible | |
| 1272 | - * @param object $form | |
| 1273 | - */ | |
| 1274 | - return (bool) apply_filters( 'frm_form_is_visible', $visible, $form ); | |
| 1059 | + return $visible; | |
| 1275 | 1060 | } |
| 1276 | 1061 | |
| 1277 | - /** | |
| 1278 | - * @param object $form | |
| 1279 | - * | |
| 1280 | - * @return bool | |
| 1281 | - */ | |
| 1282 | 1062 | public static function show_submit( $form ) { |
| 1283 | - $show = ! $form->is_template && $form->status === 'published' && ! FrmAppHelper::is_admin(); | |
| 1284 | - return apply_filters( 'frm_show_submit_button', $show, $form ); | |
| 1063 | + $show = ( ! $form->is_template && $form->status == 'published' && ! FrmAppHelper::is_admin() ); | |
| 1064 | + $show = apply_filters( 'frm_show_submit_button', $show, $form ); | |
| 1065 | + | |
| 1066 | + return $show; | |
| 1285 | 1067 | } |
| 1286 | 1068 | |
| 1287 | 1069 | /** |
| 1288 | 1070 | * @since 2.3 |
| 1289 | - * | |
| 1290 | - * @param array $atts Attributes including form, option, and default. | |
| 1291 | - * | |
| 1292 | - * @return mixed | |
| 1293 | 1071 | */ |
| 1294 | 1072 | public static function get_option( $atts ) { |
| 1295 | - $form = $atts['form']; | |
| 1296 | - $default = $atts['default'] ?? ''; | |
| 1073 | + $form = $atts['form']; | |
| 1074 | + $default = isset( $atts['default'] ) ? $atts['default'] : ''; | |
| 1297 | 1075 | |
| 1298 | - return $form->options[ $atts['option'] ] ?? $default; | |
| 1076 | + return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default; | |
| 1299 | 1077 | } |
| 1300 | 1078 | |
| 1301 | 1079 | /** |
| 1302 | 1080 | * Get the link to edit this form. |
| @@ -1301,12 +1079,9 @@ | ||
| 1301 | 1079 | /** |
| 1302 | 1080 | * Get the link to edit this form. |
| 1303 | 1081 | * |
| 1304 | 1082 | * @since 4.0 |
| 1305 | - * | |
| 1306 | 1083 | * @param int $form_id The id of the form. |
| 1307 | - * | |
| 1308 | - * @return string | |
| 1309 | 1084 | */ |
| 1310 | 1085 | public static function get_edit_link( $form_id ) { |
| 1311 | 1086 | return admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ); |
| 1312 | 1087 | } |
| @@ -1311,65 +1086,9 @@ | ||
| 1311 | 1086 | return admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ); |
| 1312 | 1087 | } |
| 1313 | 1088 | |
| 1314 | 1089 | /** |
| 1315 | - * Check if the "Submit this form with AJAX" setting is toggled on. | |
| 1316 | - * | |
| 1317 | - * @since 6.2 | |
| 1318 | - * | |
| 1319 | - * @param stdClass $form | |
| 1320 | - * | |
| 1321 | - * @return bool | |
| 1322 | - */ | |
| 1323 | - public static function is_ajax_on( $form ) { | |
| 1324 | - return ! empty( $form->options['ajax_submit'] ); | |
| 1325 | - } | |
| 1326 | - | |
| 1327 | - /** | |
| 1328 | - * Get the latest form available. | |
| 1329 | - * | |
| 1330 | - * @since 6.8 | |
| 1331 | - * | |
| 1332 | - * @return object | |
| 1333 | - */ | |
| 1334 | - public static function get_latest_form() { | |
| 1335 | - $args = array( | |
| 1336 | - array( | |
| 1337 | - 'or' => 1, | |
| 1338 | - 'parent_form_id' => null, | |
| 1339 | - 'parent_form_id <' => 1, | |
| 1340 | - ), | |
| 1341 | - 'is_template' => 0, | |
| 1342 | - 'status !' => 'trash', | |
| 1343 | - ); | |
| 1344 | - | |
| 1345 | - return self::getAll( $args, 'created_at desc', 1 ); | |
| 1346 | - } | |
| 1347 | - | |
| 1348 | - /** | |
| 1349 | - * Count and return total forms. | |
| 1350 | - * | |
| 1351 | - * @since 6.8 | |
| 1352 | - * | |
| 1353 | - * @return int | |
| 1354 | - */ | |
| 1355 | - public static function get_forms_count() { | |
| 1356 | - $args = array( | |
| 1357 | - array( | |
| 1358 | - 'or' => 1, | |
| 1359 | - 'parent_form_id' => null, | |
| 1360 | - 'parent_form_id <' => 1, | |
| 1361 | - ), | |
| 1362 | - 'is_template' => 0, | |
| 1363 | - 'status !' => 'trash', | |
| 1364 | - ); | |
| 1365 | - | |
| 1366 | - return FrmDb::get_count( 'frm_forms', $args ); | |
| 1367 | - } | |
| 1368 | - | |
| 1369 | - /** | |
| 1370 | - * @deprecated 2.03.05 This is still referenced in a few add ons (API, locations). | |
| 1371 | - * | |
| 1090 | + * @deprecated 3.0 | |
| 1372 | 1091 | * @codeCoverageIgnore |
| 1373 | 1092 | * |
| 1374 | 1093 | * @param string $key |
| 1375 | 1094 | * |
| @@ -1375,22 +1094,15 @@ | ||
| 1375 | 1094 | * |
| 1376 | 1095 | * @return int form id |
| 1377 | 1096 | */ |
| 1378 | 1097 | public static function getIdByKey( $key ) { |
| 1379 | - _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_id_by_key' ); | |
| 1380 | - return self::get_id_by_key( $key ); | |
| 1098 | + return FrmFormDeprecated::getIdByKey( $key ); | |
| 1381 | 1099 | } |
| 1382 | 1100 | |
| 1383 | 1101 | /** |
| 1384 | - * @deprecated 2.03.05 This is still referenced in the API add on as of v1.13. | |
| 1385 | - * | |
| 1102 | + * @deprecated 3.0 | |
| 1386 | 1103 | * @codeCoverageIgnore |
| 1387 | - * | |
| 1388 | - * @param int|string $id | |
| 1389 | - * | |
| 1390 | - * @return string | |
| 1391 | 1104 | */ |
| 1392 | 1105 | public static function getKeyById( $id ) { |
| 1393 | - _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_key_by_id' ); | |
| 1394 | - return self::get_key_by_id( $id ); | |
| 1106 | + return FrmFormDeprecated::getKeyById( $id ); | |
| 1395 | 1107 | } |
| 1396 | 1108 | } |
