| @@ -8,38 +8,154 @@ | ||
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | 10 | namespace BitCode\BitForm\Core\Database; |
| 11 | 11 | |
| 12 | +use BitCode\BitForm\Core\Util\Log; | |
| 13 | + | |
| 12 | 14 | /** |
| 13 | 15 | * Database Migration |
| 14 | 16 | */ |
| 15 | 17 | final class DB |
| 16 | 18 | { |
| 17 | - /** | |
| 18 | - * Undocumented function | |
| 19 | - * | |
| 20 | - * @return void | |
| 21 | - */ | |
| 22 | - public static function migrate() | |
| 23 | - { | |
| 24 | - global $wpdb; | |
| 25 | - global $bitforms_db_version; | |
| 26 | - $collate = ''; | |
| 19 | + /** | |
| 20 | + * Undocumented function | |
| 21 | + * | |
| 22 | + * @return void | |
| 23 | + */ | |
| 27 | 24 | |
| 28 | - if ($wpdb->has_cap('collation')) { | |
| 29 | - if (!empty($wpdb->charset)) { | |
| 30 | - $collate .= "DEFAULT CHARACTER SET $wpdb->charset"; | |
| 31 | - } | |
| 25 | + /** | |
| 26 | + * Idempotently add the email-template status/config columns. | |
| 27 | + * | |
| 28 | + * @return void | |
| 29 | + */ | |
| 30 | + public static function ensureEmailTemplateStatusColumn() | |
| 31 | + { | |
| 32 | + global $wpdb; | |
| 33 | + $emailTable = $wpdb->prefix . 'bitforms_email_template'; | |
| 34 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$emailTable}` LIKE 'status'")) { | |
| 35 | + // Schema migration: table name interpolation only (no user input). $wpdb->prepare() cannot parameterize DDL. | |
| 36 | + $wpdb->query( | |
| 37 | + "ALTER TABLE `{$emailTable}` | |
| 38 | + ADD COLUMN `status` TINYINT(1) DEFAULT 1 AFTER `body`, | |
| 39 | + ADD COLUMN `config` LONGTEXT NULL AFTER `status`" | |
| 40 | + ); | |
| 41 | + } | |
| 42 | + } | |
| 32 | 43 | |
| 33 | - if (!empty($wpdb->collate)) { | |
| 34 | - $collate .= " COLLATE $wpdb->collate"; | |
| 35 | - } | |
| 36 | - } | |
| 44 | + /** | |
| 45 | + * Idempotently add the workflows `workflow_info` column. | |
| 46 | + * | |
| 47 | + * @return void | |
| 48 | + */ | |
| 49 | + public static function ensureWorkflowInfoColumn() | |
| 50 | + { | |
| 51 | + global $wpdb; | |
| 52 | + $table = $wpdb->prefix . 'bitforms_workflows'; | |
| 53 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$table}` LIKE 'workflow_info'")) { | |
| 54 | + // Schema migration: table name interpolation only (no user input). $wpdb->prepare() cannot parameterize DDL. | |
| 55 | + $wpdb->query( | |
| 56 | + "ALTER TABLE `{$table}` | |
| 57 | + ADD COLUMN `workflow_info` LONGTEXT NULL AFTER `workflow_condition`" | |
| 58 | + ); | |
| 59 | + } | |
| 60 | + } | |
| 37 | 61 | |
| 38 | - $max_index_length = 191; | |
| 62 | + /** | |
| 63 | + * Idempotently add the workflows `workflow_category` column (conditional-logic classic/basic split). | |
| 64 | + * | |
| 65 | + * @return void | |
| 66 | + */ | |
| 67 | + public static function ensureWorkflowCategoryColumn() | |
| 68 | + { | |
| 69 | + self::ensureWorkflowInfoColumn(); | |
| 70 | + global $wpdb; | |
| 71 | + $table = $wpdb->prefix . 'bitforms_workflows'; | |
| 72 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$table}` LIKE 'workflow_category'")) { | |
| 73 | + // Schema migration: table name interpolation only (no user input). $wpdb->prepare() cannot parameterize DDL. | |
| 74 | + $wpdb->query( | |
| 75 | + "ALTER TABLE `{$table}` | |
| 76 | + ADD COLUMN `workflow_category` VARCHAR(20) DEFAULT 'classic' AFTER `workflow_info`, | |
| 77 | + ADD KEY `workflow_category` (`workflow_category`)" | |
| 78 | + ); | |
| 79 | + } | |
| 80 | + } | |
| 39 | 81 | |
| 40 | - $table_schema = array( | |
| 41 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_reports` ( | |
| 82 | + /** | |
| 83 | + * Idempotently add the workflows `workflow_order` column. | |
| 84 | + * | |
| 85 | + * @return void | |
| 86 | + */ | |
| 87 | + public static function ensureWorkflowOrderColumn() | |
| 88 | + { | |
| 89 | + global $wpdb; | |
| 90 | + $table = $wpdb->prefix . 'bitforms_workflows'; | |
| 91 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$table}` LIKE 'workflow_order'")) { | |
| 92 | + $wpdb->query( | |
| 93 | + "ALTER TABLE `{$table}` | |
| 94 | + ADD COLUMN `workflow_order` INT(11) DEFAULT NULL AFTER `workflow_condition`" | |
| 95 | + ); | |
| 96 | + } | |
| 97 | + } | |
| 98 | + | |
| 99 | + /** | |
| 100 | + * Idempotently add the workflows `workflow_status` column. | |
| 101 | + * | |
| 102 | + * @return void | |
| 103 | + */ | |
| 104 | + public static function ensureWorkflowStatusColumn() | |
| 105 | + { | |
| 106 | + self::ensureWorkflowOrderColumn(); | |
| 107 | + global $wpdb; | |
| 108 | + $table = $wpdb->prefix . 'bitforms_workflows'; | |
| 109 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$table}` LIKE 'workflow_status'")) { | |
| 110 | + $wpdb->query( | |
| 111 | + "ALTER TABLE `{$table}` | |
| 112 | + ADD COLUMN `workflow_status` TINYINT(1) DEFAULT 1 NOT NULL AFTER `workflow_order`" | |
| 113 | + ); | |
| 114 | + } | |
| 115 | + } | |
| 116 | + | |
| 117 | + /** | |
| 118 | + * Idempotently add every workflows column the queries reference, for installs whose | |
| 119 | + * `bitforms_db_version` ran ahead of their real schema (a version-gated ALTER failed once). | |
| 120 | + * | |
| 121 | + * @return bool true when all four columns exist afterwards | |
| 122 | + */ | |
| 123 | + public static function ensureWorkflowSchema() | |
| 124 | + { | |
| 125 | + global $wpdb; | |
| 126 | + self::ensureWorkflowStatusColumn(); | |
| 127 | + self::ensureWorkflowCategoryColumn(); | |
| 128 | + | |
| 129 | + $table = $wpdb->prefix . 'bitforms_workflows'; | |
| 130 | + foreach (['workflow_order', 'workflow_info', 'workflow_category', 'workflow_status'] as $column) { | |
| 131 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$table}` LIKE '{$column}'")) { | |
| 132 | + return false; | |
| 133 | + } | |
| 134 | + } | |
| 135 | + return true; | |
| 136 | + } | |
| 137 | + | |
| 138 | + public static function migrate() | |
| 139 | + { | |
| 140 | + global $wpdb; | |
| 141 | + global $bitforms_db_version; | |
| 142 | + $collate = ''; | |
| 143 | + | |
| 144 | + if ($wpdb->has_cap('collation')) { | |
| 145 | + if (!empty($wpdb->charset)) { | |
| 146 | + $collate .= "DEFAULT CHARACTER SET $wpdb->charset"; | |
| 147 | + } | |
| 148 | + | |
| 149 | + if (!empty($wpdb->collate)) { | |
| 150 | + $collate .= " COLLATE $wpdb->collate"; | |
| 151 | + } | |
| 152 | + } | |
| 153 | + | |
| 154 | + $max_index_length = 191; | |
| 155 | + | |
| 156 | + $table_schema = [ | |
| 157 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_reports` ( | |
| 42 | 158 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 43 | 159 | `category` varchar(50) NOT NULL, |
| 44 | 160 | `type` varchar(20) NOT NULL, |
| 45 | 161 | `context` varchar(20) NOT NULL, |
| @@ -52,12 +168,15 @@ | ||
| 52 | 168 | `updated_at` datetime DEFAULT NULL, |
| 53 | 169 | PRIMARY KEY (`id`) |
| 54 | 170 | ) $collate;", |
| 55 | 171 | |
| 56 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form` ( | |
| 172 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form` ( | |
| 57 | 173 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 58 | 174 | `form_name` varchar(255) DEFAULT NULL, |
| 59 | 175 | `form_content` longtext DEFAULT NULL, |
| 176 | + `builder_helper_state` longtext DEFAULT NULL, | |
| 177 | + `atomic_class_map` longtext DEFAULT NULL, | |
| 178 | + `generated_script_page_ids` longtext DEFAULT NULL, | |
| 60 | 179 | `user_id` bigint(20) unsigned DEFAULT NULL, |
| 61 | 180 | `user_ip` int(11) unsigned DEFAULT NULL, |
| 62 | 181 | `views` int(11) unsigned DEFAULT 0, |
| 63 | 182 | `entries` int(11) unsigned DEFAULT 0, |
| @@ -67,9 +186,9 @@ | ||
| 67 | 186 | `updated_at` datetime DEFAULT NULL, |
| 68 | 187 | PRIMARY KEY (`id`) |
| 69 | 188 | ) $collate;", |
| 70 | 189 | |
| 71 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_workflows` ( | |
| 190 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_workflows` ( | |
| 72 | 191 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 73 | 192 | `workflow_name` varchar(255) NOT NULL, |
| 74 | 193 | `workflow_type` varchar(50) NOT NULL, |
| 75 | 194 | `workflow_run` varchar(50) NOT NULL, |
| @@ -74,9 +193,12 @@ | ||
| 74 | 193 | `workflow_type` varchar(50) NOT NULL, |
| 75 | 194 | `workflow_run` varchar(50) NOT NULL, |
| 76 | 195 | `workflow_behaviour` varchar(25) NOT NULL, |
| 77 | 196 | `workflow_condition` longtext DEFAULT NULL, |
| 78 | - `workflow_action` longtext DEFAULT NULL, | |
| 197 | + `workflow_info` longtext DEFAULT NULL, | |
| 198 | + `workflow_category` varchar(20) DEFAULT 'classic',/* classic = legacy, basic = field show/hide, advanced = multi-condition routing */ | |
| 199 | + `workflow_order` int(11) unsigned DEFAULT NULL, | |
| 200 | + `workflow_status` tinyint(1) DEFAULT 1,/* 0 disable, 1 enable, 2 enable in field settings */ | |
| 79 | 201 | `form_id` bigint(20) unsigned DEFAULT NULL, |
| 80 | 202 | `user_id` bigint(20) unsigned DEFAULT NULL, |
| 81 | 203 | `user_ip` int(11) unsigned DEFAULT NULL, |
| 82 | 204 | `user_location` text DEFAULT NULL, |
| @@ -83,15 +205,17 @@ | ||
| 83 | 205 | `user_device` varchar(50) DEFAULT NULL, |
| 84 | 206 | `created_at` datetime DEFAULT NULL, |
| 85 | 207 | `updated_at` datetime DEFAULT NULL, |
| 86 | 208 | PRIMARY KEY (`id`), |
| 87 | - KEY `form_id` (`form_id`) | |
| 209 | + KEY `form_id` (`form_id`), | |
| 210 | + KEY `workflow_category` (`workflow_category`) | |
| 88 | 211 | ) $collate;", |
| 89 | 212 | |
| 90 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_success_messages` ( | |
| 213 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_success_messages` ( | |
| 91 | 214 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 92 | 215 | `message_title` varchar(255) DEFAULT NULL, |
| 93 | 216 | `message_content` longtext DEFAULT NULL, |
| 217 | + `message_config` longtext DEFAULT NULL, | |
| 94 | 218 | `form_id` bigint(20) unsigned DEFAULT NULL, |
| 95 | 219 | `user_id` bigint(20) unsigned DEFAULT NULL, |
| 96 | 220 | `user_ip` int(11) unsigned DEFAULT NULL, |
| 97 | 221 | `created_at` datetime DEFAULT NULL, |
| @@ -98,13 +222,15 @@ | ||
| 98 | 222 | `updated_at` datetime DEFAULT NULL, |
| 99 | 223 | PRIMARY KEY (`id`) |
| 100 | 224 | ) $collate;", |
| 101 | 225 | |
| 102 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_email_template` ( | |
| 226 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_email_template` ( | |
| 103 | 227 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 104 | 228 | `title` text DEFAULT NULL, |
| 105 | 229 | `sub` text DEFAULT NULL, |
| 106 | 230 | `body` longtext DEFAULT NULL, |
| 231 | + `status` tinyint(1) DEFAULT 1,/* 0 disabled, 1 enabled */ | |
| 232 | + `config` longtext DEFAULT NULL,/* SendTo / From / From Name / CC / BCC / Reply-To / attachments JSON */ | |
| 107 | 233 | `form_id` bigint(20) unsigned DEFAULT NULL, |
| 108 | 234 | `user_id` bigint(20) unsigned DEFAULT NULL, |
| 109 | 235 | `user_ip` int(11) unsigned DEFAULT NULL, |
| 110 | 236 | `created_at` datetime DEFAULT NULL, |
| @@ -111,9 +237,9 @@ | ||
| 111 | 237 | `updated_at` datetime DEFAULT NULL, |
| 112 | 238 | PRIMARY KEY (`id`) |
| 113 | 239 | ) $collate;", |
| 114 | 240 | |
| 115 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_integration` ( | |
| 241 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_integration` ( | |
| 116 | 242 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 117 | 243 | `category` varchar(50) NOT NULL, |
| 118 | 244 | `integration_name` varchar(255) DEFAULT NULL, |
| 119 | 245 | `integration_type` varchar(50) NOT NULL, |
| @@ -126,16 +252,16 @@ | ||
| 126 | 252 | `updated_at` datetime DEFAULT NULL, |
| 127 | 253 | PRIMARY KEY (`id`) |
| 128 | 254 | ) $collate;", |
| 129 | 255 | |
| 130 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entries` ( | |
| 256 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entries` ( | |
| 131 | 257 | `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 132 | 258 | `form_id` bigint(20) unsigned DEFAULT NULL, |
| 133 | 259 | `user_id` bigint(20) unsigned DEFAULT NULL, |
| 134 | - `user_ip` int(11) unsigned DEFAULT NULL, | |
| 260 | + `user_ip` varchar(255) DEFAULT NULL, | |
| 135 | 261 | `user_location` text DEFAULT NULL, |
| 136 | 262 | `user_device` varchar(50) DEFAULT NULL, |
| 137 | - `referer` varchar(255) DEFAULT NULL, | |
| 263 | + `referer` TEXT DEFAULT NULL, | |
| 138 | 264 | `status` tinyint(1) DEFAULT 0,/* 0 not viewed, 1 viewed, 2 trashed */ |
| 139 | 265 | `created_at` datetime DEFAULT NULL, |
| 140 | 266 | `updated_at` datetime DEFAULT NULL, |
| 141 | 267 | PRIMARY KEY (`id`), |
| @@ -141,9 +267,9 @@ | ||
| 141 | 267 | PRIMARY KEY (`id`), |
| 142 | 268 | KEY `form_id` (`form_id`) |
| 143 | 269 | ) $collate;", |
| 144 | 270 | |
| 145 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entrymeta` ( | |
| 271 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entrymeta` ( | |
| 146 | 272 | `meta_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, |
| 147 | 273 | `bitforms_form_entry_id` bigint(20) unsigned DEFAULT NULL, |
| 148 | 274 | `meta_key` varchar(255) DEFAULT NULL, |
| 149 | 275 | `meta_value` longtext, |
| @@ -151,9 +277,9 @@ | ||
| 151 | 277 | KEY `meta_key` (`meta_key`({$max_index_length})), |
| 152 | 278 | KEY `entry_id` (`bitforms_form_entry_id`) |
| 153 | 279 | ) $collate;", |
| 154 | 280 | |
| 155 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_log` ( | |
| 281 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_log` ( | |
| 156 | 282 | `id` int(11) unsigned NOT NULL AUTO_INCREMENT, |
| 157 | 283 | `user_id` int(11) NOT NULL, |
| 158 | 284 | `log_type` varchar(50) DEFAULT NULL, |
| 159 | 285 | `ip` int(11) DEFAULT NULL, |
| @@ -166,9 +292,9 @@ | ||
| 166 | 292 | KEY `form_id` (`form_id`), |
| 167 | 293 | KEY `form_entry_id` (`form_entry_id`) |
| 168 | 294 | ) $collate;", |
| 169 | 295 | |
| 170 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_log_details` ( | |
| 296 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_log_details` ( | |
| 171 | 297 | `id` int(11) unsigned NOT NULL AUTO_INCREMENT, |
| 172 | 298 | `log_id` bigint(20) NOT NULL, |
| 173 | 299 | `integration_id` bigint(20) DEFAULT NULL, |
| 174 | 300 | `api_type` varchar(255) DEFAULT NULL, |
| @@ -178,9 +304,9 @@ | ||
| 178 | 304 | PRIMARY KEY (`id`), |
| 179 | 305 | KEY `log_id` (`log_id`), |
| 180 | 306 | KEY `integration_id` (`integration_id`) |
| 181 | 307 | ) $collate;", |
| 182 | - "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_relatedinfo` ( | |
| 308 | + "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_relatedinfo` ( | |
| 183 | 309 | `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, |
| 184 | 310 | `info_type` VARCHAR(50) NOT NULL, |
| 185 | 311 | `info_details` LONGTEXT NULL, |
| 186 | 312 | `form_id` BIGINT(20) UNSIGNED NOT NULL, |
| @@ -193,36 +319,100 @@ | ||
| 193 | 319 | PRIMARY KEY (`id`), |
| 194 | 320 | KEY `form_id` (`form_id`), |
| 195 | 321 | KEY `entry_id` (`entry_id`) |
| 196 | 322 | ) $collate;" |
| 197 | - ); | |
| 323 | + ]; | |
| 198 | 324 | |
| 199 | - $table_schema_update = array( | |
| 200 | - "ALTER TABLE `{$wpdb->prefix}bitforms_form_entry_log` | |
| 201 | - CHANGE COLUMN `log_type` `log_type` VARCHAR(50) NULL DEFAULT NULL, | |
| 325 | + try { | |
| 326 | + include_once ABSPATH . 'wp-admin/includes/upgrade.php'; | |
| 327 | + foreach ($table_schema as $table) { | |
| 328 | + dbDelta($table); | |
| 329 | + } | |
| 330 | + $installed_db_version = get_option('bitforms_db_version'); | |
| 331 | + if ($installed_db_version && version_compare('1.1', $installed_db_version, '>=')) { | |
| 332 | + // if new db version is equal or higher than 1.1 | |
| 333 | + // Schema migration: table name interpolation only (no user input). $wpdb->prepare() cannot parameterize DDL statements. | |
| 334 | + try { | |
| 335 | + $wpdb->query("ALTER TABLE `{$wpdb->prefix}bitforms_form_entry_log` | |
| 336 | + MODIFY `log_type` VARCHAR(50) NULL DEFAULT NULL, | |
| 337 | + MODIFY `created_at` DATETIME NOT NULL, | |
| 338 | + CHANGE COLUMN `meta_key` `content` LONGTEXT NULL, | |
| 202 | 339 | ADD COLUMN `action_type` VARCHAR(50) NULL DEFAULT NULL, |
| 203 | - CHANGE COLUMN `meta_key` `content` LONGTEXT NULL, | |
| 204 | - CHANGE COLUMN `created_at` `created_at` DATETIME NOT NULL", | |
| 205 | - "ALTER TABLE `{$wpdb->prefix}bitforms_form_log_details` | |
| 206 | - CHANGE COLUMN `api_type` `api_type` VARCHAR(255) NULL DEFAULT NULL, | |
| 207 | - CHANGE COLUMN `response_obj` `response_obj` LONGTEXT NULL, | |
| 208 | - CHANGE COLUMN `created_at` `created_at` DATETIME NOT NULL", | |
| 209 | - "ALTER TABLE `{$wpdb->prefix}bitforms_form_entries` CHANGE `user_ip` `user_ip` VARCHAR(255) NULL DEFAULT NULL", | |
| 210 | - ); | |
| 340 | + ADD COLUMN `content` LONGTEXT NULL AFTER `action_type`"); | |
| 341 | + } catch (\Exception $e) { | |
| 342 | + Log::debug_log("Update failed: {$e->getMessage()} in query: ALTER TABLE `{$wpdb->prefix}bitforms_form_entry_log`..."); | |
| 343 | + } | |
| 344 | + try { | |
| 345 | + $wpdb->query("ALTER TABLE `{$wpdb->prefix}bitforms_form_log_details` | |
| 346 | + MODIFY `api_type` VARCHAR(255) NULL DEFAULT NULL, | |
| 347 | + MODIFY `response_obj` LONGTEXT NULL, | |
| 348 | + MODIFY `created_at` DATETIME NOT NULL"); | |
| 349 | + } catch (\Exception $e) { | |
| 350 | + Log::debug_log("Update failed: {$e->getMessage()} in query: ALTER TABLE `{$wpdb->prefix}bitforms_form_log_details`..."); | |
| 351 | + } | |
| 352 | + } | |
| 353 | + if ($installed_db_version && version_compare('1.3', $installed_db_version, '>=')) { | |
| 354 | + // if new db version is equal or higher than 1.3 | |
| 355 | + $wpdb->query("ALTER TABLE `{$wpdb->prefix}bitforms_form_entries` MODIFY `user_ip` VARCHAR(255) NULL DEFAULT NULL"); | |
| 356 | + } | |
| 211 | 357 | |
| 212 | - include_once ABSPATH . 'wp-admin/includes/upgrade.php'; | |
| 213 | - foreach ($table_schema as $table) { | |
| 214 | - dbDelta($table); | |
| 358 | + if ($installed_db_version && version_compare('2.0', $installed_db_version, '>=')) { | |
| 359 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$wpdb->prefix}bitforms_success_messages` LIKE 'message_config'")) { | |
| 360 | + $wpdb->query( | |
| 361 | + "ALTER TABLE `{$wpdb->prefix}bitforms_success_messages` | |
| 362 | + ADD COLUMN `message_config` LONGTEXT NULL AFTER `message_content`" | |
| 363 | + ); | |
| 215 | 364 | } |
| 216 | - $installed_db_version = get_site_option("bitforms_db_version"); | |
| 217 | - if ($installed_db_version && version_compare('1.1', $installed_db_version, '<=')) { | |
| 218 | - // if new db version is equal or higher than 1.1 | |
| 219 | - foreach ($table_schema_update as $table) { | |
| 220 | - $wpdb->query($table); | |
| 221 | - } | |
| 365 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$wpdb->prefix}bitforms_form` LIKE 'builder_helper_state'")) { | |
| 366 | + $wpdb->query( | |
| 367 | + "ALTER TABLE `{$wpdb->prefix}bitforms_form` | |
| 368 | + ADD COLUMN `builder_helper_state` LONGTEXT NULL AFTER `form_content`, | |
| 369 | + ADD COLUMN `atomic_class_map` LONGTEXT NULL AFTER `builder_helper_state`, | |
| 370 | + ADD COLUMN `generated_script_page_ids` LONGTEXT NULL AFTER `atomic_class_map`" | |
| 371 | + ); | |
| 222 | 372 | } |
| 223 | - update_site_option( | |
| 224 | - 'bitforms_db_version', | |
| 225 | - $bitforms_db_version | |
| 226 | - ); | |
| 373 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$wpdb->prefix}bitforms_workflows` LIKE 'workflow_order'")) { | |
| 374 | + $wpdb->query( | |
| 375 | + "ALTER TABLE `{$wpdb->prefix}bitforms_workflows` | |
| 376 | + ADD COLUMN `workflow_order` INT(11) DEFAULT NULL AFTER `workflow_condition`" | |
| 377 | + ); | |
| 378 | + } | |
| 379 | + } | |
| 380 | + | |
| 381 | + if ($installed_db_version && version_compare('2.2', $installed_db_version, '>=')) { | |
| 382 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$wpdb->prefix}bitforms_form_entries` LIKE 'referer'")) { | |
| 383 | + $wpdb->query( | |
| 384 | + "ALTER TABLE `{$wpdb->prefix}bitforms_form_entries` | |
| 385 | + ADD COLUMN `referer` TEXT NULL DEFAULT NULL" | |
| 386 | + ); | |
| 387 | + } | |
| 388 | + } | |
| 389 | + | |
| 390 | + if ($installed_db_version && version_compare('2.4', $installed_db_version, '>=')) { | |
| 391 | + if (null === $wpdb->get_var("SHOW COLUMNS FROM `{$wpdb->prefix}bitforms_workflows` LIKE 'workflow_status'")) { | |
| 392 | + $wpdb->query( | |
| 393 | + "ALTER TABLE `{$wpdb->prefix}bitforms_workflows` | |
| 394 | + ADD COLUMN `workflow_status` TINYINT(1) DEFAULT 1 NOT NULL AFTER `workflow_order`" | |
| 395 | + ); | |
| 396 | + } | |
| 397 | + } | |
| 398 | + | |
| 399 | + // add workflow_info column if not exists | |
| 400 | + if ($installed_db_version && version_compare('3.0', $installed_db_version, '>=')) { | |
| 401 | + self::ensureWorkflowInfoColumn(); | |
| 402 | + } | |
| 403 | + | |
| 404 | + // add workflow_category column if not exists (conditional logic separation) | |
| 405 | + // existing rows default to 'classic' so Free keeps executing them unchanged; data normalization in Fallback WorkFlow@normalizeCategory | |
| 406 | + if ($installed_db_version && version_compare('3.2', $installed_db_version, '>=')) { | |
| 407 | + self::ensureWorkflowCategoryColumn(); | |
| 408 | + // email template enable/disable + per-template config (SendTo/From/CC/BCC/Reply-To/attachments) | |
| 409 | + self::ensureEmailTemplateStatusColumn(); | |
| 410 | + } | |
| 411 | + | |
| 412 | + update_option('bitforms_db_version', $bitforms_db_version, true); | |
| 413 | + } catch (\Exception $e) { | |
| 414 | + // Log the error to a file or the database | |
| 415 | + Log::debug_log('Error during DB migration: ' . $e->getMessage()); | |
| 227 | 416 | } |
| 417 | + } | |
| 228 | 418 | } |