@@ -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 | |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | // Perform actions normally performed after updating a lead |
348 | 348 | $this->after_update(); |
349 | 349 | |
350 | - /** |
|
350 | + /** |
|
351 | 351 | * Must be AFTER after_update()! |
352 | 352 | * @see https://github.com/gravityview/GravityView/issues/764 |
353 | 353 | */ |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | |
356 | 356 | /** |
357 | 357 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
358 | - * @since 2.1 Added $gv_data parameter |
|
358 | + * @since 2.1 Added $gv_data parameter |
|
359 | 359 | * @param array $form Gravity Forms form array |
360 | 360 | * @param string $entry_id Numeric ID of the entry that was updated |
361 | 361 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | * @return void |
380 | 380 | */ |
381 | 381 | private function unset_hidden_field_values() { |
382 | - global $wpdb; |
|
382 | + global $wpdb; |
|
383 | 383 | |
384 | 384 | /** |
385 | 385 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -401,27 +401,27 @@ discard block |
||
401 | 401 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
402 | 402 | } |
403 | 403 | |
404 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
404 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
405 | 405 | |
406 | - $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
406 | + $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
407 | 407 | |
408 | - // Reset fields that are hidden |
|
409 | - // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
410 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
408 | + // Reset fields that are hidden |
|
409 | + // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
410 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
411 | 411 | |
412 | - // List fields are stored as empty arrays when empty |
|
413 | - $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
412 | + // List fields are stored as empty arrays when empty |
|
413 | + $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
414 | 414 | |
415 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
415 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
416 | 416 | |
417 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
417 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
418 | 418 | |
419 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
419 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
420 | 420 | // after submission |
421 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
422 | - $_POST[ $post_input_id ] = ''; |
|
423 | - } |
|
424 | - } |
|
421 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
422 | + $_POST[ $post_input_id ] = ''; |
|
423 | + } |
|
424 | + } |
|
425 | 425 | } |
426 | 426 | |
427 | 427 | /** |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | |
516 | 516 | $form = $this->form; |
517 | 517 | |
518 | - /** @var GF_Field $field */ |
|
518 | + /** @var GF_Field $field */ |
|
519 | 519 | foreach( $form['fields'] as $k => &$field ) { |
520 | 520 | |
521 | 521 | /** |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | |
532 | 532 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
533 | 533 | foreach( $field->inputs as $key => $input ) { |
534 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
534 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
535 | 535 | } |
536 | 536 | } |
537 | 537 | } |
@@ -554,13 +554,13 @@ discard block |
||
554 | 554 | foreach ( $this->fields_with_calculation as $calc_field ) { |
555 | 555 | $inputs = $calc_field->get_entry_inputs(); |
556 | 556 | if ( is_array( $inputs ) ) { |
557 | - foreach ( $inputs as $input ) { |
|
558 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
559 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $input['id'] ) ], $input_name, $entry['id'], $entry ); |
|
560 | - } |
|
557 | + foreach ( $inputs as $input ) { |
|
558 | + $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
559 | + $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $input['id'] ) ], $input_name, $entry['id'], $entry ); |
|
560 | + } |
|
561 | 561 | } else { |
562 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
563 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $calc_field->id ) ], $input_name, $entry['id'], $entry ); |
|
562 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
563 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $calc_field->id ) ], $input_name, $entry['id'], $entry ); |
|
564 | 564 | } |
565 | 565 | } |
566 | 566 | } |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
624 | 624 | |
625 | 625 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
626 | - $ary = stripslashes_deep( $ary ); |
|
626 | + $ary = stripslashes_deep( $ary ); |
|
627 | 627 | $img_url = \GV\Utils::get( $ary, 0 ); |
628 | 628 | |
629 | 629 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | private function maybe_update_post_fields( $form ) { |
697 | 697 | |
698 | 698 | if( empty( $this->entry['post_id'] ) ) { |
699 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
699 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
700 | 700 | return; |
701 | 701 | } |
702 | 702 | |
@@ -731,51 +731,51 @@ discard block |
||
731 | 731 | |
732 | 732 | switch( $field->type ) { |
733 | 733 | |
734 | - case 'post_title': |
|
735 | - $post_title = $value; |
|
736 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
737 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
738 | - } |
|
739 | - $updated_post->post_title = $post_title; |
|
740 | - $updated_post->post_name = $post_title; |
|
741 | - unset( $post_title ); |
|
742 | - break; |
|
743 | - |
|
744 | - case 'post_content': |
|
745 | - $post_content = $value; |
|
746 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
747 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
748 | - } |
|
749 | - $updated_post->post_content = $post_content; |
|
750 | - unset( $post_content ); |
|
751 | - break; |
|
752 | - case 'post_excerpt': |
|
753 | - $updated_post->post_excerpt = $value; |
|
754 | - break; |
|
755 | - case 'post_tags': |
|
756 | - wp_set_post_tags( $post_id, $value, false ); |
|
757 | - break; |
|
758 | - case 'post_category': |
|
759 | - break; |
|
760 | - case 'post_custom_field': |
|
734 | + case 'post_title': |
|
735 | + $post_title = $value; |
|
736 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
737 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
738 | + } |
|
739 | + $updated_post->post_title = $post_title; |
|
740 | + $updated_post->post_name = $post_title; |
|
741 | + unset( $post_title ); |
|
742 | + break; |
|
743 | + |
|
744 | + case 'post_content': |
|
745 | + $post_content = $value; |
|
746 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
747 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
748 | + } |
|
749 | + $updated_post->post_content = $post_content; |
|
750 | + unset( $post_content ); |
|
751 | + break; |
|
752 | + case 'post_excerpt': |
|
753 | + $updated_post->post_excerpt = $value; |
|
754 | + break; |
|
755 | + case 'post_tags': |
|
756 | + wp_set_post_tags( $post_id, $value, false ); |
|
757 | + break; |
|
758 | + case 'post_category': |
|
759 | + break; |
|
760 | + case 'post_custom_field': |
|
761 | 761 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
762 | 762 | $value = $value[ $field_id ]; |
763 | 763 | } |
764 | 764 | |
765 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
766 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
767 | - } |
|
765 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
766 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
767 | + } |
|
768 | 768 | |
769 | - if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
770 | - $value = wp_json_encode( $value ); |
|
771 | - } |
|
769 | + if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
770 | + $value = wp_json_encode( $value ); |
|
771 | + } |
|
772 | 772 | |
773 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
774 | - break; |
|
773 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
774 | + break; |
|
775 | 775 | |
776 | - case 'post_image': |
|
777 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
778 | - break; |
|
776 | + case 'post_image': |
|
777 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
778 | + break; |
|
779 | 779 | |
780 | 780 | } |
781 | 781 | |
@@ -820,20 +820,20 @@ discard block |
||
820 | 820 | */ |
821 | 821 | private function is_field_json_encoded( $field ) { |
822 | 822 | |
823 | - $json_encoded = false; |
|
823 | + $json_encoded = false; |
|
824 | 824 | |
825 | 825 | $input_type = RGFormsModel::get_input_type( $field ); |
826 | 826 | |
827 | - // Only certain custom field types are supported |
|
828 | - switch( $input_type ) { |
|
829 | - case 'fileupload': |
|
830 | - case 'list': |
|
831 | - case 'multiselect': |
|
832 | - $json_encoded = true; |
|
833 | - break; |
|
834 | - } |
|
827 | + // Only certain custom field types are supported |
|
828 | + switch( $input_type ) { |
|
829 | + case 'fileupload': |
|
830 | + case 'list': |
|
831 | + case 'multiselect': |
|
832 | + $json_encoded = true; |
|
833 | + break; |
|
834 | + } |
|
835 | 835 | |
836 | - return $json_encoded; |
|
836 | + return $json_encoded; |
|
837 | 837 | } |
838 | 838 | |
839 | 839 | /** |
@@ -923,14 +923,14 @@ discard block |
||
923 | 923 | ?><h2 class="gv-edit-entry-title"> |
924 | 924 | <span><?php |
925 | 925 | |
926 | - /** |
|
927 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
928 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
929 | - * @param GravityView_Edit_Entry_Render $this This object |
|
930 | - */ |
|
931 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
926 | + /** |
|
927 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
928 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
929 | + * @param GravityView_Edit_Entry_Render $this This object |
|
930 | + */ |
|
931 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
932 | 932 | |
933 | - echo esc_attr( $edit_entry_title ); |
|
933 | + echo esc_attr( $edit_entry_title ); |
|
934 | 934 | ?></span> |
935 | 935 | </h2> |
936 | 936 | |
@@ -1039,7 +1039,7 @@ discard block |
||
1039 | 1039 | |
1040 | 1040 | ob_get_clean(); |
1041 | 1041 | |
1042 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1042 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1043 | 1043 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
1044 | 1044 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
1045 | 1045 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1093,7 +1093,7 @@ discard block |
||
1093 | 1093 | |
1094 | 1094 | // for now we don't support Save and Continue feature. |
1095 | 1095 | if( ! self::$supports_save_and_continue ) { |
1096 | - unset( $form['save'] ); |
|
1096 | + unset( $form['save'] ); |
|
1097 | 1097 | } |
1098 | 1098 | |
1099 | 1099 | $form = $this->unselect_default_values( $form ); |
@@ -1120,30 +1120,30 @@ discard block |
||
1120 | 1120 | return $field_content; |
1121 | 1121 | } |
1122 | 1122 | |
1123 | - $message = null; |
|
1123 | + $message = null; |
|
1124 | 1124 | |
1125 | - // First, make sure they have the capability to edit the post. |
|
1126 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1125 | + // First, make sure they have the capability to edit the post. |
|
1126 | + if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1127 | 1127 | |
1128 | - /** |
|
1129 | - * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1130 | - * @param string $message The existing "You don't have permission..." text |
|
1131 | - */ |
|
1132 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1128 | + /** |
|
1129 | + * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1130 | + * @param string $message The existing "You don't have permission..." text |
|
1131 | + */ |
|
1132 | + $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1133 | 1133 | |
1134 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1135 | - /** |
|
1136 | - * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1137 | - * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1138 | - */ |
|
1139 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1140 | - } |
|
1134 | + } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1135 | + /** |
|
1136 | + * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1137 | + * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1138 | + */ |
|
1139 | + $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1140 | + } |
|
1141 | 1141 | |
1142 | - if( $message ) { |
|
1143 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1144 | - } |
|
1142 | + if( $message ) { |
|
1143 | + $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1144 | + } |
|
1145 | 1145 | |
1146 | - return $field_content; |
|
1146 | + return $field_content; |
|
1147 | 1147 | } |
1148 | 1148 | |
1149 | 1149 | /** |
@@ -1171,7 +1171,7 @@ discard block |
||
1171 | 1171 | || ! empty( $field_content ) |
1172 | 1172 | || in_array( $field->type, array( 'honeypot' ) ) |
1173 | 1173 | ) { |
1174 | - return $field_content; |
|
1174 | + return $field_content; |
|
1175 | 1175 | } |
1176 | 1176 | |
1177 | 1177 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1179,24 +1179,24 @@ discard block |
||
1179 | 1179 | |
1180 | 1180 | $field_value = $this->get_field_value( $field ); |
1181 | 1181 | |
1182 | - // Prevent any PHP warnings, like undefined index |
|
1183 | - ob_start(); |
|
1182 | + // Prevent any PHP warnings, like undefined index |
|
1183 | + ob_start(); |
|
1184 | 1184 | |
1185 | - $return = null; |
|
1185 | + $return = null; |
|
1186 | 1186 | |
1187 | 1187 | /** @var GravityView_Field $gv_field */ |
1188 | 1188 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
1189 | 1189 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1190 | 1190 | } else { |
1191 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1192 | - } |
|
1191 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1192 | + } |
|
1193 | 1193 | |
1194 | - // If there was output, it's an error |
|
1195 | - $warnings = ob_get_clean(); |
|
1194 | + // If there was output, it's an error |
|
1195 | + $warnings = ob_get_clean(); |
|
1196 | 1196 | |
1197 | - if( !empty( $warnings ) ) { |
|
1198 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1199 | - } |
|
1197 | + if( !empty( $warnings ) ) { |
|
1198 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1199 | + } |
|
1200 | 1200 | |
1201 | 1201 | return $return; |
1202 | 1202 | } |
@@ -1231,8 +1231,8 @@ discard block |
||
1231 | 1231 | $input_id = strval( $input['id'] ); |
1232 | 1232 | |
1233 | 1233 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1234 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1235 | - $allow_pre_populated = false; |
|
1234 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1235 | + $allow_pre_populated = false; |
|
1236 | 1236 | } |
1237 | 1237 | |
1238 | 1238 | } |
@@ -1256,7 +1256,7 @@ discard block |
||
1256 | 1256 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
1257 | 1257 | $categories = array(); |
1258 | 1258 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1259 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1259 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1260 | 1260 | } |
1261 | 1261 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1262 | 1262 | } |
@@ -1266,25 +1266,25 @@ discard block |
||
1266 | 1266 | // if value is empty get the default value if defined |
1267 | 1267 | $field_value = $field->get_value_default_if_empty( $field_value ); |
1268 | 1268 | |
1269 | - /** |
|
1270 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1271 | - * @since 1.11 |
|
1272 | - * @since 1.20 Added third param |
|
1273 | - * @param mixed $field_value field value used to populate the input |
|
1274 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1275 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1276 | - */ |
|
1277 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1278 | - |
|
1279 | - /** |
|
1280 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1281 | - * @since 1.17 |
|
1282 | - * @since 1.20 Added third param |
|
1283 | - * @param mixed $field_value field value used to populate the input |
|
1284 | - * @param GF_Field $field Gravity Forms field object |
|
1285 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1286 | - */ |
|
1287 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1269 | + /** |
|
1270 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1271 | + * @since 1.11 |
|
1272 | + * @since 1.20 Added third param |
|
1273 | + * @param mixed $field_value field value used to populate the input |
|
1274 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1275 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1276 | + */ |
|
1277 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1278 | + |
|
1279 | + /** |
|
1280 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1281 | + * @since 1.17 |
|
1282 | + * @since 1.20 Added third param |
|
1283 | + * @param mixed $field_value field value used to populate the input |
|
1284 | + * @param GF_Field $field Gravity Forms field object |
|
1285 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1286 | + */ |
|
1287 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1288 | 1288 | |
1289 | 1289 | return $field_value; |
1290 | 1290 | } |
@@ -1311,7 +1311,7 @@ discard block |
||
1311 | 1311 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1312 | 1312 | // expects certain field array items to be set. |
1313 | 1313 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
1314 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1314 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1315 | 1315 | } |
1316 | 1316 | |
1317 | 1317 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1325,61 +1325,61 @@ discard block |
||
1325 | 1325 | */ |
1326 | 1326 | case 'fileupload': |
1327 | 1327 | |
1328 | - // Set the previous value |
|
1329 | - $entry = $this->get_entry(); |
|
1328 | + // Set the previous value |
|
1329 | + $entry = $this->get_entry(); |
|
1330 | 1330 | |
1331 | - $input_name = 'input_'.$field->id; |
|
1332 | - $form_id = $form['id']; |
|
1331 | + $input_name = 'input_'.$field->id; |
|
1332 | + $form_id = $form['id']; |
|
1333 | 1333 | |
1334 | - $value = NULL; |
|
1334 | + $value = NULL; |
|
1335 | 1335 | |
1336 | - // Use the previous entry value as the default. |
|
1337 | - if( isset( $entry[ $field->id ] ) ) { |
|
1338 | - $value = $entry[ $field->id ]; |
|
1339 | - } |
|
1336 | + // Use the previous entry value as the default. |
|
1337 | + if( isset( $entry[ $field->id ] ) ) { |
|
1338 | + $value = $entry[ $field->id ]; |
|
1339 | + } |
|
1340 | 1340 | |
1341 | - // If this is a single upload file |
|
1342 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1343 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1344 | - $value = $file_path['url']; |
|
1341 | + // If this is a single upload file |
|
1342 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1343 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1344 | + $value = $file_path['url']; |
|
1345 | 1345 | |
1346 | - } else { |
|
1346 | + } else { |
|
1347 | 1347 | |
1348 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1349 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1350 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1348 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1349 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1350 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1351 | 1351 | |
1352 | - } |
|
1352 | + } |
|
1353 | 1353 | |
1354 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1354 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1355 | 1355 | |
1356 | - // If there are fresh uploads, process and merge them. |
|
1357 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1358 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1359 | - $value = empty( $value ) ? '[]' : $value; |
|
1360 | - $value = stripslashes_deep( $value ); |
|
1361 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1362 | - } |
|
1356 | + // If there are fresh uploads, process and merge them. |
|
1357 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1358 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1359 | + $value = empty( $value ) ? '[]' : $value; |
|
1360 | + $value = stripslashes_deep( $value ); |
|
1361 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1362 | + } |
|
1363 | 1363 | |
1364 | - } else { |
|
1364 | + } else { |
|
1365 | 1365 | |
1366 | - // A file already exists when editing an entry |
|
1367 | - // We set this to solve issue when file upload fields are required. |
|
1368 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1366 | + // A file already exists when editing an entry |
|
1367 | + // We set this to solve issue when file upload fields are required. |
|
1368 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1369 | 1369 | |
1370 | - } |
|
1370 | + } |
|
1371 | 1371 | |
1372 | - $this->entry[ $input_name ] = $value; |
|
1373 | - $_POST[ $input_name ] = $value; |
|
1372 | + $this->entry[ $input_name ] = $value; |
|
1373 | + $_POST[ $input_name ] = $value; |
|
1374 | 1374 | |
1375 | - break; |
|
1375 | + break; |
|
1376 | 1376 | |
1377 | 1377 | case 'number': |
1378 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
1379 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1380 | - $_POST['input_'.$field->id ] = NULL; |
|
1381 | - } |
|
1382 | - break; |
|
1378 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
1379 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1380 | + $_POST['input_'.$field->id ] = NULL; |
|
1381 | + } |
|
1382 | + break; |
|
1383 | 1383 | } |
1384 | 1384 | |
1385 | 1385 | } |
@@ -1464,42 +1464,42 @@ discard block |
||
1464 | 1464 | case 'fileupload' : |
1465 | 1465 | case 'post_image': |
1466 | 1466 | |
1467 | - // in case nothing is uploaded but there are already files saved |
|
1468 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1469 | - $field->failed_validation = false; |
|
1470 | - unset( $field->validation_message ); |
|
1471 | - } |
|
1467 | + // in case nothing is uploaded but there are already files saved |
|
1468 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1469 | + $field->failed_validation = false; |
|
1470 | + unset( $field->validation_message ); |
|
1471 | + } |
|
1472 | 1472 | |
1473 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1474 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1473 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1474 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1475 | 1475 | |
1476 | - $input_name = 'input_' . $field->id; |
|
1477 | - //uploaded |
|
1478 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1476 | + $input_name = 'input_' . $field->id; |
|
1477 | + //uploaded |
|
1478 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1479 | 1479 | |
1480 | - //existent |
|
1481 | - $entry = $this->get_entry(); |
|
1482 | - $value = NULL; |
|
1483 | - if( isset( $entry[ $field->id ] ) ) { |
|
1484 | - $value = json_decode( $entry[ $field->id ], true ); |
|
1485 | - } |
|
1480 | + //existent |
|
1481 | + $entry = $this->get_entry(); |
|
1482 | + $value = NULL; |
|
1483 | + if( isset( $entry[ $field->id ] ) ) { |
|
1484 | + $value = json_decode( $entry[ $field->id ], true ); |
|
1485 | + } |
|
1486 | 1486 | |
1487 | - // count uploaded files and existent entry files |
|
1488 | - $count_files = count( $file_names ) + count( $value ); |
|
1487 | + // count uploaded files and existent entry files |
|
1488 | + $count_files = count( $file_names ) + count( $value ); |
|
1489 | 1489 | |
1490 | - if( $count_files > $field->maxFiles ) { |
|
1491 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1492 | - $field->failed_validation = 1; |
|
1493 | - $gv_valid = false; |
|
1490 | + if( $count_files > $field->maxFiles ) { |
|
1491 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1492 | + $field->failed_validation = 1; |
|
1493 | + $gv_valid = false; |
|
1494 | 1494 | |
1495 | - // in case of error make sure the newest upload files are removed from the upload input |
|
1496 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1497 | - } |
|
1495 | + // in case of error make sure the newest upload files are removed from the upload input |
|
1496 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1497 | + } |
|
1498 | 1498 | |
1499 | - } |
|
1499 | + } |
|
1500 | 1500 | |
1501 | 1501 | |
1502 | - break; |
|
1502 | + break; |
|
1503 | 1503 | |
1504 | 1504 | } |
1505 | 1505 | |
@@ -1510,47 +1510,47 @@ discard block |
||
1510 | 1510 | |
1511 | 1511 | switch ( $field_type ) { |
1512 | 1512 | |
1513 | - // Captchas don't need to be re-entered. |
|
1514 | - case 'captcha': |
|
1513 | + // Captchas don't need to be re-entered. |
|
1514 | + case 'captcha': |
|
1515 | 1515 | |
1516 | - // Post Image fields aren't editable, so we un-fail them. |
|
1517 | - case 'post_image': |
|
1518 | - $field->failed_validation = false; |
|
1519 | - unset( $field->validation_message ); |
|
1520 | - break; |
|
1516 | + // Post Image fields aren't editable, so we un-fail them. |
|
1517 | + case 'post_image': |
|
1518 | + $field->failed_validation = false; |
|
1519 | + unset( $field->validation_message ); |
|
1520 | + break; |
|
1521 | 1521 | |
1522 | 1522 | } |
1523 | 1523 | |
1524 | 1524 | // You can't continue inside a switch, so we do it after. |
1525 | 1525 | if( empty( $field->failed_validation ) ) { |
1526 | - continue; |
|
1526 | + continue; |
|
1527 | 1527 | } |
1528 | 1528 | |
1529 | 1529 | // checks if the No Duplicates option is not validating entry against itself, since |
1530 | 1530 | // we're editing a stored entry, it would also assume it's a duplicate. |
1531 | 1531 | if( !empty( $field->noDuplicates ) ) { |
1532 | 1532 | |
1533 | - $entry = $this->get_entry(); |
|
1533 | + $entry = $this->get_entry(); |
|
1534 | 1534 | |
1535 | - // If the value of the entry is the same as the stored value |
|
1536 | - // Then we can assume it's not a duplicate, it's the same. |
|
1537 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1538 | - //if value submitted was not changed, then don't validate |
|
1539 | - $field->failed_validation = false; |
|
1535 | + // If the value of the entry is the same as the stored value |
|
1536 | + // Then we can assume it's not a duplicate, it's the same. |
|
1537 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1538 | + //if value submitted was not changed, then don't validate |
|
1539 | + $field->failed_validation = false; |
|
1540 | 1540 | |
1541 | - unset( $field->validation_message ); |
|
1541 | + unset( $field->validation_message ); |
|
1542 | 1542 | |
1543 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1543 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1544 | 1544 | |
1545 | - continue; |
|
1546 | - } |
|
1545 | + continue; |
|
1546 | + } |
|
1547 | 1547 | } |
1548 | 1548 | |
1549 | 1549 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1550 | 1550 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
1551 | - unset( $field->validation_message ); |
|
1552 | - $field->validation_message = false; |
|
1553 | - continue; |
|
1551 | + unset( $field->validation_message ); |
|
1552 | + $field->validation_message = false; |
|
1553 | + continue; |
|
1554 | 1554 | } |
1555 | 1555 | |
1556 | 1556 | $gv_valid = false; |
@@ -1614,8 +1614,8 @@ discard block |
||
1614 | 1614 | // Hide fields depending on admin settings |
1615 | 1615 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
1616 | 1616 | |
1617 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1618 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1617 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1618 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1619 | 1619 | |
1620 | 1620 | /** |
1621 | 1621 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1675,11 +1675,11 @@ discard block |
||
1675 | 1675 | // The edit tab has been configured, so we loop through to configured settings |
1676 | 1676 | foreach ( $configured_fields as $configured_field ) { |
1677 | 1677 | |
1678 | - /** @var GF_Field $field */ |
|
1679 | - foreach ( $fields as $field ) { |
|
1678 | + /** @var GF_Field $field */ |
|
1679 | + foreach ( $fields as $field ) { |
|
1680 | 1680 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
1681 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1682 | - break; |
|
1681 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1682 | + break; |
|
1683 | 1683 | } |
1684 | 1684 | |
1685 | 1685 | } |
@@ -1735,28 +1735,28 @@ discard block |
||
1735 | 1735 | */ |
1736 | 1736 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
1737 | 1737 | |
1738 | - /** |
|
1738 | + /** |
|
1739 | 1739 | * @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 |
1740 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1741 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1742 | - * @since 1.9.1 |
|
1743 | - * @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. |
|
1744 | - * @param array $form GF Form array |
|
1745 | - * @param int $view_id View ID |
|
1746 | - */ |
|
1747 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1748 | - |
|
1749 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1740 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1741 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1742 | + * @since 1.9.1 |
|
1743 | + * @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. |
|
1744 | + * @param array $form GF Form array |
|
1745 | + * @param int $view_id View ID |
|
1746 | + */ |
|
1747 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1748 | + |
|
1749 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1750 | 1750 | foreach( $fields as $k => $field ) { |
1751 | 1751 | if( $field->adminOnly ) { |
1752 | - unset( $fields[ $k ] ); |
|
1752 | + unset( $fields[ $k ] ); |
|
1753 | 1753 | } |
1754 | 1754 | } |
1755 | 1755 | return array_values( $fields ); |
1756 | 1756 | } |
1757 | 1757 | |
1758 | - foreach( $fields as &$field ) { |
|
1759 | - $field->adminOnly = false; |
|
1758 | + foreach( $fields as &$field ) { |
|
1759 | + $field->adminOnly = false; |
|
1760 | 1760 | } |
1761 | 1761 | |
1762 | 1762 | return $fields; |
@@ -1776,13 +1776,13 @@ discard block |
||
1776 | 1776 | */ |
1777 | 1777 | private function unselect_default_values( $form ) { |
1778 | 1778 | |
1779 | - foreach ( $form['fields'] as &$field ) { |
|
1779 | + foreach ( $form['fields'] as &$field ) { |
|
1780 | 1780 | |
1781 | 1781 | if ( empty( $field->choices ) ) { |
1782 | - continue; |
|
1782 | + continue; |
|
1783 | 1783 | } |
1784 | 1784 | |
1785 | - foreach ( $field->choices as &$choice ) { |
|
1785 | + foreach ( $field->choices as &$choice ) { |
|
1786 | 1786 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
1787 | 1787 | $choice['isSelected'] = false; |
1788 | 1788 | } |
@@ -1819,36 +1819,36 @@ discard block |
||
1819 | 1819 | |
1820 | 1820 | if( 'checkbox' === $field->type ) { |
1821 | 1821 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1822 | - $input_id = $input['id']; |
|
1823 | - $choice = $field->choices[ $key ]; |
|
1824 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1825 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1826 | - if( $match ) { |
|
1827 | - $field->choices[ $key ]['isSelected'] = true; |
|
1828 | - } |
|
1822 | + $input_id = $input['id']; |
|
1823 | + $choice = $field->choices[ $key ]; |
|
1824 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1825 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1826 | + if( $match ) { |
|
1827 | + $field->choices[ $key ]['isSelected'] = true; |
|
1828 | + } |
|
1829 | 1829 | } |
1830 | 1830 | } else { |
1831 | 1831 | |
1832 | 1832 | // We need to run through each field to set the default values |
1833 | 1833 | foreach ( $this->entry as $field_id => $field_value ) { |
1834 | 1834 | |
1835 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1835 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1836 | 1836 | |
1837 | - if( 'list' === $field->type ) { |
|
1838 | - $list_rows = maybe_unserialize( $field_value ); |
|
1837 | + if( 'list' === $field->type ) { |
|
1838 | + $list_rows = maybe_unserialize( $field_value ); |
|
1839 | 1839 | |
1840 | - $list_field_value = array(); |
|
1841 | - foreach ( (array) $list_rows as $row ) { |
|
1842 | - foreach ( (array) $row as $column ) { |
|
1843 | - $list_field_value[] = $column; |
|
1844 | - } |
|
1845 | - } |
|
1840 | + $list_field_value = array(); |
|
1841 | + foreach ( (array) $list_rows as $row ) { |
|
1842 | + foreach ( (array) $row as $column ) { |
|
1843 | + $list_field_value[] = $column; |
|
1844 | + } |
|
1845 | + } |
|
1846 | 1846 | |
1847 | - $field->defaultValue = serialize( $list_field_value ); |
|
1848 | - } else { |
|
1849 | - $field->defaultValue = $field_value; |
|
1850 | - } |
|
1851 | - } |
|
1847 | + $field->defaultValue = serialize( $list_field_value ); |
|
1848 | + } else { |
|
1849 | + $field->defaultValue = $field_value; |
|
1850 | + } |
|
1851 | + } |
|
1852 | 1852 | } |
1853 | 1853 | } |
1854 | 1854 | } |
@@ -1905,7 +1905,7 @@ discard block |
||
1905 | 1905 | return $has_conditional_logic; |
1906 | 1906 | } |
1907 | 1907 | |
1908 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
1908 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
1909 | 1909 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
1910 | 1910 | } |
1911 | 1911 | |
@@ -1972,14 +1972,14 @@ discard block |
||
1972 | 1972 | |
1973 | 1973 | if( $echo && $error !== true ) { |
1974 | 1974 | |
1975 | - $error = esc_html( $error ); |
|
1975 | + $error = esc_html( $error ); |
|
1976 | 1976 | |
1977 | - /** |
|
1978 | - * @since 1.9 |
|
1979 | - */ |
|
1980 | - if ( ! empty( $this->entry ) ) { |
|
1981 | - $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;" ) ); |
|
1982 | - } |
|
1977 | + /** |
|
1978 | + * @since 1.9 |
|
1979 | + */ |
|
1980 | + if ( ! empty( $this->entry ) ) { |
|
1981 | + $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;" ) ); |
|
1982 | + } |
|
1983 | 1983 | |
1984 | 1984 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
1985 | 1985 | } |
@@ -115,16 +115,16 @@ discard block |
||
115 | 115 | function load() { |
116 | 116 | |
117 | 117 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
118 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
118 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
119 | 119 | |
120 | 120 | // Don't display an embedded form when editing an entry |
121 | 121 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
122 | 122 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
123 | 123 | |
124 | 124 | // Stop Gravity Forms processing what is ours! |
125 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
125 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
126 | 126 | |
127 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
127 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
128 | 128 | |
129 | 129 | add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
130 | 130 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
136 | 136 | |
137 | 137 | // Add fields expected by GFFormDisplay::validate() |
138 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
138 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
139 | 139 | |
140 | 140 | // Fix multiselect value for GF 2.2 |
141 | 141 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | * @return void |
153 | 153 | */ |
154 | 154 | public function prevent_render_form() { |
155 | - if( $this->is_edit_entry() ) { |
|
156 | - if( 'wp_head' === current_filter() ) { |
|
155 | + if ( $this->is_edit_entry() ) { |
|
156 | + if ( 'wp_head' === current_filter() ) { |
|
157 | 157 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
158 | 158 | } else { |
159 | 159 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -168,13 +168,13 @@ discard block |
||
168 | 168 | */ |
169 | 169 | public function prevent_maybe_process_form() { |
170 | 170 | |
171 | - if( ! empty( $_POST ) ) { |
|
171 | + if ( ! empty( $_POST ) ) { |
|
172 | 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 | - if( $this->is_edit_entry_submission() ) { |
|
176 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
177 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
175 | + if ( $this->is_edit_entry_submission() ) { |
|
176 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
177 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | */ |
185 | 185 | public function is_edit_entry() { |
186 | 186 | |
187 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
187 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
188 | 188 | |
189 | 189 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
190 | 190 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * @return boolean |
196 | 196 | */ |
197 | 197 | public function is_edit_entry_submission() { |
198 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
198 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | /** |
@@ -208,8 +208,8 @@ discard block |
||
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(); |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $this->view_id = $gravityview_view->getViewId(); |
218 | 218 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
219 | 219 | |
220 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
220 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | |
@@ -268,9 +268,9 @@ discard block |
||
268 | 268 | private function print_scripts() { |
269 | 269 | $gravityview_view = GravityView_View::getInstance(); |
270 | 270 | |
271 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
271 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
272 | 272 | |
273 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
273 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
274 | 274 | |
275 | 275 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
276 | 276 | |
@@ -286,19 +286,19 @@ discard block |
||
286 | 286 | */ |
287 | 287 | private function process_save( $gv_data ) { |
288 | 288 | |
289 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
289 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
290 | 290 | return; |
291 | 291 | } |
292 | 292 | |
293 | 293 | // Make sure the entry, view, and form IDs are all correct |
294 | 294 | $valid = $this->verify_nonce(); |
295 | 295 | |
296 | - if ( !$valid ) { |
|
296 | + if ( ! $valid ) { |
|
297 | 297 | gravityview()->log->error( 'Nonce validation failed.' ); |
298 | 298 | return; |
299 | 299 | } |
300 | 300 | |
301 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
301 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
302 | 302 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
303 | 303 | return; |
304 | 304 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | |
310 | 310 | $this->validate(); |
311 | 311 | |
312 | - if( $this->is_valid ) { |
|
312 | + if ( $this->is_valid ) { |
|
313 | 313 | |
314 | 314 | gravityview()->log->debug( 'Submission is valid.' ); |
315 | 315 | |
@@ -321,22 +321,22 @@ discard block |
||
321 | 321 | /** |
322 | 322 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
323 | 323 | */ |
324 | - unset( $_GET['page'] ); |
|
324 | + unset( $_GET[ 'page' ] ); |
|
325 | 325 | |
326 | - $date_created = $this->entry['date_created']; |
|
326 | + $date_created = $this->entry[ 'date_created' ]; |
|
327 | 327 | |
328 | 328 | /** |
329 | 329 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
330 | 330 | * @since 1.17.2 |
331 | 331 | */ |
332 | - unset( $this->entry['date_created'] ); |
|
332 | + unset( $this->entry[ 'date_created' ] ); |
|
333 | 333 | |
334 | 334 | GFFormsModel::save_lead( $form, $this->entry ); |
335 | 335 | |
336 | 336 | // Delete the values for hidden inputs |
337 | 337 | $this->unset_hidden_field_values(); |
338 | 338 | |
339 | - $this->entry['date_created'] = $date_created; |
|
339 | + $this->entry[ 'date_created' ] = $date_created; |
|
340 | 340 | |
341 | 341 | // Process calculation fields |
342 | 342 | $this->update_calculation_fields(); |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | * @param GravityView_Edit_Entry_Render $this This object |
362 | 362 | * @param GravityView_View_Data $gv_data The View data |
363 | 363 | */ |
364 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
364 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
365 | 365 | |
366 | 366 | } else { |
367 | 367 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -389,16 +389,16 @@ discard block |
||
389 | 389 | */ |
390 | 390 | $unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
391 | 391 | |
392 | - if( ! $unset_hidden_field_values ) { |
|
392 | + if ( ! $unset_hidden_field_values ) { |
|
393 | 393 | return; |
394 | 394 | } |
395 | 395 | |
396 | 396 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
397 | 397 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
398 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
398 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
399 | 399 | } else { |
400 | 400 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
401 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
401 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
402 | 402 | } |
403 | 403 | |
404 | 404 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | } |
480 | 480 | |
481 | 481 | /** No file is being uploaded. */ |
482 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
482 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
483 | 483 | /** So return the original upload */ |
484 | 484 | return $entry[ $input_id ]; |
485 | 485 | } |
@@ -497,11 +497,11 @@ discard block |
||
497 | 497 | * @return mixed |
498 | 498 | */ |
499 | 499 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
500 | - if( ! $this->is_edit_entry() ) { |
|
500 | + if ( ! $this->is_edit_entry() ) { |
|
501 | 501 | return $plupload_init; |
502 | 502 | } |
503 | 503 | |
504 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
504 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
505 | 505 | |
506 | 506 | return $plupload_init; |
507 | 507 | } |
@@ -516,27 +516,27 @@ discard block |
||
516 | 516 | $form = $this->form; |
517 | 517 | |
518 | 518 | /** @var GF_Field $field */ |
519 | - foreach( $form['fields'] as $k => &$field ) { |
|
519 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
520 | 520 | |
521 | 521 | /** |
522 | 522 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
523 | 523 | * @since 1.16.3 |
524 | 524 | * @var GF_Field $field |
525 | 525 | */ |
526 | - if( $field->has_calculation() ) { |
|
527 | - unset( $form['fields'][ $k ] ); |
|
526 | + if ( $field->has_calculation() ) { |
|
527 | + unset( $form[ 'fields' ][ $k ] ); |
|
528 | 528 | } |
529 | 529 | |
530 | 530 | $field->adminOnly = false; |
531 | 531 | |
532 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
533 | - foreach( $field->inputs as $key => $input ) { |
|
534 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
532 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
533 | + foreach ( $field->inputs as $key => $input ) { |
|
534 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
535 | 535 | } |
536 | 536 | } |
537 | 537 | } |
538 | 538 | |
539 | - $form['fields'] = array_values( $form['fields'] ); |
|
539 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
540 | 540 | |
541 | 541 | return $form; |
542 | 542 | } |
@@ -547,20 +547,20 @@ discard block |
||
547 | 547 | $update = false; |
548 | 548 | |
549 | 549 | // get the most up to date entry values |
550 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
550 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
551 | 551 | |
552 | - if( !empty( $this->fields_with_calculation ) ) { |
|
552 | + if ( ! empty( $this->fields_with_calculation ) ) { |
|
553 | 553 | $update = true; |
554 | 554 | foreach ( $this->fields_with_calculation as $calc_field ) { |
555 | 555 | $inputs = $calc_field->get_entry_inputs(); |
556 | 556 | if ( is_array( $inputs ) ) { |
557 | 557 | foreach ( $inputs as $input ) { |
558 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
559 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $input['id'] ) ], $input_name, $entry['id'], $entry ); |
|
558 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
559 | + $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $input[ 'id' ] ) ], $input_name, $entry[ 'id' ], $entry ); |
|
560 | 560 | } |
561 | 561 | } else { |
562 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
563 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $calc_field->id ) ], $input_name, $entry['id'], $entry ); |
|
562 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
563 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, $entry[ strval( $calc_field->id ) ], $input_name, $entry[ 'id' ], $entry ); |
|
564 | 564 | } |
565 | 565 | } |
566 | 566 | } |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | |
570 | 570 | $return_entry = GFAPI::update_entry( $entry ); |
571 | 571 | |
572 | - if( is_wp_error( $return_entry ) ) { |
|
572 | + if ( is_wp_error( $return_entry ) ) { |
|
573 | 573 | gravityview()->log->error( 'Updating the entry calculation fields failed', array( 'data' => $return_entry ) ); |
574 | 574 | } else { |
575 | 575 | gravityview()->log->debug( 'Updating the entry calculation fields succeeded' ); |
@@ -586,7 +586,7 @@ discard block |
||
586 | 586 | return; |
587 | 587 | } |
588 | 588 | |
589 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
589 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
590 | 590 | |
591 | 591 | foreach ( array( 'score', 'percent', 'grade', 'is_pass' ) as $meta ) { |
592 | 592 | GFQuiz::get_instance()->update_entry_meta( "gfquiz_$meta", $entry, self::$original_form ); |
@@ -616,19 +616,19 @@ discard block |
||
616 | 616 | |
617 | 617 | $input_name = 'input_' . $field_id; |
618 | 618 | |
619 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
619 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
620 | 620 | |
621 | 621 | // We have a new image |
622 | 622 | |
623 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
623 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
624 | 624 | |
625 | 625 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
626 | 626 | $ary = stripslashes_deep( $ary ); |
627 | 627 | $img_url = \GV\Utils::get( $ary, 0 ); |
628 | 628 | |
629 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
630 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
631 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
629 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
630 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
631 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
632 | 632 | |
633 | 633 | $image_meta = array( |
634 | 634 | 'post_excerpt' => $img_caption, |
@@ -637,7 +637,7 @@ discard block |
||
637 | 637 | |
638 | 638 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
639 | 639 | if ( ! empty( $img_title ) ) { |
640 | - $image_meta['post_title'] = $img_title; |
|
640 | + $image_meta[ 'post_title' ] = $img_title; |
|
641 | 641 | } |
642 | 642 | |
643 | 643 | /** |
@@ -695,15 +695,15 @@ discard block |
||
695 | 695 | */ |
696 | 696 | private function maybe_update_post_fields( $form ) { |
697 | 697 | |
698 | - if( empty( $this->entry['post_id'] ) ) { |
|
698 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
699 | 699 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
700 | 700 | return; |
701 | 701 | } |
702 | 702 | |
703 | - $post_id = $this->entry['post_id']; |
|
703 | + $post_id = $this->entry[ 'post_id' ]; |
|
704 | 704 | |
705 | 705 | // Security check |
706 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
706 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
707 | 707 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
708 | 708 | return; |
709 | 709 | } |
@@ -716,25 +716,25 @@ discard block |
||
716 | 716 | |
717 | 717 | $field = RGFormsModel::get_field( $form, $field_id ); |
718 | 718 | |
719 | - if( ! $field ) { |
|
719 | + if ( ! $field ) { |
|
720 | 720 | continue; |
721 | 721 | } |
722 | 722 | |
723 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
723 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
724 | 724 | |
725 | 725 | // Get the value of the field, including $_POSTed value |
726 | 726 | $value = RGFormsModel::get_field_value( $field ); |
727 | 727 | |
728 | 728 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
729 | 729 | $entry_tmp = $this->entry; |
730 | - $entry_tmp["{$field_id}"] = $value; |
|
730 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
731 | 731 | |
732 | - switch( $field->type ) { |
|
732 | + switch ( $field->type ) { |
|
733 | 733 | |
734 | 734 | case 'post_title': |
735 | 735 | $post_title = $value; |
736 | 736 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
737 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
737 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
738 | 738 | } |
739 | 739 | $updated_post->post_title = $post_title; |
740 | 740 | $updated_post->post_name = $post_title; |
@@ -744,7 +744,7 @@ discard block |
||
744 | 744 | case 'post_content': |
745 | 745 | $post_content = $value; |
746 | 746 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
747 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
747 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
748 | 748 | } |
749 | 749 | $updated_post->post_content = $post_content; |
750 | 750 | unset( $post_content ); |
@@ -762,7 +762,7 @@ discard block |
||
762 | 762 | $value = $value[ $field_id ]; |
763 | 763 | } |
764 | 764 | |
765 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
765 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
766 | 766 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
767 | 767 | } |
768 | 768 | |
@@ -780,7 +780,7 @@ discard block |
||
780 | 780 | } |
781 | 781 | |
782 | 782 | // update entry after |
783 | - $this->entry["{$field_id}"] = $value; |
|
783 | + $this->entry[ "{$field_id}" ] = $value; |
|
784 | 784 | |
785 | 785 | $update_entry = true; |
786 | 786 | |
@@ -789,11 +789,11 @@ discard block |
||
789 | 789 | |
790 | 790 | } |
791 | 791 | |
792 | - if( $update_entry ) { |
|
792 | + if ( $update_entry ) { |
|
793 | 793 | |
794 | 794 | $return_entry = GFAPI::update_entry( $this->entry ); |
795 | 795 | |
796 | - if( is_wp_error( $return_entry ) ) { |
|
796 | + if ( is_wp_error( $return_entry ) ) { |
|
797 | 797 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
798 | 798 | } else { |
799 | 799 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | |
804 | 804 | $return_post = wp_update_post( $updated_post, true ); |
805 | 805 | |
806 | - if( is_wp_error( $return_post ) ) { |
|
806 | + if ( is_wp_error( $return_post ) ) { |
|
807 | 807 | $return_post->add_data( $updated_post, '$updated_post' ); |
808 | 808 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
809 | 809 | } else { |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | $input_type = RGFormsModel::get_input_type( $field ); |
826 | 826 | |
827 | 827 | // Only certain custom field types are supported |
828 | - switch( $input_type ) { |
|
828 | + switch ( $input_type ) { |
|
829 | 829 | case 'fileupload': |
830 | 830 | case 'list': |
831 | 831 | case 'multiselect': |
@@ -862,7 +862,7 @@ discard block |
||
862 | 862 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
863 | 863 | |
864 | 864 | // replace conditional shortcodes |
865 | - if( $do_shortcode ) { |
|
865 | + if ( $do_shortcode ) { |
|
866 | 866 | $output = do_shortcode( $output ); |
867 | 867 | } |
868 | 868 | |
@@ -881,19 +881,19 @@ discard block |
||
881 | 881 | */ |
882 | 882 | private function after_update() { |
883 | 883 | |
884 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
885 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
884 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
885 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
886 | 886 | |
887 | 887 | // Re-define the entry now that we've updated it. |
888 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
888 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
889 | 889 | |
890 | 890 | $entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
891 | 891 | |
892 | 892 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
893 | 893 | // We need to clear the cache because Gravity Forms caches the field values, which |
894 | 894 | // we have just updated. |
895 | - foreach ($this->form['fields'] as $key => $field) { |
|
896 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
895 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
896 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
897 | 897 | } |
898 | 898 | } |
899 | 899 | |
@@ -912,7 +912,7 @@ discard block |
||
912 | 912 | |
913 | 913 | <div class="gv-edit-entry-wrapper"><?php |
914 | 914 | |
915 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
915 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
916 | 916 | |
917 | 917 | /** |
918 | 918 | * Fixes weird wpautop() issue |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | * @param string $edit_entry_title Modify the "Edit Entry" title |
929 | 929 | * @param GravityView_Edit_Entry_Render $this This object |
930 | 930 | */ |
931 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
931 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
932 | 932 | |
933 | 933 | echo esc_attr( $edit_entry_title ); |
934 | 934 | ?></span> |
@@ -978,16 +978,16 @@ discard block |
||
978 | 978 | |
979 | 979 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
980 | 980 | |
981 | - if( ! $this->is_valid ){ |
|
981 | + if ( ! $this->is_valid ) { |
|
982 | 982 | |
983 | 983 | // Keeping this compatible with Gravity Forms. |
984 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
985 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
984 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
985 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
986 | 986 | |
987 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
987 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
988 | 988 | |
989 | 989 | } else { |
990 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
990 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
991 | 991 | |
992 | 992 | /** |
993 | 993 | * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
@@ -997,7 +997,7 @@ discard block |
||
997 | 997 | * @param array $entry Gravity Forms entry array |
998 | 998 | * @param string $back_link URL to return to the original entry. @since 1.6 |
999 | 999 | */ |
1000 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
1000 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1001 | 1001 | |
1002 | 1002 | echo GVCommon::generate_notice( $message ); |
1003 | 1003 | } |
@@ -1021,21 +1021,21 @@ discard block |
||
1021 | 1021 | */ |
1022 | 1022 | do_action( 'gravityview/edit-entry/render/before', $this ); |
1023 | 1023 | |
1024 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1025 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
1024 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
1025 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1026 | 1026 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
1027 | 1027 | |
1028 | 1028 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
1029 | 1029 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
1030 | 1030 | |
1031 | 1031 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
1032 | - unset( $_GET['page'] ); |
|
1032 | + unset( $_GET[ 'page' ] ); |
|
1033 | 1033 | |
1034 | 1034 | // TODO: Verify multiple-page forms |
1035 | 1035 | |
1036 | 1036 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
1037 | 1037 | |
1038 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
1038 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1039 | 1039 | |
1040 | 1040 | ob_get_clean(); |
1041 | 1041 | |
@@ -1061,7 +1061,7 @@ discard block |
||
1061 | 1061 | * @return string |
1062 | 1062 | */ |
1063 | 1063 | public function render_form_buttons() { |
1064 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
1064 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1065 | 1065 | } |
1066 | 1066 | |
1067 | 1067 | |
@@ -1081,10 +1081,10 @@ discard block |
||
1081 | 1081 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
1082 | 1082 | |
1083 | 1083 | // In case we have validated the form, use it to inject the validation results into the form render |
1084 | - if( isset( $this->form_after_validation ) ) { |
|
1084 | + if ( isset( $this->form_after_validation ) ) { |
|
1085 | 1085 | $form = $this->form_after_validation; |
1086 | 1086 | } else { |
1087 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1087 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1088 | 1088 | } |
1089 | 1089 | |
1090 | 1090 | $form = $this->filter_conditional_logic( $form ); |
@@ -1092,8 +1092,8 @@ discard block |
||
1092 | 1092 | $form = $this->prefill_conditional_logic( $form ); |
1093 | 1093 | |
1094 | 1094 | // for now we don't support Save and Continue feature. |
1095 | - if( ! self::$supports_save_and_continue ) { |
|
1096 | - unset( $form['save'] ); |
|
1095 | + if ( ! self::$supports_save_and_continue ) { |
|
1096 | + unset( $form[ 'save' ] ); |
|
1097 | 1097 | } |
1098 | 1098 | |
1099 | 1099 | $form = $this->unselect_default_values( $form ); |
@@ -1116,31 +1116,31 @@ discard block |
||
1116 | 1116 | */ |
1117 | 1117 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1118 | 1118 | |
1119 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
1119 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
1120 | 1120 | return $field_content; |
1121 | 1121 | } |
1122 | 1122 | |
1123 | 1123 | $message = null; |
1124 | 1124 | |
1125 | 1125 | // First, make sure they have the capability to edit the post. |
1126 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1126 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1127 | 1127 | |
1128 | 1128 | /** |
1129 | 1129 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1130 | 1130 | * @param string $message The existing "You don't have permission..." text |
1131 | 1131 | */ |
1132 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1132 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1133 | 1133 | |
1134 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1134 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1135 | 1135 | /** |
1136 | 1136 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1137 | 1137 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1138 | 1138 | */ |
1139 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1139 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1140 | 1140 | } |
1141 | 1141 | |
1142 | - if( $message ) { |
|
1143 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1142 | + if ( $message ) { |
|
1143 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1144 | 1144 | } |
1145 | 1145 | |
1146 | 1146 | return $field_content; |
@@ -1164,8 +1164,8 @@ discard block |
||
1164 | 1164 | |
1165 | 1165 | // If the form has been submitted, then we don't need to pre-fill the values, |
1166 | 1166 | // Except for fileupload type and when a field input is overridden- run always!! |
1167 | - if( |
|
1168 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1167 | + if ( |
|
1168 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1169 | 1169 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1170 | 1170 | && ! GFCommon::is_product_field( $field->type ) |
1171 | 1171 | || ! empty( $field_content ) |
@@ -1185,7 +1185,7 @@ discard block |
||
1185 | 1185 | $return = null; |
1186 | 1186 | |
1187 | 1187 | /** @var GravityView_Field $gv_field */ |
1188 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1188 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1189 | 1189 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1190 | 1190 | } else { |
1191 | 1191 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1194,7 +1194,7 @@ discard block |
||
1194 | 1194 | // If there was output, it's an error |
1195 | 1195 | $warnings = ob_get_clean(); |
1196 | 1196 | |
1197 | - if( !empty( $warnings ) ) { |
|
1197 | + if ( ! empty( $warnings ) ) { |
|
1198 | 1198 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
1199 | 1199 | } |
1200 | 1200 | |
@@ -1219,7 +1219,7 @@ discard block |
||
1219 | 1219 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1220 | 1220 | |
1221 | 1221 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1222 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1222 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1223 | 1223 | |
1224 | 1224 | $field_value = array(); |
1225 | 1225 | |
@@ -1228,10 +1228,10 @@ discard block |
||
1228 | 1228 | |
1229 | 1229 | foreach ( (array)$field->inputs as $input ) { |
1230 | 1230 | |
1231 | - $input_id = strval( $input['id'] ); |
|
1231 | + $input_id = strval( $input[ 'id' ] ); |
|
1232 | 1232 | |
1233 | 1233 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1234 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1234 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1235 | 1235 | $allow_pre_populated = false; |
1236 | 1236 | } |
1237 | 1237 | |
@@ -1239,7 +1239,7 @@ discard block |
||
1239 | 1239 | |
1240 | 1240 | $pre_value = $field->get_value_submission( array(), false ); |
1241 | 1241 | |
1242 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1242 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1243 | 1243 | |
1244 | 1244 | } else { |
1245 | 1245 | |
@@ -1250,13 +1250,13 @@ discard block |
||
1250 | 1250 | |
1251 | 1251 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1252 | 1252 | // or pre-populated value if not empty and set to override saved value |
1253 | - $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1253 | + $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1254 | 1254 | |
1255 | 1255 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1256 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1256 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1257 | 1257 | $categories = array(); |
1258 | 1258 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1259 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1259 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1260 | 1260 | } |
1261 | 1261 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1262 | 1262 | } |
@@ -1284,7 +1284,7 @@ discard block |
||
1284 | 1284 | * @param GF_Field $field Gravity Forms field object |
1285 | 1285 | * @param GravityView_Edit_Entry_Render $this Current object |
1286 | 1286 | */ |
1287 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1287 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1288 | 1288 | |
1289 | 1289 | return $field_value; |
1290 | 1290 | } |
@@ -1301,12 +1301,12 @@ discard block |
||
1301 | 1301 | */ |
1302 | 1302 | public function gform_pre_validation( $form ) { |
1303 | 1303 | |
1304 | - if( ! $this->verify_nonce() ) { |
|
1304 | + if ( ! $this->verify_nonce() ) { |
|
1305 | 1305 | return $form; |
1306 | 1306 | } |
1307 | 1307 | |
1308 | 1308 | // Fix PHP warning regarding undefined index. |
1309 | - foreach ( $form['fields'] as &$field) { |
|
1309 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1310 | 1310 | |
1311 | 1311 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1312 | 1312 | // expects certain field array items to be set. |
@@ -1314,7 +1314,7 @@ discard block |
||
1314 | 1314 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1315 | 1315 | } |
1316 | 1316 | |
1317 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1317 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1318 | 1318 | |
1319 | 1319 | /** |
1320 | 1320 | * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend. |
@@ -1328,26 +1328,26 @@ discard block |
||
1328 | 1328 | // Set the previous value |
1329 | 1329 | $entry = $this->get_entry(); |
1330 | 1330 | |
1331 | - $input_name = 'input_'.$field->id; |
|
1332 | - $form_id = $form['id']; |
|
1331 | + $input_name = 'input_' . $field->id; |
|
1332 | + $form_id = $form[ 'id' ]; |
|
1333 | 1333 | |
1334 | 1334 | $value = NULL; |
1335 | 1335 | |
1336 | 1336 | // Use the previous entry value as the default. |
1337 | - if( isset( $entry[ $field->id ] ) ) { |
|
1337 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1338 | 1338 | $value = $entry[ $field->id ]; |
1339 | 1339 | } |
1340 | 1340 | |
1341 | 1341 | // If this is a single upload file |
1342 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1343 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1344 | - $value = $file_path['url']; |
|
1342 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1343 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1344 | + $value = $file_path[ 'url' ]; |
|
1345 | 1345 | |
1346 | 1346 | } else { |
1347 | 1347 | |
1348 | 1348 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1349 | 1349 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1350 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1350 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1351 | 1351 | |
1352 | 1352 | } |
1353 | 1353 | |
@@ -1355,10 +1355,10 @@ discard block |
||
1355 | 1355 | |
1356 | 1356 | // If there are fresh uploads, process and merge them. |
1357 | 1357 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1358 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1358 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1359 | 1359 | $value = empty( $value ) ? '[]' : $value; |
1360 | 1360 | $value = stripslashes_deep( $value ); |
1361 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1361 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1362 | 1362 | } |
1363 | 1363 | |
1364 | 1364 | } else { |
@@ -1376,8 +1376,8 @@ discard block |
||
1376 | 1376 | |
1377 | 1377 | case 'number': |
1378 | 1378 | // Fix "undefined index" issue at line 1286 in form_display.php |
1379 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1380 | - $_POST['input_'.$field->id ] = NULL; |
|
1379 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1380 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1381 | 1381 | } |
1382 | 1382 | break; |
1383 | 1383 | } |
@@ -1414,7 +1414,7 @@ discard block |
||
1414 | 1414 | * You can enter whatever you want! |
1415 | 1415 | * We try validating, and customize the results using `self::custom_validation()` |
1416 | 1416 | */ |
1417 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1417 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1418 | 1418 | |
1419 | 1419 | // Needed by the validate funtion |
1420 | 1420 | $failed_validation_page = NULL; |
@@ -1422,14 +1422,14 @@ discard block |
||
1422 | 1422 | |
1423 | 1423 | // Prevent entry limit from running when editing an entry, also |
1424 | 1424 | // prevent form scheduling from preventing editing |
1425 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1425 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1426 | 1426 | |
1427 | 1427 | // Hide fields depending on Edit Entry settings |
1428 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1428 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1429 | 1429 | |
1430 | 1430 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1431 | 1431 | |
1432 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1432 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1433 | 1433 | } |
1434 | 1434 | |
1435 | 1435 | |
@@ -1452,7 +1452,7 @@ discard block |
||
1452 | 1452 | |
1453 | 1453 | $gv_valid = true; |
1454 | 1454 | |
1455 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1455 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1456 | 1456 | |
1457 | 1457 | $value = RGFormsModel::get_field_value( $field ); |
1458 | 1458 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1465,35 +1465,35 @@ discard block |
||
1465 | 1465 | case 'post_image': |
1466 | 1466 | |
1467 | 1467 | // in case nothing is uploaded but there are already files saved |
1468 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1468 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1469 | 1469 | $field->failed_validation = false; |
1470 | 1470 | unset( $field->validation_message ); |
1471 | 1471 | } |
1472 | 1472 | |
1473 | 1473 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
1474 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1474 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1475 | 1475 | |
1476 | 1476 | $input_name = 'input_' . $field->id; |
1477 | 1477 | //uploaded |
1478 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1478 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1479 | 1479 | |
1480 | 1480 | //existent |
1481 | 1481 | $entry = $this->get_entry(); |
1482 | 1482 | $value = NULL; |
1483 | - if( isset( $entry[ $field->id ] ) ) { |
|
1483 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1484 | 1484 | $value = json_decode( $entry[ $field->id ], true ); |
1485 | 1485 | } |
1486 | 1486 | |
1487 | 1487 | // count uploaded files and existent entry files |
1488 | 1488 | $count_files = count( $file_names ) + count( $value ); |
1489 | 1489 | |
1490 | - if( $count_files > $field->maxFiles ) { |
|
1490 | + if ( $count_files > $field->maxFiles ) { |
|
1491 | 1491 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
1492 | 1492 | $field->failed_validation = 1; |
1493 | 1493 | $gv_valid = false; |
1494 | 1494 | |
1495 | 1495 | // in case of error make sure the newest upload files are removed from the upload input |
1496 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1496 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1497 | 1497 | } |
1498 | 1498 | |
1499 | 1499 | } |
@@ -1504,7 +1504,7 @@ discard block |
||
1504 | 1504 | } |
1505 | 1505 | |
1506 | 1506 | // This field has failed validation. |
1507 | - if( !empty( $field->failed_validation ) ) { |
|
1507 | + if ( ! empty( $field->failed_validation ) ) { |
|
1508 | 1508 | |
1509 | 1509 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
1510 | 1510 | |
@@ -1522,19 +1522,19 @@ discard block |
||
1522 | 1522 | } |
1523 | 1523 | |
1524 | 1524 | // You can't continue inside a switch, so we do it after. |
1525 | - if( empty( $field->failed_validation ) ) { |
|
1525 | + if ( empty( $field->failed_validation ) ) { |
|
1526 | 1526 | continue; |
1527 | 1527 | } |
1528 | 1528 | |
1529 | 1529 | // checks if the No Duplicates option is not validating entry against itself, since |
1530 | 1530 | // we're editing a stored entry, it would also assume it's a duplicate. |
1531 | - if( !empty( $field->noDuplicates ) ) { |
|
1531 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1532 | 1532 | |
1533 | 1533 | $entry = $this->get_entry(); |
1534 | 1534 | |
1535 | 1535 | // If the value of the entry is the same as the stored value |
1536 | 1536 | // Then we can assume it's not a duplicate, it's the same. |
1537 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1537 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1538 | 1538 | //if value submitted was not changed, then don't validate |
1539 | 1539 | $field->failed_validation = false; |
1540 | 1540 | |
@@ -1547,7 +1547,7 @@ discard block |
||
1547 | 1547 | } |
1548 | 1548 | |
1549 | 1549 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1550 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1550 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1551 | 1551 | unset( $field->validation_message ); |
1552 | 1552 | $field->validation_message = false; |
1553 | 1553 | continue; |
@@ -1559,12 +1559,12 @@ discard block |
||
1559 | 1559 | |
1560 | 1560 | } |
1561 | 1561 | |
1562 | - $validation_results['is_valid'] = $gv_valid; |
|
1562 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1563 | 1563 | |
1564 | 1564 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
1565 | 1565 | |
1566 | 1566 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1567 | - $this->form_after_validation = $validation_results['form']; |
|
1567 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1568 | 1568 | |
1569 | 1569 | return $validation_results; |
1570 | 1570 | } |
@@ -1577,7 +1577,7 @@ discard block |
||
1577 | 1577 | */ |
1578 | 1578 | public function get_entry() { |
1579 | 1579 | |
1580 | - if( empty( $this->entry ) ) { |
|
1580 | + if ( empty( $this->entry ) ) { |
|
1581 | 1581 | // Get the database value of the entry that's being edited |
1582 | 1582 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1583 | 1583 | } |
@@ -1609,10 +1609,10 @@ discard block |
||
1609 | 1609 | } |
1610 | 1610 | |
1611 | 1611 | // If edit tab not yet configured, show all fields |
1612 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1612 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1613 | 1613 | |
1614 | 1614 | // Hide fields depending on admin settings |
1615 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1615 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1616 | 1616 | |
1617 | 1617 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1618 | 1618 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1644,7 +1644,7 @@ discard block |
||
1644 | 1644 | */ |
1645 | 1645 | private function filter_fields( $fields, $configured_fields ) { |
1646 | 1646 | |
1647 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1647 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1648 | 1648 | return $fields; |
1649 | 1649 | } |
1650 | 1650 | |
@@ -1657,18 +1657,18 @@ discard block |
||
1657 | 1657 | |
1658 | 1658 | // Remove the fields that have calculation properties and keep them to be used later |
1659 | 1659 | // @since 1.16.2 |
1660 | - if( $field->has_calculation() ) { |
|
1661 | - $this->fields_with_calculation[] = $field; |
|
1660 | + if ( $field->has_calculation() ) { |
|
1661 | + $this->fields_with_calculation[ ] = $field; |
|
1662 | 1662 | // don't remove the calculation fields on form render. |
1663 | 1663 | } |
1664 | 1664 | |
1665 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1665 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1666 | 1666 | unset( $fields[ $key ] ); |
1667 | 1667 | } |
1668 | 1668 | } |
1669 | 1669 | |
1670 | 1670 | // The Edit tab has not been configured, so we return all fields by default. |
1671 | - if( empty( $configured_fields ) ) { |
|
1671 | + if ( empty( $configured_fields ) ) { |
|
1672 | 1672 | return array_values( $fields ); |
1673 | 1673 | } |
1674 | 1674 | |
@@ -1677,8 +1677,8 @@ discard block |
||
1677 | 1677 | |
1678 | 1678 | /** @var GF_Field $field */ |
1679 | 1679 | foreach ( $fields as $field ) { |
1680 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1681 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1680 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1681 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1682 | 1682 | break; |
1683 | 1683 | } |
1684 | 1684 | |
@@ -1701,14 +1701,14 @@ discard block |
||
1701 | 1701 | |
1702 | 1702 | $return_field = $field; |
1703 | 1703 | |
1704 | - if( empty( $field_setting['show_label'] ) ) { |
|
1704 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1705 | 1705 | $return_field->label = ''; |
1706 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1707 | - $return_field->label = $field_setting['custom_label']; |
|
1706 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
1707 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
1708 | 1708 | } |
1709 | 1709 | |
1710 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
1711 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
1710 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
1711 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1712 | 1712 | } |
1713 | 1713 | |
1714 | 1714 | /** |
@@ -1746,16 +1746,16 @@ discard block |
||
1746 | 1746 | */ |
1747 | 1747 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
1748 | 1748 | |
1749 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1750 | - foreach( $fields as $k => $field ) { |
|
1751 | - if( $field->adminOnly ) { |
|
1749 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
1750 | + foreach ( $fields as $k => $field ) { |
|
1751 | + if ( $field->adminOnly ) { |
|
1752 | 1752 | unset( $fields[ $k ] ); |
1753 | 1753 | } |
1754 | 1754 | } |
1755 | 1755 | return array_values( $fields ); |
1756 | 1756 | } |
1757 | 1757 | |
1758 | - foreach( $fields as &$field ) { |
|
1758 | + foreach ( $fields as &$field ) { |
|
1759 | 1759 | $field->adminOnly = false; |
1760 | 1760 | } |
1761 | 1761 | |
@@ -1776,7 +1776,7 @@ discard block |
||
1776 | 1776 | */ |
1777 | 1777 | private function unselect_default_values( $form ) { |
1778 | 1778 | |
1779 | - foreach ( $form['fields'] as &$field ) { |
|
1779 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1780 | 1780 | |
1781 | 1781 | if ( empty( $field->choices ) ) { |
1782 | 1782 | continue; |
@@ -1784,7 +1784,7 @@ discard block |
||
1784 | 1784 | |
1785 | 1785 | foreach ( $field->choices as &$choice ) { |
1786 | 1786 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
1787 | - $choice['isSelected'] = false; |
|
1787 | + $choice[ 'isSelected' ] = false; |
|
1788 | 1788 | } |
1789 | 1789 | } |
1790 | 1790 | } |
@@ -1809,22 +1809,22 @@ discard block |
||
1809 | 1809 | */ |
1810 | 1810 | function prefill_conditional_logic( $form ) { |
1811 | 1811 | |
1812 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1812 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1813 | 1813 | return $form; |
1814 | 1814 | } |
1815 | 1815 | |
1816 | 1816 | // Have Conditional Logic pre-fill fields as if the data were default values |
1817 | 1817 | /** @var GF_Field $field */ |
1818 | - foreach ( $form['fields'] as &$field ) { |
|
1818 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1819 | 1819 | |
1820 | - if( 'checkbox' === $field->type ) { |
|
1820 | + if ( 'checkbox' === $field->type ) { |
|
1821 | 1821 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1822 | - $input_id = $input['id']; |
|
1822 | + $input_id = $input[ 'id' ]; |
|
1823 | 1823 | $choice = $field->choices[ $key ]; |
1824 | 1824 | $value = \GV\Utils::get( $this->entry, $input_id ); |
1825 | 1825 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
1826 | - if( $match ) { |
|
1827 | - $field->choices[ $key ]['isSelected'] = true; |
|
1826 | + if ( $match ) { |
|
1827 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
1828 | 1828 | } |
1829 | 1829 | } |
1830 | 1830 | } else { |
@@ -1832,15 +1832,15 @@ discard block |
||
1832 | 1832 | // We need to run through each field to set the default values |
1833 | 1833 | foreach ( $this->entry as $field_id => $field_value ) { |
1834 | 1834 | |
1835 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1835 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1836 | 1836 | |
1837 | - if( 'list' === $field->type ) { |
|
1837 | + if ( 'list' === $field->type ) { |
|
1838 | 1838 | $list_rows = maybe_unserialize( $field_value ); |
1839 | 1839 | |
1840 | 1840 | $list_field_value = array(); |
1841 | - foreach ( (array) $list_rows as $row ) { |
|
1842 | - foreach ( (array) $row as $column ) { |
|
1843 | - $list_field_value[] = $column; |
|
1841 | + foreach ( (array)$list_rows as $row ) { |
|
1842 | + foreach ( (array)$row as $column ) { |
|
1843 | + $list_field_value[ ] = $column; |
|
1844 | 1844 | } |
1845 | 1845 | } |
1846 | 1846 | |
@@ -1875,16 +1875,16 @@ discard block |
||
1875 | 1875 | */ |
1876 | 1876 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
1877 | 1877 | |
1878 | - if( $use_conditional_logic ) { |
|
1878 | + if ( $use_conditional_logic ) { |
|
1879 | 1879 | return $form; |
1880 | 1880 | } |
1881 | 1881 | |
1882 | - foreach( $form['fields'] as &$field ) { |
|
1882 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1883 | 1883 | /* @var GF_Field $field */ |
1884 | 1884 | $field->conditionalLogic = null; |
1885 | 1885 | } |
1886 | 1886 | |
1887 | - unset( $form['button']['conditionalLogic'] ); |
|
1887 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
1888 | 1888 | |
1889 | 1889 | return $form; |
1890 | 1890 | |
@@ -1901,7 +1901,7 @@ discard block |
||
1901 | 1901 | */ |
1902 | 1902 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
1903 | 1903 | |
1904 | - if( ! $this->is_edit_entry() ) { |
|
1904 | + if ( ! $this->is_edit_entry() ) { |
|
1905 | 1905 | return $has_conditional_logic; |
1906 | 1906 | } |
1907 | 1907 | |
@@ -1933,44 +1933,44 @@ discard block |
||
1933 | 1933 | * 2. There are two entries embedded using oEmbed |
1934 | 1934 | * 3. One of the entries has just been saved |
1935 | 1935 | */ |
1936 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
1936 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
1937 | 1937 | |
1938 | 1938 | $error = true; |
1939 | 1939 | |
1940 | 1940 | } |
1941 | 1941 | |
1942 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
1942 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
1943 | 1943 | |
1944 | 1944 | $error = true; |
1945 | 1945 | |
1946 | - } elseif( ! $this->verify_nonce() ) { |
|
1946 | + } elseif ( ! $this->verify_nonce() ) { |
|
1947 | 1947 | |
1948 | 1948 | /** |
1949 | 1949 | * If the Entry is embedded, there may be two entries on the same page. |
1950 | 1950 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
1951 | 1951 | */ |
1952 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1952 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1953 | 1953 | $error = true; |
1954 | 1954 | } else { |
1955 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
1955 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
1956 | 1956 | } |
1957 | 1957 | |
1958 | 1958 | } |
1959 | 1959 | |
1960 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1961 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
1960 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1961 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
1962 | 1962 | } |
1963 | 1963 | |
1964 | - if( $this->entry['status'] === 'trash' ) { |
|
1965 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1964 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
1965 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1966 | 1966 | } |
1967 | 1967 | |
1968 | 1968 | // No errors; everything's fine here! |
1969 | - if( empty( $error ) ) { |
|
1969 | + if ( empty( $error ) ) { |
|
1970 | 1970 | return true; |
1971 | 1971 | } |
1972 | 1972 | |
1973 | - if( $echo && $error !== true ) { |
|
1973 | + if ( $echo && $error !== true ) { |
|
1974 | 1974 | |
1975 | 1975 | $error = esc_html( $error ); |
1976 | 1976 | |
@@ -1978,10 +1978,10 @@ discard block |
||
1978 | 1978 | * @since 1.9 |
1979 | 1979 | */ |
1980 | 1980 | if ( ! empty( $this->entry ) ) { |
1981 | - $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;" ) ); |
|
1981 | + $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;" ) ); |
|
1982 | 1982 | } |
1983 | 1983 | |
1984 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
1984 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
1985 | 1985 | } |
1986 | 1986 | |
1987 | 1987 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2001,17 +2001,17 @@ discard block |
||
2001 | 2001 | |
2002 | 2002 | $error = NULL; |
2003 | 2003 | |
2004 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2005 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
2004 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2005 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2006 | 2006 | } |
2007 | 2007 | |
2008 | 2008 | // No errors; everything's fine here! |
2009 | - if( empty( $error ) ) { |
|
2009 | + if ( empty( $error ) ) { |
|
2010 | 2010 | return true; |
2011 | 2011 | } |
2012 | 2012 | |
2013 | - if( $echo ) { |
|
2014 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
2013 | + if ( $echo ) { |
|
2014 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2015 | 2015 | } |
2016 | 2016 | |
2017 | 2017 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2032,14 +2032,14 @@ discard block |
||
2032 | 2032 | private function check_user_cap_edit_field( $field ) { |
2033 | 2033 | |
2034 | 2034 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
2035 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2035 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2036 | 2036 | return true; |
2037 | 2037 | } |
2038 | 2038 | |
2039 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
2039 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2040 | 2040 | |
2041 | - if( $field_cap ) { |
|
2042 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
2041 | + if ( $field_cap ) { |
|
2042 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2043 | 2043 | } |
2044 | 2044 | |
2045 | 2045 | return false; |
@@ -2053,17 +2053,17 @@ discard block |
||
2053 | 2053 | public function verify_nonce() { |
2054 | 2054 | |
2055 | 2055 | // Verify form submitted for editing single |
2056 | - if( $this->is_edit_entry_submission() ) { |
|
2056 | + if ( $this->is_edit_entry_submission() ) { |
|
2057 | 2057 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
2058 | 2058 | } |
2059 | 2059 | |
2060 | 2060 | // Verify |
2061 | - else if( ! $this->is_edit_entry() ) { |
|
2061 | + else if ( ! $this->is_edit_entry() ) { |
|
2062 | 2062 | $valid = false; |
2063 | 2063 | } |
2064 | 2064 | |
2065 | 2065 | else { |
2066 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
2066 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2067 | 2067 | } |
2068 | 2068 | |
2069 | 2069 | /** |