| @@ -4,36 +4,21 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmFormApi { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * @var string | |
| 10 | - */ | |
| 11 | 8 | protected $license = ''; |
| 12 | - | |
| 13 | - /** | |
| 14 | - * @var string | |
| 15 | - */ | |
| 16 | 9 | protected $cache_key = ''; |
| 17 | - | |
| 18 | - /** | |
| 19 | - * @var string | |
| 20 | - */ | |
| 21 | 10 | protected $cache_timeout = '+6 hours'; |
| 22 | 11 | |
| 23 | 12 | /** |
| 24 | 13 | * The number of days an add-on is new. |
| 25 | 14 | * |
| 26 | - * @var int | |
| 15 | + * @var int $new_days | |
| 27 | 16 | */ |
| 28 | 17 | protected $new_days = 90; |
| 29 | 18 | |
| 30 | 19 | /** |
| 31 | 20 | * @since 3.06 |
| 32 | - * | |
| 33 | - * @param string|null $license The license key. | |
| 34 | - * | |
| 35 | - * @return void | |
| 36 | 21 | */ |
| 37 | 22 | public function __construct( $license = null ) { |
| 38 | 23 | $this->set_license( $license ); |
| 39 | 24 | $this->set_cache_key(); |
| @@ -41,16 +26,13 @@ | ||
| 41 | 26 | |
| 42 | 27 | /** |
| 43 | 28 | * @since 3.06 |
| 44 | 29 | * |
| 45 | - * @param string|null $license The license key. | |
| 46 | - * | |
| 47 | 30 | * @return void |
| 48 | 31 | */ |
| 49 | 32 | private function set_license( $license ) { |
| 50 | 33 | if ( $license === null ) { |
| 51 | 34 | $edd_update = $this->get_pro_updater(); |
| 52 | - | |
| 53 | 35 | if ( ! empty( $edd_update ) ) { |
| 54 | 36 | $license = $edd_update->license; |
| 55 | 37 | } |
| 56 | 38 | } |
| @@ -58,9 +40,8 @@ | ||
| 58 | 40 | } |
| 59 | 41 | |
| 60 | 42 | /** |
| 61 | 43 | * @since 3.06 |
| 62 | - * | |
| 63 | 44 | * @return string |
| 64 | 45 | */ |
| 65 | 46 | public function get_license() { |
| 66 | 47 | return $this->license; |
| @@ -76,9 +57,8 @@ | ||
| 76 | 57 | } |
| 77 | 58 | |
| 78 | 59 | /** |
| 79 | 60 | * @since 3.06 |
| 80 | - * | |
| 81 | 61 | * @return string |
| 82 | 62 | */ |
| 83 | 63 | public function get_cache_key() { |
| 84 | 64 | return $this->cache_key; |
| @@ -85,34 +65,23 @@ | ||
| 85 | 65 | } |
| 86 | 66 | |
| 87 | 67 | /** |
| 88 | 68 | * @since 3.06 |
| 89 | - * | |
| 90 | 69 | * @return array |
| 91 | 70 | */ |
| 92 | 71 | public function get_api_info() { |
| 93 | 72 | $url = $this->api_url(); |
| 94 | - | |
| 95 | 73 | if ( ! empty( $this->license ) ) { |
| 96 | 74 | $url .= '?l=' . urlencode( base64_encode( $this->license ) ); |
| 97 | 75 | } |
| 98 | 76 | |
| 99 | 77 | $addons = $this->get_cached(); |
| 100 | - | |
| 101 | 78 | if ( is_array( $addons ) ) { |
| 102 | 79 | return $addons; |
| 103 | 80 | } |
| 104 | 81 | |
| 105 | - if ( $this->is_running() ) { | |
| 106 | - // If there's no saved cache, we'll need to wait for the current request to finish. | |
| 107 | - return array(); | |
| 108 | - } | |
| 109 | - | |
| 110 | - $this->set_running(); | |
| 111 | - | |
| 112 | 82 | // We need to know the version number to allow different downloads. |
| 113 | 83 | $agent = 'formidable/' . FrmAppHelper::plugin_version(); |
| 114 | - | |
| 115 | 84 | if ( class_exists( 'FrmProDb' ) ) { |
| 116 | 85 | $agent = 'formidable-pro/' . FrmProDb::$plug_version; |
| 117 | 86 | } |
| 118 | 87 | |
| @@ -131,10 +100,8 @@ | ||
| 131 | 100 | if ( ! is_array( $addons ) ) { |
| 132 | 101 | $addons = array(); |
| 133 | 102 | } |
| 134 | 103 | |
| 135 | - $addons['response_code'] = wp_remote_retrieve_response_code( $response ); | |
| 136 | - | |
| 137 | 104 | foreach ( $addons as $k => $addon ) { |
| 138 | 105 | if ( ! is_array( $addon ) ) { |
| 139 | 106 | continue; |
| 140 | 107 | } |
| @@ -140,9 +107,8 @@ | ||
| 140 | 107 | } |
| 141 | 108 | |
| 142 | 109 | if ( isset( $addon['categories'] ) ) { |
| 143 | 110 | $cats = array_intersect( $this->skip_categories(), $addon['categories'] ); |
| 144 | - | |
| 145 | 111 | if ( ! empty( $cats ) ) { |
| 146 | 112 | unset( $addons[ $k ] ); |
| 147 | 113 | continue; |
| 148 | 114 | } |
| @@ -153,86 +119,18 @@ | ||
| 153 | 119 | } |
| 154 | 120 | } |
| 155 | 121 | |
| 156 | 122 | $this->set_cached( $addons ); |
| 157 | - $this->done_running(); | |
| 158 | 123 | |
| 159 | 124 | return $addons; |
| 160 | 125 | } |
| 161 | 126 | |
| 162 | 127 | /** |
| 163 | - * Prevent multiple requests from running at the same time. | |
| 164 | - * | |
| 165 | - * @since 6.8.3 | |
| 166 | - * | |
| 167 | - * @return bool | |
| 168 | - */ | |
| 169 | - protected function is_running() { | |
| 170 | - if ( $this->run_as_multisite() ) { | |
| 171 | - return get_site_transient( $this->transient_key() ); | |
| 172 | - } | |
| 173 | - return get_transient( $this->transient_key() ); | |
| 174 | - } | |
| 175 | - | |
| 176 | - /** | |
| 177 | - * @since 6.8.3 | |
| 178 | - * | |
| 179 | - * @return void | |
| 180 | - */ | |
| 181 | - protected function set_running() { | |
| 182 | - $expires = 2 * MINUTE_IN_SECONDS; | |
| 183 | - | |
| 184 | - if ( $this->run_as_multisite() ) { | |
| 185 | - set_site_transient( $this->transient_key(), true, $expires ); | |
| 186 | - return; | |
| 187 | - } | |
| 188 | - | |
| 189 | - set_transient( $this->transient_key(), true, $expires ); | |
| 190 | - } | |
| 191 | - | |
| 192 | - /** | |
| 193 | - * @since 6.8.3 | |
| 194 | - * | |
| 195 | - * @return void | |
| 196 | - */ | |
| 197 | - protected function done_running() { | |
| 198 | - if ( $this->run_as_multisite() ) { | |
| 199 | - delete_site_transient( $this->transient_key() ); | |
| 200 | - } | |
| 201 | - delete_transient( $this->transient_key() ); | |
| 202 | - } | |
| 203 | - | |
| 204 | - /** | |
| 205 | - * Only allow one site in the network to make the api request at a time. | |
| 206 | - * If there is a license for the request, run individually. | |
| 207 | - * | |
| 208 | - * @since 6.8.3 | |
| 209 | - * | |
| 210 | - * @return bool | |
| 211 | - */ | |
| 212 | - protected function run_as_multisite() { | |
| 213 | - return is_multisite() && empty( $this->license ); | |
| 214 | - } | |
| 215 | - | |
| 216 | - /** | |
| 217 | - * @since 6.8.3 | |
| 218 | - * | |
| 219 | - * @return string | |
| 220 | - */ | |
| 221 | - protected function transient_key() { | |
| 222 | - return strtolower( self::class ) . '_request_lock'; | |
| 223 | - } | |
| 224 | - | |
| 225 | - /** | |
| 226 | 128 | * @since 3.06 |
| 227 | 129 | * |
| 228 | 130 | * @return string |
| 229 | 131 | */ |
| 230 | 132 | protected function api_url() { |
| 231 | - if ( empty( $this->license ) ) { | |
| 232 | - // Direct traffic to Cloudflare worker when there is no license. | |
| 233 | - return 'https://plapi.formidableforms.com/list/'; | |
| 234 | - } | |
| 235 | 133 | return 'https://formidableforms.com/wp-json/s11edd/v1/updates/'; |
| 236 | 134 | } |
| 237 | 135 | |
| 238 | 136 | /** |
| @@ -246,10 +144,10 @@ | ||
| 246 | 144 | |
| 247 | 145 | /** |
| 248 | 146 | * @since 3.06 |
| 249 | 147 | * |
| 250 | - * @param object $license_plugin The FrmAddon object. | |
| 251 | - * @param array $addons | |
| 148 | + * @param object $license_plugin The FrmAddon object | |
| 149 | + * @param array $addons | |
| 252 | 150 | * |
| 253 | 151 | * @return array |
| 254 | 152 | */ |
| 255 | 153 | public function get_addon_for_license( $license_plugin, $addons = array() ) { |
| @@ -255,15 +153,13 @@ | ||
| 255 | 153 | public function get_addon_for_license( $license_plugin, $addons = array() ) { |
| 256 | 154 | if ( empty( $addons ) ) { |
| 257 | 155 | $addons = $this->get_api_info(); |
| 258 | 156 | } |
| 259 | - | |
| 260 | 157 | $download_id = $license_plugin->download_id; |
| 261 | 158 | $plugin = array(); |
| 262 | - | |
| 263 | 159 | if ( empty( $download_id ) && ! empty( $addons ) ) { |
| 264 | 160 | foreach ( $addons as $addon ) { |
| 265 | - if ( is_array( $addon ) && ! empty( $addon['title'] ) && strtolower( $license_plugin->plugin_name ) === strtolower( $addon['title'] ) ) { | |
| 161 | + if ( strtolower( $license_plugin->plugin_name ) == strtolower( $addon['title'] ) ) { | |
| 266 | 162 | return $addon; |
| 267 | 163 | } |
| 268 | 164 | } |
| 269 | 165 | } elseif ( isset( $addons[ $download_id ] ) ) { |
| @@ -274,10 +170,8 @@ | ||
| 274 | 170 | } |
| 275 | 171 | |
| 276 | 172 | /** |
| 277 | 173 | * @since 3.06 |
| 278 | - * | |
| 279 | - * @return false|object | |
| 280 | 174 | */ |
| 281 | 175 | public function get_pro_updater() { |
| 282 | 176 | if ( FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::get_updater' ) ) { |
| 283 | 177 | $updater = FrmProAppHelper::get_updater(); |
| @@ -290,56 +184,27 @@ | ||
| 290 | 184 | } |
| 291 | 185 | |
| 292 | 186 | /** |
| 293 | 187 | * @since 3.06 |
| 294 | - * | |
| 295 | - * @return array|bool | |
| 188 | + * @return array | |
| 296 | 189 | */ |
| 297 | 190 | protected function get_cached() { |
| 298 | - $cache = $this->get_cached_option(); | |
| 191 | + $cache = get_option( $this->cache_key ); | |
| 299 | 192 | |
| 300 | - if ( empty( $cache ) ) { | |
| 301 | - return false; | |
| 302 | - } | |
| 193 | + FrmAppHelper::filter_gmt_offset(); | |
| 303 | 194 | |
| 304 | - // If the api call is running, we can use the expired cache. | |
| 305 | - if ( ! $this->is_running() ) { | |
| 306 | - if ( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) { | |
| 307 | - // Cache is expired. | |
| 308 | - return false; | |
| 309 | - } | |
| 310 | - | |
| 311 | - $version = FrmAppHelper::plugin_version(); | |
| 312 | - $for_current = isset( $cache['version'] ) && $cache['version'] == $version; | |
| 313 | - | |
| 314 | - if ( ! $for_current ) { | |
| 315 | - // Force a new check. | |
| 316 | - return false; | |
| 317 | - } | |
| 195 | + if ( empty( $cache ) || empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) { | |
| 196 | + return false; // Cache is expired | |
| 318 | 197 | } |
| 319 | 198 | |
| 320 | - $values = json_decode( $cache['value'], true ); | |
| 321 | - | |
| 322 | - return $values; | |
| 323 | - } | |
| 324 | - | |
| 325 | - /** | |
| 326 | - * Get the cache for the network if multisite. | |
| 327 | - * | |
| 328 | - * @since 6.8.3 | |
| 329 | - * | |
| 330 | - * @return mixed | |
| 331 | - */ | |
| 332 | - protected function get_cached_option() { | |
| 333 | - if ( is_multisite() ) { | |
| 334 | - $cached = get_site_option( $this->cache_key ); | |
| 335 | - | |
| 336 | - if ( $cached ) { | |
| 337 | - return $cached; | |
| 338 | - } | |
| 199 | + $version = FrmAppHelper::plugin_version(); | |
| 200 | + $for_current = isset( $cache['version'] ) && $cache['version'] == $version; | |
| 201 | + if ( ! $for_current ) { | |
| 202 | + // Force a new check. | |
| 203 | + return false; | |
| 339 | 204 | } |
| 340 | 205 | |
| 341 | - return get_option( $this->cache_key ); | |
| 206 | + return json_decode( $cache['value'], true ); | |
| 342 | 207 | } |
| 343 | 208 | |
| 344 | 209 | /** |
| 345 | 210 | * @since 3.06 |
| @@ -348,61 +213,34 @@ | ||
| 348 | 213 | * |
| 349 | 214 | * @return void |
| 350 | 215 | */ |
| 351 | 216 | protected function set_cached( $addons ) { |
| 217 | + FrmAppHelper::filter_gmt_offset(); | |
| 218 | + | |
| 352 | 219 | $data = array( |
| 353 | - 'timeout' => strtotime( $this->get_cache_timeout( $addons ), time() ), | |
| 354 | - 'value' => wp_json_encode( $addons ), | |
| 220 | + 'timeout' => strtotime( $this->cache_timeout, current_time( 'timestamp' ) ), | |
| 221 | + 'value' => json_encode( $addons ), | |
| 355 | 222 | 'version' => FrmAppHelper::plugin_version(), |
| 356 | 223 | ); |
| 357 | 224 | |
| 358 | - if ( is_multisite() ) { | |
| 359 | - update_site_option( $this->cache_key, $data ); | |
| 360 | - } else { | |
| 361 | - update_option( $this->cache_key, $data, 'no' ); | |
| 362 | - } | |
| 225 | + update_option( $this->cache_key, $data, 'no' ); | |
| 363 | 226 | } |
| 364 | 227 | |
| 365 | 228 | /** |
| 366 | - * If the last check was a a rate limit, we'll need to check again sooner. | |
| 367 | - * | |
| 368 | - * @since 6.8.3 | |
| 369 | - * | |
| 370 | - * @param array $addons | |
| 371 | - * | |
| 372 | - * @return string | |
| 373 | - */ | |
| 374 | - protected function get_cache_timeout( $addons ) { | |
| 375 | - $timeout = $this->cache_timeout; | |
| 376 | - | |
| 377 | - if ( isset( $addons['response_code'] ) && 429 === $addons['response_code'] ) { | |
| 378 | - $timeout = '+5 minutes'; | |
| 379 | - } | |
| 380 | - return $timeout; | |
| 381 | - } | |
| 382 | - | |
| 383 | - /** | |
| 384 | 229 | * @since 3.06 |
| 385 | 230 | * |
| 386 | 231 | * @return void |
| 387 | 232 | */ |
| 388 | 233 | public function reset_cached() { |
| 389 | - if ( is_multisite() ) { | |
| 390 | - delete_site_option( $this->cache_key ); | |
| 391 | - } else { | |
| 392 | - delete_option( $this->cache_key ); | |
| 393 | - } | |
| 394 | - $this->done_running(); | |
| 234 | + delete_option( $this->cache_key ); | |
| 395 | 235 | } |
| 396 | 236 | |
| 397 | 237 | /** |
| 398 | 238 | * @since 3.06 |
| 399 | - * | |
| 400 | 239 | * @return array |
| 401 | 240 | */ |
| 402 | 241 | public function error_for_license() { |
| 403 | 242 | $errors = array(); |
| 404 | - | |
| 405 | 243 | if ( ! empty( $this->license ) ) { |
| 406 | 244 | $errors = $this->get_error_from_response(); |
| 407 | 245 | } |
| 408 | 246 | |
| @@ -410,11 +248,8 @@ | ||
| 410 | 248 | } |
| 411 | 249 | |
| 412 | 250 | /** |
| 413 | 251 | * @since 3.06 |
| 414 | - * | |
| 415 | - * @param array $addons | |
| 416 | - * | |
| 417 | 252 | * @return array |
| 418 | 253 | */ |
| 419 | 254 | public function get_error_from_response( $addons = array() ) { |
| 420 | 255 | if ( empty( $addons ) ) { |
| @@ -419,18 +254,11 @@ | ||
| 419 | 254 | public function get_error_from_response( $addons = array() ) { |
| 420 | 255 | if ( empty( $addons ) ) { |
| 421 | 256 | $addons = $this->get_api_info(); |
| 422 | 257 | } |
| 423 | - | |
| 424 | 258 | $errors = array(); |
| 425 | - | |
| 426 | 259 | if ( isset( $addons['error'] ) ) { |
| 427 | - if ( is_string( $addons['error'] ) ) { | |
| 428 | - $errors[] = $addons['error']; | |
| 429 | - } elseif ( ! empty( $addons['error']['message'] ) ) { | |
| 430 | - $errors[] = $addons['error']['message']; | |
| 431 | - } | |
| 432 | - | |
| 260 | + $errors[] = $addons['error']['message']; | |
| 433 | 261 | do_action( 'frm_license_error', $addons['error'] ); |
| 434 | 262 | } |
| 435 | 263 | |
| 436 | 264 | return $errors; |
| @@ -441,9 +269,8 @@ | ||
| 441 | 269 | * |
| 442 | 270 | * @since 6.0 |
| 443 | 271 | * |
| 444 | 272 | * @param array $addon |
| 445 | - * | |
| 446 | 273 | * @return bool |
| 447 | 274 | */ |
| 448 | 275 | protected function is_new( $addon ) { |
| 449 | 276 | return strtotime( $addon['released'] ) > strtotime( '-' . $this->new_days . ' days' ); |
