@@ -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,27 +398,27 @@ discard block |
||
398 | 398 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number 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 | - // List fields are stored as empty arrays when empty |
|
410 | - $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
409 | + // List fields are stored as empty arrays when empty |
|
410 | + $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
411 | 411 | |
412 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
412 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
413 | 413 | |
414 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
414 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
415 | 415 | |
416 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
416 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
417 | 417 | // after submission |
418 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
419 | - $_POST[ $post_input_id ] = ''; |
|
420 | - } |
|
421 | - } |
|
418 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
419 | + $_POST[ $post_input_id ] = ''; |
|
420 | + } |
|
421 | + } |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | /** |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | |
513 | 513 | $form = $this->form; |
514 | 514 | |
515 | - /** @var GF_Field $field */ |
|
515 | + /** @var GF_Field $field */ |
|
516 | 516 | foreach( $form['fields'] as $k => &$field ) { |
517 | 517 | |
518 | 518 | /** |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | |
529 | 529 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
530 | 530 | foreach( $field->inputs as $key => $input ) { |
531 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
531 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
532 | 532 | } |
533 | 533 | } |
534 | 534 | } |
@@ -549,13 +549,13 @@ discard block |
||
549 | 549 | foreach ( $this->fields_with_calculation as $calc_field ) { |
550 | 550 | $inputs = $calc_field->get_entry_inputs(); |
551 | 551 | if ( is_array( $inputs ) ) { |
552 | - foreach ( $inputs as $input ) { |
|
553 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
554 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
555 | - } |
|
552 | + foreach ( $inputs as $input ) { |
|
553 | + $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
554 | + $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
555 | + } |
|
556 | 556 | } else { |
557 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
558 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
557 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
558 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
559 | 559 | } |
560 | 560 | } |
561 | 561 | |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
604 | 604 | |
605 | 605 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
606 | - $ary = stripslashes_deep( $ary ); |
|
606 | + $ary = stripslashes_deep( $ary ); |
|
607 | 607 | $img_url = \GV\Utils::get( $ary, 0 ); |
608 | 608 | |
609 | 609 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -676,7 +676,7 @@ discard block |
||
676 | 676 | private function maybe_update_post_fields( $form ) { |
677 | 677 | |
678 | 678 | if( empty( $this->entry['post_id'] ) ) { |
679 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
679 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
680 | 680 | return; |
681 | 681 | } |
682 | 682 | |
@@ -711,51 +711,51 @@ discard block |
||
711 | 711 | |
712 | 712 | switch( $field->type ) { |
713 | 713 | |
714 | - case 'post_title': |
|
715 | - $post_title = $value; |
|
716 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
717 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
718 | - } |
|
719 | - $updated_post->post_title = $post_title; |
|
720 | - $updated_post->post_name = $post_title; |
|
721 | - unset( $post_title ); |
|
722 | - break; |
|
723 | - |
|
724 | - case 'post_content': |
|
725 | - $post_content = $value; |
|
726 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
727 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
728 | - } |
|
729 | - $updated_post->post_content = $post_content; |
|
730 | - unset( $post_content ); |
|
731 | - break; |
|
732 | - case 'post_excerpt': |
|
733 | - $updated_post->post_excerpt = $value; |
|
734 | - break; |
|
735 | - case 'post_tags': |
|
736 | - wp_set_post_tags( $post_id, $value, false ); |
|
737 | - break; |
|
738 | - case 'post_category': |
|
739 | - break; |
|
740 | - case 'post_custom_field': |
|
714 | + case 'post_title': |
|
715 | + $post_title = $value; |
|
716 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
717 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
718 | + } |
|
719 | + $updated_post->post_title = $post_title; |
|
720 | + $updated_post->post_name = $post_title; |
|
721 | + unset( $post_title ); |
|
722 | + break; |
|
723 | + |
|
724 | + case 'post_content': |
|
725 | + $post_content = $value; |
|
726 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
727 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
728 | + } |
|
729 | + $updated_post->post_content = $post_content; |
|
730 | + unset( $post_content ); |
|
731 | + break; |
|
732 | + case 'post_excerpt': |
|
733 | + $updated_post->post_excerpt = $value; |
|
734 | + break; |
|
735 | + case 'post_tags': |
|
736 | + wp_set_post_tags( $post_id, $value, false ); |
|
737 | + break; |
|
738 | + case 'post_category': |
|
739 | + break; |
|
740 | + case 'post_custom_field': |
|
741 | 741 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
742 | 742 | $value = $value[ $field_id ]; |
743 | 743 | } |
744 | 744 | |
745 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
746 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
747 | - } |
|
745 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
746 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
747 | + } |
|
748 | 748 | |
749 | - if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
750 | - $value = wp_json_encode( $value ); |
|
751 | - } |
|
749 | + if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
750 | + $value = wp_json_encode( $value ); |
|
751 | + } |
|
752 | 752 | |
753 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
754 | - break; |
|
753 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
754 | + break; |
|
755 | 755 | |
756 | - case 'post_image': |
|
757 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
758 | - break; |
|
756 | + case 'post_image': |
|
757 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
758 | + break; |
|
759 | 759 | |
760 | 760 | } |
761 | 761 | |
@@ -800,20 +800,20 @@ discard block |
||
800 | 800 | */ |
801 | 801 | private function is_field_json_encoded( $field ) { |
802 | 802 | |
803 | - $json_encoded = false; |
|
803 | + $json_encoded = false; |
|
804 | 804 | |
805 | 805 | $input_type = RGFormsModel::get_input_type( $field ); |
806 | 806 | |
807 | - // Only certain custom field types are supported |
|
808 | - switch( $input_type ) { |
|
809 | - case 'fileupload': |
|
810 | - case 'list': |
|
811 | - case 'multiselect': |
|
812 | - $json_encoded = true; |
|
813 | - break; |
|
814 | - } |
|
807 | + // Only certain custom field types are supported |
|
808 | + switch( $input_type ) { |
|
809 | + case 'fileupload': |
|
810 | + case 'list': |
|
811 | + case 'multiselect': |
|
812 | + $json_encoded = true; |
|
813 | + break; |
|
814 | + } |
|
815 | 815 | |
816 | - return $json_encoded; |
|
816 | + return $json_encoded; |
|
817 | 817 | } |
818 | 818 | |
819 | 819 | /** |
@@ -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 | |
@@ -1019,7 +1019,7 @@ discard block |
||
1019 | 1019 | |
1020 | 1020 | ob_get_clean(); |
1021 | 1021 | |
1022 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1022 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1023 | 1023 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
1024 | 1024 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
1025 | 1025 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1073,7 +1073,7 @@ discard block |
||
1073 | 1073 | |
1074 | 1074 | // for now we don't support Save and Continue feature. |
1075 | 1075 | if( ! self::$supports_save_and_continue ) { |
1076 | - unset( $form['save'] ); |
|
1076 | + unset( $form['save'] ); |
|
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | return $form; |
@@ -1148,7 +1148,7 @@ discard block |
||
1148 | 1148 | || ! empty( $field_content ) |
1149 | 1149 | || in_array( $field->type, array( 'honeypot' ) ) |
1150 | 1150 | ) { |
1151 | - return $field_content; |
|
1151 | + return $field_content; |
|
1152 | 1152 | } |
1153 | 1153 | |
1154 | 1154 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1156,24 +1156,24 @@ discard block |
||
1156 | 1156 | |
1157 | 1157 | $field_value = $this->get_field_value( $field ); |
1158 | 1158 | |
1159 | - // Prevent any PHP warnings, like undefined index |
|
1160 | - ob_start(); |
|
1159 | + // Prevent any PHP warnings, like undefined index |
|
1160 | + ob_start(); |
|
1161 | 1161 | |
1162 | - $return = null; |
|
1162 | + $return = null; |
|
1163 | 1163 | |
1164 | 1164 | /** @var GravityView_Field $gv_field */ |
1165 | 1165 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
1166 | 1166 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1167 | 1167 | } else { |
1168 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1169 | - } |
|
1168 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1169 | + } |
|
1170 | 1170 | |
1171 | - // If there was output, it's an error |
|
1172 | - $warnings = ob_get_clean(); |
|
1171 | + // If there was output, it's an error |
|
1172 | + $warnings = ob_get_clean(); |
|
1173 | 1173 | |
1174 | - if( !empty( $warnings ) ) { |
|
1175 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1176 | - } |
|
1174 | + if( !empty( $warnings ) ) { |
|
1175 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1176 | + } |
|
1177 | 1177 | |
1178 | 1178 | return $return; |
1179 | 1179 | } |
@@ -1208,8 +1208,8 @@ discard block |
||
1208 | 1208 | $input_id = strval( $input['id'] ); |
1209 | 1209 | |
1210 | 1210 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1211 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1212 | - $allow_pre_populated = false; |
|
1211 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1212 | + $allow_pre_populated = false; |
|
1213 | 1213 | } |
1214 | 1214 | |
1215 | 1215 | } |
@@ -1233,7 +1233,7 @@ discard block |
||
1233 | 1233 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
1234 | 1234 | $categories = array(); |
1235 | 1235 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1236 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1236 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1237 | 1237 | } |
1238 | 1238 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1239 | 1239 | } |
@@ -1243,25 +1243,25 @@ discard block |
||
1243 | 1243 | // if value is empty get the default value if defined |
1244 | 1244 | $field_value = $field->get_value_default_if_empty( $field_value ); |
1245 | 1245 | |
1246 | - /** |
|
1247 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1248 | - * @since 1.11 |
|
1249 | - * @since 1.20 Added third param |
|
1250 | - * @param mixed $field_value field value used to populate the input |
|
1251 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1252 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1253 | - */ |
|
1254 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1255 | - |
|
1256 | - /** |
|
1257 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1258 | - * @since 1.17 |
|
1259 | - * @since 1.20 Added third param |
|
1260 | - * @param mixed $field_value field value used to populate the input |
|
1261 | - * @param GF_Field $field Gravity Forms field object |
|
1262 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1263 | - */ |
|
1264 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1246 | + /** |
|
1247 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1248 | + * @since 1.11 |
|
1249 | + * @since 1.20 Added third param |
|
1250 | + * @param mixed $field_value field value used to populate the input |
|
1251 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1252 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1253 | + */ |
|
1254 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1255 | + |
|
1256 | + /** |
|
1257 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1258 | + * @since 1.17 |
|
1259 | + * @since 1.20 Added third param |
|
1260 | + * @param mixed $field_value field value used to populate the input |
|
1261 | + * @param GF_Field $field Gravity Forms field object |
|
1262 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1263 | + */ |
|
1264 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1265 | 1265 | |
1266 | 1266 | return $field_value; |
1267 | 1267 | } |
@@ -1288,7 +1288,7 @@ discard block |
||
1288 | 1288 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1289 | 1289 | // expects certain field array items to be set. |
1290 | 1290 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
1291 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1291 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1292 | 1292 | } |
1293 | 1293 | |
1294 | 1294 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1302,61 +1302,61 @@ discard block |
||
1302 | 1302 | */ |
1303 | 1303 | case 'fileupload': |
1304 | 1304 | |
1305 | - // Set the previous value |
|
1306 | - $entry = $this->get_entry(); |
|
1305 | + // Set the previous value |
|
1306 | + $entry = $this->get_entry(); |
|
1307 | 1307 | |
1308 | - $input_name = 'input_'.$field->id; |
|
1309 | - $form_id = $form['id']; |
|
1308 | + $input_name = 'input_'.$field->id; |
|
1309 | + $form_id = $form['id']; |
|
1310 | 1310 | |
1311 | - $value = NULL; |
|
1311 | + $value = NULL; |
|
1312 | 1312 | |
1313 | - // Use the previous entry value as the default. |
|
1314 | - if( isset( $entry[ $field->id ] ) ) { |
|
1315 | - $value = $entry[ $field->id ]; |
|
1316 | - } |
|
1313 | + // Use the previous entry value as the default. |
|
1314 | + if( isset( $entry[ $field->id ] ) ) { |
|
1315 | + $value = $entry[ $field->id ]; |
|
1316 | + } |
|
1317 | 1317 | |
1318 | - // If this is a single upload file |
|
1319 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1320 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1321 | - $value = $file_path['url']; |
|
1318 | + // If this is a single upload file |
|
1319 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1320 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1321 | + $value = $file_path['url']; |
|
1322 | 1322 | |
1323 | - } else { |
|
1323 | + } else { |
|
1324 | 1324 | |
1325 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1326 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1327 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1325 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1326 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1327 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1328 | 1328 | |
1329 | - } |
|
1329 | + } |
|
1330 | 1330 | |
1331 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1331 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1332 | 1332 | |
1333 | - // If there are fresh uploads, process and merge them. |
|
1334 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1335 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1336 | - $value = empty( $value ) ? '[]' : $value; |
|
1337 | - $value = stripslashes_deep( $value ); |
|
1338 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1339 | - } |
|
1333 | + // If there are fresh uploads, process and merge them. |
|
1334 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1335 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1336 | + $value = empty( $value ) ? '[]' : $value; |
|
1337 | + $value = stripslashes_deep( $value ); |
|
1338 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1339 | + } |
|
1340 | 1340 | |
1341 | - } else { |
|
1341 | + } else { |
|
1342 | 1342 | |
1343 | - // A file already exists when editing an entry |
|
1344 | - // We set this to solve issue when file upload fields are required. |
|
1345 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1343 | + // A file already exists when editing an entry |
|
1344 | + // We set this to solve issue when file upload fields are required. |
|
1345 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1346 | 1346 | |
1347 | - } |
|
1347 | + } |
|
1348 | 1348 | |
1349 | - $this->entry[ $input_name ] = $value; |
|
1350 | - $_POST[ $input_name ] = $value; |
|
1349 | + $this->entry[ $input_name ] = $value; |
|
1350 | + $_POST[ $input_name ] = $value; |
|
1351 | 1351 | |
1352 | - break; |
|
1352 | + break; |
|
1353 | 1353 | |
1354 | 1354 | case 'number': |
1355 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
1356 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1357 | - $_POST['input_'.$field->id ] = NULL; |
|
1358 | - } |
|
1359 | - break; |
|
1355 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
1356 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1357 | + $_POST['input_'.$field->id ] = NULL; |
|
1358 | + } |
|
1359 | + break; |
|
1360 | 1360 | } |
1361 | 1361 | |
1362 | 1362 | } |
@@ -1441,42 +1441,42 @@ discard block |
||
1441 | 1441 | case 'fileupload' : |
1442 | 1442 | case 'post_image': |
1443 | 1443 | |
1444 | - // in case nothing is uploaded but there are already files saved |
|
1445 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1446 | - $field->failed_validation = false; |
|
1447 | - unset( $field->validation_message ); |
|
1448 | - } |
|
1444 | + // in case nothing is uploaded but there are already files saved |
|
1445 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1446 | + $field->failed_validation = false; |
|
1447 | + unset( $field->validation_message ); |
|
1448 | + } |
|
1449 | 1449 | |
1450 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1451 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1450 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1451 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1452 | 1452 | |
1453 | - $input_name = 'input_' . $field->id; |
|
1454 | - //uploaded |
|
1455 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1453 | + $input_name = 'input_' . $field->id; |
|
1454 | + //uploaded |
|
1455 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1456 | 1456 | |
1457 | - //existent |
|
1458 | - $entry = $this->get_entry(); |
|
1459 | - $value = NULL; |
|
1460 | - if( isset( $entry[ $field->id ] ) ) { |
|
1461 | - $value = json_decode( $entry[ $field->id ], true ); |
|
1462 | - } |
|
1457 | + //existent |
|
1458 | + $entry = $this->get_entry(); |
|
1459 | + $value = NULL; |
|
1460 | + if( isset( $entry[ $field->id ] ) ) { |
|
1461 | + $value = json_decode( $entry[ $field->id ], true ); |
|
1462 | + } |
|
1463 | 1463 | |
1464 | - // count uploaded files and existent entry files |
|
1465 | - $count_files = count( $file_names ) + count( $value ); |
|
1464 | + // count uploaded files and existent entry files |
|
1465 | + $count_files = count( $file_names ) + count( $value ); |
|
1466 | 1466 | |
1467 | - if( $count_files > $field->maxFiles ) { |
|
1468 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1469 | - $field->failed_validation = 1; |
|
1470 | - $gv_valid = false; |
|
1467 | + if( $count_files > $field->maxFiles ) { |
|
1468 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1469 | + $field->failed_validation = 1; |
|
1470 | + $gv_valid = false; |
|
1471 | 1471 | |
1472 | - // in case of error make sure the newest upload files are removed from the upload input |
|
1473 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1474 | - } |
|
1472 | + // in case of error make sure the newest upload files are removed from the upload input |
|
1473 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1474 | + } |
|
1475 | 1475 | |
1476 | - } |
|
1476 | + } |
|
1477 | 1477 | |
1478 | 1478 | |
1479 | - break; |
|
1479 | + break; |
|
1480 | 1480 | |
1481 | 1481 | } |
1482 | 1482 | |
@@ -1487,47 +1487,47 @@ discard block |
||
1487 | 1487 | |
1488 | 1488 | switch ( $field_type ) { |
1489 | 1489 | |
1490 | - // Captchas don't need to be re-entered. |
|
1491 | - case 'captcha': |
|
1490 | + // Captchas don't need to be re-entered. |
|
1491 | + case 'captcha': |
|
1492 | 1492 | |
1493 | - // Post Image fields aren't editable, so we un-fail them. |
|
1494 | - case 'post_image': |
|
1495 | - $field->failed_validation = false; |
|
1496 | - unset( $field->validation_message ); |
|
1497 | - break; |
|
1493 | + // Post Image fields aren't editable, so we un-fail them. |
|
1494 | + case 'post_image': |
|
1495 | + $field->failed_validation = false; |
|
1496 | + unset( $field->validation_message ); |
|
1497 | + break; |
|
1498 | 1498 | |
1499 | 1499 | } |
1500 | 1500 | |
1501 | 1501 | // You can't continue inside a switch, so we do it after. |
1502 | 1502 | if( empty( $field->failed_validation ) ) { |
1503 | - continue; |
|
1503 | + continue; |
|
1504 | 1504 | } |
1505 | 1505 | |
1506 | 1506 | // checks if the No Duplicates option is not validating entry against itself, since |
1507 | 1507 | // we're editing a stored entry, it would also assume it's a duplicate. |
1508 | 1508 | if( !empty( $field->noDuplicates ) ) { |
1509 | 1509 | |
1510 | - $entry = $this->get_entry(); |
|
1510 | + $entry = $this->get_entry(); |
|
1511 | 1511 | |
1512 | - // If the value of the entry is the same as the stored value |
|
1513 | - // Then we can assume it's not a duplicate, it's the same. |
|
1514 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1515 | - //if value submitted was not changed, then don't validate |
|
1516 | - $field->failed_validation = false; |
|
1512 | + // If the value of the entry is the same as the stored value |
|
1513 | + // Then we can assume it's not a duplicate, it's the same. |
|
1514 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1515 | + //if value submitted was not changed, then don't validate |
|
1516 | + $field->failed_validation = false; |
|
1517 | 1517 | |
1518 | - unset( $field->validation_message ); |
|
1518 | + unset( $field->validation_message ); |
|
1519 | 1519 | |
1520 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1520 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1521 | 1521 | |
1522 | - continue; |
|
1523 | - } |
|
1522 | + continue; |
|
1523 | + } |
|
1524 | 1524 | } |
1525 | 1525 | |
1526 | 1526 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1527 | 1527 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
1528 | - unset( $field->validation_message ); |
|
1529 | - $field->validation_message = false; |
|
1530 | - continue; |
|
1528 | + unset( $field->validation_message ); |
|
1529 | + $field->validation_message = false; |
|
1530 | + continue; |
|
1531 | 1531 | } |
1532 | 1532 | |
1533 | 1533 | $gv_valid = false; |
@@ -1591,8 +1591,8 @@ discard block |
||
1591 | 1591 | // Hide fields depending on admin settings |
1592 | 1592 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
1593 | 1593 | |
1594 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1595 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1594 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1595 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1596 | 1596 | |
1597 | 1597 | /** |
1598 | 1598 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1652,11 +1652,11 @@ discard block |
||
1652 | 1652 | // The edit tab has been configured, so we loop through to configured settings |
1653 | 1653 | foreach ( $configured_fields as $configured_field ) { |
1654 | 1654 | |
1655 | - /** @var GF_Field $field */ |
|
1656 | - foreach ( $fields as $field ) { |
|
1655 | + /** @var GF_Field $field */ |
|
1656 | + foreach ( $fields as $field ) { |
|
1657 | 1657 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
1658 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1659 | - break; |
|
1658 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1659 | + break; |
|
1660 | 1660 | } |
1661 | 1661 | |
1662 | 1662 | } |
@@ -1712,28 +1712,28 @@ discard block |
||
1712 | 1712 | */ |
1713 | 1713 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
1714 | 1714 | |
1715 | - /** |
|
1715 | + /** |
|
1716 | 1716 | * @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 |
1717 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1718 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1719 | - * @since 1.9.1 |
|
1720 | - * @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. |
|
1721 | - * @param array $form GF Form array |
|
1722 | - * @param int $view_id View ID |
|
1723 | - */ |
|
1724 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1725 | - |
|
1726 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1717 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1718 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1719 | + * @since 1.9.1 |
|
1720 | + * @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. |
|
1721 | + * @param array $form GF Form array |
|
1722 | + * @param int $view_id View ID |
|
1723 | + */ |
|
1724 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1725 | + |
|
1726 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1727 | 1727 | foreach( $fields as $k => $field ) { |
1728 | 1728 | if( $field->adminOnly ) { |
1729 | - unset( $fields[ $k ] ); |
|
1729 | + unset( $fields[ $k ] ); |
|
1730 | 1730 | } |
1731 | 1731 | } |
1732 | 1732 | return $fields; |
1733 | 1733 | } |
1734 | 1734 | |
1735 | - foreach( $fields as &$field ) { |
|
1736 | - $field->adminOnly = false; |
|
1735 | + foreach( $fields as &$field ) { |
|
1736 | + $field->adminOnly = false; |
|
1737 | 1737 | } |
1738 | 1738 | |
1739 | 1739 | return $fields; |
@@ -1766,36 +1766,36 @@ discard block |
||
1766 | 1766 | |
1767 | 1767 | if( 'checkbox' === $field->type ) { |
1768 | 1768 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1769 | - $input_id = $input['id']; |
|
1770 | - $choice = $field->choices[ $key ]; |
|
1771 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1772 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1773 | - if( $match ) { |
|
1774 | - $field->choices[ $key ]['isSelected'] = true; |
|
1775 | - } |
|
1769 | + $input_id = $input['id']; |
|
1770 | + $choice = $field->choices[ $key ]; |
|
1771 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1772 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1773 | + if( $match ) { |
|
1774 | + $field->choices[ $key ]['isSelected'] = true; |
|
1775 | + } |
|
1776 | 1776 | } |
1777 | 1777 | } else { |
1778 | 1778 | |
1779 | 1779 | // We need to run through each field to set the default values |
1780 | 1780 | foreach ( $this->entry as $field_id => $field_value ) { |
1781 | 1781 | |
1782 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1782 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1783 | 1783 | |
1784 | - if( 'list' === $field->type ) { |
|
1785 | - $list_rows = maybe_unserialize( $field_value ); |
|
1784 | + if( 'list' === $field->type ) { |
|
1785 | + $list_rows = maybe_unserialize( $field_value ); |
|
1786 | 1786 | |
1787 | - $list_field_value = array(); |
|
1788 | - foreach ( (array) $list_rows as $row ) { |
|
1789 | - foreach ( (array) $row as $column ) { |
|
1790 | - $list_field_value[] = $column; |
|
1791 | - } |
|
1792 | - } |
|
1787 | + $list_field_value = array(); |
|
1788 | + foreach ( (array) $list_rows as $row ) { |
|
1789 | + foreach ( (array) $row as $column ) { |
|
1790 | + $list_field_value[] = $column; |
|
1791 | + } |
|
1792 | + } |
|
1793 | 1793 | |
1794 | - $field->defaultValue = serialize( $list_field_value ); |
|
1795 | - } else { |
|
1796 | - $field->defaultValue = $field_value; |
|
1797 | - } |
|
1798 | - } |
|
1794 | + $field->defaultValue = serialize( $list_field_value ); |
|
1795 | + } else { |
|
1796 | + $field->defaultValue = $field_value; |
|
1797 | + } |
|
1798 | + } |
|
1799 | 1799 | } |
1800 | 1800 | } |
1801 | 1801 | } |
@@ -1852,7 +1852,7 @@ discard block |
||
1852 | 1852 | return $has_conditional_logic; |
1853 | 1853 | } |
1854 | 1854 | |
1855 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
1855 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
1856 | 1856 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
1857 | 1857 | } |
1858 | 1858 | |
@@ -1919,14 +1919,14 @@ discard block |
||
1919 | 1919 | |
1920 | 1920 | if( $echo && $error !== true ) { |
1921 | 1921 | |
1922 | - $error = esc_html( $error ); |
|
1922 | + $error = esc_html( $error ); |
|
1923 | 1923 | |
1924 | - /** |
|
1925 | - * @since 1.9 |
|
1926 | - */ |
|
1927 | - if ( ! empty( $this->entry ) ) { |
|
1928 | - $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;" ) ); |
|
1929 | - } |
|
1924 | + /** |
|
1925 | + * @since 1.9 |
|
1926 | + */ |
|
1927 | + if ( ! empty( $this->entry ) ) { |
|
1928 | + $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;" ) ); |
|
1929 | + } |
|
1930 | 1930 | |
1931 | 1931 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
1932 | 1932 | } |