@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | $this->api_data = $_api_data; |
| 49 | 49 | $this->name = plugin_basename( $_plugin_file ); |
| 50 | 50 | $this->slug = basename( $_plugin_file, '.php' ); |
| 51 | - $this->version = $_api_data['version']; |
|
| 52 | - $this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false; |
|
| 53 | - $this->beta = ! empty( $this->api_data['beta'] ) ? true : false; |
|
| 54 | - $this->cache_key = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
| 51 | + $this->version = $_api_data[ 'version' ]; |
|
| 52 | + $this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false; |
|
| 53 | + $this->beta = ! empty( $this->api_data[ 'beta' ] ) ? true : false; |
|
| 54 | + $this->cache_key = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
| 55 | 55 | |
| 56 | 56 | $edd_plugin_data[ $this->slug ] = $this->api_data; |
| 57 | 57 | |
@@ -173,11 +173,11 @@ discard block |
||
| 173 | 173 | return; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
| 176 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
| 177 | 177 | return; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - if( ! is_multisite() ) { |
|
| 180 | + if ( ! is_multisite() ) { |
|
| 181 | 181 | return; |
| 182 | 182 | } |
| 183 | 183 | |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | '<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">', |
| 270 | 270 | esc_html( $version_info->new_version ), |
| 271 | 271 | '</a>', |
| 272 | - '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">', |
|
| 272 | + '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">', |
|
| 273 | 273 | '</a>' |
| 274 | 274 | ); |
| 275 | 275 | } |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | $_data->contributors = $this->convert_object_to_array( $_data->contributors ); |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | - if( ! isset( $_data->plugin ) ) { |
|
| 356 | + if ( ! isset( $_data->plugin ) ) { |
|
| 357 | 357 | $_data->plugin = $this->name; |
| 358 | 358 | } |
| 359 | 359 | |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | $verify_ssl = $this->verify_ssl(); |
| 397 | 397 | if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
| 398 | - $args['sslverify'] = $verify_ssl; |
|
| 398 | + $args[ 'sslverify' ] = $verify_ssl; |
|
| 399 | 399 | } |
| 400 | 400 | return $args; |
| 401 | 401 | |
@@ -423,9 +423,9 @@ discard block |
||
| 423 | 423 | if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) { |
| 424 | 424 | $test_url_parts = parse_url( $this->api_url ); |
| 425 | 425 | |
| 426 | - $scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme'] : 'http'; |
|
| 427 | - $host = ! empty( $test_url_parts['host'] ) ? $test_url_parts['host'] : ''; |
|
| 428 | - $port = ! empty( $test_url_parts['port'] ) ? ':' . $test_url_parts['port'] : ''; |
|
| 426 | + $scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http'; |
|
| 427 | + $host = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : ''; |
|
| 428 | + $port = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : ''; |
|
| 429 | 429 | |
| 430 | 430 | if ( empty( $host ) ) { |
| 431 | 431 | $edd_plugin_url_available[ $store_hash ] = false; |
@@ -442,27 +442,27 @@ discard block |
||
| 442 | 442 | |
| 443 | 443 | $data = array_merge( $this->api_data, $_data ); |
| 444 | 444 | |
| 445 | - if ( $data['slug'] != $this->slug ) { |
|
| 445 | + if ( $data[ 'slug' ] != $this->slug ) { |
|
| 446 | 446 | return false; |
| 447 | 447 | } |
| 448 | 448 | |
| 449 | - if ( $this->api_url == trailingslashit ( home_url() ) ) { |
|
| 449 | + if ( $this->api_url == trailingslashit( home_url() ) ) { |
|
| 450 | 450 | return false; // Don't allow a plugin to ping itself |
| 451 | 451 | } |
| 452 | 452 | |
| 453 | 453 | $api_params = array( |
| 454 | 454 | 'edd_action' => 'get_version', |
| 455 | - 'license' => ! empty( $data['license'] ) ? $data['license'] : '', |
|
| 456 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
| 457 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
| 458 | - 'version' => isset( $data['version'] ) ? $data['version'] : false, |
|
| 459 | - 'slug' => $data['slug'], |
|
| 460 | - 'author' => $data['author'], |
|
| 455 | + 'license' => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '', |
|
| 456 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
| 457 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
| 458 | + 'version' => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false, |
|
| 459 | + 'slug' => $data[ 'slug' ], |
|
| 460 | + 'author' => $data[ 'author' ], |
|
| 461 | 461 | 'url' => home_url(), |
| 462 | - 'beta' => ! empty( $data['beta'] ), |
|
| 462 | + 'beta' => ! empty( $data[ 'beta' ] ), |
|
| 463 | 463 | ); |
| 464 | 464 | |
| 465 | - $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) ); |
|
| 465 | + $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) ); |
|
| 466 | 466 | |
| 467 | 467 | if ( ! is_wp_error( $request ) ) { |
| 468 | 468 | $request = json_decode( wp_remote_retrieve_body( $request ) ); |
@@ -483,8 +483,8 @@ discard block |
||
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | if ( ! empty( $request->sections ) ) { |
| 486 | - foreach( $request->sections as $key => $section ) { |
|
| 487 | - $request->$key = (array) $section; |
|
| 486 | + foreach ( $request->sections as $key => $section ) { |
|
| 487 | + $request->$key = (array)$section; |
|
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | |
@@ -498,35 +498,35 @@ discard block |
||
| 498 | 498 | |
| 499 | 499 | global $edd_plugin_data; |
| 500 | 500 | |
| 501 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
| 501 | + if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) { |
|
| 502 | 502 | return; |
| 503 | 503 | } |
| 504 | 504 | |
| 505 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
| 505 | + if ( empty( $_REQUEST[ 'plugin' ] ) ) { |
|
| 506 | 506 | return; |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | - if( empty( $_REQUEST['slug'] ) ) { |
|
| 509 | + if ( empty( $_REQUEST[ 'slug' ] ) ) { |
|
| 510 | 510 | return; |
| 511 | 511 | } |
| 512 | 512 | |
| 513 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
| 513 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
| 514 | 514 | wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) ); |
| 515 | 515 | } |
| 516 | 516 | |
| 517 | - $data = $edd_plugin_data[ $_REQUEST['slug'] ]; |
|
| 517 | + $data = $edd_plugin_data[ $_REQUEST[ 'slug' ] ]; |
|
| 518 | 518 | $version_info = $this->get_cached_version_info(); |
| 519 | 519 | |
| 520 | - if( false === $version_info ) { |
|
| 520 | + if ( false === $version_info ) { |
|
| 521 | 521 | |
| 522 | 522 | $api_params = array( |
| 523 | 523 | 'edd_action' => 'get_version', |
| 524 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
| 525 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
| 526 | - 'slug' => $_REQUEST['slug'], |
|
| 527 | - 'author' => $data['author'], |
|
| 524 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
| 525 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
| 526 | + 'slug' => $_REQUEST[ 'slug' ], |
|
| 527 | + 'author' => $data[ 'author' ], |
|
| 528 | 528 | 'url' => home_url(), |
| 529 | - 'beta' => ! empty( $data['beta'] ) |
|
| 529 | + 'beta' => ! empty( $data[ 'beta' ] ) |
|
| 530 | 530 | ); |
| 531 | 531 | |
| 532 | 532 | $verify_ssl = $this->verify_ssl(); |
@@ -542,22 +542,22 @@ discard block |
||
| 542 | 542 | $version_info = false; |
| 543 | 543 | } |
| 544 | 544 | |
| 545 | - if( ! empty( $version_info ) ) { |
|
| 546 | - foreach( $version_info->sections as $key => $section ) { |
|
| 547 | - $version_info->$key = (array) $section; |
|
| 545 | + if ( ! empty( $version_info ) ) { |
|
| 546 | + foreach ( $version_info->sections as $key => $section ) { |
|
| 547 | + $version_info->$key = (array)$section; |
|
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | $this->set_version_info_cache( $version_info ); |
| 552 | 552 | |
| 553 | 553 | // Delete the unneeded option |
| 554 | - delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $this->beta . '_version_info' ) ); |
|
| 554 | + delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $this->beta . '_version_info' ) ); |
|
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | if ( isset( $version_info->sections ) ) { |
| 558 | 558 | $sections = $this->convert_object_to_array( $version_info->sections ); |
| 559 | - if ( ! empty( $sections['changelog'] ) ) { |
|
| 560 | - echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections['changelog'] ) . '</div>'; |
|
| 559 | + if ( ! empty( $sections[ 'changelog' ] ) ) { |
|
| 560 | + echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections[ 'changelog' ] ) . '</div>'; |
|
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | 563 | |
@@ -572,25 +572,25 @@ discard block |
||
| 572 | 572 | */ |
| 573 | 573 | public function get_cached_version_info( $cache_key = '' ) { |
| 574 | 574 | |
| 575 | - if( empty( $cache_key ) ) { |
|
| 575 | + if ( empty( $cache_key ) ) { |
|
| 576 | 576 | $cache_key = $this->cache_key; |
| 577 | 577 | } |
| 578 | 578 | |
| 579 | 579 | $cache = get_option( $cache_key ); |
| 580 | 580 | |
| 581 | - if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) { |
|
| 581 | + if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) { |
|
| 582 | 582 | return false; // Cache is expired |
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | // We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point. |
| 586 | - $cache['value'] = json_decode( $cache['value'] ); |
|
| 587 | - if ( ! empty( $cache['value']->icons ) ) { |
|
| 588 | - $cache['value']->icons = (array) $cache['value']->icons; |
|
| 589 | - } elseif ( $cache['value'] ) { |
|
| 590 | - $cache['value']->icons = array(); |
|
| 586 | + $cache[ 'value' ] = json_decode( $cache[ 'value' ] ); |
|
| 587 | + if ( ! empty( $cache[ 'value' ]->icons ) ) { |
|
| 588 | + $cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons; |
|
| 589 | + } elseif ( $cache[ 'value' ] ) { |
|
| 590 | + $cache[ 'value' ]->icons = array(); |
|
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - return $cache['value']; |
|
| 593 | + return $cache[ 'value' ]; |
|
| 594 | 594 | |
| 595 | 595 | } |
| 596 | 596 | |
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | */ |
| 603 | 603 | public function set_version_info_cache( $value = '', $cache_key = '' ) { |
| 604 | 604 | |
| 605 | - if( empty( $cache_key ) ) { |
|
| 605 | + if ( empty( $cache_key ) ) { |
|
| 606 | 606 | $cache_key = $this->cache_key; |
| 607 | 607 | } |
| 608 | 608 | |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | update_option( $cache_key, $data, 'no' ); |
| 615 | 615 | |
| 616 | 616 | // Delete the duplicate option |
| 617 | - delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ) ); |
|
| 617 | + delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ) ); |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | /** |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | * @return bool |
| 625 | 625 | */ |
| 626 | 626 | private function verify_ssl() { |
| 627 | - return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
| 627 | + return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | } |