From fcf08ab9d4c4dbe79642bb18e8aaab8d904f3a89 Mon Sep 17 00:00:00 2001 From: Gennady Kovshenin Date: Sat, 1 Jul 2017 18:39:51 +0500 Subject: [PATCH 01/17] Fix oEmbed Add Media / From URL preview Since WordPress 4.8 the preview is generated via a REST API call to the oembed/proxy endpoint, which in turn does a remote request to a registered oEmbed provider. The default oEmbed provider fetches the content of a local URL, which, for a GravityView entry URL, ends up being the View instead of the Entry. Register the simplest provider for entry requests and serve the entry as needed. --- includes/class-oembed.php | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/includes/class-oembed.php b/includes/class-oembed.php index 96fe73901b..f8b6c0b1cd 100644 --- a/includes/class-oembed.php +++ b/includes/class-oembed.php @@ -33,7 +33,11 @@ private function __construct() {} private function initialize() { add_action( 'init', array( $this, 'register_handler' ) ); + add_action( 'init', array( $this, 'add_provider' ) ); + if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) { + add_action( 'template_redirect', array( $this, 'render_provider_request' ) ); + } } /** @@ -63,6 +67,61 @@ function register_handler() { } + /** + * Become an oEmbed provider for GravityView. + * + * @return void + */ + function add_provider() { + wp_oembed_add_provider( $this->get_handler_regex(), add_query_arg( 'gv_oembed_provider', '1', site_url() ), true ); + } + + /** + * Output a response as a provider for an entry oEmbed URL. + * + * For now we only output the JSON format and don't care about the size (width, height). + * Our only current use-case is for it to provide output to the Add Media / From URL box + * in WordPress 4.8. + * + * @return void + */ + function render_provider_request() { + if ( ! empty( $_GET['url'] ) ) { + $url = $_GET['url']; + } else { + header( 'HTTP/1.0 404 Not Found' ); + exit; + } + + preg_match( $this->get_handler_regex(), $url, $matches ); + + // If not using permalinks, re-assign values for matching groups + if ( ! empty( $matches['entry_slug2'] ) ) { + $matches['is_cpt'] = $matches['is_cpt2']; + $matches['slug'] = $matches['slug2']; + $matches['entry_slug'] = $matches['entry_slug2']; + unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] ); + } + + // No Entry was found + if ( empty( $matches['entry_slug'] ) ) { + do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches ); + header( 'HTTP/1.0 404 Not Found' ); + exit; + } + + // Setup the data used + $this->set_vars( $matches, null, $url, null ); + + echo json_encode( array( + 'version' => '1.0', + 'provider_name' => 'gravityview', + 'provider_url' => add_query_arg( 'gv_oembed_provider', '1', site_url() ), + 'html' => $this->generate_preview_notice() . $this->render_frontend( null, null, null, null ), + ) ); + exit; + } + /** * Generate the Regular expression that matches embedded entries. * From 74ef74c55c173f4a8336ae167f31be3481a36d58 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 10 Jul 2017 11:27:51 -0600 Subject: [PATCH 02/17] Add support for passing renewal URL in response --- includes/class-gv-license-handler.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/includes/class-gv-license-handler.php b/includes/class-gv-license-handler.php index a724d7e251..31b7bebb56 100644 --- a/includes/class-gv-license-handler.php +++ b/includes/class-gv-license-handler.php @@ -695,8 +695,19 @@ private function license_call_update_settings( $license_data, $data ) { * @return string Renewal or account URL */ private function get_license_renewal_url( $license_data ) { + $license_data = is_array( $license_data ) ? (object)$license_data : $license_data; - $renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/'; + + if( ! empty( $license_data->renewal_url ) ) { + $renew_license_url = $license_data->renewal_url; + } elseif( ! empty( $license_data->license_key ) ) { + $renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key ); + } else { + $renew_license_url = 'https://gravityview.co/account/'; + } + + $renew_license_url = add_query_arg( wp_parse_args( 'utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1' ), $renew_license_url ); + return $renew_license_url; } From 36917a924b2838e82d040f4ba43e57d035302f94 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 10 Jul 2017 11:28:04 -0600 Subject: [PATCH 03/17] Add license check debug logging --- includes/class-gv-license-handler.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/class-gv-license-handler.php b/includes/class-gv-license-handler.php index 31b7bebb56..414b72858f 100644 --- a/includes/class-gv-license-handler.php +++ b/includes/class-gv-license-handler.php @@ -413,6 +413,9 @@ private function _license_get_remote_response( $data, $license = '' ) { )); if ( is_wp_error( $response ) ) { + + do_action( 'gravityview_log_error', 'WP_Error response from license check. API params:', $api_params ); + return array(); } @@ -421,6 +424,8 @@ private function _license_get_remote_response( $data, $license = '' ) { // Not JSON if ( empty( $license_data ) ) { + do_action( 'gravityview_log_error', 'Empty license data response from license check', compact( 'response', 'url', 'api_params', 'data' ) ); + delete_transient( self::status_transient_key ); // Change status From a8015098807a82c244bc544a611b35fb7fbe8c91 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 10 Jul 2017 11:28:15 -0600 Subject: [PATCH 04/17] Pass `beta` setting to usage metrics --- includes/class-gv-license-handler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/class-gv-license-handler.php b/includes/class-gv-license-handler.php index 414b72858f..1dfd653ae0 100644 --- a/includes/class-gv-license-handler.php +++ b/includes/class-gv-license-handler.php @@ -197,6 +197,7 @@ public function get_site_data() { $data['theme'] = $theme; $data['url'] = home_url(); $data['license_key'] = GravityView_Settings::get_instance()->get_app_setting( 'license_key' ); + $data['beta'] = GravityView_Settings::get_instance()->get_app_setting( 'beta' ); // View Data $gravityview_posts = get_posts('numberposts=-1&post_type=gravityview&post_status=publish&order=ASC'); From 03ffef405b349abdd947925ad06abaeb7224abba Mon Sep 17 00:00:00 2001 From: Gennady Kovshenin Date: Tue, 11 Jul 2017 00:29:51 +0500 Subject: [PATCH 05/17] Fix fatal error on trashed forms If a form is trashed the view that connects to it will fatal. Fix this quickly. --- includes/class-frontend-views.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/class-frontend-views.php b/includes/class-frontend-views.php index f4355ab492..800b054cf8 100644 --- a/includes/class-frontend-views.php +++ b/includes/class-frontend-views.php @@ -715,13 +715,20 @@ public function render_view( $passed_args ) { $view = gravityview()->views->get( $view_id ); if ( ! $view ) { - do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) ); + do_action( 'gravityview_log_debug', sprintf( 'GravityView_frontend[render_view] Returning; View #%s does not have a form tied to it.', $view_id ) ); return null; } + } /** Update the view settings with the requested arguments. */ $view->settings->update( $passed_args ); + + /** Form is not valid. */ + if ( ! $view->form ) { + do_action( 'gravityview_log_debug', sprintf( 'GravityView_frontend[render_view] Returning; View #%s does not exist.', $view_id ) ); + return null; + } } else { /** \GravityView_View_Data::get_view is deprecated. */ $view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args ); From b851221e9eaca6b68c5e6e3903caa5b854066218 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Tue, 11 Jul 2017 10:30:01 -0600 Subject: [PATCH 06/17] Change how EDDSL plugin updater is loaded @jakejackson1 can you apply this and see if it works for your case? Not sure why it would, but this now uses the `admin_init` hook they show in the EDDSL sample. Related to #896 --- includes/class-gv-license-handler.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/class-gv-license-handler.php b/includes/class-gv-license-handler.php index 1dfd653ae0..6b14c328be 100644 --- a/includes/class-gv-license-handler.php +++ b/includes/class-gv-license-handler.php @@ -57,12 +57,11 @@ private function __construct( GravityView_Settings $GFAddOn ) { $this->Addon = $GFAddOn; - $this->setup_edd(); - $this->add_hooks(); } private function add_hooks() { + add_action( 'admin_init', array( $this, 'setup_edd' ), 0 ); add_action( 'wp_ajax_gravityview_license', array( $this, 'license_call' ) ); add_action( 'admin_init', array( $this, 'refresh_license_status' ) ); add_action( 'admin_init', array( $this, 'check_license' ) ); @@ -345,10 +344,13 @@ function settings_edd_license_activation( $field, $echo ) { /** * Include the EDD plugin updater class, if not exists + * * @since 1.7.4 + * @since 1.21.5.3 Changed visibility of method to public + * * @return void */ - private function setup_edd() { + public function setup_edd() { if( !class_exists('EDD_SL_Plugin_Updater') ) { require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php'); From a6f2a2f0464faab63ff1ba862b55414e7689a191 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Tue, 11 Jul 2017 10:38:06 -0600 Subject: [PATCH 07/17] Fix fatal error with older WPML For now, just log an error. Closes #905 --- .../class-gravityview-theme-hooks-wpml.php | 5 +++++ readme.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php b/includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php index 4b1fc98224..a9d07f4c9e 100644 --- a/includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php +++ b/includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php @@ -167,6 +167,11 @@ public function wpml_ls_filter( $languages ) { if ( $entry_slug = GravityView_frontend::getInstance()->getSingleEntry() ) { + if ( ! method_exists( $sitepress, 'get_setting' ) ) { + do_action( 'gravityview_log_error', __METHOD__ . ': This version of WPML is outdated and does not include the required method get_setting().' ); + return $languages; + } + $trid = $sitepress->get_element_trid( $post->ID ); $translations = $sitepress->get_element_translations( $trid ); $language_url_setting = $sitepress->get_setting( 'language_negotiation_type' ); diff --git a/readme.txt b/readme.txt index 374457c29d..72a26067ab 100644 --- a/readme.txt +++ b/readme.txt @@ -20,6 +20,8 @@ Beautifully display your Gravity Forms entries. Learn more on [gravityview.co](h == Changelog == +* Fixed: Fatal error when using older version of WPML + = 1.21.5.2 on June 26, 2017 = * Tweak: Improved plugin speed by reducing amount of information logged From fd99ffaea21b760f8a46ce36cd1bf14f52c6acd9 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Fri, 14 Jul 2017 16:25:57 -0600 Subject: [PATCH 08/17] Remove Gravity Forms-dependent functions These errors were an edge case, migrating the `{prefix}_options` table, but it's possible that others could have this affect them, too. Fixes #907 --- includes/class-admin-views.php | 6 ++++-- includes/class-gravityview-migrate.php | 5 +++++ .../entry-notes/class-gravityview-field-notes.php | 6 +++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/includes/class-admin-views.php b/includes/class-admin-views.php index 2139c7d93a..aa8306dc13 100644 --- a/includes/class-admin-views.php +++ b/includes/class-admin-views.php @@ -70,7 +70,9 @@ public function filter_pre_get_posts_by_gravityview_form_id( &$query ) { return; } - if( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) { + $form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false; + + if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { return; } @@ -78,7 +80,7 @@ public function filter_pre_get_posts_by_gravityview_form_id( &$query ) { $query->set( 'meta_query', array( array( 'key' => '_gravityview_form_id', - 'value' => rgget( 'gravityview_form_id' ), + 'value' => $form_id, ) ) ); } diff --git a/includes/class-gravityview-migrate.php b/includes/class-gravityview-migrate.php index 8f41394254..6dc9b9d103 100644 --- a/includes/class-gravityview-migrate.php +++ b/includes/class-gravityview-migrate.php @@ -55,6 +55,11 @@ private function maybe_migrate_approved_meta() { private function update_approved_meta() { global $wpdb; + if ( ! class_exists( 'GFFormsModel' ) ) { + do_action( 'gravityview_log_error', __METHOD__ . ': GFFormsModel does not exist.' ); + return; + } + $table_name = GFFormsModel::get_lead_meta_table_name(); $sql = "UPDATE {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s"; diff --git a/includes/extensions/entry-notes/class-gravityview-field-notes.php b/includes/extensions/entry-notes/class-gravityview-field-notes.php index c5f484cc63..1334ac9c5d 100644 --- a/includes/extensions/entry-notes/class-gravityview-field-notes.php +++ b/includes/extensions/entry-notes/class-gravityview-field-notes.php @@ -168,7 +168,11 @@ function maybe_add_note() { return; } - if( 'gv_note_add' === rgpost('action') ) { + if( ! isset( $_POST['action'] ) ) { + return; + } + + if( 'gv_note_add' === $_POST['action'] ) { $post = wp_unslash( $_POST ); From 154b175c8c9b7827c9fe9d098613e0fc2adf4374 Mon Sep 17 00:00:00 2001 From: Gennady Kovshenin Date: Thu, 20 Jul 2017 03:24:13 +0500 Subject: [PATCH 09/17] Fix issue with checkboxes in edit-entry When saving a custom field, our code will load the value of the saved field back into the entry. For later versions of GF the value for checkboxes is an array. So the `gform_field_values` would contain a really bad encoded string that fails to validate. Saving again kills at least custom field file uploads. This fix checks to see whether the value is an array to begin with and pulls out the needed subvalue. https://secure.helpscout.net/conversation/394406485/9835/?folderId=408730 --- includes/extensions/edit-entry/class-edit-entry-render.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/extensions/edit-entry/class-edit-entry-render.php b/includes/extensions/edit-entry/class-edit-entry-render.php index 996c9a2c13..83e4f783c3 100644 --- a/includes/extensions/edit-entry/class-edit-entry-render.php +++ b/includes/extensions/edit-entry/class-edit-entry-render.php @@ -700,6 +700,10 @@ private function maybe_update_post_fields( $form ) { case 'post_category': break; case 'post_custom_field': + if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { + $value = $value[ $field_id ]; + } + if( ! empty( $field->customFieldTemplateEnabled ) ) { $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); } From 7825f412551455d4cd1daf3dd028827d66086636 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Thu, 20 Jul 2017 11:49:11 -0600 Subject: [PATCH 10/17] Fix issue where `No` is interpreted as false MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don't recall why we added this to `gv_empty()` in the first place.…but it doesn't really make much sense. Thoughts, @soulseekah ? --- includes/class-gravityview-shortcode.php | 2 +- includes/widgets/search-widget/class-search-widget.php | 2 +- .../widgets/search-widget/templates/search-field-checkbox.php | 2 +- includes/widgets/search-widget/templates/search-field-date.php | 2 +- .../widgets/search-widget/templates/search-field-date_range.php | 2 +- .../widgets/search-widget/templates/search-field-entry_date.php | 2 +- .../widgets/search-widget/templates/search-field-entry_id.php | 2 +- .../widgets/search-widget/templates/search-field-input_text.php | 2 +- .../search-widget/templates/search-field-multiselect.php | 2 +- includes/widgets/search-widget/templates/search-field-radio.php | 2 +- .../widgets/search-widget/templates/search-field-search_all.php | 2 +- .../widgets/search-widget/templates/search-field-select.php | 2 +- .../search-widget/templates/search-field-single_checkbox.php | 2 +- templates/fields/quiz.php | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/includes/class-gravityview-shortcode.php b/includes/class-gravityview-shortcode.php index 92f3229e57..3ade316a9c 100644 --- a/includes/class-gravityview-shortcode.php +++ b/includes/class-gravityview-shortcode.php @@ -110,7 +110,7 @@ private function parse_and_sanitize_atts( $passed_atts ) { // Checkboxes should be 1 or 0 case 'checkbox': - $atts[ $key ] = gv_empty( $passed_value ) ? 0 : 1; + $atts[ $key ] = gv_empty( $passed_value, true, false ) ? 0 : 1; break; /** diff --git a/includes/widgets/search-widget/class-search-widget.php b/includes/widgets/search-widget/class-search-widget.php index dbd3733e8d..cc2ebe8400 100644 --- a/includes/widgets/search-widget/class-search-widget.php +++ b/includes/widgets/search-widget/class-search-widget.php @@ -551,7 +551,7 @@ public function filter_entries( $search_criteria ) { // get the other search filters foreach ( $get as $key => $value ) { - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false ) ) ) { + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { continue; } diff --git a/includes/widgets/search-widget/templates/search-field-checkbox.php b/includes/widgets/search-widget/templates/search-field-checkbox.php index 9787b25fdb..0298683eff 100644 --- a/includes/widgets/search-widget/templates/search-field-checkbox.php +++ b/includes/widgets/search-widget/templates/search-field-checkbox.php @@ -17,7 +17,7 @@ ?>
- +

diff --git a/includes/widgets/search-widget/templates/search-field-date.php b/includes/widgets/search-widget/templates/search-field-date.php index 973448439f..4a7e17c40b 100644 --- a/includes/widgets/search-widget/templates/search-field-date.php +++ b/includes/widgets/search-widget/templates/search-field-date.php @@ -11,7 +11,7 @@ ?>

- +

diff --git a/includes/widgets/search-widget/templates/search-field-date_range.php b/includes/widgets/search-widget/templates/search-field-date_range.php index ddb201a408..4894eb6ebc 100644 --- a/includes/widgets/search-widget/templates/search-field-date_range.php +++ b/includes/widgets/search-widget/templates/search-field-date_range.php @@ -13,7 +13,7 @@ ?>

- +

diff --git a/includes/widgets/search-widget/templates/search-field-entry_date.php b/includes/widgets/search-widget/templates/search-field-entry_date.php index 92f7e3fe22..33d213c2d8 100644 --- a/includes/widgets/search-widget/templates/search-field-entry_date.php +++ b/includes/widgets/search-widget/templates/search-field-entry_date.php @@ -13,7 +13,7 @@ ?>

- +

diff --git a/includes/widgets/search-widget/templates/search-field-entry_id.php b/includes/widgets/search-widget/templates/search-field-entry_id.php index 8978978779..8a86506774 100644 --- a/includes/widgets/search-widget/templates/search-field-entry_id.php +++ b/includes/widgets/search-widget/templates/search-field-entry_id.php @@ -13,7 +13,7 @@

- +

diff --git a/includes/widgets/search-widget/templates/search-field-input_text.php b/includes/widgets/search-widget/templates/search-field-input_text.php index c769b5a205..afd788337b 100644 --- a/includes/widgets/search-widget/templates/search-field-input_text.php +++ b/includes/widgets/search-widget/templates/search-field-input_text.php @@ -10,7 +10,7 @@ ?>
- +

diff --git a/includes/widgets/search-widget/templates/search-field-multiselect.php b/includes/widgets/search-widget/templates/search-field-multiselect.php index 0fdc7146ba..83b5c4e5b1 100644 --- a/includes/widgets/search-widget/templates/search-field-multiselect.php +++ b/includes/widgets/search-widget/templates/search-field-multiselect.php @@ -25,7 +25,7 @@ ?>

- +

diff --git a/includes/widgets/search-widget/templates/search-field-radio.php b/includes/widgets/search-widget/templates/search-field-radio.php index dc9d9d9132..acf70ed479 100644 --- a/includes/widgets/search-widget/templates/search-field-radio.php +++ b/includes/widgets/search-widget/templates/search-field-radio.php @@ -17,7 +17,7 @@ ?>

- +

diff --git a/includes/widgets/search-widget/templates/search-field-search_all.php b/includes/widgets/search-widget/templates/search-field-search_all.php index bd55f69757..c536fa5b2f 100644 --- a/includes/widgets/search-widget/templates/search-field-search_all.php +++ b/includes/widgets/search-widget/templates/search-field-search_all.php @@ -14,7 +14,7 @@

- +

diff --git a/includes/widgets/search-widget/templates/search-field-select.php b/includes/widgets/search-widget/templates/search-field-select.php index edead7e85f..1b9f8a2a95 100644 --- a/includes/widgets/search-widget/templates/search-field-select.php +++ b/includes/widgets/search-widget/templates/search-field-select.php @@ -25,7 +25,7 @@ ?>
- +

diff --git a/includes/widgets/search-widget/templates/search-field-single_checkbox.php b/includes/widgets/search-widget/templates/search-field-single_checkbox.php index fc41822853..9843112369 100644 --- a/includes/widgets/search-widget/templates/search-field-single_checkbox.php +++ b/includes/widgets/search-widget/templates/search-field-single_checkbox.php @@ -14,6 +14,6 @@

\ No newline at end of file diff --git a/templates/fields/quiz.php b/templates/fields/quiz.php index 7b4d18b75f..999bbb8680 100644 --- a/templates/fields/quiz.php +++ b/templates/fields/quiz.php @@ -11,7 +11,7 @@ $field = $gravityview_view->getCurrentField(); // If there's no grade, don't continue -if( gv_empty( $field['value'] ) ) { +if( gv_empty( $field['value'], false, false ) ) { return; } From 0abf27dc4945fe9eeb66a80a55df97a349cc1255 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Thu, 20 Jul 2017 11:49:41 -0600 Subject: [PATCH 11/17] Check for class existing before calling it --- includes/connector-functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/connector-functions.php b/includes/connector-functions.php index cb9ad6e937..5741567269 100644 --- a/includes/connector-functions.php +++ b/includes/connector-functions.php @@ -386,7 +386,7 @@ function gravityview_is_single_entry() { */ function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) { - if( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { + if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { /** @var GF_Field_Radio|GF_Field_Checkbox $form_field */ foreach( $form_fields as $form_field ) { From c51855f79fbc24902d20b8fadc9dea20447740fb Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Thu, 20 Jul 2017 11:50:15 -0600 Subject: [PATCH 12/17] Remove empty View IDs from cache blacklist Saw an empty View ID in the blacklist, might as well fix it. --- includes/class-cache.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/class-cache.php b/includes/class-cache.php index 928be5d32a..39fb56c7ad 100644 --- a/includes/class-cache.php +++ b/includes/class-cache.php @@ -247,6 +247,9 @@ public function blacklist_add( $form_ids ) { // Don't duplicate $blacklist = array_unique( $blacklist ); + // Remove empty items from blacklist + $blacklist = array_filter( $blacklist ); + return update_option( self::BLACKLIST_OPTION_NAME, $blacklist ); } From e0a4e5b52521ee00c0a20df45dbd701f46328119 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 24 Jul 2017 10:45:29 -0600 Subject: [PATCH 13/17] Gennady! --- assets/images/gennady.jpg | Bin 0 -> 35014 bytes includes/class-admin-welcome.php | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 assets/images/gennady.jpg diff --git a/assets/images/gennady.jpg b/assets/images/gennady.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5bd1a849d2099fa060a663e3a6b5470d3df5aa2a GIT binary patch literal 35014 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 zvDE*>02C1c0000000000000000001x|Jncu0RjO5KL8wm|HJ?k5di=I0000000000 X000000FeLM00;pC0RcY%9Do1W-p7uF literal 0 HcmV?d00001 diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php index 1c5f4abe80..39de23bf71 100644 --- a/includes/class-admin-welcome.php +++ b/includes/class-admin-welcome.php @@ -413,6 +413,12 @@ public function credits_screen() { ?>

Rafael helps guide GravityView development priorities and keep us on track. He’s the face of our customer support and helps customers get the most out of the product. Rafael hails from Porto Alegre, Brazil.

View Rafael’s WordPress Journey

+ +
+

Gennady Kovshenin

+

Core Developer

+

Gennady works on the GravityView core, improving everything behind the scenes. He is an active member of the WordPress community and loves exotic tea. Gennady lives and runs long distances in Magnitogorsk, Russia.

+
From 77a2e11fa872e12f970e095454e10c34e9d9c13b Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 24 Jul 2017 10:46:28 -0600 Subject: [PATCH 14/17] Team Twitter links --- includes/class-admin-welcome.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php index 39de23bf71..70031cb08d 100644 --- a/includes/class-admin-welcome.php +++ b/includes/class-admin-welcome.php @@ -397,21 +397,26 @@ public function credits_screen() { ?> tabs(); ?>

-
+ +
-

Zack Katz

+

Zack Katz

Project Lead & Developer

-

-

Zack has been developing integrations with Gravity Forms since 2009. He is the President of Katz Web Services and lives with his wife (and cat) in Denver, Colorado.

-

View Zack’s website

+

Zack has been developing integrations with Gravity Forms since 2009. He runs GravityView and lives with his wife (and cat) in Denver, Colorado.

-
-

Rafael Ehlers

-

Project Manager, Support Lead & Customer Advocate

-

Rafael helps guide GravityView development priorities and keep us on track. He’s the face of our customer support and helps customers get the most out of the product. Rafael hails from Porto Alegre, Brazil.

-

View Rafael’s WordPress Journey

+
+

Rafael Ehlers

+

Project Manager, Support Lead & Customer Advocate

+

Rafael helps guide GravityView development priorities and keep us on track. He’s the face of our customer support and helps customers get the most out of the product. Rafael hails from Porto Alegre, Brazil.

From 92d8ca146b38964b58db6192016bc7d0e9d4e1ff Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 24 Jul 2017 10:47:36 -0600 Subject: [PATCH 15/17] Version bump --- gravityview.php | 4 ++-- includes/class-admin-welcome.php | 13 ++++++++++++- readme.txt | 6 ++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gravityview.php b/gravityview.php index bd404525a9..f40114e796 100644 --- a/gravityview.php +++ b/gravityview.php @@ -3,7 +3,7 @@ * Plugin Name: GravityView * Plugin URI: https://gravityview.co * Description: The best, easiest way to display Gravity Forms entries on your website. - * Version: 1.21.5.2 + * Version: 1.21.5.3 * Author: GravityView * Author URI: https://gravityview.co * Text Domain: gravityview @@ -79,7 +79,7 @@ */ final class GravityView_Plugin { - const version = '1.21.5.2'; + const version = '1.21.5.3'; private static $instance; diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php index 70031cb08d..056fb315ef 100644 --- a/includes/class-admin-welcome.php +++ b/includes/class-admin-welcome.php @@ -273,7 +273,18 @@ public function changelog_screen() {

- + +

1.21.5.3 on July 24, 2017

+ +
    +
  • Fixed: For some field types, the value "No" would be interpreted as false
    • +
  • Fixed: In Edit Entry, when editing a form that has a Post Custom Field field type—configured as checkboxes—file upload fields would not be saved
    • +
  • Fixed: If a form connected to a View is in the trash, there will be an error when editing the View
    • +
  • Fixed: Embedding single entries with WordPress 4.8
    • +
  • Fixed: Fatal error when using older version of WPML
    • +
+ +

1.21.5.2 on June 26, 2017

    diff --git a/readme.txt b/readme.txt index 72a26067ab..a3d8756e7f 100644 --- a/readme.txt +++ b/readme.txt @@ -20,6 +20,12 @@ Beautifully display your Gravity Forms entries. Learn more on [gravityview.co](h == Changelog == += 1.21.5.3 on July 24, 2017 = + +* Fixed: For some field types, the value "No" would be interpreted as `false` +* Fixed: In Edit Entry, when editing a form that has a Post Custom Field field type—configured as checkboxes—file upload fields would not be saved +* Fixed: If a form connected to a View is in the trash, there will be an error when editing the View +* Fixed: Embedding single entries with WordPress 4.8 * Fixed: Fatal error when using older version of WPML = 1.21.5.2 on June 26, 2017 = From c178779b11ab7fd03c6fb939d0b75bf1ff9867e5 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 24 Jul 2017 11:07:45 -0600 Subject: [PATCH 16/17] Improve the Getting Started page layout It was looking bad for smaller screens, the screenshots were huge. Get rid of the `.gv-welcome-screenshots` class and use core instead. --- assets/css/admin-global.css | 2 +- assets/css/scss/admin-global.scss | 20 +++++++- includes/class-admin-welcome.php | 83 +++++++++++++++---------------- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/assets/css/admin-global.css b/assets/css/admin-global.css index 6bcad0223e..00d06b9e2b 100644 --- a/assets/css/admin-global.css +++ b/assets/css/admin-global.css @@ -1 +1 @@ -@font-face{font-family:"gravityview";src:url("../fonts/gravityview.eot");src:url("../fonts/gravityview.eot?#iefix") format("embedded-opentype"),url("../fonts/gravityview.woff") format("woff"),url("../fonts/gravityview.ttf") format("truetype"),url("../fonts/gravityview.svg#gravityview") format("svg");font-weight:normal;font-style:normal}a.icon{text-decoration:none}[data-gv-icon]:before{font-family:"gravityview" !important;content:attr(data-gv-icon);font-style:normal !important;font-weight:normal !important;font-variant:normal !important;text-transform:none !important;speak:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}[class^="gv-icon-"]:before,#toplevel_page_gravityview_settings .wp-menu-image:before,#adminmenu .menu-icon-gravityview div.wp-menu-image:before,#available-widgets [class*=gv_recent_entries] .widget-title:before,#available-widgets [class*=gravityview_search] .widget-title:before,[class*=" gv-icon-"]:before{font-family:"gravityview" !important;font-style:normal !important;font-weight:normal !important;font-variant:normal !important;text-transform:none !important;speak:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.gv-icon-astronaut-head:before,#toplevel_page_gravityview_settings .wp-menu-image:before,#adminmenu .menu-icon-gravityview div.wp-menu-image:before,#available-widgets [class*=gv_recent_entries] .widget-title:before,#available-widgets [class*=gravityview_search] .widget-title:before{content:"a"}.gv-icon-astronaut:before{content:"b"}.gv-icon-datatables-icon:before{content:"c"}.gv-icon-caret-up-down:before{content:"d"}.gv-icon-minus-square:before{content:"f"}.gv-icon-plus-square:before{content:"g"}.gv-icon-level-down:before{content:"e"}.gv-icon-sort-asc:before{content:"h"}.gv-icon-sort-desc:before{content:"i"}.members-tab-title a[href$="type-gravityview"]{display:none !important}.members-tab-title .gv-icon-astronaut-head{font-size:20px;width:20px;line-height:20px;margin-right:6.25px;display:block;float:left}#hs-beacon iframe{z-index:9991 !important}#hs-beacon iframe[data-reactid-hs=".0.0"]{right:-5px !important;bottom:-5px !important}.rtl #hs-beacon iframe[data-reactid-hs=".0.0"]{right:auto !important;left:-5px !important}.wp-editor-tools #add_gravityview{width:auto}.post-type-gravityview .about-wrap img{border:none}#gf_form_toolbar .gv_connected_forms .gv-icon{font-size:19px;margin-top:-.5em;line-height:0.5em;display:inline-block}#gf_form_toolbar .gv_connected_forms .gv-create-view:before{content:"\f132";display:inline-block;font-weight:normal;font-size:16px;font-family:dashicons !important;line-height:16px !important;top:4px;left:-3px;speak:none;margin:0 auto;padding:0 !important;position:relative;text-align:center;width:16px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#gf_form_toolbar .gv_connected_forms .hidden{display:none !important}#gf_form_toolbar .gv_connected_forms .gf_submenu{min-width:150px;max-width:100%}#gf_form_toolbar .gv_connected_forms li a{padding:0.5em 0.75em !important;display:block;width:auto}.post-type-gravityview .changelog ul{list-style-type:square}.post-type-gravityview .changelog ul ul{list-style:circle;margin:.5em 0 .5em 1.3em} +@font-face{font-family:"gravityview";src:url("../fonts/gravityview.eot");src:url("../fonts/gravityview.eot?#iefix") format("embedded-opentype"),url("../fonts/gravityview.woff") format("woff"),url("../fonts/gravityview.ttf") format("truetype"),url("../fonts/gravityview.svg#gravityview") format("svg");font-weight:normal;font-style:normal}a.icon{text-decoration:none}[data-gv-icon]:before{font-family:"gravityview" !important;content:attr(data-gv-icon);font-style:normal !important;font-weight:normal !important;font-variant:normal !important;text-transform:none !important;speak:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}[class^="gv-icon-"]:before,#toplevel_page_gravityview_settings .wp-menu-image:before,#adminmenu .menu-icon-gravityview div.wp-menu-image:before,#available-widgets [class*=gv_recent_entries] .widget-title:before,#available-widgets [class*=gravityview_search] .widget-title:before,[class*=" gv-icon-"]:before{font-family:"gravityview" !important;font-style:normal !important;font-weight:normal !important;font-variant:normal !important;text-transform:none !important;speak:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.gv-icon-astronaut-head:before,#toplevel_page_gravityview_settings .wp-menu-image:before,#adminmenu .menu-icon-gravityview div.wp-menu-image:before,#available-widgets [class*=gv_recent_entries] .widget-title:before,#available-widgets [class*=gravityview_search] .widget-title:before{content:"a"}.gv-icon-astronaut:before{content:"b"}.gv-icon-datatables-icon:before{content:"c"}.gv-icon-caret-up-down:before{content:"d"}.gv-icon-minus-square:before{content:"f"}.gv-icon-plus-square:before{content:"g"}.gv-icon-level-down:before{content:"e"}.gv-icon-sort-asc:before{content:"h"}.gv-icon-sort-desc:before{content:"i"}.members-tab-title a[href$="type-gravityview"]{display:none !important}.members-tab-title .gv-icon-astronaut-head{font-size:20px;width:20px;line-height:20px;margin-right:6.25px;display:block;float:left}#hs-beacon iframe{z-index:9991 !important}#hs-beacon iframe[data-reactid-hs=".0.0"]{right:-5px !important;bottom:-5px !important}.rtl #hs-beacon iframe[data-reactid-hs=".0.0"]{right:auto !important;left:-5px !important}.wp-editor-tools #add_gravityview{width:auto}.post-type-gravityview .about-wrap .feature-video iframe{width:100%;max-width:560px}.post-type-gravityview .about-wrap .feature-video .button-hero{font-size:22px;max-width:100%;overflow:hidden;text-overflow:ellipsis}.post-type-gravityview .about-wrap .feature-section img{border:1px solid #ccc;max-width:99%}#gf_form_toolbar .gv_connected_forms .gv-icon{font-size:19px;margin-top:-.5em;line-height:0.5em;display:inline-block}#gf_form_toolbar .gv_connected_forms .gv-create-view:before{content:"\f132";display:inline-block;font-weight:normal;font-size:16px;font-family:dashicons !important;line-height:16px !important;top:4px;left:-3px;speak:none;margin:0 auto;padding:0 !important;position:relative;text-align:center;width:16px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#gf_form_toolbar .gv_connected_forms .hidden{display:none !important}#gf_form_toolbar .gv_connected_forms .gf_submenu{min-width:150px;max-width:100%}#gf_form_toolbar .gv_connected_forms li a{padding:0.5em 0.75em !important;display:block;width:auto}.post-type-gravityview .changelog ul{list-style-type:square}.post-type-gravityview .changelog ul ul{list-style:circle;margin:.5em 0 .5em 1.3em} diff --git a/assets/css/scss/admin-global.scss b/assets/css/scss/admin-global.scss index 38f0df15a7..19f1310d9e 100644 --- a/assets/css/scss/admin-global.scss +++ b/assets/css/scss/admin-global.scss @@ -29,8 +29,24 @@ } // Prevent borders on images in the Getting Started, What's New screens -.post-type-gravityview .about-wrap img { - border: none; +.post-type-gravityview .about-wrap { + + .feature-video { + iframe { + width: 100%; + max-width: 560px; + } + .button-hero { + font-size: 22px; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + } + } + .feature-section img { + border: 1px solid #ccc; + max-width: 99%; // Allow for border on the right + } } // Form Toolbar for connected views diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php index 056fb315ef..45f9cb213c 100644 --- a/includes/class-admin-welcome.php +++ b/includes/class-admin-welcome.php @@ -113,16 +113,7 @@ public function admin_head() { ?> tabs(); ?>
-
+
-
-

Configuring a View

+

Configuring a View

-
- +
+ -

Read more: Setting Up Your First View

-
+

Read more: Setting Up Your First View

-
- -
- -

Create a View

+
+
+

Create a View

-
    +
    1. Go to Views > New View
    2. If you want to create a new form, click the "Use a Form Preset" button
    3. If you want to use an existing form’s entries, select from the dropdown.
      4. @@ -207,33 +194,43 @@ public function getting_started_screen() {
    4. On the View Configuration metabox, click on the "+Add Field" button to add form fields to the active areas of your View. These are the fields that will be displayed in the frontend.
- -
-

Embed Views in Posts & Pages

-

Views don’t need to be embedded in a post or page, but you can if you want. Embed Views using the "Add View" button above your content editor.

-
+
+

What is a View?

+

When a form is submitted in Gravity Forms, an entry is created. Without GravityView, Gravity Forms entries are visible only in the WordPress dashboard, and only to users with permission.

+

GravityView allows you to display entries on the front of your site. In GravityView, when you arrange the fields you want displayed and save the configuration, it's called a "View".

+
-
-

Configure Multiple Entry, Single Entry, and Edit Entry Layouts

+
-

Add a field dialog box - You can configure what fields are displayed in Multiple Entry, Single Entry, and Edit Entry modes. These can be configured by clicking on the tabs in "View Configuration." -

+
+
+

Embed Views in Posts & Pages

+

Views don’t need to be embedded in a post or page, but you can if you want. Embed Views using the "Add View" button above your content editor.

+
+
+ +
+
-
    -
  • Click "+ Add Field" to add a field to a zone
    • -
  • Click the name of the field you want to display
    • -
  • Once added, fields can be dragged and dropped to be re-arranged. Hover over the field until you see a cursor with four arrows, then drag the field.
    • -
  • Click the gear icon on each field to configure the Field Settings
    • -
-
+
-
-

What is a View?

-

When a form is submitted in Gravity Forms, an entry is created. Without GravityView, Gravity Forms entries are visible only in the WordPress dashboard, and only to users with permission.

+
+
+

Configure Multiple Entry, Single Entry, and Edit Entry Layouts

+ +

You can configure what fields are displayed in Multiple Entry, Single Entry, and Edit Entry modes. These can be configured by clicking on the tabs in "View Configuration."

-

GravityView allows you to display entries on the front of your site. In GravityView, when you arrange the fields you want displayed and save the configuration, it's called a "View".

+
    +
  • Click "+ Add Field" to add a field to a zone
    • +
  • Click the name of the field you want to display
    • +
  • Once added, fields can be dragged and dropped to be re-arranged. Hover over the field until you see a cursor with four arrows, then drag the field.
    • +
  • Click the gear icon on each field to configure the Field Settings
    • +
+
+
+ Add a field dialog box +
Date: Mon, 24 Jul 2017 11:11:55 -0600 Subject: [PATCH 17/17] Add docblock --- includes/class-oembed.php | 4 ++++ .../extensions/entry-notes/class-gravityview-field-notes.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/class-oembed.php b/includes/class-oembed.php index f8b6c0b1cd..3411c46268 100644 --- a/includes/class-oembed.php +++ b/includes/class-oembed.php @@ -70,6 +70,8 @@ function register_handler() { /** * Become an oEmbed provider for GravityView. * + * @since 1.21.5.3 + * * @return void */ function add_provider() { @@ -83,6 +85,8 @@ function add_provider() { * Our only current use-case is for it to provide output to the Add Media / From URL box * in WordPress 4.8. * + * @since 1.21.5.3 + * * @return void */ function render_provider_request() { diff --git a/includes/extensions/entry-notes/class-gravityview-field-notes.php b/includes/extensions/entry-notes/class-gravityview-field-notes.php index 1334ac9c5d..3964722cb0 100644 --- a/includes/extensions/entry-notes/class-gravityview-field-notes.php +++ b/includes/extensions/entry-notes/class-gravityview-field-notes.php @@ -169,8 +169,8 @@ function maybe_add_note() { } if( ! isset( $_POST['action'] ) ) { - return; - } + return; + } if( 'gv_note_add' === $_POST['action'] ) {