@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | abstract class GravityView_Extension extends \GV\Extension { |
16 | 16 | public function __construct() { |
17 | - if( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
17 | + if ( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
18 | 18 | gravityview()->log->warning( '\GravityView_Extension is deprecated. Inherit from \GV\Extension instead', array( 'data' => $this ) ); |
19 | 19 | } |
20 | 20 | parent::__construct(); |
@@ -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' ); |
@@ -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 |
@@ -379,9 +379,9 @@ discard block |
||
379 | 379 | */ |
380 | 380 | protected function render_download( $download, $wp_plugins ) { |
381 | 381 | |
382 | - $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
382 | + $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
383 | 383 | |
384 | - $download_info = $details['download_info']; |
|
384 | + $download_info = $details['download_info']; |
|
385 | 385 | |
386 | 386 | ?> |
387 | 387 | <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
@@ -405,45 +405,45 @@ discard block |
||
405 | 405 | |
406 | 406 | <div class="addon-excerpt"><?php |
407 | 407 | |
408 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
408 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
409 | 409 | |
410 | - // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
411 | - $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
412 | - $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
410 | + // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
411 | + $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
412 | + $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
413 | 413 | |
414 | - $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
415 | - $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
414 | + $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
415 | + $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
416 | 416 | $excerpt = str_replace( $replacements, $tags, $excerpt ); |
417 | 417 | |
418 | 418 | echo wpautop( $excerpt ); |
419 | - ?></div> |
|
419 | + ?></div> |
|
420 | 420 | </div> |
421 | 421 | </div> |
422 | 422 | <?php |
423 | 423 | } |
424 | 424 | |
425 | 425 | /** |
426 | - * Generates details array for the download to keep the render_download() method a bit tidier |
|
427 | - * |
|
426 | + * Generates details array for the download to keep the render_download() method a bit tidier |
|
427 | + * |
|
428 | 428 | * @since 2.10 Allow managing installed add-ons whether or not the user's license shows they have access. |
429 | 429 | * |
430 | 430 | * @param array $download Single download, as returned by {@see get_downloads_data} |
431 | 431 | * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()} |
432 | 432 | * |
433 | 433 | * @return array { |
434 | - * @type array $download_info |
|
435 | - * @type string $plugin_path |
|
436 | - * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
437 | - * @type string $status_label |
|
438 | - * @type string $button_title Title attribute to show when hovering over the download's button |
|
439 | - * @type string $button_class CSS class to use for the button |
|
440 | - * @type string $button_label Text to use for the download's anchor link |
|
441 | - * @type string $href URL for the download's button |
|
442 | - * @type bool $spinner Whether to show the spinner icon |
|
443 | - * @type string $item_class CSS class for the download container |
|
444 | - * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
445 | - * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
446 | - * } |
|
434 | + * @type array $download_info |
|
435 | + * @type string $plugin_path |
|
436 | + * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
437 | + * @type string $status_label |
|
438 | + * @type string $button_title Title attribute to show when hovering over the download's button |
|
439 | + * @type string $button_class CSS class to use for the button |
|
440 | + * @type string $button_label Text to use for the download's anchor link |
|
441 | + * @type string $href URL for the download's button |
|
442 | + * @type bool $spinner Whether to show the spinner icon |
|
443 | + * @type string $item_class CSS class for the download container |
|
444 | + * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
445 | + * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
446 | + * } |
|
447 | 447 | */ |
448 | 448 | private function get_download_display_details( $download, $wp_plugins ) { |
449 | 449 | |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | 'slug' => '', |
455 | 455 | 'excerpt' => '', |
456 | 456 | 'link' => '', |
457 | - 'coming_soon' => false, |
|
457 | + 'coming_soon' => false, |
|
458 | 458 | 'installer_title' => null, // May not be defined |
459 | 459 | 'installer_excerpt' => null, // May not be defined |
460 | 460 | ) ); |
@@ -496,14 +496,14 @@ discard block |
||
496 | 496 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
497 | 497 | } |
498 | 498 | |
499 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
500 | - $spinner = false; |
|
501 | - $status = 'notinstalled'; |
|
502 | - $status_label = __( 'Coming Soon', 'gravityview' ); |
|
503 | - $button_label = __( 'Learn More', 'gravityview' ); |
|
504 | - $button_class = 'button-primary button-large'; |
|
505 | - $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
506 | - } |
|
499 | + elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
500 | + $spinner = false; |
|
501 | + $status = 'notinstalled'; |
|
502 | + $status_label = __( 'Coming Soon', 'gravityview' ); |
|
503 | + $button_label = __( 'Learn More', 'gravityview' ); |
|
504 | + $button_class = 'button-primary button-large'; |
|
505 | + $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
506 | + } |
|
507 | 507 | |
508 | 508 | // Access but the plugin is not installed |
509 | 509 | elseif ( ! $wp_plugin ) { |
@@ -547,18 +547,18 @@ discard block |
||
547 | 547 | $download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] ); |
548 | 548 | |
549 | 549 | return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
550 | - } |
|
550 | + } |
|
551 | 551 | |
552 | 552 | /** |
553 | - * Returns the base price for an extension |
|
554 | - * |
|
553 | + * Returns the base price for an extension |
|
554 | + * |
|
555 | 555 | * @param array $download |
556 | 556 | * |
557 | 557 | * @return float Base price for an extension. If not for sale separately, returns 0 |
558 | 558 | */ |
559 | 559 | private function get_download_base_price( $download ) { |
560 | 560 | |
561 | - $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
561 | + $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
562 | 562 | $base_price = \GFCommon::to_number( $base_price ); |
563 | 563 | |
564 | 564 | unset( $download['pricing']['amount'] ); |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | } |
570 | 570 | |
571 | 571 | return floatval( $base_price ); |
572 | - } |
|
572 | + } |
|
573 | 573 | |
574 | 574 | /** |
575 | 575 | * Handle AJAX request to activate extension |
@@ -587,8 +587,8 @@ discard block |
||
587 | 587 | |
588 | 588 | if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
589 | 589 | wp_send_json_error( array( |
590 | - 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
591 | - ) ); |
|
590 | + 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
591 | + ) ); |
|
592 | 592 | } |
593 | 593 | |
594 | 594 | wp_send_json_success(); |
@@ -609,10 +609,10 @@ discard block |
||
609 | 609 | deactivate_plugins( $data['path'] ); |
610 | 610 | |
611 | 611 | if( is_plugin_active( $data['path'] ) ) { |
612 | - wp_send_json_error( array( |
|
613 | - 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
614 | - ) ); |
|
615 | - } |
|
612 | + wp_send_json_error( array( |
|
613 | + 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
614 | + ) ); |
|
615 | + } |
|
616 | 616 | |
617 | 617 | wp_send_json_success(); |
618 | 618 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function register_noconflict( $items ) { |
55 | 55 | |
56 | - $items[] = 'gravityview-admin-installer'; |
|
56 | + $items[ ] = 'gravityview-admin-installer'; |
|
57 | 57 | |
58 | 58 | return $items; |
59 | 59 | } |
@@ -68,21 +68,21 @@ discard block |
||
68 | 68 | |
69 | 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 | |
75 | - add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) { |
|
75 | + add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) { |
|
76 | 76 | foreach ( $downloads_data as $extension ) { |
77 | - if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) { |
|
77 | + if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) { |
|
78 | 78 | continue; |
79 | 79 | } |
80 | 80 | |
81 | - return (object) array( |
|
82 | - 'slug' => $extension['info']['slug'], |
|
83 | - 'name' => $extension['info']['title'], |
|
84 | - 'version' => $extension['licensing']['version'], |
|
85 | - 'download_link' => $extension['files'][0]['file'], |
|
81 | + return (object)array( |
|
82 | + 'slug' => $extension[ 'info' ][ 'slug' ], |
|
83 | + 'name' => $extension[ 'info' ][ 'title' ], |
|
84 | + 'version' => $extension[ 'licensing' ][ 'version' ], |
|
85 | + 'download_link' => $extension[ 'files' ][ 0 ][ 'file' ], |
|
86 | 86 | ); |
87 | 87 | } |
88 | 88 | |
@@ -149,13 +149,13 @@ discard block |
||
149 | 149 | |
150 | 150 | foreach ( $all_plugins as $path => $plugin ) { |
151 | 151 | |
152 | - if ( empty( $plugin['TextDomain'] ) ) { |
|
152 | + if ( empty( $plugin[ 'TextDomain' ] ) ) { |
|
153 | 153 | continue; |
154 | 154 | } |
155 | 155 | |
156 | - $wp_plugins[ $plugin['TextDomain'] ] = array( |
|
156 | + $wp_plugins[ $plugin[ 'TextDomain' ] ] = array( |
|
157 | 157 | 'path' => $path, |
158 | - 'version' => $plugin['Version'], |
|
158 | + 'version' => $plugin[ 'Version' ], |
|
159 | 159 | 'activated' => is_plugin_active( $path ) |
160 | 160 | ); |
161 | 161 | } |
@@ -209,11 +209,11 @@ discard block |
||
209 | 209 | |
210 | 210 | $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT ); |
211 | 211 | |
212 | - if ( $downloads_data && ! isset( $_GET['cache'] ) ) { |
|
212 | + if ( $downloads_data && ! isset( $_GET[ 'cache' ] ) ) { |
|
213 | 213 | return $downloads_data; |
214 | 214 | } |
215 | 215 | |
216 | - if( \GV\Plugin::is_network_activated() ) { |
|
216 | + if ( \GV\Plugin::is_network_activated() ) { |
|
217 | 217 | $home_url = network_home_url(); |
218 | 218 | } else { |
219 | 219 | $home_url = home_url(); |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | |
242 | 242 | $downloads_data = json_decode( wp_remote_retrieve_body( $response ), true ); |
243 | 243 | |
244 | - if ( empty( $downloads_data['products'] ) ) { |
|
244 | + if ( empty( $downloads_data[ 'products' ] ) ) { |
|
245 | 245 | return array(); |
246 | 246 | } |
247 | 247 | |
248 | - $this->set_downloads_data( $downloads_data['products'] ); |
|
248 | + $this->set_downloads_data( $downloads_data[ 'products' ] ); |
|
249 | 249 | |
250 | - return $downloads_data['products']; |
|
250 | + return $downloads_data[ 'products' ]; |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | |
308 | 308 | <h2><?php esc_html_e( 'The following plugins extend GravityView and Gravity Forms functionality:', 'gravityview' ); ?></h2> |
309 | 309 | |
310 | - <a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg(array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a> |
|
310 | + <a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg( array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a> |
|
311 | 311 | |
312 | 312 | <hr class="wp-header-end" /> |
313 | 313 | |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | |
325 | 325 | $this->render_section( 'extensions', esc_html__( 'GravityView Extensions', 'gravityview' ), $downloads_data, $wp_plugins ); |
326 | 326 | |
327 | - $this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
327 | + $this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
328 | 328 | |
329 | - $this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
329 | + $this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
330 | 330 | |
331 | - $this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
331 | + $this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins ); |
|
332 | 332 | ?> |
333 | 333 | </div> |
334 | 334 | </div> |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | continue; |
356 | 356 | } |
357 | 357 | |
358 | - if ( empty( $download['info'] ) ) { |
|
358 | + if ( empty( $download[ 'info' ] ) ) { |
|
359 | 359 | continue; |
360 | 360 | } |
361 | 361 | |
@@ -383,31 +383,31 @@ discard block |
||
383 | 383 | |
384 | 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 | - <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
|
389 | + <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>"> |
|
390 | 390 | <div class="addon-inner"> |
391 | - <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a> |
|
392 | - <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3> |
|
391 | + <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a> |
|
392 | + <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3> |
|
393 | 393 | <div> |
394 | - <?php if( ! empty( $details['status_label'] ) ) { ?> |
|
395 | - <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>"> |
|
396 | - <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span> |
|
394 | + <?php if ( ! empty( $details[ 'status_label' ] ) ) { ?> |
|
395 | + <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>"> |
|
396 | + <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span> |
|
397 | 397 | </div> |
398 | 398 | <?php } ?> |
399 | 399 | |
400 | - <?php if ( 'gravityview' !== $download_info['slug'] ) { ?> |
|
401 | - <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>"> |
|
402 | - <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span> |
|
403 | - <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?> |
|
400 | + <?php if ( 'gravityview' !== $download_info[ 'slug' ] ) { ?> |
|
401 | + <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>"> |
|
402 | + <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span> |
|
403 | + <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?> |
|
404 | 404 | </a> |
405 | 405 | <?php } ?> |
406 | 406 | </div> |
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 | 412 | // Allow some pure HTML tags, but remove everything else from the excerpt. |
413 | 413 | $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | */ |
450 | 450 | private function get_download_display_details( $download, $wp_plugins ) { |
451 | 451 | |
452 | - $download_info = wp_parse_args( (array) $download['info'], array( |
|
452 | + $download_info = wp_parse_args( (array)$download[ 'info' ], array( |
|
453 | 453 | 'thumbnail' => '', |
454 | 454 | 'title' => '', |
455 | 455 | 'textdomain' => '', |
@@ -461,9 +461,9 @@ discard block |
||
461 | 461 | 'installer_excerpt' => null, // May not be defined |
462 | 462 | ) ); |
463 | 463 | |
464 | - $wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false ); |
|
464 | + $wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false ); |
|
465 | 465 | |
466 | - $has_access = ! empty( $download['files'] ); |
|
466 | + $has_access = ! empty( $download[ 'files' ] ); |
|
467 | 467 | $spinner = true; |
468 | 468 | $href = $plugin_path = '#'; |
469 | 469 | $status = $item_class = $button_title = $button_class = ''; |
@@ -473,11 +473,11 @@ discard block |
||
473 | 473 | $required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' ); |
474 | 474 | |
475 | 475 | // The license is not active - no matter what level, this should not work |
476 | - if( ! $is_active && empty( $base_price ) ) { |
|
476 | + if ( ! $is_active && empty( $base_price ) ) { |
|
477 | 477 | $spinner = false; |
478 | 478 | $status_label = ''; |
479 | 479 | $button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license ); |
480 | - $href = $download_info['link']; |
|
480 | + $href = $download_info[ 'link' ]; |
|
481 | 481 | $button_class = 'button-primary'; |
482 | 482 | } |
483 | 483 | |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | $status_label = ''; |
488 | 488 | $button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price ); |
489 | 489 | $button_class = 'button-primary button-large'; |
490 | - $href = $download_info['link']; |
|
490 | + $href = $download_info[ 'link' ]; |
|
491 | 491 | $item_class = 'featured'; |
492 | 492 | } |
493 | 493 | |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | $href = 'https://gravityview.co/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'] ) ) { |
|
503 | + elseif ( ! empty( $download_info[ 'coming_soon' ] ) ) { |
|
504 | 504 | $spinner = false; |
505 | 505 | $status = 'notinstalled'; |
506 | 506 | $status_label = __( 'Coming Soon', 'gravityview' ); |
@@ -515,8 +515,8 @@ discard block |
||
515 | 515 | $href = add_query_arg( |
516 | 516 | array( |
517 | 517 | 'action' => 'install-plugin', |
518 | - 'plugin' => $download_info['slug'], |
|
519 | - '_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ), |
|
518 | + 'plugin' => $download_info[ 'slug' ], |
|
519 | + '_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ), |
|
520 | 520 | ), |
521 | 521 | self_admin_url( 'update.php' ) |
522 | 522 | ); |
@@ -532,12 +532,12 @@ discard block |
||
532 | 532 | $status = 'inactive'; |
533 | 533 | $status_label = __( 'Inactive', 'gravityview' ); |
534 | 534 | $button_label = __( 'Activate', 'gravityview' ); |
535 | - $plugin_path = $wp_plugin['path']; |
|
535 | + $plugin_path = $wp_plugin[ 'path' ]; |
|
536 | 536 | $button_class = 'button-secondary'; |
537 | 537 | } |
538 | 538 | // The plugin is installed and active |
539 | - elseif ( ! empty( $wp_plugin['path'] ) ) { |
|
540 | - $plugin_path = $wp_plugin['path']; |
|
539 | + elseif ( ! empty( $wp_plugin[ 'path' ] ) ) { |
|
540 | + $plugin_path = $wp_plugin[ 'path' ]; |
|
541 | 541 | $status = 'active'; |
542 | 542 | $status_label = __( 'Active', 'gravityview' ); |
543 | 543 | $button_label = __( 'Deactivate', 'gravityview' ); |
@@ -550,9 +550,9 @@ discard block |
||
550 | 550 | $href = add_query_arg( array( 'license_key' => $license_key ), $href ); |
551 | 551 | } |
552 | 552 | |
553 | - $download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] ); |
|
553 | + $download_info[ 'link' ] = add_query_arg( array( 'license_key' => $license_key ), $download_info[ 'link' ] ); |
|
554 | 554 | |
555 | - return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
|
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 | /** |
@@ -567,11 +567,11 @@ discard block |
||
567 | 567 | $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
568 | 568 | $base_price = \GFCommon::to_number( $base_price ); |
569 | 569 | |
570 | - unset( $download['pricing']['amount'] ); |
|
570 | + unset( $download[ 'pricing' ][ 'amount' ] ); |
|
571 | 571 | |
572 | 572 | // Price options array, not single price |
573 | - if ( ! $base_price && ! empty( $download['pricing'] ) ) { |
|
574 | - $base_price = array_shift( $download['pricing'] ); |
|
573 | + if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) { |
|
574 | + $base_price = array_shift( $download[ 'pricing' ] ); |
|
575 | 575 | } |
576 | 576 | |
577 | 577 | return floatval( $base_price ); |
@@ -585,13 +585,13 @@ discard block |
||
585 | 585 | public function activate_download() { |
586 | 586 | $data = \GV\Utils::_POST( 'data', array() ); |
587 | 587 | |
588 | - if ( empty( $data['path'] ) ) { |
|
588 | + if ( empty( $data[ 'path' ] ) ) { |
|
589 | 589 | return; |
590 | 590 | } |
591 | 591 | |
592 | - $result = activate_plugin( $data['path'] ); |
|
592 | + $result = activate_plugin( $data[ 'path' ] ); |
|
593 | 593 | |
594 | - if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
|
594 | + if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) { |
|
595 | 595 | wp_send_json_error( array( |
596 | 596 | 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
597 | 597 | ) ); |
@@ -608,13 +608,13 @@ discard block |
||
608 | 608 | public function deactivate_download() { |
609 | 609 | $data = \GV\Utils::_POST( 'data', array() ); |
610 | 610 | |
611 | - if ( empty( $data['path'] ) ) { |
|
611 | + if ( empty( $data[ 'path' ] ) ) { |
|
612 | 612 | return; |
613 | 613 | } |
614 | 614 | |
615 | - deactivate_plugins( $data['path'] ); |
|
615 | + deactivate_plugins( $data[ 'path' ] ); |
|
616 | 616 | |
617 | - if( is_plugin_active( $data['path'] ) ) { |
|
617 | + if ( is_plugin_active( $data[ 'path' ] ) ) { |
|
618 | 618 | wp_send_json_error( array( |
619 | 619 | 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
620 | 620 | ) ); |
@@ -78,7 +78,7 @@ |
||
78 | 78 | $gv_page = gravityview()->request->is_admin( '', 'single' ); |
79 | 79 | |
80 | 80 | // New View or Edit View page |
81 | - if( $gv_page && $pagenow === 'post-new.php' ) { |
|
81 | + if ( $gv_page && $pagenow === 'post-new.php' ) { |
|
82 | 82 | remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' ); |
83 | 83 | } |
84 | 84 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | parent::add_hooks(); |
69 | 69 | |
70 | - if( gravityview()->request->is_admin( '', null ) ) { |
|
70 | + if ( gravityview()->request->is_admin( '', null ) ) { |
|
71 | 71 | |
72 | 72 | // Make Yoast metabox go down to the bottom please. |
73 | 73 | add_filter( 'wpseo_metabox_prio', array( $this, 'return_low' ) ); |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function disable_content_analysis( $options ) { |
94 | 94 | |
95 | - $options['keyword_analysis_active'] = false; |
|
96 | - $options['content_analysis_active'] = false; |
|
95 | + $options[ 'keyword_analysis_active' ] = false; |
|
96 | + $options[ 'content_analysis_active' ] = false; |
|
97 | 97 | |
98 | 98 | return $options; |
99 | 99 | } |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | global $pagenow; |
113 | 113 | |
114 | 114 | // New View page |
115 | - if( $pagenow === 'post-new.php' ) { |
|
116 | - $options['hideeditbox-gravityview'] = true; |
|
115 | + if ( $pagenow === 'post-new.php' ) { |
|
116 | + $options[ 'hideeditbox-gravityview' ] = true; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | return $options; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | $is_page = false; |
40 | 40 | |
41 | - if( function_exists( '\get_current_screen' ) || function_exists( 'get_current_screen' ) ) { |
|
41 | + if ( function_exists( '\get_current_screen' ) || function_exists( 'get_current_screen' ) ) { |
|
42 | 42 | $current_screen = \get_current_screen(); |
43 | 43 | } else { |
44 | 44 | $current_screen = false; |
@@ -51,13 +51,13 @@ discard block |
||
51 | 51 | $is_page = 'single'; |
52 | 52 | } elseif ( $is_gv_settings = 'gravityview_page_gravityview_settings' === $current_screen->id ) { |
53 | 53 | $is_page = 'settings'; |
54 | - } elseif( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) { |
|
54 | + } elseif ( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) { |
|
55 | 55 | $is_page = 'downloads'; |
56 | - } elseif( $is_changelog = 'gravityview_page_gv-changelog' === $current_screen->id ) { |
|
56 | + } elseif ( $is_changelog = 'gravityview_page_gv-changelog' === $current_screen->id ) { |
|
57 | 57 | $is_page = 'changelog'; |
58 | - } elseif( $is_getting_started = 'gravityview_page_gv-getting-started' === $current_screen->id ) { |
|
58 | + } elseif ( $is_getting_started = 'gravityview_page_gv-getting-started' === $current_screen->id ) { |
|
59 | 59 | $is_page = 'getting-started'; |
60 | - } elseif( $is_credits = 'gravityview_page_gv-credits' === $current_screen->id ) { |
|
60 | + } elseif ( $is_credits = 'gravityview_page_gv-credits' === $current_screen->id ) { |
|
61 | 61 | $is_page = 'credits'; |
62 | 62 | } |
63 | 63 | } |
@@ -29,11 +29,11 @@ |
||
29 | 29 | $KWS_GF_Change_Lead_Creator = new KWS_GF_Change_Lead_Creator; |
30 | 30 | |
31 | 31 | // Now, no validation is required in the methods; let's hook in. |
32 | - remove_action('admin_init', array( $KWS_GF_Change_Lead_Creator, 'set_screen_mode' ) ); |
|
32 | + remove_action( 'admin_init', array( $KWS_GF_Change_Lead_Creator, 'set_screen_mode' ) ); |
|
33 | 33 | |
34 | - remove_action("gform_entry_info", array( $KWS_GF_Change_Lead_Creator, 'add_select' ), 10 ); |
|
34 | + remove_action( "gform_entry_info", array( $KWS_GF_Change_Lead_Creator, 'add_select' ), 10 ); |
|
35 | 35 | |
36 | - remove_action("gform_after_update_entry", array( $KWS_GF_Change_Lead_Creator, 'update_entry_creator' ), 10 ); |
|
36 | + remove_action( "gform_after_update_entry", array( $KWS_GF_Change_Lead_Creator, 'update_entry_creator' ), 10 ); |
|
37 | 37 | |
38 | 38 | } |
39 | 39 | } |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | * This allows us to fake it till we make it. |
110 | 110 | */ |
111 | 111 | $parameters = $view->settings->as_atts(); |
112 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
112 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
113 | 113 | $has_multisort = true; |
114 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
115 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
116 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
114 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
115 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
116 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | 'entries' => $entries, |
129 | 129 | 'request' => $request, |
130 | 130 | ), empty( $parameters ) ? array() : array( |
131 | - 'paging' => $parameters['paging'], |
|
132 | - 'sorting' => $parameters['sorting'], |
|
131 | + 'paging' => $parameters[ 'paging' ], |
|
132 | + 'sorting' => $parameters[ 'sorting' ], |
|
133 | 133 | ), empty( $post ) ? array() : array( |
134 | 134 | 'post' => $post, |
135 | 135 | ) ) ); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | if( is_array( $search_field['value'] ) ) { |
19 | - gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
19 | + gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
20 | 20 | $search_field['value'] = reset( $search_field['value'] ); |
21 | 21 | } |
22 | 22 |
@@ -10,14 +10,14 @@ discard block |
||
10 | 10 | $search_field = $gravityview_view->search_field; |
11 | 11 | |
12 | 12 | // Make sure that there are choices to display |
13 | -if( empty( $search_field['choices'] ) ) { |
|
13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
14 | 14 | gravityview()->log->debug( 'search-field-select.php - No choices for field' ); |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | -if( is_array( $search_field['value'] ) ) { |
|
18 | +if ( is_array( $search_field[ 'value' ] ) ) { |
|
19 | 19 | gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
20 | - $search_field['value'] = reset( $search_field['value'] ); |
|
20 | + $search_field[ 'value' ] = reset( $search_field[ 'value' ] ); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -26,26 +26,26 @@ discard block |
||
26 | 26 | * @param string $default_option Default: `—` (—) |
27 | 27 | * @param string $field_type Field type: "select" or "multiselect" |
28 | 28 | */ |
29 | -$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' ); |
|
29 | +$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' ); |
|
30 | 30 | |
31 | 31 | ?> |
32 | 32 | <div class="gv-search-box gv-search-field-select"> |
33 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
34 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
33 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
34 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
35 | 35 | <?php } ?> |
36 | 36 | <p> |
37 | - <select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"> |
|
38 | - <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
37 | + <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"> |
|
38 | + <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
39 | 39 | <?php |
40 | - foreach( $search_field['choices'] as $choice ) { ?> |
|
41 | - <?php if ( is_array( $choice['value'] ) ) { ?> |
|
42 | - <optgroup label="<?php echo esc_attr( $choice['text'] ); ?>"> |
|
43 | - <?php foreach ( $choice['value'] as $subchoice ): ?> |
|
44 | - <option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option> |
|
40 | + foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
41 | + <?php if ( is_array( $choice[ 'value' ] ) ) { ?> |
|
42 | + <optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>"> |
|
43 | + <?php foreach ( $choice[ 'value' ] as $subchoice ): ?> |
|
44 | + <option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option> |
|
45 | 45 | <?php endforeach; ?> |
46 | 46 | </optgroup> |
47 | 47 | <?php } else { ?> |
48 | - <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
48 | + <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
49 | 49 | <?php } ?> |
50 | 50 | <?php } ?> |
51 | 51 | </select> |
@@ -58,16 +58,16 @@ |
||
58 | 58 | if ( $view->joins ) { |
59 | 59 | $form_ids = array(); |
60 | 60 | foreach ( $view->joins as $join ) { |
61 | - $form_ids[] = $join->join->ID; |
|
62 | - $form_ids[] = $join->join_on->ID; |
|
61 | + $form_ids[ ] = $join->join->ID; |
|
62 | + $form_ids[ ] = $join->join_on->ID; |
|
63 | 63 | } |
64 | 64 | foreach ( $entry->entries as $e ) { |
65 | - if ( ! in_array( $e['form_id'], $form_ids ) ) { |
|
65 | + if ( ! in_array( $e[ 'form_id' ], $form_ids ) ) { |
|
66 | 66 | gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $e->ID, 'view_id' => $view->ID ) ); |
67 | 67 | return null; |
68 | 68 | } |
69 | 69 | } |
70 | - } else if ( $view->form && $view->form->ID != $entry['form_id'] ) { |
|
70 | + } else if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) { |
|
71 | 71 | gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) ); |
72 | 72 | return null; |
73 | 73 | } |