| @@ -2,118 +2,29 @@ | ||
| 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 | - | |
| 9 | - /** | |
| 10 | - * @var string | |
| 11 | - */ | |
| 12 | 7 | public $store_url = 'https://formidableforms.com'; |
| 13 | - | |
| 14 | - /** | |
| 15 | - * @var int|string|null | |
| 16 | - */ | |
| 17 | 8 | public $download_id; |
| 18 | - | |
| 19 | - /** | |
| 20 | - * @var string|null | |
| 21 | - */ | |
| 22 | 9 | public $plugin_file; |
| 23 | - | |
| 24 | - /** | |
| 25 | - * @var string | |
| 26 | - */ | |
| 27 | 10 | public $plugin_folder; |
| 28 | - | |
| 29 | - /** | |
| 30 | - * @var string | |
| 31 | - */ | |
| 32 | 11 | public $plugin_name; |
| 33 | - | |
| 34 | - /** | |
| 35 | - * @var string | |
| 36 | - */ | |
| 37 | 12 | public $plugin_slug; |
| 38 | - | |
| 39 | - /** | |
| 40 | - * @var string | |
| 41 | - */ | |
| 42 | 13 | public $option_name; |
| 43 | - | |
| 44 | - /** | |
| 45 | - * @var string|null | |
| 46 | - */ | |
| 47 | 14 | public $version; |
| 48 | - | |
| 49 | - /** | |
| 50 | - * @var string | |
| 51 | - */ | |
| 52 | 15 | public $author = 'Strategy11'; |
| 53 | - | |
| 54 | - /** | |
| 55 | - * @var bool | |
| 56 | - */ | |
| 57 | 16 | public $is_parent_licence = false; |
| 58 | - | |
| 59 | - /** | |
| 60 | - * @var bool | |
| 61 | - */ | |
| 62 | 17 | public $needs_license = true; |
| 63 | - | |
| 64 | - /** | |
| 65 | - * @var bool | |
| 66 | - */ | |
| 67 | 18 | private $is_expired_addon = false; |
| 68 | - | |
| 69 | - /** | |
| 70 | - * @var string|null | |
| 71 | - */ | |
| 72 | 19 | public $license; |
| 73 | - | |
| 74 | - /** | |
| 75 | - * @var bool | |
| 76 | - */ | |
| 77 | 20 | protected $get_beta = false; |
| 78 | 21 | |
| 79 | - /** | |
| 80 | - * @var array|null | |
| 81 | - */ | |
| 82 | - protected $save_status; | |
| 22 | + public function __construct() { | |
| 83 | 23 | |
| 84 | - /** | |
| 85 | - * This is used to decide whether the license checks should continue. | |
| 86 | - * The point is to avoid license issues when a site url changes. | |
| 87 | - * | |
| 88 | - * @since 6.8.3 | |
| 89 | - * | |
| 90 | - * @var array | |
| 91 | - */ | |
| 92 | - private $save_response = array(); | |
| 93 | - | |
| 94 | - /** | |
| 95 | - * This is used to flag other add ons not to send a request. | |
| 96 | - * We only want to send a single API request per page load. | |
| 97 | - * | |
| 98 | - * @since 6.8.3 | |
| 99 | - * | |
| 100 | - * @var string | |
| 101 | - */ | |
| 102 | - private $transient_lock_key = 'frm_activate_request_lock'; | |
| 103 | - | |
| 104 | - /** | |
| 105 | - * @since 6.8.3 | |
| 106 | - * | |
| 107 | - * @var bool | |
| 108 | - */ | |
| 109 | - protected $should_clear_cache = true; | |
| 110 | - | |
| 111 | - public function __construct() { | |
| 112 | 24 | if ( empty( $this->plugin_slug ) ) { |
| 113 | 25 | $this->plugin_slug = preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->plugin_name ) ) ); |
| 114 | 26 | } |
| 115 | - | |
| 116 | 27 | if ( empty( $this->option_name ) ) { |
| 117 | 28 | $this->option_name = 'edd_' . $this->plugin_slug . '_license_'; |
| 118 | 29 | } |
| 119 | 30 | |
| @@ -123,46 +34,38 @@ | ||
| 123 | 34 | add_filter( 'frm_installed_addons', array( &$this, 'insert_installed_addon' ) ); |
| 124 | 35 | $this->edd_plugin_updater(); |
| 125 | 36 | } |
| 126 | 37 | |
| 127 | - /** | |
| 128 | - * @return void | |
| 129 | - */ | |
| 130 | 38 | public static function load_hooks() { |
| 131 | 39 | add_filter( 'frm_include_addon_page', '__return_true' ); |
| 132 | - new static(); | |
| 40 | + //new static(); | |
| 133 | 41 | } |
| 134 | 42 | |
| 135 | - /** | |
| 136 | - * @param array $plugins | |
| 137 | - * | |
| 138 | - * @return array | |
| 139 | - */ | |
| 140 | 43 | public function insert_installed_addon( $plugins ) { |
| 141 | 44 | $plugins[ $this->plugin_slug ] = $this; |
| 45 | + | |
| 142 | 46 | return $plugins; |
| 143 | 47 | } |
| 144 | 48 | |
| 145 | - /** | |
| 146 | - * @param string $plugin_slug | |
| 147 | - * | |
| 148 | - * @return false|FrmAddon | |
| 149 | - */ | |
| 150 | 49 | public static function get_addon( $plugin_slug ) { |
| 151 | 50 | $plugins = apply_filters( 'frm_installed_addons', array() ); |
| 152 | - return $plugins[ $plugin_slug ] ?? false; | |
| 51 | + $plugin = false; | |
| 52 | + if ( isset( $plugins[ $plugin_slug ] ) ) { | |
| 53 | + $plugin = $plugins[ $plugin_slug ]; | |
| 54 | + } | |
| 55 | + | |
| 56 | + return $plugin; | |
| 153 | 57 | } |
| 154 | 58 | |
| 155 | - /** | |
| 156 | - * @return void | |
| 157 | - */ | |
| 158 | 59 | public function edd_plugin_updater() { |
| 60 | + | |
| 159 | 61 | $this->is_license_revoked(); |
| 160 | 62 | $license = $this->license; |
| 161 | 63 | |
| 162 | 64 | add_action( 'after_plugin_row_' . plugin_basename( $this->plugin_file ), array( $this, 'maybe_show_license_message' ), 10, 2 ); |
| 163 | 65 | |
| 164 | - if ( $license ) { | |
| 66 | + if ( ! empty( $license ) ) { | |
| 67 | + | |
| 165 | 68 | if ( 'formidable/formidable.php' !== $this->plugin_folder ) { |
| 166 | 69 | add_filter( 'plugins_api', array( &$this, 'plugins_api_filter' ), 10, 3 ); |
| 167 | 70 | } |
| 168 | 71 | |
| @@ -170,13 +73,13 @@ | ||
| 170 | 73 | } |
| 171 | 74 | } |
| 172 | 75 | |
| 173 | 76 | /** |
| 174 | - * 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. | |
| 175 | 78 | * |
| 176 | 79 | * @uses api_request() |
| 177 | 80 | * |
| 178 | - * @param mixed $_data | |
| 81 | + * @param mixed $_data | |
| 179 | 82 | * @param string $_action |
| 180 | 83 | * @param object $_args |
| 181 | 84 | * |
| 182 | 85 | * @return object $_data |
| @@ -181,22 +84,21 @@ | ||
| 181 | 84 | * |
| 182 | 85 | * @return object $_data |
| 183 | 86 | */ |
| 184 | 87 | public function plugins_api_filter( $_data, $_action = '', $_args = null ) { |
| 185 | - if ( $_action !== 'plugin_information' ) { | |
| 88 | + | |
| 89 | + if ( $_action != 'plugin_information' ) { | |
| 186 | 90 | return $_data; |
| 187 | 91 | } |
| 188 | 92 | |
| 189 | 93 | $slug = basename( $this->plugin_file, '.php' ); |
| 190 | 94 | $slug2 = str_replace( '/' . $slug . '.php', '', $this->plugin_folder ); |
| 191 | - | |
| 192 | - if ( empty( $_args->slug ) || ( $_args->slug !== $slug && $_args->slug !== $slug2 ) ) { | |
| 95 | + if ( empty( $_args->slug ) || ( $_args->slug != $slug && $_args->slug !== $slug2 ) ) { | |
| 193 | 96 | return $_data; |
| 194 | 97 | } |
| 195 | 98 | |
| 196 | 99 | $item_id = $this->download_id; |
| 197 | - | |
| 198 | - if ( ! $item_id ) { | |
| 100 | + if ( empty( $item_id ) ) { | |
| 199 | 101 | $_data = array( |
| 200 | 102 | 'name' => $this->plugin_name, |
| 201 | 103 | 'excerpt' => '', |
| 202 | 104 | 'changelog' => 'See the full changelog at <a href="' . esc_url( $this->store_url . '/changelog/' ) . '"></a>', |
| @@ -220,21 +122,16 @@ | ||
| 220 | 122 | |
| 221 | 123 | return (object) $_data; |
| 222 | 124 | } |
| 223 | 125 | |
| 224 | - /** | |
| 225 | - * @return string | |
| 226 | - */ | |
| 227 | 126 | public function get_license() { |
| 228 | 127 | $license = $this->maybe_get_pro_license(); |
| 229 | - | |
| 230 | - if ( $license ) { | |
| 128 | + if ( ! empty( $license ) ) { | |
| 231 | 129 | return $license; |
| 232 | 130 | } |
| 233 | 131 | |
| 234 | 132 | $license = trim( get_option( $this->option_name . 'key' ) ); |
| 235 | - | |
| 236 | - if ( ! $license ) { | |
| 133 | + if ( empty( $license ) ) { | |
| 237 | 134 | $license = $this->activate_defined_license(); |
| 238 | 135 | } |
| 239 | 136 | |
| 240 | 137 | return $license; |
| @@ -241,14 +138,12 @@ | ||
| 241 | 138 | } |
| 242 | 139 | |
| 243 | 140 | /** |
| 244 | 141 | * @since 3.04.03 |
| 245 | - * | |
| 246 | - * @return false|string | |
| 247 | 142 | */ |
| 248 | 143 | protected function maybe_get_pro_license() { |
| 249 | 144 | // prevent a loop if $this is the pro plugin |
| 250 | - $get_license = FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::get_updater' ) && $this->plugin_name !== 'Formidable Pro'; | |
| 145 | + $get_license = FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::get_updater' ) && $this->plugin_name != 'Formidable Pro'; | |
| 251 | 146 | |
| 252 | 147 | if ( ! $get_license ) { |
| 253 | 148 | return false; |
| 254 | 149 | } |
| @@ -255,15 +150,13 @@ | ||
| 255 | 150 | |
| 256 | 151 | $api = new FrmFormApi(); |
| 257 | 152 | $api->get_pro_updater(); |
| 258 | 153 | $license = $api->get_license(); |
| 259 | - | |
| 260 | - if ( ! $license ) { | |
| 154 | + if ( empty( $license ) ) { | |
| 261 | 155 | return false; |
| 262 | 156 | } |
| 263 | 157 | |
| 264 | 158 | $this->get_api_info( $license ); |
| 265 | - | |
| 266 | 159 | if ( ! $this->is_parent_licence ) { |
| 267 | 160 | $license = false; |
| 268 | 161 | } |
| 269 | 162 | |
| @@ -273,17 +166,14 @@ | ||
| 273 | 166 | /** |
| 274 | 167 | * Activate the license in wp-config.php |
| 275 | 168 | * |
| 276 | 169 | * @since 2.04 |
| 277 | - * | |
| 278 | - * @return string | |
| 279 | 170 | */ |
| 280 | 171 | public function activate_defined_license() { |
| 281 | 172 | $license = $this->get_defined_license(); |
| 282 | - | |
| 283 | - if ( $license && ! $this->is_active() && ! $this->checked_recently( '1 day' ) ) { | |
| 173 | + if ( ! empty( $license ) && ! $this->is_active() && $this->is_time_to_auto_activate() ) { | |
| 284 | 174 | $response = $this->activate_license( $license ); |
| 285 | - | |
| 175 | + $this->set_auto_activate_time(); | |
| 286 | 176 | if ( ! $response['success'] ) { |
| 287 | 177 | $license = ''; |
| 288 | 178 | } |
| 289 | 179 | } |
| @@ -294,28 +184,35 @@ | ||
| 294 | 184 | /** |
| 295 | 185 | * Check the wp-config.php for the license key |
| 296 | 186 | * |
| 297 | 187 | * @since 2.04 |
| 298 | - * | |
| 299 | - * @return false|string | |
| 300 | 188 | */ |
| 301 | 189 | public function get_defined_license() { |
| 302 | - $constant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; | |
| 303 | - return defined( $constant_name ) ? constant( $constant_name ) : false; | |
| 190 | + $consant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; | |
| 191 | + | |
| 192 | + return defined( $consant_name ) ? constant( $consant_name ) : false; | |
| 304 | 193 | } |
| 305 | 194 | |
| 306 | - /** | |
| 307 | - * @param string $license | |
| 308 | - * | |
| 309 | - * @return void | |
| 310 | - */ | |
| 311 | 195 | public function set_license( $license ) { |
| 312 | 196 | update_option( $this->option_name . 'key', $license ); |
| 313 | 197 | } |
| 314 | 198 | |
| 315 | 199 | /** |
| 316 | - * @return mixed | |
| 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 | |
| 317 | 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 | + | |
| 318 | 215 | public function is_active() { |
| 319 | 216 | return get_option( $this->option_name . 'active' ); |
| 320 | 217 | } |
| 321 | 218 | |
| @@ -321,63 +218,26 @@ | ||
| 321 | 218 | |
| 322 | 219 | /** |
| 323 | 220 | * @since 3.04.03 |
| 324 | 221 | * |
| 325 | - * @param array|string $error | |
| 326 | - * | |
| 327 | - * @return void | |
| 222 | + * @param array error | |
| 328 | 223 | */ |
| 329 | 224 | public function maybe_clear_license( $error ) { |
| 330 | - if ( is_array( $error ) && $error['code'] === 'disabled' && $error['license'] === $this->license ) { | |
| 225 | + if ( $error['code'] === 'disabled' && $error['license'] === $this->license ) { | |
| 331 | 226 | $this->clear_license(); |
| 332 | 227 | } |
| 333 | 228 | } |
| 334 | 229 | |
| 335 | - /** | |
| 336 | - * @return void | |
| 337 | - */ | |
| 338 | 230 | public function clear_license() { |
| 339 | 231 | delete_option( $this->option_name . 'active' ); |
| 340 | 232 | delete_option( $this->option_name . 'key' ); |
| 341 | - | |
| 342 | - if ( $this->should_clear_cache ) { | |
| 343 | - delete_site_option( $this->transient_key() ); | |
| 344 | - delete_option( $this->transient_key() ); | |
| 345 | - $this->delete_cache(); | |
| 346 | - $this->should_clear_cache = true; | |
| 347 | - } | |
| 233 | + delete_site_option( $this->transient_key() ); | |
| 234 | + delete_option( $this->transient_key() ); | |
| 235 | + $this->delete_cache(); | |
| 348 | 236 | } |
| 349 | 237 | |
| 350 | - /** | |
| 351 | - * Don't save an invalid license. | |
| 352 | - * | |
| 353 | - * @since 6.8.3 | |
| 354 | - * | |
| 355 | - * @param bool $is_valid If license activation was successful. | |
| 356 | - * | |
| 357 | - * @return void | |
| 358 | - */ | |
| 359 | - protected function maybe_set_active( $is_valid ) { | |
| 360 | - update_option( $this->option_name . 'active', $is_valid ); | |
| 361 | - | |
| 362 | - if ( $is_valid ) { | |
| 363 | - $this->set_active( $is_valid ); | |
| 364 | - return; | |
| 365 | - } | |
| 366 | - | |
| 367 | - // Don't save the license if it's invalid. | |
| 368 | - $this->should_clear_cache = false; | |
| 369 | - $this->clear_license(); | |
| 370 | - delete_option( $this->option_name . 'key' ); | |
| 371 | - $this->license = ''; | |
| 372 | - } | |
| 373 | - | |
| 374 | - /** | |
| 375 | - * @param bool $is_active | |
| 376 | - * | |
| 377 | - * @return void | |
| 378 | - */ | |
| 379 | 238 | public function set_active( $is_active ) { |
| 239 | + update_option( $this->option_name . 'active', $is_active ); | |
| 380 | 240 | $this->delete_cache(); |
| 381 | 241 | FrmAppHelper::save_combined_js(); |
| 382 | 242 | $this->update_pro_capabilities(); |
| 383 | 243 | } |
| @@ -385,32 +245,25 @@ | ||
| 385 | 245 | /** |
| 386 | 246 | * Updates roles capabilities after pro license is active. |
| 387 | 247 | * |
| 388 | 248 | * @since 5.0 |
| 389 | - * | |
| 390 | - * @return void | |
| 391 | 249 | */ |
| 392 | 250 | protected function update_pro_capabilities() { |
| 393 | 251 | global $wp_roles; |
| 394 | 252 | |
| 395 | - if ( ! function_exists( 'get_editable_roles' ) ) { | |
| 396 | - require_once ABSPATH . 'wp-admin/includes/user.php'; | |
| 397 | - } | |
| 398 | - | |
| 399 | 253 | $caps = FrmAppHelper::frm_capabilities( 'pro_only' ); |
| 400 | 254 | $roles = get_editable_roles(); |
| 401 | 255 | $settings = new FrmSettings(); |
| 402 | - | |
| 403 | 256 | foreach ( $caps as $cap => $cap_desc ) { |
| 404 | - $cap_roles = (array) ( $settings->$cap ?? 'administrator' ); | |
| 257 | + $cap_roles = (array) ( isset( $settings->$cap ) ? $settings->$cap : 'administrator' ); | |
| 405 | 258 | |
| 406 | 259 | // Make sure administrators always have permissions. |
| 407 | - if ( ! in_array( 'administrator', $cap_roles, true ) ) { | |
| 260 | + if ( ! in_array( 'administrator', $cap_roles ) ) { | |
| 408 | 261 | array_push( $cap_roles, 'administrator' ); |
| 409 | 262 | } |
| 410 | 263 | |
| 411 | 264 | foreach ( $roles as $role => $details ) { |
| 412 | - if ( in_array( $role, $cap_roles, true ) ) { | |
| 265 | + if ( in_array( $role, $cap_roles ) ) { | |
| 413 | 266 | $wp_roles->add_cap( $role, $cap ); |
| 414 | 267 | } else { |
| 415 | 268 | $wp_roles->remove_cap( $role, $cap ); |
| 416 | 269 | } |
| @@ -419,31 +272,17 @@ | ||
| 419 | 272 | } |
| 420 | 273 | |
| 421 | 274 | /** |
| 422 | 275 | * @since 3.04.03 |
| 423 | - * | |
| 424 | - * @return void | |
| 425 | 276 | */ |
| 426 | 277 | protected function delete_cache() { |
| 427 | 278 | delete_transient( 'frm_api_licence' ); |
| 428 | 279 | |
| 429 | - // Cleanup option that has been removed. | |
| 430 | - delete_option( $this->option_name . 'last_activate' ); | |
| 431 | - | |
| 432 | 280 | $api = new FrmFormApi( $this->license ); |
| 433 | 281 | $api->reset_cached(); |
| 434 | 282 | |
| 435 | 283 | $api = new FrmFormTemplateApi( $this->license ); |
| 436 | 284 | $api->reset_cached(); |
| 437 | - | |
| 438 | - $api = new FrmApplicationApi( $this->license ); | |
| 439 | - $api->reset_cached(); | |
| 440 | - | |
| 441 | - $api = new FrmSalesApi(); | |
| 442 | - $api->reset_cached(); | |
| 443 | - | |
| 444 | - $api = new FrmStyleApi(); | |
| 445 | - $api->reset_cached(); | |
| 446 | 285 | } |
| 447 | 286 | |
| 448 | 287 | /** |
| 449 | 288 | * The Pro version includes the show_license_message function. |
| @@ -449,13 +288,8 @@ | ||
| 449 | 288 | * The Pro version includes the show_license_message function. |
| 450 | 289 | * We need an extra check before we allow it to show a message. |
| 451 | 290 | * |
| 452 | 291 | * @since 3.04.03 |
| 453 | - * | |
| 454 | - * @param string $file File path of the plugin. | |
| 455 | - * @param array $plugin Plugin data. | |
| 456 | - * | |
| 457 | - * @return void | |
| 458 | 292 | */ |
| 459 | 293 | public function maybe_show_license_message( $file, $plugin ) { |
| 460 | 294 | if ( $this->is_expired_addon || isset( $plugin['package'] ) ) { |
| 461 | 295 | // let's not show a ton of duplicate messages |
| @@ -464,30 +298,22 @@ | ||
| 464 | 298 | |
| 465 | 299 | $this->show_license_message( $file, $plugin ); |
| 466 | 300 | } |
| 467 | 301 | |
| 468 | - /** | |
| 469 | - * @param string $file File path of the plugin. | |
| 470 | - * @param array $plugin Plugin data. | |
| 471 | - * | |
| 472 | - * @return void | |
| 473 | - */ | |
| 474 | 302 | public function show_license_message( $file, $plugin ) { |
| 475 | 303 | $message = ''; |
| 476 | - | |
| 477 | 304 | if ( empty( $this->license ) ) { |
| 478 | 305 | /* translators: %1$s: Plugin name, %2$s: Start link HTML, %3$s: end link HTML */ |
| 479 | - $message = sprintf( esc_html__( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), esc_html( $this->plugin_name ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings' ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 306 | + $message = sprintf( esc_html__( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), esc_html( $this->plugin_name ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings' ) ) . '">', '</a>' ); | |
| 480 | 307 | } else { |
| 481 | 308 | $api = new FrmFormApi( $this->license ); |
| 482 | 309 | $errors = $api->error_for_license(); |
| 483 | - | |
| 484 | - if ( $errors ) { | |
| 310 | + if ( ! empty( $errors ) ) { | |
| 485 | 311 | $message = reset( $errors ); |
| 486 | 312 | } |
| 487 | 313 | } |
| 488 | 314 | |
| 489 | - if ( ! $message ) { | |
| 315 | + if ( empty( $message ) ) { | |
| 490 | 316 | return; |
| 491 | 317 | } |
| 492 | 318 | |
| 493 | 319 | $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
| @@ -492,19 +318,14 @@ | ||
| 492 | 318 | |
| 493 | 319 | $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
| 494 | 320 | $id = sanitize_title( $plugin['Name'] ) . '-next'; |
| 495 | 321 | |
| 496 | - 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>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 497 | - FrmAppHelper::kses_echo( $message, 'a' ); | |
| 498 | - echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '").previousSibling;if ( d !== null ){ d.className = d.className + " update"; }</script>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 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>'; | |
| 323 | + echo FrmAppHelper::kses( $message, 'a' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 324 | + echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '").previousSibling;if ( d !== null ){ d.className = d.className + " update"; }</script>'; | |
| 499 | 325 | echo '</p></div></td></tr>'; |
| 500 | 326 | } |
| 501 | 327 | |
| 502 | - /** | |
| 503 | - * @param mixed $transient | |
| 504 | - * | |
| 505 | - * @return mixed | |
| 506 | - */ | |
| 507 | 328 | public function clear_expired_download( $transient ) { |
| 508 | 329 | if ( ! is_object( $transient ) ) { |
| 509 | 330 | return $transient; |
| 510 | 331 | } |
| @@ -509,9 +330,9 @@ | ||
| 509 | 330 | return $transient; |
| 510 | 331 | } |
| 511 | 332 | |
| 512 | 333 | if ( $this->is_current_version( $transient ) ) { |
| 513 | - // 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 | |
| 514 | 335 | if ( isset( $transient->response[ $this->plugin_folder ] ) ) { |
| 515 | 336 | unset( $transient->response[ $this->plugin_folder ] ); |
| 516 | 337 | } |
| 517 | 338 | } elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) { |
| @@ -534,25 +355,20 @@ | ||
| 534 | 355 | * Check if the plugin information is correct to allow an update |
| 535 | 356 | * |
| 536 | 357 | * @since 3.04.03 |
| 537 | 358 | * |
| 538 | - * @param object $transient The current plugin info saved for update. | |
| 539 | - * | |
| 540 | - * @return void | |
| 359 | + * @param object $transient - the current plugin info saved for update | |
| 541 | 360 | */ |
| 542 | 361 | private function prepare_update_details( &$transient ) { |
| 543 | 362 | $version_info = $transient; |
| 544 | - $has_beta_url = ! empty( $version_info->beta ); | |
| 545 | - | |
| 363 | + $has_beta_url = isset( $version_info->beta ) && ! empty( $version_info->beta ); | |
| 546 | 364 | if ( $this->get_beta && ! $has_beta_url ) { |
| 547 | 365 | $version_info = (object) $this->get_api_info( $this->license ); |
| 548 | 366 | } |
| 549 | 367 | |
| 550 | - if ( ! empty( $version_info->new_version ) ) { | |
| 368 | + if ( isset( $version_info->new_version ) && ! empty( $version_info->new_version ) ) { | |
| 551 | 369 | $this->clear_old_plugin_version( $version_info ); |
| 552 | - | |
| 553 | - if ( $version_info === false ) { | |
| 554 | - // Was cleared with timeout. | |
| 370 | + if ( $version_info === false ) { // was cleared with timeout | |
| 555 | 371 | $transient = false; |
| 556 | 372 | } else { |
| 557 | 373 | $this->maybe_use_beta_url( $version_info ); |
| 558 | 374 | |
| @@ -566,12 +382,8 @@ | ||
| 566 | 382 | /** |
| 567 | 383 | * Get the API info for this plugin |
| 568 | 384 | * |
| 569 | 385 | * @since 3.04.03 |
| 570 | - * | |
| 571 | - * @param string $license The license key. | |
| 572 | - * | |
| 573 | - * @return array The API info for the plugin. | |
| 574 | 386 | */ |
| 575 | 387 | protected function get_api_info( $license ) { |
| 576 | 388 | $api = new FrmFormApi( $license ); |
| 577 | 389 | $addon = $api->get_addon_for_license( $this ); |
| @@ -592,19 +404,13 @@ | ||
| 592 | 404 | * Make sure transients don't stick around on sites that |
| 593 | 405 | * don't save the transient expiration |
| 594 | 406 | * |
| 595 | 407 | * @since 2.05.05 |
| 596 | - * | |
| 597 | - * @param object $version_info The version info for the plugin. | |
| 598 | - * | |
| 599 | - * @return void | |
| 600 | 408 | */ |
| 601 | 409 | private function clear_old_plugin_version( &$version_info ) { |
| 602 | - $timeout = ! empty( $version_info->timeout ) ? $version_info->timeout : 0; | |
| 603 | - | |
| 604 | - if ( $timeout && time() > $timeout ) { | |
| 605 | - // Cache is expired. | |
| 606 | - $version_info = false; | |
| 410 | + $timeout = ( isset( $version_info->timeout ) && ! empty( $version_info->timeout ) ) ? $version_info->timeout : 0; | |
| 411 | + if ( ! empty( $timeout ) && time() > $timeout ) { | |
| 412 | + $version_info = false; // Cache is expired | |
| 607 | 413 | $api = new FrmFormApi( $this->license ); |
| 608 | 414 | $api->reset_cached(); |
| 609 | 415 | } |
| 610 | 416 | } |
| @@ -613,163 +419,89 @@ | ||
| 613 | 419 | * The beta url is always included if the download has a beta. |
| 614 | 420 | * Check if the beta should be downloaded. |
| 615 | 421 | * |
| 616 | 422 | * @since 3.04.03 |
| 617 | - * | |
| 618 | - * @param object $version_info The version info for the plugin. | |
| 619 | - * | |
| 620 | - * @return void | |
| 621 | 423 | */ |
| 622 | 424 | private function maybe_use_beta_url( &$version_info ) { |
| 623 | - if ( $this->get_beta && ! empty( $version_info->beta ) ) { | |
| 425 | + if ( $this->get_beta && isset( $version_info->beta ) && ! empty( $version_info->beta ) ) { | |
| 624 | 426 | $version_info->new_version = $version_info->beta['version']; |
| 625 | 427 | $version_info->package = $version_info->beta['package']; |
| 626 | - | |
| 627 | - if ( ! empty( $version_info->plugin ) ) { | |
| 428 | + if ( isset( $version_info->plugin ) && ! empty( $version_info->plugin ) ) { | |
| 628 | 429 | $version_info->plugin = $version_info->beta['plugin']; |
| 629 | 430 | } |
| 630 | 431 | } |
| 631 | 432 | } |
| 632 | 433 | |
| 633 | - /** | |
| 634 | - * @param object $transient | |
| 635 | - * | |
| 636 | - * @return bool | |
| 637 | - */ | |
| 638 | 434 | private function is_current_version( $transient ) { |
| 639 | 435 | if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) { |
| 640 | 436 | return false; |
| 641 | 437 | } |
| 642 | 438 | |
| 643 | - $response = empty( $transient->response ); | |
| 644 | - | |
| 439 | + $response = ! isset( $transient->response ) || empty( $transient->response ); | |
| 645 | 440 | if ( $response ) { |
| 646 | 441 | return true; |
| 647 | 442 | } |
| 648 | 443 | |
| 649 | - return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 444 | + return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version; | |
| 650 | 445 | } |
| 651 | 446 | |
| 652 | - /** | |
| 653 | - * @return bool | |
| 654 | - */ | |
| 655 | 447 | private function has_been_cleared() { |
| 656 | 448 | $last_cleared = get_option( 'frm_last_cleared' ); |
| 657 | - 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' ) ) ); | |
| 658 | 451 | } |
| 659 | 452 | |
| 660 | - /** | |
| 661 | - * @return void | |
| 662 | - */ | |
| 663 | 453 | private function cleared_plugins() { |
| 664 | 454 | update_option( 'frm_last_cleared', gmdate( 'Y-m-d H:i:s' ) ); |
| 665 | 455 | } |
| 666 | 456 | |
| 667 | - /** | |
| 668 | - * @return void | |
| 669 | - */ | |
| 670 | 457 | private function is_license_revoked() { |
| 671 | 458 | if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 672 | 459 | return; |
| 673 | 460 | } |
| 674 | 461 | |
| 675 | - if ( $this->get_defined_license() ) { | |
| 676 | - // Don't check if the license is defined in wp-config.php since we can't remove it. | |
| 677 | - return; | |
| 462 | + if ( is_multisite() ) { | |
| 463 | + $last_checked = get_site_option( $this->transient_key() ); | |
| 464 | + } else { | |
| 465 | + $last_checked = get_option( $this->transient_key() ); | |
| 678 | 466 | } |
| 679 | 467 | |
| 680 | - // Only check weekly. | |
| 681 | - if ( $this->checked_recently( '7 days', 'valid' ) || $this->is_running() ) { | |
| 682 | - return; | |
| 683 | - } | |
| 468 | + $seven_days_ago = gmdate( 'Y-m-d H:i:s', strtotime( '-7 days' ) ); | |
| 684 | 469 | |
| 685 | - $response = $this->get_license_status(); | |
| 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 | + } | |
| 686 | 477 | |
| 687 | - if ( 'revoked' === $response['status'] || 'blocked' === $response['status'] || 'disabled' === $response['status'] || 'missing' === $response['status'] ) { | |
| 688 | - $this->clear_license(); | |
| 478 | + $response = $this->get_license_status(); | |
| 479 | + if ( 'revoked' === $response['status'] || 'blocked' === $response['status'] || 'disabled' === $response['status'] ) { | |
| 480 | + $this->clear_license(); | |
| 481 | + } | |
| 689 | 482 | } |
| 690 | 483 | } |
| 691 | 484 | |
| 692 | 485 | /** |
| 693 | - * Has this been checked too recently? | |
| 694 | - * | |
| 695 | - * @param string $time ie. '1 day'. | |
| 696 | - * @param string $required_status Return false if the last check does not match. ie 'valid'. | |
| 697 | - * | |
| 698 | - * @return bool | |
| 699 | - */ | |
| 700 | - private function checked_recently( $time, $required_status = '' ) { | |
| 701 | - $last_checked = $this->last_checked(); | |
| 702 | - $is_429 = isset( $last_checked['response_code'] ) && 429 === $last_checked['response_code']; | |
| 703 | - | |
| 704 | - if ( $is_429 ) { | |
| 705 | - // If the last check was a a rate limit, we'll need to check again sooner. | |
| 706 | - $time = '5 minutes'; | |
| 707 | - $required_status = ''; | |
| 708 | - } | |
| 709 | - | |
| 710 | - if ( $required_status && ( ! isset( $last_checked['status'] ) || $last_checked['status'] !== $required_status ) ) { | |
| 711 | - // If the last check was invalid, we don't need to check again. | |
| 712 | - return true; | |
| 713 | - } | |
| 714 | - | |
| 715 | - $checked_time = $last_checked['time'] ?? false; | |
| 716 | - $time_ago = gmdate( 'Y-m-d H:i:s', strtotime( '-' . $time ) ); | |
| 717 | - return $checked_time && $checked_time > $time_ago; | |
| 718 | - } | |
| 719 | - | |
| 720 | - /** | |
| 721 | - * @since 6.8.3 Switched to an array to store extra response info. | |
| 722 | - * | |
| 723 | - * @return array | |
| 724 | - */ | |
| 725 | - private function last_checked() { | |
| 726 | - $last_checked = is_multisite() ? get_site_option( $this->transient_key() ) : get_option( $this->transient_key() ); | |
| 727 | - | |
| 728 | - if ( $last_checked && ! is_array( $last_checked ) ) { | |
| 729 | - // Get string into array for existing values. | |
| 730 | - $last_checked = array( 'time' => $last_checked ); | |
| 731 | - } | |
| 732 | - | |
| 733 | - return $last_checked ? $last_checked : array(); | |
| 734 | - } | |
| 735 | - | |
| 736 | - /** | |
| 737 | - * @return void | |
| 738 | - */ | |
| 739 | - private function update_last_checked() { | |
| 740 | - $this->save_response['time'] = gmdate( 'Y-m-d H:i:s' ); | |
| 741 | - | |
| 742 | - if ( is_multisite() ) { | |
| 743 | - update_site_option( $this->transient_key(), $this->save_response ); | |
| 744 | - } else { | |
| 745 | - update_option( $this->transient_key(), $this->save_response ); | |
| 746 | - } | |
| 747 | - } | |
| 748 | - | |
| 749 | - /** | |
| 750 | 486 | * Use a new cache after the license is changed, or Formidable is updated. |
| 751 | - * | |
| 752 | - * @return string | |
| 753 | 487 | */ |
| 754 | 488 | private function transient_key() { |
| 755 | 489 | return 'frm_' . md5( sanitize_key( $this->license . '_' . $this->plugin_slug ) ); |
| 756 | 490 | } |
| 757 | 491 | |
| 758 | - /** | |
| 759 | - * @return void | |
| 760 | - */ | |
| 761 | 492 | public static function activate() { |
| 762 | 493 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 763 | 494 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 764 | 495 | |
| 765 | 496 | $license = stripslashes( FrmAppHelper::get_param( 'license', '', 'post', 'sanitize_text_field' ) ); |
| 766 | - | |
| 767 | - if ( ! $license ) { | |
| 768 | - wp_send_json( | |
| 769 | - array( | |
| 770 | - 'message' => __( 'Oops! You forgot to enter your license number.', 'formidable' ), | |
| 771 | - 'success' => false, | |
| 497 | + if ( empty( $license ) ) { | |
| 498 | + wp_die( | |
| 499 | + json_encode( | |
| 500 | + array( | |
| 501 | + 'message' => __( 'Oops! You forgot to enter your license number.', 'formidable' ), | |
| 502 | + 'success' => false, | |
| 503 | + ) | |
| 772 | 504 | ) |
| 773 | 505 | ); |
| 774 | 506 | } |
| 775 | 507 | |
| @@ -775,20 +507,14 @@ | ||
| 775 | 507 | |
| 776 | 508 | $plugin_slug = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 777 | 509 | $response = self::activate_license_for_plugin( $license, $plugin_slug ); |
| 778 | 510 | |
| 779 | - FrmInbox::clear_cache(); | |
| 780 | - | |
| 781 | - wp_send_json( $response ); | |
| 511 | + echo json_encode( $response ); | |
| 512 | + wp_die(); | |
| 782 | 513 | } |
| 783 | 514 | |
| 784 | 515 | /** |
| 785 | 516 | * @since 4.08 |
| 786 | - * | |
| 787 | - * @param string $license The license key. | |
| 788 | - * @param string $plugin_slug The plugin slug. | |
| 789 | - * | |
| 790 | - * @return array The response from the license activation. | |
| 791 | 517 | */ |
| 792 | 518 | public static function activate_license_for_plugin( $license, $plugin_slug ) { |
| 793 | 519 | $this_plugin = self::get_addon( $plugin_slug ); |
| 794 | 520 | return $this_plugin->activate_license( $license ); |
| @@ -793,19 +519,12 @@ | ||
| 793 | 519 | $this_plugin = self::get_addon( $plugin_slug ); |
| 794 | 520 | return $this_plugin->activate_license( $license ); |
| 795 | 521 | } |
| 796 | 522 | |
| 797 | - /** | |
| 798 | - * @param string $license The license key. | |
| 799 | - * | |
| 800 | - * @return array The response from the license activation. | |
| 801 | - */ | |
| 802 | 523 | private function activate_license( $license ) { |
| 803 | 524 | $this->set_license( $license ); |
| 804 | 525 | $this->license = $license; |
| 805 | 526 | |
| 806 | - $this->die_if_not_allowed(); | |
| 807 | - | |
| 808 | 527 | $response = $this->get_license_status(); |
| 809 | 528 | $response['message'] = ''; |
| 810 | 529 | $response['success'] = false; |
| 811 | 530 | |
| @@ -812,9 +531,8 @@ | ||
| 812 | 531 | if ( $response['error'] ) { |
| 813 | 532 | $response['message'] = $response['status']; |
| 814 | 533 | } else { |
| 815 | 534 | $messages = $this->get_messages(); |
| 816 | - | |
| 817 | 535 | if ( is_string( $response['status'] ) && isset( $messages[ $response['status'] ] ) ) { |
| 818 | 536 | $response['message'] = $messages[ $response['status'] ]; |
| 819 | 537 | } else { |
| 820 | 538 | $response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) ); |
| @@ -820,53 +538,26 @@ | ||
| 820 | 538 | $response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) ); |
| 821 | 539 | } |
| 822 | 540 | |
| 823 | 541 | $is_valid = false; |
| 824 | - | |
| 825 | 542 | if ( 'valid' === $response['status'] ) { |
| 826 | 543 | $is_valid = 'valid'; |
| 827 | 544 | $response['success'] = true; |
| 828 | 545 | } |
| 829 | - $this->maybe_set_active( $is_valid ); | |
| 546 | + $this->set_active( $is_valid ); | |
| 830 | 547 | } |
| 831 | 548 | |
| 832 | - $this->update_last_checked(); | |
| 833 | - | |
| 834 | 549 | return $response; |
| 835 | 550 | } |
| 836 | 551 | |
| 837 | - /** | |
| 838 | - * Prevent this check from happening more than once per minute with the same license. | |
| 839 | - * | |
| 840 | - * @return void | |
| 841 | - */ | |
| 842 | - private function die_if_not_allowed() { | |
| 843 | - if ( ! $this->checked_recently( '2 minutes' ) ) { | |
| 844 | - return; | |
| 845 | - } | |
| 846 | - | |
| 847 | - // Don't check more than once per minute. | |
| 848 | - wp_send_json( | |
| 849 | - array( | |
| 850 | - 'message' => __( 'Please wait two minutes before trying again.', 'formidable' ), | |
| 851 | - 'success' => false, | |
| 852 | - ) | |
| 853 | - ); | |
| 854 | - } | |
| 855 | - | |
| 856 | - /** | |
| 857 | - * @return array | |
| 858 | - */ | |
| 859 | 552 | private function get_license_status() { |
| 860 | - $this->set_running(); | |
| 861 | - | |
| 862 | 553 | $response = array( |
| 863 | 554 | 'status' => 'missing', |
| 864 | 555 | 'error' => true, |
| 865 | 556 | ); |
| 866 | - | |
| 867 | 557 | if ( empty( $this->license ) ) { |
| 868 | 558 | $response['error'] = false; |
| 559 | + | |
| 869 | 560 | return $response; |
| 870 | 561 | } |
| 871 | 562 | |
| 872 | 563 | try { |
| @@ -874,11 +565,10 @@ | ||
| 874 | 565 | $license_data = $this->send_mothership_request( 'activate_license' ); |
| 875 | 566 | |
| 876 | 567 | // $license_data->license will be either "valid" or "invalid" |
| 877 | 568 | if ( is_array( $license_data ) ) { |
| 878 | - if ( ! empty( $license_data['license'] ) && in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) { | |
| 879 | - $response['status'] = $license_data['license']; | |
| 880 | - $this->save_status['status'] = $license_data['license']; | |
| 569 | + if ( in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) { | |
| 570 | + $response['status'] = $license_data['license']; | |
| 881 | 571 | } |
| 882 | 572 | } else { |
| 883 | 573 | $response['status'] = $license_data; |
| 884 | 574 | } |
| @@ -885,16 +575,11 @@ | ||
| 885 | 575 | } catch ( Exception $e ) { |
| 886 | 576 | $response['status'] = $e->getMessage(); |
| 887 | 577 | } |
| 888 | 578 | |
| 889 | - $this->update_last_checked(); | |
| 890 | - $this->done_running(); | |
| 891 | 579 | return $response; |
| 892 | 580 | } |
| 893 | 581 | |
| 894 | - /** | |
| 895 | - * @return array | |
| 896 | - */ | |
| 897 | 582 | private function get_messages() { |
| 898 | 583 | return array( |
| 899 | 584 | 'valid' => __( 'Your license has been activated. Enjoy!', 'formidable' ), |
| 900 | 585 | 'invalid' => __( 'That license key is invalid', 'formidable' ), |
| @@ -907,10 +592,8 @@ | ||
| 907 | 592 | } |
| 908 | 593 | |
| 909 | 594 | /** |
| 910 | 595 | * @since 4.03 |
| 911 | - * | |
| 912 | - * @return void | |
| 913 | 596 | */ |
| 914 | 597 | public static function reset_cache() { |
| 915 | 598 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 916 | 599 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -922,14 +605,12 @@ | ||
| 922 | 605 | 'success' => true, |
| 923 | 606 | 'message' => __( 'Cache cleared', 'formidable' ), |
| 924 | 607 | ); |
| 925 | 608 | |
| 926 | - wp_send_json( $response ); | |
| 609 | + echo json_encode( $response ); | |
| 610 | + wp_die(); | |
| 927 | 611 | } |
| 928 | 612 | |
| 929 | - /** | |
| 930 | - * @return void | |
| 931 | - */ | |
| 932 | 613 | public static function deactivate() { |
| 933 | 614 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 934 | 615 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 935 | 616 | |
| @@ -938,13 +619,11 @@ | ||
| 938 | 619 | $response = array( |
| 939 | 620 | 'success' => false, |
| 940 | 621 | 'message' => '', |
| 941 | 622 | ); |
| 942 | - | |
| 943 | 623 | try { |
| 944 | 624 | // $license_data->license will be either "deactivated" or "failed" |
| 945 | 625 | $license_data = $this_plugin->send_mothership_request( 'deactivate_license' ); |
| 946 | - | |
| 947 | 626 | if ( is_array( $license_data ) && 'deactivated' === $license_data['license'] ) { |
| 948 | 627 | $response['success'] = true; |
| 949 | 628 | $response['message'] = __( 'That license was removed successfully', 'formidable' ); |
| 950 | 629 | } else { |
| @@ -954,17 +633,15 @@ | ||
| 954 | 633 | $response['message'] = $e->getMessage(); |
| 955 | 634 | } |
| 956 | 635 | |
| 957 | 636 | $this_plugin->clear_license(); |
| 958 | - FrmInbox::clear_cache(); | |
| 959 | 637 | |
| 960 | - wp_send_json( $response ); | |
| 638 | + echo json_encode( $response ); | |
| 639 | + wp_die(); | |
| 961 | 640 | } |
| 962 | 641 | |
| 963 | 642 | /** |
| 964 | 643 | * @since 4.03 |
| 965 | - * | |
| 966 | - * @return FrmAddon | |
| 967 | 644 | */ |
| 968 | 645 | private static function set_license_from_post() { |
| 969 | 646 | $plugin_slug = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 970 | 647 | $this_plugin = self::get_addon( $plugin_slug ); |
| @@ -972,13 +649,8 @@ | ||
| 972 | 649 | $this_plugin->license = $license; |
| 973 | 650 | return $this_plugin; |
| 974 | 651 | } |
| 975 | 652 | |
| 976 | - /** | |
| 977 | - * @param string $action | |
| 978 | - * | |
| 979 | - * @return string | |
| 980 | - */ | |
| 981 | 653 | public function send_mothership_request( $action ) { |
| 982 | 654 | $api_params = array( |
| 983 | 655 | 'edd_action' => $action, |
| 984 | 656 | 'license' => $this->license, |
| @@ -983,9 +655,8 @@ | ||
| 983 | 655 | 'edd_action' => $action, |
| 984 | 656 | 'license' => $this->license, |
| 985 | 657 | 'url' => home_url(), |
| 986 | 658 | ); |
| 987 | - | |
| 988 | 659 | if ( is_numeric( $this->download_id ) ) { |
| 989 | 660 | $api_params['item_id'] = absint( $this->download_id ); |
| 990 | 661 | } else { |
| 991 | 662 | $api_params['item_name'] = rawurlencode( $this->plugin_name ); |
| @@ -996,47 +667,36 @@ | ||
| 996 | 667 | 'timeout' => 25, |
| 997 | 668 | 'user-agent' => $this->plugin_slug . '/' . $this->version . '; ' . get_bloginfo( 'url' ), |
| 998 | 669 | ); |
| 999 | 670 | |
| 1000 | - $resp = wp_remote_post( | |
| 1001 | - $this->store_url . '?l=' . urlencode( base64_encode( $this->license ) ), | |
| 1002 | - $arg_array | |
| 1003 | - ); | |
| 1004 | - $body = wp_remote_retrieve_body( $resp ); | |
| 1005 | - $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 ); | |
| 1006 | 673 | |
| 1007 | 674 | $message = __( 'Your License Key was invalid', 'formidable' ); |
| 1008 | - | |
| 1009 | 675 | if ( is_wp_error( $resp ) ) { |
| 1010 | 676 | $link = FrmAppHelper::admin_upgrade_link( 'api', 'knowledgebase/why-cant-i-activate-formidable-pro/' ); |
| 1011 | 677 | /* translators: %1$s: Start link HTML, %2$s: End link HTML */ |
| 1012 | - $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>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 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>' ); | |
| 1013 | 679 | $message .= ' ' . $resp->get_error_message(); |
| 1014 | 680 | } elseif ( 'error' === $body || is_wp_error( $body ) ) { |
| 1015 | 681 | $message = __( 'You had an HTTP error connecting to the Formidable API', 'formidable' ); |
| 1016 | 682 | } else { |
| 1017 | 683 | $json_res = json_decode( $body, true ); |
| 1018 | - | |
| 1019 | 684 | if ( null !== $json_res ) { |
| 1020 | - $message = is_array( $json_res ) && isset( $json_res['error'] ) ? $json_res['error'] : $json_res; | |
| 1021 | - } elseif ( ! empty( $resp['response'] ) && ! empty( $resp['response']['code'] ) ) { | |
| 1022 | - $resp['body'] = wp_strip_all_tags( $resp['body'] ); | |
| 1023 | - | |
| 1024 | - $message = sprintf( | |
| 1025 | - /* translators: %1$s: Error code, %2$s: Error message */ | |
| 1026 | - esc_html__( 'There was a %1$s error: %2$s', 'formidable' ), | |
| 1027 | - esc_html( $resp['response']['code'] ), | |
| 1028 | - $resp['response']['message'] . ' ' . $resp['body'] | |
| 1029 | - ); | |
| 685 | + if ( is_array( $json_res ) && isset( $json_res['error'] ) ) { | |
| 686 | + $message = $json_res['error']; | |
| 687 | + } else { | |
| 688 | + $message = $json_res; | |
| 689 | + } | |
| 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'] ); | |
| 1030 | 693 | } |
| 1031 | - }//end if | |
| 694 | + } | |
| 1032 | 695 | |
| 1033 | 696 | return $message; |
| 1034 | 697 | } |
| 1035 | 698 | |
| 1036 | - /** | |
| 1037 | - * @return void | |
| 1038 | - */ | |
| 1039 | 699 | public function manually_queue_update() { |
| 1040 | 700 | $updates = new stdClass(); |
| 1041 | 701 | $updates->last_checked = 0; |
| 1042 | 702 | $updates->response = array(); |
| @@ -1043,46 +703,6 @@ | ||
| 1043 | 703 | $updates->translations = array(); |
| 1044 | 704 | $updates->no_update = array(); |
| 1045 | 705 | $updates->checked = array(); |
| 1046 | 706 | set_site_transient( 'update_plugins', $updates ); |
| 1047 | - } | |
| 1048 | - | |
| 1049 | - /** | |
| 1050 | - * Set the transient key for the lock. It should be unique to the license. | |
| 1051 | - * | |
| 1052 | - * @since 6.8.3 | |
| 1053 | - * | |
| 1054 | - * @return bool | |
| 1055 | - */ | |
| 1056 | - protected function lock_key() { | |
| 1057 | - return $this->transient_lock_key . '_' . $this->license; | |
| 1058 | - } | |
| 1059 | - | |
| 1060 | - /** | |
| 1061 | - * Prevent multiple requests from running at the same time. | |
| 1062 | - * | |
| 1063 | - * @since 6.8.3 | |
| 1064 | - * | |
| 1065 | - * @return bool | |
| 1066 | - */ | |
| 1067 | - protected function is_running() { | |
| 1068 | - return get_transient( $this->lock_key() ); | |
| 1069 | - } | |
| 1070 | - | |
| 1071 | - /** | |
| 1072 | - * @since 6.8.3 | |
| 1073 | - * | |
| 1074 | - * @return void | |
| 1075 | - */ | |
| 1076 | - protected function set_running() { | |
| 1077 | - set_transient( $this->lock_key(), true, 2 * MINUTE_IN_SECONDS ); | |
| 1078 | - } | |
| 1079 | - | |
| 1080 | - /** | |
| 1081 | - * @since 6.8.3 | |
| 1082 | - * | |
| 1083 | - * @return void | |
| 1084 | - */ | |
| 1085 | - protected function done_running() { | |
| 1086 | - delete_transient( $this->lock_key() ); | |
| 1087 | 707 | } |
| 1088 | 708 | } |
