@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | |
103 | 103 | /** |
104 | 104 | * ID of the current post. May also be ID of the current View. |
105 | - * |
|
106 | - * @since 2.0.13 |
|
107 | 105 | * |
108 | - * @var int |
|
106 | + * @since 2.0.13 |
|
107 | + * |
|
108 | + * @var int |
|
109 | 109 | */ |
110 | 110 | public $post_id; |
111 | 111 | |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | */ |
190 | 190 | public function prevent_maybe_process_form() { |
191 | 191 | |
192 | - if( ! $this->is_edit_entry_submission() ) { |
|
192 | + if( ! $this->is_edit_entry_submission() ) { |
|
193 | 193 | return; |
194 | 194 | } |
195 | 195 | |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | * When Edit entry view is requested setup the vars |
229 | 229 | */ |
230 | 230 | private function setup_vars() { |
231 | - global $post; |
|
231 | + global $post; |
|
232 | 232 | |
233 | 233 | $gravityview_view = GravityView_View::getInstance(); |
234 | 234 | |
235 | 235 | |
236 | 236 | $entries = $gravityview_view->getEntries(); |
237 | - self::$original_entry = $entries[0]; |
|
238 | - $this->entry = $entries[0]; |
|
237 | + self::$original_entry = $entries[0]; |
|
238 | + $this->entry = $entries[0]; |
|
239 | 239 | |
240 | 240 | self::$original_form = GFAPI::get_form( $this->entry['form_id'] ); |
241 | 241 | $this->form = $gravityview_view->getForm(); |
@@ -377,8 +377,8 @@ discard block |
||
377 | 377 | |
378 | 378 | GFFormsModel::save_lead( $form, $this->entry ); |
379 | 379 | |
380 | - // Delete the values for hidden inputs |
|
381 | - $this->unset_hidden_field_values(); |
|
380 | + // Delete the values for hidden inputs |
|
381 | + $this->unset_hidden_field_values(); |
|
382 | 382 | |
383 | 383 | $this->entry['date_created'] = $date_created; |
384 | 384 | |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | // Perform actions normally performed after updating a lead |
392 | 392 | $this->after_update(); |
393 | 393 | |
394 | - /** |
|
394 | + /** |
|
395 | 395 | * Must be AFTER after_update()! |
396 | 396 | * @see https://github.com/gravityview/GravityView/issues/764 |
397 | 397 | */ |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | |
400 | 400 | /** |
401 | 401 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
402 | - * @since 2.1 Added $gv_data parameter |
|
402 | + * @since 2.1 Added $gv_data parameter |
|
403 | 403 | * @param array $form Gravity Forms form array |
404 | 404 | * @param string $entry_id Numeric ID of the entry that was updated |
405 | 405 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | * @return void |
424 | 424 | */ |
425 | 425 | private function unset_hidden_field_values() { |
426 | - global $wpdb; |
|
426 | + global $wpdb; |
|
427 | 427 | |
428 | 428 | /** |
429 | 429 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
448 | 448 | } |
449 | 449 | |
450 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
450 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
451 | 451 | |
452 | 452 | if ( ! is_numeric( $input_id ) ) { |
453 | 453 | continue; |
@@ -457,8 +457,8 @@ discard block |
||
457 | 457 | continue; |
458 | 458 | } |
459 | 459 | |
460 | - // Reset fields that are or would be hidden |
|
461 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) { |
|
460 | + // Reset fields that are or would be hidden |
|
461 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) { |
|
462 | 462 | |
463 | 463 | $empty_value = $field->get_value_save_entry( |
464 | 464 | is_array( $field->get_entry_inputs() ) ? array() : '', |
@@ -470,16 +470,16 @@ discard block |
||
470 | 470 | $empty_value = ''; |
471 | 471 | } |
472 | 472 | |
473 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
473 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
474 | 474 | |
475 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
475 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
476 | 476 | |
477 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
477 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
478 | 478 | // after submission |
479 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
480 | - $_POST[ $post_input_id ] = ''; |
|
481 | - } |
|
482 | - } |
|
479 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
480 | + $_POST[ $post_input_id ] = ''; |
|
481 | + } |
|
482 | + } |
|
483 | 483 | } |
484 | 484 | |
485 | 485 | /** |
@@ -634,7 +634,7 @@ discard block |
||
634 | 634 | |
635 | 635 | $form = $this->filter_conditional_logic( $this->form ); |
636 | 636 | |
637 | - /** @type GF_Field $field */ |
|
637 | + /** @type GF_Field $field */ |
|
638 | 638 | foreach( $form['fields'] as $k => &$field ) { |
639 | 639 | |
640 | 640 | /** |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | |
650 | 650 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
651 | 651 | foreach( $field->inputs as $key => $input ) { |
652 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
652 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
653 | 653 | } |
654 | 654 | } |
655 | 655 | } |
@@ -689,7 +689,7 @@ discard block |
||
689 | 689 | |
690 | 690 | $inputs = $field->get_entry_inputs(); |
691 | 691 | if ( is_array( $inputs ) ) { |
692 | - foreach ( $inputs as $input ) { |
|
692 | + foreach ( $inputs as $input ) { |
|
693 | 693 | list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
694 | 694 | |
695 | 695 | if ( 'product' === $field->type ) { |
@@ -708,7 +708,7 @@ discard block |
||
708 | 708 | } |
709 | 709 | |
710 | 710 | GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
711 | - } |
|
711 | + } |
|
712 | 712 | } else { |
713 | 713 | // Set to what it previously was if it's not editable |
714 | 714 | if ( ! in_array( $field->id, $allowed_fields ) ) { |
@@ -754,7 +754,7 @@ discard block |
||
754 | 754 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
755 | 755 | |
756 | 756 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
757 | - $ary = stripslashes_deep( $ary ); |
|
757 | + $ary = stripslashes_deep( $ary ); |
|
758 | 758 | $img_url = \GV\Utils::get( $ary, 0 ); |
759 | 759 | |
760 | 760 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | private function maybe_update_post_fields( $form ) { |
828 | 828 | |
829 | 829 | if( empty( $this->entry['post_id'] ) ) { |
830 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
830 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
831 | 831 | return; |
832 | 832 | } |
833 | 833 | |
@@ -862,49 +862,49 @@ discard block |
||
862 | 862 | |
863 | 863 | switch( $field->type ) { |
864 | 864 | |
865 | - case 'post_title': |
|
866 | - $post_title = $value; |
|
867 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
868 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
869 | - } |
|
870 | - $updated_post->post_title = $post_title; |
|
871 | - $updated_post->post_name = $post_title; |
|
872 | - unset( $post_title ); |
|
873 | - break; |
|
874 | - |
|
875 | - case 'post_content': |
|
876 | - $post_content = $value; |
|
877 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
878 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
879 | - } |
|
880 | - $updated_post->post_content = $post_content; |
|
881 | - unset( $post_content ); |
|
882 | - break; |
|
883 | - case 'post_excerpt': |
|
884 | - $updated_post->post_excerpt = $value; |
|
885 | - break; |
|
886 | - case 'post_tags': |
|
887 | - wp_set_post_tags( $post_id, $value, false ); |
|
888 | - break; |
|
889 | - case 'post_category': |
|
890 | - break; |
|
891 | - case 'post_custom_field': |
|
865 | + case 'post_title': |
|
866 | + $post_title = $value; |
|
867 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
868 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
869 | + } |
|
870 | + $updated_post->post_title = $post_title; |
|
871 | + $updated_post->post_name = $post_title; |
|
872 | + unset( $post_title ); |
|
873 | + break; |
|
874 | + |
|
875 | + case 'post_content': |
|
876 | + $post_content = $value; |
|
877 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
878 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
879 | + } |
|
880 | + $updated_post->post_content = $post_content; |
|
881 | + unset( $post_content ); |
|
882 | + break; |
|
883 | + case 'post_excerpt': |
|
884 | + $updated_post->post_excerpt = $value; |
|
885 | + break; |
|
886 | + case 'post_tags': |
|
887 | + wp_set_post_tags( $post_id, $value, false ); |
|
888 | + break; |
|
889 | + case 'post_category': |
|
890 | + break; |
|
891 | + case 'post_custom_field': |
|
892 | 892 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
893 | 893 | $value = $value[ $field_id ]; |
894 | 894 | } |
895 | 895 | |
896 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
897 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
898 | - } |
|
896 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
897 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
898 | + } |
|
899 | 899 | |
900 | 900 | $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
901 | 901 | |
902 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
903 | - break; |
|
902 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
903 | + break; |
|
904 | 904 | |
905 | - case 'post_image': |
|
906 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
907 | - break; |
|
905 | + case 'post_image': |
|
906 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
907 | + break; |
|
908 | 908 | |
909 | 909 | } |
910 | 910 | |
@@ -1074,14 +1074,14 @@ discard block |
||
1074 | 1074 | ?><h2 class="gv-edit-entry-title"> |
1075 | 1075 | <span><?php |
1076 | 1076 | |
1077 | - /** |
|
1078 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
1079 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
1080 | - * @param GravityView_Edit_Entry_Render $this This object |
|
1081 | - */ |
|
1082 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
1077 | + /** |
|
1078 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
1079 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
1080 | + * @param GravityView_Edit_Entry_Render $this This object |
|
1081 | + */ |
|
1082 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
1083 | 1083 | |
1084 | - echo esc_attr( $edit_entry_title ); |
|
1084 | + echo esc_attr( $edit_entry_title ); |
|
1085 | 1085 | ?></span> |
1086 | 1086 | </h2> |
1087 | 1087 | |
@@ -1136,13 +1136,13 @@ discard block |
||
1136 | 1136 | ); |
1137 | 1137 | |
1138 | 1138 | /** |
1139 | - * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
1140 | - * @since 1.16.3 |
|
1141 | - * @param array $labels Default button labels associative array |
|
1142 | - * @param array $form The Gravity Forms form |
|
1143 | - * @param array $entry The Gravity Forms entry |
|
1144 | - * @param int $view_id The current View ID |
|
1145 | - */ |
|
1139 | + * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
1140 | + * @since 1.16.3 |
|
1141 | + * @param array $labels Default button labels associative array |
|
1142 | + * @param array $form The Gravity Forms form |
|
1143 | + * @param array $entry The Gravity Forms entry |
|
1144 | + * @param int $view_id The current View ID |
|
1145 | + */ |
|
1146 | 1146 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1147 | 1147 | |
1148 | 1148 | $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
@@ -1179,26 +1179,26 @@ discard block |
||
1179 | 1179 | |
1180 | 1180 | switch ( $edit_redirect ) { |
1181 | 1181 | |
1182 | - case '0': |
|
1183 | - $redirect_url = $back_link; |
|
1184 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1185 | - break; |
|
1186 | - |
|
1187 | - case '1': |
|
1188 | - $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
1189 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
1190 | - break; |
|
1191 | - |
|
1192 | - case '2': |
|
1193 | - $redirect_url = $edit_redirect_url; |
|
1194 | - $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
1195 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
1196 | - break; |
|
1197 | - |
|
1198 | - case '': |
|
1199 | - default: |
|
1200 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1201 | - break; |
|
1182 | + case '0': |
|
1183 | + $redirect_url = $back_link; |
|
1184 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1185 | + break; |
|
1186 | + |
|
1187 | + case '1': |
|
1188 | + $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
1189 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
1190 | + break; |
|
1191 | + |
|
1192 | + case '2': |
|
1193 | + $redirect_url = $edit_redirect_url; |
|
1194 | + $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
1195 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
1196 | + break; |
|
1197 | + |
|
1198 | + case '': |
|
1199 | + default: |
|
1200 | + $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1201 | + break; |
|
1202 | 1202 | } |
1203 | 1203 | |
1204 | 1204 | if ( isset( $redirect_url ) ) { |
@@ -1264,13 +1264,13 @@ discard block |
||
1264 | 1264 | ); |
1265 | 1265 | |
1266 | 1266 | /** |
1267 | - * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
1268 | - * @since 1.16.3 |
|
1269 | - * @param array $labels Default button labels associative array |
|
1270 | - * @param array $form The Gravity Forms form |
|
1271 | - * @param array $entry The Gravity Forms entry |
|
1272 | - * @param int $view_id The current View ID |
|
1273 | - */ |
|
1267 | + * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels |
|
1268 | + * @since 1.16.3 |
|
1269 | + * @param array $labels Default button labels associative array |
|
1270 | + * @param array $form The Gravity Forms form |
|
1271 | + * @param array $entry The Gravity Forms entry |
|
1272 | + * @param int $view_id The current View ID |
|
1273 | + */ |
|
1274 | 1274 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1275 | 1275 | |
1276 | 1276 | GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
@@ -1316,7 +1316,7 @@ discard block |
||
1316 | 1316 | |
1317 | 1317 | ob_get_clean(); |
1318 | 1318 | |
1319 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1319 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1320 | 1320 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
1321 | 1321 | remove_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
1322 | 1322 | remove_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
@@ -1376,7 +1376,7 @@ discard block |
||
1376 | 1376 | |
1377 | 1377 | // for now we don't support Save and Continue feature. |
1378 | 1378 | if( ! self::$supports_save_and_continue ) { |
1379 | - unset( $form['save'] ); |
|
1379 | + unset( $form['save'] ); |
|
1380 | 1380 | } |
1381 | 1381 | |
1382 | 1382 | $form = $this->unselect_default_values( $form ); |
@@ -1403,30 +1403,30 @@ discard block |
||
1403 | 1403 | return $field_content; |
1404 | 1404 | } |
1405 | 1405 | |
1406 | - $message = null; |
|
1406 | + $message = null; |
|
1407 | 1407 | |
1408 | - // First, make sure they have the capability to edit the post. |
|
1409 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1408 | + // First, make sure they have the capability to edit the post. |
|
1409 | + if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1410 | 1410 | |
1411 | - /** |
|
1412 | - * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1413 | - * @param string $message The existing "You don't have permission..." text |
|
1414 | - */ |
|
1415 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1411 | + /** |
|
1412 | + * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1413 | + * @param string $message The existing "You don't have permission..." text |
|
1414 | + */ |
|
1415 | + $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1416 | 1416 | |
1417 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1418 | - /** |
|
1419 | - * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1420 | - * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1421 | - */ |
|
1422 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1423 | - } |
|
1417 | + } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1418 | + /** |
|
1419 | + * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1420 | + * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1421 | + */ |
|
1422 | + $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1423 | + } |
|
1424 | 1424 | |
1425 | - if( $message ) { |
|
1426 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1427 | - } |
|
1425 | + if( $message ) { |
|
1426 | + $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1427 | + } |
|
1428 | 1428 | |
1429 | - return $field_content; |
|
1429 | + return $field_content; |
|
1430 | 1430 | } |
1431 | 1431 | |
1432 | 1432 | /** |
@@ -1454,7 +1454,7 @@ discard block |
||
1454 | 1454 | || ! empty( $field_content ) |
1455 | 1455 | || in_array( $field->type, array( 'honeypot' ) ) |
1456 | 1456 | ) { |
1457 | - return $field_content; |
|
1457 | + return $field_content; |
|
1458 | 1458 | } |
1459 | 1459 | |
1460 | 1460 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1462,24 +1462,24 @@ discard block |
||
1462 | 1462 | |
1463 | 1463 | $field_value = $this->get_field_value( $field ); |
1464 | 1464 | |
1465 | - // Prevent any PHP warnings, like undefined index |
|
1466 | - ob_start(); |
|
1465 | + // Prevent any PHP warnings, like undefined index |
|
1466 | + ob_start(); |
|
1467 | 1467 | |
1468 | - $return = null; |
|
1468 | + $return = null; |
|
1469 | 1469 | |
1470 | 1470 | /** @var GravityView_Field $gv_field */ |
1471 | 1471 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
1472 | 1472 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1473 | 1473 | } else { |
1474 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1475 | - } |
|
1474 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1475 | + } |
|
1476 | 1476 | |
1477 | - // If there was output, it's an error |
|
1478 | - $warnings = ob_get_clean(); |
|
1477 | + // If there was output, it's an error |
|
1478 | + $warnings = ob_get_clean(); |
|
1479 | 1479 | |
1480 | - if( !empty( $warnings ) ) { |
|
1481 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1482 | - } |
|
1480 | + if( !empty( $warnings ) ) { |
|
1481 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1482 | + } |
|
1483 | 1483 | |
1484 | 1484 | return $return; |
1485 | 1485 | } |
@@ -1514,8 +1514,8 @@ discard block |
||
1514 | 1514 | $input_id = strval( $input['id'] ); |
1515 | 1515 | |
1516 | 1516 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1517 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1518 | - $allow_pre_populated = false; |
|
1517 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1518 | + $allow_pre_populated = false; |
|
1519 | 1519 | } |
1520 | 1520 | |
1521 | 1521 | } |
@@ -1539,7 +1539,7 @@ discard block |
||
1539 | 1539 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
1540 | 1540 | $categories = array(); |
1541 | 1541 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1542 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1542 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1543 | 1543 | } |
1544 | 1544 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1545 | 1545 | } |
@@ -1549,25 +1549,25 @@ discard block |
||
1549 | 1549 | // if value is empty get the default value if defined |
1550 | 1550 | $field_value = $field->get_value_default_if_empty( $field_value ); |
1551 | 1551 | |
1552 | - /** |
|
1553 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1554 | - * @since 1.11 |
|
1555 | - * @since 1.20 Added third param |
|
1556 | - * @param mixed $field_value field value used to populate the input |
|
1557 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1558 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1559 | - */ |
|
1560 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1561 | - |
|
1562 | - /** |
|
1563 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1564 | - * @since 1.17 |
|
1565 | - * @since 1.20 Added third param |
|
1566 | - * @param mixed $field_value field value used to populate the input |
|
1567 | - * @param GF_Field $field Gravity Forms field object |
|
1568 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1569 | - */ |
|
1570 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1552 | + /** |
|
1553 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1554 | + * @since 1.11 |
|
1555 | + * @since 1.20 Added third param |
|
1556 | + * @param mixed $field_value field value used to populate the input |
|
1557 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1558 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1559 | + */ |
|
1560 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1561 | + |
|
1562 | + /** |
|
1563 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1564 | + * @since 1.17 |
|
1565 | + * @since 1.20 Added third param |
|
1566 | + * @param mixed $field_value field value used to populate the input |
|
1567 | + * @param GF_Field $field Gravity Forms field object |
|
1568 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1569 | + */ |
|
1570 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1571 | 1571 | |
1572 | 1572 | return $field_value; |
1573 | 1573 | } |
@@ -1594,7 +1594,7 @@ discard block |
||
1594 | 1594 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1595 | 1595 | // expects certain field array items to be set. |
1596 | 1596 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
1597 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1597 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1598 | 1598 | } |
1599 | 1599 | |
1600 | 1600 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1608,61 +1608,61 @@ discard block |
||
1608 | 1608 | */ |
1609 | 1609 | case 'fileupload': |
1610 | 1610 | |
1611 | - // Set the previous value |
|
1612 | - $entry = $this->get_entry(); |
|
1611 | + // Set the previous value |
|
1612 | + $entry = $this->get_entry(); |
|
1613 | 1613 | |
1614 | - $input_name = 'input_'.$field->id; |
|
1615 | - $form_id = $form['id']; |
|
1614 | + $input_name = 'input_'.$field->id; |
|
1615 | + $form_id = $form['id']; |
|
1616 | 1616 | |
1617 | - $value = NULL; |
|
1617 | + $value = NULL; |
|
1618 | 1618 | |
1619 | - // Use the previous entry value as the default. |
|
1620 | - if( isset( $entry[ $field->id ] ) ) { |
|
1621 | - $value = $entry[ $field->id ]; |
|
1622 | - } |
|
1619 | + // Use the previous entry value as the default. |
|
1620 | + if( isset( $entry[ $field->id ] ) ) { |
|
1621 | + $value = $entry[ $field->id ]; |
|
1622 | + } |
|
1623 | 1623 | |
1624 | - // If this is a single upload file |
|
1625 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1626 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1627 | - $value = $file_path['url']; |
|
1624 | + // If this is a single upload file |
|
1625 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1626 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1627 | + $value = $file_path['url']; |
|
1628 | 1628 | |
1629 | - } else { |
|
1629 | + } else { |
|
1630 | 1630 | |
1631 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1632 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1633 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1631 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1632 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1633 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1634 | 1634 | |
1635 | - } |
|
1635 | + } |
|
1636 | 1636 | |
1637 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1637 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1638 | 1638 | |
1639 | - // If there are fresh uploads, process and merge them. |
|
1640 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1641 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1642 | - $value = empty( $value ) ? '[]' : $value; |
|
1643 | - $value = stripslashes_deep( $value ); |
|
1644 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1645 | - } |
|
1639 | + // If there are fresh uploads, process and merge them. |
|
1640 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1641 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1642 | + $value = empty( $value ) ? '[]' : $value; |
|
1643 | + $value = stripslashes_deep( $value ); |
|
1644 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1645 | + } |
|
1646 | 1646 | |
1647 | - } else { |
|
1647 | + } else { |
|
1648 | 1648 | |
1649 | - // A file already exists when editing an entry |
|
1650 | - // We set this to solve issue when file upload fields are required. |
|
1651 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1649 | + // A file already exists when editing an entry |
|
1650 | + // We set this to solve issue when file upload fields are required. |
|
1651 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1652 | 1652 | |
1653 | - } |
|
1653 | + } |
|
1654 | 1654 | |
1655 | - $this->entry[ $input_name ] = $value; |
|
1656 | - $_POST[ $input_name ] = $value; |
|
1655 | + $this->entry[ $input_name ] = $value; |
|
1656 | + $_POST[ $input_name ] = $value; |
|
1657 | 1657 | |
1658 | - break; |
|
1658 | + break; |
|
1659 | 1659 | |
1660 | 1660 | case 'number': |
1661 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
1662 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1663 | - $_POST['input_'.$field->id ] = NULL; |
|
1664 | - } |
|
1665 | - break; |
|
1661 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
1662 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1663 | + $_POST['input_'.$field->id ] = NULL; |
|
1664 | + } |
|
1665 | + break; |
|
1666 | 1666 | } |
1667 | 1667 | |
1668 | 1668 | } |
@@ -1783,7 +1783,7 @@ discard block |
||
1783 | 1783 | |
1784 | 1784 | // count uploaded files and existent entry files |
1785 | 1785 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
1786 | - ( is_array( $value ) ? count( $value ) : 0 ); |
|
1786 | + ( is_array( $value ) ? count( $value ) : 0 ); |
|
1787 | 1787 | |
1788 | 1788 | if ( $count_files > $field->maxFiles ) { |
1789 | 1789 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
@@ -1805,47 +1805,47 @@ discard block |
||
1805 | 1805 | |
1806 | 1806 | switch ( $field_type ) { |
1807 | 1807 | |
1808 | - // Captchas don't need to be re-entered. |
|
1809 | - case 'captcha': |
|
1808 | + // Captchas don't need to be re-entered. |
|
1809 | + case 'captcha': |
|
1810 | 1810 | |
1811 | - // Post Image fields aren't editable, so we un-fail them. |
|
1812 | - case 'post_image': |
|
1813 | - $field->failed_validation = false; |
|
1814 | - unset( $field->validation_message ); |
|
1815 | - break; |
|
1811 | + // Post Image fields aren't editable, so we un-fail them. |
|
1812 | + case 'post_image': |
|
1813 | + $field->failed_validation = false; |
|
1814 | + unset( $field->validation_message ); |
|
1815 | + break; |
|
1816 | 1816 | |
1817 | 1817 | } |
1818 | 1818 | |
1819 | 1819 | // You can't continue inside a switch, so we do it after. |
1820 | 1820 | if( empty( $field->failed_validation ) ) { |
1821 | - continue; |
|
1821 | + continue; |
|
1822 | 1822 | } |
1823 | 1823 | |
1824 | 1824 | // checks if the No Duplicates option is not validating entry against itself, since |
1825 | 1825 | // we're editing a stored entry, it would also assume it's a duplicate. |
1826 | 1826 | if( !empty( $field->noDuplicates ) ) { |
1827 | 1827 | |
1828 | - $entry = $this->get_entry(); |
|
1828 | + $entry = $this->get_entry(); |
|
1829 | 1829 | |
1830 | - // If the value of the entry is the same as the stored value |
|
1831 | - // Then we can assume it's not a duplicate, it's the same. |
|
1832 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1833 | - //if value submitted was not changed, then don't validate |
|
1834 | - $field->failed_validation = false; |
|
1830 | + // If the value of the entry is the same as the stored value |
|
1831 | + // Then we can assume it's not a duplicate, it's the same. |
|
1832 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1833 | + //if value submitted was not changed, then don't validate |
|
1834 | + $field->failed_validation = false; |
|
1835 | 1835 | |
1836 | - unset( $field->validation_message ); |
|
1836 | + unset( $field->validation_message ); |
|
1837 | 1837 | |
1838 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1838 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1839 | 1839 | |
1840 | - continue; |
|
1841 | - } |
|
1840 | + continue; |
|
1841 | + } |
|
1842 | 1842 | } |
1843 | 1843 | |
1844 | 1844 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1845 | 1845 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
1846 | - unset( $field->validation_message ); |
|
1846 | + unset( $field->validation_message ); |
|
1847 | 1847 | $field->failed_validation = false; |
1848 | - continue; |
|
1848 | + continue; |
|
1849 | 1849 | } |
1850 | 1850 | |
1851 | 1851 | $gv_valid = false; |
@@ -1909,8 +1909,8 @@ discard block |
||
1909 | 1909 | // Hide fields depending on admin settings |
1910 | 1910 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
1911 | 1911 | |
1912 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1913 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1912 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1913 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1914 | 1914 | |
1915 | 1915 | /** |
1916 | 1916 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -2001,11 +2001,11 @@ discard block |
||
2001 | 2001 | // The edit tab has been configured, so we loop through to configured settings |
2002 | 2002 | foreach ( $configured_fields as $configured_field ) { |
2003 | 2003 | |
2004 | - /** @var GF_Field $field */ |
|
2005 | - foreach ( $fields as $field ) { |
|
2004 | + /** @var GF_Field $field */ |
|
2005 | + foreach ( $fields as $field ) { |
|
2006 | 2006 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
2007 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
2008 | - break; |
|
2007 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
2008 | + break; |
|
2009 | 2009 | } |
2010 | 2010 | |
2011 | 2011 | } |
@@ -2061,28 +2061,28 @@ discard block |
||
2061 | 2061 | */ |
2062 | 2062 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
2063 | 2063 | |
2064 | - /** |
|
2064 | + /** |
|
2065 | 2065 | * @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 |
2066 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
2067 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
2068 | - * @since 1.9.1 |
|
2069 | - * @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. |
|
2070 | - * @param array $form GF Form array |
|
2071 | - * @param int $view_id View ID |
|
2072 | - */ |
|
2073 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
2074 | - |
|
2075 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
2066 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
2067 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
2068 | + * @since 1.9.1 |
|
2069 | + * @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. |
|
2070 | + * @param array $form GF Form array |
|
2071 | + * @param int $view_id View ID |
|
2072 | + */ |
|
2073 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
2074 | + |
|
2075 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
2076 | 2076 | foreach( $fields as $k => $field ) { |
2077 | 2077 | if( $field->adminOnly ) { |
2078 | - unset( $fields[ $k ] ); |
|
2078 | + unset( $fields[ $k ] ); |
|
2079 | 2079 | } |
2080 | 2080 | } |
2081 | 2081 | return array_values( $fields ); |
2082 | 2082 | } |
2083 | 2083 | |
2084 | - foreach( $fields as &$field ) { |
|
2085 | - $field->adminOnly = false; |
|
2084 | + foreach( $fields as &$field ) { |
|
2085 | + $field->adminOnly = false; |
|
2086 | 2086 | } |
2087 | 2087 | |
2088 | 2088 | return $fields; |
@@ -2102,13 +2102,13 @@ discard block |
||
2102 | 2102 | */ |
2103 | 2103 | private function unselect_default_values( $form ) { |
2104 | 2104 | |
2105 | - foreach ( $form['fields'] as &$field ) { |
|
2105 | + foreach ( $form['fields'] as &$field ) { |
|
2106 | 2106 | |
2107 | 2107 | if ( empty( $field->choices ) ) { |
2108 | - continue; |
|
2108 | + continue; |
|
2109 | 2109 | } |
2110 | 2110 | |
2111 | - foreach ( $field->choices as &$choice ) { |
|
2111 | + foreach ( $field->choices as &$choice ) { |
|
2112 | 2112 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
2113 | 2113 | $choice['isSelected'] = false; |
2114 | 2114 | } |
@@ -2145,36 +2145,36 @@ discard block |
||
2145 | 2145 | |
2146 | 2146 | if( 'checkbox' === $field->type ) { |
2147 | 2147 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
2148 | - $input_id = $input['id']; |
|
2149 | - $choice = $field->choices[ $key ]; |
|
2150 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
2151 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
2152 | - if( $match ) { |
|
2153 | - $field->choices[ $key ]['isSelected'] = true; |
|
2154 | - } |
|
2148 | + $input_id = $input['id']; |
|
2149 | + $choice = $field->choices[ $key ]; |
|
2150 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
2151 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
2152 | + if( $match ) { |
|
2153 | + $field->choices[ $key ]['isSelected'] = true; |
|
2154 | + } |
|
2155 | 2155 | } |
2156 | 2156 | } else { |
2157 | 2157 | |
2158 | 2158 | // We need to run through each field to set the default values |
2159 | 2159 | foreach ( $this->entry as $field_id => $field_value ) { |
2160 | 2160 | |
2161 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2161 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2162 | 2162 | |
2163 | - if( 'list' === $field->type ) { |
|
2164 | - $list_rows = maybe_unserialize( $field_value ); |
|
2163 | + if( 'list' === $field->type ) { |
|
2164 | + $list_rows = maybe_unserialize( $field_value ); |
|
2165 | 2165 | |
2166 | - $list_field_value = array(); |
|
2167 | - foreach ( (array) $list_rows as $row ) { |
|
2168 | - foreach ( (array) $row as $column ) { |
|
2169 | - $list_field_value[] = $column; |
|
2170 | - } |
|
2171 | - } |
|
2166 | + $list_field_value = array(); |
|
2167 | + foreach ( (array) $list_rows as $row ) { |
|
2168 | + foreach ( (array) $row as $column ) { |
|
2169 | + $list_field_value[] = $column; |
|
2170 | + } |
|
2171 | + } |
|
2172 | 2172 | |
2173 | - $field->defaultValue = serialize( $list_field_value ); |
|
2174 | - } else { |
|
2175 | - $field->defaultValue = $field_value; |
|
2176 | - } |
|
2177 | - } |
|
2173 | + $field->defaultValue = serialize( $list_field_value ); |
|
2174 | + } else { |
|
2175 | + $field->defaultValue = $field_value; |
|
2176 | + } |
|
2177 | + } |
|
2178 | 2178 | } |
2179 | 2179 | } |
2180 | 2180 | } |
@@ -2235,7 +2235,7 @@ discard block |
||
2235 | 2235 | foreach ( $form['fields'] as &$field ) { |
2236 | 2236 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
2237 | 2237 | |
2238 | - list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
2238 | + list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
2239 | 2239 | |
2240 | 2240 | if ( $field['id'] == $rule_field_id ) { |
2241 | 2241 | unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
@@ -2286,7 +2286,7 @@ discard block |
||
2286 | 2286 | return $has_conditional_logic; |
2287 | 2287 | } |
2288 | 2288 | |
2289 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
2289 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
2290 | 2290 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
2291 | 2291 | } |
2292 | 2292 | |
@@ -2353,14 +2353,14 @@ discard block |
||
2353 | 2353 | |
2354 | 2354 | if( $echo && $error !== true ) { |
2355 | 2355 | |
2356 | - $error = esc_html( $error ); |
|
2356 | + $error = esc_html( $error ); |
|
2357 | 2357 | |
2358 | - /** |
|
2359 | - * @since 1.9 |
|
2360 | - */ |
|
2361 | - if ( ! empty( $this->entry ) ) { |
|
2362 | - $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;" ) ); |
|
2363 | - } |
|
2358 | + /** |
|
2359 | + * @since 1.9 |
|
2360 | + */ |
|
2361 | + if ( ! empty( $this->entry ) ) { |
|
2362 | + $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;" ) ); |
|
2363 | + } |
|
2364 | 2364 | |
2365 | 2365 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
2366 | 2366 | } |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | function load() { |
136 | 136 | |
137 | 137 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
138 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
138 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
139 | 139 | |
140 | 140 | // Don't display an embedded form when editing an entry |
141 | 141 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | add_action( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
146 | 146 | add_action( 'admin_init', array( $this, 'prevent_maybe_process_form' ), 8 ); |
147 | 147 | |
148 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
148 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
149 | 149 | |
150 | 150 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
151 | 151 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
157 | 157 | |
158 | 158 | // Add fields expected by GFFormDisplay::validate() |
159 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
159 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
160 | 160 | |
161 | 161 | // Fix multiselect value for GF 2.2 |
162 | 162 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -173,8 +173,8 @@ discard block |
||
173 | 173 | * @return void |
174 | 174 | */ |
175 | 175 | public function prevent_render_form() { |
176 | - if( $this->is_edit_entry() ) { |
|
177 | - if( 'wp_head' === current_filter() ) { |
|
176 | + if ( $this->is_edit_entry() ) { |
|
177 | + if ( 'wp_head' === current_filter() ) { |
|
178 | 178 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
179 | 179 | } else { |
180 | 180 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -189,17 +189,17 @@ discard block |
||
189 | 189 | */ |
190 | 190 | public function prevent_maybe_process_form() { |
191 | 191 | |
192 | - if( ! $this->is_edit_entry_submission() ) { |
|
192 | + if ( ! $this->is_edit_entry_submission() ) { |
|
193 | 193 | return; |
194 | 194 | } |
195 | 195 | |
196 | 196 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
197 | 197 | |
198 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
199 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
198 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
199 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
200 | 200 | |
201 | - remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
202 | - remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
201 | + remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
202 | + remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | |
211 | 211 | $is_edit_entry = |
212 | 212 | ( GravityView_frontend::is_single_entry() || gravityview()->request->is_entry() ) |
213 | - && ( ! empty( $_GET['edit'] ) ); |
|
213 | + && ( ! empty( $_GET[ 'edit' ] ) ); |
|
214 | 214 | |
215 | 215 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
216 | 216 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | * @return boolean |
222 | 222 | */ |
223 | 223 | public function is_edit_entry_submission() { |
224 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
224 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -234,16 +234,16 @@ discard block |
||
234 | 234 | |
235 | 235 | |
236 | 236 | $entries = $gravityview_view->getEntries(); |
237 | - self::$original_entry = $entries[0]; |
|
238 | - $this->entry = $entries[0]; |
|
237 | + self::$original_entry = $entries[ 0 ]; |
|
238 | + $this->entry = $entries[ 0 ]; |
|
239 | 239 | |
240 | - self::$original_form = GFAPI::get_form( $this->entry['form_id'] ); |
|
240 | + self::$original_form = GFAPI::get_form( $this->entry[ 'form_id' ] ); |
|
241 | 241 | $this->form = $gravityview_view->getForm(); |
242 | - $this->form_id = $this->entry['form_id']; |
|
242 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
243 | 243 | $this->view_id = $gravityview_view->getViewId(); |
244 | 244 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
245 | 245 | |
246 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
246 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | |
@@ -302,9 +302,9 @@ discard block |
||
302 | 302 | private function print_scripts() { |
303 | 303 | $gravityview_view = GravityView_View::getInstance(); |
304 | 304 | |
305 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
305 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
306 | 306 | |
307 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
307 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
308 | 308 | |
309 | 309 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
310 | 310 | |
@@ -320,19 +320,19 @@ discard block |
||
320 | 320 | */ |
321 | 321 | private function process_save( $gv_data ) { |
322 | 322 | |
323 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
323 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
324 | 324 | return; |
325 | 325 | } |
326 | 326 | |
327 | 327 | // Make sure the entry, view, and form IDs are all correct |
328 | 328 | $valid = $this->verify_nonce(); |
329 | 329 | |
330 | - if ( !$valid ) { |
|
330 | + if ( ! $valid ) { |
|
331 | 331 | gravityview()->log->error( 'Nonce validation failed.' ); |
332 | 332 | return; |
333 | 333 | } |
334 | 334 | |
335 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
335 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
336 | 336 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
337 | 337 | return; |
338 | 338 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | |
344 | 344 | $this->validate(); |
345 | 345 | |
346 | - if( $this->is_valid ) { |
|
346 | + if ( $this->is_valid ) { |
|
347 | 347 | |
348 | 348 | gravityview()->log->debug( 'Submission is valid.' ); |
349 | 349 | |
@@ -355,15 +355,15 @@ discard block |
||
355 | 355 | /** |
356 | 356 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
357 | 357 | */ |
358 | - unset( $_GET['page'] ); |
|
358 | + unset( $_GET[ 'page' ] ); |
|
359 | 359 | |
360 | - $date_created = $this->entry['date_created']; |
|
360 | + $date_created = $this->entry[ 'date_created' ]; |
|
361 | 361 | |
362 | 362 | /** |
363 | 363 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
364 | 364 | * @since 1.17.2 |
365 | 365 | */ |
366 | - unset( $this->entry['date_created'] ); |
|
366 | + unset( $this->entry[ 'date_created' ] ); |
|
367 | 367 | |
368 | 368 | /** |
369 | 369 | * @action `gravityview/edit_entry/before_update` Perform an action before the entry has been updated using Edit Entry |
@@ -373,14 +373,14 @@ discard block |
||
373 | 373 | * @param GravityView_Edit_Entry_Render $this This object |
374 | 374 | * @param GravityView_View_Data $gv_data The View data |
375 | 375 | */ |
376 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
376 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
377 | 377 | |
378 | 378 | GFFormsModel::save_lead( $form, $this->entry ); |
379 | 379 | |
380 | 380 | // Delete the values for hidden inputs |
381 | 381 | $this->unset_hidden_field_values(); |
382 | 382 | |
383 | - $this->entry['date_created'] = $date_created; |
|
383 | + $this->entry[ 'date_created' ] = $date_created; |
|
384 | 384 | |
385 | 385 | // Process calculation fields |
386 | 386 | $this->update_calculation_fields(); |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | * @param GravityView_Edit_Entry_Render $this This object |
406 | 406 | * @param GravityView_View_Data $gv_data The View data |
407 | 407 | */ |
408 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
408 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
409 | 409 | |
410 | 410 | } else { |
411 | 411 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -441,10 +441,10 @@ discard block |
||
441 | 441 | |
442 | 442 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
443 | 443 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
444 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
444 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
445 | 445 | } else { |
446 | 446 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
447 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
447 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
448 | 448 | } |
449 | 449 | |
450 | 450 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -462,11 +462,11 @@ discard block |
||
462 | 462 | |
463 | 463 | $empty_value = $field->get_value_save_entry( |
464 | 464 | is_array( $field->get_entry_inputs() ) ? array() : '', |
465 | - $this->form, '', $this->entry['id'], $this->entry |
|
465 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
466 | 466 | ); |
467 | 467 | |
468 | 468 | if ( $field->has_calculation() ) { |
469 | - $this->unset_hidden_calculations[] = $field->id; // Unset |
|
469 | + $this->unset_hidden_calculations[ ] = $field->id; // Unset |
|
470 | 470 | $empty_value = ''; |
471 | 471 | } |
472 | 472 | |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | private function preset_approval_fields() { |
496 | 496 | $has_approved_field = false; |
497 | 497 | |
498 | - foreach ( self::$original_form['fields'] as $field ) { |
|
498 | + foreach ( self::$original_form[ 'fields' ] as $field ) { |
|
499 | 499 | if ( $field->gravityview_approved ) { |
500 | 500 | $has_approved_field = true; |
501 | 501 | break; |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | |
509 | 509 | $is_field_hidden = true; |
510 | 510 | |
511 | - foreach ( $this->form['fields'] as $field ) { |
|
511 | + foreach ( $this->form[ 'fields' ] as $field ) { |
|
512 | 512 | if ( $field->gravityview_approved ) { |
513 | 513 | $is_field_hidden = false; |
514 | 514 | break; |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | |
534 | 534 | remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 ); |
535 | 535 | |
536 | - if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) { |
|
536 | + if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) { |
|
537 | 537 | |
538 | 538 | $value = GravityView_Entry_Approval_Status::UNAPPROVED; |
539 | 539 | |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | } |
599 | 599 | |
600 | 600 | /** No file is being uploaded. */ |
601 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
601 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
602 | 602 | /** So return the original upload, with $value as backup (it can be empty during edit form rendering) */ |
603 | 603 | return rgar( $entry, $input_id, $value ); |
604 | 604 | } |
@@ -616,11 +616,11 @@ discard block |
||
616 | 616 | * @return mixed |
617 | 617 | */ |
618 | 618 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
619 | - if( ! $this->is_edit_entry() ) { |
|
619 | + if ( ! $this->is_edit_entry() ) { |
|
620 | 620 | return $plupload_init; |
621 | 621 | } |
622 | 622 | |
623 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
623 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
624 | 624 | |
625 | 625 | return $plupload_init; |
626 | 626 | } |
@@ -635,26 +635,26 @@ discard block |
||
635 | 635 | $form = $this->filter_conditional_logic( $this->form ); |
636 | 636 | |
637 | 637 | /** @type GF_Field $field */ |
638 | - foreach( $form['fields'] as $k => &$field ) { |
|
638 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
639 | 639 | |
640 | 640 | /** |
641 | 641 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
642 | 642 | * @since 1.16.3 |
643 | 643 | */ |
644 | - if( $field->has_calculation() ) { |
|
645 | - unset( $form['fields'][ $k ] ); |
|
644 | + if ( $field->has_calculation() ) { |
|
645 | + unset( $form[ 'fields' ][ $k ] ); |
|
646 | 646 | } |
647 | 647 | |
648 | 648 | $field->adminOnly = false; |
649 | 649 | |
650 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
651 | - foreach( $field->inputs as $key => $input ) { |
|
652 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
650 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
651 | + foreach ( $field->inputs as $key => $input ) { |
|
652 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
653 | 653 | } |
654 | 654 | } |
655 | 655 | } |
656 | 656 | |
657 | - $form['fields'] = array_values( $form['fields'] ); |
|
657 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
658 | 658 | |
659 | 659 | return $form; |
660 | 660 | } |
@@ -666,14 +666,14 @@ discard block |
||
666 | 666 | $update = false; |
667 | 667 | |
668 | 668 | // get the most up to date entry values |
669 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
669 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
670 | 670 | |
671 | 671 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
672 | 672 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
673 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
673 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
674 | 674 | } else { |
675 | 675 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
676 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
676 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
677 | 677 | } |
678 | 678 | |
679 | 679 | |
@@ -690,24 +690,24 @@ discard block |
||
690 | 690 | $inputs = $field->get_entry_inputs(); |
691 | 691 | if ( is_array( $inputs ) ) { |
692 | 692 | foreach ( $inputs as $input ) { |
693 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
693 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
694 | 694 | |
695 | 695 | if ( 'product' === $field->type ) { |
696 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
696 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
697 | 697 | |
698 | 698 | // Only allow quantity to be set if it's allowed to be edited |
699 | 699 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
700 | 700 | } else { // otherwise set to what it previously was |
701 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
701 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
702 | 702 | } |
703 | 703 | } else { |
704 | 704 | // Set to what it previously was if it's not editable |
705 | 705 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
706 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
706 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
707 | 707 | } |
708 | 708 | } |
709 | 709 | |
710 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
710 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
711 | 711 | } |
712 | 712 | } else { |
713 | 713 | // Set to what it previously was if it's not editable |
@@ -747,19 +747,19 @@ discard block |
||
747 | 747 | |
748 | 748 | $input_name = 'input_' . $field_id; |
749 | 749 | |
750 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
750 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
751 | 751 | |
752 | 752 | // We have a new image |
753 | 753 | |
754 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
754 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
755 | 755 | |
756 | 756 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
757 | 757 | $ary = stripslashes_deep( $ary ); |
758 | 758 | $img_url = \GV\Utils::get( $ary, 0 ); |
759 | 759 | |
760 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
761 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
762 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
760 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
761 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
762 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
763 | 763 | |
764 | 764 | $image_meta = array( |
765 | 765 | 'post_excerpt' => $img_caption, |
@@ -768,7 +768,7 @@ discard block |
||
768 | 768 | |
769 | 769 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
770 | 770 | if ( ! empty( $img_title ) ) { |
771 | - $image_meta['post_title'] = $img_title; |
|
771 | + $image_meta[ 'post_title' ] = $img_title; |
|
772 | 772 | } |
773 | 773 | |
774 | 774 | /** |
@@ -826,15 +826,15 @@ discard block |
||
826 | 826 | */ |
827 | 827 | private function maybe_update_post_fields( $form ) { |
828 | 828 | |
829 | - if( empty( $this->entry['post_id'] ) ) { |
|
829 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
830 | 830 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
831 | 831 | return; |
832 | 832 | } |
833 | 833 | |
834 | - $post_id = $this->entry['post_id']; |
|
834 | + $post_id = $this->entry[ 'post_id' ]; |
|
835 | 835 | |
836 | 836 | // Security check |
837 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
837 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
838 | 838 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
839 | 839 | return; |
840 | 840 | } |
@@ -847,25 +847,25 @@ discard block |
||
847 | 847 | |
848 | 848 | $field = RGFormsModel::get_field( $form, $field_id ); |
849 | 849 | |
850 | - if( ! $field ) { |
|
850 | + if ( ! $field ) { |
|
851 | 851 | continue; |
852 | 852 | } |
853 | 853 | |
854 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
854 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
855 | 855 | |
856 | 856 | // Get the value of the field, including $_POSTed value |
857 | 857 | $value = RGFormsModel::get_field_value( $field ); |
858 | 858 | |
859 | 859 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
860 | 860 | $entry_tmp = $this->entry; |
861 | - $entry_tmp["{$field_id}"] = $value; |
|
861 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
862 | 862 | |
863 | - switch( $field->type ) { |
|
863 | + switch ( $field->type ) { |
|
864 | 864 | |
865 | 865 | case 'post_title': |
866 | 866 | $post_title = $value; |
867 | 867 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
868 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
868 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
869 | 869 | } |
870 | 870 | $updated_post->post_title = $post_title; |
871 | 871 | $updated_post->post_name = $post_title; |
@@ -875,7 +875,7 @@ discard block |
||
875 | 875 | case 'post_content': |
876 | 876 | $post_content = $value; |
877 | 877 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
878 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
878 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
879 | 879 | } |
880 | 880 | $updated_post->post_content = $post_content; |
881 | 881 | unset( $post_content ); |
@@ -893,11 +893,11 @@ discard block |
||
893 | 893 | $value = $value[ $field_id ]; |
894 | 894 | } |
895 | 895 | |
896 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
896 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
897 | 897 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
898 | 898 | } |
899 | 899 | |
900 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
900 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
901 | 901 | |
902 | 902 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
903 | 903 | break; |
@@ -909,7 +909,7 @@ discard block |
||
909 | 909 | } |
910 | 910 | |
911 | 911 | // update entry after |
912 | - $this->entry["{$field_id}"] = $value; |
|
912 | + $this->entry[ "{$field_id}" ] = $value; |
|
913 | 913 | |
914 | 914 | $update_entry = true; |
915 | 915 | |
@@ -918,11 +918,11 @@ discard block |
||
918 | 918 | |
919 | 919 | } |
920 | 920 | |
921 | - if( $update_entry ) { |
|
921 | + if ( $update_entry ) { |
|
922 | 922 | |
923 | 923 | $return_entry = GFAPI::update_entry( $this->entry ); |
924 | 924 | |
925 | - if( is_wp_error( $return_entry ) ) { |
|
925 | + if ( is_wp_error( $return_entry ) ) { |
|
926 | 926 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
927 | 927 | } else { |
928 | 928 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -932,7 +932,7 @@ discard block |
||
932 | 932 | |
933 | 933 | $return_post = wp_update_post( $updated_post, true ); |
934 | 934 | |
935 | - if( is_wp_error( $return_post ) ) { |
|
935 | + if ( is_wp_error( $return_post ) ) { |
|
936 | 936 | $return_post->add_data( $updated_post, '$updated_post' ); |
937 | 937 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
938 | 938 | } else { |
@@ -966,7 +966,7 @@ discard block |
||
966 | 966 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
967 | 967 | |
968 | 968 | // replace conditional shortcodes |
969 | - if( $do_shortcode ) { |
|
969 | + if ( $do_shortcode ) { |
|
970 | 970 | $output = do_shortcode( $output ); |
971 | 971 | } |
972 | 972 | |
@@ -985,19 +985,19 @@ discard block |
||
985 | 985 | */ |
986 | 986 | private function after_update() { |
987 | 987 | |
988 | - do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry ); |
|
989 | - do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry ); |
|
988 | + do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
989 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
990 | 990 | |
991 | 991 | // Re-define the entry now that we've updated it. |
992 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
992 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
993 | 993 | |
994 | 994 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
995 | 995 | |
996 | 996 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
997 | 997 | // We need to clear the cache because Gravity Forms caches the field values, which |
998 | 998 | // we have just updated. |
999 | - foreach ($this->form['fields'] as $key => $field) { |
|
1000 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
999 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
1000 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
1001 | 1001 | } |
1002 | 1002 | } |
1003 | 1003 | |
@@ -1007,11 +1007,11 @@ discard block |
||
1007 | 1007 | * @since develop |
1008 | 1008 | */ |
1009 | 1009 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
1010 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
1010 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
1011 | 1011 | if ( ! is_wp_error( $feeds ) ) { |
1012 | 1012 | $registered_feeds = array(); |
1013 | 1013 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
1014 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
1014 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
1015 | 1015 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
1016 | 1016 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
1017 | 1017 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -1019,8 +1019,8 @@ discard block |
||
1019 | 1019 | } |
1020 | 1020 | } |
1021 | 1021 | foreach ( $feeds as $feed ) { |
1022 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
1023 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
1022 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
1023 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
1024 | 1024 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
1025 | 1025 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
1026 | 1026 | $entry = $returned_entry; |
@@ -1048,9 +1048,9 @@ discard block |
||
1048 | 1048 | |
1049 | 1049 | $view = \GV\View::by_id( $this->view_id ); |
1050 | 1050 | |
1051 | - if( $view->settings->get( 'edit_locking' ) ) { |
|
1051 | + if ( $view->settings->get( 'edit_locking' ) ) { |
|
1052 | 1052 | $locking = new GravityView_Edit_Entry_Locking(); |
1053 | - $locking->maybe_lock_object( $this->entry['id'] ); |
|
1053 | + $locking->maybe_lock_object( $this->entry[ 'id' ] ); |
|
1054 | 1054 | } |
1055 | 1055 | |
1056 | 1056 | ?> |
@@ -1063,7 +1063,7 @@ discard block |
||
1063 | 1063 | |
1064 | 1064 | <div class="gv-edit-entry-wrapper"><?php |
1065 | 1065 | |
1066 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
1066 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
1067 | 1067 | |
1068 | 1068 | /** |
1069 | 1069 | * Fixes weird wpautop() issue |
@@ -1079,7 +1079,7 @@ discard block |
||
1079 | 1079 | * @param string $edit_entry_title Modify the "Edit Entry" title |
1080 | 1080 | * @param GravityView_Edit_Entry_Render $this This object |
1081 | 1081 | */ |
1082 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
1082 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
1083 | 1083 | |
1084 | 1084 | echo esc_attr( $edit_entry_title ); |
1085 | 1085 | ?></span> |
@@ -1145,18 +1145,18 @@ discard block |
||
1145 | 1145 | */ |
1146 | 1146 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1147 | 1147 | |
1148 | - $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
|
1148 | + $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ]; |
|
1149 | 1149 | } |
1150 | 1150 | |
1151 | 1151 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
1152 | 1152 | |
1153 | - if( ! $this->is_valid ){ |
|
1153 | + if ( ! $this->is_valid ) { |
|
1154 | 1154 | |
1155 | 1155 | // Keeping this compatible with Gravity Forms. |
1156 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
1157 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
1156 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
1157 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
1158 | 1158 | |
1159 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
1159 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
1160 | 1160 | |
1161 | 1161 | } elseif ( false === $this->is_paged_submitted ) { |
1162 | 1162 | // Paged form that hasn't been submitted on the last page yet |
@@ -1169,7 +1169,7 @@ discard block |
||
1169 | 1169 | * @param int $view_id View ID |
1170 | 1170 | * @param array $entry Gravity Forms entry array |
1171 | 1171 | */ |
1172 | - $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry ); |
|
1172 | + $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry ); |
|
1173 | 1173 | |
1174 | 1174 | echo GVCommon::generate_notice( $message ); |
1175 | 1175 | } else { |
@@ -1181,23 +1181,23 @@ discard block |
||
1181 | 1181 | |
1182 | 1182 | case '0': |
1183 | 1183 | $redirect_url = $back_link; |
1184 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1184 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
1185 | 1185 | break; |
1186 | 1186 | |
1187 | 1187 | case '1': |
1188 | 1188 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
1189 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
1189 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
1190 | 1190 | break; |
1191 | 1191 | |
1192 | 1192 | case '2': |
1193 | 1193 | $redirect_url = $edit_redirect_url; |
1194 | 1194 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
1195 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
1195 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
1196 | 1196 | break; |
1197 | 1197 | |
1198 | 1198 | case '': |
1199 | 1199 | default: |
1200 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1200 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
1201 | 1201 | break; |
1202 | 1202 | } |
1203 | 1203 | |
@@ -1213,7 +1213,7 @@ discard block |
||
1213 | 1213 | * @param array $entry Gravity Forms entry array |
1214 | 1214 | * @param string $back_link URL to return to the original entry. @since 1.6 |
1215 | 1215 | */ |
1216 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
1216 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1217 | 1217 | |
1218 | 1218 | echo GVCommon::generate_notice( $message ); |
1219 | 1219 | } |
@@ -1237,8 +1237,8 @@ discard block |
||
1237 | 1237 | */ |
1238 | 1238 | do_action( 'gravityview/edit-entry/render/before', $this ); |
1239 | 1239 | |
1240 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1241 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
1240 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
1241 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1242 | 1242 | add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
1243 | 1243 | add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
1244 | 1244 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
@@ -1247,14 +1247,14 @@ discard block |
||
1247 | 1247 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
1248 | 1248 | |
1249 | 1249 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
1250 | - unset( $_GET['page'] ); |
|
1250 | + unset( $_GET[ 'page' ] ); |
|
1251 | 1251 | |
1252 | 1252 | $this->show_next_button = false; |
1253 | 1253 | $this->show_previous_button = false; |
1254 | 1254 | |
1255 | 1255 | // TODO: Verify multiple-page forms |
1256 | 1256 | if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) { |
1257 | - if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) { |
|
1257 | + if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) { |
|
1258 | 1258 | |
1259 | 1259 | $labels = array( |
1260 | 1260 | 'cancel' => __( 'Cancel', 'gravityview' ), |
@@ -1273,20 +1273,20 @@ discard block |
||
1273 | 1273 | */ |
1274 | 1274 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1275 | 1275 | |
1276 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
|
1277 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true; |
|
1276 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form; |
|
1277 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true; |
|
1278 | 1278 | |
1279 | - if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) { |
|
1279 | + if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) { |
|
1280 | 1280 | $last_page = \GFFormDisplay::get_max_page_number( $this->form ); |
1281 | 1281 | |
1282 | 1282 | while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
1283 | 1283 | } // Advance to next visible page |
1284 | - } elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) { |
|
1284 | + } elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) { |
|
1285 | 1285 | while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
1286 | 1286 | } // Advance to next visible page |
1287 | 1287 | } |
1288 | 1288 | |
1289 | - GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number; |
|
1289 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number; |
|
1290 | 1290 | } |
1291 | 1291 | |
1292 | 1292 | if ( ( $page_number = intval( $page_number ) ) < 2 ) { |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | |
1313 | 1313 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
1314 | 1314 | |
1315 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
1315 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1316 | 1316 | |
1317 | 1317 | ob_get_clean(); |
1318 | 1318 | |
@@ -1340,7 +1340,7 @@ discard block |
||
1340 | 1340 | * @return string |
1341 | 1341 | */ |
1342 | 1342 | public function render_form_buttons() { |
1343 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
1343 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1344 | 1344 | } |
1345 | 1345 | |
1346 | 1346 | |
@@ -1359,15 +1359,15 @@ discard block |
||
1359 | 1359 | */ |
1360 | 1360 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
1361 | 1361 | |
1362 | - if( $form['id'] != $this->form_id ) { |
|
1362 | + if ( $form[ 'id' ] != $this->form_id ) { |
|
1363 | 1363 | return $form; |
1364 | 1364 | } |
1365 | 1365 | |
1366 | 1366 | // In case we have validated the form, use it to inject the validation results into the form render |
1367 | - if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) { |
|
1367 | + if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) { |
|
1368 | 1368 | $form = $this->form_after_validation; |
1369 | 1369 | } else { |
1370 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1370 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1371 | 1371 | } |
1372 | 1372 | |
1373 | 1373 | $form = $this->filter_conditional_logic( $form ); |
@@ -1375,8 +1375,8 @@ discard block |
||
1375 | 1375 | $form = $this->prefill_conditional_logic( $form ); |
1376 | 1376 | |
1377 | 1377 | // for now we don't support Save and Continue feature. |
1378 | - if( ! self::$supports_save_and_continue ) { |
|
1379 | - unset( $form['save'] ); |
|
1378 | + if ( ! self::$supports_save_and_continue ) { |
|
1379 | + unset( $form[ 'save' ] ); |
|
1380 | 1380 | } |
1381 | 1381 | |
1382 | 1382 | $form = $this->unselect_default_values( $form ); |
@@ -1399,31 +1399,31 @@ discard block |
||
1399 | 1399 | */ |
1400 | 1400 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1401 | 1401 | |
1402 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
1402 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
1403 | 1403 | return $field_content; |
1404 | 1404 | } |
1405 | 1405 | |
1406 | 1406 | $message = null; |
1407 | 1407 | |
1408 | 1408 | // First, make sure they have the capability to edit the post. |
1409 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1409 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1410 | 1410 | |
1411 | 1411 | /** |
1412 | 1412 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1413 | 1413 | * @param string $message The existing "You don't have permission..." text |
1414 | 1414 | */ |
1415 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1415 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1416 | 1416 | |
1417 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1417 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1418 | 1418 | /** |
1419 | 1419 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1420 | 1420 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1421 | 1421 | */ |
1422 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1422 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1423 | 1423 | } |
1424 | 1424 | |
1425 | - if( $message ) { |
|
1426 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1425 | + if ( $message ) { |
|
1426 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1427 | 1427 | } |
1428 | 1428 | |
1429 | 1429 | return $field_content; |
@@ -1447,8 +1447,8 @@ discard block |
||
1447 | 1447 | |
1448 | 1448 | // If the form has been submitted, then we don't need to pre-fill the values, |
1449 | 1449 | // Except for fileupload type and when a field input is overridden- run always!! |
1450 | - if( |
|
1451 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1450 | + if ( |
|
1451 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1452 | 1452 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1453 | 1453 | && ! GFCommon::is_product_field( $field->type ) |
1454 | 1454 | || ! empty( $field_content ) |
@@ -1468,7 +1468,7 @@ discard block |
||
1468 | 1468 | $return = null; |
1469 | 1469 | |
1470 | 1470 | /** @var GravityView_Field $gv_field */ |
1471 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1471 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1472 | 1472 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1473 | 1473 | } else { |
1474 | 1474 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1477,7 +1477,7 @@ discard block |
||
1477 | 1477 | // If there was output, it's an error |
1478 | 1478 | $warnings = ob_get_clean(); |
1479 | 1479 | |
1480 | - if( !empty( $warnings ) ) { |
|
1480 | + if ( ! empty( $warnings ) ) { |
|
1481 | 1481 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
1482 | 1482 | } |
1483 | 1483 | |
@@ -1502,7 +1502,7 @@ discard block |
||
1502 | 1502 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1503 | 1503 | |
1504 | 1504 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1505 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1505 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1506 | 1506 | |
1507 | 1507 | $field_value = array(); |
1508 | 1508 | |
@@ -1511,10 +1511,10 @@ discard block |
||
1511 | 1511 | |
1512 | 1512 | foreach ( (array)$field->inputs as $input ) { |
1513 | 1513 | |
1514 | - $input_id = strval( $input['id'] ); |
|
1514 | + $input_id = strval( $input[ 'id' ] ); |
|
1515 | 1515 | |
1516 | 1516 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1517 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1517 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1518 | 1518 | $allow_pre_populated = false; |
1519 | 1519 | } |
1520 | 1520 | |
@@ -1522,7 +1522,7 @@ discard block |
||
1522 | 1522 | |
1523 | 1523 | $pre_value = $field->get_value_submission( array(), false ); |
1524 | 1524 | |
1525 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1525 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1526 | 1526 | |
1527 | 1527 | } else { |
1528 | 1528 | |
@@ -1533,13 +1533,13 @@ discard block |
||
1533 | 1533 | |
1534 | 1534 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1535 | 1535 | // or pre-populated value if not empty and set to override saved value |
1536 | - $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; |
|
1536 | + $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; |
|
1537 | 1537 | |
1538 | 1538 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1539 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1539 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1540 | 1540 | $categories = array(); |
1541 | 1541 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1542 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1542 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1543 | 1543 | } |
1544 | 1544 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1545 | 1545 | } |
@@ -1567,7 +1567,7 @@ discard block |
||
1567 | 1567 | * @param GF_Field $field Gravity Forms field object |
1568 | 1568 | * @param GravityView_Edit_Entry_Render $this Current object |
1569 | 1569 | */ |
1570 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1570 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1571 | 1571 | |
1572 | 1572 | return $field_value; |
1573 | 1573 | } |
@@ -1584,12 +1584,12 @@ discard block |
||
1584 | 1584 | */ |
1585 | 1585 | public function gform_pre_validation( $form ) { |
1586 | 1586 | |
1587 | - if( ! $this->verify_nonce() ) { |
|
1587 | + if ( ! $this->verify_nonce() ) { |
|
1588 | 1588 | return $form; |
1589 | 1589 | } |
1590 | 1590 | |
1591 | 1591 | // Fix PHP warning regarding undefined index. |
1592 | - foreach ( $form['fields'] as &$field) { |
|
1592 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1593 | 1593 | |
1594 | 1594 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1595 | 1595 | // expects certain field array items to be set. |
@@ -1597,7 +1597,7 @@ discard block |
||
1597 | 1597 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1598 | 1598 | } |
1599 | 1599 | |
1600 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1600 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1601 | 1601 | |
1602 | 1602 | /** |
1603 | 1603 | * 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. |
@@ -1611,26 +1611,26 @@ discard block |
||
1611 | 1611 | // Set the previous value |
1612 | 1612 | $entry = $this->get_entry(); |
1613 | 1613 | |
1614 | - $input_name = 'input_'.$field->id; |
|
1615 | - $form_id = $form['id']; |
|
1614 | + $input_name = 'input_' . $field->id; |
|
1615 | + $form_id = $form[ 'id' ]; |
|
1616 | 1616 | |
1617 | 1617 | $value = NULL; |
1618 | 1618 | |
1619 | 1619 | // Use the previous entry value as the default. |
1620 | - if( isset( $entry[ $field->id ] ) ) { |
|
1620 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1621 | 1621 | $value = $entry[ $field->id ]; |
1622 | 1622 | } |
1623 | 1623 | |
1624 | 1624 | // If this is a single upload file |
1625 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1626 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1627 | - $value = $file_path['url']; |
|
1625 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1626 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1627 | + $value = $file_path[ 'url' ]; |
|
1628 | 1628 | |
1629 | 1629 | } else { |
1630 | 1630 | |
1631 | 1631 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1632 | 1632 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1633 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1633 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1634 | 1634 | |
1635 | 1635 | } |
1636 | 1636 | |
@@ -1638,10 +1638,10 @@ discard block |
||
1638 | 1638 | |
1639 | 1639 | // If there are fresh uploads, process and merge them. |
1640 | 1640 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1641 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1641 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1642 | 1642 | $value = empty( $value ) ? '[]' : $value; |
1643 | 1643 | $value = stripslashes_deep( $value ); |
1644 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1644 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1645 | 1645 | } |
1646 | 1646 | |
1647 | 1647 | } else { |
@@ -1659,8 +1659,8 @@ discard block |
||
1659 | 1659 | |
1660 | 1660 | case 'number': |
1661 | 1661 | // Fix "undefined index" issue at line 1286 in form_display.php |
1662 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1663 | - $_POST['input_'.$field->id ] = NULL; |
|
1662 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1663 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1664 | 1664 | } |
1665 | 1665 | break; |
1666 | 1666 | } |
@@ -1697,7 +1697,7 @@ discard block |
||
1697 | 1697 | * You can enter whatever you want! |
1698 | 1698 | * We try validating, and customize the results using `self::custom_validation()` |
1699 | 1699 | */ |
1700 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1700 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1701 | 1701 | |
1702 | 1702 | // Needed by the validate funtion |
1703 | 1703 | $failed_validation_page = NULL; |
@@ -1705,14 +1705,14 @@ discard block |
||
1705 | 1705 | |
1706 | 1706 | // Prevent entry limit from running when editing an entry, also |
1707 | 1707 | // prevent form scheduling from preventing editing |
1708 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1708 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1709 | 1709 | |
1710 | 1710 | // Hide fields depending on Edit Entry settings |
1711 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1711 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1712 | 1712 | |
1713 | 1713 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1714 | 1714 | |
1715 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1715 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1716 | 1716 | } |
1717 | 1717 | |
1718 | 1718 | |
@@ -1740,7 +1740,7 @@ discard block |
||
1740 | 1740 | |
1741 | 1741 | $gv_valid = true; |
1742 | 1742 | |
1743 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1743 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1744 | 1744 | $value = RGFormsModel::get_field_value( $field ); |
1745 | 1745 | $field_type = RGFormsModel::get_input_type( $field ); |
1746 | 1746 | $is_required = ! empty( $field->isRequired ); |
@@ -1748,7 +1748,7 @@ discard block |
||
1748 | 1748 | |
1749 | 1749 | // Manually validate required fields as they can be skipped be skipped by GF's validation |
1750 | 1750 | // This can happen when the field is considered "hidden" (see `GFFormDisplay::validate`) due to unmet conditional logic |
1751 | - if ( $is_required && !$failed_validation && empty( $value ) ) { |
|
1751 | + if ( $is_required && ! $failed_validation && empty( $value ) ) { |
|
1752 | 1752 | $field->failed_validation = true; |
1753 | 1753 | $field->validation_message = esc_html__( 'This field is required.', 'gravityview' ); |
1754 | 1754 | |
@@ -1772,7 +1772,7 @@ discard block |
||
1772 | 1772 | if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
1773 | 1773 | $input_name = 'input_' . $field->id; |
1774 | 1774 | //uploaded |
1775 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1775 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1776 | 1776 | |
1777 | 1777 | //existent |
1778 | 1778 | $entry = $this->get_entry(); |
@@ -1791,7 +1791,7 @@ discard block |
||
1791 | 1791 | $gv_valid = false; |
1792 | 1792 | |
1793 | 1793 | // in case of error make sure the newest upload files are removed from the upload input |
1794 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1794 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1795 | 1795 | } |
1796 | 1796 | } |
1797 | 1797 | |
@@ -1799,7 +1799,7 @@ discard block |
||
1799 | 1799 | } |
1800 | 1800 | |
1801 | 1801 | // This field has failed validation. |
1802 | - if( !empty( $field->failed_validation ) ) { |
|
1802 | + if ( ! empty( $field->failed_validation ) ) { |
|
1803 | 1803 | |
1804 | 1804 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
1805 | 1805 | |
@@ -1817,19 +1817,19 @@ discard block |
||
1817 | 1817 | } |
1818 | 1818 | |
1819 | 1819 | // You can't continue inside a switch, so we do it after. |
1820 | - if( empty( $field->failed_validation ) ) { |
|
1820 | + if ( empty( $field->failed_validation ) ) { |
|
1821 | 1821 | continue; |
1822 | 1822 | } |
1823 | 1823 | |
1824 | 1824 | // checks if the No Duplicates option is not validating entry against itself, since |
1825 | 1825 | // we're editing a stored entry, it would also assume it's a duplicate. |
1826 | - if( !empty( $field->noDuplicates ) ) { |
|
1826 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1827 | 1827 | |
1828 | 1828 | $entry = $this->get_entry(); |
1829 | 1829 | |
1830 | 1830 | // If the value of the entry is the same as the stored value |
1831 | 1831 | // Then we can assume it's not a duplicate, it's the same. |
1832 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1832 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1833 | 1833 | //if value submitted was not changed, then don't validate |
1834 | 1834 | $field->failed_validation = false; |
1835 | 1835 | |
@@ -1842,7 +1842,7 @@ discard block |
||
1842 | 1842 | } |
1843 | 1843 | |
1844 | 1844 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1845 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1845 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1846 | 1846 | unset( $field->validation_message ); |
1847 | 1847 | $field->failed_validation = false; |
1848 | 1848 | continue; |
@@ -1854,12 +1854,12 @@ discard block |
||
1854 | 1854 | |
1855 | 1855 | } |
1856 | 1856 | |
1857 | - $validation_results['is_valid'] = $gv_valid; |
|
1857 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1858 | 1858 | |
1859 | 1859 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
1860 | 1860 | |
1861 | 1861 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1862 | - $this->form_after_validation = $validation_results['form']; |
|
1862 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1863 | 1863 | |
1864 | 1864 | return $validation_results; |
1865 | 1865 | } |
@@ -1872,7 +1872,7 @@ discard block |
||
1872 | 1872 | */ |
1873 | 1873 | public function get_entry() { |
1874 | 1874 | |
1875 | - if( empty( $this->entry ) ) { |
|
1875 | + if ( empty( $this->entry ) ) { |
|
1876 | 1876 | // Get the database value of the entry that's being edited |
1877 | 1877 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1878 | 1878 | } |
@@ -1904,10 +1904,10 @@ discard block |
||
1904 | 1904 | } |
1905 | 1905 | |
1906 | 1906 | // If edit tab not yet configured, show all fields |
1907 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1907 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1908 | 1908 | |
1909 | 1909 | // Hide fields depending on admin settings |
1910 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1910 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1911 | 1911 | |
1912 | 1912 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1913 | 1913 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1940,7 +1940,7 @@ discard block |
||
1940 | 1940 | */ |
1941 | 1941 | private function filter_fields( $fields, $configured_fields ) { |
1942 | 1942 | |
1943 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1943 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1944 | 1944 | return $fields; |
1945 | 1945 | } |
1946 | 1946 | |
@@ -1957,12 +1957,12 @@ discard block |
||
1957 | 1957 | |
1958 | 1958 | // Remove the fields that have calculation properties and keep them to be used later |
1959 | 1959 | // @since 1.16.2 |
1960 | - if( $field->has_calculation() ) { |
|
1961 | - $this->fields_with_calculation[] = $field; |
|
1960 | + if ( $field->has_calculation() ) { |
|
1961 | + $this->fields_with_calculation[ ] = $field; |
|
1962 | 1962 | // don't remove the calculation fields on form render. |
1963 | 1963 | } |
1964 | 1964 | |
1965 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1965 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1966 | 1966 | unset( $fields[ $key ] ); |
1967 | 1967 | } |
1968 | 1968 | } |
@@ -1992,7 +1992,7 @@ discard block |
||
1992 | 1992 | continue; // Never include when no fields are configured |
1993 | 1993 | } |
1994 | 1994 | |
1995 | - $out_fields[] = $field; |
|
1995 | + $out_fields[ ] = $field; |
|
1996 | 1996 | } |
1997 | 1997 | |
1998 | 1998 | return array_values( $out_fields ); |
@@ -2003,8 +2003,8 @@ discard block |
||
2003 | 2003 | |
2004 | 2004 | /** @var GF_Field $field */ |
2005 | 2005 | foreach ( $fields as $field ) { |
2006 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
2007 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
2006 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
2007 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
2008 | 2008 | break; |
2009 | 2009 | } |
2010 | 2010 | |
@@ -2027,14 +2027,14 @@ discard block |
||
2027 | 2027 | |
2028 | 2028 | $return_field = $field; |
2029 | 2029 | |
2030 | - if( empty( $field_setting['show_label'] ) ) { |
|
2030 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
2031 | 2031 | $return_field->label = ''; |
2032 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
2033 | - $return_field->label = $field_setting['custom_label']; |
|
2032 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
2033 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
2034 | 2034 | } |
2035 | 2035 | |
2036 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
2037 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
2036 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
2037 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
2038 | 2038 | } |
2039 | 2039 | |
2040 | 2040 | /** |
@@ -2072,16 +2072,16 @@ discard block |
||
2072 | 2072 | */ |
2073 | 2073 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
2074 | 2074 | |
2075 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
2076 | - foreach( $fields as $k => $field ) { |
|
2077 | - if( $field->adminOnly ) { |
|
2075 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
2076 | + foreach ( $fields as $k => $field ) { |
|
2077 | + if ( $field->adminOnly ) { |
|
2078 | 2078 | unset( $fields[ $k ] ); |
2079 | 2079 | } |
2080 | 2080 | } |
2081 | 2081 | return array_values( $fields ); |
2082 | 2082 | } |
2083 | 2083 | |
2084 | - foreach( $fields as &$field ) { |
|
2084 | + foreach ( $fields as &$field ) { |
|
2085 | 2085 | $field->adminOnly = false; |
2086 | 2086 | } |
2087 | 2087 | |
@@ -2102,7 +2102,7 @@ discard block |
||
2102 | 2102 | */ |
2103 | 2103 | private function unselect_default_values( $form ) { |
2104 | 2104 | |
2105 | - foreach ( $form['fields'] as &$field ) { |
|
2105 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2106 | 2106 | |
2107 | 2107 | if ( empty( $field->choices ) ) { |
2108 | 2108 | continue; |
@@ -2110,7 +2110,7 @@ discard block |
||
2110 | 2110 | |
2111 | 2111 | foreach ( $field->choices as &$choice ) { |
2112 | 2112 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
2113 | - $choice['isSelected'] = false; |
|
2113 | + $choice[ 'isSelected' ] = false; |
|
2114 | 2114 | } |
2115 | 2115 | } |
2116 | 2116 | } |
@@ -2135,22 +2135,22 @@ discard block |
||
2135 | 2135 | */ |
2136 | 2136 | function prefill_conditional_logic( $form ) { |
2137 | 2137 | |
2138 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2138 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2139 | 2139 | return $form; |
2140 | 2140 | } |
2141 | 2141 | |
2142 | 2142 | // Have Conditional Logic pre-fill fields as if the data were default values |
2143 | 2143 | /** @var GF_Field $field */ |
2144 | - foreach ( $form['fields'] as &$field ) { |
|
2144 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2145 | 2145 | |
2146 | - if( 'checkbox' === $field->type ) { |
|
2146 | + if ( 'checkbox' === $field->type ) { |
|
2147 | 2147 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
2148 | - $input_id = $input['id']; |
|
2148 | + $input_id = $input[ 'id' ]; |
|
2149 | 2149 | $choice = $field->choices[ $key ]; |
2150 | 2150 | $value = \GV\Utils::get( $this->entry, $input_id ); |
2151 | 2151 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
2152 | - if( $match ) { |
|
2153 | - $field->choices[ $key ]['isSelected'] = true; |
|
2152 | + if ( $match ) { |
|
2153 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
2154 | 2154 | } |
2155 | 2155 | } |
2156 | 2156 | } else { |
@@ -2158,15 +2158,15 @@ discard block |
||
2158 | 2158 | // We need to run through each field to set the default values |
2159 | 2159 | foreach ( $this->entry as $field_id => $field_value ) { |
2160 | 2160 | |
2161 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2161 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2162 | 2162 | |
2163 | - if( 'list' === $field->type ) { |
|
2163 | + if ( 'list' === $field->type ) { |
|
2164 | 2164 | $list_rows = maybe_unserialize( $field_value ); |
2165 | 2165 | |
2166 | 2166 | $list_field_value = array(); |
2167 | - foreach ( (array) $list_rows as $row ) { |
|
2168 | - foreach ( (array) $row as $column ) { |
|
2169 | - $list_field_value[] = $column; |
|
2167 | + foreach ( (array)$list_rows as $row ) { |
|
2168 | + foreach ( (array)$row as $column ) { |
|
2169 | + $list_field_value[ ] = $column; |
|
2170 | 2170 | } |
2171 | 2171 | } |
2172 | 2172 | |
@@ -2199,32 +2199,32 @@ discard block |
||
2199 | 2199 | * @see https://github.com/gravityview/GravityView/issues/840 |
2200 | 2200 | * @since develop |
2201 | 2201 | */ |
2202 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
2202 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
2203 | 2203 | $editable_ids = array(); |
2204 | - foreach ( $form['fields'] as $field ) { |
|
2205 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
2204 | + foreach ( $form[ 'fields' ] as $field ) { |
|
2205 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
2206 | 2206 | } |
2207 | 2207 | $remove_conditions_rule = array(); |
2208 | - foreach ( $the_form['fields'] as $field ) { |
|
2209 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
2210 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
2211 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
2208 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
2209 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
2210 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
2211 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
2212 | 2212 | /** |
2213 | 2213 | * This conditional field is not editable in this View. |
2214 | 2214 | * We need to remove the rule, but only if it matches. |
2215 | 2215 | */ |
2216 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
2216 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
2217 | 2217 | $value = $_field->get_value_export( $this->entry ); |
2218 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
2219 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
2218 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
2219 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
2220 | 2220 | } else { |
2221 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
2221 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
2222 | 2222 | } |
2223 | 2223 | |
2224 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
2224 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
2225 | 2225 | |
2226 | 2226 | if ( $match ) { |
2227 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
2227 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
2228 | 2228 | } |
2229 | 2229 | } |
2230 | 2230 | } |
@@ -2232,21 +2232,21 @@ discard block |
||
2232 | 2232 | } |
2233 | 2233 | |
2234 | 2234 | if ( $remove_conditions_rule ) { |
2235 | - foreach ( $form['fields'] as &$field ) { |
|
2235 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2236 | 2236 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
2237 | 2237 | |
2238 | 2238 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
2239 | 2239 | |
2240 | - if ( $field['id'] == $rule_field_id ) { |
|
2241 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
2242 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
2240 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
2241 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
2242 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
2243 | 2243 | } |
2244 | 2244 | } |
2245 | 2245 | } |
2246 | 2246 | } |
2247 | 2247 | |
2248 | 2248 | /** Normalize the indices... */ |
2249 | - $form['fields'] = array_values( $form['fields'] ); |
|
2249 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
2250 | 2250 | |
2251 | 2251 | /** |
2252 | 2252 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2256,16 +2256,16 @@ discard block |
||
2256 | 2256 | */ |
2257 | 2257 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
2258 | 2258 | |
2259 | - if( $use_conditional_logic ) { |
|
2259 | + if ( $use_conditional_logic ) { |
|
2260 | 2260 | return $form; |
2261 | 2261 | } |
2262 | 2262 | |
2263 | - foreach( $form['fields'] as &$field ) { |
|
2263 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2264 | 2264 | /* @var GF_Field $field */ |
2265 | 2265 | $field->conditionalLogic = null; |
2266 | 2266 | } |
2267 | 2267 | |
2268 | - unset( $form['button']['conditionalLogic'] ); |
|
2268 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
2269 | 2269 | |
2270 | 2270 | return $form; |
2271 | 2271 | |
@@ -2282,7 +2282,7 @@ discard block |
||
2282 | 2282 | */ |
2283 | 2283 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
2284 | 2284 | |
2285 | - if( ! $this->is_edit_entry() ) { |
|
2285 | + if ( ! $this->is_edit_entry() ) { |
|
2286 | 2286 | return $has_conditional_logic; |
2287 | 2287 | } |
2288 | 2288 | |
@@ -2314,44 +2314,44 @@ discard block |
||
2314 | 2314 | * 2. There are two entries embedded using oEmbed |
2315 | 2315 | * 3. One of the entries has just been saved |
2316 | 2316 | */ |
2317 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
2317 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
2318 | 2318 | |
2319 | 2319 | $error = true; |
2320 | 2320 | |
2321 | 2321 | } |
2322 | 2322 | |
2323 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
2323 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
2324 | 2324 | |
2325 | 2325 | $error = true; |
2326 | 2326 | |
2327 | - } elseif( ! $this->verify_nonce() ) { |
|
2327 | + } elseif ( ! $this->verify_nonce() ) { |
|
2328 | 2328 | |
2329 | 2329 | /** |
2330 | 2330 | * If the Entry is embedded, there may be two entries on the same page. |
2331 | 2331 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
2332 | 2332 | */ |
2333 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2333 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2334 | 2334 | $error = true; |
2335 | 2335 | } else { |
2336 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
2336 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
2337 | 2337 | } |
2338 | 2338 | |
2339 | 2339 | } |
2340 | 2340 | |
2341 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2342 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
2341 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2342 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
2343 | 2343 | } |
2344 | 2344 | |
2345 | - if( $this->entry['status'] === 'trash' ) { |
|
2346 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2345 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
2346 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2347 | 2347 | } |
2348 | 2348 | |
2349 | 2349 | // No errors; everything's fine here! |
2350 | - if( empty( $error ) ) { |
|
2350 | + if ( empty( $error ) ) { |
|
2351 | 2351 | return true; |
2352 | 2352 | } |
2353 | 2353 | |
2354 | - if( $echo && $error !== true ) { |
|
2354 | + if ( $echo && $error !== true ) { |
|
2355 | 2355 | |
2356 | 2356 | $error = esc_html( $error ); |
2357 | 2357 | |
@@ -2359,10 +2359,10 @@ discard block |
||
2359 | 2359 | * @since 1.9 |
2360 | 2360 | */ |
2361 | 2361 | if ( ! empty( $this->entry ) ) { |
2362 | - $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;" ) ); |
|
2362 | + $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;" ) ); |
|
2363 | 2363 | } |
2364 | 2364 | |
2365 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
2365 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
2366 | 2366 | } |
2367 | 2367 | |
2368 | 2368 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2382,17 +2382,17 @@ discard block |
||
2382 | 2382 | |
2383 | 2383 | $error = NULL; |
2384 | 2384 | |
2385 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2386 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
2385 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2386 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2387 | 2387 | } |
2388 | 2388 | |
2389 | 2389 | // No errors; everything's fine here! |
2390 | - if( empty( $error ) ) { |
|
2390 | + if ( empty( $error ) ) { |
|
2391 | 2391 | return true; |
2392 | 2392 | } |
2393 | 2393 | |
2394 | - if( $echo ) { |
|
2395 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
2394 | + if ( $echo ) { |
|
2395 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2396 | 2396 | } |
2397 | 2397 | |
2398 | 2398 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2413,14 +2413,14 @@ discard block |
||
2413 | 2413 | private function check_user_cap_edit_field( $field ) { |
2414 | 2414 | |
2415 | 2415 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
2416 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2416 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2417 | 2417 | return true; |
2418 | 2418 | } |
2419 | 2419 | |
2420 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
2420 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2421 | 2421 | |
2422 | - if( $field_cap ) { |
|
2423 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
2422 | + if ( $field_cap ) { |
|
2423 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2424 | 2424 | } |
2425 | 2425 | |
2426 | 2426 | return false; |
@@ -2434,17 +2434,17 @@ discard block |
||
2434 | 2434 | public function verify_nonce() { |
2435 | 2435 | |
2436 | 2436 | // Verify form submitted for editing single |
2437 | - if( $this->is_edit_entry_submission() ) { |
|
2437 | + if ( $this->is_edit_entry_submission() ) { |
|
2438 | 2438 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
2439 | 2439 | } |
2440 | 2440 | |
2441 | 2441 | // Verify |
2442 | - else if( ! $this->is_edit_entry() ) { |
|
2442 | + else if ( ! $this->is_edit_entry() ) { |
|
2443 | 2443 | $valid = false; |
2444 | 2444 | } |
2445 | 2445 | |
2446 | 2446 | else { |
2447 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
2447 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2448 | 2448 | } |
2449 | 2449 | |
2450 | 2450 | /** |