| @@ -3,27 +3,11 @@ | ||
| 3 | 3 | die( 'You are not allowed to call this page directly.' ); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmMigrate { |
| 7 | - | |
| 8 | - /** | |
| 9 | - * @var string | |
| 10 | - */ | |
| 11 | 7 | public $fields; |
| 12 | - | |
| 13 | - /** | |
| 14 | - * @var string | |
| 15 | - */ | |
| 16 | 8 | public $forms; |
| 17 | - | |
| 18 | - /** | |
| 19 | - * @var string | |
| 20 | - */ | |
| 21 | 9 | public $entries; |
| 22 | - | |
| 23 | - /** | |
| 24 | - * @var string | |
| 25 | - */ | |
| 26 | 10 | public $entry_metas; |
| 27 | 11 | |
| 28 | 12 | public function __construct() { |
| 29 | 13 | global $wpdb; |
| @@ -32,11 +16,8 @@ | ||
| 32 | 16 | $this->entries = $wpdb->prefix . 'frm_items'; |
| 33 | 17 | $this->entry_metas = $wpdb->prefix . 'frm_item_metas'; |
| 34 | 18 | } |
| 35 | 19 | |
| 36 | - /** | |
| 37 | - * @return void | |
| 38 | - */ | |
| 39 | 20 | public function upgrade() { |
| 40 | 21 | do_action( 'frm_before_install' ); |
| 41 | 22 | |
| 42 | 23 | global $wpdb, $frm_vars; |
| @@ -51,34 +32,25 @@ | ||
| 51 | 32 | ) |
| 52 | 33 | ); |
| 53 | 34 | |
| 54 | 35 | if ( $needs_upgrade ) { |
| 55 | - $this->maybe_delete_htaccess_file(); | |
| 56 | - | |
| 57 | - // Update rewrite rules for views and other custom post types | |
| 36 | + // update rewrite rules for views and other custom post types | |
| 58 | 37 | flush_rewrite_rules(); |
| 59 | 38 | |
| 60 | - require_once ABSPATH . 'wp-admin/includes/upgrade.php'; | |
| 39 | + require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); | |
| 61 | 40 | |
| 62 | 41 | $old_db_version = get_option( 'frm_db_version' ); |
| 63 | 42 | |
| 64 | 43 | $this->create_tables(); |
| 65 | 44 | $this->migrate_data( $old_db_version ); |
| 66 | - $this->check_that_tables_exist(); | |
| 67 | 45 | |
| 68 | - // SAVE DB VERSION. | |
| 46 | + /***** SAVE DB VERSION *****/ | |
| 69 | 47 | update_option( 'frm_db_version', FrmAppHelper::plugin_version() . '-' . FrmAppHelper::$db_version ); |
| 70 | 48 | |
| 71 | 49 | if ( ! $old_db_version ) { |
| 72 | 50 | $this->maybe_create_contact_form(); |
| 73 | - | |
| 74 | - if ( false === get_option( 'frm_first_activation' ) ) { | |
| 75 | - update_option( 'frm_first_activation', time(), false ); | |
| 76 | - } | |
| 77 | - | |
| 78 | - $this->update_settings_for_new_install(); | |
| 79 | 51 | } |
| 80 | - }//end if | |
| 52 | + } | |
| 81 | 53 | |
| 82 | 54 | do_action( 'frm_after_install' ); |
| 83 | 55 | |
| 84 | 56 | $frm_vars['doing_upgrade'] = false; |
| @@ -84,97 +56,24 @@ | ||
| 84 | 56 | $frm_vars['doing_upgrade'] = false; |
| 85 | 57 | |
| 86 | 58 | FrmAppHelper::save_combined_js(); |
| 87 | 59 | |
| 88 | - // Update the styling settings | |
| 89 | - if ( ! function_exists( 'get_filesystem_method' ) ) { | |
| 90 | - return; | |
| 60 | + // update the styling settings | |
| 61 | + if ( function_exists( 'get_filesystem_method' ) ) { | |
| 62 | + $frm_style = new FrmStyle(); | |
| 63 | + $frm_style->update( 'default' ); | |
| 91 | 64 | } |
| 92 | - | |
| 93 | - $frm_style = new FrmStyle(); | |
| 94 | - $frm_style->update( 'default' ); | |
| 95 | 65 | } |
| 96 | 66 | |
| 97 | - /** | |
| 98 | - * Check if the .htaccess file should be deleted based on server response. | |
| 99 | - * If a server has AllowOverride FileInfo but not AllowOverride AuthConfig, JS and CSS files | |
| 100 | - * will result in a 500 error. | |
| 101 | - * | |
| 102 | - * @since 6.27 | |
| 103 | - * | |
| 104 | - * @return void | |
| 105 | - */ | |
| 106 | - private function maybe_delete_htaccess_file() { | |
| 107 | - $css_file_request = wp_remote_get( FrmAppHelper::plugin_url() . '/css/frm_fonts.css' ); | |
| 108 | - | |
| 109 | - if ( 200 === wp_remote_retrieve_response_code( $css_file_request ) ) { | |
| 110 | - return; | |
| 111 | - } | |
| 112 | - | |
| 113 | - $htaccess_path = FrmAppHelper::plugin_path() . '/.htaccess'; | |
| 114 | - | |
| 115 | - if ( file_exists( $htaccess_path ) ) { | |
| 116 | - wp_delete_file( $htaccess_path ); | |
| 117 | - } | |
| 118 | - } | |
| 119 | - | |
| 120 | - /** | |
| 121 | - * Updates some settings for new installs. | |
| 122 | - * | |
| 123 | - * @since 6.23 | |
| 124 | - * | |
| 125 | - * @return void | |
| 126 | - */ | |
| 127 | - private function update_settings_for_new_install() { | |
| 128 | - $settings = FrmAppHelper::get_settings(); | |
| 129 | - | |
| 130 | - $settings->denylist_check = 1; | |
| 131 | - $settings->installed_after_welcome_tour_update = 1; | |
| 132 | - $settings->store(); | |
| 133 | - } | |
| 134 | - | |
| 135 | - /** | |
| 136 | - * If we fail to create the database tables, add an inbox notice. | |
| 137 | - * This informs the user that they need to correct the issue and try again. | |
| 138 | - * | |
| 139 | - * @since 6.19 | |
| 140 | - * | |
| 141 | - * @return void | |
| 142 | - */ | |
| 143 | - private function check_that_tables_exist() { | |
| 144 | - // Check the DB that the table $this->forms exists. | |
| 67 | + public function collation() { | |
| 145 | 68 | global $wpdb; |
| 146 | - $exists = $wpdb->get_results( $wpdb->prepare( 'SHOW TABLES LIKE %s', $this->forms ) ); | |
| 147 | - | |
| 148 | - if ( $exists ) { | |
| 149 | - $inbox = new FrmInbox(); | |
| 150 | - $inbox->dismiss( 'failed-to-create-tables' ); | |
| 151 | - return; | |
| 69 | + if ( ! $wpdb->has_cap( 'collation' ) ) { | |
| 70 | + return ''; | |
| 152 | 71 | } |
| 153 | 72 | |
| 154 | - $message = array( | |
| 155 | - 'key' => 'failed-to-create-tables', | |
| 156 | - 'subject' => 'Something went wrong setting up the database', | |
| 157 | - 'message' => 'For steps to continue, see our <a href="https://formidableforms.com/knowledgebase/install-formidable-forms/#kb-missing-database-tables">documentation</a>. If you need assistance, we recommend that you reach out to your hosting provider. Then <a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_add_tables=1' ) ) . '">click here</a> to try again.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 158 | - 'cta' => '<a href="https://formidableforms.com/knowledgebase/install-formidable-forms/#kb-missing-database-tables">Learn More</a>', | |
| 159 | - 'type' => 'error', | |
| 160 | - ); | |
| 161 | - | |
| 162 | - $inbox = new FrmInbox(); | |
| 163 | - $inbox->add_message( $message ); | |
| 73 | + return $wpdb->get_charset_collate(); | |
| 164 | 74 | } |
| 165 | 75 | |
| 166 | - /** | |
| 167 | - * @return string | |
| 168 | - */ | |
| 169 | - public function collation() { | |
| 170 | - global $wpdb; | |
| 171 | - return $wpdb->has_cap( 'collation' ) ? $wpdb->get_charset_collate() : ''; | |
| 172 | - } | |
| 173 | - | |
| 174 | - /** | |
| 175 | - * @return void | |
| 176 | - */ | |
| 177 | 76 | private function create_tables() { |
| 178 | 77 | $charset_collate = $this->collation(); |
| 179 | 78 | $sql = array(); |
| 180 | 79 | |
| @@ -266,10 +165,8 @@ | ||
| 266 | 165 | /** |
| 267 | 166 | * These indexes help optimize database queries for entries. |
| 268 | 167 | * |
| 269 | 168 | * @since 6.6 |
| 270 | - * @since 6.16.3 idx_form_id_is_draft was also added to frm_items. | |
| 271 | - * @since 6.17 idx_form_id_type was also added to frm_fields. | |
| 272 | 169 | * |
| 273 | 170 | * @return void |
| 274 | 171 | */ |
| 275 | 172 | private function add_composite_indexes_for_entries() { |
| @@ -287,22 +184,8 @@ | ||
| 287 | 184 | |
| 288 | 185 | if ( ! self::index_exists( $table_name, $index_name ) ) { |
| 289 | 186 | $wpdb->query( "CREATE INDEX idx_field_id_item_id ON `{$wpdb->prefix}frm_item_metas` (field_id, item_id)" ); |
| 290 | 187 | } |
| 291 | - | |
| 292 | - $table_name = "{$wpdb->prefix}frm_items"; | |
| 293 | - $index_name = 'idx_form_id_is_draft'; | |
| 294 | - | |
| 295 | - if ( ! self::index_exists( $table_name, $index_name ) ) { | |
| 296 | - $wpdb->query( "CREATE INDEX idx_form_id_is_draft ON `{$wpdb->prefix}frm_items` (form_id, is_draft)" ); | |
| 297 | - } | |
| 298 | - | |
| 299 | - $table_name = "{$wpdb->prefix}frm_fields"; | |
| 300 | - $index_name = 'idx_form_id_type'; | |
| 301 | - | |
| 302 | - if ( ! self::index_exists( $table_name, $index_name ) ) { | |
| 303 | - $wpdb->query( "CREATE INDEX idx_form_id_type ON `{$wpdb->prefix}frm_fields` (form_id, type(30))" ); | |
| 304 | - } | |
| 305 | 188 | } |
| 306 | 189 | |
| 307 | 190 | /** |
| 308 | 191 | * Check that an index exists in a database table before trying to add it (which results in an error). |
| @@ -310,9 +193,8 @@ | ||
| 310 | 193 | * @since 6.6 |
| 311 | 194 | * |
| 312 | 195 | * @param string $table_name |
| 313 | 196 | * @param string $index_name |
| 314 | - * | |
| 315 | 197 | * @return bool |
| 316 | 198 | */ |
| 317 | 199 | private static function index_exists( $table_name, $index_name ) { |
| 318 | 200 | global $wpdb; |
| @@ -328,14 +210,10 @@ | ||
| 328 | 210 | ); |
| 329 | 211 | return (bool) $row; |
| 330 | 212 | } |
| 331 | 213 | |
| 332 | - /** | |
| 333 | - * @return void | |
| 334 | - */ | |
| 335 | 214 | private function maybe_create_contact_form() { |
| 336 | 215 | $form_exists = FrmForm::get_id_by_key( 'contact-form' ); |
| 337 | - | |
| 338 | 216 | if ( ! $form_exists ) { |
| 339 | 217 | $this->add_default_template(); |
| 340 | 218 | } |
| 341 | 219 | } |
| @@ -343,10 +221,8 @@ | ||
| 343 | 221 | /** |
| 344 | 222 | * Create the default contact form |
| 345 | 223 | * |
| 346 | 224 | * @since 3.06 |
| 347 | - * | |
| 348 | - * @return void | |
| 349 | 225 | */ |
| 350 | 226 | private function add_default_template() { |
| 351 | 227 | if ( FrmXMLHelper::check_if_libxml_disable_entity_loader_exists() ) { |
| 352 | 228 | // XML import is not enabled on your server. |
| @@ -354,9 +230,10 @@ | ||
| 354 | 230 | } |
| 355 | 231 | |
| 356 | 232 | $set_err = libxml_use_internal_errors( true ); |
| 357 | 233 | $loader = FrmXMLHelper::maybe_libxml_disable_entity_loader( true ); |
| 358 | - $file = FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml'; | |
| 234 | + | |
| 235 | + $file = FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml'; | |
| 359 | 236 | FrmXMLHelper::import_xml( $file ); |
| 360 | 237 | |
| 361 | 238 | libxml_use_internal_errors( $set_err ); |
| 362 | 239 | FrmXMLHelper::maybe_libxml_disable_entity_loader( $loader ); |
| @@ -363,41 +240,32 @@ | ||
| 363 | 240 | } |
| 364 | 241 | |
| 365 | 242 | /** |
| 366 | 243 | * @param int|string $old_db_version |
| 367 | - * | |
| 368 | - * @return void | |
| 369 | 244 | */ |
| 370 | 245 | private function migrate_data( $old_db_version ) { |
| 371 | 246 | if ( ! $old_db_version ) { |
| 372 | 247 | $old_db_version = get_option( 'frm_db_version' ); |
| 373 | 248 | } |
| 374 | - | |
| 375 | - if ( str_contains( $old_db_version, '-' ) ) { | |
| 249 | + if ( strpos( $old_db_version, '-' ) ) { | |
| 376 | 250 | $last_upgrade = explode( '-', $old_db_version ); |
| 377 | - $old_db_version = intval( end( $last_upgrade ) ); | |
| 251 | + $old_db_version = (int) $last_upgrade[1]; | |
| 378 | 252 | } |
| 379 | 253 | |
| 380 | 254 | if ( ! is_numeric( $old_db_version ) ) { |
| 381 | - // Bail if we don't know the previous version | |
| 255 | + // bail if we don't know the previous version | |
| 382 | 256 | return; |
| 383 | 257 | } |
| 384 | 258 | |
| 385 | - $migrations = array( 16, 11, 16, 17, 23, 25, 86, 90, 97, 98, 101, 104, 105 ); | |
| 386 | - | |
| 259 | + $migrations = array( 16, 11, 16, 17, 23, 25, 86, 90, 97, 98 ); | |
| 387 | 260 | foreach ( $migrations as $migration ) { |
| 388 | - if ( FrmAppHelper::$db_version < $migration || $old_db_version >= $migration ) { | |
| 389 | - continue; | |
| 261 | + if ( FrmAppHelper::$db_version >= $migration && $old_db_version < $migration ) { | |
| 262 | + $function_name = 'migrate_to_' . $migration; | |
| 263 | + $this->$function_name(); | |
| 390 | 264 | } |
| 391 | - | |
| 392 | - $function_name = 'migrate_to_' . $migration; | |
| 393 | - $this->$function_name(); | |
| 394 | 265 | } |
| 395 | 266 | } |
| 396 | 267 | |
| 397 | - /** | |
| 398 | - * @return bool | |
| 399 | - */ | |
| 400 | 268 | public function uninstall() { |
| 401 | 269 | if ( ! current_user_can( 'administrator' ) ) { |
| 402 | 270 | $frm_settings = FrmAppHelper::get_settings(); |
| 403 | 271 | wp_die( esc_html( $frm_settings->admin_permission ) ); |
| @@ -416,15 +284,14 @@ | ||
| 416 | 284 | delete_option( 'frm_lite_settings_upgrade' ); |
| 417 | 285 | delete_option( 'frm-usage-uuid' ); |
| 418 | 286 | delete_option( 'frm_inbox' ); |
| 419 | 287 | delete_option( 'frmpro_css' ); |
| 420 | - delete_option( FrmOnboardingWizardController::REDIRECT_STATUS_OPTION ); | |
| 288 | + delete_option( 'frm_welcome_redirect' ); | |
| 421 | 289 | delete_option( FrmEmailSummaryHelper::$option_name ); |
| 422 | 290 | |
| 423 | 291 | // Delete roles. |
| 424 | 292 | $frm_roles = FrmAppHelper::frm_capabilities(); |
| 425 | 293 | $roles = get_editable_roles(); |
| 426 | - | |
| 427 | 294 | foreach ( $frm_roles as $frm_role => $frm_role_description ) { |
| 428 | 295 | foreach ( $roles as $role => $details ) { |
| 429 | 296 | $wp_roles->remove_cap( $role, $frm_role ); |
| 430 | 297 | unset( $role, $details ); |
| @@ -432,16 +299,15 @@ | ||
| 432 | 299 | unset( $frm_role, $frm_role_description ); |
| 433 | 300 | } |
| 434 | 301 | unset( $roles, $frm_roles ); |
| 435 | 302 | |
| 436 | - // Delete actions, views, and styles | |
| 303 | + // delete actions, views, and styles | |
| 437 | 304 | |
| 438 | - // Prevent the post deletion from triggering entries to be deleted | |
| 305 | + // prevent the post deletion from triggering entries to be deleted | |
| 439 | 306 | remove_action( 'before_delete_post', 'FrmProDisplaysController::before_delete_post' ); |
| 440 | 307 | remove_action( 'deleted_post', 'FrmProEntriesController::delete_entry' ); |
| 441 | 308 | |
| 442 | - $post_ids = $wpdb->get_col( $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type in (%s, %s, %s)', FrmFormActionsController::$action_post_type, FrmStylesController::$post_type, 'frm_display' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 443 | - | |
| 309 | + $post_ids = $wpdb->get_col( $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type in (%s, %s, %s)', FrmFormActionsController::$action_post_type, FrmStylesController::$post_type, 'frm_display' ) ); | |
| 444 | 310 | foreach ( $post_ids as $post_id ) { |
| 445 | 311 | // Delete's each post. |
| 446 | 312 | wp_delete_post( $post_id, true ); |
| 447 | 313 | } |
| @@ -446,15 +312,15 @@ | ||
| 446 | 312 | wp_delete_post( $post_id, true ); |
| 447 | 313 | } |
| 448 | 314 | unset( $post_ids ); |
| 449 | 315 | |
| 450 | - // Delete transients | |
| 316 | + // delete transients | |
| 451 | 317 | delete_transient( 'frmpro_css' ); |
| 452 | 318 | delete_transient( 'frm_options' ); |
| 453 | 319 | delete_transient( 'frmpro_options' ); |
| 454 | - delete_transient( FrmOnboardingWizardController::TRANSIENT_NAME ); | |
| 320 | + delete_transient( 'frm_activation_redirect' ); | |
| 455 | 321 | |
| 456 | - $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 322 | + $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) ); | |
| 457 | 323 | |
| 458 | 324 | do_action( 'frm_after_uninstall' ); |
| 459 | 325 | |
| 460 | 326 | return true; |
| @@ -460,67 +326,11 @@ | ||
| 460 | 326 | return true; |
| 461 | 327 | } |
| 462 | 328 | |
| 463 | 329 | /** |
| 464 | - * In older versions of Lite, it's possible we've saved the wrong location ID. | |
| 465 | - * So force it to get valid values again. | |
| 466 | - * | |
| 467 | - * @since 6.25 | |
| 468 | - * | |
| 469 | - * @return void | |
| 470 | - */ | |
| 471 | - private function migrate_to_104() { | |
| 472 | - if ( FrmSquareLiteConnectHelper::get_merchant_id( 'test' ) ) { | |
| 473 | - FrmSquareLiteConnectHelper::get_location_id( true, 'test' ); | |
| 474 | - } | |
| 475 | - | |
| 476 | - if ( FrmSquareLiteConnectHelper::get_merchant_id( 'live' ) ) { | |
| 477 | - FrmSquareLiteConnectHelper::get_location_id( true, 'live' ); | |
| 478 | - } | |
| 479 | - } | |
| 480 | - | |
| 481 | - /** | |
| 482 | - * Add new wp_options row for custom setting. | |
| 483 | - * | |
| 484 | - * @since 6.26 | |
| 485 | - * | |
| 486 | - * @return void | |
| 487 | - */ | |
| 488 | - private function migrate_to_105() { | |
| 489 | - if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 490 | - update_option( 'frm_show_pricing_fields_modal', 1, false ); | |
| 491 | - } | |
| 492 | - } | |
| 493 | - | |
| 494 | - /** | |
| 495 | - * Disables summary email for multisite (not the main site) if recipient setting isn't changed. | |
| 496 | - * | |
| 497 | - * @since 6.8 | |
| 498 | - * | |
| 499 | - * @return void | |
| 500 | - */ | |
| 501 | - private function migrate_to_101() { | |
| 502 | - if ( ! is_multisite() || get_main_site_id() === get_current_blog_id() ) { | |
| 503 | - return; | |
| 504 | - } | |
| 505 | - | |
| 506 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 507 | - | |
| 508 | - if ( empty( $frm_settings->summary_emails ) || '[admin_email]' !== $frm_settings->summary_emails_recipients ) { | |
| 509 | - // User changed it. | |
| 510 | - return; | |
| 511 | - } | |
| 512 | - | |
| 513 | - $frm_settings->summary_emails = 0; | |
| 514 | - $frm_settings->store(); | |
| 515 | - } | |
| 516 | - | |
| 517 | - /** | |
| 518 | 330 | * Clear frmpro_css transient. |
| 519 | 331 | * |
| 520 | 332 | * @since 4.10.02 |
| 521 | - * | |
| 522 | - * @return void | |
| 523 | 333 | */ |
| 524 | 334 | private function migrate_to_98() { |
| 525 | 335 | delete_transient( 'frmpro_css' ); |
| 526 | 336 | } |
| @@ -528,10 +338,8 @@ | ||
| 528 | 338 | /** |
| 529 | 339 | * Move default_blank and clear_on_focus to placeholder. |
| 530 | 340 | * |
| 531 | 341 | * @since 4.0 |
| 532 | - * | |
| 533 | - * @return void | |
| 534 | 342 | */ |
| 535 | 343 | private function migrate_to_97() { |
| 536 | 344 | $this->migrate_to_placeholder( 'clear_on_focus' ); |
| 537 | 345 | $this->migrate_to_placeholder( 'default_blank' ); |
| @@ -540,12 +348,8 @@ | ||
| 540 | 348 | /** |
| 541 | 349 | * Move clear_on_focus or default_blank to placeholder. |
| 542 | 350 | * |
| 543 | 351 | * @since 4.0 |
| 544 | - * | |
| 545 | - * @param string $type Field option key to migrate. | |
| 546 | - * | |
| 547 | - * @return void | |
| 548 | 352 | */ |
| 549 | 353 | private function migrate_to_placeholder( $type = 'clear_on_focus' ) { |
| 550 | 354 | $query = array( |
| 551 | 355 | 'field_options like' => '"' . $type . '";s:1:"1";', |
| @@ -556,10 +360,9 @@ | ||
| 556 | 360 | foreach ( $fields as $field ) { |
| 557 | 361 | FrmAppHelper::unserialize_or_decode( $field->field_options ); |
| 558 | 362 | FrmAppHelper::unserialize_or_decode( $field->options ); |
| 559 | 363 | $update_values = FrmXMLHelper::migrate_field_placeholder( $field, $type ); |
| 560 | - | |
| 561 | - if ( ! $update_values ) { | |
| 364 | + if ( empty( $update_values ) ) { | |
| 562 | 365 | continue; |
| 563 | 366 | } |
| 564 | 367 | |
| 565 | 368 | FrmField::update( $field->id, $update_values ); |
| @@ -567,18 +370,14 @@ | ||
| 567 | 370 | } |
| 568 | 371 | } |
| 569 | 372 | |
| 570 | 373 | /** |
| 571 | - * Delete unneeded default templates | |
| 374 | + * Delete uneeded default templates | |
| 572 | 375 | * |
| 573 | 376 | * @since 3.06 |
| 574 | - * | |
| 575 | - * @return void | |
| 576 | 377 | */ |
| 577 | 378 | private function migrate_to_90() { |
| 578 | 379 | $form = FrmForm::getOne( 'contact' ); |
| 579 | - | |
| 580 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 581 | 380 | if ( $form && $form->default_template == 1 ) { |
| 582 | 381 | FrmForm::destroy( 'contact' ); |
| 583 | 382 | } |
| 584 | 383 | } |
| @@ -586,17 +385,16 @@ | ||
| 586 | 385 | /** |
| 587 | 386 | * Reverse migration 17 -- Divide by 9 |
| 588 | 387 | * |
| 589 | 388 | * @since 3.0.05 |
| 590 | - * | |
| 591 | - * @return void | |
| 592 | 389 | */ |
| 593 | 390 | private function migrate_to_86() { |
| 391 | + | |
| 594 | 392 | $fields = $this->get_fields_with_size(); |
| 595 | 393 | |
| 596 | - foreach ( $fields as $f ) { | |
| 394 | + foreach ( (array) $fields as $f ) { | |
| 597 | 395 | FrmAppHelper::unserialize_or_decode( $f->field_options ); |
| 598 | - $size = $f->field_options['size']; | |
| 396 | + $size = $f->field_options['size']; | |
| 599 | 397 | $this->maybe_convert_migrated_size( $size ); |
| 600 | 398 | |
| 601 | 399 | if ( $size === $f->field_options['size'] ) { |
| 602 | 400 | continue; |
| @@ -606,12 +404,11 @@ | ||
| 606 | 404 | FrmField::update( $f->id, array( 'field_options' => $f->field_options ) ); |
| 607 | 405 | unset( $f ); |
| 608 | 406 | } |
| 609 | 407 | |
| 610 | - // Reverse the extra size changes in widgets | |
| 408 | + // reverse the extra size changes in widgets | |
| 611 | 409 | $widgets = get_option( 'widget_frm_show_form' ); |
| 612 | - | |
| 613 | - if ( ! $widgets ) { | |
| 410 | + if ( empty( $widgets ) ) { | |
| 614 | 411 | return; |
| 615 | 412 | } |
| 616 | 413 | |
| 617 | 414 | $this->revert_widget_field_size(); |
| @@ -616,11 +413,8 @@ | ||
| 616 | 413 | |
| 617 | 414 | $this->revert_widget_field_size(); |
| 618 | 415 | } |
| 619 | 416 | |
| 620 | - /** | |
| 621 | - * @return array | |
| 622 | - */ | |
| 623 | 417 | private function get_fields_with_size() { |
| 624 | 418 | $field_types = array( |
| 625 | 419 | 'textarea', |
| 626 | 420 | 'text', |
| @@ -648,20 +442,16 @@ | ||
| 648 | 442 | /** |
| 649 | 443 | * Reverse the extra size changes in widgets |
| 650 | 444 | * |
| 651 | 445 | * @since 3.0.05 |
| 652 | - * | |
| 653 | - * @return void | |
| 654 | 446 | */ |
| 655 | 447 | private function revert_widget_field_size() { |
| 656 | 448 | $widgets = get_option( 'widget_frm_show_form' ); |
| 657 | - | |
| 658 | - if ( ! $widgets ) { | |
| 449 | + if ( empty( $widgets ) ) { | |
| 659 | 450 | return; |
| 660 | 451 | } |
| 661 | 452 | |
| 662 | 453 | FrmAppHelper::unserialize_or_decode( $widgets ); |
| 663 | - | |
| 664 | 454 | foreach ( $widgets as $k => $widget ) { |
| 665 | 455 | if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) { |
| 666 | 456 | continue; |
| 667 | 457 | } |
| @@ -667,9 +457,8 @@ | ||
| 667 | 457 | } |
| 668 | 458 | |
| 669 | 459 | $this->maybe_convert_migrated_size( $widgets[ $k ]['size'] ); |
| 670 | 460 | } |
| 671 | - | |
| 672 | 461 | update_option( 'widget_frm_show_form', $widgets ); |
| 673 | 462 | } |
| 674 | 463 | |
| 675 | 464 | /** |
| @@ -675,28 +464,23 @@ | ||
| 675 | 464 | /** |
| 676 | 465 | * Divide by 9 to reverse the multiplication |
| 677 | 466 | * |
| 678 | 467 | * @since 3.0.05 |
| 679 | - * | |
| 680 | - * @param string $size Size string to maybe convert, passed by reference. | |
| 681 | - * | |
| 682 | - * @return void | |
| 683 | 468 | */ |
| 684 | 469 | private function maybe_convert_migrated_size( &$size ) { |
| 685 | - $has_px_size = $size && str_contains( $size, 'px' ); | |
| 686 | - | |
| 470 | + $has_px_size = ! empty( $size ) && strpos( $size, 'px' ); | |
| 687 | 471 | if ( ! $has_px_size ) { |
| 688 | 472 | return; |
| 689 | 473 | } |
| 690 | 474 | |
| 691 | 475 | $int_size = str_replace( 'px', '', $size ); |
| 692 | - | |
| 693 | 476 | if ( ! is_numeric( $int_size ) || (int) $int_size < 900 ) { |
| 694 | 477 | return; |
| 695 | 478 | } |
| 696 | 479 | |
| 697 | 480 | $pixel_conversion = 9; |
| 698 | - $size = round( (int) $int_size / $pixel_conversion ); | |
| 481 | + | |
| 482 | + $size = round( (int) $int_size / $pixel_conversion ); | |
| 699 | 483 | } |
| 700 | 484 | |
| 701 | 485 | /** |
| 702 | 486 | * Migrate old styling settings. If sites are using the old |
| @@ -702,22 +486,19 @@ | ||
| 702 | 486 | * Migrate old styling settings. If sites are using the old |
| 703 | 487 | * default 400px field width, switch it to 100% |
| 704 | 488 | * |
| 705 | 489 | * @since 2.0.4 |
| 706 | - * | |
| 707 | - * @return void | |
| 708 | 490 | */ |
| 709 | 491 | private function migrate_to_25() { |
| 710 | - // Get the style that was created with the style migration | |
| 492 | + // get the style that was created with the style migration | |
| 711 | 493 | $frm_style = new FrmStyle(); |
| 712 | 494 | $styles = $frm_style->get_all( 'post_date', 'ASC', 1 ); |
| 713 | - | |
| 714 | - if ( ! $styles ) { | |
| 495 | + if ( empty( $styles ) ) { | |
| 715 | 496 | return; |
| 716 | 497 | } |
| 717 | 498 | |
| 718 | 499 | foreach ( $styles as $style ) { |
| 719 | - if ( $style->post_content['field_width'] === '400px' ) { | |
| 500 | + if ( $style->post_content['field_width'] == '400px' ) { | |
| 720 | 501 | $style->post_content['field_width'] = '100%'; |
| 721 | 502 | $frm_style->save( (array) $style ); |
| 722 | 503 | |
| 723 | 504 | return; |
| @@ -729,16 +510,13 @@ | ||
| 729 | 510 | * Check if the parent_form_id columns exists. |
| 730 | 511 | * If not, try and add it again |
| 731 | 512 | * |
| 732 | 513 | * @since 2.0.2 |
| 733 | - * | |
| 734 | - * @return void | |
| 735 | 514 | */ |
| 736 | 515 | private function migrate_to_23() { |
| 737 | 516 | global $wpdb; |
| 738 | 517 | $exists = $wpdb->get_row( 'SHOW COLUMNS FROM ' . $this->forms . ' LIKE "parent_form_id"' ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 739 | - | |
| 740 | - if ( ! $exists ) { | |
| 518 | + if ( empty( $exists ) ) { | |
| 741 | 519 | $wpdb->query( 'ALTER TABLE ' . $this->forms . ' ADD parent_form_id int(11) default 0' ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 742 | 520 | } |
| 743 | 521 | } |
| 744 | 522 | |
| @@ -743,10 +521,8 @@ | ||
| 743 | 521 | } |
| 744 | 522 | |
| 745 | 523 | /** |
| 746 | 524 | * Change field size from character to pixel -- Multiply by 9 |
| 747 | - * | |
| 748 | - * @return void | |
| 749 | 525 | */ |
| 750 | 526 | private function migrate_to_17() { |
| 751 | 527 | $fields = $this->get_fields_with_size(); |
| 752 | 528 | |
| @@ -751,9 +527,8 @@ | ||
| 751 | 527 | $fields = $this->get_fields_with_size(); |
| 752 | 528 | |
| 753 | 529 | foreach ( $fields as $f ) { |
| 754 | 530 | FrmAppHelper::unserialize_or_decode( $f->field_options ); |
| 755 | - | |
| 756 | 531 | if ( empty( $f->field_options['size'] ) || ! is_numeric( $f->field_options['size'] ) ) { |
| 757 | 532 | continue; |
| 758 | 533 | } |
| 759 | 534 | |
| @@ -767,20 +542,16 @@ | ||
| 767 | 542 | } |
| 768 | 543 | |
| 769 | 544 | /** |
| 770 | 545 | * Change the characters in widgets to pixels |
| 771 | - * | |
| 772 | - * @return void | |
| 773 | 546 | */ |
| 774 | 547 | private function adjust_widget_size() { |
| 775 | 548 | $widgets = get_option( 'widget_frm_show_form' ); |
| 776 | - | |
| 777 | - if ( ! $widgets ) { | |
| 549 | + if ( empty( $widgets ) ) { | |
| 778 | 550 | return; |
| 779 | 551 | } |
| 780 | 552 | |
| 781 | 553 | FrmAppHelper::unserialize_or_decode( $widgets ); |
| 782 | - | |
| 783 | 554 | foreach ( $widgets as $k => $widget ) { |
| 784 | 555 | if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) { |
| 785 | 556 | continue; |
| 786 | 557 | } |
| @@ -785,21 +556,15 @@ | ||
| 785 | 556 | continue; |
| 786 | 557 | } |
| 787 | 558 | $this->convert_character_to_px( $widgets[ $k ]['size'] ); |
| 788 | 559 | } |
| 789 | - | |
| 790 | 560 | update_option( 'widget_frm_show_form', $widgets ); |
| 791 | 561 | } |
| 792 | 562 | |
| 793 | - /** | |
| 794 | - * @param string $size | |
| 795 | - * | |
| 796 | - * @return void | |
| 797 | - */ | |
| 798 | 563 | private function convert_character_to_px( &$size ) { |
| 799 | 564 | $pixel_conversion = 9; |
| 800 | 565 | |
| 801 | - $size = round( $pixel_conversion * (int) $size ); | |
| 566 | + $size = round( $pixel_conversion * (int) $size ); | |
| 802 | 567 | $size .= 'px'; |
| 803 | 568 | } |
| 804 | 569 | |
| 805 | 570 | /** |
| @@ -838,9 +603,9 @@ | ||
| 838 | 603 | * post_excerpt: message |
| 839 | 604 | */ |
| 840 | 605 | foreach ( $forms as $form ) { |
| 841 | 606 | if ( $form->is_template && $form->default_template ) { |
| 842 | - // Don't migrate the default templates since the email will be added anyway | |
| 607 | + // don't migrate the default templates since the email will be added anyway | |
| 843 | 608 | continue; |
| 844 | 609 | } |
| 845 | 610 | |
| 846 | 611 | // Format form options |
| @@ -854,9 +619,10 @@ | ||
| 854 | 619 | |
| 855 | 620 | private function migrate_to_11() { |
| 856 | 621 | global $wpdb; |
| 857 | 622 | |
| 858 | - $forms = FrmDb::get_results( $this->forms, array(), 'id, options' ); | |
| 623 | + $forms = FrmDb::get_results( $this->forms, array(), 'id, options' ); | |
| 624 | + | |
| 859 | 625 | $sending = __( 'Sending', 'formidable' ); |
| 860 | 626 | $img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif'; |
| 861 | 627 | $old_default_html = <<<DEFAULT_HTML |
| 862 | 628 | <div class="frm_submit"> |
| @@ -868,21 +634,18 @@ | ||
| 868 | 634 | unset( $sending, $img ); |
| 869 | 635 | |
| 870 | 636 | $new_default_html = FrmFormsHelper::get_default_html( 'submit' ); |
| 871 | 637 | $draft_link = FrmFormsHelper::get_draft_link(); |
| 872 | - | |
| 873 | 638 | foreach ( $forms as $form ) { |
| 874 | 639 | FrmAppHelper::unserialize_or_decode( $form->options ); |
| 875 | - | |
| 876 | - if ( empty( $form->options['submit_html'] ) ) { | |
| 640 | + if ( ! isset( $form->options['submit_html'] ) || empty( $form->options['submit_html'] ) ) { | |
| 877 | 641 | continue; |
| 878 | 642 | } |
| 879 | 643 | |
| 880 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 881 | 644 | if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) { |
| 882 | 645 | $form->options['submit_html'] = $new_default_html; |
| 883 | 646 | $wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) ); |
| 884 | - } elseif ( ! str_contains( $form->options['submit_html'], 'save_draft' ) ) { | |
| 647 | + } elseif ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) { | |
| 885 | 648 | $form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] ); |
| 886 | 649 | $wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) ); |
| 887 | 650 | } |
| 888 | 651 | unset( $form ); |
