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