@@ -134,28 +134,28 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | public function add_network_menu() { |
| 136 | 136 | |
| 137 | - if ( ! gravityview()->plugin->is_network_activated() ) { |
|
| 137 | + if ( ! gravityview()->plugin->is_network_activated() ) { |
|
| 138 | 138 | return; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); |
|
| 141 | + add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | /** |
| 145 | - * Uninstall all traces of GravityView |
|
| 146 | - * |
|
| 147 | - * Note: method is public because parent method is public |
|
| 148 | - * |
|
| 145 | + * Uninstall all traces of GravityView |
|
| 146 | + * |
|
| 147 | + * Note: method is public because parent method is public |
|
| 148 | + * |
|
| 149 | 149 | * @return bool |
| 150 | 150 | */ |
| 151 | 151 | public function uninstall() { |
| 152 | 152 | gravityview()->plugin->uninstall(); |
| 153 | 153 | |
| 154 | 154 | /** |
| 155 | - * Set the path so that Gravity Forms can de-activate GravityView |
|
| 156 | - * @see GFAddOn::uninstall_addon |
|
| 157 | - * @uses deactivate_plugins() |
|
| 158 | - */ |
|
| 155 | + * Set the path so that Gravity Forms can de-activate GravityView |
|
| 156 | + * @see GFAddOn::uninstall_addon |
|
| 157 | + * @uses deactivate_plugins() |
|
| 158 | + */ |
|
| 159 | 159 | $this->_path = GRAVITYVIEW_FILE; |
| 160 | 160 | |
| 161 | 161 | return true; |
@@ -185,42 +185,42 @@ discard block |
||
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | /** |
| 188 | - * Get an array of reasons why the plugin might be uninstalled |
|
| 189 | - * |
|
| 190 | - * @since 1.17.5 |
|
| 191 | - * |
|
| 188 | + * Get an array of reasons why the plugin might be uninstalled |
|
| 189 | + * |
|
| 190 | + * @since 1.17.5 |
|
| 191 | + * |
|
| 192 | 192 | * @return array Array of reasons with the label and followup questions for each uninstall reason |
| 193 | 193 | */ |
| 194 | 194 | private function get_uninstall_reasons() { |
| 195 | 195 | $reasons = array( |
| 196 | 196 | 'will-continue' => array( |
| 197 | - 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
| 198 | - ), |
|
| 197 | + 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
| 198 | + ), |
|
| 199 | 199 | 'no-longer-need' => array( |
| 200 | - 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
| 201 | - ), |
|
| 200 | + 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
| 201 | + ), |
|
| 202 | 202 | 'doesnt-work' => array( |
| 203 | - 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
| 204 | - ), |
|
| 203 | + 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
| 204 | + ), |
|
| 205 | 205 | 'found-other' => array( |
| 206 | - 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
| 207 | - 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
| 208 | - ), |
|
| 206 | + 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
| 207 | + 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
| 208 | + ), |
|
| 209 | 209 | 'other' => array( |
| 210 | - 'label' => esc_html__( 'Other', 'gravityview' ), |
|
| 211 | - ), |
|
| 210 | + 'label' => esc_html__( 'Other', 'gravityview' ), |
|
| 211 | + ), |
|
| 212 | 212 | ); |
| 213 | 213 | |
| 214 | 214 | shuffle( $reasons ); |
| 215 | 215 | |
| 216 | 216 | return $reasons; |
| 217 | - } |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | 219 | /** |
| 220 | - * Display a feedback form when the plugin is uninstalled |
|
| 221 | - * |
|
| 222 | - * @since 1.17.5 |
|
| 223 | - * |
|
| 220 | + * Display a feedback form when the plugin is uninstalled |
|
| 221 | + * |
|
| 222 | + * @since 1.17.5 |
|
| 223 | + * |
|
| 224 | 224 | * @return string HTML of the uninstallation form |
| 225 | 225 | */ |
| 226 | 226 | public function uninstall_form() { |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2> |
| 301 | 301 | <ul> |
| 302 | 302 | <?php |
| 303 | - $reasons = $this->get_uninstall_reasons(); |
|
| 303 | + $reasons = $this->get_uninstall_reasons(); |
|
| 304 | 304 | foreach ( $reasons as $reason ) { |
| 305 | 305 | printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) ); |
| 306 | 306 | } |
@@ -394,12 +394,12 @@ discard block |
||
| 394 | 394 | } |
| 395 | 395 | |
| 396 | 396 | public function app_settings_tab() { |
| 397 | - parent::app_settings_tab(); |
|
| 397 | + parent::app_settings_tab(); |
|
| 398 | 398 | |
| 399 | 399 | if ( $this->maybe_uninstall() ) { |
| 400 | - echo $this->uninstall_form(); |
|
| 400 | + echo $this->uninstall_form(); |
|
| 401 | 401 | } |
| 402 | - } |
|
| 402 | + } |
|
| 403 | 403 | |
| 404 | 404 | /** |
| 405 | 405 | * The Settings title |
@@ -558,8 +558,8 @@ discard block |
||
| 558 | 558 | type="' . $field['type'] . '" |
| 559 | 559 | name="' . esc_attr( $name ) . '" |
| 560 | 560 | value="' . $value . '" ' . |
| 561 | - implode( ' ', $attributes ) . |
|
| 562 | - ' />'; |
|
| 561 | + implode( ' ', $attributes ) . |
|
| 562 | + ' />'; |
|
| 563 | 563 | |
| 564 | 564 | if ( $echo ) { |
| 565 | 565 | echo $html; |
@@ -577,12 +577,12 @@ discard block |
||
| 577 | 577 | } |
| 578 | 578 | |
| 579 | 579 | /** |
| 580 | - * Check whether GravityView is being saved |
|
| 581 | - * |
|
| 582 | - * The generic is_save_postback() is true for all addons |
|
| 583 | - * |
|
| 584 | - * @since 2.0.8 |
|
| 585 | - * |
|
| 580 | + * Check whether GravityView is being saved |
|
| 581 | + * |
|
| 582 | + * The generic is_save_postback() is true for all addons |
|
| 583 | + * |
|
| 584 | + * @since 2.0.8 |
|
| 585 | + * |
|
| 586 | 586 | * @return bool |
| 587 | 587 | */ |
| 588 | 588 | public function is_save_postback() { |
@@ -596,16 +596,16 @@ discard block |
||
| 596 | 596 | */ |
| 597 | 597 | public function license_key_notice() { |
| 598 | 598 | |
| 599 | - if( $this->is_save_postback() ) { |
|
| 600 | - $settings = $this->get_posted_settings(); |
|
| 601 | - $license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
| 602 | - $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
| 603 | - } else { |
|
| 604 | - $license_status = $this->get( 'license_key_status', 'inactive' ); |
|
| 605 | - $license_key = $this->get( 'license_key' ); |
|
| 606 | - } |
|
| 599 | + if( $this->is_save_postback() ) { |
|
| 600 | + $settings = $this->get_posted_settings(); |
|
| 601 | + $license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
| 602 | + $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
| 603 | + } else { |
|
| 604 | + $license_status = $this->get( 'license_key_status', 'inactive' ); |
|
| 605 | + $license_key = $this->get( 'license_key' ); |
|
| 606 | + } |
|
| 607 | 607 | |
| 608 | - $license_id = empty( $license_key ) ? 'license' : $license_key; |
|
| 608 | + $license_id = empty( $license_key ) ? 'license' : $license_key; |
|
| 609 | 609 | |
| 610 | 610 | $message = esc_html__( 'Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
| 611 | 611 | |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | $update_below = false; |
| 623 | 623 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
| 624 | 624 | |
| 625 | - switch ( $license_status ) { |
|
| 625 | + switch ( $license_status ) { |
|
| 626 | 626 | /** @since 1.17 */ |
| 627 | 627 | case 'expired': |
| 628 | 628 | $title = __( 'Expired License', 'gravityview' ); |
@@ -660,13 +660,13 @@ discard block |
||
| 660 | 660 | return; |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | - \GravityView_Admin_Notices::add_notice( array( |
|
| 664 | - 'message' => $message, |
|
| 665 | - 'class' => 'notice notice-warning', |
|
| 666 | - 'title' => $title, |
|
| 667 | - 'cap' => 'gravityview_edit_settings', |
|
| 668 | - 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) |
|
| 669 | - ) ); |
|
| 663 | + \GravityView_Admin_Notices::add_notice( array( |
|
| 664 | + 'message' => $message, |
|
| 665 | + 'class' => 'notice notice-warning', |
|
| 666 | + 'title' => $title, |
|
| 667 | + 'cap' => 'gravityview_edit_settings', |
|
| 668 | + 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) |
|
| 669 | + ) ); |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | /** |
@@ -680,12 +680,12 @@ discard block |
||
| 680 | 680 | } |
| 681 | 681 | |
| 682 | 682 | /** |
| 683 | - * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
| 684 | - * |
|
| 685 | - * @since 1.21.5 |
|
| 686 | - * |
|
| 687 | - * @see GFAddOn::scripts() |
|
| 688 | - * |
|
| 683 | + * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
| 684 | + * |
|
| 685 | + * @since 1.21.5 |
|
| 686 | + * |
|
| 687 | + * @see GFAddOn::scripts() |
|
| 688 | + * |
|
| 689 | 689 | * @return array Array of scripts |
| 690 | 690 | */ |
| 691 | 691 | public function scripts() { |
@@ -694,10 +694,10 @@ discard block |
||
| 694 | 694 | $scripts[] = array( |
| 695 | 695 | 'handle' => 'gform_tooltip_init', |
| 696 | 696 | 'enqueue' => array( |
| 697 | - array( |
|
| 698 | - 'admin_page' => array( 'app_settings' ) |
|
| 699 | - ) |
|
| 700 | - ) |
|
| 697 | + array( |
|
| 698 | + 'admin_page' => array( 'app_settings' ) |
|
| 699 | + ) |
|
| 700 | + ) |
|
| 701 | 701 | ); |
| 702 | 702 | |
| 703 | 703 | return $scripts; |
@@ -715,10 +715,10 @@ discard block |
||
| 715 | 715 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
| 716 | 716 | 'version' => Plugin::$version, |
| 717 | 717 | 'deps' => array( |
| 718 | - 'gform_admin', |
|
| 718 | + 'gform_admin', |
|
| 719 | 719 | 'gaddon_form_settings_css', |
| 720 | - 'gform_tooltip', |
|
| 721 | - 'gform_font_awesome', |
|
| 720 | + 'gform_tooltip', |
|
| 721 | + 'gform_font_awesome', |
|
| 722 | 722 | ), |
| 723 | 723 | 'enqueue' => array( |
| 724 | 724 | array( 'admin_page' => array( |
@@ -886,7 +886,7 @@ discard block |
||
| 886 | 886 | array( |
| 887 | 887 | 'label' => esc_html__( 'Show me beta versions if they are available.', 'gravityview' ), |
| 888 | 888 | 'value' => '1', |
| 889 | - 'name' => 'beta', |
|
| 889 | + 'name' => 'beta', |
|
| 890 | 890 | ), |
| 891 | 891 | ), |
| 892 | 892 | 'description' => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ), |
@@ -924,38 +924,38 @@ discard block |
||
| 924 | 924 | |
| 925 | 925 | if ( empty( $field['disabled'] ) ) { |
| 926 | 926 | unset( $field['disabled'] ); |
| 927 | - } |
|
| 927 | + } |
|
| 928 | 928 | } |
| 929 | 929 | |
| 930 | - $sections = array( |
|
| 931 | - array( |
|
| 932 | - 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
| 933 | - 'fields' => $fields, |
|
| 934 | - ) |
|
| 935 | - ); |
|
| 930 | + $sections = array( |
|
| 931 | + array( |
|
| 932 | + 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
| 933 | + 'fields' => $fields, |
|
| 934 | + ) |
|
| 935 | + ); |
|
| 936 | 936 | |
| 937 | - // custom 'update settings' button |
|
| 938 | - $button = array( |
|
| 939 | - 'class' => 'button button-primary button-hero', |
|
| 940 | - 'type' => 'save', |
|
| 941 | - ); |
|
| 937 | + // custom 'update settings' button |
|
| 938 | + $button = array( |
|
| 939 | + 'class' => 'button button-primary button-hero', |
|
| 940 | + 'type' => 'save', |
|
| 941 | + ); |
|
| 942 | 942 | |
| 943 | 943 | if ( $disabled_attribute ) { |
| 944 | 944 | $button['disabled'] = $disabled_attribute; |
| 945 | 945 | } |
| 946 | 946 | |
| 947 | - /** |
|
| 948 | - * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
| 949 | - * Extensions can tap in here to insert their own section and settings. |
|
| 950 | - * <code> |
|
| 951 | - * $sections[] = array( |
|
| 952 | - * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
| 953 | - * 'fields' => $settings, |
|
| 954 | - * ); |
|
| 955 | - * </code> |
|
| 956 | - * @param array $extension_settings Empty array, ready for extension settings! |
|
| 957 | - */ |
|
| 958 | - $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
| 947 | + /** |
|
| 948 | + * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
| 949 | + * Extensions can tap in here to insert their own section and settings. |
|
| 950 | + * <code> |
|
| 951 | + * $sections[] = array( |
|
| 952 | + * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
| 953 | + * 'fields' => $settings, |
|
| 954 | + * ); |
|
| 955 | + * </code> |
|
| 956 | + * @param array $extension_settings Empty array, ready for extension settings! |
|
| 957 | + */ |
|
| 958 | + $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
| 959 | 959 | |
| 960 | 960 | // If there are extensions, add a section for them |
| 961 | 961 | if ( ! empty( $extension_sections ) ) { |
@@ -968,13 +968,13 @@ discard block |
||
| 968 | 968 | } |
| 969 | 969 | } |
| 970 | 970 | |
| 971 | - $k = count( $extension_sections ) - 1 ; |
|
| 972 | - $extension_sections[ $k ]['fields'][] = $button; |
|
| 971 | + $k = count( $extension_sections ) - 1 ; |
|
| 972 | + $extension_sections[ $k ]['fields'][] = $button; |
|
| 973 | 973 | $sections = array_merge( $sections, $extension_sections ); |
| 974 | 974 | } else { |
| 975 | - // add the 'update settings' button to the general section |
|
| 976 | - $sections[0]['fields'][] = $button; |
|
| 977 | - } |
|
| 975 | + // add the 'update settings' button to the general section |
|
| 976 | + $sections[0]['fields'][] = $button; |
|
| 977 | + } |
|
| 978 | 978 | |
| 979 | 979 | return $sections; |
| 980 | 980 | } |
@@ -1028,9 +1028,9 @@ discard block |
||
| 1028 | 1028 | */ |
| 1029 | 1029 | protected function settings_edd_license( $field, $echo = true ) { |
| 1030 | 1030 | |
| 1031 | - if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
| 1032 | - $field['input_type'] = 'password'; |
|
| 1033 | - } |
|
| 1031 | + if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
| 1032 | + $field['input_type'] = 'password'; |
|
| 1033 | + } |
|
| 1034 | 1034 | |
| 1035 | 1035 | $text = $this->settings_text( $field, false ); |
| 1036 | 1036 | |
@@ -1047,9 +1047,9 @@ discard block |
||
| 1047 | 1047 | |
| 1048 | 1048 | /** |
| 1049 | 1049 | * Allow pure HTML settings row |
| 1050 | - * |
|
| 1051 | - * @since 2.0.6 |
|
| 1052 | - * |
|
| 1050 | + * |
|
| 1051 | + * @since 2.0.6 |
|
| 1052 | + * |
|
| 1053 | 1053 | * @param array $field |
| 1054 | 1054 | * @param bool $echo Whether to echo the |
| 1055 | 1055 | * |
@@ -1115,19 +1115,19 @@ discard block |
||
| 1115 | 1115 | } |
| 1116 | 1116 | |
| 1117 | 1117 | /** |
| 1118 | - * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
| 1119 | - * |
|
| 1120 | - * Converts `$field['description']` to `$field['gv_description']` |
|
| 1121 | - * Converts `$field['subtitle']` to `$field['description']` |
|
| 1122 | - * |
|
| 1123 | - * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
| 1124 | - * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
| 1125 | - * |
|
| 1126 | - * @since 1.21.5.2 |
|
| 1127 | - * |
|
| 1118 | + * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
| 1119 | + * |
|
| 1120 | + * Converts `$field['description']` to `$field['gv_description']` |
|
| 1121 | + * Converts `$field['subtitle']` to `$field['description']` |
|
| 1122 | + * |
|
| 1123 | + * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
| 1124 | + * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
| 1125 | + * |
|
| 1126 | + * @since 1.21.5.2 |
|
| 1127 | + * |
|
| 1128 | 1128 | * @param array $field |
| 1129 | - * |
|
| 1130 | - * @return void |
|
| 1129 | + * |
|
| 1130 | + * @return void |
|
| 1131 | 1131 | */ |
| 1132 | 1132 | public function single_setting_row( $field ) { |
| 1133 | 1133 | $field['gv_description'] = Utils::get( $field, 'description' ); |
@@ -310,12 +310,12 @@ discard block |
||
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
| 313 | - * @hack |
|
| 314 | - * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 315 | - */ |
|
| 313 | + * @hack |
|
| 314 | + * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 315 | + */ |
|
| 316 | 316 | if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
| 317 | - continue; |
|
| 318 | - } |
|
| 317 | + continue; |
|
| 318 | + } |
|
| 319 | 319 | $fields["{$input['id']}"] = array( |
| 320 | 320 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 321 | 321 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
@@ -1488,7 +1488,7 @@ discard block |
||
| 1488 | 1488 | ), |
| 1489 | 1489 | ); |
| 1490 | 1490 | |
| 1491 | - $fields = $date_created + $fields; |
|
| 1491 | + $fields = $date_created + $fields; |
|
| 1492 | 1492 | |
| 1493 | 1493 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1494 | 1494 | |
@@ -1516,13 +1516,13 @@ discard block |
||
| 1516 | 1516 | |
| 1517 | 1517 | } |
| 1518 | 1518 | |
| 1519 | - /** |
|
| 1520 | - * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1521 | - * @since 1.12 |
|
| 1522 | - * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1523 | - * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1524 | - */ |
|
| 1525 | - $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1519 | + /** |
|
| 1520 | + * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1521 | + * @since 1.12 |
|
| 1522 | + * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1523 | + * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1524 | + */ |
|
| 1525 | + $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1526 | 1526 | |
| 1527 | 1527 | return $fields; |
| 1528 | 1528 | } |
@@ -1814,26 +1814,26 @@ discard block |
||
| 1814 | 1814 | } |
| 1815 | 1815 | |
| 1816 | 1816 | |
| 1817 | - /** |
|
| 1818 | - * Display updated/error notice |
|
| 1819 | - * |
|
| 1820 | - * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1821 | - * |
|
| 1822 | - * @param string $notice text/HTML of notice |
|
| 1823 | - * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1824 | - * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1825 | - * |
|
| 1826 | - * @return string |
|
| 1827 | - */ |
|
| 1828 | - public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1829 | - |
|
| 1830 | - // If $cap is defined, only show notice if user has capability |
|
| 1831 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1832 | - return ''; |
|
| 1833 | - } |
|
| 1834 | - |
|
| 1835 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1836 | - } |
|
| 1817 | + /** |
|
| 1818 | + * Display updated/error notice |
|
| 1819 | + * |
|
| 1820 | + * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1821 | + * |
|
| 1822 | + * @param string $notice text/HTML of notice |
|
| 1823 | + * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1824 | + * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1825 | + * |
|
| 1826 | + * @return string |
|
| 1827 | + */ |
|
| 1828 | + public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1829 | + |
|
| 1830 | + // If $cap is defined, only show notice if user has capability |
|
| 1831 | + if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1832 | + return ''; |
|
| 1833 | + } |
|
| 1834 | + |
|
| 1835 | + return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1836 | + } |
|
| 1837 | 1837 | |
| 1838 | 1838 | /** |
| 1839 | 1839 | * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | 78 | * Render the page size widget |
| 79 | - * |
|
| 79 | + * |
|
| 80 | 80 | * @param array $widget_args The Widget shortcode args. |
| 81 | 81 | * @param string $content The content. |
| 82 | 82 | * @param string|\GV\Template_Context $context The context, if available. |
@@ -117,10 +117,10 @@ discard block |
||
| 117 | 117 | <?php } ?> |
| 118 | 118 | </select> |
| 119 | 119 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
| 120 | - if( ! empty( $_GET ) ) { |
|
| 121 | - $get = $_GET; |
|
| 122 | - unset( $get['page_size'] ); |
|
| 123 | - foreach ( $get as $key => $value ) { |
|
| 120 | + if( ! empty( $_GET ) ) { |
|
| 121 | + $get = $_GET; |
|
| 122 | + unset( $get['page_size'] ); |
|
| 123 | + foreach ( $get as $key => $value ) { |
|
| 124 | 124 | if ( is_array( $value ) ) { |
| 125 | 125 | foreach ( $value as $_key => $_value ) { |
| 126 | 126 | printf( '<input type="hidden" name="%s[%s]" value="%s" />', esc_attr( $key ), esc_attr( $_key ), esc_attr( $_value ) ); |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | } else { |
| 129 | 129 | printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) ); |
| 130 | 130 | } |
| 131 | - } |
|
| 132 | - } |
|
| 133 | - ?> |
|
| 131 | + } |
|
| 132 | + } |
|
| 133 | + ?> |
|
| 134 | 134 | </div> |
| 135 | 135 | </form> |
| 136 | 136 | </div> |
@@ -10,175 +10,175 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | if ( ! defined( 'WPINC' ) ) { |
| 13 | - die; |
|
| 13 | + die; |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | class GravityView_Edit_Entry_Admin { |
| 18 | 18 | |
| 19 | - protected $loader; |
|
| 19 | + protected $loader; |
|
| 20 | 20 | |
| 21 | - function __construct( GravityView_Edit_Entry $loader ) { |
|
| 22 | - $this->loader = $loader; |
|
| 23 | - } |
|
| 21 | + function __construct( GravityView_Edit_Entry $loader ) { |
|
| 22 | + $this->loader = $loader; |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - function load() { |
|
| 26 | - |
|
| 27 | - if( !is_admin() ) { |
|
| 28 | - return; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - // Add Edit Link as a default field, outside those set in the Gravity Form form |
|
| 32 | - add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
| 33 | - |
|
| 34 | - // For the Edit Entry Link, you don't want visible to all users. |
|
| 35 | - add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
| 25 | + function load() { |
|
| 26 | + |
|
| 27 | + if( !is_admin() ) { |
|
| 28 | + return; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + // Add Edit Link as a default field, outside those set in the Gravity Form form |
|
| 32 | + add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
| 33 | + |
|
| 34 | + // For the Edit Entry Link, you don't want visible to all users. |
|
| 35 | + add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
| 36 | 36 | |
| 37 | - // Modify the field options based on the name of the field type |
|
| 38 | - add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 ); |
|
| 37 | + // Modify the field options based on the name of the field type |
|
| 38 | + add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 ); |
|
| 39 | 39 | |
| 40 | - // add tooltips |
|
| 41 | - add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') ); |
|
| 42 | - |
|
| 43 | - // custom fields' options for zone EDIT |
|
| 44 | - add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 ); |
|
| 45 | - } |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * Add Edit Link as a default field, outside those set in the Gravity Form form |
|
| 49 | - * @param array $entry_default_fields Existing fields |
|
| 50 | - * @param string|array $form form_ID or form object |
|
| 51 | - * @param string $zone Either 'single', 'directory', 'header', 'footer' |
|
| 52 | - */ |
|
| 53 | - function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
|
| 54 | - |
|
| 55 | - if( $zone !== 'edit' ) { |
|
| 56 | - |
|
| 57 | - $entry_default_fields['edit_link'] = array( |
|
| 58 | - 'label' => __('Edit Entry', 'gravityview'), |
|
| 59 | - 'type' => 'edit_link', |
|
| 60 | - 'desc' => __('A link to edit the entry. Visible based on View settings.', 'gravityview'), |
|
| 61 | - ); |
|
| 62 | - |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - return $entry_default_fields; |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - /** |
|
| 69 | - * Change wording for the Edit context to read Entry Creator |
|
| 70 | - * |
|
| 71 | - * @param array $visibility_caps Array of capabilities to display in field dropdown. |
|
| 72 | - * @param string $field_type Type of field options to render (`field` or `widget`) |
|
| 73 | - * @param string $template_id Table slug |
|
| 74 | - * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
|
| 75 | - * @param string $context What context are we in? Example: `single` or `directory` |
|
| 76 | - * @param string $input_type (textarea, list, select, etc.) |
|
| 77 | - * @return array Array of field options with `label`, `value`, `type`, `default` keys |
|
| 78 | - */ |
|
| 79 | - function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
|
| 80 | - |
|
| 81 | - $caps = $visibility_caps; |
|
| 82 | - |
|
| 83 | - // If we're configuring fields in the edit context, we want a limited selection |
|
| 84 | - if( $context === 'edit' ) { |
|
| 85 | - |
|
| 86 | - // Remove other built-in caps. |
|
| 87 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
| 88 | - |
|
| 89 | - $caps['read'] = _x('Entry Creator','User capability', 'gravityview'); |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - return $caps; |
|
| 93 | - } |
|
| 94 | - |
|
| 95 | - /** |
|
| 96 | - * Add "Edit Link Text" setting to the edit_link field settings |
|
| 97 | - * @param [type] $field_options [description] |
|
| 98 | - * @param [type] $template_id [description] |
|
| 99 | - * @param [type] $field_id [description] |
|
| 100 | - * @param [type] $context [description] |
|
| 101 | - * @param [type] $input_type [description] |
|
| 102 | - * @return [type] [description] |
|
| 103 | - */ |
|
| 104 | - function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
|
| 105 | - |
|
| 106 | - // Always a link, never a filter |
|
| 107 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
| 108 | - |
|
| 109 | - // Edit Entry link should only appear to visitors capable of editing entries |
|
| 110 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 111 | - |
|
| 112 | - $add_option['edit_link'] = array( |
|
| 113 | - 'type' => 'text', |
|
| 114 | - 'label' => __( 'Edit Link Text', 'gravityview' ), |
|
| 115 | - 'desc' => NULL, |
|
| 116 | - 'value' => __('Edit Entry', 'gravityview'), |
|
| 117 | - 'merge_tags' => true, |
|
| 118 | - ); |
|
| 119 | - |
|
| 120 | - return array_merge( $add_option, $field_options ); |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - /** |
|
| 124 | - * Add tooltips |
|
| 125 | - * @param array $tooltips Existing tooltips |
|
| 126 | - * @return array Modified tooltips |
|
| 127 | - */ |
|
| 128 | - function tooltips( $tooltips ) { |
|
| 129 | - |
|
| 130 | - $return = $tooltips; |
|
| 131 | - |
|
| 132 | - $return['allow_edit_cap'] = array( |
|
| 133 | - 'title' => __('Limiting Edit Access', 'gravityview'), |
|
| 134 | - 'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'), |
|
| 135 | - ); |
|
| 136 | - |
|
| 137 | - return $return; |
|
| 138 | - } |
|
| 139 | - |
|
| 140 | - /** |
|
| 141 | - * Manipulate the fields' options for the EDIT ENTRY screen |
|
| 142 | - * @param [type] $field_options [description] |
|
| 143 | - * @param [type] $template_id [description] |
|
| 144 | - * @param [type] $field_id [description] |
|
| 145 | - * @param [type] $context [description] |
|
| 146 | - * @param [type] $input_type [description] |
|
| 147 | - * @return [type] [description] |
|
| 148 | - */ |
|
| 40 | + // add tooltips |
|
| 41 | + add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') ); |
|
| 42 | + |
|
| 43 | + // custom fields' options for zone EDIT |
|
| 44 | + add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 ); |
|
| 45 | + } |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * Add Edit Link as a default field, outside those set in the Gravity Form form |
|
| 49 | + * @param array $entry_default_fields Existing fields |
|
| 50 | + * @param string|array $form form_ID or form object |
|
| 51 | + * @param string $zone Either 'single', 'directory', 'header', 'footer' |
|
| 52 | + */ |
|
| 53 | + function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
|
| 54 | + |
|
| 55 | + if( $zone !== 'edit' ) { |
|
| 56 | + |
|
| 57 | + $entry_default_fields['edit_link'] = array( |
|
| 58 | + 'label' => __('Edit Entry', 'gravityview'), |
|
| 59 | + 'type' => 'edit_link', |
|
| 60 | + 'desc' => __('A link to edit the entry. Visible based on View settings.', 'gravityview'), |
|
| 61 | + ); |
|
| 62 | + |
|
| 63 | + } |
|
| 64 | + |
|
| 65 | + return $entry_default_fields; |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + /** |
|
| 69 | + * Change wording for the Edit context to read Entry Creator |
|
| 70 | + * |
|
| 71 | + * @param array $visibility_caps Array of capabilities to display in field dropdown. |
|
| 72 | + * @param string $field_type Type of field options to render (`field` or `widget`) |
|
| 73 | + * @param string $template_id Table slug |
|
| 74 | + * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
|
| 75 | + * @param string $context What context are we in? Example: `single` or `directory` |
|
| 76 | + * @param string $input_type (textarea, list, select, etc.) |
|
| 77 | + * @return array Array of field options with `label`, `value`, `type`, `default` keys |
|
| 78 | + */ |
|
| 79 | + function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
|
| 80 | + |
|
| 81 | + $caps = $visibility_caps; |
|
| 82 | + |
|
| 83 | + // If we're configuring fields in the edit context, we want a limited selection |
|
| 84 | + if( $context === 'edit' ) { |
|
| 85 | + |
|
| 86 | + // Remove other built-in caps. |
|
| 87 | + unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
| 88 | + |
|
| 89 | + $caps['read'] = _x('Entry Creator','User capability', 'gravityview'); |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + return $caps; |
|
| 93 | + } |
|
| 94 | + |
|
| 95 | + /** |
|
| 96 | + * Add "Edit Link Text" setting to the edit_link field settings |
|
| 97 | + * @param [type] $field_options [description] |
|
| 98 | + * @param [type] $template_id [description] |
|
| 99 | + * @param [type] $field_id [description] |
|
| 100 | + * @param [type] $context [description] |
|
| 101 | + * @param [type] $input_type [description] |
|
| 102 | + * @return [type] [description] |
|
| 103 | + */ |
|
| 104 | + function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
|
| 105 | + |
|
| 106 | + // Always a link, never a filter |
|
| 107 | + unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
| 108 | + |
|
| 109 | + // Edit Entry link should only appear to visitors capable of editing entries |
|
| 110 | + unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 111 | + |
|
| 112 | + $add_option['edit_link'] = array( |
|
| 113 | + 'type' => 'text', |
|
| 114 | + 'label' => __( 'Edit Link Text', 'gravityview' ), |
|
| 115 | + 'desc' => NULL, |
|
| 116 | + 'value' => __('Edit Entry', 'gravityview'), |
|
| 117 | + 'merge_tags' => true, |
|
| 118 | + ); |
|
| 119 | + |
|
| 120 | + return array_merge( $add_option, $field_options ); |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + /** |
|
| 124 | + * Add tooltips |
|
| 125 | + * @param array $tooltips Existing tooltips |
|
| 126 | + * @return array Modified tooltips |
|
| 127 | + */ |
|
| 128 | + function tooltips( $tooltips ) { |
|
| 129 | + |
|
| 130 | + $return = $tooltips; |
|
| 131 | + |
|
| 132 | + $return['allow_edit_cap'] = array( |
|
| 133 | + 'title' => __('Limiting Edit Access', 'gravityview'), |
|
| 134 | + 'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'), |
|
| 135 | + ); |
|
| 136 | + |
|
| 137 | + return $return; |
|
| 138 | + } |
|
| 139 | + |
|
| 140 | + /** |
|
| 141 | + * Manipulate the fields' options for the EDIT ENTRY screen |
|
| 142 | + * @param [type] $field_options [description] |
|
| 143 | + * @param [type] $template_id [description] |
|
| 144 | + * @param [type] $field_id [description] |
|
| 145 | + * @param [type] $context [description] |
|
| 146 | + * @param [type] $input_type [description] |
|
| 147 | + * @return [type] [description] |
|
| 148 | + */ |
|
| 149 | 149 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 150 | 150 | |
| 151 | - // We only want to modify the settings for the edit context |
|
| 152 | - if( 'edit' !== $context ) { |
|
| 153 | - |
|
| 154 | - /** |
|
| 155 | - * @since 1.8.4 |
|
| 156 | - */ |
|
| 157 | - $field_options['new_window'] = array( |
|
| 158 | - 'type' => 'checkbox', |
|
| 159 | - 'label' => __( 'Open link in a new tab or window?', 'gravityview' ), |
|
| 160 | - 'value' => false, |
|
| 161 | - ); |
|
| 162 | - |
|
| 163 | - return $field_options; |
|
| 164 | - } |
|
| 165 | - |
|
| 166 | - // Entry field is only for logged in users |
|
| 167 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 168 | - |
|
| 169 | - $add_options = array( |
|
| 170 | - 'allow_edit_cap' => array( |
|
| 171 | - 'type' => 'select', |
|
| 172 | - 'label' => __( 'Make field editable to:', 'gravityview' ), |
|
| 173 | - 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
|
| 174 | - 'tooltip' => 'allow_edit_cap', |
|
| 175 | - 'class' => 'widefat', |
|
| 176 | - 'value' => 'read', // Default: entry creator |
|
| 177 | - ), |
|
| 178 | - ); |
|
| 179 | - |
|
| 180 | - return array_merge( $field_options, $add_options ); |
|
| 181 | - } |
|
| 151 | + // We only want to modify the settings for the edit context |
|
| 152 | + if( 'edit' !== $context ) { |
|
| 153 | + |
|
| 154 | + /** |
|
| 155 | + * @since 1.8.4 |
|
| 156 | + */ |
|
| 157 | + $field_options['new_window'] = array( |
|
| 158 | + 'type' => 'checkbox', |
|
| 159 | + 'label' => __( 'Open link in a new tab or window?', 'gravityview' ), |
|
| 160 | + 'value' => false, |
|
| 161 | + ); |
|
| 162 | + |
|
| 163 | + return $field_options; |
|
| 164 | + } |
|
| 165 | + |
|
| 166 | + // Entry field is only for logged in users |
|
| 167 | + unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 168 | + |
|
| 169 | + $add_options = array( |
|
| 170 | + 'allow_edit_cap' => array( |
|
| 171 | + 'type' => 'select', |
|
| 172 | + 'label' => __( 'Make field editable to:', 'gravityview' ), |
|
| 173 | + 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
|
| 174 | + 'tooltip' => 'allow_edit_cap', |
|
| 175 | + 'class' => 'widefat', |
|
| 176 | + 'value' => 'read', // Default: entry creator |
|
| 177 | + ), |
|
| 178 | + ); |
|
| 179 | + |
|
| 180 | + return array_merge( $field_options, $add_options ); |
|
| 181 | + } |
|
| 182 | 182 | |
| 183 | 183 | |
| 184 | 184 | } // end class |
| 185 | 185 | \ No newline at end of file |
@@ -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" style="margin: 0">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text ); |
| 103 | 103 | |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | - * When on the Installer page, show a different notice than on the Settings page |
|
| 116 | - * |
|
| 115 | + * When on the Installer page, show a different notice than on the Settings page |
|
| 116 | + * |
|
| 117 | 117 | * @param array $notice |
| 118 | 118 | * |
| 119 | 119 | * @return string License notice |
@@ -121,10 +121,10 @@ discard block |
||
| 121 | 121 | public function maybe_modify_license_notice( $notice = '' ) { |
| 122 | 122 | |
| 123 | 123 | if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) { |
| 124 | - return $notice; |
|
| 125 | - } |
|
| 124 | + return $notice; |
|
| 125 | + } |
|
| 126 | 126 | |
| 127 | - return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
| 127 | + return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -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 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | ) ); |
| 231 | 231 | |
| 232 | 232 | if ( is_wp_error( $response ) ) { |
| 233 | - gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
| 233 | + gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) ); |
|
| 234 | 234 | return $response; |
| 235 | 235 | } |
| 236 | 236 | |
@@ -283,10 +283,10 @@ discard block |
||
| 283 | 283 | <div class="gv-admin-installer-notice notice inline error"> |
| 284 | 284 | <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3> |
| 285 | 285 | <?php |
| 286 | - if ( is_wp_error( $downloads_data ) ) { |
|
| 287 | - echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
| 288 | - } |
|
| 289 | - ?> |
|
| 286 | + if ( is_wp_error( $downloads_data ) ) { |
|
| 287 | + echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' ); |
|
| 288 | + } |
|
| 289 | + ?> |
|
| 290 | 290 | </div> |
| 291 | 291 | </div> |
| 292 | 292 | <?php |
@@ -342,9 +342,9 @@ discard block |
||
| 342 | 342 | protected function render_download( $download, $wp_plugins ) { |
| 343 | 343 | |
| 344 | 344 | |
| 345 | - $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
| 345 | + $details = $this->get_download_display_details( $download, $wp_plugins ); |
|
| 346 | 346 | |
| 347 | - $download_info = $details['download_info']; |
|
| 347 | + $download_info = $details['download_info']; |
|
| 348 | 348 | |
| 349 | 349 | ?> |
| 350 | 350 | <div class="item <?php echo esc_attr( $details['item_class'] ); ?>"> |
@@ -366,43 +366,43 @@ discard block |
||
| 366 | 366 | |
| 367 | 367 | <div class="addon-excerpt"><?php |
| 368 | 368 | |
| 369 | - $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 369 | + $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] ); |
|
| 370 | 370 | |
| 371 | - // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
| 372 | - $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
| 373 | - $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
| 371 | + // Allow some pure HTML tags, but remove everything else from the excerpt. |
|
| 372 | + $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' ); |
|
| 373 | + $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' ); |
|
| 374 | 374 | |
| 375 | - $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
| 376 | - $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
| 375 | + $excerpt = str_replace( $tags, $replacements, $excerpt ); |
|
| 376 | + $excerpt = esc_html( strip_tags( $excerpt ) ); |
|
| 377 | 377 | $excerpt = str_replace( $replacements, $tags, $excerpt ); |
| 378 | 378 | |
| 379 | 379 | echo wpautop( $excerpt ); |
| 380 | - ?></div> |
|
| 380 | + ?></div> |
|
| 381 | 381 | </div> |
| 382 | 382 | </div> |
| 383 | 383 | <?php |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | 386 | /** |
| 387 | - * Generates details array for the download to keep the render_download() method a bit tidier |
|
| 388 | - * |
|
| 387 | + * Generates details array for the download to keep the render_download() method a bit tidier |
|
| 388 | + * |
|
| 389 | 389 | * @param array $download Single download, as returned by {@see get_downloads_data} |
| 390 | 390 | * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()} |
| 391 | 391 | * |
| 392 | 392 | * @return array { |
| 393 | - * @type array $download_info |
|
| 394 | - * @type string $plugin_path |
|
| 395 | - * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
| 396 | - * @type string $status_label |
|
| 397 | - * @type string $button_title Title attribute to show when hovering over the download's button |
|
| 398 | - * @type string $button_class CSS class to use for the button |
|
| 399 | - * @type string $button_label Text to use for the download's anchor link |
|
| 400 | - * @type string $href URL for the download's button |
|
| 401 | - * @type bool $spinner Whether to show the spinner icon |
|
| 402 | - * @type string $item_class CSS class for the download container |
|
| 403 | - * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
| 404 | - * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
| 405 | - * } |
|
| 393 | + * @type array $download_info |
|
| 394 | + * @type string $plugin_path |
|
| 395 | + * @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc) |
|
| 396 | + * @type string $status_label |
|
| 397 | + * @type string $button_title Title attribute to show when hovering over the download's button |
|
| 398 | + * @type string $button_class CSS class to use for the button |
|
| 399 | + * @type string $button_label Text to use for the download's anchor link |
|
| 400 | + * @type string $href URL for the download's button |
|
| 401 | + * @type bool $spinner Whether to show the spinner icon |
|
| 402 | + * @type string $item_class CSS class for the download container |
|
| 403 | + * @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions") |
|
| 404 | + * @type bool $is_active Is the current GravityView license (as entered in Settings) active? |
|
| 405 | + * } |
|
| 406 | 406 | */ |
| 407 | 407 | private function get_download_display_details( $download, $wp_plugins ) { |
| 408 | 408 | |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | 'slug' => '', |
| 414 | 414 | 'excerpt' => '', |
| 415 | 415 | 'link' => '', |
| 416 | - 'coming_soon' => false, |
|
| 416 | + 'coming_soon' => false, |
|
| 417 | 417 | 'installer_title' => null, // May not be defined |
| 418 | 418 | 'installer_excerpt' => null, // May not be defined |
| 419 | 419 | ) ); |
@@ -456,14 +456,14 @@ discard block |
||
| 456 | 456 | $href = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license; |
| 457 | 457 | } |
| 458 | 458 | |
| 459 | - elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
| 460 | - $spinner = false; |
|
| 461 | - $status = 'notinstalled'; |
|
| 462 | - $status_label = __( 'Coming Soon', 'gravityview' ); |
|
| 463 | - $button_label = __( 'Learn More', 'gravityview' ); |
|
| 464 | - $button_class = 'button-primary button-large'; |
|
| 465 | - $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
| 466 | - } |
|
| 459 | + elseif ( ! empty( $download_info['coming_soon'] ) ) { |
|
| 460 | + $spinner = false; |
|
| 461 | + $status = 'notinstalled'; |
|
| 462 | + $status_label = __( 'Coming Soon', 'gravityview' ); |
|
| 463 | + $button_label = __( 'Learn More', 'gravityview' ); |
|
| 464 | + $button_class = 'button-primary button-large'; |
|
| 465 | + $href = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' ); |
|
| 466 | + } |
|
| 467 | 467 | |
| 468 | 468 | // Access but the plugin is not installed |
| 469 | 469 | elseif ( ! $wp_plugin ) { |
@@ -503,18 +503,18 @@ discard block |
||
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' ); |
| 506 | - } |
|
| 506 | + } |
|
| 507 | 507 | |
| 508 | 508 | /** |
| 509 | - * Returns the base price for an extension |
|
| 510 | - * |
|
| 509 | + * Returns the base price for an extension |
|
| 510 | + * |
|
| 511 | 511 | * @param array $download |
| 512 | 512 | * |
| 513 | 513 | * @return float Base price for an extension. If not for sale separately, returns 0 |
| 514 | 514 | */ |
| 515 | 515 | private function get_download_base_price( $download ) { |
| 516 | 516 | |
| 517 | - $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
| 517 | + $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 ); |
|
| 518 | 518 | $base_price = \GFCommon::to_number( $base_price ); |
| 519 | 519 | |
| 520 | 520 | unset( $download['pricing']['amount'] ); |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | return floatval( $base_price ); |
| 528 | - } |
|
| 528 | + } |
|
| 529 | 529 | |
| 530 | 530 | /** |
| 531 | 531 | * Handle AJAX request to activate extension |
@@ -543,8 +543,8 @@ discard block |
||
| 543 | 543 | |
| 544 | 544 | if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) { |
| 545 | 545 | wp_send_json_error( array( |
| 546 | - 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
| 547 | - ) ); |
|
| 546 | + 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() ) |
|
| 547 | + ) ); |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | wp_send_json_success(); |
@@ -565,10 +565,10 @@ discard block |
||
| 565 | 565 | deactivate_plugins( $data['path'] ); |
| 566 | 566 | |
| 567 | 567 | if( is_plugin_active( $data['path'] ) ) { |
| 568 | - wp_send_json_error( array( |
|
| 569 | - 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
| 570 | - ) ); |
|
| 571 | - } |
|
| 568 | + wp_send_json_error( array( |
|
| 569 | + 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) ) |
|
| 570 | + ) ); |
|
| 571 | + } |
|
| 572 | 572 | |
| 573 | 573 | wp_send_json_success(); |
| 574 | 574 | } |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | public static function get_duplicate_link( $entry, $view_id, $post_id = null ) { |
| 261 | 261 | self::getInstance()->set_entry( $entry ); |
| 262 | 262 | |
| 263 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 263 | + $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 264 | 264 | |
| 265 | 265 | if ( empty( $base ) ) { |
| 266 | 266 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | 'action' => 'duplicate', |
| 272 | 272 | 'entry_id' => $entry['id'], |
| 273 | 273 | 'gvid' => $view_id, |
| 274 | - 'view_id' => $view_id, |
|
| 274 | + 'view_id' => $view_id, |
|
| 275 | 275 | ), $base ); |
| 276 | 276 | |
| 277 | 277 | return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl ); |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | * @since 2.5 |
| 471 | 471 | * @param array $duplicated_entry The duplicated entry |
| 472 | 472 | * @param array $entry The original entry |
| 473 | - */ |
|
| 473 | + */ |
|
| 474 | 474 | do_action( 'gravityview/duplicate-entry/duplicated', $duplicated_entry, $entry ); |
| 475 | 475 | |
| 476 | 476 | gravityview()->log->debug( 'Duplicate response: {duplicate_response}', array( 'duplicate_response' => $duplicate_response ) ); |
@@ -102,10 +102,10 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | 104 | * ID of the current post. May also be ID of the current View. |
| 105 | - * |
|
| 106 | - * @since 2.0.13 |
|
| 107 | 105 | * |
| 108 | - * @var int |
|
| 106 | + * @since 2.0.13 |
|
| 107 | + * |
|
| 108 | + * @var int |
|
| 109 | 109 | */ |
| 110 | 110 | public $post_id; |
| 111 | 111 | |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | public function prevent_maybe_process_form() { |
| 190 | 190 | |
| 191 | - if( ! $this->is_edit_entry_submission() ) { |
|
| 191 | + if( ! $this->is_edit_entry_submission() ) { |
|
| 192 | 192 | return; |
| 193 | 193 | } |
| 194 | 194 | |
@@ -222,14 +222,14 @@ discard block |
||
| 222 | 222 | * When Edit entry view is requested setup the vars |
| 223 | 223 | */ |
| 224 | 224 | private function setup_vars() { |
| 225 | - global $post; |
|
| 225 | + global $post; |
|
| 226 | 226 | |
| 227 | 227 | $gravityview_view = GravityView_View::getInstance(); |
| 228 | 228 | |
| 229 | 229 | |
| 230 | 230 | $entries = $gravityview_view->getEntries(); |
| 231 | - self::$original_entry = $entries[0]; |
|
| 232 | - $this->entry = $entries[0]; |
|
| 231 | + self::$original_entry = $entries[0]; |
|
| 232 | + $this->entry = $entries[0]; |
|
| 233 | 233 | |
| 234 | 234 | self::$original_form = $gravityview_view->getForm(); |
| 235 | 235 | $this->form = $gravityview_view->getForm(); |
@@ -371,8 +371,8 @@ discard block |
||
| 371 | 371 | |
| 372 | 372 | GFFormsModel::save_lead( $form, $this->entry ); |
| 373 | 373 | |
| 374 | - // Delete the values for hidden inputs |
|
| 375 | - $this->unset_hidden_field_values(); |
|
| 374 | + // Delete the values for hidden inputs |
|
| 375 | + $this->unset_hidden_field_values(); |
|
| 376 | 376 | |
| 377 | 377 | $this->entry['date_created'] = $date_created; |
| 378 | 378 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | // Perform actions normally performed after updating a lead |
| 386 | 386 | $this->after_update(); |
| 387 | 387 | |
| 388 | - /** |
|
| 388 | + /** |
|
| 389 | 389 | * Must be AFTER after_update()! |
| 390 | 390 | * @see https://github.com/gravityview/GravityView/issues/764 |
| 391 | 391 | */ |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | |
| 394 | 394 | /** |
| 395 | 395 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
| 396 | - * @since 2.1 Added $gv_data parameter |
|
| 396 | + * @since 2.1 Added $gv_data parameter |
|
| 397 | 397 | * @param array $form Gravity Forms form array |
| 398 | 398 | * @param string $entry_id Numeric ID of the entry that was updated |
| 399 | 399 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | * @return void |
| 418 | 418 | */ |
| 419 | 419 | private function unset_hidden_field_values() { |
| 420 | - global $wpdb; |
|
| 420 | + global $wpdb; |
|
| 421 | 421 | |
| 422 | 422 | /** |
| 423 | 423 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
| 442 | 442 | } |
| 443 | 443 | |
| 444 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
| 444 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
| 445 | 445 | |
| 446 | 446 | if ( ! is_numeric( $input_id ) ) { |
| 447 | 447 | continue; |
@@ -451,8 +451,8 @@ discard block |
||
| 451 | 451 | continue; |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | - // Reset fields that are or would be hidden |
|
| 455 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) { |
|
| 454 | + // Reset fields that are or would be hidden |
|
| 455 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) { |
|
| 456 | 456 | |
| 457 | 457 | $empty_value = $field->get_value_save_entry( |
| 458 | 458 | is_array( $field->get_entry_inputs() ) ? array() : '', |
@@ -464,16 +464,16 @@ discard block |
||
| 464 | 464 | $empty_value = ''; |
| 465 | 465 | } |
| 466 | 466 | |
| 467 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 467 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 468 | 468 | |
| 469 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 469 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 470 | 470 | |
| 471 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 471 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 472 | 472 | // after submission |
| 473 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 474 | - $_POST[ $post_input_id ] = ''; |
|
| 475 | - } |
|
| 476 | - } |
|
| 473 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 474 | + $_POST[ $post_input_id ] = ''; |
|
| 475 | + } |
|
| 476 | + } |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | /** |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | |
| 629 | 629 | $form = $this->filter_conditional_logic( $this->form ); |
| 630 | 630 | |
| 631 | - /** @var GF_Field $field */ |
|
| 631 | + /** @var GF_Field $field */ |
|
| 632 | 632 | foreach( $form['fields'] as $k => &$field ) { |
| 633 | 633 | |
| 634 | 634 | /** |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | |
| 645 | 645 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
| 646 | 646 | foreach( $field->inputs as $key => $input ) { |
| 647 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 647 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 648 | 648 | } |
| 649 | 649 | } |
| 650 | 650 | } |
@@ -684,7 +684,7 @@ discard block |
||
| 684 | 684 | |
| 685 | 685 | $inputs = $field->get_entry_inputs(); |
| 686 | 686 | if ( is_array( $inputs ) ) { |
| 687 | - foreach ( $inputs as $input ) { |
|
| 687 | + foreach ( $inputs as $input ) { |
|
| 688 | 688 | list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
| 689 | 689 | |
| 690 | 690 | if ( 'product' === $field->type ) { |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
| 706 | - } |
|
| 706 | + } |
|
| 707 | 707 | } else { |
| 708 | 708 | // Set to what it previously was if it's not editable |
| 709 | 709 | if ( ! in_array( $field->id, $allowed_fields ) ) { |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
| 750 | 750 | |
| 751 | 751 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 752 | - $ary = stripslashes_deep( $ary ); |
|
| 752 | + $ary = stripslashes_deep( $ary ); |
|
| 753 | 753 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 754 | 754 | |
| 755 | 755 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | private function maybe_update_post_fields( $form ) { |
| 823 | 823 | |
| 824 | 824 | if( empty( $this->entry['post_id'] ) ) { |
| 825 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 825 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 826 | 826 | return; |
| 827 | 827 | } |
| 828 | 828 | |
@@ -857,49 +857,49 @@ discard block |
||
| 857 | 857 | |
| 858 | 858 | switch( $field->type ) { |
| 859 | 859 | |
| 860 | - case 'post_title': |
|
| 861 | - $post_title = $value; |
|
| 862 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 863 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 864 | - } |
|
| 865 | - $updated_post->post_title = $post_title; |
|
| 866 | - $updated_post->post_name = $post_title; |
|
| 867 | - unset( $post_title ); |
|
| 868 | - break; |
|
| 869 | - |
|
| 870 | - case 'post_content': |
|
| 871 | - $post_content = $value; |
|
| 872 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 873 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 874 | - } |
|
| 875 | - $updated_post->post_content = $post_content; |
|
| 876 | - unset( $post_content ); |
|
| 877 | - break; |
|
| 878 | - case 'post_excerpt': |
|
| 879 | - $updated_post->post_excerpt = $value; |
|
| 880 | - break; |
|
| 881 | - case 'post_tags': |
|
| 882 | - wp_set_post_tags( $post_id, $value, false ); |
|
| 883 | - break; |
|
| 884 | - case 'post_category': |
|
| 885 | - break; |
|
| 886 | - case 'post_custom_field': |
|
| 860 | + case 'post_title': |
|
| 861 | + $post_title = $value; |
|
| 862 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 863 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 864 | + } |
|
| 865 | + $updated_post->post_title = $post_title; |
|
| 866 | + $updated_post->post_name = $post_title; |
|
| 867 | + unset( $post_title ); |
|
| 868 | + break; |
|
| 869 | + |
|
| 870 | + case 'post_content': |
|
| 871 | + $post_content = $value; |
|
| 872 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 873 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 874 | + } |
|
| 875 | + $updated_post->post_content = $post_content; |
|
| 876 | + unset( $post_content ); |
|
| 877 | + break; |
|
| 878 | + case 'post_excerpt': |
|
| 879 | + $updated_post->post_excerpt = $value; |
|
| 880 | + break; |
|
| 881 | + case 'post_tags': |
|
| 882 | + wp_set_post_tags( $post_id, $value, false ); |
|
| 883 | + break; |
|
| 884 | + case 'post_category': |
|
| 885 | + break; |
|
| 886 | + case 'post_custom_field': |
|
| 887 | 887 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
| 888 | 888 | $value = $value[ $field_id ]; |
| 889 | 889 | } |
| 890 | 890 | |
| 891 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 892 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 893 | - } |
|
| 891 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 892 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 893 | + } |
|
| 894 | 894 | |
| 895 | 895 | $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
| 896 | 896 | |
| 897 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 898 | - break; |
|
| 897 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 898 | + break; |
|
| 899 | 899 | |
| 900 | - case 'post_image': |
|
| 901 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 902 | - break; |
|
| 900 | + case 'post_image': |
|
| 901 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 902 | + break; |
|
| 903 | 903 | |
| 904 | 904 | } |
| 905 | 905 | |
@@ -1063,14 +1063,14 @@ discard block |
||
| 1063 | 1063 | ?><h2 class="gv-edit-entry-title"> |
| 1064 | 1064 | <span><?php |
| 1065 | 1065 | |
| 1066 | - /** |
|
| 1067 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 1068 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 1069 | - * @param GravityView_Edit_Entry_Render $this This object |
|
| 1070 | - */ |
|
| 1071 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 1066 | + /** |
|
| 1067 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 1068 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 1069 | + * @param GravityView_Edit_Entry_Render $this This object |
|
| 1070 | + */ |
|
| 1071 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 1072 | 1072 | |
| 1073 | - echo esc_attr( $edit_entry_title ); |
|
| 1073 | + echo esc_attr( $edit_entry_title ); |
|
| 1074 | 1074 | ?></span> |
| 1075 | 1075 | </h2> |
| 1076 | 1076 | |
@@ -1125,13 +1125,13 @@ discard block |
||
| 1125 | 1125 | ); |
| 1126 | 1126 | |
| 1127 | 1127 | /** |
| 1128 | - * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
| 1129 | - * @since 1.16.3 |
|
| 1130 | - * @param array $labels Default button labels associative array |
|
| 1131 | - * @param array $form The Gravity Forms form |
|
| 1132 | - * @param array $entry The Gravity Forms entry |
|
| 1133 | - * @param int $view_id The current View ID |
|
| 1134 | - */ |
|
| 1128 | + * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
| 1129 | + * @since 1.16.3 |
|
| 1130 | + * @param array $labels Default button labels associative array |
|
| 1131 | + * @param array $form The Gravity Forms form |
|
| 1132 | + * @param array $entry The Gravity Forms entry |
|
| 1133 | + * @param int $view_id The current View ID |
|
| 1134 | + */ |
|
| 1135 | 1135 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
| 1136 | 1136 | |
| 1137 | 1137 | $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
@@ -1168,26 +1168,26 @@ discard block |
||
| 1168 | 1168 | |
| 1169 | 1169 | switch ( $edit_redirect ) { |
| 1170 | 1170 | |
| 1171 | - case '0': |
|
| 1172 | - $redirect_url = $back_link; |
|
| 1173 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 1174 | - break; |
|
| 1175 | - |
|
| 1176 | - case '1': |
|
| 1177 | - $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
| 1178 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 1179 | - break; |
|
| 1180 | - |
|
| 1181 | - case '2': |
|
| 1182 | - $redirect_url = $edit_redirect_url; |
|
| 1183 | - $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
| 1184 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 1185 | - break; |
|
| 1186 | - |
|
| 1187 | - case '': |
|
| 1188 | - default: |
|
| 1189 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 1190 | - break; |
|
| 1171 | + case '0': |
|
| 1172 | + $redirect_url = $back_link; |
|
| 1173 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 1174 | + break; |
|
| 1175 | + |
|
| 1176 | + case '1': |
|
| 1177 | + $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
| 1178 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 1179 | + break; |
|
| 1180 | + |
|
| 1181 | + case '2': |
|
| 1182 | + $redirect_url = $edit_redirect_url; |
|
| 1183 | + $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
| 1184 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 1185 | + break; |
|
| 1186 | + |
|
| 1187 | + case '': |
|
| 1188 | + default: |
|
| 1189 | + $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 1190 | + break; |
|
| 1191 | 1191 | } |
| 1192 | 1192 | |
| 1193 | 1193 | if ( isset( $redirect_url ) ) { |
@@ -1253,13 +1253,13 @@ discard block |
||
| 1253 | 1253 | ); |
| 1254 | 1254 | |
| 1255 | 1255 | /** |
| 1256 | - * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
| 1257 | - * @since 1.16.3 |
|
| 1258 | - * @param array $labels Default button labels associative array |
|
| 1259 | - * @param array $form The Gravity Forms form |
|
| 1260 | - * @param array $entry The Gravity Forms entry |
|
| 1261 | - * @param int $view_id The current View ID |
|
| 1262 | - */ |
|
| 1256 | + * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
| 1257 | + * @since 1.16.3 |
|
| 1258 | + * @param array $labels Default button labels associative array |
|
| 1259 | + * @param array $form The Gravity Forms form |
|
| 1260 | + * @param array $entry The Gravity Forms entry |
|
| 1261 | + * @param int $view_id The current View ID |
|
| 1262 | + */ |
|
| 1263 | 1263 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
| 1264 | 1264 | |
| 1265 | 1265 | GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
@@ -1305,7 +1305,7 @@ discard block |
||
| 1305 | 1305 | |
| 1306 | 1306 | ob_get_clean(); |
| 1307 | 1307 | |
| 1308 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1308 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1309 | 1309 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
| 1310 | 1310 | remove_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
| 1311 | 1311 | remove_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
@@ -1365,7 +1365,7 @@ discard block |
||
| 1365 | 1365 | |
| 1366 | 1366 | // for now we don't support Save and Continue feature. |
| 1367 | 1367 | if( ! self::$supports_save_and_continue ) { |
| 1368 | - unset( $form['save'] ); |
|
| 1368 | + unset( $form['save'] ); |
|
| 1369 | 1369 | } |
| 1370 | 1370 | |
| 1371 | 1371 | $form = $this->unselect_default_values( $form ); |
@@ -1392,30 +1392,30 @@ discard block |
||
| 1392 | 1392 | return $field_content; |
| 1393 | 1393 | } |
| 1394 | 1394 | |
| 1395 | - $message = null; |
|
| 1395 | + $message = null; |
|
| 1396 | 1396 | |
| 1397 | - // First, make sure they have the capability to edit the post. |
|
| 1398 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1397 | + // First, make sure they have the capability to edit the post. |
|
| 1398 | + if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1399 | 1399 | |
| 1400 | - /** |
|
| 1401 | - * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
| 1402 | - * @param string $message The existing "You don't have permission..." text |
|
| 1403 | - */ |
|
| 1404 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1400 | + /** |
|
| 1401 | + * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
| 1402 | + * @param string $message The existing "You don't have permission..." text |
|
| 1403 | + */ |
|
| 1404 | + $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1405 | 1405 | |
| 1406 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1407 | - /** |
|
| 1408 | - * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
| 1409 | - * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
| 1410 | - */ |
|
| 1411 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1412 | - } |
|
| 1406 | + } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1407 | + /** |
|
| 1408 | + * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
| 1409 | + * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
| 1410 | + */ |
|
| 1411 | + $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1412 | + } |
|
| 1413 | 1413 | |
| 1414 | - if( $message ) { |
|
| 1415 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1416 | - } |
|
| 1414 | + if( $message ) { |
|
| 1415 | + $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1416 | + } |
|
| 1417 | 1417 | |
| 1418 | - return $field_content; |
|
| 1418 | + return $field_content; |
|
| 1419 | 1419 | } |
| 1420 | 1420 | |
| 1421 | 1421 | /** |
@@ -1443,7 +1443,7 @@ discard block |
||
| 1443 | 1443 | || ! empty( $field_content ) |
| 1444 | 1444 | || in_array( $field->type, array( 'honeypot' ) ) |
| 1445 | 1445 | ) { |
| 1446 | - return $field_content; |
|
| 1446 | + return $field_content; |
|
| 1447 | 1447 | } |
| 1448 | 1448 | |
| 1449 | 1449 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1451,24 +1451,24 @@ discard block |
||
| 1451 | 1451 | |
| 1452 | 1452 | $field_value = $this->get_field_value( $field ); |
| 1453 | 1453 | |
| 1454 | - // Prevent any PHP warnings, like undefined index |
|
| 1455 | - ob_start(); |
|
| 1454 | + // Prevent any PHP warnings, like undefined index |
|
| 1455 | + ob_start(); |
|
| 1456 | 1456 | |
| 1457 | - $return = null; |
|
| 1457 | + $return = null; |
|
| 1458 | 1458 | |
| 1459 | 1459 | /** @var GravityView_Field $gv_field */ |
| 1460 | 1460 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
| 1461 | 1461 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1462 | 1462 | } else { |
| 1463 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1464 | - } |
|
| 1463 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1464 | + } |
|
| 1465 | 1465 | |
| 1466 | - // If there was output, it's an error |
|
| 1467 | - $warnings = ob_get_clean(); |
|
| 1466 | + // If there was output, it's an error |
|
| 1467 | + $warnings = ob_get_clean(); |
|
| 1468 | 1468 | |
| 1469 | - if( !empty( $warnings ) ) { |
|
| 1470 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1471 | - } |
|
| 1469 | + if( !empty( $warnings ) ) { |
|
| 1470 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1471 | + } |
|
| 1472 | 1472 | |
| 1473 | 1473 | return $return; |
| 1474 | 1474 | } |
@@ -1503,8 +1503,8 @@ discard block |
||
| 1503 | 1503 | $input_id = strval( $input['id'] ); |
| 1504 | 1504 | |
| 1505 | 1505 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1506 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1507 | - $allow_pre_populated = false; |
|
| 1506 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1507 | + $allow_pre_populated = false; |
|
| 1508 | 1508 | } |
| 1509 | 1509 | |
| 1510 | 1510 | } |
@@ -1528,7 +1528,7 @@ discard block |
||
| 1528 | 1528 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
| 1529 | 1529 | $categories = array(); |
| 1530 | 1530 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1531 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1531 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1532 | 1532 | } |
| 1533 | 1533 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1534 | 1534 | } |
@@ -1538,25 +1538,25 @@ discard block |
||
| 1538 | 1538 | // if value is empty get the default value if defined |
| 1539 | 1539 | $field_value = $field->get_value_default_if_empty( $field_value ); |
| 1540 | 1540 | |
| 1541 | - /** |
|
| 1542 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1543 | - * @since 1.11 |
|
| 1544 | - * @since 1.20 Added third param |
|
| 1545 | - * @param mixed $field_value field value used to populate the input |
|
| 1546 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1547 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1548 | - */ |
|
| 1549 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1550 | - |
|
| 1551 | - /** |
|
| 1552 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1553 | - * @since 1.17 |
|
| 1554 | - * @since 1.20 Added third param |
|
| 1555 | - * @param mixed $field_value field value used to populate the input |
|
| 1556 | - * @param GF_Field $field Gravity Forms field object |
|
| 1557 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1558 | - */ |
|
| 1559 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1541 | + /** |
|
| 1542 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1543 | + * @since 1.11 |
|
| 1544 | + * @since 1.20 Added third param |
|
| 1545 | + * @param mixed $field_value field value used to populate the input |
|
| 1546 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1547 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1548 | + */ |
|
| 1549 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1550 | + |
|
| 1551 | + /** |
|
| 1552 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1553 | + * @since 1.17 |
|
| 1554 | + * @since 1.20 Added third param |
|
| 1555 | + * @param mixed $field_value field value used to populate the input |
|
| 1556 | + * @param GF_Field $field Gravity Forms field object |
|
| 1557 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1558 | + */ |
|
| 1559 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1560 | 1560 | |
| 1561 | 1561 | return $field_value; |
| 1562 | 1562 | } |
@@ -1583,7 +1583,7 @@ discard block |
||
| 1583 | 1583 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1584 | 1584 | // expects certain field array items to be set. |
| 1585 | 1585 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
| 1586 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1586 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1587 | 1587 | } |
| 1588 | 1588 | |
| 1589 | 1589 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1597,61 +1597,61 @@ discard block |
||
| 1597 | 1597 | */ |
| 1598 | 1598 | case 'fileupload': |
| 1599 | 1599 | |
| 1600 | - // Set the previous value |
|
| 1601 | - $entry = $this->get_entry(); |
|
| 1600 | + // Set the previous value |
|
| 1601 | + $entry = $this->get_entry(); |
|
| 1602 | 1602 | |
| 1603 | - $input_name = 'input_'.$field->id; |
|
| 1604 | - $form_id = $form['id']; |
|
| 1603 | + $input_name = 'input_'.$field->id; |
|
| 1604 | + $form_id = $form['id']; |
|
| 1605 | 1605 | |
| 1606 | - $value = NULL; |
|
| 1606 | + $value = NULL; |
|
| 1607 | 1607 | |
| 1608 | - // Use the previous entry value as the default. |
|
| 1609 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1610 | - $value = $entry[ $field->id ]; |
|
| 1611 | - } |
|
| 1608 | + // Use the previous entry value as the default. |
|
| 1609 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1610 | + $value = $entry[ $field->id ]; |
|
| 1611 | + } |
|
| 1612 | 1612 | |
| 1613 | - // If this is a single upload file |
|
| 1614 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1615 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1616 | - $value = $file_path['url']; |
|
| 1613 | + // If this is a single upload file |
|
| 1614 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1615 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1616 | + $value = $file_path['url']; |
|
| 1617 | 1617 | |
| 1618 | - } else { |
|
| 1618 | + } else { |
|
| 1619 | 1619 | |
| 1620 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1621 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1622 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1620 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1621 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1622 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1623 | 1623 | |
| 1624 | - } |
|
| 1624 | + } |
|
| 1625 | 1625 | |
| 1626 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1626 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1627 | 1627 | |
| 1628 | - // If there are fresh uploads, process and merge them. |
|
| 1629 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1630 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1631 | - $value = empty( $value ) ? '[]' : $value; |
|
| 1632 | - $value = stripslashes_deep( $value ); |
|
| 1633 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1634 | - } |
|
| 1628 | + // If there are fresh uploads, process and merge them. |
|
| 1629 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1630 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1631 | + $value = empty( $value ) ? '[]' : $value; |
|
| 1632 | + $value = stripslashes_deep( $value ); |
|
| 1633 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1634 | + } |
|
| 1635 | 1635 | |
| 1636 | - } else { |
|
| 1636 | + } else { |
|
| 1637 | 1637 | |
| 1638 | - // A file already exists when editing an entry |
|
| 1639 | - // We set this to solve issue when file upload fields are required. |
|
| 1640 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1638 | + // A file already exists when editing an entry |
|
| 1639 | + // We set this to solve issue when file upload fields are required. |
|
| 1640 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1641 | 1641 | |
| 1642 | - } |
|
| 1642 | + } |
|
| 1643 | 1643 | |
| 1644 | - $this->entry[ $input_name ] = $value; |
|
| 1645 | - $_POST[ $input_name ] = $value; |
|
| 1644 | + $this->entry[ $input_name ] = $value; |
|
| 1645 | + $_POST[ $input_name ] = $value; |
|
| 1646 | 1646 | |
| 1647 | - break; |
|
| 1647 | + break; |
|
| 1648 | 1648 | |
| 1649 | 1649 | case 'number': |
| 1650 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1651 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1652 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1653 | - } |
|
| 1654 | - break; |
|
| 1650 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1651 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1652 | + $_POST['input_'.$field->id ] = NULL; |
|
| 1653 | + } |
|
| 1654 | + break; |
|
| 1655 | 1655 | } |
| 1656 | 1656 | |
| 1657 | 1657 | } |
@@ -1736,43 +1736,43 @@ discard block |
||
| 1736 | 1736 | case 'fileupload' : |
| 1737 | 1737 | case 'post_image': |
| 1738 | 1738 | |
| 1739 | - // in case nothing is uploaded but there are already files saved |
|
| 1740 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1741 | - $field->failed_validation = false; |
|
| 1742 | - unset( $field->validation_message ); |
|
| 1743 | - } |
|
| 1739 | + // in case nothing is uploaded but there are already files saved |
|
| 1740 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1741 | + $field->failed_validation = false; |
|
| 1742 | + unset( $field->validation_message ); |
|
| 1743 | + } |
|
| 1744 | 1744 | |
| 1745 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1746 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1745 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1746 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1747 | 1747 | |
| 1748 | - $input_name = 'input_' . $field->id; |
|
| 1749 | - //uploaded |
|
| 1750 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1748 | + $input_name = 'input_' . $field->id; |
|
| 1749 | + //uploaded |
|
| 1750 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1751 | 1751 | |
| 1752 | - //existent |
|
| 1753 | - $entry = $this->get_entry(); |
|
| 1754 | - $value = NULL; |
|
| 1755 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1756 | - $value = json_decode( $entry[ $field->id ], true ); |
|
| 1757 | - } |
|
| 1752 | + //existent |
|
| 1753 | + $entry = $this->get_entry(); |
|
| 1754 | + $value = NULL; |
|
| 1755 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1756 | + $value = json_decode( $entry[ $field->id ], true ); |
|
| 1757 | + } |
|
| 1758 | 1758 | |
| 1759 | - // count uploaded files and existent entry files |
|
| 1760 | - $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
|
| 1761 | - ( is_array( $value ) ? count( $value ) : 0 ); |
|
| 1759 | + // count uploaded files and existent entry files |
|
| 1760 | + $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
|
| 1761 | + ( is_array( $value ) ? count( $value ) : 0 ); |
|
| 1762 | 1762 | |
| 1763 | - if( $count_files > $field->maxFiles ) { |
|
| 1764 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1765 | - $field->failed_validation = 1; |
|
| 1766 | - $gv_valid = false; |
|
| 1763 | + if( $count_files > $field->maxFiles ) { |
|
| 1764 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1765 | + $field->failed_validation = 1; |
|
| 1766 | + $gv_valid = false; |
|
| 1767 | 1767 | |
| 1768 | - // in case of error make sure the newest upload files are removed from the upload input |
|
| 1769 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1770 | - } |
|
| 1768 | + // in case of error make sure the newest upload files are removed from the upload input |
|
| 1769 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1770 | + } |
|
| 1771 | 1771 | |
| 1772 | - } |
|
| 1772 | + } |
|
| 1773 | 1773 | |
| 1774 | 1774 | |
| 1775 | - break; |
|
| 1775 | + break; |
|
| 1776 | 1776 | |
| 1777 | 1777 | } |
| 1778 | 1778 | |
@@ -1783,47 +1783,47 @@ discard block |
||
| 1783 | 1783 | |
| 1784 | 1784 | switch ( $field_type ) { |
| 1785 | 1785 | |
| 1786 | - // Captchas don't need to be re-entered. |
|
| 1787 | - case 'captcha': |
|
| 1786 | + // Captchas don't need to be re-entered. |
|
| 1787 | + case 'captcha': |
|
| 1788 | 1788 | |
| 1789 | - // Post Image fields aren't editable, so we un-fail them. |
|
| 1790 | - case 'post_image': |
|
| 1791 | - $field->failed_validation = false; |
|
| 1792 | - unset( $field->validation_message ); |
|
| 1793 | - break; |
|
| 1789 | + // Post Image fields aren't editable, so we un-fail them. |
|
| 1790 | + case 'post_image': |
|
| 1791 | + $field->failed_validation = false; |
|
| 1792 | + unset( $field->validation_message ); |
|
| 1793 | + break; |
|
| 1794 | 1794 | |
| 1795 | 1795 | } |
| 1796 | 1796 | |
| 1797 | 1797 | // You can't continue inside a switch, so we do it after. |
| 1798 | 1798 | if( empty( $field->failed_validation ) ) { |
| 1799 | - continue; |
|
| 1799 | + continue; |
|
| 1800 | 1800 | } |
| 1801 | 1801 | |
| 1802 | 1802 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1803 | 1803 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1804 | 1804 | if( !empty( $field->noDuplicates ) ) { |
| 1805 | 1805 | |
| 1806 | - $entry = $this->get_entry(); |
|
| 1806 | + $entry = $this->get_entry(); |
|
| 1807 | 1807 | |
| 1808 | - // If the value of the entry is the same as the stored value |
|
| 1809 | - // Then we can assume it's not a duplicate, it's the same. |
|
| 1810 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1811 | - //if value submitted was not changed, then don't validate |
|
| 1812 | - $field->failed_validation = false; |
|
| 1808 | + // If the value of the entry is the same as the stored value |
|
| 1809 | + // Then we can assume it's not a duplicate, it's the same. |
|
| 1810 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1811 | + //if value submitted was not changed, then don't validate |
|
| 1812 | + $field->failed_validation = false; |
|
| 1813 | 1813 | |
| 1814 | - unset( $field->validation_message ); |
|
| 1814 | + unset( $field->validation_message ); |
|
| 1815 | 1815 | |
| 1816 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1816 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1817 | 1817 | |
| 1818 | - continue; |
|
| 1819 | - } |
|
| 1818 | + continue; |
|
| 1819 | + } |
|
| 1820 | 1820 | } |
| 1821 | 1821 | |
| 1822 | 1822 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1823 | 1823 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
| 1824 | - unset( $field->validation_message ); |
|
| 1825 | - $field->validation_message = false; |
|
| 1826 | - continue; |
|
| 1824 | + unset( $field->validation_message ); |
|
| 1825 | + $field->validation_message = false; |
|
| 1826 | + continue; |
|
| 1827 | 1827 | } |
| 1828 | 1828 | |
| 1829 | 1829 | $gv_valid = false; |
@@ -1887,8 +1887,8 @@ discard block |
||
| 1887 | 1887 | // Hide fields depending on admin settings |
| 1888 | 1888 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
| 1889 | 1889 | |
| 1890 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1891 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1890 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1891 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1892 | 1892 | |
| 1893 | 1893 | /** |
| 1894 | 1894 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1967,11 +1967,11 @@ discard block |
||
| 1967 | 1967 | // The edit tab has been configured, so we loop through to configured settings |
| 1968 | 1968 | foreach ( $configured_fields as $configured_field ) { |
| 1969 | 1969 | |
| 1970 | - /** @var GF_Field $field */ |
|
| 1971 | - foreach ( $fields as $field ) { |
|
| 1970 | + /** @var GF_Field $field */ |
|
| 1971 | + foreach ( $fields as $field ) { |
|
| 1972 | 1972 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
| 1973 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1974 | - break; |
|
| 1973 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1974 | + break; |
|
| 1975 | 1975 | } |
| 1976 | 1976 | |
| 1977 | 1977 | } |
@@ -2027,28 +2027,28 @@ discard block |
||
| 2027 | 2027 | */ |
| 2028 | 2028 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
| 2029 | 2029 | |
| 2030 | - /** |
|
| 2030 | + /** |
|
| 2031 | 2031 | * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true |
| 2032 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 2033 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 2034 | - * @since 1.9.1 |
|
| 2035 | - * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions. |
|
| 2036 | - * @param array $form GF Form array |
|
| 2037 | - * @param int $view_id View ID |
|
| 2038 | - */ |
|
| 2039 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 2040 | - |
|
| 2041 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 2032 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 2033 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 2034 | + * @since 1.9.1 |
|
| 2035 | + * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions. |
|
| 2036 | + * @param array $form GF Form array |
|
| 2037 | + * @param int $view_id View ID |
|
| 2038 | + */ |
|
| 2039 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 2040 | + |
|
| 2041 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 2042 | 2042 | foreach( $fields as $k => $field ) { |
| 2043 | 2043 | if( $field->adminOnly ) { |
| 2044 | - unset( $fields[ $k ] ); |
|
| 2044 | + unset( $fields[ $k ] ); |
|
| 2045 | 2045 | } |
| 2046 | 2046 | } |
| 2047 | 2047 | return array_values( $fields ); |
| 2048 | 2048 | } |
| 2049 | 2049 | |
| 2050 | - foreach( $fields as &$field ) { |
|
| 2051 | - $field->adminOnly = false; |
|
| 2050 | + foreach( $fields as &$field ) { |
|
| 2051 | + $field->adminOnly = false; |
|
| 2052 | 2052 | } |
| 2053 | 2053 | |
| 2054 | 2054 | return $fields; |
@@ -2068,13 +2068,13 @@ discard block |
||
| 2068 | 2068 | */ |
| 2069 | 2069 | private function unselect_default_values( $form ) { |
| 2070 | 2070 | |
| 2071 | - foreach ( $form['fields'] as &$field ) { |
|
| 2071 | + foreach ( $form['fields'] as &$field ) { |
|
| 2072 | 2072 | |
| 2073 | 2073 | if ( empty( $field->choices ) ) { |
| 2074 | - continue; |
|
| 2074 | + continue; |
|
| 2075 | 2075 | } |
| 2076 | 2076 | |
| 2077 | - foreach ( $field->choices as &$choice ) { |
|
| 2077 | + foreach ( $field->choices as &$choice ) { |
|
| 2078 | 2078 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
| 2079 | 2079 | $choice['isSelected'] = false; |
| 2080 | 2080 | } |
@@ -2111,36 +2111,36 @@ discard block |
||
| 2111 | 2111 | |
| 2112 | 2112 | if( 'checkbox' === $field->type ) { |
| 2113 | 2113 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 2114 | - $input_id = $input['id']; |
|
| 2115 | - $choice = $field->choices[ $key ]; |
|
| 2116 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 2117 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 2118 | - if( $match ) { |
|
| 2119 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 2120 | - } |
|
| 2114 | + $input_id = $input['id']; |
|
| 2115 | + $choice = $field->choices[ $key ]; |
|
| 2116 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 2117 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 2118 | + if( $match ) { |
|
| 2119 | + $field->choices[ $key ]['isSelected'] = true; |
|
| 2120 | + } |
|
| 2121 | 2121 | } |
| 2122 | 2122 | } else { |
| 2123 | 2123 | |
| 2124 | 2124 | // We need to run through each field to set the default values |
| 2125 | 2125 | foreach ( $this->entry as $field_id => $field_value ) { |
| 2126 | 2126 | |
| 2127 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 2127 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 2128 | 2128 | |
| 2129 | - if( 'list' === $field->type ) { |
|
| 2130 | - $list_rows = maybe_unserialize( $field_value ); |
|
| 2129 | + if( 'list' === $field->type ) { |
|
| 2130 | + $list_rows = maybe_unserialize( $field_value ); |
|
| 2131 | 2131 | |
| 2132 | - $list_field_value = array(); |
|
| 2133 | - foreach ( (array) $list_rows as $row ) { |
|
| 2134 | - foreach ( (array) $row as $column ) { |
|
| 2135 | - $list_field_value[] = $column; |
|
| 2136 | - } |
|
| 2137 | - } |
|
| 2132 | + $list_field_value = array(); |
|
| 2133 | + foreach ( (array) $list_rows as $row ) { |
|
| 2134 | + foreach ( (array) $row as $column ) { |
|
| 2135 | + $list_field_value[] = $column; |
|
| 2136 | + } |
|
| 2137 | + } |
|
| 2138 | 2138 | |
| 2139 | - $field->defaultValue = serialize( $list_field_value ); |
|
| 2140 | - } else { |
|
| 2141 | - $field->defaultValue = $field_value; |
|
| 2142 | - } |
|
| 2143 | - } |
|
| 2139 | + $field->defaultValue = serialize( $list_field_value ); |
|
| 2140 | + } else { |
|
| 2141 | + $field->defaultValue = $field_value; |
|
| 2142 | + } |
|
| 2143 | + } |
|
| 2144 | 2144 | } |
| 2145 | 2145 | } |
| 2146 | 2146 | } |
@@ -2201,7 +2201,7 @@ discard block |
||
| 2201 | 2201 | foreach ( $form['fields'] as &$field ) { |
| 2202 | 2202 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
| 2203 | 2203 | |
| 2204 | - list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
| 2204 | + list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
| 2205 | 2205 | |
| 2206 | 2206 | if ( $field['id'] == $rule_field_id ) { |
| 2207 | 2207 | unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
@@ -2252,7 +2252,7 @@ discard block |
||
| 2252 | 2252 | return $has_conditional_logic; |
| 2253 | 2253 | } |
| 2254 | 2254 | |
| 2255 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 2255 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 2256 | 2256 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
| 2257 | 2257 | } |
| 2258 | 2258 | |
@@ -2319,14 +2319,14 @@ discard block |
||
| 2319 | 2319 | |
| 2320 | 2320 | if( $echo && $error !== true ) { |
| 2321 | 2321 | |
| 2322 | - $error = esc_html( $error ); |
|
| 2322 | + $error = esc_html( $error ); |
|
| 2323 | 2323 | |
| 2324 | - /** |
|
| 2325 | - * @since 1.9 |
|
| 2326 | - */ |
|
| 2327 | - if ( ! empty( $this->entry ) ) { |
|
| 2328 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 2329 | - } |
|
| 2324 | + /** |
|
| 2325 | + * @since 1.9 |
|
| 2326 | + */ |
|
| 2327 | + if ( ! empty( $this->entry ) ) { |
|
| 2328 | + $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 2329 | + } |
|
| 2330 | 2330 | |
| 2331 | 2331 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
| 2332 | 2332 | } |
@@ -18,82 +18,82 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | class GravityView_Edit_Entry { |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * @var string |
|
| 23 | - */ |
|
| 21 | + /** |
|
| 22 | + * @var string |
|
| 23 | + */ |
|
| 24 | 24 | static $file; |
| 25 | 25 | |
| 26 | 26 | static $instance; |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Component instances. |
|
| 30 | - * @var array |
|
| 31 | - */ |
|
| 32 | - public $instances = array(); |
|
| 28 | + /** |
|
| 29 | + * Component instances. |
|
| 30 | + * @var array |
|
| 31 | + */ |
|
| 32 | + public $instances = array(); |
|
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | function __construct() { |
| 36 | 36 | |
| 37 | - self::$file = plugin_dir_path( __FILE__ ); |
|
| 37 | + self::$file = plugin_dir_path( __FILE__ ); |
|
| 38 | 38 | |
| 39 | - if( is_admin() ) { |
|
| 40 | - $this->load_components( 'admin' ); |
|
| 41 | - } |
|
| 39 | + if( is_admin() ) { |
|
| 40 | + $this->load_components( 'admin' ); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | 43 | |
| 44 | - $this->load_components( 'render' ); |
|
| 44 | + $this->load_components( 'render' ); |
|
| 45 | 45 | |
| 46 | - // If GF User Registration Add-on exists |
|
| 47 | - $this->load_components( 'user-registration' ); |
|
| 46 | + // If GF User Registration Add-on exists |
|
| 47 | + $this->load_components( 'user-registration' ); |
|
| 48 | 48 | |
| 49 | - $this->add_hooks(); |
|
| 49 | + $this->add_hooks(); |
|
| 50 | 50 | |
| 51 | 51 | // Process hooks for addons that may or may not be present |
| 52 | 52 | $this->addon_specific_hooks(); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
| 56 | - static function getInstance() { |
|
| 56 | + static function getInstance() { |
|
| 57 | 57 | |
| 58 | - if( empty( self::$instance ) ) { |
|
| 59 | - self::$instance = new GravityView_Edit_Entry; |
|
| 60 | - } |
|
| 58 | + if( empty( self::$instance ) ) { |
|
| 59 | + self::$instance = new GravityView_Edit_Entry; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - return self::$instance; |
|
| 63 | - } |
|
| 62 | + return self::$instance; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - private function load_components( $component ) { |
|
| 66 | + private function load_components( $component ) { |
|
| 67 | 67 | |
| 68 | - $dir = trailingslashit( self::$file ); |
|
| 68 | + $dir = trailingslashit( self::$file ); |
|
| 69 | 69 | |
| 70 | - $filename = $dir . 'class-edit-entry-' . $component . '.php'; |
|
| 71 | - $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) ); |
|
| 70 | + $filename = $dir . 'class-edit-entry-' . $component . '.php'; |
|
| 71 | + $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) ); |
|
| 72 | 72 | |
| 73 | - // Loads component and pass extension's instance so that component can |
|
| 74 | - // talk each other. |
|
| 75 | - require_once $filename; |
|
| 76 | - $this->instances[ $component ] = new $classname( $this ); |
|
| 77 | - $this->instances[ $component ]->load(); |
|
| 73 | + // Loads component and pass extension's instance so that component can |
|
| 74 | + // talk each other. |
|
| 75 | + require_once $filename; |
|
| 76 | + $this->instances[ $component ] = new $classname( $this ); |
|
| 77 | + $this->instances[ $component ]->load(); |
|
| 78 | 78 | |
| 79 | - } |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - private function add_hooks() { |
|
| 81 | + private function add_hooks() { |
|
| 82 | 82 | |
| 83 | - // Add front-end access to Gravity Forms delete file action |
|
| 84 | - add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') ); |
|
| 83 | + // Add front-end access to Gravity Forms delete file action |
|
| 84 | + add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') ); |
|
| 85 | 85 | |
| 86 | - // Make sure this hook is run for non-admins |
|
| 87 | - add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') ); |
|
| 86 | + // Make sure this hook is run for non-admins |
|
| 87 | + add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') ); |
|
| 88 | 88 | |
| 89 | - add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 ); |
|
| 89 | + add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 ); |
|
| 90 | 90 | |
| 91 | - // add template path to check for field |
|
| 92 | - add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
|
| 91 | + // add template path to check for field |
|
| 92 | + add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
|
| 93 | 93 | |
| 94 | 94 | add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 ); |
| 95 | 95 | |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | 99 | * Trigger hooks that are normally run in the admin for Addons, but need to be triggered manually because we're not in the admin |
@@ -151,77 +151,77 @@ discard block |
||
| 151 | 151 | return false; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Include this extension templates path |
|
| 156 | - * @param array $file_paths List of template paths ordered |
|
| 157 | - */ |
|
| 158 | - public function add_template_path( $file_paths ) { |
|
| 159 | - |
|
| 160 | - // Index 100 is the default GravityView template path. |
|
| 161 | - $file_paths[ 110 ] = self::$file; |
|
| 162 | - |
|
| 163 | - return $file_paths; |
|
| 164 | - } |
|
| 165 | - |
|
| 166 | - /** |
|
| 167 | - * |
|
| 168 | - * Return a well formatted nonce key according to GravityView Edit Entry protocol |
|
| 169 | - * |
|
| 170 | - * @param $view_id int GravityView view id |
|
| 171 | - * @param $form_id int Gravity Forms form id |
|
| 172 | - * @param $entry_id int Gravity Forms entry id |
|
| 173 | - * @return string |
|
| 174 | - */ |
|
| 175 | - public static function get_nonce_key( $view_id, $form_id, $entry_id ) { |
|
| 176 | - return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id ); |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - |
|
| 180 | - /** |
|
| 181 | - * The edit entry link creates a secure link with a nonce |
|
| 182 | - * |
|
| 183 | - * It also mimics the URL structure Gravity Forms expects to have so that |
|
| 184 | - * it formats the display of the edit form like it does in the backend, like |
|
| 185 | - * "You can edit this post from the post page" fields, for example. |
|
| 186 | - * |
|
| 187 | - * @param $entry array Gravity Forms entry object |
|
| 188 | - * @param $view_id int GravityView view id |
|
| 189 | - * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2} |
|
| 190 | - * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ } |
|
| 191 | - * @return string |
|
| 192 | - */ |
|
| 193 | - public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) { |
|
| 194 | - |
|
| 195 | - $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id'] ); |
|
| 196 | - |
|
| 197 | - $base = gv_entry_link( $entry, $post_id ? : $view_id ); |
|
| 198 | - |
|
| 199 | - $url = add_query_arg( array( |
|
| 200 | - 'edit' => wp_create_nonce( $nonce_key ) |
|
| 201 | - ), $base ); |
|
| 202 | - |
|
| 203 | - if( $post_id ) { |
|
| 204 | - $url = add_query_arg( array( 'gvid' => $view_id ), $url ); |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - /** |
|
| 208 | - * Allow passing params to dynamically populate entry with values |
|
| 209 | - * @since 1.9.2 |
|
| 210 | - */ |
|
| 211 | - if( !empty( $field_values ) ) { |
|
| 212 | - |
|
| 213 | - if( is_array( $field_values ) ) { |
|
| 214 | - // If already an array, no parse_str() needed |
|
| 215 | - $params = $field_values; |
|
| 216 | - } else { |
|
| 217 | - parse_str( $field_values, $params ); |
|
| 218 | - } |
|
| 219 | - |
|
| 220 | - $url = add_query_arg( $params, $url ); |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - return $url; |
|
| 224 | - } |
|
| 154 | + /** |
|
| 155 | + * Include this extension templates path |
|
| 156 | + * @param array $file_paths List of template paths ordered |
|
| 157 | + */ |
|
| 158 | + public function add_template_path( $file_paths ) { |
|
| 159 | + |
|
| 160 | + // Index 100 is the default GravityView template path. |
|
| 161 | + $file_paths[ 110 ] = self::$file; |
|
| 162 | + |
|
| 163 | + return $file_paths; |
|
| 164 | + } |
|
| 165 | + |
|
| 166 | + /** |
|
| 167 | + * |
|
| 168 | + * Return a well formatted nonce key according to GravityView Edit Entry protocol |
|
| 169 | + * |
|
| 170 | + * @param $view_id int GravityView view id |
|
| 171 | + * @param $form_id int Gravity Forms form id |
|
| 172 | + * @param $entry_id int Gravity Forms entry id |
|
| 173 | + * @return string |
|
| 174 | + */ |
|
| 175 | + public static function get_nonce_key( $view_id, $form_id, $entry_id ) { |
|
| 176 | + return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id ); |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + |
|
| 180 | + /** |
|
| 181 | + * The edit entry link creates a secure link with a nonce |
|
| 182 | + * |
|
| 183 | + * It also mimics the URL structure Gravity Forms expects to have so that |
|
| 184 | + * it formats the display of the edit form like it does in the backend, like |
|
| 185 | + * "You can edit this post from the post page" fields, for example. |
|
| 186 | + * |
|
| 187 | + * @param $entry array Gravity Forms entry object |
|
| 188 | + * @param $view_id int GravityView view id |
|
| 189 | + * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2} |
|
| 190 | + * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ } |
|
| 191 | + * @return string |
|
| 192 | + */ |
|
| 193 | + public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) { |
|
| 194 | + |
|
| 195 | + $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id'] ); |
|
| 196 | + |
|
| 197 | + $base = gv_entry_link( $entry, $post_id ? : $view_id ); |
|
| 198 | + |
|
| 199 | + $url = add_query_arg( array( |
|
| 200 | + 'edit' => wp_create_nonce( $nonce_key ) |
|
| 201 | + ), $base ); |
|
| 202 | + |
|
| 203 | + if( $post_id ) { |
|
| 204 | + $url = add_query_arg( array( 'gvid' => $view_id ), $url ); |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + /** |
|
| 208 | + * Allow passing params to dynamically populate entry with values |
|
| 209 | + * @since 1.9.2 |
|
| 210 | + */ |
|
| 211 | + if( !empty( $field_values ) ) { |
|
| 212 | + |
|
| 213 | + if( is_array( $field_values ) ) { |
|
| 214 | + // If already an array, no parse_str() needed |
|
| 215 | + $params = $field_values; |
|
| 216 | + } else { |
|
| 217 | + parse_str( $field_values, $params ); |
|
| 218 | + } |
|
| 219 | + |
|
| 220 | + $url = add_query_arg( $params, $url ); |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + return $url; |
|
| 224 | + } |
|
| 225 | 225 | |
| 226 | 226 | /** |
| 227 | 227 | * Edit mode doesn't allow certain field types. |
@@ -276,19 +276,19 @@ discard block |
||
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | |
| 279 | - /** |
|
| 280 | - * checks if user has permissions to edit a specific entry |
|
| 281 | - * |
|
| 282 | - * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!! |
|
| 283 | - * |
|
| 284 | - * @param array $entry Gravity Forms entry array |
|
| 285 | - * @param \GV\View int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0 |
|
| 286 | - * @return bool |
|
| 287 | - */ |
|
| 288 | - public static function check_user_cap_edit_entry( $entry, $view = 0 ) { |
|
| 279 | + /** |
|
| 280 | + * checks if user has permissions to edit a specific entry |
|
| 281 | + * |
|
| 282 | + * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!! |
|
| 283 | + * |
|
| 284 | + * @param array $entry Gravity Forms entry array |
|
| 285 | + * @param \GV\View int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0 |
|
| 286 | + * @return bool |
|
| 287 | + */ |
|
| 288 | + public static function check_user_cap_edit_entry( $entry, $view = 0 ) { |
|
| 289 | 289 | |
| 290 | - // No permission by default |
|
| 291 | - $user_can_edit = false; |
|
| 290 | + // No permission by default |
|
| 291 | + $user_can_edit = false; |
|
| 292 | 292 | |
| 293 | 293 | // get user_edit setting |
| 294 | 294 | if ( empty( $view ) ) { |
@@ -306,59 +306,59 @@ discard block |
||
| 306 | 306 | $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' ); |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | - // If they can edit any entries (as defined in Gravity Forms) |
|
| 310 | - // Or if they can edit other people's entries |
|
| 311 | - // Then we're good. |
|
| 312 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) { |
|
| 309 | + // If they can edit any entries (as defined in Gravity Forms) |
|
| 310 | + // Or if they can edit other people's entries |
|
| 311 | + // Then we're good. |
|
| 312 | + if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) { |
|
| 313 | 313 | |
| 314 | - gravityview()->log->debug( 'User has ability to edit all entries.' ); |
|
| 314 | + gravityview()->log->debug( 'User has ability to edit all entries.' ); |
|
| 315 | 315 | |
| 316 | - $user_can_edit = true; |
|
| 316 | + $user_can_edit = true; |
|
| 317 | 317 | |
| 318 | - } else if( !isset( $entry['created_by'] ) ) { |
|
| 318 | + } else if( !isset( $entry['created_by'] ) ) { |
|
| 319 | 319 | |
| 320 | - gravityview()->log->error( 'Entry `created_by` doesn\'t exist.'); |
|
| 320 | + gravityview()->log->error( 'Entry `created_by` doesn\'t exist.'); |
|
| 321 | 321 | |
| 322 | - $user_can_edit = false; |
|
| 322 | + $user_can_edit = false; |
|
| 323 | 323 | |
| 324 | - } else { |
|
| 324 | + } else { |
|
| 325 | 325 | |
| 326 | 326 | |
| 327 | - $current_user = wp_get_current_user(); |
|
| 327 | + $current_user = wp_get_current_user(); |
|
| 328 | 328 | |
| 329 | - // User edit is disabled |
|
| 330 | - if( empty( $user_edit ) ) { |
|
| 329 | + // User edit is disabled |
|
| 330 | + if( empty( $user_edit ) ) { |
|
| 331 | 331 | |
| 332 | - gravityview()->log->debug( 'User Edit is disabled. Returning false.' ); |
|
| 332 | + gravityview()->log->debug( 'User Edit is disabled. Returning false.' ); |
|
| 333 | 333 | |
| 334 | - $user_can_edit = false; |
|
| 335 | - } |
|
| 334 | + $user_can_edit = false; |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | - // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good. |
|
| 338 | - else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
| 337 | + // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good. |
|
| 338 | + else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
| 339 | 339 | |
| 340 | - gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) ); |
|
| 340 | + gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) ); |
|
| 341 | 341 | |
| 342 | - $user_can_edit = true; |
|
| 342 | + $user_can_edit = true; |
|
| 343 | 343 | |
| 344 | - } else if( ! is_user_logged_in() ) { |
|
| 344 | + } else if( ! is_user_logged_in() ) { |
|
| 345 | 345 | |
| 346 | - gravityview()->log->debug( 'No user defined; edit entry requires logged in user' ); |
|
| 347 | - } |
|
| 346 | + gravityview()->log->debug( 'No user defined; edit entry requires logged in user' ); |
|
| 347 | + } |
|
| 348 | 348 | |
| 349 | - } |
|
| 349 | + } |
|
| 350 | 350 | |
| 351 | - /** |
|
| 352 | - * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry. |
|
| 353 | - * @since 1.15 Added `$entry` and `$view_id` parameters |
|
| 354 | - * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false) |
|
| 355 | - * @param[in] array $entry Gravity Forms entry array {@since 1.15} |
|
| 356 | - * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15} |
|
| 357 | - */ |
|
| 358 | - $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id ); |
|
| 351 | + /** |
|
| 352 | + * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry. |
|
| 353 | + * @since 1.15 Added `$entry` and `$view_id` parameters |
|
| 354 | + * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false) |
|
| 355 | + * @param[in] array $entry Gravity Forms entry array {@since 1.15} |
|
| 356 | + * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15} |
|
| 357 | + */ |
|
| 358 | + $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id ); |
|
| 359 | 359 | |
| 360 | - return (bool)$user_can_edit; |
|
| 361 | - } |
|
| 360 | + return (bool)$user_can_edit; |
|
| 361 | + } |
|
| 362 | 362 | |
| 363 | 363 | |
| 364 | 364 | |