@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | |
95 | 95 | /** |
96 | 96 | * ID of the current post. May also be ID of the current View. |
97 | - * |
|
98 | - * @since 2.0.13 |
|
99 | - * |
|
100 | - * @var int |
|
97 | + * |
|
98 | + * @since 2.0.13 |
|
99 | + * |
|
100 | + * @var int |
|
101 | 101 | */ |
102 | 102 | public $post_id; |
103 | 103 | |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | public function prevent_maybe_process_form() { |
170 | 170 | |
171 | 171 | if( ! empty( $_POST ) ) { |
172 | - gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
172 | + gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | if( $this->is_edit_entry_submission() ) { |
176 | 176 | remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
177 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
177 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | |
@@ -202,14 +202,14 @@ discard block |
||
202 | 202 | * When Edit entry view is requested setup the vars |
203 | 203 | */ |
204 | 204 | private function setup_vars() { |
205 | - global $post; |
|
205 | + global $post; |
|
206 | 206 | |
207 | 207 | $gravityview_view = GravityView_View::getInstance(); |
208 | 208 | |
209 | 209 | |
210 | 210 | $entries = $gravityview_view->getEntries(); |
211 | - self::$original_entry = $entries[0]; |
|
212 | - $this->entry = $entries[0]; |
|
211 | + self::$original_entry = $entries[0]; |
|
212 | + $this->entry = $entries[0]; |
|
213 | 213 | |
214 | 214 | self::$original_form = $gravityview_view->getForm(); |
215 | 215 | $this->form = $gravityview_view->getForm(); |
@@ -333,8 +333,8 @@ discard block |
||
333 | 333 | |
334 | 334 | GFFormsModel::save_lead( $form, $this->entry ); |
335 | 335 | |
336 | - // Delete the values for hidden inputs |
|
337 | - $this->unset_hidden_field_values(); |
|
336 | + // Delete the values for hidden inputs |
|
337 | + $this->unset_hidden_field_values(); |
|
338 | 338 | |
339 | 339 | $this->entry['date_created'] = $date_created; |
340 | 340 | |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | // Perform actions normally performed after updating a lead |
345 | 345 | $this->after_update(); |
346 | 346 | |
347 | - /** |
|
347 | + /** |
|
348 | 348 | * Must be AFTER after_update()! |
349 | 349 | * @see https://github.com/gravityview/GravityView/issues/764 |
350 | 350 | */ |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | |
353 | 353 | /** |
354 | 354 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
355 | - * @since 2.1 Added $gv_data parameter |
|
355 | + * @since 2.1 Added $gv_data parameter |
|
356 | 356 | * @param array $form Gravity Forms form array |
357 | 357 | * @param string $entry_id Numeric ID of the entry that was updated |
358 | 358 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | * @return void |
377 | 377 | */ |
378 | 378 | private function unset_hidden_field_values() { |
379 | - global $wpdb; |
|
379 | + global $wpdb; |
|
380 | 380 | |
381 | 381 | /** |
382 | 382 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -398,27 +398,27 @@ discard block |
||
398 | 398 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
399 | 399 | } |
400 | 400 | |
401 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
401 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
402 | 402 | |
403 | - $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
403 | + $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
404 | 404 | |
405 | - // Reset fields that are hidden |
|
406 | - // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
407 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
405 | + // Reset fields that are hidden |
|
406 | + // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
407 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
408 | 408 | |
409 | - // List fields are stored as empty arrays when empty |
|
410 | - $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
409 | + // List fields are stored as empty arrays when empty |
|
410 | + $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
411 | 411 | |
412 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
412 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
413 | 413 | |
414 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
414 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
415 | 415 | |
416 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
416 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
417 | 417 | // after submission |
418 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
419 | - $_POST[ $post_input_id ] = ''; |
|
420 | - } |
|
421 | - } |
|
418 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
419 | + $_POST[ $post_input_id ] = ''; |
|
420 | + } |
|
421 | + } |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | /** |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | |
513 | 513 | $form = $this->form; |
514 | 514 | |
515 | - /** @var GF_Field $field */ |
|
515 | + /** @var GF_Field $field */ |
|
516 | 516 | foreach( $form['fields'] as $k => &$field ) { |
517 | 517 | |
518 | 518 | /** |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | |
529 | 529 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
530 | 530 | foreach( $field->inputs as $key => $input ) { |
531 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
531 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
532 | 532 | } |
533 | 533 | } |
534 | 534 | } |
@@ -549,13 +549,13 @@ discard block |
||
549 | 549 | foreach ( $this->fields_with_calculation as $calc_field ) { |
550 | 550 | $inputs = $calc_field->get_entry_inputs(); |
551 | 551 | if ( is_array( $inputs ) ) { |
552 | - foreach ( $inputs as $input ) { |
|
553 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
554 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
555 | - } |
|
552 | + foreach ( $inputs as $input ) { |
|
553 | + $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
554 | + $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
555 | + } |
|
556 | 556 | } else { |
557 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
558 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
557 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
558 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
559 | 559 | } |
560 | 560 | } |
561 | 561 | |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
604 | 604 | |
605 | 605 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
606 | - $ary = stripslashes_deep( $ary ); |
|
606 | + $ary = stripslashes_deep( $ary ); |
|
607 | 607 | $img_url = \GV\Utils::get( $ary, 0 ); |
608 | 608 | |
609 | 609 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -676,7 +676,7 @@ discard block |
||
676 | 676 | private function maybe_update_post_fields( $form ) { |
677 | 677 | |
678 | 678 | if( empty( $this->entry['post_id'] ) ) { |
679 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
679 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
680 | 680 | return; |
681 | 681 | } |
682 | 682 | |
@@ -711,51 +711,51 @@ discard block |
||
711 | 711 | |
712 | 712 | switch( $field->type ) { |
713 | 713 | |
714 | - case 'post_title': |
|
715 | - $post_title = $value; |
|
716 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
717 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
718 | - } |
|
719 | - $updated_post->post_title = $post_title; |
|
720 | - $updated_post->post_name = $post_title; |
|
721 | - unset( $post_title ); |
|
722 | - break; |
|
723 | - |
|
724 | - case 'post_content': |
|
725 | - $post_content = $value; |
|
726 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
727 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
728 | - } |
|
729 | - $updated_post->post_content = $post_content; |
|
730 | - unset( $post_content ); |
|
731 | - break; |
|
732 | - case 'post_excerpt': |
|
733 | - $updated_post->post_excerpt = $value; |
|
734 | - break; |
|
735 | - case 'post_tags': |
|
736 | - wp_set_post_tags( $post_id, $value, false ); |
|
737 | - break; |
|
738 | - case 'post_category': |
|
739 | - break; |
|
740 | - case 'post_custom_field': |
|
714 | + case 'post_title': |
|
715 | + $post_title = $value; |
|
716 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
717 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
718 | + } |
|
719 | + $updated_post->post_title = $post_title; |
|
720 | + $updated_post->post_name = $post_title; |
|
721 | + unset( $post_title ); |
|
722 | + break; |
|
723 | + |
|
724 | + case 'post_content': |
|
725 | + $post_content = $value; |
|
726 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
727 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
728 | + } |
|
729 | + $updated_post->post_content = $post_content; |
|
730 | + unset( $post_content ); |
|
731 | + break; |
|
732 | + case 'post_excerpt': |
|
733 | + $updated_post->post_excerpt = $value; |
|
734 | + break; |
|
735 | + case 'post_tags': |
|
736 | + wp_set_post_tags( $post_id, $value, false ); |
|
737 | + break; |
|
738 | + case 'post_category': |
|
739 | + break; |
|
740 | + case 'post_custom_field': |
|
741 | 741 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
742 | 742 | $value = $value[ $field_id ]; |
743 | 743 | } |
744 | 744 | |
745 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
746 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
747 | - } |
|
745 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
746 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
747 | + } |
|
748 | 748 | |
749 | - if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
750 | - $value = wp_json_encode( $value ); |
|
751 | - } |
|
749 | + if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
750 | + $value = wp_json_encode( $value ); |
|
751 | + } |
|
752 | 752 | |
753 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
754 | - break; |
|
753 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
754 | + break; |
|
755 | 755 | |
756 | - case 'post_image': |
|
757 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
758 | - break; |
|
756 | + case 'post_image': |
|
757 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
758 | + break; |
|
759 | 759 | |
760 | 760 | } |
761 | 761 | |
@@ -800,20 +800,20 @@ discard block |
||
800 | 800 | */ |
801 | 801 | private function is_field_json_encoded( $field ) { |
802 | 802 | |
803 | - $json_encoded = false; |
|
803 | + $json_encoded = false; |
|
804 | 804 | |
805 | 805 | $input_type = RGFormsModel::get_input_type( $field ); |
806 | 806 | |
807 | - // Only certain custom field types are supported |
|
808 | - switch( $input_type ) { |
|
809 | - case 'fileupload': |
|
810 | - case 'list': |
|
811 | - case 'multiselect': |
|
812 | - $json_encoded = true; |
|
813 | - break; |
|
814 | - } |
|
807 | + // Only certain custom field types are supported |
|
808 | + switch( $input_type ) { |
|
809 | + case 'fileupload': |
|
810 | + case 'list': |
|
811 | + case 'multiselect': |
|
812 | + $json_encoded = true; |
|
813 | + break; |
|
814 | + } |
|
815 | 815 | |
816 | - return $json_encoded; |
|
816 | + return $json_encoded; |
|
817 | 817 | } |
818 | 818 | |
819 | 819 | /** |
@@ -903,14 +903,14 @@ discard block |
||
903 | 903 | ?><h2 class="gv-edit-entry-title"> |
904 | 904 | <span><?php |
905 | 905 | |
906 | - /** |
|
907 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
908 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
909 | - * @param GravityView_Edit_Entry_Render $this This object |
|
910 | - */ |
|
911 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
906 | + /** |
|
907 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
908 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
909 | + * @param GravityView_Edit_Entry_Render $this This object |
|
910 | + */ |
|
911 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
912 | 912 | |
913 | - echo esc_attr( $edit_entry_title ); |
|
913 | + echo esc_attr( $edit_entry_title ); |
|
914 | 914 | ?></span> |
915 | 915 | </h2> |
916 | 916 | |
@@ -1019,7 +1019,7 @@ discard block |
||
1019 | 1019 | |
1020 | 1020 | ob_get_clean(); |
1021 | 1021 | |
1022 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1022 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1023 | 1023 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
1024 | 1024 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
1025 | 1025 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1073,7 +1073,7 @@ discard block |
||
1073 | 1073 | |
1074 | 1074 | // for now we don't support Save and Continue feature. |
1075 | 1075 | if( ! self::$supports_save_and_continue ) { |
1076 | - unset( $form['save'] ); |
|
1076 | + unset( $form['save'] ); |
|
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | $form = $this->unselect_default_values( $form ); |
@@ -1150,7 +1150,7 @@ discard block |
||
1150 | 1150 | || ! empty( $field_content ) |
1151 | 1151 | || in_array( $field->type, array( 'honeypot' ) ) |
1152 | 1152 | ) { |
1153 | - return $field_content; |
|
1153 | + return $field_content; |
|
1154 | 1154 | } |
1155 | 1155 | |
1156 | 1156 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1158,24 +1158,24 @@ discard block |
||
1158 | 1158 | |
1159 | 1159 | $field_value = $this->get_field_value( $field ); |
1160 | 1160 | |
1161 | - // Prevent any PHP warnings, like undefined index |
|
1162 | - ob_start(); |
|
1161 | + // Prevent any PHP warnings, like undefined index |
|
1162 | + ob_start(); |
|
1163 | 1163 | |
1164 | - $return = null; |
|
1164 | + $return = null; |
|
1165 | 1165 | |
1166 | 1166 | /** @var GravityView_Field $gv_field */ |
1167 | 1167 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
1168 | 1168 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1169 | 1169 | } else { |
1170 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1171 | - } |
|
1170 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1171 | + } |
|
1172 | 1172 | |
1173 | - // If there was output, it's an error |
|
1174 | - $warnings = ob_get_clean(); |
|
1173 | + // If there was output, it's an error |
|
1174 | + $warnings = ob_get_clean(); |
|
1175 | 1175 | |
1176 | - if( !empty( $warnings ) ) { |
|
1177 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1178 | - } |
|
1176 | + if( !empty( $warnings ) ) { |
|
1177 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1178 | + } |
|
1179 | 1179 | |
1180 | 1180 | return $return; |
1181 | 1181 | } |
@@ -1210,8 +1210,8 @@ discard block |
||
1210 | 1210 | $input_id = strval( $input['id'] ); |
1211 | 1211 | |
1212 | 1212 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1213 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1214 | - $allow_pre_populated = false; |
|
1213 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1214 | + $allow_pre_populated = false; |
|
1215 | 1215 | } |
1216 | 1216 | |
1217 | 1217 | } |
@@ -1235,7 +1235,7 @@ discard block |
||
1235 | 1235 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
1236 | 1236 | $categories = array(); |
1237 | 1237 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1238 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1238 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1239 | 1239 | } |
1240 | 1240 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1241 | 1241 | } |
@@ -1245,25 +1245,25 @@ discard block |
||
1245 | 1245 | // if value is empty get the default value if defined |
1246 | 1246 | $field_value = $field->get_value_default_if_empty( $field_value ); |
1247 | 1247 | |
1248 | - /** |
|
1249 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1250 | - * @since 1.11 |
|
1251 | - * @since 1.20 Added third param |
|
1252 | - * @param mixed $field_value field value used to populate the input |
|
1253 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1254 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1255 | - */ |
|
1256 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1257 | - |
|
1258 | - /** |
|
1259 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1260 | - * @since 1.17 |
|
1261 | - * @since 1.20 Added third param |
|
1262 | - * @param mixed $field_value field value used to populate the input |
|
1263 | - * @param GF_Field $field Gravity Forms field object |
|
1264 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1265 | - */ |
|
1266 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1248 | + /** |
|
1249 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1250 | + * @since 1.11 |
|
1251 | + * @since 1.20 Added third param |
|
1252 | + * @param mixed $field_value field value used to populate the input |
|
1253 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1254 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1255 | + */ |
|
1256 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1257 | + |
|
1258 | + /** |
|
1259 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1260 | + * @since 1.17 |
|
1261 | + * @since 1.20 Added third param |
|
1262 | + * @param mixed $field_value field value used to populate the input |
|
1263 | + * @param GF_Field $field Gravity Forms field object |
|
1264 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1265 | + */ |
|
1266 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1267 | 1267 | |
1268 | 1268 | return $field_value; |
1269 | 1269 | } |
@@ -1290,7 +1290,7 @@ discard block |
||
1290 | 1290 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1291 | 1291 | // expects certain field array items to be set. |
1292 | 1292 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
1293 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1293 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1294 | 1294 | } |
1295 | 1295 | |
1296 | 1296 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1304,61 +1304,61 @@ discard block |
||
1304 | 1304 | */ |
1305 | 1305 | case 'fileupload': |
1306 | 1306 | |
1307 | - // Set the previous value |
|
1308 | - $entry = $this->get_entry(); |
|
1307 | + // Set the previous value |
|
1308 | + $entry = $this->get_entry(); |
|
1309 | 1309 | |
1310 | - $input_name = 'input_'.$field->id; |
|
1311 | - $form_id = $form['id']; |
|
1310 | + $input_name = 'input_'.$field->id; |
|
1311 | + $form_id = $form['id']; |
|
1312 | 1312 | |
1313 | - $value = NULL; |
|
1313 | + $value = NULL; |
|
1314 | 1314 | |
1315 | - // Use the previous entry value as the default. |
|
1316 | - if( isset( $entry[ $field->id ] ) ) { |
|
1317 | - $value = $entry[ $field->id ]; |
|
1318 | - } |
|
1315 | + // Use the previous entry value as the default. |
|
1316 | + if( isset( $entry[ $field->id ] ) ) { |
|
1317 | + $value = $entry[ $field->id ]; |
|
1318 | + } |
|
1319 | 1319 | |
1320 | - // If this is a single upload file |
|
1321 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1322 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1323 | - $value = $file_path['url']; |
|
1320 | + // If this is a single upload file |
|
1321 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1322 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1323 | + $value = $file_path['url']; |
|
1324 | 1324 | |
1325 | - } else { |
|
1325 | + } else { |
|
1326 | 1326 | |
1327 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1328 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1329 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1327 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1328 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1329 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1330 | 1330 | |
1331 | - } |
|
1331 | + } |
|
1332 | 1332 | |
1333 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1333 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1334 | 1334 | |
1335 | - // If there are fresh uploads, process and merge them. |
|
1336 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1337 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1338 | - $value = empty( $value ) ? '[]' : $value; |
|
1339 | - $value = stripslashes_deep( $value ); |
|
1340 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1341 | - } |
|
1335 | + // If there are fresh uploads, process and merge them. |
|
1336 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1337 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1338 | + $value = empty( $value ) ? '[]' : $value; |
|
1339 | + $value = stripslashes_deep( $value ); |
|
1340 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1341 | + } |
|
1342 | 1342 | |
1343 | - } else { |
|
1343 | + } else { |
|
1344 | 1344 | |
1345 | - // A file already exists when editing an entry |
|
1346 | - // We set this to solve issue when file upload fields are required. |
|
1347 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1345 | + // A file already exists when editing an entry |
|
1346 | + // We set this to solve issue when file upload fields are required. |
|
1347 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1348 | 1348 | |
1349 | - } |
|
1349 | + } |
|
1350 | 1350 | |
1351 | - $this->entry[ $input_name ] = $value; |
|
1352 | - $_POST[ $input_name ] = $value; |
|
1351 | + $this->entry[ $input_name ] = $value; |
|
1352 | + $_POST[ $input_name ] = $value; |
|
1353 | 1353 | |
1354 | - break; |
|
1354 | + break; |
|
1355 | 1355 | |
1356 | 1356 | case 'number': |
1357 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
1358 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1359 | - $_POST['input_'.$field->id ] = NULL; |
|
1360 | - } |
|
1361 | - break; |
|
1357 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
1358 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1359 | + $_POST['input_'.$field->id ] = NULL; |
|
1360 | + } |
|
1361 | + break; |
|
1362 | 1362 | } |
1363 | 1363 | |
1364 | 1364 | } |
@@ -1443,42 +1443,42 @@ discard block |
||
1443 | 1443 | case 'fileupload' : |
1444 | 1444 | case 'post_image': |
1445 | 1445 | |
1446 | - // in case nothing is uploaded but there are already files saved |
|
1447 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1448 | - $field->failed_validation = false; |
|
1449 | - unset( $field->validation_message ); |
|
1450 | - } |
|
1446 | + // in case nothing is uploaded but there are already files saved |
|
1447 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1448 | + $field->failed_validation = false; |
|
1449 | + unset( $field->validation_message ); |
|
1450 | + } |
|
1451 | 1451 | |
1452 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1453 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1452 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1453 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1454 | 1454 | |
1455 | - $input_name = 'input_' . $field->id; |
|
1456 | - //uploaded |
|
1457 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1455 | + $input_name = 'input_' . $field->id; |
|
1456 | + //uploaded |
|
1457 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1458 | 1458 | |
1459 | - //existent |
|
1460 | - $entry = $this->get_entry(); |
|
1461 | - $value = NULL; |
|
1462 | - if( isset( $entry[ $field->id ] ) ) { |
|
1463 | - $value = json_decode( $entry[ $field->id ], true ); |
|
1464 | - } |
|
1459 | + //existent |
|
1460 | + $entry = $this->get_entry(); |
|
1461 | + $value = NULL; |
|
1462 | + if( isset( $entry[ $field->id ] ) ) { |
|
1463 | + $value = json_decode( $entry[ $field->id ], true ); |
|
1464 | + } |
|
1465 | 1465 | |
1466 | - // count uploaded files and existent entry files |
|
1467 | - $count_files = count( $file_names ) + count( $value ); |
|
1466 | + // count uploaded files and existent entry files |
|
1467 | + $count_files = count( $file_names ) + count( $value ); |
|
1468 | 1468 | |
1469 | - if( $count_files > $field->maxFiles ) { |
|
1470 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1471 | - $field->failed_validation = 1; |
|
1472 | - $gv_valid = false; |
|
1469 | + if( $count_files > $field->maxFiles ) { |
|
1470 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1471 | + $field->failed_validation = 1; |
|
1472 | + $gv_valid = false; |
|
1473 | 1473 | |
1474 | - // in case of error make sure the newest upload files are removed from the upload input |
|
1475 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1476 | - } |
|
1474 | + // in case of error make sure the newest upload files are removed from the upload input |
|
1475 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1476 | + } |
|
1477 | 1477 | |
1478 | - } |
|
1478 | + } |
|
1479 | 1479 | |
1480 | 1480 | |
1481 | - break; |
|
1481 | + break; |
|
1482 | 1482 | |
1483 | 1483 | } |
1484 | 1484 | |
@@ -1489,47 +1489,47 @@ discard block |
||
1489 | 1489 | |
1490 | 1490 | switch ( $field_type ) { |
1491 | 1491 | |
1492 | - // Captchas don't need to be re-entered. |
|
1493 | - case 'captcha': |
|
1492 | + // Captchas don't need to be re-entered. |
|
1493 | + case 'captcha': |
|
1494 | 1494 | |
1495 | - // Post Image fields aren't editable, so we un-fail them. |
|
1496 | - case 'post_image': |
|
1497 | - $field->failed_validation = false; |
|
1498 | - unset( $field->validation_message ); |
|
1499 | - break; |
|
1495 | + // Post Image fields aren't editable, so we un-fail them. |
|
1496 | + case 'post_image': |
|
1497 | + $field->failed_validation = false; |
|
1498 | + unset( $field->validation_message ); |
|
1499 | + break; |
|
1500 | 1500 | |
1501 | 1501 | } |
1502 | 1502 | |
1503 | 1503 | // You can't continue inside a switch, so we do it after. |
1504 | 1504 | if( empty( $field->failed_validation ) ) { |
1505 | - continue; |
|
1505 | + continue; |
|
1506 | 1506 | } |
1507 | 1507 | |
1508 | 1508 | // checks if the No Duplicates option is not validating entry against itself, since |
1509 | 1509 | // we're editing a stored entry, it would also assume it's a duplicate. |
1510 | 1510 | if( !empty( $field->noDuplicates ) ) { |
1511 | 1511 | |
1512 | - $entry = $this->get_entry(); |
|
1512 | + $entry = $this->get_entry(); |
|
1513 | 1513 | |
1514 | - // If the value of the entry is the same as the stored value |
|
1515 | - // Then we can assume it's not a duplicate, it's the same. |
|
1516 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1517 | - //if value submitted was not changed, then don't validate |
|
1518 | - $field->failed_validation = false; |
|
1514 | + // If the value of the entry is the same as the stored value |
|
1515 | + // Then we can assume it's not a duplicate, it's the same. |
|
1516 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1517 | + //if value submitted was not changed, then don't validate |
|
1518 | + $field->failed_validation = false; |
|
1519 | 1519 | |
1520 | - unset( $field->validation_message ); |
|
1520 | + unset( $field->validation_message ); |
|
1521 | 1521 | |
1522 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1522 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1523 | 1523 | |
1524 | - continue; |
|
1525 | - } |
|
1524 | + continue; |
|
1525 | + } |
|
1526 | 1526 | } |
1527 | 1527 | |
1528 | 1528 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1529 | 1529 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
1530 | - unset( $field->validation_message ); |
|
1531 | - $field->validation_message = false; |
|
1532 | - continue; |
|
1530 | + unset( $field->validation_message ); |
|
1531 | + $field->validation_message = false; |
|
1532 | + continue; |
|
1533 | 1533 | } |
1534 | 1534 | |
1535 | 1535 | $gv_valid = false; |
@@ -1593,8 +1593,8 @@ discard block |
||
1593 | 1593 | // Hide fields depending on admin settings |
1594 | 1594 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
1595 | 1595 | |
1596 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1597 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1596 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1597 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1598 | 1598 | |
1599 | 1599 | /** |
1600 | 1600 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1654,11 +1654,11 @@ discard block |
||
1654 | 1654 | // The edit tab has been configured, so we loop through to configured settings |
1655 | 1655 | foreach ( $configured_fields as $configured_field ) { |
1656 | 1656 | |
1657 | - /** @var GF_Field $field */ |
|
1658 | - foreach ( $fields as $field ) { |
|
1657 | + /** @var GF_Field $field */ |
|
1658 | + foreach ( $fields as $field ) { |
|
1659 | 1659 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
1660 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1661 | - break; |
|
1660 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1661 | + break; |
|
1662 | 1662 | } |
1663 | 1663 | |
1664 | 1664 | } |
@@ -1714,28 +1714,28 @@ discard block |
||
1714 | 1714 | */ |
1715 | 1715 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
1716 | 1716 | |
1717 | - /** |
|
1717 | + /** |
|
1718 | 1718 | * @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 |
1719 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1720 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1721 | - * @since 1.9.1 |
|
1722 | - * @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. |
|
1723 | - * @param array $form GF Form array |
|
1724 | - * @param int $view_id View ID |
|
1725 | - */ |
|
1726 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1727 | - |
|
1728 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1719 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1720 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1721 | + * @since 1.9.1 |
|
1722 | + * @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. |
|
1723 | + * @param array $form GF Form array |
|
1724 | + * @param int $view_id View ID |
|
1725 | + */ |
|
1726 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1727 | + |
|
1728 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1729 | 1729 | foreach( $fields as $k => $field ) { |
1730 | 1730 | if( $field->adminOnly ) { |
1731 | - unset( $fields[ $k ] ); |
|
1731 | + unset( $fields[ $k ] ); |
|
1732 | 1732 | } |
1733 | 1733 | } |
1734 | 1734 | return $fields; |
1735 | 1735 | } |
1736 | 1736 | |
1737 | - foreach( $fields as &$field ) { |
|
1738 | - $field->adminOnly = false; |
|
1737 | + foreach( $fields as &$field ) { |
|
1738 | + $field->adminOnly = false; |
|
1739 | 1739 | } |
1740 | 1740 | |
1741 | 1741 | return $fields; |
@@ -1791,36 +1791,36 @@ discard block |
||
1791 | 1791 | |
1792 | 1792 | if( 'checkbox' === $field->type ) { |
1793 | 1793 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1794 | - $input_id = $input['id']; |
|
1795 | - $choice = $field->choices[ $key ]; |
|
1796 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1797 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1798 | - if( $match ) { |
|
1799 | - $field->choices[ $key ]['isSelected'] = true; |
|
1800 | - } |
|
1794 | + $input_id = $input['id']; |
|
1795 | + $choice = $field->choices[ $key ]; |
|
1796 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1797 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1798 | + if( $match ) { |
|
1799 | + $field->choices[ $key ]['isSelected'] = true; |
|
1800 | + } |
|
1801 | 1801 | } |
1802 | 1802 | } else { |
1803 | 1803 | |
1804 | 1804 | // We need to run through each field to set the default values |
1805 | 1805 | foreach ( $this->entry as $field_id => $field_value ) { |
1806 | 1806 | |
1807 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1807 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1808 | 1808 | |
1809 | - if( 'list' === $field->type ) { |
|
1810 | - $list_rows = maybe_unserialize( $field_value ); |
|
1809 | + if( 'list' === $field->type ) { |
|
1810 | + $list_rows = maybe_unserialize( $field_value ); |
|
1811 | 1811 | |
1812 | - $list_field_value = array(); |
|
1813 | - foreach ( (array) $list_rows as $row ) { |
|
1814 | - foreach ( (array) $row as $column ) { |
|
1815 | - $list_field_value[] = $column; |
|
1816 | - } |
|
1817 | - } |
|
1812 | + $list_field_value = array(); |
|
1813 | + foreach ( (array) $list_rows as $row ) { |
|
1814 | + foreach ( (array) $row as $column ) { |
|
1815 | + $list_field_value[] = $column; |
|
1816 | + } |
|
1817 | + } |
|
1818 | 1818 | |
1819 | - $field->defaultValue = serialize( $list_field_value ); |
|
1820 | - } else { |
|
1821 | - $field->defaultValue = $field_value; |
|
1822 | - } |
|
1823 | - } |
|
1819 | + $field->defaultValue = serialize( $list_field_value ); |
|
1820 | + } else { |
|
1821 | + $field->defaultValue = $field_value; |
|
1822 | + } |
|
1823 | + } |
|
1824 | 1824 | } |
1825 | 1825 | } |
1826 | 1826 | } |
@@ -1877,7 +1877,7 @@ discard block |
||
1877 | 1877 | return $has_conditional_logic; |
1878 | 1878 | } |
1879 | 1879 | |
1880 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
1880 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
1881 | 1881 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
1882 | 1882 | } |
1883 | 1883 | |
@@ -1944,14 +1944,14 @@ discard block |
||
1944 | 1944 | |
1945 | 1945 | if( $echo && $error !== true ) { |
1946 | 1946 | |
1947 | - $error = esc_html( $error ); |
|
1947 | + $error = esc_html( $error ); |
|
1948 | 1948 | |
1949 | - /** |
|
1950 | - * @since 1.9 |
|
1951 | - */ |
|
1952 | - if ( ! empty( $this->entry ) ) { |
|
1953 | - $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;" ) ); |
|
1954 | - } |
|
1949 | + /** |
|
1950 | + * @since 1.9 |
|
1951 | + */ |
|
1952 | + if ( ! empty( $this->entry ) ) { |
|
1953 | + $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;" ) ); |
|
1954 | + } |
|
1955 | 1955 | |
1956 | 1956 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
1957 | 1957 | } |
@@ -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(); |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | * @param GravityView_Edit_Entry_Render $this This object |
359 | 359 | * @param GravityView_View_Data $gv_data The View data |
360 | 360 | */ |
361 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
361 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
362 | 362 | |
363 | 363 | } else { |
364 | 364 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -386,16 +386,16 @@ discard block |
||
386 | 386 | */ |
387 | 387 | $unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
388 | 388 | |
389 | - if( ! $unset_hidden_field_values ) { |
|
389 | + if ( ! $unset_hidden_field_values ) { |
|
390 | 390 | return; |
391 | 391 | } |
392 | 392 | |
393 | 393 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
394 | 394 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
395 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
395 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
396 | 396 | } else { |
397 | 397 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
398 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
398 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
399 | 399 | } |
400 | 400 | |
401 | 401 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | } |
477 | 477 | |
478 | 478 | /** No file is being uploaded. */ |
479 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
479 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
480 | 480 | /** So return the original upload */ |
481 | 481 | return $entry[ $input_id ]; |
482 | 482 | } |
@@ -494,11 +494,11 @@ discard block |
||
494 | 494 | * @return mixed |
495 | 495 | */ |
496 | 496 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
497 | - if( ! $this->is_edit_entry() ) { |
|
497 | + if ( ! $this->is_edit_entry() ) { |
|
498 | 498 | return $plupload_init; |
499 | 499 | } |
500 | 500 | |
501 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
501 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
502 | 502 | |
503 | 503 | return $plupload_init; |
504 | 504 | } |
@@ -513,22 +513,22 @@ discard block |
||
513 | 513 | $form = $this->form; |
514 | 514 | |
515 | 515 | /** @var GF_Field $field */ |
516 | - foreach( $form['fields'] as $k => &$field ) { |
|
516 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
517 | 517 | |
518 | 518 | /** |
519 | 519 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
520 | 520 | * @since 1.16.3 |
521 | 521 | * @var GF_Field $field |
522 | 522 | */ |
523 | - if( $field->has_calculation() ) { |
|
524 | - unset( $form['fields'][ $k ] ); |
|
523 | + if ( $field->has_calculation() ) { |
|
524 | + unset( $form[ 'fields' ][ $k ] ); |
|
525 | 525 | } |
526 | 526 | |
527 | 527 | $field->adminOnly = false; |
528 | 528 | |
529 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
530 | - foreach( $field->inputs as $key => $input ) { |
|
531 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
529 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
530 | + foreach ( $field->inputs as $key => $input ) { |
|
531 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
532 | 532 | } |
533 | 533 | } |
534 | 534 | } |
@@ -542,30 +542,30 @@ discard block |
||
542 | 542 | $update = false; |
543 | 543 | |
544 | 544 | // get the most up to date entry values |
545 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
545 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
546 | 546 | |
547 | - if( !empty( $this->fields_with_calculation ) ) { |
|
547 | + if ( ! empty( $this->fields_with_calculation ) ) { |
|
548 | 548 | $update = true; |
549 | 549 | foreach ( $this->fields_with_calculation as $calc_field ) { |
550 | 550 | $inputs = $calc_field->get_entry_inputs(); |
551 | 551 | if ( is_array( $inputs ) ) { |
552 | 552 | foreach ( $inputs as $input ) { |
553 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
554 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
553 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
554 | + $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
555 | 555 | } |
556 | 556 | } else { |
557 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
558 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
557 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
558 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
559 | 559 | } |
560 | 560 | } |
561 | 561 | |
562 | 562 | } |
563 | 563 | |
564 | - if( $update ) { |
|
564 | + if ( $update ) { |
|
565 | 565 | |
566 | 566 | $return_entry = GFAPI::update_entry( $entry ); |
567 | 567 | |
568 | - if( is_wp_error( $return_entry ) ) { |
|
568 | + if ( is_wp_error( $return_entry ) ) { |
|
569 | 569 | gravityview()->log->error( 'Updating the entry calculation fields failed', array( 'data' => $return_entry ) ); |
570 | 570 | } else { |
571 | 571 | gravityview()->log->debug( 'Updating the entry calculation fields succeeded' ); |
@@ -596,19 +596,19 @@ discard block |
||
596 | 596 | |
597 | 597 | $input_name = 'input_' . $field_id; |
598 | 598 | |
599 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
599 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
600 | 600 | |
601 | 601 | // We have a new image |
602 | 602 | |
603 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
603 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
604 | 604 | |
605 | 605 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
606 | 606 | $ary = stripslashes_deep( $ary ); |
607 | 607 | $img_url = \GV\Utils::get( $ary, 0 ); |
608 | 608 | |
609 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
610 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
611 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
609 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
610 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
611 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
612 | 612 | |
613 | 613 | $image_meta = array( |
614 | 614 | 'post_excerpt' => $img_caption, |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | |
618 | 618 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
619 | 619 | if ( ! empty( $img_title ) ) { |
620 | - $image_meta['post_title'] = $img_title; |
|
620 | + $image_meta[ 'post_title' ] = $img_title; |
|
621 | 621 | } |
622 | 622 | |
623 | 623 | /** |
@@ -675,15 +675,15 @@ discard block |
||
675 | 675 | */ |
676 | 676 | private function maybe_update_post_fields( $form ) { |
677 | 677 | |
678 | - if( empty( $this->entry['post_id'] ) ) { |
|
678 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
679 | 679 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
680 | 680 | return; |
681 | 681 | } |
682 | 682 | |
683 | - $post_id = $this->entry['post_id']; |
|
683 | + $post_id = $this->entry[ 'post_id' ]; |
|
684 | 684 | |
685 | 685 | // Security check |
686 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
686 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
687 | 687 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
688 | 688 | return; |
689 | 689 | } |
@@ -696,25 +696,25 @@ discard block |
||
696 | 696 | |
697 | 697 | $field = RGFormsModel::get_field( $form, $field_id ); |
698 | 698 | |
699 | - if( ! $field ) { |
|
699 | + if ( ! $field ) { |
|
700 | 700 | continue; |
701 | 701 | } |
702 | 702 | |
703 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
703 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
704 | 704 | |
705 | 705 | // Get the value of the field, including $_POSTed value |
706 | 706 | $value = RGFormsModel::get_field_value( $field ); |
707 | 707 | |
708 | 708 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
709 | 709 | $entry_tmp = $this->entry; |
710 | - $entry_tmp["{$field_id}"] = $value; |
|
710 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
711 | 711 | |
712 | - switch( $field->type ) { |
|
712 | + switch ( $field->type ) { |
|
713 | 713 | |
714 | 714 | case 'post_title': |
715 | 715 | $post_title = $value; |
716 | 716 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
717 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
717 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
718 | 718 | } |
719 | 719 | $updated_post->post_title = $post_title; |
720 | 720 | $updated_post->post_name = $post_title; |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | case 'post_content': |
725 | 725 | $post_content = $value; |
726 | 726 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
727 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
727 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
728 | 728 | } |
729 | 729 | $updated_post->post_content = $post_content; |
730 | 730 | unset( $post_content ); |
@@ -742,7 +742,7 @@ discard block |
||
742 | 742 | $value = $value[ $field_id ]; |
743 | 743 | } |
744 | 744 | |
745 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
745 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
746 | 746 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
747 | 747 | } |
748 | 748 | |
@@ -760,7 +760,7 @@ discard block |
||
760 | 760 | } |
761 | 761 | |
762 | 762 | // update entry after |
763 | - $this->entry["{$field_id}"] = $value; |
|
763 | + $this->entry[ "{$field_id}" ] = $value; |
|
764 | 764 | |
765 | 765 | $update_entry = true; |
766 | 766 | |
@@ -769,11 +769,11 @@ discard block |
||
769 | 769 | |
770 | 770 | } |
771 | 771 | |
772 | - if( $update_entry ) { |
|
772 | + if ( $update_entry ) { |
|
773 | 773 | |
774 | 774 | $return_entry = GFAPI::update_entry( $this->entry ); |
775 | 775 | |
776 | - if( is_wp_error( $return_entry ) ) { |
|
776 | + if ( is_wp_error( $return_entry ) ) { |
|
777 | 777 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
778 | 778 | } else { |
779 | 779 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | |
784 | 784 | $return_post = wp_update_post( $updated_post, true ); |
785 | 785 | |
786 | - if( is_wp_error( $return_post ) ) { |
|
786 | + if ( is_wp_error( $return_post ) ) { |
|
787 | 787 | $return_post->add_data( $updated_post, '$updated_post' ); |
788 | 788 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
789 | 789 | } else { |
@@ -805,7 +805,7 @@ discard block |
||
805 | 805 | $input_type = RGFormsModel::get_input_type( $field ); |
806 | 806 | |
807 | 807 | // Only certain custom field types are supported |
808 | - switch( $input_type ) { |
|
808 | + switch ( $input_type ) { |
|
809 | 809 | case 'fileupload': |
810 | 810 | case 'list': |
811 | 811 | case 'multiselect': |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
843 | 843 | |
844 | 844 | // replace conditional shortcodes |
845 | - if( $do_shortcode ) { |
|
845 | + if ( $do_shortcode ) { |
|
846 | 846 | $output = do_shortcode( $output ); |
847 | 847 | } |
848 | 848 | |
@@ -861,19 +861,19 @@ discard block |
||
861 | 861 | */ |
862 | 862 | private function after_update() { |
863 | 863 | |
864 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
865 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
864 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
865 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
866 | 866 | |
867 | 867 | // Re-define the entry now that we've updated it. |
868 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
868 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
869 | 869 | |
870 | 870 | $entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
871 | 871 | |
872 | 872 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
873 | 873 | // We need to clear the cache because Gravity Forms caches the field values, which |
874 | 874 | // we have just updated. |
875 | - foreach ($this->form['fields'] as $key => $field) { |
|
876 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
875 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
876 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
877 | 877 | } |
878 | 878 | } |
879 | 879 | |
@@ -892,7 +892,7 @@ discard block |
||
892 | 892 | |
893 | 893 | <div class="gv-edit-entry-wrapper"><?php |
894 | 894 | |
895 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
895 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
896 | 896 | |
897 | 897 | /** |
898 | 898 | * Fixes weird wpautop() issue |
@@ -908,7 +908,7 @@ discard block |
||
908 | 908 | * @param string $edit_entry_title Modify the "Edit Entry" title |
909 | 909 | * @param GravityView_Edit_Entry_Render $this This object |
910 | 910 | */ |
911 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
911 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
912 | 912 | |
913 | 913 | echo esc_attr( $edit_entry_title ); |
914 | 914 | ?></span> |
@@ -958,16 +958,16 @@ discard block |
||
958 | 958 | |
959 | 959 | $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
960 | 960 | |
961 | - if( ! $this->is_valid ){ |
|
961 | + if ( ! $this->is_valid ) { |
|
962 | 962 | |
963 | 963 | // Keeping this compatible with Gravity Forms. |
964 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
965 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
964 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
965 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
966 | 966 | |
967 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
967 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
968 | 968 | |
969 | 969 | } else { |
970 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' ); |
|
970 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' ); |
|
971 | 971 | |
972 | 972 | /** |
973 | 973 | * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
@@ -977,7 +977,7 @@ discard block |
||
977 | 977 | * @param array $entry Gravity Forms entry array |
978 | 978 | * @param string $back_link URL to return to the original entry. @since 1.6 |
979 | 979 | */ |
980 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
980 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
981 | 981 | |
982 | 982 | echo GVCommon::generate_notice( $message ); |
983 | 983 | } |
@@ -1001,21 +1001,21 @@ discard block |
||
1001 | 1001 | */ |
1002 | 1002 | do_action( 'gravityview/edit-entry/render/before', $this ); |
1003 | 1003 | |
1004 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1005 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
1004 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
1005 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1006 | 1006 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
1007 | 1007 | |
1008 | 1008 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
1009 | 1009 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
1010 | 1010 | |
1011 | 1011 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
1012 | - unset( $_GET['page'] ); |
|
1012 | + unset( $_GET[ 'page' ] ); |
|
1013 | 1013 | |
1014 | 1014 | // TODO: Verify multiple-page forms |
1015 | 1015 | |
1016 | 1016 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
1017 | 1017 | |
1018 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
1018 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1019 | 1019 | |
1020 | 1020 | ob_get_clean(); |
1021 | 1021 | |
@@ -1041,7 +1041,7 @@ discard block |
||
1041 | 1041 | * @return string |
1042 | 1042 | */ |
1043 | 1043 | public function render_form_buttons() { |
1044 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
1044 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1045 | 1045 | } |
1046 | 1046 | |
1047 | 1047 | |
@@ -1061,10 +1061,10 @@ discard block |
||
1061 | 1061 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
1062 | 1062 | |
1063 | 1063 | // In case we have validated the form, use it to inject the validation results into the form render |
1064 | - if( isset( $this->form_after_validation ) ) { |
|
1064 | + if ( isset( $this->form_after_validation ) ) { |
|
1065 | 1065 | $form = $this->form_after_validation; |
1066 | 1066 | } else { |
1067 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1067 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1068 | 1068 | } |
1069 | 1069 | |
1070 | 1070 | $form = $this->filter_conditional_logic( $form ); |
@@ -1072,8 +1072,8 @@ discard block |
||
1072 | 1072 | $form = $this->prefill_conditional_logic( $form ); |
1073 | 1073 | |
1074 | 1074 | // for now we don't support Save and Continue feature. |
1075 | - if( ! self::$supports_save_and_continue ) { |
|
1076 | - unset( $form['save'] ); |
|
1075 | + if ( ! self::$supports_save_and_continue ) { |
|
1076 | + unset( $form[ 'save' ] ); |
|
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | $form = $this->unselect_default_values( $form ); |
@@ -1096,29 +1096,29 @@ discard block |
||
1096 | 1096 | */ |
1097 | 1097 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1098 | 1098 | |
1099 | - if( GFCommon::is_post_field( $field ) ) { |
|
1099 | + if ( GFCommon::is_post_field( $field ) ) { |
|
1100 | 1100 | |
1101 | 1101 | $message = null; |
1102 | 1102 | |
1103 | 1103 | // First, make sure they have the capability to edit the post. |
1104 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1104 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1105 | 1105 | |
1106 | 1106 | /** |
1107 | 1107 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1108 | 1108 | * @param string $message The existing "You don't have permission..." text |
1109 | 1109 | */ |
1110 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1110 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1111 | 1111 | |
1112 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1112 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1113 | 1113 | /** |
1114 | 1114 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1115 | 1115 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1116 | 1116 | */ |
1117 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1117 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1118 | 1118 | } |
1119 | 1119 | |
1120 | - if( $message ) { |
|
1121 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1120 | + if ( $message ) { |
|
1121 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1122 | 1122 | } |
1123 | 1123 | } |
1124 | 1124 | |
@@ -1143,8 +1143,8 @@ discard block |
||
1143 | 1143 | |
1144 | 1144 | // If the form has been submitted, then we don't need to pre-fill the values, |
1145 | 1145 | // Except for fileupload type and when a field input is overridden- run always!! |
1146 | - if( |
|
1147 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1146 | + if ( |
|
1147 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1148 | 1148 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1149 | 1149 | && ! GFCommon::is_product_field( $field->type ) |
1150 | 1150 | || ! empty( $field_content ) |
@@ -1164,7 +1164,7 @@ discard block |
||
1164 | 1164 | $return = null; |
1165 | 1165 | |
1166 | 1166 | /** @var GravityView_Field $gv_field */ |
1167 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1167 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1168 | 1168 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1169 | 1169 | } else { |
1170 | 1170 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1173,7 +1173,7 @@ discard block |
||
1173 | 1173 | // If there was output, it's an error |
1174 | 1174 | $warnings = ob_get_clean(); |
1175 | 1175 | |
1176 | - if( !empty( $warnings ) ) { |
|
1176 | + if ( ! empty( $warnings ) ) { |
|
1177 | 1177 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
1178 | 1178 | } |
1179 | 1179 | |
@@ -1198,7 +1198,7 @@ discard block |
||
1198 | 1198 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1199 | 1199 | |
1200 | 1200 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1201 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1201 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1202 | 1202 | |
1203 | 1203 | $field_value = array(); |
1204 | 1204 | |
@@ -1207,10 +1207,10 @@ discard block |
||
1207 | 1207 | |
1208 | 1208 | foreach ( (array)$field->inputs as $input ) { |
1209 | 1209 | |
1210 | - $input_id = strval( $input['id'] ); |
|
1210 | + $input_id = strval( $input[ 'id' ] ); |
|
1211 | 1211 | |
1212 | 1212 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1213 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1213 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1214 | 1214 | $allow_pre_populated = false; |
1215 | 1215 | } |
1216 | 1216 | |
@@ -1218,7 +1218,7 @@ discard block |
||
1218 | 1218 | |
1219 | 1219 | $pre_value = $field->get_value_submission( array(), false ); |
1220 | 1220 | |
1221 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1221 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1222 | 1222 | |
1223 | 1223 | } else { |
1224 | 1224 | |
@@ -1229,13 +1229,13 @@ discard block |
||
1229 | 1229 | |
1230 | 1230 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1231 | 1231 | // or pre-populated value if not empty and set to override saved value |
1232 | - $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; |
|
1232 | + $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; |
|
1233 | 1233 | |
1234 | 1234 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1235 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1235 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1236 | 1236 | $categories = array(); |
1237 | 1237 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1238 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1238 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1239 | 1239 | } |
1240 | 1240 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1241 | 1241 | } |
@@ -1263,7 +1263,7 @@ discard block |
||
1263 | 1263 | * @param GF_Field $field Gravity Forms field object |
1264 | 1264 | * @param GravityView_Edit_Entry_Render $this Current object |
1265 | 1265 | */ |
1266 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1266 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1267 | 1267 | |
1268 | 1268 | return $field_value; |
1269 | 1269 | } |
@@ -1280,12 +1280,12 @@ discard block |
||
1280 | 1280 | */ |
1281 | 1281 | public function gform_pre_validation( $form ) { |
1282 | 1282 | |
1283 | - if( ! $this->verify_nonce() ) { |
|
1283 | + if ( ! $this->verify_nonce() ) { |
|
1284 | 1284 | return $form; |
1285 | 1285 | } |
1286 | 1286 | |
1287 | 1287 | // Fix PHP warning regarding undefined index. |
1288 | - foreach ( $form['fields'] as &$field) { |
|
1288 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1289 | 1289 | |
1290 | 1290 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1291 | 1291 | // expects certain field array items to be set. |
@@ -1293,7 +1293,7 @@ discard block |
||
1293 | 1293 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1294 | 1294 | } |
1295 | 1295 | |
1296 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1296 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1297 | 1297 | |
1298 | 1298 | /** |
1299 | 1299 | * 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. |
@@ -1307,26 +1307,26 @@ discard block |
||
1307 | 1307 | // Set the previous value |
1308 | 1308 | $entry = $this->get_entry(); |
1309 | 1309 | |
1310 | - $input_name = 'input_'.$field->id; |
|
1311 | - $form_id = $form['id']; |
|
1310 | + $input_name = 'input_' . $field->id; |
|
1311 | + $form_id = $form[ 'id' ]; |
|
1312 | 1312 | |
1313 | 1313 | $value = NULL; |
1314 | 1314 | |
1315 | 1315 | // Use the previous entry value as the default. |
1316 | - if( isset( $entry[ $field->id ] ) ) { |
|
1316 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1317 | 1317 | $value = $entry[ $field->id ]; |
1318 | 1318 | } |
1319 | 1319 | |
1320 | 1320 | // If this is a single upload file |
1321 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1322 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1323 | - $value = $file_path['url']; |
|
1321 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1322 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1323 | + $value = $file_path[ 'url' ]; |
|
1324 | 1324 | |
1325 | 1325 | } else { |
1326 | 1326 | |
1327 | 1327 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1328 | 1328 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1329 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1329 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1330 | 1330 | |
1331 | 1331 | } |
1332 | 1332 | |
@@ -1334,10 +1334,10 @@ discard block |
||
1334 | 1334 | |
1335 | 1335 | // If there are fresh uploads, process and merge them. |
1336 | 1336 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1337 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1337 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1338 | 1338 | $value = empty( $value ) ? '[]' : $value; |
1339 | 1339 | $value = stripslashes_deep( $value ); |
1340 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1340 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1341 | 1341 | } |
1342 | 1342 | |
1343 | 1343 | } else { |
@@ -1355,8 +1355,8 @@ discard block |
||
1355 | 1355 | |
1356 | 1356 | case 'number': |
1357 | 1357 | // Fix "undefined index" issue at line 1286 in form_display.php |
1358 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1359 | - $_POST['input_'.$field->id ] = NULL; |
|
1358 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1359 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1360 | 1360 | } |
1361 | 1361 | break; |
1362 | 1362 | } |
@@ -1393,7 +1393,7 @@ discard block |
||
1393 | 1393 | * You can enter whatever you want! |
1394 | 1394 | * We try validating, and customize the results using `self::custom_validation()` |
1395 | 1395 | */ |
1396 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1396 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1397 | 1397 | |
1398 | 1398 | // Needed by the validate funtion |
1399 | 1399 | $failed_validation_page = NULL; |
@@ -1401,14 +1401,14 @@ discard block |
||
1401 | 1401 | |
1402 | 1402 | // Prevent entry limit from running when editing an entry, also |
1403 | 1403 | // prevent form scheduling from preventing editing |
1404 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1404 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1405 | 1405 | |
1406 | 1406 | // Hide fields depending on Edit Entry settings |
1407 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1407 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1408 | 1408 | |
1409 | 1409 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1410 | 1410 | |
1411 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1411 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1412 | 1412 | } |
1413 | 1413 | |
1414 | 1414 | |
@@ -1431,7 +1431,7 @@ discard block |
||
1431 | 1431 | |
1432 | 1432 | $gv_valid = true; |
1433 | 1433 | |
1434 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1434 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1435 | 1435 | |
1436 | 1436 | $value = RGFormsModel::get_field_value( $field ); |
1437 | 1437 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1444,35 +1444,35 @@ discard block |
||
1444 | 1444 | case 'post_image': |
1445 | 1445 | |
1446 | 1446 | // in case nothing is uploaded but there are already files saved |
1447 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1447 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1448 | 1448 | $field->failed_validation = false; |
1449 | 1449 | unset( $field->validation_message ); |
1450 | 1450 | } |
1451 | 1451 | |
1452 | 1452 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
1453 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1453 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1454 | 1454 | |
1455 | 1455 | $input_name = 'input_' . $field->id; |
1456 | 1456 | //uploaded |
1457 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1457 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1458 | 1458 | |
1459 | 1459 | //existent |
1460 | 1460 | $entry = $this->get_entry(); |
1461 | 1461 | $value = NULL; |
1462 | - if( isset( $entry[ $field->id ] ) ) { |
|
1462 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1463 | 1463 | $value = json_decode( $entry[ $field->id ], true ); |
1464 | 1464 | } |
1465 | 1465 | |
1466 | 1466 | // count uploaded files and existent entry files |
1467 | 1467 | $count_files = count( $file_names ) + count( $value ); |
1468 | 1468 | |
1469 | - if( $count_files > $field->maxFiles ) { |
|
1469 | + if ( $count_files > $field->maxFiles ) { |
|
1470 | 1470 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
1471 | 1471 | $field->failed_validation = 1; |
1472 | 1472 | $gv_valid = false; |
1473 | 1473 | |
1474 | 1474 | // in case of error make sure the newest upload files are removed from the upload input |
1475 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1475 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1476 | 1476 | } |
1477 | 1477 | |
1478 | 1478 | } |
@@ -1483,7 +1483,7 @@ discard block |
||
1483 | 1483 | } |
1484 | 1484 | |
1485 | 1485 | // This field has failed validation. |
1486 | - if( !empty( $field->failed_validation ) ) { |
|
1486 | + if ( ! empty( $field->failed_validation ) ) { |
|
1487 | 1487 | |
1488 | 1488 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
1489 | 1489 | |
@@ -1501,19 +1501,19 @@ discard block |
||
1501 | 1501 | } |
1502 | 1502 | |
1503 | 1503 | // You can't continue inside a switch, so we do it after. |
1504 | - if( empty( $field->failed_validation ) ) { |
|
1504 | + if ( empty( $field->failed_validation ) ) { |
|
1505 | 1505 | continue; |
1506 | 1506 | } |
1507 | 1507 | |
1508 | 1508 | // checks if the No Duplicates option is not validating entry against itself, since |
1509 | 1509 | // we're editing a stored entry, it would also assume it's a duplicate. |
1510 | - if( !empty( $field->noDuplicates ) ) { |
|
1510 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1511 | 1511 | |
1512 | 1512 | $entry = $this->get_entry(); |
1513 | 1513 | |
1514 | 1514 | // If the value of the entry is the same as the stored value |
1515 | 1515 | // Then we can assume it's not a duplicate, it's the same. |
1516 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1516 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1517 | 1517 | //if value submitted was not changed, then don't validate |
1518 | 1518 | $field->failed_validation = false; |
1519 | 1519 | |
@@ -1526,7 +1526,7 @@ discard block |
||
1526 | 1526 | } |
1527 | 1527 | |
1528 | 1528 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1529 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1529 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1530 | 1530 | unset( $field->validation_message ); |
1531 | 1531 | $field->validation_message = false; |
1532 | 1532 | continue; |
@@ -1538,12 +1538,12 @@ discard block |
||
1538 | 1538 | |
1539 | 1539 | } |
1540 | 1540 | |
1541 | - $validation_results['is_valid'] = $gv_valid; |
|
1541 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1542 | 1542 | |
1543 | 1543 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
1544 | 1544 | |
1545 | 1545 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1546 | - $this->form_after_validation = $validation_results['form']; |
|
1546 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1547 | 1547 | |
1548 | 1548 | return $validation_results; |
1549 | 1549 | } |
@@ -1556,7 +1556,7 @@ discard block |
||
1556 | 1556 | */ |
1557 | 1557 | public function get_entry() { |
1558 | 1558 | |
1559 | - if( empty( $this->entry ) ) { |
|
1559 | + if ( empty( $this->entry ) ) { |
|
1560 | 1560 | // Get the database value of the entry that's being edited |
1561 | 1561 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1562 | 1562 | } |
@@ -1588,10 +1588,10 @@ discard block |
||
1588 | 1588 | } |
1589 | 1589 | |
1590 | 1590 | // If edit tab not yet configured, show all fields |
1591 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1591 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1592 | 1592 | |
1593 | 1593 | // Hide fields depending on admin settings |
1594 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1594 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1595 | 1595 | |
1596 | 1596 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1597 | 1597 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1623,7 +1623,7 @@ discard block |
||
1623 | 1623 | */ |
1624 | 1624 | private function filter_fields( $fields, $configured_fields ) { |
1625 | 1625 | |
1626 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1626 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1627 | 1627 | return $fields; |
1628 | 1628 | } |
1629 | 1629 | |
@@ -1636,18 +1636,18 @@ discard block |
||
1636 | 1636 | |
1637 | 1637 | // Remove the fields that have calculation properties and keep them to be used later |
1638 | 1638 | // @since 1.16.2 |
1639 | - if( $field->has_calculation() ) { |
|
1640 | - $this->fields_with_calculation[] = $field; |
|
1639 | + if ( $field->has_calculation() ) { |
|
1640 | + $this->fields_with_calculation[ ] = $field; |
|
1641 | 1641 | // don't remove the calculation fields on form render. |
1642 | 1642 | } |
1643 | 1643 | |
1644 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1644 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1645 | 1645 | unset( $fields[ $key ] ); |
1646 | 1646 | } |
1647 | 1647 | } |
1648 | 1648 | |
1649 | 1649 | // The Edit tab has not been configured, so we return all fields by default. |
1650 | - if( empty( $configured_fields ) ) { |
|
1650 | + if ( empty( $configured_fields ) ) { |
|
1651 | 1651 | return $fields; |
1652 | 1652 | } |
1653 | 1653 | |
@@ -1656,8 +1656,8 @@ discard block |
||
1656 | 1656 | |
1657 | 1657 | /** @var GF_Field $field */ |
1658 | 1658 | foreach ( $fields as $field ) { |
1659 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1660 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1659 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1660 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1661 | 1661 | break; |
1662 | 1662 | } |
1663 | 1663 | |
@@ -1680,14 +1680,14 @@ discard block |
||
1680 | 1680 | |
1681 | 1681 | $return_field = $field; |
1682 | 1682 | |
1683 | - if( empty( $field_setting['show_label'] ) ) { |
|
1683 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1684 | 1684 | $return_field->label = ''; |
1685 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1686 | - $return_field->label = $field_setting['custom_label']; |
|
1685 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
1686 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
1687 | 1687 | } |
1688 | 1688 | |
1689 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
1690 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
1689 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
1690 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1691 | 1691 | } |
1692 | 1692 | |
1693 | 1693 | /** |
@@ -1725,16 +1725,16 @@ discard block |
||
1725 | 1725 | */ |
1726 | 1726 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
1727 | 1727 | |
1728 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1729 | - foreach( $fields as $k => $field ) { |
|
1730 | - if( $field->adminOnly ) { |
|
1728 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
1729 | + foreach ( $fields as $k => $field ) { |
|
1730 | + if ( $field->adminOnly ) { |
|
1731 | 1731 | unset( $fields[ $k ] ); |
1732 | 1732 | } |
1733 | 1733 | } |
1734 | 1734 | return $fields; |
1735 | 1735 | } |
1736 | 1736 | |
1737 | - foreach( $fields as &$field ) { |
|
1737 | + foreach ( $fields as &$field ) { |
|
1738 | 1738 | $field->adminOnly = false; |
1739 | 1739 | } |
1740 | 1740 | |
@@ -1754,10 +1754,10 @@ discard block |
||
1754 | 1754 | * @return array $form, modified to default checkboxes, radios from showing up. |
1755 | 1755 | */ |
1756 | 1756 | function unselect_default_values( $form ) { |
1757 | - foreach ( $form['fields'] as &$field ) { |
|
1757 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1758 | 1758 | if ( $field->choices ) foreach ( $field->choices as &$choice ) { |
1759 | 1759 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
1760 | - $choice['isSelected'] = false; |
|
1760 | + $choice[ 'isSelected' ] = false; |
|
1761 | 1761 | } |
1762 | 1762 | } |
1763 | 1763 | } |
@@ -1781,22 +1781,22 @@ discard block |
||
1781 | 1781 | */ |
1782 | 1782 | function prefill_conditional_logic( $form ) { |
1783 | 1783 | |
1784 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1784 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1785 | 1785 | return $form; |
1786 | 1786 | } |
1787 | 1787 | |
1788 | 1788 | // Have Conditional Logic pre-fill fields as if the data were default values |
1789 | 1789 | /** @var GF_Field $field */ |
1790 | - foreach ( $form['fields'] as &$field ) { |
|
1790 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1791 | 1791 | |
1792 | - if( 'checkbox' === $field->type ) { |
|
1792 | + if ( 'checkbox' === $field->type ) { |
|
1793 | 1793 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1794 | - $input_id = $input['id']; |
|
1794 | + $input_id = $input[ 'id' ]; |
|
1795 | 1795 | $choice = $field->choices[ $key ]; |
1796 | 1796 | $value = \GV\Utils::get( $this->entry, $input_id ); |
1797 | 1797 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
1798 | - if( $match ) { |
|
1799 | - $field->choices[ $key ]['isSelected'] = true; |
|
1798 | + if ( $match ) { |
|
1799 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
1800 | 1800 | } |
1801 | 1801 | } |
1802 | 1802 | } else { |
@@ -1804,15 +1804,15 @@ discard block |
||
1804 | 1804 | // We need to run through each field to set the default values |
1805 | 1805 | foreach ( $this->entry as $field_id => $field_value ) { |
1806 | 1806 | |
1807 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1807 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1808 | 1808 | |
1809 | - if( 'list' === $field->type ) { |
|
1809 | + if ( 'list' === $field->type ) { |
|
1810 | 1810 | $list_rows = maybe_unserialize( $field_value ); |
1811 | 1811 | |
1812 | 1812 | $list_field_value = array(); |
1813 | - foreach ( (array) $list_rows as $row ) { |
|
1814 | - foreach ( (array) $row as $column ) { |
|
1815 | - $list_field_value[] = $column; |
|
1813 | + foreach ( (array)$list_rows as $row ) { |
|
1814 | + foreach ( (array)$row as $column ) { |
|
1815 | + $list_field_value[ ] = $column; |
|
1816 | 1816 | } |
1817 | 1817 | } |
1818 | 1818 | |
@@ -1847,16 +1847,16 @@ discard block |
||
1847 | 1847 | */ |
1848 | 1848 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
1849 | 1849 | |
1850 | - if( $use_conditional_logic ) { |
|
1850 | + if ( $use_conditional_logic ) { |
|
1851 | 1851 | return $form; |
1852 | 1852 | } |
1853 | 1853 | |
1854 | - foreach( $form['fields'] as &$field ) { |
|
1854 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1855 | 1855 | /* @var GF_Field $field */ |
1856 | 1856 | $field->conditionalLogic = null; |
1857 | 1857 | } |
1858 | 1858 | |
1859 | - unset( $form['button']['conditionalLogic'] ); |
|
1859 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
1860 | 1860 | |
1861 | 1861 | return $form; |
1862 | 1862 | |
@@ -1873,7 +1873,7 @@ discard block |
||
1873 | 1873 | */ |
1874 | 1874 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
1875 | 1875 | |
1876 | - if( ! $this->is_edit_entry() ) { |
|
1876 | + if ( ! $this->is_edit_entry() ) { |
|
1877 | 1877 | return $has_conditional_logic; |
1878 | 1878 | } |
1879 | 1879 | |
@@ -1905,44 +1905,44 @@ discard block |
||
1905 | 1905 | * 2. There are two entries embedded using oEmbed |
1906 | 1906 | * 3. One of the entries has just been saved |
1907 | 1907 | */ |
1908 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
1908 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
1909 | 1909 | |
1910 | 1910 | $error = true; |
1911 | 1911 | |
1912 | 1912 | } |
1913 | 1913 | |
1914 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
1914 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
1915 | 1915 | |
1916 | 1916 | $error = true; |
1917 | 1917 | |
1918 | - } elseif( ! $this->verify_nonce() ) { |
|
1918 | + } elseif ( ! $this->verify_nonce() ) { |
|
1919 | 1919 | |
1920 | 1920 | /** |
1921 | 1921 | * If the Entry is embedded, there may be two entries on the same page. |
1922 | 1922 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
1923 | 1923 | */ |
1924 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1924 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1925 | 1925 | $error = true; |
1926 | 1926 | } else { |
1927 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
1927 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
1928 | 1928 | } |
1929 | 1929 | |
1930 | 1930 | } |
1931 | 1931 | |
1932 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1933 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
1932 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1933 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
1934 | 1934 | } |
1935 | 1935 | |
1936 | - if( $this->entry['status'] === 'trash' ) { |
|
1937 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1936 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
1937 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1938 | 1938 | } |
1939 | 1939 | |
1940 | 1940 | // No errors; everything's fine here! |
1941 | - if( empty( $error ) ) { |
|
1941 | + if ( empty( $error ) ) { |
|
1942 | 1942 | return true; |
1943 | 1943 | } |
1944 | 1944 | |
1945 | - if( $echo && $error !== true ) { |
|
1945 | + if ( $echo && $error !== true ) { |
|
1946 | 1946 | |
1947 | 1947 | $error = esc_html( $error ); |
1948 | 1948 | |
@@ -1950,10 +1950,10 @@ discard block |
||
1950 | 1950 | * @since 1.9 |
1951 | 1951 | */ |
1952 | 1952 | if ( ! empty( $this->entry ) ) { |
1953 | - $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;" ) ); |
|
1953 | + $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;" ) ); |
|
1954 | 1954 | } |
1955 | 1955 | |
1956 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
1956 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
1957 | 1957 | } |
1958 | 1958 | |
1959 | 1959 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -1973,17 +1973,17 @@ discard block |
||
1973 | 1973 | |
1974 | 1974 | $error = NULL; |
1975 | 1975 | |
1976 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
1977 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
1976 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
1977 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
1978 | 1978 | } |
1979 | 1979 | |
1980 | 1980 | // No errors; everything's fine here! |
1981 | - if( empty( $error ) ) { |
|
1981 | + if ( empty( $error ) ) { |
|
1982 | 1982 | return true; |
1983 | 1983 | } |
1984 | 1984 | |
1985 | - if( $echo ) { |
|
1986 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
1985 | + if ( $echo ) { |
|
1986 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
1987 | 1987 | } |
1988 | 1988 | |
1989 | 1989 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2004,14 +2004,14 @@ discard block |
||
2004 | 2004 | private function check_user_cap_edit_field( $field ) { |
2005 | 2005 | |
2006 | 2006 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
2007 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2007 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2008 | 2008 | return true; |
2009 | 2009 | } |
2010 | 2010 | |
2011 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
2011 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2012 | 2012 | |
2013 | - if( $field_cap ) { |
|
2014 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
2013 | + if ( $field_cap ) { |
|
2014 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2015 | 2015 | } |
2016 | 2016 | |
2017 | 2017 | return false; |
@@ -2025,17 +2025,17 @@ discard block |
||
2025 | 2025 | public function verify_nonce() { |
2026 | 2026 | |
2027 | 2027 | // Verify form submitted for editing single |
2028 | - if( $this->is_edit_entry_submission() ) { |
|
2028 | + if ( $this->is_edit_entry_submission() ) { |
|
2029 | 2029 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
2030 | 2030 | } |
2031 | 2031 | |
2032 | 2032 | // Verify |
2033 | - else if( ! $this->is_edit_entry() ) { |
|
2033 | + else if ( ! $this->is_edit_entry() ) { |
|
2034 | 2034 | $valid = false; |
2035 | 2035 | } |
2036 | 2036 | |
2037 | 2037 | else { |
2038 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
2038 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2039 | 2039 | } |
2040 | 2040 | |
2041 | 2041 | /** |
@@ -958,7 +958,7 @@ discard block |
||
958 | 958 | |
959 | 959 | $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
960 | 960 | |
961 | - if( ! $this->is_valid ){ |
|
961 | + if( ! $this->is_valid ) { |
|
962 | 962 | |
963 | 963 | // Keeping this compatible with Gravity Forms. |
964 | 964 | $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
@@ -1755,9 +1755,11 @@ discard block |
||
1755 | 1755 | */ |
1756 | 1756 | function unselect_default_values( $form ) { |
1757 | 1757 | foreach ( $form['fields'] as &$field ) { |
1758 | - if ( $field->choices ) foreach ( $field->choices as &$choice ) { |
|
1758 | + if ( $field->choices ) { |
|
1759 | + foreach ( $field->choices as &$choice ) { |
|
1759 | 1760 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
1760 | 1761 | $choice['isSelected'] = false; |
1762 | + } |
|
1761 | 1763 | } |
1762 | 1764 | } |
1763 | 1765 | } |
@@ -2032,9 +2034,7 @@ discard block |
||
2032 | 2034 | // Verify |
2033 | 2035 | else if( ! $this->is_edit_entry() ) { |
2034 | 2036 | $valid = false; |
2035 | - } |
|
2036 | - |
|
2037 | - else { |
|
2037 | + } else { |
|
2038 | 2038 | $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
2039 | 2039 | } |
2040 | 2040 |