@@ -66,9 +66,9 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function add_downloads_data_filters() { |
| 68 | 68 | |
| 69 | - $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
|
| 69 | + $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
|
| 70 | 70 | |
| 71 | - if ( ! $downloads_data ) { |
|
| 71 | + if ( ! $downloads_data ) { |
|
| 72 | 72 | return; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | */ |
| 98 | 98 | public function add_admin_menu() { |
| 99 | 99 | |
| 100 | - $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
| 100 | + $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
| 101 | 101 | |
| 102 | 102 | $menu_text = sprintf( '<span title="%s">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text ); |
| 103 | 103 | |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | - * When on the Installer page, show a different notice than on the Settings page |
|
| 116 | - * |
|
| 115 | + * When on the Installer page, show a different notice than on the Settings page |
|
| 116 | + * |
|
| 117 | 117 | * @param array $notice |
| 118 | 118 | * |
| 119 | 119 | * @return string License notice |
@@ -121,10 +121,10 @@ discard block |
||
| 121 | 121 | public function maybe_modify_license_notice( $notice = '' ) { |
| 122 | 122 | |
| 123 | 123 | if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) { |
| 124 | - return $notice; |
|
| 125 | - } |
|
| 124 | + return $notice; |
|
| 125 | + } |
|
| 126 | 126 | |
| 127 | - return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
| 127 | + return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -162,43 +162,43 @@ discard block |
||
| 162 | 162 | * Get downloads data from transient or from API; save transient after getting data from API |
| 163 | 163 | * |
| 164 | 164 | * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: { |
| 165 | - * @type array $info { |
|
| 166 | - * @type string $id int 17 |
|
| 167 | - * @type string $slug Extension slug |
|
| 168 | - * @type string $title Extension title |
|
| 169 | - * @type string $create_date in '2018-07-19 20:03:10' format |
|
| 170 | - * @type string $modified_date |
|
| 171 | - * @type string $status |
|
| 172 | - * @type string $link URL to public plugin page |
|
| 173 | - * @type string $content |
|
| 174 | - * @type string $excerpt |
|
| 175 | - * @type string $thumbnail URL to thumbnail |
|
| 176 | - * @type array $category Taxonomy details for the plugin's category { |
|
| 177 | - * @type int $term_id => int 30 |
|
| 178 | - * @type string $name => string 'Plugins' (length=7) |
|
| 179 | - * @type string $slug => string 'plugins' (length=7) |
|
| 180 | - * @type int $term_group => int 0 |
|
| 181 | - * @type int $term_taxonomy_id => int 30 |
|
| 182 | - * @type string $taxonomy => string 'download_category' (length=17) |
|
| 183 | - * @type string $description => string '' (length=0) |
|
| 184 | - * @type int $parent => int 0 |
|
| 185 | - * @type int $count => int 4 |
|
| 186 | - * @type string $filter => string 'raw' (length=3) |
|
| 187 | - * } |
|
| 188 | - * @type array $tags {see $category above} |
|
| 189 | - * @type string $textdomain string 'gravityview' (length=11) |
|
| 190 | - * } |
|
| 191 | - * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
| 192 | - * @type array $licensing { |
|
| 193 | - * @type bool $enabled Is licensing enabled for the extension |
|
| 194 | - * @type string $version Version number |
|
| 195 | - * @type string $exp_unit Expiration unit ('years') |
|
| 196 | - * @type string $exp_length Expiration length ('1') |
|
| 197 | - * } |
|
| 198 | - * @type array $files Array of files. Empty if user has no access to the file. { |
|
| 199 | - * @type string $file string URL of the file download |
|
| 200 | - * } |
|
| 201 | - * } |
|
| 165 | + * @type array $info { |
|
| 166 | + * @type string $id int 17 |
|
| 167 | + * @type string $slug Extension slug |
|
| 168 | + * @type string $title Extension title |
|
| 169 | + * @type string $create_date in '2018-07-19 20:03:10' format |
|
| 170 | + * @type string $modified_date |
|
| 171 | + * @type string $status |
|
| 172 | + * @type string $link URL to public plugin page |
|
| 173 | + * @type string $content |
|
| 174 | + * @type string $excerpt |
|
| 175 | + * @type string $thumbnail URL to thumbnail |
|
| 176 | + * @type array $category Taxonomy details for the plugin's category { |
|
| 177 | + * @type int $term_id => int 30 |
|
| 178 | + * @type string $name => string 'Plugins' (length=7) |
|
| 179 | + * @type string $slug => string 'plugins' (length=7) |
|
| 180 | + * @type int $term_group => int 0 |
|
| 181 | + * @type int $term_taxonomy_id => int 30 |
|
| 182 | + * @type string $taxonomy => string 'download_category' (length=17) |
|
| 183 | + * @type string $description => string '' (length=0) |
|
| 184 | + * @type int $parent => int 0 |
|
| 185 | + * @type int $count => int 4 |
|
| 186 | + * @type string $filter => string 'raw' (length=3) |
|
| 187 | + * } |
|
| 188 | + * @type array $tags {see $category above} |
|
| 189 | + * @type string $textdomain string 'gravityview' (length=11) |
|
| 190 | + * } |
|
| 191 | + * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
| 192 | + * @type array $licensing { |
|
| 193 | + * @type bool $enabled Is licensing enabled for the extension |
|
| 194 | + * @type string $version Version number |
|
| 195 | + * @type string $exp_unit Expiration unit ('years') |
|
| 196 | + * @type string $exp_length Expiration length ('1') |
|
| 197 | + * } |
|
| 198 | + * @type array $files Array of files. Empty if user has no access to the file. { |
|
| 199 | + * @type string $file string URL of the file download |
|
| 200 | + * } |
|
| 201 | + * } |
|
| 202 | 202 | */ |
| 203 | 203 | public function get_downloads_data() { |
| 204 | 204 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | ) ); |
| 227 | 227 | |
| 228 | 228 | if ( is_wp_error( $response ) ) { |
| 229 | - gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
| 229 | + gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
| 230 | 230 | return $response; |
| 231 | 231 | } |
| 232 | 232 | |
@@ -279,10 +279,10 @@ discard block |
||
| 279 | 279 | <div class="gv-admin-installer-notice notice inline error"> |
| 280 | 280 | <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3> |
| 281 | 281 | <?php |
| 282 | - if ( is_wp_error( $downloads_data ) ) { |
|
| 283 | - echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
| 284 | - } |
|
| 285 | - ?> |
|
| 282 | + if ( is_wp_error( $downloads_data ) ) { |
|
| 283 | + echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
| 284 | + } |
|
| 285 | + ?> |
|
| 286 | 286 | </div> |
| 287 | 287 | </div> |
| 288 | 288 | <?php |
@@ -338,9 +338,9 @@ discard block |
||
| 338 | 338 | protected function render_download( $download, $wp_plugins ) { |
| 339 | 339 | |
| 340 | 340 | |
| 341 | - $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
| 341 | + $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
| 342 | 342 | |
| 343 | - $download_info = $details['download_info']; |
|
| 343 | + $download_info = $details['download_info']; |
|
| 344 | 344 | |
| 345 | 345 | ?> |
| 346 | 346 | <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
@@ -362,43 +362,43 @@ discard block |
||
| 362 | 362 | |
| 363 | 363 | <div class="addon-excerpt"><?php |
| 364 | 364 | |
| 365 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 365 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 366 | 366 | |
| 367 | - // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
| 368 | - $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
| 369 | - $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
| 367 | + // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
| 368 | + $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
| 369 | + $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
| 370 | 370 | |
| 371 | - $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
| 372 | - $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
| 371 | + $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
| 372 | + $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
| 373 | 373 | $excerpt = str_replace( $replacements, $tags, $excerpt ); |
| 374 | 374 | |
| 375 | 375 | echo wpautop( $excerpt ); |
| 376 | - ?></div> |
|
| 376 | + ?></div> |
|
| 377 | 377 | </div> |
| 378 | 378 | </div> |
| 379 | 379 | <?php |
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | /** |
| 383 | - * Generates details array for the download to keep the render_download() method a bit tidier |
|
| 384 | - * |
|
| 383 | + * Generates details array for the download to keep the render_download() method a bit tidier |
|
| 384 | + * |
|
| 385 | 385 | * @param array $download Single download, as returned by {@see get_downloads_data} |
| 386 | 386 | * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()} |
| 387 | 387 | * |
| 388 | 388 | * @return array { |
| 389 | - * @type array $download_info |
|
| 390 | - * @type string $plugin_path |
|
| 391 | - * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
| 392 | - * @type string $status_label |
|
| 393 | - * @type string $button_title Title attribute to show when hovering over the download's button |
|
| 394 | - * @type string $button_class CSS class to use for the button |
|
| 395 | - * @type string $button_label Text to use for the download's anchor link |
|
| 396 | - * @type string $href URL for the download's button |
|
| 397 | - * @type bool $spinner Whether to show the spinner icon |
|
| 398 | - * @type string $item_class CSS class for the download container |
|
| 399 | - * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
| 400 | - * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
| 401 | - * } |
|
| 389 | + * @type array $download_info |
|
| 390 | + * @type string $plugin_path |
|
| 391 | + * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
| 392 | + * @type string $status_label |
|
| 393 | + * @type string $button_title Title attribute to show when hovering over the download's button |
|
| 394 | + * @type string $button_class CSS class to use for the button |
|
| 395 | + * @type string $button_label Text to use for the download's anchor link |
|
| 396 | + * @type string $href URL for the download's button |
|
| 397 | + * @type bool $spinner Whether to show the spinner icon |
|
| 398 | + * @type string $item_class CSS class for the download container |
|
| 399 | + * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
| 400 | + * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
| 401 | + * } |
|
| 402 | 402 | */ |
| 403 | 403 | private function get_download_display_details( $download, $wp_plugins ) { |
| 404 | 404 | |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | 'slug' => '', |
| 410 | 410 | 'excerpt' => '', |
| 411 | 411 | 'link' => '', |
| 412 | - 'coming_soon' => false, |
|
| 412 | + 'coming_soon' => false, |
|
| 413 | 413 | 'installer_title' => null, // May not be defined |
| 414 | 414 | 'installer_excerpt' => null, // May not be defined |
| 415 | 415 | ) ); |
@@ -451,14 +451,14 @@ discard block |
||
| 451 | 451 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
| 455 | - $spinner = false; |
|
| 456 | - $status = 'notinstalled'; |
|
| 457 | - $status_label = __( 'Coming Soon', 'gravityview' ); |
|
| 458 | - $button_label = __( 'Learn More', 'gravityview' ); |
|
| 459 | - $button_class = 'button-primary button-large'; |
|
| 460 | - $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
| 461 | - } |
|
| 454 | + elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
| 455 | + $spinner = false; |
|
| 456 | + $status = 'notinstalled'; |
|
| 457 | + $status_label = __( 'Coming Soon', 'gravityview' ); |
|
| 458 | + $button_label = __( 'Learn More', 'gravityview' ); |
|
| 459 | + $button_class = 'button-primary button-large'; |
|
| 460 | + $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
| 461 | + } |
|
| 462 | 462 | |
| 463 | 463 | // Access but the plugin is not installed |
| 464 | 464 | elseif ( ! $wp_plugin ) { |
@@ -498,18 +498,18 @@ discard block |
||
| 498 | 498 | } |
| 499 | 499 | |
| 500 | 500 | return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
| 501 | - } |
|
| 501 | + } |
|
| 502 | 502 | |
| 503 | 503 | /** |
| 504 | - * Returns the base price for an extension |
|
| 505 | - * |
|
| 504 | + * Returns the base price for an extension |
|
| 505 | + * |
|
| 506 | 506 | * @param array $download |
| 507 | 507 | * |
| 508 | 508 | * @return float Base price for an extension. If not for sale separately, returns 0 |
| 509 | 509 | */ |
| 510 | 510 | private function get_download_base_price( $download ) { |
| 511 | 511 | |
| 512 | - $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
| 512 | + $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
| 513 | 513 | $base_price = \GFCommon::to_number( $base_price ); |
| 514 | 514 | |
| 515 | 515 | unset( $download['pricing']['amount'] ); |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | return floatval( $base_price ); |
| 523 | - } |
|
| 523 | + } |
|
| 524 | 524 | |
| 525 | 525 | /** |
| 526 | 526 | * Handle AJAX request to activate extension |
@@ -538,8 +538,8 @@ discard block |
||
| 538 | 538 | |
| 539 | 539 | if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
| 540 | 540 | wp_send_json_error( array( |
| 541 | - 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
| 542 | - ) ); |
|
| 541 | + 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
| 542 | + ) ); |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | wp_send_json_success(); |
@@ -560,10 +560,10 @@ discard block |
||
| 560 | 560 | deactivate_plugins( $data['path'] ); |
| 561 | 561 | |
| 562 | 562 | if( is_plugin_active( $data['path'] ) ) { |
| 563 | - wp_send_json_error( array( |
|
| 564 | - 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
| 565 | - ) ); |
|
| 566 | - } |
|
| 563 | + wp_send_json_error( array( |
|
| 564 | + 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
| 565 | + ) ); |
|
| 566 | + } |
|
| 567 | 567 | |
| 568 | 568 | wp_send_json_success(); |
| 569 | 569 | } |
@@ -449,9 +449,7 @@ |
||
| 449 | 449 | $button_label = sprintf( __( 'Upgrade to %s for Access', 'gravityview' ), $required_license ); |
| 450 | 450 | $button_class = 'button-primary button-large'; |
| 451 | 451 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
| 452 | - } |
|
| 453 | - |
|
| 454 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
| 452 | + } elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
| 455 | 453 | $spinner = false; |
| 456 | 454 | $status = 'notinstalled'; |
| 457 | 455 | $status_label = __( 'Coming Soon', 'gravityview' ); |