| @@ -4,144 +4,29 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | /** @phpstan-consistent-constructor */ |
| 7 | 7 | class FrmAddon { |
| 8 | - | |
| 9 | - /** | |
| 10 | - * @var string | |
| 11 | - */ | |
| 12 | 8 | public $store_url = 'https://formidableforms.com'; |
| 13 | - | |
| 14 | - /** | |
| 15 | - * @var int|string|null | |
| 16 | - */ | |
| 17 | 9 | public $download_id; |
| 18 | - | |
| 19 | - /** | |
| 20 | - * @var string|null | |
| 21 | - */ | |
| 22 | 10 | public $plugin_file; |
| 23 | - | |
| 24 | - /** | |
| 25 | - * @var string | |
| 26 | - */ | |
| 27 | 11 | public $plugin_folder; |
| 28 | - | |
| 29 | - /** | |
| 30 | - * @var string | |
| 31 | - */ | |
| 32 | 12 | public $plugin_name; |
| 33 | - | |
| 34 | - /** | |
| 35 | - * @var string | |
| 36 | - */ | |
| 37 | 13 | public $plugin_slug; |
| 38 | - | |
| 39 | - /** | |
| 40 | - * @var string | |
| 41 | - */ | |
| 42 | 14 | public $option_name; |
| 43 | - | |
| 44 | - /** | |
| 45 | - * @var string|null | |
| 46 | - */ | |
| 47 | 15 | public $version; |
| 48 | - | |
| 49 | - /** | |
| 50 | - * @var string | |
| 51 | - */ | |
| 52 | 16 | public $author = 'Strategy11'; |
| 53 | - | |
| 54 | - /** | |
| 55 | - * @var bool | |
| 56 | - */ | |
| 57 | 17 | public $is_parent_licence = false; |
| 58 | - | |
| 59 | - /** | |
| 60 | - * @var bool | |
| 61 | - */ | |
| 62 | 18 | public $needs_license = true; |
| 63 | - | |
| 64 | - /** | |
| 65 | - * @var bool | |
| 66 | - */ | |
| 67 | 19 | private $is_expired_addon = false; |
| 68 | - | |
| 69 | - /** | |
| 70 | - * @var string|null | |
| 71 | - */ | |
| 72 | 20 | public $license; |
| 73 | - | |
| 74 | - /** | |
| 75 | - * @var bool | |
| 76 | - */ | |
| 77 | 21 | protected $get_beta = false; |
| 78 | 22 | |
| 79 | - /** | |
| 80 | - * @var array|null | |
| 81 | - */ | |
| 82 | - protected $save_status; | |
| 23 | + public function __construct() { | |
| 83 | 24 | |
| 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 | - /** | |
| 112 | - * Cached for the request, since every add-on asks for the same values. | |
| 113 | - * | |
| 114 | - * @since 6.35 | |
| 115 | - * | |
| 116 | - * @var array<string,string>|null | |
| 117 | - */ | |
| 118 | - private static $lite_requirements; | |
| 119 | - | |
| 120 | - /** | |
| 121 | - * Add-ons that require more than Lite does, keyed by plugin slug. | |
| 122 | - * | |
| 123 | - * Nearly every add-on is plain PHP with no dependency of its own, so it runs anywhere Lite | |
| 124 | - * runs and Lite's own requirements describe it. The exceptions bundle a third party | |
| 125 | - * library, which sets a floor of its own. PDFs bundles Dompdf, which needs PHP 7.1. | |
| 126 | - * | |
| 127 | - * Values here are floors, never ceilings, so raising Lite's minimum still raises every | |
| 128 | - * add-on's. Keys match the names WordPress uses, requires and requires_php. | |
| 129 | - * | |
| 130 | - * @since 6.35 | |
| 131 | - * | |
| 132 | - * @var array<string,array<string,string>> | |
| 133 | - */ | |
| 134 | - private static $addon_requirements = array( | |
| 135 | - 'pdfs' => array( 'requires_php' => '7.1' ), | |
| 136 | - ); | |
| 137 | - | |
| 138 | - public function __construct() { | |
| 139 | - if ( ! $this->plugin_slug ) { | |
| 25 | + if ( empty( $this->plugin_slug ) ) { | |
| 140 | 26 | $this->plugin_slug = preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->plugin_name ) ) ); |
| 141 | 27 | } |
| 142 | - | |
| 143 | - if ( ! $this->option_name ) { | |
| 28 | + if ( empty( $this->option_name ) ) { | |
| 144 | 29 | $this->option_name = 'edd_' . $this->plugin_slug . '_license_'; |
| 145 | 30 | } |
| 146 | 31 | |
| 147 | 32 | $this->plugin_folder = plugin_basename( $this->plugin_file ); |
| @@ -150,103 +35,71 @@ | ||
| 150 | 35 | add_filter( 'frm_installed_addons', array( &$this, 'insert_installed_addon' ) ); |
| 151 | 36 | $this->edd_plugin_updater(); |
| 152 | 37 | } |
| 153 | 38 | |
| 154 | - /** | |
| 155 | - * @return void | |
| 156 | - */ | |
| 157 | 39 | public static function load_hooks() { |
| 158 | 40 | add_filter( 'frm_include_addon_page', '__return_true' ); |
| 159 | 41 | new static(); |
| 160 | 42 | } |
| 161 | 43 | |
| 162 | - /** | |
| 163 | - * @param array $plugins | |
| 164 | - * | |
| 165 | - * @return array | |
| 166 | - */ | |
| 167 | 44 | public function insert_installed_addon( $plugins ) { |
| 168 | 45 | $plugins[ $this->plugin_slug ] = $this; |
| 46 | + | |
| 169 | 47 | return $plugins; |
| 170 | 48 | } |
| 171 | 49 | |
| 172 | - /** | |
| 173 | - * @param string $plugin_slug | |
| 174 | - * | |
| 175 | - * @return false|FrmAddon | |
| 176 | - */ | |
| 177 | 50 | public static function get_addon( $plugin_slug ) { |
| 178 | 51 | $plugins = apply_filters( 'frm_installed_addons', array() ); |
| 179 | - return $plugins[ $plugin_slug ] ?? false; | |
| 52 | + $plugin = false; | |
| 53 | + if ( isset( $plugins[ $plugin_slug ] ) ) { | |
| 54 | + $plugin = $plugins[ $plugin_slug ]; | |
| 55 | + } | |
| 56 | + | |
| 57 | + return $plugin; | |
| 180 | 58 | } |
| 181 | 59 | |
| 182 | - /** | |
| 183 | - * @return void | |
| 184 | - */ | |
| 185 | 60 | public function edd_plugin_updater() { |
| 61 | + | |
| 186 | 62 | $this->is_license_revoked(); |
| 187 | 63 | $license = $this->license; |
| 188 | 64 | |
| 189 | 65 | add_action( 'after_plugin_row_' . plugin_basename( $this->plugin_file ), array( $this, 'maybe_show_license_message' ), 10, 2 ); |
| 190 | 66 | |
| 191 | - $is_addon = 'formidable/formidable.php' !== $this->plugin_folder; | |
| 67 | + if ( ! empty( $license ) ) { | |
| 192 | 68 | |
| 193 | - if ( $is_addon ) { | |
| 194 | - // Lite gets its tested and required versions from wordpress.org, add-ons have no | |
| 195 | - // such source. Added before the license check, since a site without a license | |
| 196 | - // still needs to know what its add-ons support. | |
| 197 | - add_filter( 'site_transient_update_plugins', array( $this, 'add_version_requirements' ), 20 ); | |
| 198 | - add_filter( 'plugins_api', array( $this, 'add_requirements_to_plugin_info' ), 20, 3 ); | |
| 199 | - } | |
| 69 | + if ( 'formidable/formidable.php' !== $this->plugin_folder ) { | |
| 70 | + add_filter( 'plugins_api', array( &$this, 'plugins_api_filter' ), 10, 3 ); | |
| 71 | + } | |
| 200 | 72 | |
| 201 | - if ( ! $license ) { | |
| 202 | - return; | |
| 73 | + add_filter( 'site_transient_update_plugins', array( &$this, 'clear_expired_download' ) ); | |
| 203 | 74 | } |
| 204 | - | |
| 205 | - if ( $is_addon ) { | |
| 206 | - add_filter( 'plugins_api', array( &$this, 'plugins_api_filter' ), 10, 3 ); | |
| 207 | - } | |
| 208 | - | |
| 209 | - add_filter( 'site_transient_update_plugins', array( &$this, 'clear_expired_download' ) ); | |
| 210 | 75 | } |
| 211 | 76 | |
| 212 | 77 | /** |
| 213 | - * Updates information on the "View version 6.15 details" page with custom data. | |
| 78 | + * Updates information on the "View version x.x details" page with custom data. | |
| 214 | 79 | * |
| 215 | 80 | * @uses api_request() |
| 216 | 81 | * |
| 217 | - * @param mixed $_data | |
| 218 | - * @param string $_action | |
| 219 | - * @param object|null $_args | |
| 82 | + * @param mixed $_data | |
| 83 | + * @param string $_action | |
| 84 | + * @param object $_args | |
| 220 | 85 | * |
| 221 | - * @return object Data. | |
| 86 | + * @return object $_data | |
| 222 | 87 | */ |
| 223 | 88 | public function plugins_api_filter( $_data, $_action = '', $_args = null ) { |
| 224 | - if ( $_action !== 'plugin_information' ) { | |
| 89 | + | |
| 90 | + if ( $_action != 'plugin_information' ) { | |
| 225 | 91 | return $_data; |
| 226 | 92 | } |
| 227 | 93 | |
| 228 | - if ( empty( $_args->slug ) || ! $this->is_plugin_slug( $_args->slug ) ) { | |
| 94 | + $slug = basename( $this->plugin_file, '.php' ); | |
| 95 | + $slug2 = str_replace( '/' . $slug . '.php', '', $this->plugin_folder ); | |
| 96 | + if ( empty( $_args->slug ) || ( $_args->slug != $slug && $_args->slug !== $slug2 ) ) { | |
| 229 | 97 | return $_data; |
| 230 | 98 | } |
| 231 | 99 | |
| 232 | 100 | $item_id = $this->download_id; |
| 233 | - | |
| 234 | - if ( $item_id ) { | |
| 235 | - $api = new FrmFormApi( $this->license ); | |
| 236 | - | |
| 237 | - // Force new API info so we can pull changelog data. | |
| 238 | - // Change log data is intentionally omitted from the cached API response | |
| 239 | - // To help reduce the size of the autoloaded option. | |
| 240 | - $api->force_api_request(); | |
| 241 | - $plugins = $api->get_api_info(); | |
| 242 | - | |
| 243 | - if ( $plugins ) { | |
| 244 | - $_data = $plugins[ $item_id ]; | |
| 245 | - } | |
| 246 | - } | |
| 247 | - | |
| 248 | - if ( empty( $plugins ) ) { | |
| 101 | + if ( empty( $item_id ) ) { | |
| 249 | 102 | $_data = array( |
| 250 | 103 | 'name' => $this->plugin_name, |
| 251 | 104 | 'excerpt' => '', |
| 252 | 105 | 'changelog' => 'See the full changelog at <a href="' . esc_url( $this->store_url . '/changelog/' ) . '"></a>', |
| @@ -254,8 +107,12 @@ | ||
| 254 | 107 | 'high' => '', |
| 255 | 108 | 'low' => 'https://ps.w.org/formidable/assets/banner-1544x500.png', |
| 256 | 109 | ), |
| 257 | 110 | ); |
| 111 | + } else { | |
| 112 | + $api = new FrmFormApi( $this->license ); | |
| 113 | + $plugins = $api->get_api_info(); | |
| 114 | + $_data = $plugins[ $item_id ]; | |
| 258 | 115 | } |
| 259 | 116 | |
| 260 | 117 | $_data['sections'] = array( |
| 261 | 118 | 'description' => $_data['excerpt'], |
| @@ -266,295 +123,28 @@ | ||
| 266 | 123 | |
| 267 | 124 | return (object) $_data; |
| 268 | 125 | } |
| 269 | 126 | |
| 270 | - /** | |
| 271 | - * Checks if a requested plugin_information slug refers to this plugin. | |
| 272 | - * | |
| 273 | - * Either the plugin file name or the plugin folder may be used as an add-on's slug. | |
| 274 | - * | |
| 275 | - * @since 6.35 | |
| 276 | - * | |
| 277 | - * @param string $slug The requested slug. | |
| 278 | - * | |
| 279 | - * @return bool | |
| 280 | - */ | |
| 281 | - private function is_plugin_slug( $slug ) { | |
| 282 | - $file_slug = basename( $this->plugin_file, '.php' ); | |
| 283 | - $folder_slug = str_replace( '/' . $file_slug . '.php', '', $this->plugin_folder ); | |
| 284 | - | |
| 285 | - return $slug === $file_slug || $slug === $folder_slug; | |
| 286 | - } | |
| 287 | - | |
| 288 | - /** | |
| 289 | - * Adds the versions this add-on supports to its update data. | |
| 290 | - * | |
| 291 | - * The API reports no tested or required versions, so anything reading the update transient | |
| 292 | - * has no way to tell whether an add-on has been tried with the WordPress release in use, or | |
| 293 | - * whether the site meets what the add-on needs. | |
| 294 | - * | |
| 295 | - * @since 6.35 | |
| 296 | - * | |
| 297 | - * @param mixed $transient The update_plugins site transient. | |
| 298 | - * | |
| 299 | - * @return mixed | |
| 300 | - */ | |
| 301 | - public function add_version_requirements( $transient ) { | |
| 302 | - if ( ! is_object( $transient ) ) { | |
| 303 | - return $transient; | |
| 304 | - } | |
| 305 | - | |
| 306 | - $requirements = $this->get_version_requirements(); | |
| 307 | - | |
| 308 | - if ( ! $requirements ) { | |
| 309 | - return $transient; | |
| 310 | - } | |
| 311 | - | |
| 312 | - foreach ( array( 'response', 'no_update' ) as $group ) { | |
| 313 | - $plugins = $transient->$group ?? false; | |
| 314 | - | |
| 315 | - if ( ! is_array( $plugins ) || empty( $plugins[ $this->plugin_folder ] ) ) { | |
| 316 | - continue; | |
| 317 | - } | |
| 318 | - | |
| 319 | - // The entries are objects, so this updates the transient in place. | |
| 320 | - $plugin = $plugins[ $this->plugin_folder ]; | |
| 321 | - | |
| 322 | - if ( ! is_object( $plugin ) ) { | |
| 323 | - continue; | |
| 324 | - } | |
| 325 | - | |
| 326 | - foreach ( $requirements as $key => $value ) { | |
| 327 | - if ( empty( $plugin->$key ) ) { | |
| 328 | - $plugin->$key = $value; | |
| 329 | - } | |
| 330 | - } | |
| 331 | - } | |
| 332 | - | |
| 333 | - return $transient; | |
| 334 | - } | |
| 335 | - | |
| 336 | - /** | |
| 337 | - * Adds the versions this add-on supports to its plugin information. | |
| 338 | - * | |
| 339 | - * This is where WordPress itself reads the values, for the "Compatible up to" and | |
| 340 | - * "Requires PHP" lines and the compatibility warnings in the plugin details modal. It is | |
| 341 | - * separate from plugins_api_filter because that filter is only added when a license is set. | |
| 342 | - * | |
| 343 | - * @since 6.35 | |
| 344 | - * | |
| 345 | - * @param mixed $data Plugin information from an earlier filter, or false if none. | |
| 346 | - * @param string $action The requested action. | |
| 347 | - * @param object|null $args Arguments for the request, including the slug. | |
| 348 | - * | |
| 349 | - * @return mixed | |
| 350 | - */ | |
| 351 | - public function add_requirements_to_plugin_info( $data, $action = '', $args = null ) { | |
| 352 | - if ( 'plugin_information' !== $action || empty( $args->slug ) || ! $this->is_plugin_slug( $args->slug ) ) { | |
| 353 | - return $data; | |
| 354 | - } | |
| 355 | - | |
| 356 | - $requirements = $this->get_version_requirements(); | |
| 357 | - | |
| 358 | - if ( ! $requirements ) { | |
| 359 | - return $data; | |
| 360 | - } | |
| 361 | - | |
| 362 | - $is_object = is_object( $data ) && ! is_wp_error( $data ); | |
| 363 | - | |
| 364 | - if ( ! $is_object && ! is_array( $data ) ) { | |
| 365 | - return $data; | |
| 366 | - } | |
| 367 | - | |
| 368 | - foreach ( $requirements as $key => $value ) { | |
| 369 | - if ( ! $is_object ) { | |
| 370 | - if ( empty( $data[ $key ] ) ) { | |
| 371 | - $data[ $key ] = $value; | |
| 372 | - } | |
| 373 | - continue; | |
| 374 | - } | |
| 375 | - | |
| 376 | - if ( empty( $data->$key ) ) { | |
| 377 | - $data->$key = $value; | |
| 378 | - } | |
| 379 | - } | |
| 380 | - | |
| 381 | - return $data; | |
| 382 | - } | |
| 383 | - | |
| 384 | - /** | |
| 385 | - * Gets the versions this add-on reports to WordPress. | |
| 386 | - * | |
| 387 | - * Lite's own values describe every add-on, apart from the few that bundle a library with a | |
| 388 | - * higher floor of its own. | |
| 389 | - * | |
| 390 | - * @since 6.35 | |
| 391 | - * | |
| 392 | - * @return array<string,string> Keyed by the names WordPress uses, tested, requires and requires_php. | |
| 393 | - */ | |
| 394 | - public function get_version_requirements() { | |
| 395 | - $requirements = self::get_lite_requirements(); | |
| 396 | - $addon = self::$addon_requirements[ $this->plugin_slug ] ?? array(); | |
| 397 | - | |
| 398 | - foreach ( $addon as $key => $version ) { | |
| 399 | - $is_higher = empty( $requirements[ $key ] ) || version_compare( $version, $requirements[ $key ], '>' ); | |
| 400 | - | |
| 401 | - if ( $is_higher ) { | |
| 402 | - $requirements[ $key ] = $version; | |
| 403 | - } | |
| 404 | - } | |
| 405 | - | |
| 406 | - /** | |
| 407 | - * Filters the versions a single add-on reports to WordPress. | |
| 408 | - * | |
| 409 | - * @since 6.35 | |
| 410 | - * | |
| 411 | - * @param array<string,string> $requirements Keyed by tested, requires and requires_php. | |
| 412 | - * @param string $plugin_slug The add-on's slug, for example pdfs. | |
| 413 | - */ | |
| 414 | - $requirements = apply_filters( 'frm_addon_version_requirements', $requirements, $this->plugin_slug ); | |
| 415 | - | |
| 416 | - return is_array( $requirements ) ? array_filter( $requirements ) : array(); | |
| 417 | - } | |
| 418 | - | |
| 419 | - /** | |
| 420 | - * Gets the WordPress version the add-ons report as tested. | |
| 421 | - * | |
| 422 | - * @since 6.35 | |
| 423 | - * | |
| 424 | - * @return string The tested version, or an empty string if the readme has none. | |
| 425 | - */ | |
| 426 | - public static function get_tested_wp_version() { | |
| 427 | - return self::get_lite_requirements()['tested']; | |
| 428 | - } | |
| 429 | - | |
| 430 | - /** | |
| 431 | - * Gets the versions Lite declares, which the add-ons report as their own. | |
| 432 | - * | |
| 433 | - * Read from Lite's readme, which is the same place wordpress.org reads them from, so the | |
| 434 | - * add-ons report what Lite reports without anything being added to the API. | |
| 435 | - * | |
| 436 | - * @since 6.35 | |
| 437 | - * | |
| 438 | - * @return array<string,string> Keyed by tested, requires and requires_php. Values may be empty. | |
| 439 | - */ | |
| 440 | - public static function get_lite_requirements() { | |
| 441 | - if ( null !== self::$lite_requirements ) { | |
| 442 | - return self::$lite_requirements; | |
| 443 | - } | |
| 444 | - | |
| 445 | - $headers = array( | |
| 446 | - 'tested' => 'Tested up to', | |
| 447 | - 'requires' => 'Requires at least', | |
| 448 | - 'requires_php' => 'Requires PHP', | |
| 449 | - ); | |
| 450 | - | |
| 451 | - $versions = array( | |
| 452 | - 'tested' => '', | |
| 453 | - 'requires' => '', | |
| 454 | - 'requires_php' => '', | |
| 455 | - ); | |
| 456 | - | |
| 457 | - $readme = FrmAppHelper::plugin_path() . '/readme.txt'; | |
| 458 | - | |
| 459 | - if ( is_readable( $readme ) ) { | |
| 460 | - $data = get_file_data( $readme, $headers ); | |
| 461 | - | |
| 462 | - foreach ( $versions as $key => $version ) { | |
| 463 | - $versions[ $key ] = isset( $data[ $key ] ) ? trim( $data[ $key ] ) : ''; | |
| 464 | - } | |
| 465 | - } | |
| 466 | - | |
| 467 | - /** | |
| 468 | - * Filters the versions read from Lite's readme before the add-ons report them. | |
| 469 | - * | |
| 470 | - * @since 6.35 | |
| 471 | - * | |
| 472 | - * @param array<string,string> $versions Keyed by tested, requires and requires_php. | |
| 473 | - */ | |
| 474 | - $versions = apply_filters( 'frm_lite_version_requirements', $versions ); | |
| 475 | - | |
| 476 | - if ( ! is_array( $versions ) ) { | |
| 477 | - $versions = array(); | |
| 478 | - } | |
| 479 | - | |
| 480 | - $versions['tested'] = self::expand_tested_branch( $versions['tested'] ?? '' ); | |
| 481 | - | |
| 482 | - self::$lite_requirements = $versions; | |
| 483 | - | |
| 484 | - return self::$lite_requirements; | |
| 485 | - } | |
| 486 | - | |
| 487 | - /** | |
| 488 | - * Expands a tested release branch to the release running on this site. | |
| 489 | - * | |
| 490 | - * A readme names a branch, like 7.0, while wordpress.org reports the newest release in | |
| 491 | - * that branch, like 7.0.4. The difference matters because WordPress compares the tested | |
| 492 | - * version to the current one exactly, so a site on 7.0.4 reading 7.0 is warned that the | |
| 493 | - * plugin is untested when it is not. Only versions within the tested branch are expanded, | |
| 494 | - * so a genuinely older tested version is still reported as older. | |
| 495 | - * | |
| 496 | - * @since 6.35 | |
| 497 | - * | |
| 498 | - * @param string $tested The tested version from the readme. | |
| 499 | - * | |
| 500 | - * @return string | |
| 501 | - */ | |
| 502 | - private static function expand_tested_branch( $tested ) { | |
| 503 | - if ( ! $tested ) { | |
| 504 | - return $tested; | |
| 505 | - } | |
| 506 | - | |
| 507 | - // Drop any pre-release suffix, since 7.1-RC4 is not a release to report as tested. | |
| 508 | - $current = preg_replace( '/[^0-9.].*$/', '', get_bloginfo( 'version' ) ); | |
| 509 | - | |
| 510 | - if ( self::get_version_branch( $current ) !== self::get_version_branch( $tested ) ) { | |
| 511 | - return $tested; | |
| 512 | - } | |
| 513 | - | |
| 514 | - return version_compare( $current, $tested, '>' ) ? $current : $tested; | |
| 515 | - } | |
| 516 | - | |
| 517 | - /** | |
| 518 | - * Reduces a version to its major.minor release branch. | |
| 519 | - * | |
| 520 | - * @since 6.35 | |
| 521 | - * | |
| 522 | - * @param string $version A WordPress version. | |
| 523 | - * | |
| 524 | - * @return string The branch, or an empty string if the version cannot be read. | |
| 525 | - */ | |
| 526 | - private static function get_version_branch( $version ) { | |
| 527 | - if ( ! preg_match( '/^(\d+)\.(\d+)/', $version, $matches ) ) { | |
| 528 | - return ''; | |
| 529 | - } | |
| 530 | - | |
| 531 | - return $matches[1] . '.' . $matches[2]; | |
| 532 | - } | |
| 533 | - | |
| 534 | - /** | |
| 535 | - * @return string | |
| 536 | - */ | |
| 537 | 127 | public function get_license() { |
| 538 | 128 | $license = $this->maybe_get_pro_license(); |
| 539 | - | |
| 540 | - if ( $license ) { | |
| 129 | + if ( ! empty( $license ) ) { | |
| 541 | 130 | return $license; |
| 542 | 131 | } |
| 543 | 132 | |
| 544 | 133 | $license = trim( get_option( $this->option_name . 'key' ) ); |
| 134 | + if ( empty( $license ) ) { | |
| 135 | + $license = $this->activate_defined_license(); | |
| 136 | + } | |
| 545 | 137 | |
| 546 | - return $license ? $license : $this->activate_defined_license(); | |
| 138 | + return $license; | |
| 547 | 139 | } |
| 548 | 140 | |
| 549 | 141 | /** |
| 550 | 142 | * @since 3.04.03 |
| 551 | - * | |
| 552 | - * @return false|string | |
| 553 | 143 | */ |
| 554 | 144 | protected function maybe_get_pro_license() { |
| 555 | - // Prevent a loop if $this is the pro plugin | |
| 556 | - $get_license = FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::get_updater' ) && $this->plugin_name !== 'Formidable Pro'; | |
| 145 | + // prevent a loop if $this is the pro plugin | |
| 146 | + $get_license = FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::get_updater' ) && $this->plugin_name != 'Formidable Pro'; | |
| 557 | 147 | |
| 558 | 148 | if ( ! $get_license ) { |
| 559 | 149 | return false; |
| 560 | 150 | } |
| @@ -561,16 +151,18 @@ | ||
| 561 | 151 | |
| 562 | 152 | $api = new FrmFormApi(); |
| 563 | 153 | $api->get_pro_updater(); |
| 564 | 154 | $license = $api->get_license(); |
| 565 | - | |
| 566 | - if ( ! $license ) { | |
| 155 | + if ( empty( $license ) ) { | |
| 567 | 156 | return false; |
| 568 | 157 | } |
| 569 | 158 | |
| 570 | 159 | $this->get_api_info( $license ); |
| 160 | + if ( ! $this->is_parent_licence ) { | |
| 161 | + $license = false; | |
| 162 | + } | |
| 571 | 163 | |
| 572 | - return $this->is_parent_licence ? $license : false; | |
| 164 | + return $license; | |
| 573 | 165 | } |
| 574 | 166 | |
| 575 | 167 | /** |
| 576 | 168 | * Activate the license in wp-config.php |
| @@ -575,17 +167,14 @@ | ||
| 575 | 167 | /** |
| 576 | 168 | * Activate the license in wp-config.php |
| 577 | 169 | * |
| 578 | 170 | * @since 2.04 |
| 579 | - * | |
| 580 | - * @return string | |
| 581 | 171 | */ |
| 582 | 172 | public function activate_defined_license() { |
| 583 | 173 | $license = $this->get_defined_license(); |
| 584 | - | |
| 585 | - if ( $license && ! $this->is_active() && ! $this->checked_recently( '1 day' ) ) { | |
| 174 | + if ( ! empty( $license ) && ! $this->is_active() && $this->is_time_to_auto_activate() ) { | |
| 586 | 175 | $response = $this->activate_license( $license ); |
| 587 | - | |
| 176 | + $this->set_auto_activate_time(); | |
| 588 | 177 | if ( ! $response['success'] ) { |
| 589 | 178 | $license = ''; |
| 590 | 179 | } |
| 591 | 180 | } |
| @@ -596,28 +185,35 @@ | ||
| 596 | 185 | /** |
| 597 | 186 | * Check the wp-config.php for the license key |
| 598 | 187 | * |
| 599 | 188 | * @since 2.04 |
| 600 | - * | |
| 601 | - * @return false|string | |
| 602 | 189 | */ |
| 603 | 190 | public function get_defined_license() { |
| 604 | - $constant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; | |
| 605 | - return defined( $constant_name ) ? constant( $constant_name ) : false; | |
| 191 | + $consant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; | |
| 192 | + | |
| 193 | + return defined( $consant_name ) ? constant( $consant_name ) : false; | |
| 606 | 194 | } |
| 607 | 195 | |
| 608 | - /** | |
| 609 | - * @param string $license | |
| 610 | - * | |
| 611 | - * @return void | |
| 612 | - */ | |
| 613 | 196 | public function set_license( $license ) { |
| 614 | 197 | update_option( $this->option_name . 'key', $license ); |
| 615 | 198 | } |
| 616 | 199 | |
| 617 | 200 | /** |
| 618 | - * @return mixed | |
| 201 | + * If the license is in the config, limit the frequency of checks. | |
| 202 | + * The license may be entered incorrectly, so we don't want to check on every page load. | |
| 203 | + * | |
| 204 | + * @since 2.04 | |
| 619 | 205 | */ |
| 206 | + private function is_time_to_auto_activate() { | |
| 207 | + $last_try = get_option( $this->option_name . 'last_activate' ); | |
| 208 | + | |
| 209 | + return ( ! $last_try || $last_try < strtotime( '-1 day' ) ); | |
| 210 | + } | |
| 211 | + | |
| 212 | + private function set_auto_activate_time() { | |
| 213 | + update_option( $this->option_name . 'last_activate', time() ); | |
| 214 | + } | |
| 215 | + | |
| 620 | 216 | public function is_active() { |
| 621 | 217 | return get_option( $this->option_name . 'active' ); |
| 622 | 218 | } |
| 623 | 219 | |
| @@ -623,65 +219,26 @@ | ||
| 623 | 219 | |
| 624 | 220 | /** |
| 625 | 221 | * @since 3.04.03 |
| 626 | 222 | * |
| 627 | - * @param array|string $error | |
| 628 | - * | |
| 629 | - * @return void | |
| 223 | + * @param array error | |
| 630 | 224 | */ |
| 631 | 225 | public function maybe_clear_license( $error ) { |
| 632 | - if ( is_array( $error ) && $error['code'] === 'disabled' && $error['license'] === $this->license ) { | |
| 226 | + if ( $error['code'] === 'disabled' && $error['license'] === $this->license ) { | |
| 633 | 227 | $this->clear_license(); |
| 634 | 228 | } |
| 635 | 229 | } |
| 636 | 230 | |
| 637 | - /** | |
| 638 | - * @return void | |
| 639 | - */ | |
| 640 | 231 | public function clear_license() { |
| 641 | 232 | delete_option( $this->option_name . 'active' ); |
| 642 | 233 | delete_option( $this->option_name . 'key' ); |
| 643 | - | |
| 644 | - if ( ! $this->should_clear_cache ) { | |
| 645 | - return; | |
| 646 | - } | |
| 647 | - | |
| 648 | 234 | delete_site_option( $this->transient_key() ); |
| 649 | 235 | delete_option( $this->transient_key() ); |
| 650 | 236 | $this->delete_cache(); |
| 651 | - $this->should_clear_cache = true; | |
| 652 | 237 | } |
| 653 | 238 | |
| 654 | - /** | |
| 655 | - * Don't save an invalid license. | |
| 656 | - * | |
| 657 | - * @since 6.8.3 | |
| 658 | - * | |
| 659 | - * @param bool|string $is_valid If license activation was successful. May be a string 'valid'. | |
| 660 | - * | |
| 661 | - * @return void | |
| 662 | - */ | |
| 663 | - protected function maybe_set_active( $is_valid ) { | |
| 664 | - update_option( $this->option_name . 'active', $is_valid ); | |
| 665 | - | |
| 666 | - if ( $is_valid ) { | |
| 667 | - $this->set_active( $is_valid ); | |
| 668 | - return; | |
| 669 | - } | |
| 670 | - | |
| 671 | - // Don't save the license if it's invalid. | |
| 672 | - $this->should_clear_cache = false; | |
| 673 | - $this->clear_license(); | |
| 674 | - delete_option( $this->option_name . 'key' ); | |
| 675 | - $this->license = ''; | |
| 676 | - } | |
| 677 | - | |
| 678 | - /** | |
| 679 | - * @param bool|string $is_active Value may include 'valid'. | |
| 680 | - * | |
| 681 | - * @return void | |
| 682 | - */ | |
| 683 | 239 | public function set_active( $is_active ) { |
| 240 | + update_option( $this->option_name . 'active', $is_active ); | |
| 684 | 241 | $this->delete_cache(); |
| 685 | 242 | FrmAppHelper::save_combined_js(); |
| 686 | 243 | $this->update_pro_capabilities(); |
| 687 | 244 | } |
| @@ -689,10 +246,8 @@ | ||
| 689 | 246 | /** |
| 690 | 247 | * Updates roles capabilities after pro license is active. |
| 691 | 248 | * |
| 692 | 249 | * @since 5.0 |
| 693 | - * | |
| 694 | - * @return void | |
| 695 | 250 | */ |
| 696 | 251 | protected function update_pro_capabilities() { |
| 697 | 252 | global $wp_roles; |
| 698 | 253 | |
| @@ -702,19 +257,18 @@ | ||
| 702 | 257 | |
| 703 | 258 | $caps = FrmAppHelper::frm_capabilities( 'pro_only' ); |
| 704 | 259 | $roles = get_editable_roles(); |
| 705 | 260 | $settings = new FrmSettings(); |
| 706 | - | |
| 707 | 261 | foreach ( $caps as $cap => $cap_desc ) { |
| 708 | - $cap_roles = (array) ( $settings->$cap ?? 'administrator' ); | |
| 262 | + $cap_roles = (array) ( isset( $settings->$cap ) ? $settings->$cap : 'administrator' ); | |
| 709 | 263 | |
| 710 | 264 | // Make sure administrators always have permissions. |
| 711 | - if ( ! in_array( 'administrator', $cap_roles, true ) ) { | |
| 265 | + if ( ! in_array( 'administrator', $cap_roles ) ) { | |
| 712 | 266 | array_push( $cap_roles, 'administrator' ); |
| 713 | 267 | } |
| 714 | 268 | |
| 715 | 269 | foreach ( $roles as $role => $details ) { |
| 716 | - if ( in_array( $role, $cap_roles, true ) ) { | |
| 270 | + if ( in_array( $role, $cap_roles ) ) { | |
| 717 | 271 | $wp_roles->add_cap( $role, $cap ); |
| 718 | 272 | } else { |
| 719 | 273 | $wp_roles->remove_cap( $role, $cap ); |
| 720 | 274 | } |
| @@ -723,17 +277,12 @@ | ||
| 723 | 277 | } |
| 724 | 278 | |
| 725 | 279 | /** |
| 726 | 280 | * @since 3.04.03 |
| 727 | - * | |
| 728 | - * @return void | |
| 729 | 281 | */ |
| 730 | 282 | protected function delete_cache() { |
| 731 | 283 | delete_transient( 'frm_api_licence' ); |
| 732 | 284 | |
| 733 | - // Cleanup option that has been removed. | |
| 734 | - delete_option( $this->option_name . 'last_activate' ); | |
| 735 | - | |
| 736 | 285 | $api = new FrmFormApi( $this->license ); |
| 737 | 286 | $api->reset_cached(); |
| 738 | 287 | |
| 739 | 288 | $api = new FrmFormTemplateApi( $this->license ); |
| @@ -740,20 +289,8 @@ | ||
| 740 | 289 | $api->reset_cached(); |
| 741 | 290 | |
| 742 | 291 | $api = new FrmApplicationApi( $this->license ); |
| 743 | 292 | $api->reset_cached(); |
| 744 | - | |
| 745 | - // The Sales API tries to pull API data in the constructor. | |
| 746 | - // But we do not need sales data here. | |
| 747 | - FrmSalesApi::prevent_new_sales_requests(); | |
| 748 | - | |
| 749 | - $api = new FrmSalesApi(); | |
| 750 | - $api->reset_cached(); | |
| 751 | - | |
| 752 | - FrmSalesApi::allow_new_sales_requests(); | |
| 753 | - | |
| 754 | - $api = new FrmStyleApi(); | |
| 755 | - $api->reset_cached(); | |
| 756 | 293 | } |
| 757 | 294 | |
| 758 | 295 | /** |
| 759 | 296 | * The Pro version includes the show_license_message function. |
| @@ -759,17 +296,12 @@ | ||
| 759 | 296 | * The Pro version includes the show_license_message function. |
| 760 | 297 | * We need an extra check before we allow it to show a message. |
| 761 | 298 | * |
| 762 | 299 | * @since 3.04.03 |
| 763 | - * | |
| 764 | - * @param string $file File path of the plugin. | |
| 765 | - * @param array $plugin Plugin data. | |
| 766 | - * | |
| 767 | - * @return void | |
| 768 | 300 | */ |
| 769 | 301 | public function maybe_show_license_message( $file, $plugin ) { |
| 770 | 302 | if ( $this->is_expired_addon || isset( $plugin['package'] ) ) { |
| 771 | - // Let's not show a ton of duplicate messages | |
| 303 | + // let's not show a ton of duplicate messages | |
| 772 | 304 | return; |
| 773 | 305 | } |
| 774 | 306 | |
| 775 | 307 | $this->show_license_message( $file, $plugin ); |
| @@ -774,30 +306,22 @@ | ||
| 774 | 306 | |
| 775 | 307 | $this->show_license_message( $file, $plugin ); |
| 776 | 308 | } |
| 777 | 309 | |
| 778 | - /** | |
| 779 | - * @param string $file File path of the plugin. | |
| 780 | - * @param array $plugin Plugin data. | |
| 781 | - * | |
| 782 | - * @return void | |
| 783 | - */ | |
| 784 | 310 | public function show_license_message( $file, $plugin ) { |
| 785 | 311 | $message = ''; |
| 786 | - | |
| 787 | - if ( $this->license ) { | |
| 312 | + if ( empty( $this->license ) ) { | |
| 313 | + /* translators: %1$s: Plugin name, %2$s: Start link HTML, %3$s: end link HTML */ | |
| 314 | + $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>' ); | |
| 315 | + } else { | |
| 788 | 316 | $api = new FrmFormApi( $this->license ); |
| 789 | 317 | $errors = $api->error_for_license(); |
| 790 | - | |
| 791 | - if ( $errors ) { | |
| 318 | + if ( ! empty( $errors ) ) { | |
| 792 | 319 | $message = reset( $errors ); |
| 793 | 320 | } |
| 794 | - } else { | |
| 795 | - /* translators: %1$s: Plugin name, %2$s: Start link HTML, %3$s: end link HTML */ | |
| 796 | - $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 | |
| 797 | 321 | } |
| 798 | 322 | |
| 799 | - if ( ! $message ) { | |
| 323 | + if ( empty( $message ) ) { | |
| 800 | 324 | return; |
| 801 | 325 | } |
| 802 | 326 | |
| 803 | 327 | $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
| @@ -802,19 +326,14 @@ | ||
| 802 | 326 | |
| 803 | 327 | $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' ); |
| 804 | 328 | $id = sanitize_title( $plugin['Name'] ) . '-next'; |
| 805 | 329 | |
| 806 | - 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 | |
| 807 | - FrmAppHelper::kses_echo( $message, 'a' ); | |
| 808 | - 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 | |
| 330 | + 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>'; | |
| 331 | + echo FrmAppHelper::kses( $message, 'a' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 332 | + echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '").previousSibling;if ( d !== null ){ d.className = d.className + " update"; }</script>'; | |
| 809 | 333 | echo '</p></div></td></tr>'; |
| 810 | 334 | } |
| 811 | 335 | |
| 812 | - /** | |
| 813 | - * @param mixed $transient | |
| 814 | - * | |
| 815 | - * @return mixed | |
| 816 | - */ | |
| 817 | 336 | public function clear_expired_download( $transient ) { |
| 818 | 337 | if ( ! is_object( $transient ) ) { |
| 819 | 338 | return $transient; |
| 820 | 339 | } |
| @@ -819,9 +338,9 @@ | ||
| 819 | 338 | return $transient; |
| 820 | 339 | } |
| 821 | 340 | |
| 822 | 341 | if ( $this->is_current_version( $transient ) ) { |
| 823 | - // Make sure it doesn't show there is an update if plugin is up-to-date. | |
| 342 | + //make sure it doesn't show there is an update if plugin is up-to-date | |
| 824 | 343 | if ( isset( $transient->response[ $this->plugin_folder ] ) ) { |
| 825 | 344 | unset( $transient->response[ $this->plugin_folder ] ); |
| 826 | 345 | } |
| 827 | 346 | } elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) { |
| @@ -826,9 +345,9 @@ | ||
| 826 | 345 | } |
| 827 | 346 | } elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) { |
| 828 | 347 | $this->prepare_update_details( $transient->response[ $this->plugin_folder ] ); |
| 829 | 348 | |
| 830 | - // If the transient has expired, clear the update and trigger it again | |
| 349 | + // if the transient has expired, clear the update and trigger it again | |
| 831 | 350 | if ( $transient->response[ $this->plugin_folder ] === false ) { |
| 832 | 351 | if ( ! $this->has_been_cleared() ) { |
| 833 | 352 | $this->cleared_plugins(); |
| 834 | 353 | $this->manually_queue_update(); |
| @@ -844,38 +363,29 @@ | ||
| 844 | 363 | * Check if the plugin information is correct to allow an update |
| 845 | 364 | * |
| 846 | 365 | * @since 3.04.03 |
| 847 | 366 | * |
| 848 | - * @param object $transient The current plugin info saved for update. | |
| 849 | - * | |
| 850 | - * @return void | |
| 367 | + * @param object $transient - the current plugin info saved for update | |
| 851 | 368 | */ |
| 852 | 369 | private function prepare_update_details( &$transient ) { |
| 853 | 370 | $version_info = $transient; |
| 854 | - $has_beta_url = ! empty( $version_info->beta ); | |
| 855 | - | |
| 371 | + $has_beta_url = isset( $version_info->beta ) && ! empty( $version_info->beta ); | |
| 856 | 372 | if ( $this->get_beta && ! $has_beta_url ) { |
| 857 | 373 | $version_info = (object) $this->get_api_info( $this->license ); |
| 858 | 374 | } |
| 859 | 375 | |
| 860 | - if ( empty( $version_info->new_version ) ) { | |
| 861 | - return; | |
| 862 | - } | |
| 376 | + if ( isset( $version_info->new_version ) && ! empty( $version_info->new_version ) ) { | |
| 377 | + $this->clear_old_plugin_version( $version_info ); | |
| 378 | + if ( $version_info === false ) { // was cleared with timeout | |
| 379 | + $transient = false; | |
| 380 | + } else { | |
| 381 | + $this->maybe_use_beta_url( $version_info ); | |
| 863 | 382 | |
| 864 | - $this->clear_old_plugin_version( $version_info ); | |
| 865 | - | |
| 866 | - if ( $version_info === false ) { | |
| 867 | - // Was cleared with timeout. | |
| 868 | - $transient = false; | |
| 869 | - | |
| 870 | - return; | |
| 383 | + if ( version_compare( $version_info->new_version, $this->version, '>' ) ) { | |
| 384 | + $transient = $version_info; | |
| 385 | + } | |
| 386 | + } | |
| 871 | 387 | } |
| 872 | - | |
| 873 | - $this->maybe_use_beta_url( $version_info ); | |
| 874 | - | |
| 875 | - if ( version_compare( $version_info->new_version, $this->version, '>' ) ) { | |
| 876 | - $transient = $version_info; | |
| 877 | - } | |
| 878 | 388 | } |
| 879 | 389 | |
| 880 | 390 | /** |
| 881 | 391 | * Get the API info for this plugin |
| @@ -880,22 +390,18 @@ | ||
| 880 | 390 | /** |
| 881 | 391 | * Get the API info for this plugin |
| 882 | 392 | * |
| 883 | 393 | * @since 3.04.03 |
| 884 | - * | |
| 885 | - * @param string $license The license key. | |
| 886 | - * | |
| 887 | - * @return array The API info for the plugin. | |
| 888 | 394 | */ |
| 889 | 395 | protected function get_api_info( $license ) { |
| 890 | 396 | $api = new FrmFormApi( $license ); |
| 891 | 397 | $addon = $api->get_addon_for_license( $this ); |
| 892 | 398 | |
| 893 | - // If there is no download url, this license does not apply to the addon | |
| 399 | + // if there is no download url, this license does not apply to the addon | |
| 894 | 400 | if ( isset( $addon['package'] ) ) { |
| 895 | 401 | $this->is_parent_licence = true; |
| 896 | 402 | } elseif ( isset( $addon['error'] ) ) { |
| 897 | - // If the license is expired, we must assume all add-ons were packaged | |
| 403 | + // if the license is expired, we must assume all add-ons were packaged | |
| 898 | 404 | $this->is_parent_licence = true; |
| 899 | 405 | $this->is_expired_addon = true; |
| 900 | 406 | } |
| 901 | 407 | |
| @@ -906,24 +412,16 @@ | ||
| 906 | 412 | * Make sure transients don't stick around on sites that |
| 907 | 413 | * don't save the transient expiration |
| 908 | 414 | * |
| 909 | 415 | * @since 2.05.05 |
| 910 | - * | |
| 911 | - * @param object $version_info The version info for the plugin. | |
| 912 | - * | |
| 913 | - * @return void | |
| 914 | 416 | */ |
| 915 | 417 | private function clear_old_plugin_version( &$version_info ) { |
| 916 | - $timeout = ! empty( $version_info->timeout ) ? $version_info->timeout : 0; | |
| 917 | - | |
| 918 | - if ( ! $timeout || time() <= $timeout ) { | |
| 919 | - return; | |
| 418 | + $timeout = ( isset( $version_info->timeout ) && ! empty( $version_info->timeout ) ) ? $version_info->timeout : 0; | |
| 419 | + if ( ! empty( $timeout ) && time() > $timeout ) { | |
| 420 | + $version_info = false; // Cache is expired | |
| 421 | + $api = new FrmFormApi( $this->license ); | |
| 422 | + $api->reset_cached(); | |
| 920 | 423 | } |
| 921 | - | |
| 922 | - // Cache is expired. | |
| 923 | - $version_info = false; | |
| 924 | - $api = new FrmFormApi( $this->license ); | |
| 925 | - $api->reset_cached(); | |
| 926 | 424 | } |
| 927 | 425 | |
| 928 | 426 | /** |
| 929 | 427 | * The beta url is always included if the download has a beta. |
| @@ -929,189 +427,89 @@ | ||
| 929 | 427 | * The beta url is always included if the download has a beta. |
| 930 | 428 | * Check if the beta should be downloaded. |
| 931 | 429 | * |
| 932 | 430 | * @since 3.04.03 |
| 933 | - * | |
| 934 | - * @param object $version_info The version info for the plugin. | |
| 935 | - * | |
| 936 | - * @return void | |
| 937 | 431 | */ |
| 938 | 432 | private function maybe_use_beta_url( &$version_info ) { |
| 939 | - if ( ! $this->get_beta || empty( $version_info->beta ) ) { | |
| 940 | - return; | |
| 433 | + if ( $this->get_beta && isset( $version_info->beta ) && ! empty( $version_info->beta ) ) { | |
| 434 | + $version_info->new_version = $version_info->beta['version']; | |
| 435 | + $version_info->package = $version_info->beta['package']; | |
| 436 | + if ( isset( $version_info->plugin ) && ! empty( $version_info->plugin ) ) { | |
| 437 | + $version_info->plugin = $version_info->beta['plugin']; | |
| 438 | + } | |
| 941 | 439 | } |
| 942 | - | |
| 943 | - $version_info->new_version = $version_info->beta['version']; | |
| 944 | - $version_info->package = $version_info->beta['package']; | |
| 945 | - | |
| 946 | - if ( ! empty( $version_info->plugin ) ) { | |
| 947 | - $version_info->plugin = $version_info->beta['plugin']; | |
| 948 | - } | |
| 949 | 440 | } |
| 950 | 441 | |
| 951 | - /** | |
| 952 | - * @param object $transient | |
| 953 | - * | |
| 954 | - * @return bool | |
| 955 | - */ | |
| 956 | 442 | private function is_current_version( $transient ) { |
| 957 | 443 | if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) { |
| 958 | 444 | return false; |
| 959 | 445 | } |
| 960 | 446 | |
| 961 | - $response = empty( $transient->response ); | |
| 962 | - | |
| 447 | + $response = ! isset( $transient->response ) || empty( $transient->response ); | |
| 963 | 448 | if ( $response ) { |
| 964 | 449 | return true; |
| 965 | 450 | } |
| 966 | 451 | |
| 967 | - 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 | |
| 452 | + return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version; | |
| 968 | 453 | } |
| 969 | 454 | |
| 970 | - /** | |
| 971 | - * @return bool | |
| 972 | - */ | |
| 973 | 455 | private function has_been_cleared() { |
| 974 | 456 | $last_cleared = get_option( 'frm_last_cleared' ); |
| 975 | - return $last_cleared && $last_cleared > gmdate( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) ); | |
| 457 | + | |
| 458 | + return ( $last_cleared && $last_cleared > gmdate( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) ) ); | |
| 976 | 459 | } |
| 977 | 460 | |
| 978 | - /** | |
| 979 | - * @return void | |
| 980 | - */ | |
| 981 | 461 | private function cleared_plugins() { |
| 982 | 462 | update_option( 'frm_last_cleared', gmdate( 'Y-m-d H:i:s' ) ); |
| 983 | 463 | } |
| 984 | 464 | |
| 985 | - /** | |
| 986 | - * @return void | |
| 987 | - */ | |
| 988 | 465 | private function is_license_revoked() { |
| 989 | - if ( ! $this->license || ! $this->plugin_slug || isset( $_POST['license'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 466 | + if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 990 | 467 | return; |
| 991 | 468 | } |
| 992 | 469 | |
| 993 | - if ( $this->get_defined_license() ) { | |
| 994 | - // Don't check if the license is defined in wp-config.php since we can't remove it. | |
| 995 | - return; | |
| 470 | + if ( is_multisite() ) { | |
| 471 | + $last_checked = get_site_option( $this->transient_key() ); | |
| 472 | + } else { | |
| 473 | + $last_checked = get_option( $this->transient_key() ); | |
| 996 | 474 | } |
| 997 | 475 | |
| 998 | - // Only check weekly. | |
| 999 | - if ( $this->checked_recently( '7 days' ) || $this->is_running() ) { | |
| 1000 | - return; | |
| 1001 | - } | |
| 476 | + $seven_days_ago = gmdate( 'Y-m-d H:i:s', strtotime( '-7 days' ) ); | |
| 1002 | 477 | |
| 1003 | - $response = $this->get_license_status(); | |
| 478 | + if ( ! $last_checked || $last_checked < $seven_days_ago ) { | |
| 479 | + // check weekly | |
| 480 | + if ( is_multisite() ) { | |
| 481 | + update_site_option( $this->transient_key(), gmdate( 'Y-m-d H:i:s' ) ); | |
| 482 | + } else { | |
| 483 | + update_option( $this->transient_key(), gmdate( 'Y-m-d H:i:s' ) ); | |
| 484 | + } | |
| 1004 | 485 | |
| 1005 | - if ( ! empty( $this->save_status['response_code'] ) && 429 === $this->save_status['response_code'] ) { | |
| 1006 | - // If we got a rate limit response, don't clear the license. | |
| 1007 | - return; | |
| 1008 | - } | |
| 1009 | - | |
| 1010 | - if ( 'revoked' === $response['status'] || 'blocked' === $response['status'] || 'disabled' === $response['status'] || 'missing' === $response['status'] ) { | |
| 1011 | - $this->clear_license(); | |
| 1012 | - } | |
| 1013 | - } | |
| 1014 | - | |
| 1015 | - /** | |
| 1016 | - * Has this been checked too recently? | |
| 1017 | - * | |
| 1018 | - * @param string $time ie. '1 day'. | |
| 1019 | - * | |
| 1020 | - * @return bool True if the last check time was recent. | |
| 1021 | - */ | |
| 1022 | - private function checked_recently( $time ) { | |
| 1023 | - $last_checked = $this->last_checked(); | |
| 1024 | - | |
| 1025 | - if ( ! $last_checked ) { | |
| 1026 | - return false; | |
| 1027 | - } | |
| 1028 | - | |
| 1029 | - $is_429 = isset( $last_checked['response_code'] ) && 429 === $last_checked['response_code']; | |
| 1030 | - | |
| 1031 | - // If the last check was a a rate limit error, adjust the check time. | |
| 1032 | - if ( $is_429 ) { | |
| 1033 | - // If the time is 2 minutes, do not adjust it so people | |
| 1034 | - // can still try to activate again in 2 minutes (and not 5). | |
| 1035 | - switch ( $time ) { | |
| 1036 | - case '7 days': | |
| 1037 | - // 7 days is used to check for license revocation. | |
| 1038 | - $time = '30 minutes'; | |
| 1039 | - break; | |
| 1040 | - case '1 day': | |
| 1041 | - // 1 day is used for defined license constants. | |
| 1042 | - // The response won't change often, so we can check less frequently. | |
| 1043 | - $time = '2 hours'; | |
| 1044 | - break; | |
| 486 | + $response = $this->get_license_status(); | |
| 487 | + if ( 'revoked' === $response['status'] || 'blocked' === $response['status'] || 'disabled' === $response['status'] || 'missing' === $response['status'] ) { | |
| 488 | + $this->clear_license(); | |
| 1045 | 489 | } |
| 1046 | 490 | } |
| 1047 | - | |
| 1048 | - if ( empty( $last_checked['time'] ) ) { | |
| 1049 | - // If we do not have time, data is really old. | |
| 1050 | - return false; | |
| 1051 | - } | |
| 1052 | - | |
| 1053 | - $time_ago = gmdate( 'Y-m-d H:i:s', strtotime( '-' . $time ) ); | |
| 1054 | - return $last_checked['time'] > $time_ago; | |
| 1055 | 491 | } |
| 1056 | 492 | |
| 1057 | 493 | /** |
| 1058 | - * @since 6.8.3 Switched to an array to store extra response info. | |
| 1059 | - * | |
| 1060 | - * @return array | |
| 1061 | - */ | |
| 1062 | - private function last_checked() { | |
| 1063 | - $last_checked = is_multisite() ? get_site_option( $this->transient_key() ) : get_option( $this->transient_key() ); | |
| 1064 | - | |
| 1065 | - if ( $last_checked && ! is_array( $last_checked ) ) { | |
| 1066 | - // Get string into array for existing values. | |
| 1067 | - $last_checked = array( 'time' => $last_checked ); | |
| 1068 | - } | |
| 1069 | - | |
| 1070 | - return $last_checked ? $last_checked : array(); | |
| 1071 | - } | |
| 1072 | - | |
| 1073 | - /** | |
| 1074 | - * @since 6.30 Added the $is_valid param. | |
| 1075 | - * | |
| 1076 | - * @param bool $is_valid | |
| 1077 | - * | |
| 1078 | - * @return void | |
| 1079 | - */ | |
| 1080 | - private function update_last_checked( $is_valid ) { | |
| 1081 | - $this->save_response['time'] = gmdate( 'Y-m-d H:i:s' ); | |
| 1082 | - $this->save_response['is_valid'] = $is_valid; | |
| 1083 | - | |
| 1084 | - if ( is_multisite() ) { | |
| 1085 | - update_site_option( $this->transient_key(), $this->save_response ); | |
| 1086 | - } else { | |
| 1087 | - update_option( $this->transient_key(), $this->save_response ); | |
| 1088 | - } | |
| 1089 | - } | |
| 1090 | - | |
| 1091 | - /** | |
| 1092 | 494 | * Use a new cache after the license is changed, or Formidable is updated. |
| 1093 | - * | |
| 1094 | - * @return string | |
| 1095 | 495 | */ |
| 1096 | 496 | private function transient_key() { |
| 1097 | 497 | return 'frm_' . md5( sanitize_key( $this->license . '_' . $this->plugin_slug ) ); |
| 1098 | 498 | } |
| 1099 | 499 | |
| 1100 | - /** | |
| 1101 | - * @return void | |
| 1102 | - */ | |
| 1103 | 500 | public static function activate() { |
| 1104 | 501 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1105 | 502 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1106 | 503 | |
| 1107 | 504 | $license = stripslashes( FrmAppHelper::get_param( 'license', '', 'post', 'sanitize_text_field' ) ); |
| 1108 | - | |
| 1109 | - if ( ! $license ) { | |
| 1110 | - wp_send_json( | |
| 1111 | - array( | |
| 1112 | - 'message' => __( 'Oops! You forgot to enter your license number.', 'formidable' ), | |
| 1113 | - 'success' => false, | |
| 505 | + if ( empty( $license ) ) { | |
| 506 | + wp_die( | |
| 507 | + json_encode( | |
| 508 | + array( | |
| 509 | + 'message' => __( 'Oops! You forgot to enter your license number.', 'formidable' ), | |
| 510 | + 'success' => false, | |
| 511 | + ) | |
| 1114 | 512 | ) |
| 1115 | 513 | ); |
| 1116 | 514 | } |
| 1117 | 515 | |
| @@ -1117,20 +515,14 @@ | ||
| 1117 | 515 | |
| 1118 | 516 | $plugin_slug = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 1119 | 517 | $response = self::activate_license_for_plugin( $license, $plugin_slug ); |
| 1120 | 518 | |
| 1121 | - FrmInbox::clear_cache(); | |
| 1122 | - | |
| 1123 | - wp_send_json( $response ); | |
| 519 | + echo json_encode( $response ); | |
| 520 | + wp_die(); | |
| 1124 | 521 | } |
| 1125 | 522 | |
| 1126 | 523 | /** |
| 1127 | 524 | * @since 4.08 |
| 1128 | - * | |
| 1129 | - * @param string $license The license key. | |
| 1130 | - * @param string $plugin_slug The plugin slug. | |
| 1131 | - * | |
| 1132 | - * @return array The response from the license activation. | |
| 1133 | 525 | */ |
| 1134 | 526 | public static function activate_license_for_plugin( $license, $plugin_slug ) { |
| 1135 | 527 | $this_plugin = self::get_addon( $plugin_slug ); |
| 1136 | 528 | return $this_plugin->activate_license( $license ); |
| @@ -1135,30 +527,20 @@ | ||
| 1135 | 527 | $this_plugin = self::get_addon( $plugin_slug ); |
| 1136 | 528 | return $this_plugin->activate_license( $license ); |
| 1137 | 529 | } |
| 1138 | 530 | |
| 1139 | - /** | |
| 1140 | - * @param string $license The license key. | |
| 1141 | - * | |
| 1142 | - * @return array The response from the license activation. | |
| 1143 | - */ | |
| 1144 | 531 | private function activate_license( $license ) { |
| 1145 | 532 | $this->set_license( $license ); |
| 1146 | 533 | $this->license = $license; |
| 1147 | 534 | |
| 1148 | - $this->die_if_not_allowed(); | |
| 1149 | - | |
| 1150 | 535 | $response = $this->get_license_status(); |
| 1151 | 536 | $response['message'] = ''; |
| 1152 | 537 | $response['success'] = false; |
| 1153 | 538 | |
| 1154 | - $is_valid = false; | |
| 1155 | - | |
| 1156 | 539 | if ( $response['error'] ) { |
| 1157 | 540 | $response['message'] = $response['status']; |
| 1158 | 541 | } else { |
| 1159 | 542 | $messages = $this->get_messages(); |
| 1160 | - | |
| 1161 | 543 | if ( is_string( $response['status'] ) && isset( $messages[ $response['status'] ] ) ) { |
| 1162 | 544 | $response['message'] = $messages[ $response['status'] ]; |
| 1163 | 545 | } else { |
| 1164 | 546 | $response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) ); |
| @@ -1163,58 +545,30 @@ | ||
| 1163 | 545 | } else { |
| 1164 | 546 | $response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) ); |
| 1165 | 547 | } |
| 1166 | 548 | |
| 549 | + $is_valid = false; | |
| 1167 | 550 | if ( 'valid' === $response['status'] ) { |
| 1168 | 551 | $is_valid = 'valid'; |
| 1169 | 552 | $response['success'] = true; |
| 1170 | 553 | } |
| 1171 | - | |
| 1172 | - $this->maybe_set_active( $is_valid ); | |
| 554 | + $this->set_active( $is_valid ); | |
| 1173 | 555 | } |
| 1174 | 556 | |
| 1175 | - $this->update_last_checked( (bool) $is_valid ); | |
| 1176 | - | |
| 1177 | 557 | return $response; |
| 1178 | 558 | } |
| 1179 | 559 | |
| 1180 | - /** | |
| 1181 | - * Prevent this check from happening more than once per minute with the same license. | |
| 1182 | - * | |
| 1183 | - * @return void | |
| 1184 | - */ | |
| 1185 | - private function die_if_not_allowed() { | |
| 1186 | - if ( ! $this->checked_recently( '2 minutes' ) ) { | |
| 1187 | - return; | |
| 1188 | - } | |
| 1189 | - | |
| 1190 | - // Don't check more than once per minute. | |
| 1191 | - wp_send_json( | |
| 1192 | - array( | |
| 1193 | - 'message' => __( 'Please wait two minutes before trying again.', 'formidable' ), | |
| 1194 | - 'success' => false, | |
| 1195 | - ) | |
| 1196 | - ); | |
| 1197 | - } | |
| 1198 | - | |
| 1199 | - /** | |
| 1200 | - * @return array | |
| 1201 | - */ | |
| 1202 | 560 | private function get_license_status() { |
| 1203 | - $this->set_running(); | |
| 1204 | - | |
| 1205 | 561 | $response = array( |
| 1206 | 562 | 'status' => 'missing', |
| 1207 | 563 | 'error' => true, |
| 1208 | 564 | ); |
| 565 | + if ( empty( $this->license ) ) { | |
| 566 | + $response['error'] = false; | |
| 1209 | 567 | |
| 1210 | - if ( ! $this->license ) { | |
| 1211 | - $response['error'] = false; | |
| 1212 | 568 | return $response; |
| 1213 | 569 | } |
| 1214 | 570 | |
| 1215 | - $is_valid = false; | |
| 1216 | - | |
| 1217 | 571 | try { |
| 1218 | 572 | $response['error'] = false; |
| 1219 | 573 | $license_data = $this->send_mothership_request( 'activate_license' ); |
| 1220 | 574 | |
| @@ -1219,12 +573,10 @@ | ||
| 1219 | 573 | $license_data = $this->send_mothership_request( 'activate_license' ); |
| 1220 | 574 | |
| 1221 | 575 | // $license_data->license will be either "valid" or "invalid" |
| 1222 | 576 | if ( is_array( $license_data ) ) { |
| 1223 | - if ( ! empty( $license_data['license'] ) && in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) { | |
| 1224 | - $response['status'] = $license_data['license']; | |
| 1225 | - $this->save_status['status'] = $license_data['license']; | |
| 1226 | - $is_valid = 'valid' === $license_data['license']; | |
| 577 | + if ( in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) { | |
| 578 | + $response['status'] = $license_data['license']; | |
| 1227 | 579 | } |
| 1228 | 580 | } else { |
| 1229 | 581 | $response['status'] = $license_data; |
| 1230 | 582 | } |
| @@ -1231,16 +583,11 @@ | ||
| 1231 | 583 | } catch ( Exception $e ) { |
| 1232 | 584 | $response['status'] = $e->getMessage(); |
| 1233 | 585 | } |
| 1234 | 586 | |
| 1235 | - $this->update_last_checked( $is_valid ); | |
| 1236 | - $this->done_running(); | |
| 1237 | 587 | return $response; |
| 1238 | 588 | } |
| 1239 | 589 | |
| 1240 | - /** | |
| 1241 | - * @return array | |
| 1242 | - */ | |
| 1243 | 590 | private function get_messages() { |
| 1244 | 591 | return array( |
| 1245 | 592 | 'valid' => __( 'Your license has been activated. Enjoy!', 'formidable' ), |
| 1246 | 593 | 'invalid' => __( 'That license key is invalid', 'formidable' ), |
| @@ -1253,10 +600,8 @@ | ||
| 1253 | 600 | } |
| 1254 | 601 | |
| 1255 | 602 | /** |
| 1256 | 603 | * @since 4.03 |
| 1257 | - * | |
| 1258 | - * @return void | |
| 1259 | 604 | */ |
| 1260 | 605 | public static function reset_cache() { |
| 1261 | 606 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1262 | 607 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -1268,14 +613,12 @@ | ||
| 1268 | 613 | 'success' => true, |
| 1269 | 614 | 'message' => __( 'Cache cleared', 'formidable' ), |
| 1270 | 615 | ); |
| 1271 | 616 | |
| 1272 | - wp_send_json( $response ); | |
| 617 | + echo json_encode( $response ); | |
| 618 | + wp_die(); | |
| 1273 | 619 | } |
| 1274 | 620 | |
| 1275 | - /** | |
| 1276 | - * @return void | |
| 1277 | - */ | |
| 1278 | 621 | public static function deactivate() { |
| 1279 | 622 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1280 | 623 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1281 | 624 | |
| @@ -1284,13 +627,11 @@ | ||
| 1284 | 627 | $response = array( |
| 1285 | 628 | 'success' => false, |
| 1286 | 629 | 'message' => '', |
| 1287 | 630 | ); |
| 1288 | - | |
| 1289 | 631 | try { |
| 1290 | 632 | // $license_data->license will be either "deactivated" or "failed" |
| 1291 | 633 | $license_data = $this_plugin->send_mothership_request( 'deactivate_license' ); |
| 1292 | - | |
| 1293 | 634 | if ( is_array( $license_data ) && 'deactivated' === $license_data['license'] ) { |
| 1294 | 635 | $response['success'] = true; |
| 1295 | 636 | $response['message'] = __( 'That license was removed successfully', 'formidable' ); |
| 1296 | 637 | } else { |
| @@ -1300,30 +641,24 @@ | ||
| 1300 | 641 | $response['message'] = $e->getMessage(); |
| 1301 | 642 | } |
| 1302 | 643 | |
| 1303 | 644 | $this_plugin->clear_license(); |
| 1304 | - FrmInbox::clear_cache(); | |
| 1305 | 645 | |
| 1306 | - wp_send_json( $response ); | |
| 646 | + echo json_encode( $response ); | |
| 647 | + wp_die(); | |
| 1307 | 648 | } |
| 1308 | 649 | |
| 1309 | 650 | /** |
| 1310 | 651 | * @since 4.03 |
| 1311 | - * | |
| 1312 | - * @return FrmAddon | |
| 1313 | 652 | */ |
| 1314 | 653 | private static function set_license_from_post() { |
| 1315 | 654 | $plugin_slug = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 1316 | 655 | $this_plugin = self::get_addon( $plugin_slug ); |
| 1317 | - $this_plugin->license = $this_plugin->get_license(); | |
| 656 | + $license = $this_plugin->get_license(); | |
| 657 | + $this_plugin->license = $license; | |
| 1318 | 658 | return $this_plugin; |
| 1319 | 659 | } |
| 1320 | 660 | |
| 1321 | - /** | |
| 1322 | - * @param string $action | |
| 1323 | - * | |
| 1324 | - * @return string | |
| 1325 | - */ | |
| 1326 | 661 | public function send_mothership_request( $action ) { |
| 1327 | 662 | $api_params = array( |
| 1328 | 663 | 'edd_action' => $action, |
| 1329 | 664 | 'license' => $this->license, |
| @@ -1328,9 +663,8 @@ | ||
| 1328 | 663 | 'edd_action' => $action, |
| 1329 | 664 | 'license' => $this->license, |
| 1330 | 665 | 'url' => home_url(), |
| 1331 | 666 | ); |
| 1332 | - | |
| 1333 | 667 | if ( is_numeric( $this->download_id ) ) { |
| 1334 | 668 | $api_params['item_id'] = absint( $this->download_id ); |
| 1335 | 669 | } else { |
| 1336 | 670 | $api_params['item_name'] = rawurlencode( $this->plugin_name ); |
| @@ -1341,49 +675,36 @@ | ||
| 1341 | 675 | 'timeout' => 25, |
| 1342 | 676 | 'user-agent' => $this->plugin_slug . '/' . $this->version . '; ' . get_bloginfo( 'url' ), |
| 1343 | 677 | ); |
| 1344 | 678 | |
| 1345 | - $resp = wp_remote_post( | |
| 1346 | - $this->store_url . '?l=' . urlencode( base64_encode( $this->license ) ), | |
| 1347 | - $arg_array | |
| 1348 | - ); | |
| 1349 | - $response_code = wp_remote_retrieve_response_code( $resp ); | |
| 1350 | - $body = wp_remote_retrieve_body( $resp ); | |
| 1351 | - $this->save_status = array( 'response_code' => $response_code ); | |
| 1352 | - $this->save_response['response_code'] = $response_code; | |
| 679 | + $resp = wp_remote_post( $this->store_url, $arg_array ); | |
| 680 | + $body = wp_remote_retrieve_body( $resp ); | |
| 1353 | 681 | |
| 1354 | 682 | $message = __( 'Your License Key was invalid', 'formidable' ); |
| 1355 | - | |
| 1356 | 683 | if ( is_wp_error( $resp ) ) { |
| 1357 | 684 | $link = FrmAppHelper::admin_upgrade_link( 'api', 'knowledgebase/why-cant-i-activate-formidable-pro/' ); |
| 1358 | 685 | /* translators: %1$s: Start link HTML, %2$s: End link HTML */ |
| 1359 | - $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 | |
| 686 | + $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>' ); | |
| 1360 | 687 | $message .= ' ' . $resp->get_error_message(); |
| 1361 | 688 | } elseif ( 'error' === $body || is_wp_error( $body ) ) { |
| 1362 | 689 | $message = __( 'You had an HTTP error connecting to the Formidable API', 'formidable' ); |
| 1363 | 690 | } else { |
| 1364 | 691 | $json_res = json_decode( $body, true ); |
| 1365 | - | |
| 1366 | 692 | if ( null !== $json_res ) { |
| 1367 | - $message = is_array( $json_res ) && isset( $json_res['error'] ) ? $json_res['error'] : $json_res; | |
| 1368 | - } elseif ( ! empty( $resp['response'] ) && ! empty( $resp['response']['code'] ) ) { | |
| 1369 | - $resp['body'] = wp_strip_all_tags( $resp['body'] ); | |
| 1370 | - | |
| 1371 | - $message = sprintf( | |
| 1372 | - /* translators: %1$s: Error code, %2$s: Error message */ | |
| 1373 | - esc_html__( 'There was a %1$s error: %2$s', 'formidable' ), | |
| 1374 | - esc_html( $resp['response']['code'] ), | |
| 1375 | - $resp['response']['message'] . ' ' . $resp['body'] | |
| 1376 | - ); | |
| 693 | + if ( is_array( $json_res ) && isset( $json_res['error'] ) ) { | |
| 694 | + $message = $json_res['error']; | |
| 695 | + } else { | |
| 696 | + $message = $json_res; | |
| 697 | + } | |
| 698 | + } elseif ( isset( $resp['response'] ) && isset( $resp['response']['code'] ) ) { | |
| 699 | + /* translators: %1$s: Error code, %2$s: Error message */ | |
| 700 | + $message = sprintf( __( 'There was a %1$s error: %2$s', 'formidable' ), $resp['response']['code'], $resp['response']['message'] . ' ' . $resp['body'] ); | |
| 1377 | 701 | } |
| 1378 | - }//end if | |
| 702 | + } | |
| 1379 | 703 | |
| 1380 | 704 | return $message; |
| 1381 | 705 | } |
| 1382 | 706 | |
| 1383 | - /** | |
| 1384 | - * @return void | |
| 1385 | - */ | |
| 1386 | 707 | public function manually_queue_update() { |
| 1387 | 708 | $updates = new stdClass(); |
| 1388 | 709 | $updates->last_checked = 0; |
| 1389 | 710 | $updates->response = array(); |
| @@ -1390,46 +711,6 @@ | ||
| 1390 | 711 | $updates->translations = array(); |
| 1391 | 712 | $updates->no_update = array(); |
| 1392 | 713 | $updates->checked = array(); |
| 1393 | 714 | set_site_transient( 'update_plugins', $updates ); |
| 1394 | - } | |
| 1395 | - | |
| 1396 | - /** | |
| 1397 | - * Set the transient key for the lock. It should be unique to the license. | |
| 1398 | - * | |
| 1399 | - * @since 6.8.3 | |
| 1400 | - * | |
| 1401 | - * @return bool | |
| 1402 | - */ | |
| 1403 | - protected function lock_key() { | |
| 1404 | - return $this->transient_lock_key . '_' . $this->license; | |
| 1405 | - } | |
| 1406 | - | |
| 1407 | - /** | |
| 1408 | - * Prevent multiple requests from running at the same time. | |
| 1409 | - * | |
| 1410 | - * @since 6.8.3 | |
| 1411 | - * | |
| 1412 | - * @return bool | |
| 1413 | - */ | |
| 1414 | - protected function is_running() { | |
| 1415 | - return get_transient( $this->lock_key() ); | |
| 1416 | - } | |
| 1417 | - | |
| 1418 | - /** | |
| 1419 | - * @since 6.8.3 | |
| 1420 | - * | |
| 1421 | - * @return void | |
| 1422 | - */ | |
| 1423 | - protected function set_running() { | |
| 1424 | - set_transient( $this->lock_key(), true, 2 * MINUTE_IN_SECONDS ); | |
| 1425 | - } | |
| 1426 | - | |
| 1427 | - /** | |
| 1428 | - * @since 6.8.3 | |
| 1429 | - * | |
| 1430 | - * @return void | |
| 1431 | - */ | |
| 1432 | - protected function done_running() { | |
| 1433 | - delete_transient( $this->lock_key() ); | |
| 1434 | 715 | } |
| 1435 | 716 | } |
