@@ -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 | } |
@@ -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 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @var string The hash key used to generate secure message history |
| 16 | - * @since 2.2.5 |
|
| 16 | + * @since 2.2.5 |
|
| 17 | 17 | */ |
| 18 | 18 | const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w='; |
| 19 | 19 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | 'payment_id' => '', |
| 111 | 111 | 'customer_name' => '', |
| 112 | 112 | 'customer_email' => '', |
| 113 | - 'price_id' => '0', |
|
| 113 | + 'price_id' => '0', |
|
| 114 | 114 | ) ); |
| 115 | 115 | |
| 116 | 116 | // This is just HTML we don't need. |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | case 3: |
| 128 | 128 | $package = 'All Access'; |
| 129 | 129 | break; |
| 130 | - case 4: |
|
| 131 | - $package = 'Lifetime'; |
|
| 132 | - break; |
|
| 130 | + case 4: |
|
| 131 | + $package = 'Lifetime'; |
|
| 132 | + break; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $current_user = wp_get_current_user(); |
@@ -159,27 +159,27 @@ discard block |
||
| 159 | 159 | // Help Scout length limit is 200 characters |
| 160 | 160 | foreach( $data as $key => $value ) { |
| 161 | 161 | if ( ! is_string( $value ) ) { |
| 162 | - continue; |
|
| 162 | + continue; |
|
| 163 | 163 | } |
| 164 | - $data[ $key ] = mb_substr( $value, 0, 200 ); |
|
| 165 | - } |
|
| 164 | + $data[ $key ] = mb_substr( $value, 0, 200 ); |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | 167 | $localization_data = array( |
| 168 | 168 | 'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ), |
| 169 | 169 | 'data' => $data, |
| 170 | 170 | 'translation' => $translation, |
| 171 | - 'suggest' => array(), |
|
| 171 | + 'suggest' => array(), |
|
| 172 | 172 | ); |
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | - * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run |
|
| 175 | + * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run |
|
| 176 | 176 | * @since 2.0 |
| 177 | - * @param array $localization_data { |
|
| 178 | - * @type int $contactEnabled Can the user contact support? |
|
| 179 | - * @type array $data Support/license info |
|
| 180 | - * @type array $translation i18n strings |
|
| 181 | - * @type array $suggest Article IDs to recommend to the user (per page in the admin |
|
| 182 | - * } |
|
| 177 | + * @param array $localization_data { |
|
| 178 | + * @type int $contactEnabled Can the user contact support? |
|
| 179 | + * @type array $data Support/license info |
|
| 180 | + * @type array $translation i18n strings |
|
| 181 | + * @type array $suggest Article IDs to recommend to the user (per page in the admin |
|
| 182 | + * } |
|
| 183 | 183 | */ |
| 184 | 184 | $localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data ); |
| 185 | 185 | |
@@ -193,11 +193,11 @@ discard block |
||
| 193 | 193 | * |
| 194 | 194 | * If the user doesn't have the `gravityview_support_port` capability, returns false; then |
| 195 | 195 | * If global setting is "hide", returns false; then |
| 196 | - * If user preference is not set, return global setting; then |
|
| 197 | - * If user preference is set, return that setting. |
|
| 196 | + * If user preference is not set, return global setting; then |
|
| 197 | + * If user preference is set, return that setting. |
|
| 198 | 198 | * |
| 199 | 199 | * @since 1.15 |
| 200 | - * @since 1.17.5 Changed behavior to respect global setting |
|
| 200 | + * @since 1.17.5 Changed behavior to respect global setting |
|
| 201 | 201 | * |
| 202 | 202 | * @param int $user Optional. ID of the user to check, defaults to 0 for current user. |
| 203 | 203 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $global_setting = gravityview()->plugin->settings->get( 'support_port' ); |
| 213 | 213 | |
| 214 | 214 | if ( empty( $global_setting ) ) { |
| 215 | - return false; |
|
| 215 | + return false; |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | // Get the per-user Support Port setting |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * Modifies the output of profile.php to add GravityView Support preference |
| 249 | 249 | * |
| 250 | 250 | * @since 1.15 |
| 251 | - * @since 1.17.5 Only show if global setting is active |
|
| 251 | + * @since 1.17.5 Only show if global setting is active |
|
| 252 | 252 | * |
| 253 | 253 | * @param WP_User $user Current user info |
| 254 | 254 | * |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $global_setting = gravityview()->plugin->settings->get( 'support_port' ); |
| 260 | 260 | |
| 261 | 261 | if ( empty( $global_setting ) ) { |
| 262 | - return; |
|
| 262 | + return; |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | - * Constructor. Add filters to modify output. |
|
| 23 | - * |
|
| 22 | + * Constructor. Add filters to modify output. |
|
| 23 | + * |
|
| 24 | 24 | * @since 2.0.4 |
| 25 | 25 | * |
| 26 | 26 | * @param View $view |
@@ -29,19 +29,19 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function __construct( View $view, Entry_Collection $entries, Request $request ) { |
| 31 | 31 | |
| 32 | - add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
| 32 | + add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
| 33 | 33 | |
| 34 | 34 | parent::__construct( $view, $entries, $request ); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | - * Add sorting links to HTML columns that support sorting |
|
| 39 | - * |
|
| 40 | - * @since 2.0.4 |
|
| 41 | - * @since 2.0.5 Made static |
|
| 42 | - * |
|
| 43 | - * @static |
|
| 44 | - * |
|
| 38 | + * Add sorting links to HTML columns that support sorting |
|
| 39 | + * |
|
| 40 | + * @since 2.0.4 |
|
| 41 | + * @since 2.0.5 Made static |
|
| 42 | + * |
|
| 43 | + * @static |
|
| 44 | + * |
|
| 45 | 45 | * @param string $column_label Label for the table column |
| 46 | 46 | * @param \GV\Template_Context $context |
| 47 | 47 | * |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $sort_columns = $context->view->settings->get( 'sort_columns' ); |
| 53 | 53 | |
| 54 | 54 | if ( empty( $sort_columns ) ) { |
| 55 | - return $column_label; |
|
| 55 | + return $column_label; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) { |
@@ -102,22 +102,22 @@ discard block |
||
| 102 | 102 | // If we are already sorting by the current field... |
| 103 | 103 | if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
| 104 | 104 | |
| 105 | - switch( $sorting['direction'] ) { |
|
| 106 | - // No sort |
|
| 107 | - case '': |
|
| 108 | - $sort_args[1] = 'asc'; |
|
| 109 | - $class .= ' gv-icon-caret-up-down'; |
|
| 110 | - break; |
|
| 111 | - case 'desc': |
|
| 112 | - $sort_args[1] = ''; |
|
| 113 | - $class .= ' gv-icon-sort-asc'; |
|
| 114 | - break; |
|
| 115 | - case 'asc': |
|
| 116 | - default: |
|
| 117 | - $sort_args[1] = 'desc'; |
|
| 118 | - $class .= ' gv-icon-sort-desc'; |
|
| 119 | - break; |
|
| 120 | - } |
|
| 105 | + switch( $sorting['direction'] ) { |
|
| 106 | + // No sort |
|
| 107 | + case '': |
|
| 108 | + $sort_args[1] = 'asc'; |
|
| 109 | + $class .= ' gv-icon-caret-up-down'; |
|
| 110 | + break; |
|
| 111 | + case 'desc': |
|
| 112 | + $sort_args[1] = ''; |
|
| 113 | + $class .= ' gv-icon-sort-asc'; |
|
| 114 | + break; |
|
| 115 | + case 'asc': |
|
| 116 | + default: |
|
| 117 | + $sort_args[1] = 'desc'; |
|
| 118 | + $class .= ' gv-icon-sort-desc'; |
|
| 119 | + break; |
|
| 120 | + } |
|
| 121 | 121 | |
| 122 | 122 | } else { |
| 123 | 123 | $class .= ' gv-icon-caret-up-down'; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $url = remove_query_arg( 'sort', $url ); |
| 128 | 128 | $multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID ); |
| 129 | 129 | |
| 130 | - $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 130 | + $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 131 | 131 | |
| 132 | 132 | $return = '<a href="'. esc_url_raw( $url ) .'"'; |
| 133 | 133 | |
@@ -141,50 +141,50 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * Get the multi-sort URL used in the sorting links |
|
| 145 | - * |
|
| 146 | - * @todo Consider moving to Utils? |
|
| 147 | - * |
|
| 148 | - * @since 2.3 |
|
| 149 | - * |
|
| 150 | - * @see add_columns_sort_links |
|
| 144 | + * Get the multi-sort URL used in the sorting links |
|
| 145 | + * |
|
| 146 | + * @todo Consider moving to Utils? |
|
| 147 | + * |
|
| 148 | + * @since 2.3 |
|
| 149 | + * |
|
| 150 | + * @see add_columns_sort_links |
|
| 151 | 151 | * @param string $url Single-sort URL |
| 152 | 152 | * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format |
| 153 | - * @param string|int $field_id ID of the current field being displayed |
|
| 154 | - * |
|
| 155 | - * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
| 153 | + * @param string|int $field_id ID of the current field being displayed |
|
| 154 | + * |
|
| 155 | + * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
| 156 | 156 | */ |
| 157 | 157 | static public function _get_multisort_url( $url, $sort_args, $field_id ) { |
| 158 | 158 | |
| 159 | 159 | $sorts = Utils::_GET( 'sort' ); |
| 160 | 160 | |
| 161 | 161 | if ( ! is_array( $sorts ) ) { |
| 162 | - return $url; |
|
| 162 | + return $url; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - $multisort_url = $url; |
|
| 165 | + $multisort_url = $url; |
|
| 166 | 166 | |
| 167 | 167 | // If the field has already been sorted by, add the field to the URL |
| 168 | - if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
| 169 | - if ( count( $keys ) ) { |
|
| 170 | - $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
| 171 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 172 | - } else { |
|
| 173 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - // Otherwise, we are just updating the sort order |
|
| 177 | - else { |
|
| 178 | - |
|
| 179 | - // Pass empty value to unset |
|
| 180 | - if( '' === $sort_args[1] ) { |
|
| 181 | - unset( $sorts[ $field_id ] ); |
|
| 182 | - } else { |
|
| 183 | - $sorts[ $field_id ] = $sort_args[1]; |
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
| 187 | - } |
|
| 168 | + if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
| 169 | + if ( count( $keys ) ) { |
|
| 170 | + $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
| 171 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 172 | + } else { |
|
| 173 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + // Otherwise, we are just updating the sort order |
|
| 177 | + else { |
|
| 178 | + |
|
| 179 | + // Pass empty value to unset |
|
| 180 | + if( '' === $sort_args[1] ) { |
|
| 181 | + unset( $sorts[ $field_id ] ); |
|
| 182 | + } else { |
|
| 183 | + $sorts[ $field_id ] = $sort_args[1]; |
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
| 187 | + } |
|
| 188 | 188 | |
| 189 | 189 | return $multisort_url; |
| 190 | 190 | } |
@@ -214,10 +214,10 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | - * Returns the label for a column, with support for all deprecated filters |
|
| 218 | - * |
|
| 219 | - * @since 2.1 |
|
| 220 | - * |
|
| 217 | + * Returns the label for a column, with support for all deprecated filters |
|
| 218 | + * |
|
| 219 | + * @since 2.1 |
|
| 220 | + * |
|
| 221 | 221 | * @param \GV\Field $field |
| 222 | 222 | * @param \GV\Template_Context $context |
| 223 | 223 | */ |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context ); |
| 241 | 241 | |
| 242 | 242 | return $column_label; |
| 243 | - } |
|
| 243 | + } |
|
| 244 | 244 | |
| 245 | 245 | /** |
| 246 | 246 | * Output the entry row. |
@@ -309,15 +309,15 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | do_action( 'gravityview/template/table/cells/before', $context ); |
| 311 | 311 | |
| 312 | - /** |
|
| 313 | - * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 314 | - * @since 1.0.7 |
|
| 312 | + /** |
|
| 313 | + * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 314 | + * @since 1.0.7 |
|
| 315 | 315 | * @param \GravityView_View $this Current GravityView_View object |
| 316 | 316 | * @deprecated Use `gravityview/template/table/cells/before` |
| 317 | - */ |
|
| 318 | - do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
| 317 | + */ |
|
| 318 | + do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
| 319 | 319 | |
| 320 | - foreach ( $fields->all() as $field ) { |
|
| 320 | + foreach ( $fields->all() as $field ) { |
|
| 321 | 321 | if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
| 322 | 322 | if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
| 323 | 323 | $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
@@ -337,13 +337,13 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | do_action( 'gravityview/template/table/cells/after', $context ); |
| 339 | 339 | |
| 340 | - /** |
|
| 341 | - * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 342 | - * @since 1.0.7 |
|
| 340 | + /** |
|
| 341 | + * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 342 | + * @since 1.0.7 |
|
| 343 | 343 | * @param \GravityView_View $this Current GravityView_View object |
| 344 | 344 | * @deprecated Use `gravityview/template/table/cells/after` |
| 345 | - */ |
|
| 346 | - do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
| 345 | + */ |
|
| 346 | + do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
| 347 | 347 | |
| 348 | 348 | ?> |
| 349 | 349 | </tr> |
@@ -384,9 +384,9 @@ discard block |
||
| 384 | 384 | 'value' => $value, |
| 385 | 385 | 'hide_empty' => false, |
| 386 | 386 | 'zone_id' => 'directory_table-columns', |
| 387 | - 'label' => self::get_field_column_label( $field, $context ), |
|
| 387 | + 'label' => self::get_field_column_label( $field, $context ), |
|
| 388 | 388 | 'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>', |
| 389 | - 'form' => $form, |
|
| 389 | + 'form' => $form, |
|
| 390 | 390 | ); |
| 391 | 391 | |
| 392 | 392 | /** Output. */ |
@@ -411,11 +411,11 @@ discard block |
||
| 411 | 411 | do_action( 'gravityview/template/table/body/before', $context ); |
| 412 | 412 | |
| 413 | 413 | /** |
| 414 | - * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 415 | - * @deprecated Use `gravityview/template/table/body/before` |
|
| 416 | - * @since 1.0.7 |
|
| 417 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 418 | - */ |
|
| 414 | + * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 415 | + * @deprecated Use `gravityview/template/table/body/before` |
|
| 416 | + * @since 1.0.7 |
|
| 417 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 418 | + */ |
|
| 419 | 419 | do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
| 420 | 420 | } |
| 421 | 421 | |
@@ -437,11 +437,11 @@ discard block |
||
| 437 | 437 | do_action( 'gravityview/template/table/body/after', $context ); |
| 438 | 438 | |
| 439 | 439 | /** |
| 440 | - * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 441 | - * @deprecated Use `gravityview/template/table/body/after` |
|
| 442 | - * @since 1.0.7 |
|
| 443 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 444 | - */ |
|
| 440 | + * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 441 | + * @deprecated Use `gravityview/template/table/body/after` |
|
| 442 | + * @since 1.0.7 |
|
| 443 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 444 | + */ |
|
| 445 | 445 | do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
| 446 | 446 | } |
| 447 | 447 | |
@@ -170,10 +170,10 @@ |
||
| 170 | 170 | */ |
| 171 | 171 | public function is_edit_entry( $form_id = 0 ) { |
| 172 | 172 | /** |
| 173 | - * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n |
|
| 174 | - * The Edit Entry functionality overrides this value. |
|
| 175 | - * @param boolean $is_edit_entry |
|
| 176 | - */ |
|
| 173 | + * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n |
|
| 174 | + * The Edit Entry functionality overrides this value. |
|
| 175 | + * @param boolean $is_edit_entry |
|
| 176 | + */ |
|
| 177 | 177 | if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) { |
| 178 | 178 | if ( $entry->is_multi() ) { |
| 179 | 179 | return array_pop( $entry->entries ); |
@@ -361,14 +361,14 @@ discard block |
||
| 361 | 361 | /** |
| 362 | 362 | * update_approved function. |
| 363 | 363 | * |
| 364 | - * @since 1.18 Moved to GravityView_Entry_Approval::update_approved |
|
| 364 | + * @since 1.18 Moved to GravityView_Entry_Approval::update_approved |
|
| 365 | 365 | * @see GravityView_Entry_Approval::update_approved |
| 366 | - * |
|
| 366 | + * |
|
| 367 | 367 | * @param int $entry_id (default: 0) |
| 368 | 368 | * @param int $approved (default: 0) |
| 369 | 369 | * @param int $form_id (default: 0) |
| 370 | 370 | * @param int $approvedcolumn (default: 0) |
| 371 | - * |
|
| 371 | + * |
|
| 372 | 372 | * @return boolean True: It worked; False: it failed |
| 373 | 373 | */ |
| 374 | 374 | public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) { |
@@ -378,9 +378,9 @@ discard block |
||
| 378 | 378 | /** |
| 379 | 379 | * Calculate the approve field.input id |
| 380 | 380 | * |
| 381 | - * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column |
|
| 382 | - * @see GravityView_Entry_Approval::get_approved_column |
|
| 383 | - * |
|
| 381 | + * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column |
|
| 382 | + * @see GravityView_Entry_Approval::get_approved_column |
|
| 383 | + * |
|
| 384 | 384 | * @param mixed $form GF Form or Form ID |
| 385 | 385 | * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set. |
| 386 | 386 | */ |
@@ -505,37 +505,37 @@ discard block |
||
| 505 | 505 | 'bulk_actions' => $this->get_bulk_actions( $form_id ), |
| 506 | 506 | 'bulk_message' => $this->bulk_update_message, |
| 507 | 507 | 'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'), |
| 508 | - 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), |
|
| 508 | + 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'), |
|
| 509 | 509 | 'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'), |
| 510 | 510 | 'column_title' => __( 'Show entry in directory view?', 'gravityview'), |
| 511 | 511 | 'column_link' => esc_url( $this->get_sort_link() ), |
| 512 | - 'status_popover_template' => GravityView_Entry_Approval::get_popover_template(), |
|
| 512 | + 'status_popover_template' => GravityView_Entry_Approval::get_popover_template(), |
|
| 513 | 513 | 'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(), |
| 514 | 514 | ) ); |
| 515 | 515 | |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | /** |
| 519 | - * Generate a link to sort by approval status |
|
| 520 | - * |
|
| 521 | - * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as |
|
| 522 | - * numeric, but it does group the approved entries together. |
|
| 523 | - * |
|
| 524 | - * @since 2.0.14 Remove need for approval field for sorting by approval status |
|
| 525 | - * |
|
| 519 | + * Generate a link to sort by approval status |
|
| 520 | + * |
|
| 521 | + * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as |
|
| 522 | + * numeric, but it does group the approved entries together. |
|
| 523 | + * |
|
| 524 | + * @since 2.0.14 Remove need for approval field for sorting by approval status |
|
| 525 | + * |
|
| 526 | 526 | * @param int $form_id [NO LONGER USED] |
| 527 | 527 | * |
| 528 | 528 | * @return string Sorting link |
| 529 | 529 | */ |
| 530 | 530 | private function get_sort_link( $form_id = 0 ) { |
| 531 | 531 | |
| 532 | - $args = array( |
|
| 533 | - 'orderby' => 'is_approved', |
|
| 534 | - 'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc', |
|
| 535 | - ); |
|
| 532 | + $args = array( |
|
| 533 | + 'orderby' => 'is_approved', |
|
| 534 | + 'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc', |
|
| 535 | + ); |
|
| 536 | 536 | |
| 537 | 537 | return add_query_arg( $args ); |
| 538 | - } |
|
| 538 | + } |
|
| 539 | 539 | |
| 540 | 540 | /** |
| 541 | 541 | * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group |
@@ -577,9 +577,9 @@ discard block |
||
| 577 | 577 | // Sanitize the values, just to be sure. |
| 578 | 578 | foreach ( $bulk_actions as $key => $group ) { |
| 579 | 579 | |
| 580 | - if( empty( $group ) ) { |
|
| 581 | - continue; |
|
| 582 | - } |
|
| 580 | + if( empty( $group ) ) { |
|
| 581 | + continue; |
|
| 582 | + } |
|
| 583 | 583 | |
| 584 | 584 | foreach ( $group as $i => $action ) { |
| 585 | 585 | $bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] ); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | // template areas |
| 140 | 140 | $template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' ); |
| 141 | - $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' ); |
|
| 141 | + $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' ); |
|
| 142 | 142 | |
| 143 | 143 | // widget areas |
| 144 | 144 | $default_widget_areas = \GV\Widget::get_default_widget_areas(); |
@@ -331,40 +331,40 @@ discard block |
||
| 331 | 331 | // load file |
| 332 | 332 | $xmlstr = file_get_contents( $form_file ); |
| 333 | 333 | |
| 334 | - $options = array( |
|
| 335 | - "page" => array("unserialize_as_array" => true), |
|
| 336 | - "form"=> array("unserialize_as_array" => true), |
|
| 337 | - "field"=> array("unserialize_as_array" => true), |
|
| 338 | - "rule"=> array("unserialize_as_array" => true), |
|
| 339 | - "choice"=> array("unserialize_as_array" => true), |
|
| 340 | - "input"=> array("unserialize_as_array" => true), |
|
| 341 | - "routing_item"=> array("unserialize_as_array" => true), |
|
| 342 | - "creditCard"=> array("unserialize_as_array" => true), |
|
| 343 | - "routin"=> array("unserialize_as_array" => true), |
|
| 344 | - "confirmation" => array("unserialize_as_array" => true), |
|
| 345 | - "notification" => array("unserialize_as_array" => true) |
|
| 346 | - ); |
|
| 334 | + $options = array( |
|
| 335 | + "page" => array("unserialize_as_array" => true), |
|
| 336 | + "form"=> array("unserialize_as_array" => true), |
|
| 337 | + "field"=> array("unserialize_as_array" => true), |
|
| 338 | + "rule"=> array("unserialize_as_array" => true), |
|
| 339 | + "choice"=> array("unserialize_as_array" => true), |
|
| 340 | + "input"=> array("unserialize_as_array" => true), |
|
| 341 | + "routing_item"=> array("unserialize_as_array" => true), |
|
| 342 | + "creditCard"=> array("unserialize_as_array" => true), |
|
| 343 | + "routin"=> array("unserialize_as_array" => true), |
|
| 344 | + "confirmation" => array("unserialize_as_array" => true), |
|
| 345 | + "notification" => array("unserialize_as_array" => true) |
|
| 346 | + ); |
|
| 347 | 347 | |
| 348 | 348 | $xml = new RGXML($options); |
| 349 | - $forms = $xml->unserialize($xmlstr); |
|
| 349 | + $forms = $xml->unserialize($xmlstr); |
|
| 350 | 350 | |
| 351 | - if( !$forms ) { |
|
| 352 | - gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) ); |
|
| 353 | - return false; |
|
| 354 | - } |
|
| 351 | + if( !$forms ) { |
|
| 352 | + gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) ); |
|
| 353 | + return false; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - if( !empty( $forms[0] ) && is_array( $forms[0] ) ) { |
|
| 357 | - $form = $forms[0]; |
|
| 358 | - } |
|
| 356 | + if( !empty( $forms[0] ) && is_array( $forms[0] ) ) { |
|
| 357 | + $form = $forms[0]; |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if( empty( $form ) ) { |
|
| 361 | - gravityview()->log->error( '$form not set.', array( 'data' => $forms ) ); |
|
| 362 | - return false; |
|
| 363 | - } |
|
| 360 | + if( empty( $form ) ) { |
|
| 361 | + gravityview()->log->error( '$form not set.', array( 'data' => $forms ) ); |
|
| 362 | + return false; |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) ); |
|
| 365 | + gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) ); |
|
| 366 | 366 | |
| 367 | - return $form; |
|
| 367 | + return $form; |
|
| 368 | 368 | |
| 369 | 369 | } |
| 370 | 370 | |
@@ -63,28 +63,28 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * When on the Add/Edit View screen, suggest most popular articles related to that |
|
| 67 | - * |
|
| 66 | + * When on the Add/Edit View screen, suggest most popular articles related to that |
|
| 67 | + * |
|
| 68 | 68 | * @param array $localization_data Data to be passed to the Support Port JS |
| 69 | 69 | * |
| 70 | 70 | * @return array |
| 71 | 71 | */ |
| 72 | 72 | function suggest_support_articles( $localization_data = array() ) { |
| 73 | 73 | |
| 74 | - if( ! gravityview()->request->is_view() ) { |
|
| 75 | - return $localization_data; |
|
| 76 | - } |
|
| 74 | + if( ! gravityview()->request->is_view() ) { |
|
| 75 | + return $localization_data; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | 78 | $localization_data['suggest'] = array( |
| 79 | - '57ef23539033602e61d4a560', |
|
| 80 | - '54c67bb9e4b0512429885513', |
|
| 81 | - '54c67bb9e4b0512429885512', |
|
| 82 | - '54c67bbbe4b07997ea3f3f6b', |
|
| 83 | - '54d1a33ae4b086c0c0964ce9', |
|
| 84 | - '57ef253c9033602e61d4a563', |
|
| 85 | - '552355bfe4b0221aadf2572b', |
|
| 86 | - '54c67bcde4b051242988553e', |
|
| 87 | - ); |
|
| 79 | + '57ef23539033602e61d4a560', |
|
| 80 | + '54c67bb9e4b0512429885513', |
|
| 81 | + '54c67bb9e4b0512429885512', |
|
| 82 | + '54c67bbbe4b07997ea3f3f6b', |
|
| 83 | + '54d1a33ae4b086c0c0964ce9', |
|
| 84 | + '57ef253c9033602e61d4a563', |
|
| 85 | + '552355bfe4b0221aadf2572b', |
|
| 86 | + '54c67bcde4b051242988553e', |
|
| 87 | + ); |
|
| 88 | 88 | |
| 89 | 89 | return $localization_data; |
| 90 | 90 | } |
@@ -170,11 +170,11 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | if( 'form_list' === GFForms::get_page() ) { |
| 172 | 172 | $priority = 790; |
| 173 | - } |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | 175 | if( empty( $connected_views ) ) { |
| 176 | 176 | |
| 177 | - $menu_items['gravityview'] = array( |
|
| 177 | + $menu_items['gravityview'] = array( |
|
| 178 | 178 | 'label' => esc_attr__( 'Create a View', 'gravityview' ), |
| 179 | 179 | 'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', |
| 180 | 180 | 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
@@ -205,13 +205,13 @@ discard block |
||
| 205 | 205 | // If there were no items added, then let's create the parent menu |
| 206 | 206 | if( $sub_menu_items ) { |
| 207 | 207 | |
| 208 | - $sub_menu_items[] = array( |
|
| 209 | - 'label' => esc_attr__( 'Create a View', 'gravityview' ), |
|
| 210 | - 'link_class' => 'gv-create-view', |
|
| 211 | - 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
|
| 212 | - 'url' => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ), |
|
| 213 | - 'capabilities' => array( 'edit_gravityviews' ), |
|
| 214 | - ); |
|
| 208 | + $sub_menu_items[] = array( |
|
| 209 | + 'label' => esc_attr__( 'Create a View', 'gravityview' ), |
|
| 210 | + 'link_class' => 'gv-create-view', |
|
| 211 | + 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), |
|
| 212 | + 'url' => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ), |
|
| 213 | + 'capabilities' => array( 'edit_gravityviews' ), |
|
| 214 | + ); |
|
| 215 | 215 | |
| 216 | 216 | // Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown |
| 217 | 217 | $sub_menu_items[] = array( |
@@ -596,12 +596,12 @@ discard block |
||
| 596 | 596 | * Render html for displaying available fields based on a Form ID |
| 597 | 597 | * $blacklist_field_types - contains the field types which are not proper to be shown in a directory. |
| 598 | 598 | * |
| 599 | - * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action |
|
| 599 | + * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action |
|
| 600 | 600 | * @access public |
| 601 | - * |
|
| 601 | + * |
|
| 602 | 602 | * @param int $form Gravity Forms Form ID (default: '') |
| 603 | 603 | * @param string $context (default: 'single') |
| 604 | - * |
|
| 604 | + * |
|
| 605 | 605 | * @return void |
| 606 | 606 | */ |
| 607 | 607 | function render_available_fields( $form = 0, $context = 'single' ) { |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | if ( ! is_array( $blacklist_field_types ) ) { |
| 617 | 617 | |
| 618 | - gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) ); |
|
| 618 | + gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) ); |
|
| 619 | 619 | |
| 620 | 620 | $blacklist_field_types = array(); |
| 621 | 621 | } |
@@ -747,12 +747,12 @@ discard block |
||
| 747 | 747 | /** |
| 748 | 748 | * @since 1.7.2 |
| 749 | 749 | */ |
| 750 | - 'other_entries' => array( |
|
| 751 | - 'label' => __('Other Entries', 'gravityview'), |
|
| 752 | - 'type' => 'other_entries', |
|
| 753 | - 'desc' => __('Display other entries created by the entry creator.', 'gravityview'), |
|
| 754 | - ), |
|
| 755 | - ); |
|
| 750 | + 'other_entries' => array( |
|
| 751 | + 'label' => __('Other Entries', 'gravityview'), |
|
| 752 | + 'type' => 'other_entries', |
|
| 753 | + 'desc' => __('Display other entries created by the entry creator.', 'gravityview'), |
|
| 754 | + ), |
|
| 755 | + ); |
|
| 756 | 756 | |
| 757 | 757 | if( 'single' !== $zone) { |
| 758 | 758 | |
@@ -885,9 +885,9 @@ discard block |
||
| 885 | 885 | |
| 886 | 886 | $joined_forms = gravityview_get_joined_forms( $post->ID ); |
| 887 | 887 | |
| 888 | - foreach ( $joined_forms as $form ) { |
|
| 889 | - $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone ); |
|
| 890 | - } |
|
| 888 | + foreach ( $joined_forms as $form ) { |
|
| 889 | + $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone ); |
|
| 890 | + } |
|
| 891 | 891 | } else { |
| 892 | 892 | $available_items[ $form ] = \GV\Widget::registered(); |
| 893 | 893 | } |
@@ -917,9 +917,9 @@ discard block |
||
| 917 | 917 | |
| 918 | 918 | if ( $form_id ) { |
| 919 | 919 | $original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ; |
| 920 | - } else { |
|
| 920 | + } else { |
|
| 921 | 921 | $original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ; |
| 922 | - } |
|
| 922 | + } |
|
| 923 | 923 | |
| 924 | 924 | if ( !$original_item ) { |
| 925 | 925 | gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) ); |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | |
| 973 | 973 | /** |
| 974 | 974 | * Render the widget active areas |
| 975 | - * @param string $template_id The current slug of the selected View template |
|
| 975 | + * @param string $template_id The current slug of the selected View template |
|
| 976 | 976 | * @param string $zone Either 'header' or 'footer' |
| 977 | 977 | * @param string $post_id Current Post ID (view) |
| 978 | 978 | * @return string html |
@@ -1002,13 +1002,13 @@ discard block |
||
| 1002 | 1002 | } |
| 1003 | 1003 | |
| 1004 | 1004 | /** |
| 1005 | - * Renders "Add Field" tooltips |
|
| 1006 | - * |
|
| 1007 | - * @since 2.0.11 |
|
| 1008 | - * |
|
| 1005 | + * Renders "Add Field" tooltips |
|
| 1006 | + * |
|
| 1007 | + * @since 2.0.11 |
|
| 1008 | + * |
|
| 1009 | 1009 | * @param string $context "directory", "single", or "edit" |
| 1010 | - * |
|
| 1011 | - * @return void |
|
| 1010 | + * |
|
| 1011 | + * @return void |
|
| 1012 | 1012 | */ |
| 1013 | 1013 | function render_field_pickers( $context = 'directory' ) { |
| 1014 | 1014 | |
@@ -1035,7 +1035,7 @@ discard block |
||
| 1035 | 1035 | </div> |
| 1036 | 1036 | <?php |
| 1037 | 1037 | } |
| 1038 | - } |
|
| 1038 | + } |
|
| 1039 | 1039 | |
| 1040 | 1040 | /** |
| 1041 | 1041 | * Render the Template Active Areas and configured active fields for a given template id and post id |
@@ -1101,7 +1101,7 @@ discard block |
||
| 1101 | 1101 | $is_widgets_page = ( $pagenow === 'widgets.php' ); |
| 1102 | 1102 | |
| 1103 | 1103 | // Add the GV font (with the Astronaut) |
| 1104 | - wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version ); |
|
| 1104 | + wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version ); |
|
| 1105 | 1105 | wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version ); |
| 1106 | 1106 | |
| 1107 | 1107 | wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true ); |
@@ -1109,63 +1109,63 @@ discard block |
||
| 1109 | 1109 | if( GFForms::get_page() === 'form_list' ) { |
| 1110 | 1110 | wp_enqueue_style( 'gravityview_views_styles' ); |
| 1111 | 1111 | return; |
| 1112 | - } |
|
| 1112 | + } |
|
| 1113 | 1113 | |
| 1114 | 1114 | // Don't process any scripts below here if it's not a GravityView page. |
| 1115 | 1115 | if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { |
| 1116 | - return; |
|
| 1116 | + return; |
|
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | - wp_enqueue_script( 'jquery-ui-datepicker' ); |
|
| 1120 | - wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version ); |
|
| 1121 | - |
|
| 1122 | - $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
| 1123 | - |
|
| 1124 | - //enqueue scripts |
|
| 1125 | - wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version ); |
|
| 1126 | - |
|
| 1127 | - wp_localize_script('gravityview_views_scripts', 'gvGlobals', array( |
|
| 1128 | - 'cookiepath' => COOKIEPATH, |
|
| 1129 | - 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ), |
|
| 1130 | - 'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ), |
|
| 1131 | - 'label_viewname' => __( 'Enter View name here', 'gravityview' ), |
|
| 1132 | - 'label_close' => __( 'Close', 'gravityview' ), |
|
| 1133 | - 'label_cancel' => __( 'Cancel', 'gravityview' ), |
|
| 1134 | - 'label_continue' => __( 'Continue', 'gravityview' ), |
|
| 1135 | - 'label_ok' => __( 'Ok', 'gravityview' ), |
|
| 1136 | - 'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ), |
|
| 1137 | - 'loading_text' => esc_html__( 'Loading…', 'gravityview' ), |
|
| 1138 | - 'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ), |
|
| 1139 | - 'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ), |
|
| 1140 | - 'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ), |
|
| 1141 | - )); |
|
| 1119 | + wp_enqueue_script( 'jquery-ui-datepicker' ); |
|
| 1120 | + wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version ); |
|
| 1121 | + |
|
| 1122 | + $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
| 1123 | + |
|
| 1124 | + //enqueue scripts |
|
| 1125 | + wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version ); |
|
| 1126 | + |
|
| 1127 | + wp_localize_script('gravityview_views_scripts', 'gvGlobals', array( |
|
| 1128 | + 'cookiepath' => COOKIEPATH, |
|
| 1129 | + 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ), |
|
| 1130 | + 'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ), |
|
| 1131 | + 'label_viewname' => __( 'Enter View name here', 'gravityview' ), |
|
| 1132 | + 'label_close' => __( 'Close', 'gravityview' ), |
|
| 1133 | + 'label_cancel' => __( 'Cancel', 'gravityview' ), |
|
| 1134 | + 'label_continue' => __( 'Continue', 'gravityview' ), |
|
| 1135 | + 'label_ok' => __( 'Ok', 'gravityview' ), |
|
| 1136 | + 'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ), |
|
| 1137 | + 'loading_text' => esc_html__( 'Loading…', 'gravityview' ), |
|
| 1138 | + 'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ), |
|
| 1139 | + 'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ), |
|
| 1140 | + 'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ), |
|
| 1141 | + )); |
|
| 1142 | 1142 | |
| 1143 | 1143 | wp_enqueue_style( 'gravityview_views_styles' ); |
| 1144 | 1144 | |
| 1145 | - // Enqueue scripts needed for merge tags |
|
| 1146 | - self::enqueue_gravity_forms_scripts(); |
|
| 1145 | + // Enqueue scripts needed for merge tags |
|
| 1146 | + self::enqueue_gravity_forms_scripts(); |
|
| 1147 | 1147 | } |
| 1148 | 1148 | |
| 1149 | 1149 | /** |
| 1150 | 1150 | * Enqueue Gravity Forms scripts, needed for Merge Tags |
| 1151 | - * |
|
| 1152 | - * @since 1.0.5-beta |
|
| 1153 | - * |
|
| 1154 | - * @return void |
|
| 1151 | + * |
|
| 1152 | + * @since 1.0.5-beta |
|
| 1153 | + * |
|
| 1154 | + * @return void |
|
| 1155 | 1155 | */ |
| 1156 | 1156 | static function enqueue_gravity_forms_scripts() { |
| 1157 | 1157 | GFForms::register_scripts(); |
| 1158 | 1158 | |
| 1159 | 1159 | $scripts = array( |
| 1160 | - 'sack', |
|
| 1161 | - 'gform_gravityforms', |
|
| 1162 | - 'gform_forms', |
|
| 1163 | - 'gform_form_admin', |
|
| 1164 | - 'jquery-ui-autocomplete' |
|
| 1160 | + 'sack', |
|
| 1161 | + 'gform_gravityforms', |
|
| 1162 | + 'gform_forms', |
|
| 1163 | + 'gform_form_admin', |
|
| 1164 | + 'jquery-ui-autocomplete' |
|
| 1165 | 1165 | ); |
| 1166 | 1166 | |
| 1167 | 1167 | if ( wp_is_mobile() ) { |
| 1168 | - $scripts[] = 'jquery-touch-punch'; |
|
| 1168 | + $scripts[] = 'jquery-touch-punch'; |
|
| 1169 | 1169 | } |
| 1170 | 1170 | |
| 1171 | 1171 | wp_enqueue_script( $scripts ); |
@@ -305,13 +305,13 @@ |
||
| 305 | 305 | $this->_remote_update_url, |
| 306 | 306 | $this->_path, |
| 307 | 307 | array( |
| 308 | - 'version' => $this->_version, // current version number |
|
| 309 | - 'license' => \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ), |
|
| 310 | - 'item_id' => $this->_item_id, // The ID of the download on _remote_update_url |
|
| 311 | - 'item_name' => $this->_title, // name of this plugin |
|
| 312 | - 'author' => strip_tags( $this->_author ) // author of this plugin |
|
| 313 | - ) |
|
| 314 | - ); |
|
| 308 | + 'version' => $this->_version, // current version number |
|
| 309 | + 'license' => \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ), |
|
| 310 | + 'item_id' => $this->_item_id, // The ID of the download on _remote_update_url |
|
| 311 | + 'item_name' => $this->_title, // name of this plugin |
|
| 312 | + 'author' => strip_tags( $this->_author ) // author of this plugin |
|
| 313 | + ) |
|
| 314 | + ); |
|
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | /** |