| @@ -2,9 +2,8 @@ | ||
| 2 | 2 | if ( ! defined( 'ABSPATH' ) ) { |
| 3 | 3 | die( 'You are not allowed to call this page directly.' ); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | -/** @phpstan-consistent-constructor */ | |
| 7 | 6 | class FrmAddon { |
| 8 | 7 | public $store_url = 'https://formidableforms.com'; |
| 9 | 8 | public $download_id; |
| 10 | 9 | public $plugin_file; |
| @@ -12,43 +11,15 @@ | ||
| 12 | 11 | public $plugin_name; |
| 13 | 12 | public $plugin_slug; |
| 14 | 13 | public $option_name; |
| 15 | 14 | public $version; |
| 16 | - public $author = 'Strategy11'; | |
| 15 | + public $author = 'Strategy11'; | |
| 17 | 16 | public $is_parent_licence = false; |
| 18 | - public $needs_license = true; | |
| 17 | + public $needs_license = true; | |
| 19 | 18 | private $is_expired_addon = false; |
| 20 | 19 | public $license; |
| 21 | 20 | protected $get_beta = false; |
| 22 | - protected $save_status; | |
| 23 | 21 | |
| 24 | - /** | |
| 25 | - * This is used to decide whether the license checks should continue. | |
| 26 | - * The point is to avoid license issues when a site url changes. | |
| 27 | - * | |
| 28 | - * @since 6.8.3 | |
| 29 | - * | |
| 30 | - * @var array | |
| 31 | - */ | |
| 32 | - private $save_response = array(); | |
| 33 | - | |
| 34 | - /** | |
| 35 | - * This is used to flag other add ons not to send a request. | |
| 36 | - * We only want to send a single API request per page load. | |
| 37 | - * | |
| 38 | - * @since 6.8.3 | |
| 39 | - * | |
| 40 | - * @var string | |
| 41 | - */ | |
| 42 | - private $transient_lock_key = 'frm_activate_request_lock'; | |
| 43 | - | |
| 44 | - /** | |
| 45 | - * @since 6.8.3 | |
| 46 | - * | |
| 47 | - * @var bool | |
| 48 | - */ | |
| 49 | - protected $should_clear_cache = true; | |
| 50 | - | |
| 51 | 22 | public function __construct() { |
| 52 | 23 | |
| 53 | 24 | if ( empty( $this->plugin_slug ) ) { |
| 54 | 25 | $this->plugin_slug = preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->plugin_name ) ) ); |
| @@ -65,9 +36,9 @@ | ||
| 65 | 36 | } |
| 66 | 37 | |
| 67 | 38 | public static function load_hooks() { |
| 68 | 39 | add_filter( 'frm_include_addon_page', '__return_true' ); |
| 69 | - new static(); | |
| 40 | + //new static(); | |
| 70 | 41 | } |
| 71 | 42 | |
| 72 | 43 | public function insert_installed_addon( $plugins ) { |
| 73 | 44 | $plugins[ $this->plugin_slug ] = $this; |
| @@ -102,13 +73,13 @@ | ||
| 102 | 73 | } |
| 103 | 74 | } |
| 104 | 75 | |
| 105 | 76 | /** |
| 106 | - * Updates information on the "View version 6.15 details" page with custom data. | |
| 77 | + * Updates information on the "View version x.x details" page with custom data. | |
| 107 | 78 | * |
| 108 | 79 | * @uses api_request() |
| 109 | 80 | * |
| 110 | - * @param mixed $_data | |
| 81 | + * @param mixed $_data | |
| 111 | 82 | * @param string $_action |
| 112 | 83 | * @param object $_args |
| 113 | 84 | * |
| 114 | 85 | * @return object $_data |
| @@ -198,10 +169,11 @@ | ||
| 198 | 169 | * @since 2.04 |
| 199 | 170 | */ |
| 200 | 171 | public function activate_defined_license() { |
| 201 | 172 | $license = $this->get_defined_license(); |
| 202 | - if ( ! empty( $license ) && ! $this->is_active() && ! $this->checked_recently( '1 day' ) ) { | |
| 173 | + if ( ! empty( $license ) && ! $this->is_active() && $this->is_time_to_auto_activate() ) { | |
| 203 | 174 | $response = $this->activate_license( $license ); |
| 175 | + $this->set_auto_activate_time(); | |
| 204 | 176 | if ( ! $response['success'] ) { |
| 205 | 177 | $license = ''; |
| 206 | 178 | } |
| 207 | 179 | } |
| @@ -214,11 +186,11 @@ | ||
| 214 | 186 | * |
| 215 | 187 | * @since 2.04 |
| 216 | 188 | */ |
| 217 | 189 | public function get_defined_license() { |
| 218 | - $constant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; | |
| 190 | + $consant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; | |
| 219 | 191 | |
| 220 | - return defined( $constant_name ) ? constant( $constant_name ) : false; | |
| 192 | + return defined( $consant_name ) ? constant( $consant_name ) : false; | |
| 221 | 193 | } |
| 222 | 194 | |
| 223 | 195 | public function set_license( $license ) { |
| 224 | 196 | update_option( $this->option_name . 'key', $license ); |
| @@ -223,8 +195,24 @@ | ||
| 223 | 195 | public function set_license( $license ) { |
| 224 | 196 | update_option( $this->option_name . 'key', $license ); |
| 225 | 197 | } |
| 226 | 198 | |
| 199 | + /** | |
| 200 | + * If the license is in the config, limit the frequency of checks. | |
| 201 | + * The license may be entered incorrectly, so we don't want to check on every page load. | |
| 202 | + * | |
| 203 | + * @since 2.04 | |
| 204 | + */ | |
| 205 | + private function is_time_to_auto_activate() { | |
| 206 | + $last_try = get_option( $this->option_name . 'last_activate' ); | |
| 207 | + | |
| 208 | + return ( ! $last_try || $last_try < strtotime( '-1 day' ) ); | |
| 209 | + } | |
| 210 | + | |
| 211 | + private function set_auto_activate_time() { | |
| 212 | + update_option( $this->option_name . 'last_activate', time() ); | |
| 213 | + } | |
| 214 | + | |
| 227 | 215 | public function is_active() { |
| 228 | 216 | return get_option( $this->option_name . 'active' ); |
| 229 | 217 | } |
| 230 | 218 | |
| @@ -230,12 +218,12 @@ | ||
| 230 | 218 | |
| 231 | 219 | /** |
| 232 | 220 | * @since 3.04.03 |
| 233 | 221 | * |
| 234 | - * @param array|string $error | |
| 222 | + * @param array error | |
| 235 | 223 | */ |
| 236 | 224 | public function maybe_clear_license( $error ) { |
| 237 | - if ( is_array( $error ) && $error['code'] === 'disabled' && $error['license'] === $this->license ) { | |
| 225 | + if ( $error['code'] === 'disabled' && $error['license'] === $this->license ) { | |
| 238 | 226 | $this->clear_license(); |
| 239 | 227 | } |
| 240 | 228 | } |
| 241 | 229 | |
| @@ -241,41 +229,15 @@ | ||
| 241 | 229 | |
| 242 | 230 | public function clear_license() { |
| 243 | 231 | delete_option( $this->option_name . 'active' ); |
| 244 | 232 | delete_option( $this->option_name . 'key' ); |
| 245 | - | |
| 246 | - if ( $this->should_clear_cache ) { | |
| 247 | - delete_site_option( $this->transient_key() ); | |
| 248 | - delete_option( $this->transient_key() ); | |
| 249 | - $this->delete_cache(); | |
| 250 | - $this->should_clear_cache = true; | |
| 251 | - } | |
| 233 | + delete_site_option( $this->transient_key() ); | |
| 234 | + delete_option( $this->transient_key() ); | |
| 235 | + $this->delete_cache(); | |
| 252 | 236 | } |
| 253 | 237 | |
| 254 | - /** | |
| 255 | - * Don't save an invalid license. | |
| 256 | - * | |
| 257 | - * @since 6.8.3 | |
| 258 | - * | |
| 259 | - * @param bool $is_valid If license activation was successful. | |
| 260 | - * | |
| 261 | - * @return void | |
| 262 | - */ | |
| 263 | - protected function maybe_set_active( $is_valid ) { | |
| 264 | - update_option( $this->option_name . 'active', $is_valid ); | |
| 265 | - if ( $is_valid ) { | |
| 266 | - $this->set_active( $is_valid ); | |
| 267 | - return; | |
| 268 | - } | |
| 269 | - | |
| 270 | - // Don't save the license if it's invalid. | |
| 271 | - $this->should_clear_cache = false; | |
| 272 | - $this->clear_license(); | |
| 273 | - delete_option( $this->option_name . 'key' ); | |
| 274 | - $this->license = ''; | |
| 275 | - } | |
| 276 | - | |
| 277 | 238 | public function set_active( $is_active ) { |
| 239 | + update_option( $this->option_name . 'active', $is_active ); | |
| 278 | 240 | $this->delete_cache(); |
| 279 | 241 | FrmAppHelper::save_combined_js(); |
| 280 | 242 | $this->update_pro_capabilities(); |
| 281 | 243 | } |
| @@ -287,20 +249,16 @@ | ||
| 287 | 249 | */ |
| 288 | 250 | protected function update_pro_capabilities() { |
| 289 | 251 | global $wp_roles; |
| 290 | 252 | |
| 291 | - if ( ! function_exists( 'get_editable_roles' ) ) { | |
| 292 | - require_once ABSPATH . 'wp-admin/includes/user.php'; | |
| 293 | - } | |
| 294 | - | |
| 295 | 253 | $caps = FrmAppHelper::frm_capabilities( 'pro_only' ); |
| 296 | 254 | $roles = get_editable_roles(); |
| 297 | 255 | $settings = new FrmSettings(); |
| 298 | 256 | foreach ( $caps as $cap => $cap_desc ) { |
| 299 | - $cap_roles = (array) ( $settings->$cap ?? 'administrator' ); | |
| 257 | + $cap_roles = (array) ( isset( $settings->$cap ) ? $settings->$cap : 'administrator' ); | |
| 300 | 258 | |
| 301 | 259 | // Make sure administrators always have permissions. |
| 302 | - if ( ! in_array( 'administrator', $cap_roles, true ) ) { | |
| 260 | + if ( ! in_array( 'administrator', $cap_roles ) ) { | |
| 303 | 261 | array_push( $cap_roles, 'administrator' ); |
| 304 | 262 | } |
| 305 | 263 | |
| 306 | 264 | foreach ( $roles as $role => $details ) { |
| @@ -318,22 +276,13 @@ | ||
| 318 | 276 | */ |
| 319 | 277 | protected function delete_cache() { |
| 320 | 278 | delete_transient( 'frm_api_licence' ); |
| 321 | 279 | |
| 322 | - // Cleanup option that has been removed. | |
| 323 | - delete_option( $this->option_name . 'last_activate' ); | |
| 324 | - | |
| 325 | 280 | $api = new FrmFormApi( $this->license ); |
| 326 | 281 | $api->reset_cached(); |
| 327 | 282 | |
| 328 | 283 | $api = new FrmFormTemplateApi( $this->license ); |
| 329 | 284 | $api->reset_cached(); |
| 330 | - | |
| 331 | - $api = new FrmApplicationApi( $this->license ); | |
| 332 | - $api->reset_cached(); | |
| 333 | - | |
| 334 | - $api = new FrmSalesApi(); | |
| 335 | - $api->reset_cached(); | |
| 336 | 285 | } |
| 337 | 286 | |
| 338 | 287 | /** |
| 339 | 288 | * The Pro version includes the show_license_message function. |
| @@ -370,9 +319,9 @@ | ||
| 370 | 319 | $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
| 371 | 320 | $id = sanitize_title( $plugin['Name'] ) . '-next'; |
| 372 | 321 | |
| 373 | 322 | echo '<tr class="plugin-update-tr active" id="' . esc_attr( $id ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message notice error inline notice-error notice-alt"><p>'; |
| 374 | - FrmAppHelper::kses_echo( $message, 'a' ); | |
| 323 | + echo FrmAppHelper::kses( $message, 'a' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 375 | 324 | echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '").previousSibling;if ( d !== null ){ d.className = d.className + " update"; }</script>'; |
| 376 | 325 | echo '</p></div></td></tr>'; |
| 377 | 326 | } |
| 378 | 327 | |
| @@ -381,9 +330,9 @@ | ||
| 381 | 330 | return $transient; |
| 382 | 331 | } |
| 383 | 332 | |
| 384 | 333 | if ( $this->is_current_version( $transient ) ) { |
| 385 | - // Make sure it doesn't show there is an update if plugin is up-to-date. | |
| 334 | + //make sure it doesn't show there is an update if plugin is up-to-date | |
| 386 | 335 | if ( isset( $transient->response[ $this->plugin_folder ] ) ) { |
| 387 | 336 | unset( $transient->response[ $this->plugin_folder ] ); |
| 388 | 337 | } |
| 389 | 338 | } elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) { |
| @@ -406,21 +355,20 @@ | ||
| 406 | 355 | * Check if the plugin information is correct to allow an update |
| 407 | 356 | * |
| 408 | 357 | * @since 3.04.03 |
| 409 | 358 | * |
| 410 | - * @param object $transient The current plugin info saved for update. | |
| 359 | + * @param object $transient - the current plugin info saved for update | |
| 411 | 360 | */ |
| 412 | 361 | private function prepare_update_details( &$transient ) { |
| 413 | 362 | $version_info = $transient; |
| 414 | - $has_beta_url = ! empty( $version_info->beta ); | |
| 363 | + $has_beta_url = isset( $version_info->beta ) && ! empty( $version_info->beta ); | |
| 415 | 364 | if ( $this->get_beta && ! $has_beta_url ) { |
| 416 | 365 | $version_info = (object) $this->get_api_info( $this->license ); |
| 417 | 366 | } |
| 418 | 367 | |
| 419 | - if ( ! empty( $version_info->new_version ) ) { | |
| 368 | + if ( isset( $version_info->new_version ) && ! empty( $version_info->new_version ) ) { | |
| 420 | 369 | $this->clear_old_plugin_version( $version_info ); |
| 421 | - if ( $version_info === false ) { | |
| 422 | - // Was cleared with timeout. | |
| 370 | + if ( $version_info === false ) { // was cleared with timeout | |
| 423 | 371 | $transient = false; |
| 424 | 372 | } else { |
| 425 | 373 | $this->maybe_use_beta_url( $version_info ); |
| 426 | 374 | |
| @@ -458,12 +406,11 @@ | ||
| 458 | 406 | * |
| 459 | 407 | * @since 2.05.05 |
| 460 | 408 | */ |
| 461 | 409 | private function clear_old_plugin_version( &$version_info ) { |
| 462 | - $timeout = ! empty( $version_info->timeout ) ? $version_info->timeout : 0; | |
| 410 | + $timeout = ( isset( $version_info->timeout ) && ! empty( $version_info->timeout ) ) ? $version_info->timeout : 0; | |
| 463 | 411 | if ( ! empty( $timeout ) && time() > $timeout ) { |
| 464 | - // Cache is expired. | |
| 465 | - $version_info = false; | |
| 412 | + $version_info = false; // Cache is expired | |
| 466 | 413 | $api = new FrmFormApi( $this->license ); |
| 467 | 414 | $api->reset_cached(); |
| 468 | 415 | } |
| 469 | 416 | } |
| @@ -474,12 +421,12 @@ | ||
| 474 | 421 | * |
| 475 | 422 | * @since 3.04.03 |
| 476 | 423 | */ |
| 477 | 424 | private function maybe_use_beta_url( &$version_info ) { |
| 478 | - if ( $this->get_beta && ! empty( $version_info->beta ) ) { | |
| 425 | + if ( $this->get_beta && isset( $version_info->beta ) && ! empty( $version_info->beta ) ) { | |
| 479 | 426 | $version_info->new_version = $version_info->beta['version']; |
| 480 | 427 | $version_info->package = $version_info->beta['package']; |
| 481 | - if ( ! empty( $version_info->plugin ) ) { | |
| 428 | + if ( isset( $version_info->plugin ) && ! empty( $version_info->plugin ) ) { | |
| 482 | 429 | $version_info->plugin = $version_info->beta['plugin']; |
| 483 | 430 | } |
| 484 | 431 | } |
| 485 | 432 | } |
| @@ -488,9 +435,9 @@ | ||
| 488 | 435 | if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) { |
| 489 | 436 | return false; |
| 490 | 437 | } |
| 491 | 438 | |
| 492 | - $response = empty( $transient->response ); | |
| 439 | + $response = ! isset( $transient->response ) || empty( $transient->response ); | |
| 493 | 440 | if ( $response ) { |
| 494 | 441 | return true; |
| 495 | 442 | } |
| 496 | 443 | |
| @@ -496,14 +443,12 @@ | ||
| 496 | 443 | |
| 497 | 444 | return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version; |
| 498 | 445 | } |
| 499 | 446 | |
| 500 | - /** | |
| 501 | - * @return bool | |
| 502 | - */ | |
| 503 | 447 | private function has_been_cleared() { |
| 504 | 448 | $last_cleared = get_option( 'frm_last_cleared' ); |
| 505 | - return $last_cleared && $last_cleared > gmdate( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) ); | |
| 449 | + | |
| 450 | + return ( $last_cleared && $last_cleared > gmdate( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) ) ); | |
| 506 | 451 | } |
| 507 | 452 | |
| 508 | 453 | private function cleared_plugins() { |
| 509 | 454 | update_option( 'frm_last_cleared', gmdate( 'Y-m-d H:i:s' ) ); |
| @@ -513,78 +458,28 @@ | ||
| 513 | 458 | if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 514 | 459 | return; |
| 515 | 460 | } |
| 516 | 461 | |
| 517 | - if ( $this->get_defined_license() ) { | |
| 518 | - // Don't check if the license is defined in wp-config.php since we can't remove it. | |
| 519 | - return; | |
| 520 | - } | |
| 521 | - | |
| 522 | - // Only check weekly. | |
| 523 | - if ( $this->checked_recently( '7 days', 'valid' ) || $this->is_running() ) { | |
| 524 | - return; | |
| 525 | - } | |
| 526 | - | |
| 527 | - $response = $this->get_license_status(); | |
| 528 | - if ( 'revoked' === $response['status'] || 'blocked' === $response['status'] || 'disabled' === $response['status'] || 'missing' === $response['status'] ) { | |
| 529 | - $this->clear_license(); | |
| 530 | - } | |
| 531 | - } | |
| 532 | - | |
| 533 | - /** | |
| 534 | - * Has this been checked too recently? | |
| 535 | - * | |
| 536 | - * @param string $time ie. '1 day'. | |
| 537 | - * @param string $required_status Return false if the last check does not match. ie 'valid'. | |
| 538 | - * | |
| 539 | - * @return bool | |
| 540 | - */ | |
| 541 | - private function checked_recently( $time, $required_status = '' ) { | |
| 542 | - $last_checked = $this->last_checked(); | |
| 543 | - $is_429 = isset( $last_checked['response_code'] ) && 429 === $last_checked['response_code']; | |
| 544 | - if ( $is_429 ) { | |
| 545 | - // If the last check was a a rate limit, we'll need to check again sooner. | |
| 546 | - $time = '5 minutes'; | |
| 547 | - $required_status = ''; | |
| 548 | - } | |
| 549 | - | |
| 550 | - if ( $required_status && ( ! isset( $last_checked['status'] ) || $last_checked['status'] !== $required_status ) ) { | |
| 551 | - // If the last check was invalid, we don't need to check again. | |
| 552 | - return true; | |
| 553 | - } | |
| 554 | - | |
| 555 | - $checked_time = $last_checked['time'] ?? false; | |
| 556 | - $time_ago = gmdate( 'Y-m-d H:i:s', strtotime( '-' . $time ) ); | |
| 557 | - return $checked_time && $checked_time > $time_ago; | |
| 558 | - } | |
| 559 | - | |
| 560 | - /** | |
| 561 | - * @since 6.8.3 Switched to an array to store extra response info. | |
| 562 | - * | |
| 563 | - * @return array | |
| 564 | - */ | |
| 565 | - private function last_checked() { | |
| 566 | 462 | if ( is_multisite() ) { |
| 567 | 463 | $last_checked = get_site_option( $this->transient_key() ); |
| 568 | 464 | } else { |
| 569 | 465 | $last_checked = get_option( $this->transient_key() ); |
| 570 | 466 | } |
| 571 | - if ( $last_checked && ! is_array( $last_checked ) ) { | |
| 572 | - // Get string into array for existing values. | |
| 573 | - $last_checked = array( 'time' => $last_checked ); | |
| 574 | - } | |
| 575 | - return $last_checked ? (array) $last_checked : array(); | |
| 576 | - } | |
| 577 | 467 | |
| 578 | - /** | |
| 579 | - * @return void | |
| 580 | - */ | |
| 581 | - private function update_last_checked() { | |
| 582 | - $this->save_response['time'] = gmdate( 'Y-m-d H:i:s' ); | |
| 583 | - if ( is_multisite() ) { | |
| 584 | - update_site_option( $this->transient_key(), $this->save_response ); | |
| 585 | - } else { | |
| 586 | - update_option( $this->transient_key(), $this->save_response ); | |
| 468 | + $seven_days_ago = gmdate( 'Y-m-d H:i:s', strtotime( '-7 days' ) ); | |
| 469 | + | |
| 470 | + if ( ! $last_checked || $last_checked < $seven_days_ago ) { | |
| 471 | + // check weekly | |
| 472 | + if ( is_multisite() ) { | |
| 473 | + update_site_option( $this->transient_key(), gmdate( 'Y-m-d H:i:s' ) ); | |
| 474 | + } else { | |
| 475 | + update_option( $this->transient_key(), gmdate( 'Y-m-d H:i:s' ) ); | |
| 476 | + } | |
| 477 | + | |
| 478 | + $response = $this->get_license_status(); | |
| 479 | + if ( 'revoked' === $response['status'] || 'blocked' === $response['status'] || 'disabled' === $response['status'] ) { | |
| 480 | + $this->clear_license(); | |
| 481 | + } | |
| 587 | 482 | } |
| 588 | 483 | } |
| 589 | 484 | |
| 590 | 485 | /** |
| @@ -599,12 +494,14 @@ | ||
| 599 | 494 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 600 | 495 | |
| 601 | 496 | $license = stripslashes( FrmAppHelper::get_param( 'license', '', 'post', 'sanitize_text_field' ) ); |
| 602 | 497 | if ( empty( $license ) ) { |
| 603 | - wp_send_json( | |
| 604 | - array( | |
| 605 | - 'message' => __( 'Oops! You forgot to enter your license number.', 'formidable' ), | |
| 606 | - 'success' => false, | |
| 498 | + wp_die( | |
| 499 | + json_encode( | |
| 500 | + array( | |
| 501 | + 'message' => __( 'Oops! You forgot to enter your license number.', 'formidable' ), | |
| 502 | + 'success' => false, | |
| 503 | + ) | |
| 607 | 504 | ) |
| 608 | 505 | ); |
| 609 | 506 | } |
| 610 | 507 | |
| @@ -610,11 +507,10 @@ | ||
| 610 | 507 | |
| 611 | 508 | $plugin_slug = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 612 | 509 | $response = self::activate_license_for_plugin( $license, $plugin_slug ); |
| 613 | 510 | |
| 614 | - FrmInbox::clear_cache(); | |
| 615 | - | |
| 616 | - wp_send_json( $response ); | |
| 511 | + echo json_encode( $response ); | |
| 512 | + wp_die(); | |
| 617 | 513 | } |
| 618 | 514 | |
| 619 | 515 | /** |
| 620 | 516 | * @since 4.08 |
| @@ -627,10 +523,8 @@ | ||
| 627 | 523 | private function activate_license( $license ) { |
| 628 | 524 | $this->set_license( $license ); |
| 629 | 525 | $this->license = $license; |
| 630 | 526 | |
| 631 | - $this->die_if_not_allowed(); | |
| 632 | - | |
| 633 | 527 | $response = $this->get_license_status(); |
| 634 | 528 | $response['message'] = ''; |
| 635 | 529 | $response['success'] = false; |
| 636 | 530 | |
| @@ -648,38 +542,15 @@ | ||
| 648 | 542 | if ( 'valid' === $response['status'] ) { |
| 649 | 543 | $is_valid = 'valid'; |
| 650 | 544 | $response['success'] = true; |
| 651 | 545 | } |
| 652 | - $this->maybe_set_active( $is_valid ); | |
| 546 | + $this->set_active( $is_valid ); | |
| 653 | 547 | } |
| 654 | 548 | |
| 655 | - $this->update_last_checked(); | |
| 656 | - | |
| 657 | 549 | return $response; |
| 658 | 550 | } |
| 659 | 551 | |
| 660 | - /** | |
| 661 | - * Prevent this check from happening more than once per minute with the same license. | |
| 662 | - * | |
| 663 | - * @return void | |
| 664 | - */ | |
| 665 | - private function die_if_not_allowed() { | |
| 666 | - if ( ! $this->checked_recently( '2 minutes' ) ) { | |
| 667 | - return; | |
| 668 | - } | |
| 669 | - | |
| 670 | - // Don't check more than once per minute. | |
| 671 | - wp_send_json( | |
| 672 | - array( | |
| 673 | - 'message' => __( 'Please wait two minutes before trying again.', 'formidable' ), | |
| 674 | - 'success' => false, | |
| 675 | - ) | |
| 676 | - ); | |
| 677 | - } | |
| 678 | - | |
| 679 | 552 | private function get_license_status() { |
| 680 | - $this->set_running(); | |
| 681 | - | |
| 682 | 553 | $response = array( |
| 683 | 554 | 'status' => 'missing', |
| 684 | 555 | 'error' => true, |
| 685 | 556 | ); |
| @@ -694,11 +565,10 @@ | ||
| 694 | 565 | $license_data = $this->send_mothership_request( 'activate_license' ); |
| 695 | 566 | |
| 696 | 567 | // $license_data->license will be either "valid" or "invalid" |
| 697 | 568 | if ( is_array( $license_data ) ) { |
| 698 | - if ( ! empty( $license_data['license'] ) && in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) { | |
| 699 | - $response['status'] = $license_data['license']; | |
| 700 | - $this->save_status['status'] = $license_data['license']; | |
| 569 | + if ( in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) { | |
| 570 | + $response['status'] = $license_data['license']; | |
| 701 | 571 | } |
| 702 | 572 | } else { |
| 703 | 573 | $response['status'] = $license_data; |
| 704 | 574 | } |
| @@ -705,10 +575,8 @@ | ||
| 705 | 575 | } catch ( Exception $e ) { |
| 706 | 576 | $response['status'] = $e->getMessage(); |
| 707 | 577 | } |
| 708 | 578 | |
| 709 | - $this->update_last_checked(); | |
| 710 | - $this->done_running(); | |
| 711 | 579 | return $response; |
| 712 | 580 | } |
| 713 | 581 | |
| 714 | 582 | private function get_messages() { |
| @@ -737,9 +605,10 @@ | ||
| 737 | 605 | 'success' => true, |
| 738 | 606 | 'message' => __( 'Cache cleared', 'formidable' ), |
| 739 | 607 | ); |
| 740 | 608 | |
| 741 | - wp_send_json( $response ); | |
| 609 | + echo json_encode( $response ); | |
| 610 | + wp_die(); | |
| 742 | 611 | } |
| 743 | 612 | |
| 744 | 613 | public static function deactivate() { |
| 745 | 614 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| @@ -764,11 +633,11 @@ | ||
| 764 | 633 | $response['message'] = $e->getMessage(); |
| 765 | 634 | } |
| 766 | 635 | |
| 767 | 636 | $this_plugin->clear_license(); |
| 768 | - FrmInbox::clear_cache(); | |
| 769 | 637 | |
| 770 | - wp_send_json( $response ); | |
| 638 | + echo json_encode( $response ); | |
| 639 | + wp_die(); | |
| 771 | 640 | } |
| 772 | 641 | |
| 773 | 642 | /** |
| 774 | 643 | * @since 4.03 |
| @@ -780,11 +649,8 @@ | ||
| 780 | 649 | $this_plugin->license = $license; |
| 781 | 650 | return $this_plugin; |
| 782 | 651 | } |
| 783 | 652 | |
| 784 | - /** | |
| 785 | - * @return string | |
| 786 | - */ | |
| 787 | 653 | public function send_mothership_request( $action ) { |
| 788 | 654 | $api_params = array( |
| 789 | 655 | 'edd_action' => $action, |
| 790 | 656 | 'license' => $this->license, |
| @@ -801,20 +667,16 @@ | ||
| 801 | 667 | 'timeout' => 25, |
| 802 | 668 | 'user-agent' => $this->plugin_slug . '/' . $this->version . '; ' . get_bloginfo( 'url' ), |
| 803 | 669 | ); |
| 804 | 670 | |
| 805 | - $resp = wp_remote_post( | |
| 806 | - $this->store_url . '?l=' . urlencode( base64_encode( $this->license ) ), | |
| 807 | - $arg_array | |
| 808 | - ); | |
| 809 | - $body = wp_remote_retrieve_body( $resp ); | |
| 810 | - $this->save_status = array( 'response_code' => wp_remote_retrieve_response_code( $resp ) ); | |
| 671 | + $resp = wp_remote_post( $this->store_url, $arg_array ); | |
| 672 | + $body = wp_remote_retrieve_body( $resp ); | |
| 811 | 673 | |
| 812 | 674 | $message = __( 'Your License Key was invalid', 'formidable' ); |
| 813 | 675 | if ( is_wp_error( $resp ) ) { |
| 814 | 676 | $link = FrmAppHelper::admin_upgrade_link( 'api', 'knowledgebase/why-cant-i-activate-formidable-pro/' ); |
| 815 | 677 | /* translators: %1$s: Start link HTML, %2$s: End link HTML */ |
| 816 | - $message = sprintf( __( 'You had an error communicating with the Formidable API. %1$sClick here%2$s for more information.', 'formidable' ), '<a href="' . esc_url( $link ) . '" target="_blank">', '</a>' ); | |
| 678 | + $message = sprintf( __( 'You had an error communicating with the Formidable API. %1$sClick here%2$s for more information.', 'formidable' ), '<a href="' . esc_url( $link ) . '" target="_blank">', '</a>' ); | |
| 817 | 679 | $message .= ' ' . $resp->get_error_message(); |
| 818 | 680 | } elseif ( 'error' === $body || is_wp_error( $body ) ) { |
| 819 | 681 | $message = __( 'You had an HTTP error connecting to the Formidable API', 'formidable' ); |
| 820 | 682 | } else { |
| @@ -824,19 +686,13 @@ | ||
| 824 | 686 | $message = $json_res['error']; |
| 825 | 687 | } else { |
| 826 | 688 | $message = $json_res; |
| 827 | 689 | } |
| 828 | - } elseif ( ! empty( $resp['response'] ) && ! empty( $resp['response']['code'] ) ) { | |
| 829 | - $resp['body'] = wp_strip_all_tags( $resp['body'] ); | |
| 830 | - | |
| 831 | - $message = sprintf( | |
| 832 | - /* translators: %1$s: Error code, %2$s: Error message */ | |
| 833 | - esc_html__( 'There was a %1$s error: %2$s', 'formidable' ), | |
| 834 | - esc_html( $resp['response']['code'] ), | |
| 835 | - $resp['response']['message'] . ' ' . $resp['body'] | |
| 836 | - ); | |
| 690 | + } elseif ( isset( $resp['response'] ) && isset( $resp['response']['code'] ) ) { | |
| 691 | + /* translators: %1$s: Error code, %2$s: Error message */ | |
| 692 | + $message = sprintf( __( 'There was a %1$s error: %2$s', 'formidable' ), $resp['response']['code'], $resp['response']['message'] . ' ' . $resp['body'] ); | |
| 837 | 693 | } |
| 838 | - }//end if | |
| 694 | + } | |
| 839 | 695 | |
| 840 | 696 | return $message; |
| 841 | 697 | } |
| 842 | 698 | |
| @@ -847,46 +703,6 @@ | ||
| 847 | 703 | $updates->translations = array(); |
| 848 | 704 | $updates->no_update = array(); |
| 849 | 705 | $updates->checked = array(); |
| 850 | 706 | set_site_transient( 'update_plugins', $updates ); |
| 851 | - } | |
| 852 | - | |
| 853 | - /** | |
| 854 | - * Set the transient key for the lock. It should be unique to the license. | |
| 855 | - * | |
| 856 | - * @since 6.8.3 | |
| 857 | - * | |
| 858 | - * @return bool | |
| 859 | - */ | |
| 860 | - protected function lock_key() { | |
| 861 | - return $this->transient_lock_key . '_' . $this->license; | |
| 862 | - } | |
| 863 | - | |
| 864 | - /** | |
| 865 | - * Prevent multiple requests from running at the same time. | |
| 866 | - * | |
| 867 | - * @since 6.8.3 | |
| 868 | - * | |
| 869 | - * @return bool | |
| 870 | - */ | |
| 871 | - protected function is_running() { | |
| 872 | - return get_transient( $this->lock_key() ); | |
| 873 | - } | |
| 874 | - | |
| 875 | - /** | |
| 876 | - * @since 6.8.3 | |
| 877 | - * | |
| 878 | - * @return void | |
| 879 | - */ | |
| 880 | - protected function set_running() { | |
| 881 | - set_transient( $this->lock_key(), true, 2 * MINUTE_IN_SECONDS ); | |
| 882 | - } | |
| 883 | - | |
| 884 | - /** | |
| 885 | - * @since 6.8.3 | |
| 886 | - * | |
| 887 | - * @return void | |
| 888 | - */ | |
| 889 | - protected function done_running() { | |
| 890 | - delete_transient( $this->lock_key() ); | |
| 891 | 707 | } |
| 892 | 708 | } |
