@@ -94,10 +94,10 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * ID of the current post. May also be ID of the current View. |
| 97 | - * |
|
| 98 | - * @since 2.0.13 |
|
| 99 | - * |
|
| 100 | - * @var int |
|
| 97 | + * |
|
| 98 | + * @since 2.0.13 |
|
| 99 | + * |
|
| 100 | + * @var int |
|
| 101 | 101 | */ |
| 102 | 102 | public $post_id; |
| 103 | 103 | |
@@ -169,12 +169,12 @@ discard block |
||
| 169 | 169 | public function prevent_maybe_process_form() { |
| 170 | 170 | |
| 171 | 171 | if( ! empty( $_POST ) ) { |
| 172 | - gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
| 172 | + gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | if( $this->is_edit_entry_submission() ) { |
| 176 | 176 | remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
| 177 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 177 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
@@ -202,14 +202,14 @@ discard block |
||
| 202 | 202 | * When Edit entry view is requested setup the vars |
| 203 | 203 | */ |
| 204 | 204 | private function setup_vars() { |
| 205 | - global $post; |
|
| 205 | + global $post; |
|
| 206 | 206 | |
| 207 | 207 | $gravityview_view = GravityView_View::getInstance(); |
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | $entries = $gravityview_view->getEntries(); |
| 211 | - self::$original_entry = $entries[0]; |
|
| 212 | - $this->entry = $entries[0]; |
|
| 211 | + self::$original_entry = $entries[0]; |
|
| 212 | + $this->entry = $entries[0]; |
|
| 213 | 213 | |
| 214 | 214 | self::$original_form = $gravityview_view->getForm(); |
| 215 | 215 | $this->form = $gravityview_view->getForm(); |
@@ -333,8 +333,8 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | GFFormsModel::save_lead( $form, $this->entry ); |
| 335 | 335 | |
| 336 | - // Delete the values for hidden inputs |
|
| 337 | - $this->unset_hidden_field_values(); |
|
| 336 | + // Delete the values for hidden inputs |
|
| 337 | + $this->unset_hidden_field_values(); |
|
| 338 | 338 | |
| 339 | 339 | $this->entry['date_created'] = $date_created; |
| 340 | 340 | |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | // Perform actions normally performed after updating a lead |
| 345 | 345 | $this->after_update(); |
| 346 | 346 | |
| 347 | - /** |
|
| 347 | + /** |
|
| 348 | 348 | * Must be AFTER after_update()! |
| 349 | 349 | * @see https://github.com/gravityview/GravityView/issues/764 |
| 350 | 350 | */ |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | |
| 353 | 353 | /** |
| 354 | 354 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
| 355 | - * @since 2.1 Added $gv_data parameter |
|
| 355 | + * @since 2.1 Added $gv_data parameter |
|
| 356 | 356 | * @param array $form Gravity Forms form array |
| 357 | 357 | * @param string $entry_id Numeric ID of the entry that was updated |
| 358 | 358 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | * @return void |
| 377 | 377 | */ |
| 378 | 378 | private function unset_hidden_field_values() { |
| 379 | - global $wpdb; |
|
| 379 | + global $wpdb; |
|
| 380 | 380 | |
| 381 | 381 | /** |
| 382 | 382 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -398,29 +398,29 @@ discard block |
||
| 398 | 398 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
| 401 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
| 402 | 402 | |
| 403 | - $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
| 403 | + $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
| 404 | 404 | |
| 405 | - // Reset fields that are hidden |
|
| 406 | - // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
| 407 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
| 405 | + // Reset fields that are hidden |
|
| 406 | + // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
| 407 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
| 408 | 408 | |
| 409 | 409 | $empty_value = $field->get_value_save_entry( |
| 410 | 410 | is_array( $field->get_entry_inputs() ) ? array() : '', |
| 411 | 411 | $this->form, '', $this->entry['id'], $this->entry |
| 412 | 412 | ); |
| 413 | 413 | |
| 414 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 414 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 415 | 415 | |
| 416 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 416 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 417 | 417 | |
| 418 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 418 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 419 | 419 | // after submission |
| 420 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 421 | - $_POST[ $post_input_id ] = ''; |
|
| 422 | - } |
|
| 423 | - } |
|
| 420 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 421 | + $_POST[ $post_input_id ] = ''; |
|
| 422 | + } |
|
| 423 | + } |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | /** |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | |
| 515 | 515 | $form = $this->form; |
| 516 | 516 | |
| 517 | - /** @var GF_Field $field */ |
|
| 517 | + /** @var GF_Field $field */ |
|
| 518 | 518 | foreach( $form['fields'] as $k => &$field ) { |
| 519 | 519 | |
| 520 | 520 | /** |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | |
| 531 | 531 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
| 532 | 532 | foreach( $field->inputs as $key => $input ) { |
| 533 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 533 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 534 | 534 | } |
| 535 | 535 | } |
| 536 | 536 | } |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | foreach ( $this->fields_with_calculation as $field ) { |
| 566 | 566 | $inputs = $field->get_entry_inputs(); |
| 567 | 567 | if ( is_array( $inputs ) ) { |
| 568 | - foreach ( $inputs as $input ) { |
|
| 568 | + foreach ( $inputs as $input ) { |
|
| 569 | 569 | list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
| 570 | 570 | |
| 571 | 571 | if ( 'product' === $field->type ) { |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
| 587 | - } |
|
| 587 | + } |
|
| 588 | 588 | } else { |
| 589 | 589 | // Set to what it previously was if it's not editable |
| 590 | 590 | if ( ! in_array( $field->id, $allowed_fields ) ) { |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
| 631 | 631 | |
| 632 | 632 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 633 | - $ary = stripslashes_deep( $ary ); |
|
| 633 | + $ary = stripslashes_deep( $ary ); |
|
| 634 | 634 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 635 | 635 | |
| 636 | 636 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | private function maybe_update_post_fields( $form ) { |
| 704 | 704 | |
| 705 | 705 | if( empty( $this->entry['post_id'] ) ) { |
| 706 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 706 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 707 | 707 | return; |
| 708 | 708 | } |
| 709 | 709 | |
@@ -738,49 +738,49 @@ discard block |
||
| 738 | 738 | |
| 739 | 739 | switch( $field->type ) { |
| 740 | 740 | |
| 741 | - case 'post_title': |
|
| 742 | - $post_title = $value; |
|
| 743 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 744 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 745 | - } |
|
| 746 | - $updated_post->post_title = $post_title; |
|
| 747 | - $updated_post->post_name = $post_title; |
|
| 748 | - unset( $post_title ); |
|
| 749 | - break; |
|
| 750 | - |
|
| 751 | - case 'post_content': |
|
| 752 | - $post_content = $value; |
|
| 753 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 754 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 755 | - } |
|
| 756 | - $updated_post->post_content = $post_content; |
|
| 757 | - unset( $post_content ); |
|
| 758 | - break; |
|
| 759 | - case 'post_excerpt': |
|
| 760 | - $updated_post->post_excerpt = $value; |
|
| 761 | - break; |
|
| 762 | - case 'post_tags': |
|
| 763 | - wp_set_post_tags( $post_id, $value, false ); |
|
| 764 | - break; |
|
| 765 | - case 'post_category': |
|
| 766 | - break; |
|
| 767 | - case 'post_custom_field': |
|
| 741 | + case 'post_title': |
|
| 742 | + $post_title = $value; |
|
| 743 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 744 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 745 | + } |
|
| 746 | + $updated_post->post_title = $post_title; |
|
| 747 | + $updated_post->post_name = $post_title; |
|
| 748 | + unset( $post_title ); |
|
| 749 | + break; |
|
| 750 | + |
|
| 751 | + case 'post_content': |
|
| 752 | + $post_content = $value; |
|
| 753 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 754 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 755 | + } |
|
| 756 | + $updated_post->post_content = $post_content; |
|
| 757 | + unset( $post_content ); |
|
| 758 | + break; |
|
| 759 | + case 'post_excerpt': |
|
| 760 | + $updated_post->post_excerpt = $value; |
|
| 761 | + break; |
|
| 762 | + case 'post_tags': |
|
| 763 | + wp_set_post_tags( $post_id, $value, false ); |
|
| 764 | + break; |
|
| 765 | + case 'post_category': |
|
| 766 | + break; |
|
| 767 | + case 'post_custom_field': |
|
| 768 | 768 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
| 769 | 769 | $value = $value[ $field_id ]; |
| 770 | 770 | } |
| 771 | 771 | |
| 772 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 773 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 774 | - } |
|
| 772 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 773 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 774 | + } |
|
| 775 | 775 | |
| 776 | 776 | $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
| 777 | 777 | |
| 778 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 779 | - break; |
|
| 778 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 779 | + break; |
|
| 780 | 780 | |
| 781 | - case 'post_image': |
|
| 782 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 783 | - break; |
|
| 781 | + case 'post_image': |
|
| 782 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 783 | + break; |
|
| 784 | 784 | |
| 785 | 785 | } |
| 786 | 786 | |
@@ -903,14 +903,14 @@ discard block |
||
| 903 | 903 | ?><h2 class="gv-edit-entry-title"> |
| 904 | 904 | <span><?php |
| 905 | 905 | |
| 906 | - /** |
|
| 907 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 908 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 909 | - * @param GravityView_Edit_Entry_Render $this This object |
|
| 910 | - */ |
|
| 911 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 906 | + /** |
|
| 907 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 908 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 909 | + * @param GravityView_Edit_Entry_Render $this This object |
|
| 910 | + */ |
|
| 911 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 912 | 912 | |
| 913 | - echo esc_attr( $edit_entry_title ); |
|
| 913 | + echo esc_attr( $edit_entry_title ); |
|
| 914 | 914 | ?></span> |
| 915 | 915 | </h2> |
| 916 | 916 | |
@@ -973,26 +973,26 @@ discard block |
||
| 973 | 973 | |
| 974 | 974 | switch ( $edit_redirect ) { |
| 975 | 975 | |
| 976 | - case '0': |
|
| 977 | - $redirect_url = $back_link; |
|
| 978 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 979 | - break; |
|
| 980 | - |
|
| 981 | - case '1': |
|
| 982 | - $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
| 983 | - $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>' ); |
|
| 984 | - break; |
|
| 985 | - |
|
| 986 | - case '2': |
|
| 987 | - $redirect_url = $edit_redirect_url; |
|
| 988 | - $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
| 989 | - $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>' ); |
|
| 990 | - break; |
|
| 991 | - |
|
| 992 | - case '': |
|
| 993 | - default: |
|
| 994 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 995 | - break; |
|
| 976 | + case '0': |
|
| 977 | + $redirect_url = $back_link; |
|
| 978 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 979 | + break; |
|
| 980 | + |
|
| 981 | + case '1': |
|
| 982 | + $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
| 983 | + $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>' ); |
|
| 984 | + break; |
|
| 985 | + |
|
| 986 | + case '2': |
|
| 987 | + $redirect_url = $edit_redirect_url; |
|
| 988 | + $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
| 989 | + $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>' ); |
|
| 990 | + break; |
|
| 991 | + |
|
| 992 | + case '': |
|
| 993 | + default: |
|
| 994 | + $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 995 | + break; |
|
| 996 | 996 | } |
| 997 | 997 | |
| 998 | 998 | if ( isset( $redirect_url ) ) { |
@@ -1049,7 +1049,7 @@ discard block |
||
| 1049 | 1049 | |
| 1050 | 1050 | ob_get_clean(); |
| 1051 | 1051 | |
| 1052 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1052 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1053 | 1053 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
| 1054 | 1054 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
| 1055 | 1055 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1103,7 +1103,7 @@ discard block |
||
| 1103 | 1103 | |
| 1104 | 1104 | // for now we don't support Save and Continue feature. |
| 1105 | 1105 | if( ! self::$supports_save_and_continue ) { |
| 1106 | - unset( $form['save'] ); |
|
| 1106 | + unset( $form['save'] ); |
|
| 1107 | 1107 | } |
| 1108 | 1108 | |
| 1109 | 1109 | $form = $this->unselect_default_values( $form ); |
@@ -1130,30 +1130,30 @@ discard block |
||
| 1130 | 1130 | return $field_content; |
| 1131 | 1131 | } |
| 1132 | 1132 | |
| 1133 | - $message = null; |
|
| 1133 | + $message = null; |
|
| 1134 | 1134 | |
| 1135 | - // First, make sure they have the capability to edit the post. |
|
| 1136 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1135 | + // First, make sure they have the capability to edit the post. |
|
| 1136 | + if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1137 | 1137 | |
| 1138 | - /** |
|
| 1139 | - * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
| 1140 | - * @param string $message The existing "You don't have permission..." text |
|
| 1141 | - */ |
|
| 1142 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1138 | + /** |
|
| 1139 | + * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
| 1140 | + * @param string $message The existing "You don't have permission..." text |
|
| 1141 | + */ |
|
| 1142 | + $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1143 | 1143 | |
| 1144 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1145 | - /** |
|
| 1146 | - * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
| 1147 | - * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
| 1148 | - */ |
|
| 1149 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1150 | - } |
|
| 1144 | + } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1145 | + /** |
|
| 1146 | + * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
| 1147 | + * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
| 1148 | + */ |
|
| 1149 | + $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1150 | + } |
|
| 1151 | 1151 | |
| 1152 | - if( $message ) { |
|
| 1153 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1154 | - } |
|
| 1152 | + if( $message ) { |
|
| 1153 | + $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1154 | + } |
|
| 1155 | 1155 | |
| 1156 | - return $field_content; |
|
| 1156 | + return $field_content; |
|
| 1157 | 1157 | } |
| 1158 | 1158 | |
| 1159 | 1159 | /** |
@@ -1181,7 +1181,7 @@ discard block |
||
| 1181 | 1181 | || ! empty( $field_content ) |
| 1182 | 1182 | || in_array( $field->type, array( 'honeypot' ) ) |
| 1183 | 1183 | ) { |
| 1184 | - return $field_content; |
|
| 1184 | + return $field_content; |
|
| 1185 | 1185 | } |
| 1186 | 1186 | |
| 1187 | 1187 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1189,24 +1189,24 @@ discard block |
||
| 1189 | 1189 | |
| 1190 | 1190 | $field_value = $this->get_field_value( $field ); |
| 1191 | 1191 | |
| 1192 | - // Prevent any PHP warnings, like undefined index |
|
| 1193 | - ob_start(); |
|
| 1192 | + // Prevent any PHP warnings, like undefined index |
|
| 1193 | + ob_start(); |
|
| 1194 | 1194 | |
| 1195 | - $return = null; |
|
| 1195 | + $return = null; |
|
| 1196 | 1196 | |
| 1197 | 1197 | /** @var GravityView_Field $gv_field */ |
| 1198 | 1198 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
| 1199 | 1199 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1200 | 1200 | } else { |
| 1201 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1202 | - } |
|
| 1201 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1202 | + } |
|
| 1203 | 1203 | |
| 1204 | - // If there was output, it's an error |
|
| 1205 | - $warnings = ob_get_clean(); |
|
| 1204 | + // If there was output, it's an error |
|
| 1205 | + $warnings = ob_get_clean(); |
|
| 1206 | 1206 | |
| 1207 | - if( !empty( $warnings ) ) { |
|
| 1208 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1209 | - } |
|
| 1207 | + if( !empty( $warnings ) ) { |
|
| 1208 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1209 | + } |
|
| 1210 | 1210 | |
| 1211 | 1211 | return $return; |
| 1212 | 1212 | } |
@@ -1241,8 +1241,8 @@ discard block |
||
| 1241 | 1241 | $input_id = strval( $input['id'] ); |
| 1242 | 1242 | |
| 1243 | 1243 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1244 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1245 | - $allow_pre_populated = false; |
|
| 1244 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1245 | + $allow_pre_populated = false; |
|
| 1246 | 1246 | } |
| 1247 | 1247 | |
| 1248 | 1248 | } |
@@ -1266,7 +1266,7 @@ discard block |
||
| 1266 | 1266 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
| 1267 | 1267 | $categories = array(); |
| 1268 | 1268 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1269 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1269 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1270 | 1270 | } |
| 1271 | 1271 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1272 | 1272 | } |
@@ -1276,25 +1276,25 @@ discard block |
||
| 1276 | 1276 | // if value is empty get the default value if defined |
| 1277 | 1277 | $field_value = $field->get_value_default_if_empty( $field_value ); |
| 1278 | 1278 | |
| 1279 | - /** |
|
| 1280 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1281 | - * @since 1.11 |
|
| 1282 | - * @since 1.20 Added third param |
|
| 1283 | - * @param mixed $field_value field value used to populate the input |
|
| 1284 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1285 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1286 | - */ |
|
| 1287 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1288 | - |
|
| 1289 | - /** |
|
| 1290 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1291 | - * @since 1.17 |
|
| 1292 | - * @since 1.20 Added third param |
|
| 1293 | - * @param mixed $field_value field value used to populate the input |
|
| 1294 | - * @param GF_Field $field Gravity Forms field object |
|
| 1295 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1296 | - */ |
|
| 1297 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1279 | + /** |
|
| 1280 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1281 | + * @since 1.11 |
|
| 1282 | + * @since 1.20 Added third param |
|
| 1283 | + * @param mixed $field_value field value used to populate the input |
|
| 1284 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1285 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1286 | + */ |
|
| 1287 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1288 | + |
|
| 1289 | + /** |
|
| 1290 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1291 | + * @since 1.17 |
|
| 1292 | + * @since 1.20 Added third param |
|
| 1293 | + * @param mixed $field_value field value used to populate the input |
|
| 1294 | + * @param GF_Field $field Gravity Forms field object |
|
| 1295 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1296 | + */ |
|
| 1297 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1298 | 1298 | |
| 1299 | 1299 | return $field_value; |
| 1300 | 1300 | } |
@@ -1321,7 +1321,7 @@ discard block |
||
| 1321 | 1321 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1322 | 1322 | // expects certain field array items to be set. |
| 1323 | 1323 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
| 1324 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1324 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1325 | 1325 | } |
| 1326 | 1326 | |
| 1327 | 1327 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1335,61 +1335,61 @@ discard block |
||
| 1335 | 1335 | */ |
| 1336 | 1336 | case 'fileupload': |
| 1337 | 1337 | |
| 1338 | - // Set the previous value |
|
| 1339 | - $entry = $this->get_entry(); |
|
| 1338 | + // Set the previous value |
|
| 1339 | + $entry = $this->get_entry(); |
|
| 1340 | 1340 | |
| 1341 | - $input_name = 'input_'.$field->id; |
|
| 1342 | - $form_id = $form['id']; |
|
| 1341 | + $input_name = 'input_'.$field->id; |
|
| 1342 | + $form_id = $form['id']; |
|
| 1343 | 1343 | |
| 1344 | - $value = NULL; |
|
| 1344 | + $value = NULL; |
|
| 1345 | 1345 | |
| 1346 | - // Use the previous entry value as the default. |
|
| 1347 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1348 | - $value = $entry[ $field->id ]; |
|
| 1349 | - } |
|
| 1346 | + // Use the previous entry value as the default. |
|
| 1347 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1348 | + $value = $entry[ $field->id ]; |
|
| 1349 | + } |
|
| 1350 | 1350 | |
| 1351 | - // If this is a single upload file |
|
| 1352 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1353 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1354 | - $value = $file_path['url']; |
|
| 1351 | + // If this is a single upload file |
|
| 1352 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1353 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1354 | + $value = $file_path['url']; |
|
| 1355 | 1355 | |
| 1356 | - } else { |
|
| 1356 | + } else { |
|
| 1357 | 1357 | |
| 1358 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1359 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1360 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1358 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1359 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1360 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1361 | 1361 | |
| 1362 | - } |
|
| 1362 | + } |
|
| 1363 | 1363 | |
| 1364 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1364 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1365 | 1365 | |
| 1366 | - // If there are fresh uploads, process and merge them. |
|
| 1367 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1368 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1369 | - $value = empty( $value ) ? '[]' : $value; |
|
| 1370 | - $value = stripslashes_deep( $value ); |
|
| 1371 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1372 | - } |
|
| 1366 | + // If there are fresh uploads, process and merge them. |
|
| 1367 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1368 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1369 | + $value = empty( $value ) ? '[]' : $value; |
|
| 1370 | + $value = stripslashes_deep( $value ); |
|
| 1371 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1372 | + } |
|
| 1373 | 1373 | |
| 1374 | - } else { |
|
| 1374 | + } else { |
|
| 1375 | 1375 | |
| 1376 | - // A file already exists when editing an entry |
|
| 1377 | - // We set this to solve issue when file upload fields are required. |
|
| 1378 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1376 | + // A file already exists when editing an entry |
|
| 1377 | + // We set this to solve issue when file upload fields are required. |
|
| 1378 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1379 | 1379 | |
| 1380 | - } |
|
| 1380 | + } |
|
| 1381 | 1381 | |
| 1382 | - $this->entry[ $input_name ] = $value; |
|
| 1383 | - $_POST[ $input_name ] = $value; |
|
| 1382 | + $this->entry[ $input_name ] = $value; |
|
| 1383 | + $_POST[ $input_name ] = $value; |
|
| 1384 | 1384 | |
| 1385 | - break; |
|
| 1385 | + break; |
|
| 1386 | 1386 | |
| 1387 | 1387 | case 'number': |
| 1388 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1389 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1390 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1391 | - } |
|
| 1392 | - break; |
|
| 1388 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1389 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1390 | + $_POST['input_'.$field->id ] = NULL; |
|
| 1391 | + } |
|
| 1392 | + break; |
|
| 1393 | 1393 | } |
| 1394 | 1394 | |
| 1395 | 1395 | } |
@@ -1474,42 +1474,42 @@ discard block |
||
| 1474 | 1474 | case 'fileupload' : |
| 1475 | 1475 | case 'post_image': |
| 1476 | 1476 | |
| 1477 | - // in case nothing is uploaded but there are already files saved |
|
| 1478 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1479 | - $field->failed_validation = false; |
|
| 1480 | - unset( $field->validation_message ); |
|
| 1481 | - } |
|
| 1477 | + // in case nothing is uploaded but there are already files saved |
|
| 1478 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1479 | + $field->failed_validation = false; |
|
| 1480 | + unset( $field->validation_message ); |
|
| 1481 | + } |
|
| 1482 | 1482 | |
| 1483 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1484 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1483 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1484 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1485 | 1485 | |
| 1486 | - $input_name = 'input_' . $field->id; |
|
| 1487 | - //uploaded |
|
| 1488 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1486 | + $input_name = 'input_' . $field->id; |
|
| 1487 | + //uploaded |
|
| 1488 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1489 | 1489 | |
| 1490 | - //existent |
|
| 1491 | - $entry = $this->get_entry(); |
|
| 1492 | - $value = NULL; |
|
| 1493 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1494 | - $value = json_decode( $entry[ $field->id ], true ); |
|
| 1495 | - } |
|
| 1490 | + //existent |
|
| 1491 | + $entry = $this->get_entry(); |
|
| 1492 | + $value = NULL; |
|
| 1493 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1494 | + $value = json_decode( $entry[ $field->id ], true ); |
|
| 1495 | + } |
|
| 1496 | 1496 | |
| 1497 | - // count uploaded files and existent entry files |
|
| 1498 | - $count_files = count( $file_names ) + count( $value ); |
|
| 1497 | + // count uploaded files and existent entry files |
|
| 1498 | + $count_files = count( $file_names ) + count( $value ); |
|
| 1499 | 1499 | |
| 1500 | - if( $count_files > $field->maxFiles ) { |
|
| 1501 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1502 | - $field->failed_validation = 1; |
|
| 1503 | - $gv_valid = false; |
|
| 1500 | + if( $count_files > $field->maxFiles ) { |
|
| 1501 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1502 | + $field->failed_validation = 1; |
|
| 1503 | + $gv_valid = false; |
|
| 1504 | 1504 | |
| 1505 | - // in case of error make sure the newest upload files are removed from the upload input |
|
| 1506 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1507 | - } |
|
| 1505 | + // in case of error make sure the newest upload files are removed from the upload input |
|
| 1506 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1507 | + } |
|
| 1508 | 1508 | |
| 1509 | - } |
|
| 1509 | + } |
|
| 1510 | 1510 | |
| 1511 | 1511 | |
| 1512 | - break; |
|
| 1512 | + break; |
|
| 1513 | 1513 | |
| 1514 | 1514 | } |
| 1515 | 1515 | |
@@ -1520,47 +1520,47 @@ discard block |
||
| 1520 | 1520 | |
| 1521 | 1521 | switch ( $field_type ) { |
| 1522 | 1522 | |
| 1523 | - // Captchas don't need to be re-entered. |
|
| 1524 | - case 'captcha': |
|
| 1523 | + // Captchas don't need to be re-entered. |
|
| 1524 | + case 'captcha': |
|
| 1525 | 1525 | |
| 1526 | - // Post Image fields aren't editable, so we un-fail them. |
|
| 1527 | - case 'post_image': |
|
| 1528 | - $field->failed_validation = false; |
|
| 1529 | - unset( $field->validation_message ); |
|
| 1530 | - break; |
|
| 1526 | + // Post Image fields aren't editable, so we un-fail them. |
|
| 1527 | + case 'post_image': |
|
| 1528 | + $field->failed_validation = false; |
|
| 1529 | + unset( $field->validation_message ); |
|
| 1530 | + break; |
|
| 1531 | 1531 | |
| 1532 | 1532 | } |
| 1533 | 1533 | |
| 1534 | 1534 | // You can't continue inside a switch, so we do it after. |
| 1535 | 1535 | if( empty( $field->failed_validation ) ) { |
| 1536 | - continue; |
|
| 1536 | + continue; |
|
| 1537 | 1537 | } |
| 1538 | 1538 | |
| 1539 | 1539 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1540 | 1540 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1541 | 1541 | if( !empty( $field->noDuplicates ) ) { |
| 1542 | 1542 | |
| 1543 | - $entry = $this->get_entry(); |
|
| 1543 | + $entry = $this->get_entry(); |
|
| 1544 | 1544 | |
| 1545 | - // If the value of the entry is the same as the stored value |
|
| 1546 | - // Then we can assume it's not a duplicate, it's the same. |
|
| 1547 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1548 | - //if value submitted was not changed, then don't validate |
|
| 1549 | - $field->failed_validation = false; |
|
| 1545 | + // If the value of the entry is the same as the stored value |
|
| 1546 | + // Then we can assume it's not a duplicate, it's the same. |
|
| 1547 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1548 | + //if value submitted was not changed, then don't validate |
|
| 1549 | + $field->failed_validation = false; |
|
| 1550 | 1550 | |
| 1551 | - unset( $field->validation_message ); |
|
| 1551 | + unset( $field->validation_message ); |
|
| 1552 | 1552 | |
| 1553 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1553 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1554 | 1554 | |
| 1555 | - continue; |
|
| 1556 | - } |
|
| 1555 | + continue; |
|
| 1556 | + } |
|
| 1557 | 1557 | } |
| 1558 | 1558 | |
| 1559 | 1559 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1560 | 1560 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
| 1561 | - unset( $field->validation_message ); |
|
| 1562 | - $field->validation_message = false; |
|
| 1563 | - continue; |
|
| 1561 | + unset( $field->validation_message ); |
|
| 1562 | + $field->validation_message = false; |
|
| 1563 | + continue; |
|
| 1564 | 1564 | } |
| 1565 | 1565 | |
| 1566 | 1566 | $gv_valid = false; |
@@ -1624,8 +1624,8 @@ discard block |
||
| 1624 | 1624 | // Hide fields depending on admin settings |
| 1625 | 1625 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
| 1626 | 1626 | |
| 1627 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1628 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1627 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1628 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1629 | 1629 | |
| 1630 | 1630 | /** |
| 1631 | 1631 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1685,11 +1685,11 @@ discard block |
||
| 1685 | 1685 | // The edit tab has been configured, so we loop through to configured settings |
| 1686 | 1686 | foreach ( $configured_fields as $configured_field ) { |
| 1687 | 1687 | |
| 1688 | - /** @var GF_Field $field */ |
|
| 1689 | - foreach ( $fields as $field ) { |
|
| 1688 | + /** @var GF_Field $field */ |
|
| 1689 | + foreach ( $fields as $field ) { |
|
| 1690 | 1690 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
| 1691 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1692 | - break; |
|
| 1691 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1692 | + break; |
|
| 1693 | 1693 | } |
| 1694 | 1694 | |
| 1695 | 1695 | } |
@@ -1745,28 +1745,28 @@ discard block |
||
| 1745 | 1745 | */ |
| 1746 | 1746 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
| 1747 | 1747 | |
| 1748 | - /** |
|
| 1748 | + /** |
|
| 1749 | 1749 | * @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 |
| 1750 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 1751 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 1752 | - * @since 1.9.1 |
|
| 1753 | - * @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. |
|
| 1754 | - * @param array $form GF Form array |
|
| 1755 | - * @param int $view_id View ID |
|
| 1756 | - */ |
|
| 1757 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 1758 | - |
|
| 1759 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1750 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 1751 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 1752 | + * @since 1.9.1 |
|
| 1753 | + * @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. |
|
| 1754 | + * @param array $form GF Form array |
|
| 1755 | + * @param int $view_id View ID |
|
| 1756 | + */ |
|
| 1757 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 1758 | + |
|
| 1759 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1760 | 1760 | foreach( $fields as $k => $field ) { |
| 1761 | 1761 | if( $field->adminOnly ) { |
| 1762 | - unset( $fields[ $k ] ); |
|
| 1762 | + unset( $fields[ $k ] ); |
|
| 1763 | 1763 | } |
| 1764 | 1764 | } |
| 1765 | 1765 | return array_values( $fields ); |
| 1766 | 1766 | } |
| 1767 | 1767 | |
| 1768 | - foreach( $fields as &$field ) { |
|
| 1769 | - $field->adminOnly = false; |
|
| 1768 | + foreach( $fields as &$field ) { |
|
| 1769 | + $field->adminOnly = false; |
|
| 1770 | 1770 | } |
| 1771 | 1771 | |
| 1772 | 1772 | return $fields; |
@@ -1786,13 +1786,13 @@ discard block |
||
| 1786 | 1786 | */ |
| 1787 | 1787 | private function unselect_default_values( $form ) { |
| 1788 | 1788 | |
| 1789 | - foreach ( $form['fields'] as &$field ) { |
|
| 1789 | + foreach ( $form['fields'] as &$field ) { |
|
| 1790 | 1790 | |
| 1791 | 1791 | if ( empty( $field->choices ) ) { |
| 1792 | - continue; |
|
| 1792 | + continue; |
|
| 1793 | 1793 | } |
| 1794 | 1794 | |
| 1795 | - foreach ( $field->choices as &$choice ) { |
|
| 1795 | + foreach ( $field->choices as &$choice ) { |
|
| 1796 | 1796 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
| 1797 | 1797 | $choice['isSelected'] = false; |
| 1798 | 1798 | } |
@@ -1829,36 +1829,36 @@ discard block |
||
| 1829 | 1829 | |
| 1830 | 1830 | if( 'checkbox' === $field->type ) { |
| 1831 | 1831 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1832 | - $input_id = $input['id']; |
|
| 1833 | - $choice = $field->choices[ $key ]; |
|
| 1834 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 1835 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 1836 | - if( $match ) { |
|
| 1837 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1838 | - } |
|
| 1832 | + $input_id = $input['id']; |
|
| 1833 | + $choice = $field->choices[ $key ]; |
|
| 1834 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 1835 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 1836 | + if( $match ) { |
|
| 1837 | + $field->choices[ $key ]['isSelected'] = true; |
|
| 1838 | + } |
|
| 1839 | 1839 | } |
| 1840 | 1840 | } else { |
| 1841 | 1841 | |
| 1842 | 1842 | // We need to run through each field to set the default values |
| 1843 | 1843 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1844 | 1844 | |
| 1845 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1845 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1846 | 1846 | |
| 1847 | - if( 'list' === $field->type ) { |
|
| 1848 | - $list_rows = maybe_unserialize( $field_value ); |
|
| 1847 | + if( 'list' === $field->type ) { |
|
| 1848 | + $list_rows = maybe_unserialize( $field_value ); |
|
| 1849 | 1849 | |
| 1850 | - $list_field_value = array(); |
|
| 1851 | - foreach ( (array) $list_rows as $row ) { |
|
| 1852 | - foreach ( (array) $row as $column ) { |
|
| 1853 | - $list_field_value[] = $column; |
|
| 1854 | - } |
|
| 1855 | - } |
|
| 1850 | + $list_field_value = array(); |
|
| 1851 | + foreach ( (array) $list_rows as $row ) { |
|
| 1852 | + foreach ( (array) $row as $column ) { |
|
| 1853 | + $list_field_value[] = $column; |
|
| 1854 | + } |
|
| 1855 | + } |
|
| 1856 | 1856 | |
| 1857 | - $field->defaultValue = serialize( $list_field_value ); |
|
| 1858 | - } else { |
|
| 1859 | - $field->defaultValue = $field_value; |
|
| 1860 | - } |
|
| 1861 | - } |
|
| 1857 | + $field->defaultValue = serialize( $list_field_value ); |
|
| 1858 | + } else { |
|
| 1859 | + $field->defaultValue = $field_value; |
|
| 1860 | + } |
|
| 1861 | + } |
|
| 1862 | 1862 | } |
| 1863 | 1863 | } |
| 1864 | 1864 | } |
@@ -1915,7 +1915,7 @@ discard block |
||
| 1915 | 1915 | return $has_conditional_logic; |
| 1916 | 1916 | } |
| 1917 | 1917 | |
| 1918 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 1918 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 1919 | 1919 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
| 1920 | 1920 | } |
| 1921 | 1921 | |
@@ -1982,14 +1982,14 @@ discard block |
||
| 1982 | 1982 | |
| 1983 | 1983 | if( $echo && $error !== true ) { |
| 1984 | 1984 | |
| 1985 | - $error = esc_html( $error ); |
|
| 1985 | + $error = esc_html( $error ); |
|
| 1986 | 1986 | |
| 1987 | - /** |
|
| 1988 | - * @since 1.9 |
|
| 1989 | - */ |
|
| 1990 | - if ( ! empty( $this->entry ) ) { |
|
| 1991 | - $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;" ) ); |
|
| 1992 | - } |
|
| 1987 | + /** |
|
| 1988 | + * @since 1.9 |
|
| 1989 | + */ |
|
| 1990 | + if ( ! empty( $this->entry ) ) { |
|
| 1991 | + $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;" ) ); |
|
| 1992 | + } |
|
| 1993 | 1993 | |
| 1994 | 1994 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
| 1995 | 1995 | } |