@@ -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 && ! isset( $_GET['cache'] ) ) { |
|
71 | + if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) { |
|
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( 'Manage Add-Ons', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
100 | + $menu_text = _x( 'Manage Add-Ons', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' ); |
|
101 | 101 | |
102 | 102 | $menu_text = sprintf( '<span title="%s" style="margin: 0">%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 | /** |
@@ -167,43 +167,43 @@ discard block |
||
167 | 167 | * Get downloads data from transient or from API; save transient after getting data from API |
168 | 168 | * |
169 | 169 | * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: { |
170 | - * @type array $info { |
|
171 | - * @type string $id int 17 |
|
172 | - * @type string $slug Extension slug |
|
173 | - * @type string $title Extension title |
|
174 | - * @type string $create_date in '2018-07-19 20:03:10' format |
|
175 | - * @type string $modified_date |
|
176 | - * @type string $status |
|
177 | - * @type string $link URL to public plugin page |
|
178 | - * @type string $content |
|
179 | - * @type string $excerpt |
|
180 | - * @type string $thumbnail URL to thumbnail |
|
181 | - * @type array $category Taxonomy details for the plugin's category { |
|
182 | - * @type int $term_id => int 30 |
|
183 | - * @type string $name => string 'Plugins' (length=7) |
|
184 | - * @type string $slug => string 'plugins' (length=7) |
|
185 | - * @type int $term_group => int 0 |
|
186 | - * @type int $term_taxonomy_id => int 30 |
|
187 | - * @type string $taxonomy => string 'download_category' (length=17) |
|
188 | - * @type string $description => string '' (length=0) |
|
189 | - * @type int $parent => int 0 |
|
190 | - * @type int $count => int 4 |
|
191 | - * @type string $filter => string 'raw' (length=3) |
|
192 | - * } |
|
193 | - * @type array $tags {see $category above} |
|
194 | - * @type string $textdomain string 'gravityview' (length=11) |
|
195 | - * } |
|
196 | - * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
197 | - * @type array $licensing { |
|
198 | - * @type bool $enabled Is licensing enabled for the extension |
|
199 | - * @type string $version Version number |
|
200 | - * @type string $exp_unit Expiration unit ('years') |
|
201 | - * @type string $exp_length Expiration length ('1') |
|
202 | - * } |
|
203 | - * @type array $files Array of files. Empty if user has no access to the file. { |
|
204 | - * @type string $file string URL of the file download |
|
205 | - * } |
|
206 | - * } |
|
170 | + * @type array $info { |
|
171 | + * @type string $id int 17 |
|
172 | + * @type string $slug Extension slug |
|
173 | + * @type string $title Extension title |
|
174 | + * @type string $create_date in '2018-07-19 20:03:10' format |
|
175 | + * @type string $modified_date |
|
176 | + * @type string $status |
|
177 | + * @type string $link URL to public plugin page |
|
178 | + * @type string $content |
|
179 | + * @type string $excerpt |
|
180 | + * @type string $thumbnail URL to thumbnail |
|
181 | + * @type array $category Taxonomy details for the plugin's category { |
|
182 | + * @type int $term_id => int 30 |
|
183 | + * @type string $name => string 'Plugins' (length=7) |
|
184 | + * @type string $slug => string 'plugins' (length=7) |
|
185 | + * @type int $term_group => int 0 |
|
186 | + * @type int $term_taxonomy_id => int 30 |
|
187 | + * @type string $taxonomy => string 'download_category' (length=17) |
|
188 | + * @type string $description => string '' (length=0) |
|
189 | + * @type int $parent => int 0 |
|
190 | + * @type int $count => int 4 |
|
191 | + * @type string $filter => string 'raw' (length=3) |
|
192 | + * } |
|
193 | + * @type array $tags {see $category above} |
|
194 | + * @type string $textdomain string 'gravityview' (length=11) |
|
195 | + * } |
|
196 | + * @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist |
|
197 | + * @type array $licensing { |
|
198 | + * @type bool $enabled Is licensing enabled for the extension |
|
199 | + * @type string $version Version number |
|
200 | + * @type string $exp_unit Expiration unit ('years') |
|
201 | + * @type string $exp_length Expiration length ('1') |
|
202 | + * } |
|
203 | + * @type array $files Array of files. Empty if user has no access to the file. { |
|
204 | + * @type string $file string URL of the file download |
|
205 | + * } |
|
206 | + * } |
|
207 | 207 | */ |
208 | 208 | public function get_downloads_data() { |
209 | 209 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | ) ); |
236 | 236 | |
237 | 237 | if ( is_wp_error( $response ) ) { |
238 | - gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
238 | + gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
239 | 239 | return $response; |
240 | 240 | } |
241 | 241 | |
@@ -288,10 +288,10 @@ discard block |
||
288 | 288 | <div class="gv-admin-installer-notice notice inline error"> |
289 | 289 | <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3> |
290 | 290 | <?php |
291 | - if ( is_wp_error( $downloads_data ) ) { |
|
292 | - echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
293 | - } |
|
294 | - ?> |
|
291 | + if ( is_wp_error( $downloads_data ) ) { |
|
292 | + echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
293 | + } |
|
294 | + ?> |
|
295 | 295 | </div> |
296 | 296 | </div> |
297 | 297 | <?php |
@@ -381,9 +381,9 @@ discard block |
||
381 | 381 | */ |
382 | 382 | protected function render_download( $download, $wp_plugins ) { |
383 | 383 | |
384 | - $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
384 | + $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
385 | 385 | |
386 | - $download_info = $details['download_info']; |
|
386 | + $download_info = $details['download_info']; |
|
387 | 387 | |
388 | 388 | ?> |
389 | 389 | <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
@@ -407,45 +407,45 @@ discard block |
||
407 | 407 | |
408 | 408 | <div class="addon-excerpt"><?php |
409 | 409 | |
410 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
410 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
411 | 411 | |
412 | - // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
413 | - $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
414 | - $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
412 | + // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
413 | + $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
414 | + $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
415 | 415 | |
416 | - $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
417 | - $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
416 | + $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
417 | + $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
418 | 418 | $excerpt = str_replace( $replacements, $tags, $excerpt ); |
419 | 419 | |
420 | 420 | echo wpautop( $excerpt ); |
421 | - ?></div> |
|
421 | + ?></div> |
|
422 | 422 | </div> |
423 | 423 | </div> |
424 | 424 | <?php |
425 | 425 | } |
426 | 426 | |
427 | 427 | /** |
428 | - * Generates details array for the download to keep the render_download() method a bit tidier |
|
429 | - * |
|
428 | + * Generates details array for the download to keep the render_download() method a bit tidier |
|
429 | + * |
|
430 | 430 | * @since 2.10 Allow managing installed add-ons whether or not the user's license shows they have access. |
431 | 431 | * |
432 | 432 | * @param array $download Single download, as returned by {@see get_downloads_data} |
433 | 433 | * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()} |
434 | 434 | * |
435 | 435 | * @return array { |
436 | - * @type array $download_info |
|
437 | - * @type string $plugin_path |
|
438 | - * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
439 | - * @type string $status_label |
|
440 | - * @type string $button_title Title attribute to show when hovering over the download's button |
|
441 | - * @type string $button_class CSS class to use for the button |
|
442 | - * @type string $button_label Text to use for the download's anchor link |
|
443 | - * @type string $href URL for the download's button |
|
444 | - * @type bool $spinner Whether to show the spinner icon |
|
445 | - * @type string $item_class CSS class for the download container |
|
446 | - * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
447 | - * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
448 | - * } |
|
436 | + * @type array $download_info |
|
437 | + * @type string $plugin_path |
|
438 | + * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
439 | + * @type string $status_label |
|
440 | + * @type string $button_title Title attribute to show when hovering over the download's button |
|
441 | + * @type string $button_class CSS class to use for the button |
|
442 | + * @type string $button_label Text to use for the download's anchor link |
|
443 | + * @type string $href URL for the download's button |
|
444 | + * @type bool $spinner Whether to show the spinner icon |
|
445 | + * @type string $item_class CSS class for the download container |
|
446 | + * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
447 | + * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
448 | + * } |
|
449 | 449 | */ |
450 | 450 | private function get_download_display_details( $download, $wp_plugins ) { |
451 | 451 | |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | 'slug' => '', |
457 | 457 | 'excerpt' => '', |
458 | 458 | 'link' => '', |
459 | - 'coming_soon' => false, |
|
459 | + 'coming_soon' => false, |
|
460 | 460 | 'installer_title' => null, // May not be defined |
461 | 461 | 'installer_excerpt' => null, // May not be defined |
462 | 462 | ) ); |
@@ -500,14 +500,14 @@ discard block |
||
500 | 500 | $href = 'https://www.gravitykit.com/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
501 | 501 | } |
502 | 502 | |
503 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
504 | - $spinner = false; |
|
505 | - $status = 'notinstalled'; |
|
506 | - $status_label = __( 'Coming Soon', 'gravityview' ); |
|
507 | - $button_label = __( 'Learn More', 'gravityview' ); |
|
508 | - $button_class = 'button-primary button-large'; |
|
509 | - $href = \GV\Utils::get( $download_info, 'link', 'https://www.gravitykit.com/extensions/' ); |
|
510 | - } |
|
503 | + elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
504 | + $spinner = false; |
|
505 | + $status = 'notinstalled'; |
|
506 | + $status_label = __( 'Coming Soon', 'gravityview' ); |
|
507 | + $button_label = __( 'Learn More', 'gravityview' ); |
|
508 | + $button_class = 'button-primary button-large'; |
|
509 | + $href = \GV\Utils::get( $download_info, 'link', 'https://www.gravitykit.com/extensions/' ); |
|
510 | + } |
|
511 | 511 | |
512 | 512 | // Access but the plugin is not installed |
513 | 513 | elseif ( ! $wp_plugin ) { |
@@ -553,18 +553,18 @@ discard block |
||
553 | 553 | $download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] ); |
554 | 554 | |
555 | 555 | return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
556 | - } |
|
556 | + } |
|
557 | 557 | |
558 | 558 | /** |
559 | - * Returns the base price for an extension |
|
560 | - * |
|
559 | + * Returns the base price for an extension |
|
560 | + * |
|
561 | 561 | * @param array $download |
562 | 562 | * |
563 | 563 | * @return float Base price for an extension. If not for sale separately, returns 0 |
564 | 564 | */ |
565 | 565 | private function get_download_base_price( $download ) { |
566 | 566 | |
567 | - $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
567 | + $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
568 | 568 | $base_price = \GFCommon::to_number( $base_price ); |
569 | 569 | |
570 | 570 | unset( $download['pricing']['amount'] ); |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | } |
576 | 576 | |
577 | 577 | return floatval( $base_price ); |
578 | - } |
|
578 | + } |
|
579 | 579 | |
580 | 580 | /** |
581 | 581 | * Handle AJAX request to activate extension |
@@ -593,8 +593,8 @@ discard block |
||
593 | 593 | |
594 | 594 | if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
595 | 595 | wp_send_json_error( array( |
596 | - 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
597 | - ) ); |
|
596 | + 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
597 | + ) ); |
|
598 | 598 | } |
599 | 599 | |
600 | 600 | wp_send_json_success(); |
@@ -615,10 +615,10 @@ discard block |
||
615 | 615 | deactivate_plugins( $data['path'] ); |
616 | 616 | |
617 | 617 | if( is_plugin_active( $data['path'] ) ) { |
618 | - wp_send_json_error( array( |
|
619 | - 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
620 | - ) ); |
|
621 | - } |
|
618 | + wp_send_json_error( array( |
|
619 | + 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
620 | + ) ); |
|
621 | + } |
|
622 | 622 | |
623 | 623 | wp_send_json_success(); |
624 | 624 | } |