@@ -282,7 +282,7 @@ |
||
282 | 282 | /** |
283 | 283 | * Process edit entry form save |
284 | 284 | * |
285 | - * @param array $gv_data The View data. |
|
285 | + * @param GravityView_View_Data $gv_data The View data. |
|
286 | 286 | */ |
287 | 287 | private function process_save( $gv_data ) { |
288 | 288 |
@@ -573,7 +573,8 @@ discard block |
||
573 | 573 | |
574 | 574 | // Only allow quantity to be set if it's allowed to be edited |
575 | 575 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
576 | - } else { // otherwise set to what it previously was |
|
576 | + } else { |
|
577 | +// otherwise set to what it previously was |
|
577 | 578 | $_POST[ $input_name ] = $entry[ $input['id'] ]; |
578 | 579 | } |
579 | 580 | } else { |
@@ -958,7 +959,7 @@ discard block |
||
958 | 959 | |
959 | 960 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
960 | 961 | |
961 | - if( ! $this->is_valid ){ |
|
962 | + if( ! $this->is_valid ) { |
|
962 | 963 | |
963 | 964 | // Keeping this compatible with Gravity Forms. |
964 | 965 | $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
@@ -2070,9 +2071,7 @@ discard block |
||
2070 | 2071 | // Verify |
2071 | 2072 | else if( ! $this->is_edit_entry() ) { |
2072 | 2073 | $valid = false; |
2073 | - } |
|
2074 | - |
|
2075 | - else { |
|
2074 | + } else { |
|
2076 | 2075 | $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
2077 | 2076 | } |
2078 | 2077 |
@@ -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 | - * |
|
108 | - * @var int |
|
105 | + * |
|
106 | + * @since 2.0.13 |
|
107 | + * |
|
108 | + * @var int |
|
109 | 109 | */ |
110 | 110 | public $post_id; |
111 | 111 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | */ |
177 | 177 | public function prevent_maybe_process_form() { |
178 | 178 | |
179 | - if( ! $this->is_edit_entry_submission() ) { |
|
179 | + if( ! $this->is_edit_entry_submission() ) { |
|
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
@@ -210,14 +210,14 @@ discard block |
||
210 | 210 | * When Edit entry view is requested setup the vars |
211 | 211 | */ |
212 | 212 | private function setup_vars() { |
213 | - global $post; |
|
213 | + global $post; |
|
214 | 214 | |
215 | 215 | $gravityview_view = GravityView_View::getInstance(); |
216 | 216 | |
217 | 217 | |
218 | 218 | $entries = $gravityview_view->getEntries(); |
219 | - self::$original_entry = $entries[0]; |
|
220 | - $this->entry = $entries[0]; |
|
219 | + self::$original_entry = $entries[0]; |
|
220 | + $this->entry = $entries[0]; |
|
221 | 221 | |
222 | 222 | self::$original_form = $gravityview_view->getForm(); |
223 | 223 | $this->form = $gravityview_view->getForm(); |
@@ -359,8 +359,8 @@ discard block |
||
359 | 359 | |
360 | 360 | GFFormsModel::save_lead( $form, $this->entry ); |
361 | 361 | |
362 | - // Delete the values for hidden inputs |
|
363 | - $this->unset_hidden_field_values(); |
|
362 | + // Delete the values for hidden inputs |
|
363 | + $this->unset_hidden_field_values(); |
|
364 | 364 | |
365 | 365 | $this->entry['date_created'] = $date_created; |
366 | 366 | |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | // Perform actions normally performed after updating a lead |
371 | 371 | $this->after_update(); |
372 | 372 | |
373 | - /** |
|
373 | + /** |
|
374 | 374 | * Must be AFTER after_update()! |
375 | 375 | * @see https://github.com/gravityview/GravityView/issues/764 |
376 | 376 | */ |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | /** |
380 | 380 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
381 | - * @since 2.1 Added $gv_data parameter |
|
381 | + * @since 2.1 Added $gv_data parameter |
|
382 | 382 | * @param array $form Gravity Forms form array |
383 | 383 | * @param string $entry_id Numeric ID of the entry that was updated |
384 | 384 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | * @return void |
403 | 403 | */ |
404 | 404 | private function unset_hidden_field_values() { |
405 | - global $wpdb; |
|
405 | + global $wpdb; |
|
406 | 406 | |
407 | 407 | /** |
408 | 408 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -424,29 +424,29 @@ discard block |
||
424 | 424 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
425 | 425 | } |
426 | 426 | |
427 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
427 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
428 | 428 | |
429 | - $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
429 | + $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
430 | 430 | |
431 | - // Reset fields that are hidden |
|
432 | - // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
433 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
431 | + // Reset fields that are hidden |
|
432 | + // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
433 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
434 | 434 | |
435 | 435 | $empty_value = $field->get_value_save_entry( |
436 | 436 | is_array( $field->get_entry_inputs() ) ? array() : '', |
437 | 437 | $this->form, '', $this->entry['id'], $this->entry |
438 | 438 | ); |
439 | 439 | |
440 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
440 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
441 | 441 | |
442 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
442 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
443 | 443 | |
444 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
444 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
445 | 445 | // after submission |
446 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
447 | - $_POST[ $post_input_id ] = ''; |
|
448 | - } |
|
449 | - } |
|
446 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
447 | + $_POST[ $post_input_id ] = ''; |
|
448 | + } |
|
449 | + } |
|
450 | 450 | } |
451 | 451 | |
452 | 452 | /** |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | |
541 | 541 | $form = $this->filter_conditional_logic( $this->form ); |
542 | 542 | |
543 | - /** @var GF_Field $field */ |
|
543 | + /** @var GF_Field $field */ |
|
544 | 544 | foreach( $form['fields'] as $k => &$field ) { |
545 | 545 | |
546 | 546 | /** |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | |
557 | 557 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
558 | 558 | foreach( $field->inputs as $key => $input ) { |
559 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
559 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
560 | 560 | } |
561 | 561 | } |
562 | 562 | } |
@@ -591,7 +591,7 @@ discard block |
||
591 | 591 | foreach ( $this->fields_with_calculation as $field ) { |
592 | 592 | $inputs = $field->get_entry_inputs(); |
593 | 593 | if ( is_array( $inputs ) ) { |
594 | - foreach ( $inputs as $input ) { |
|
594 | + foreach ( $inputs as $input ) { |
|
595 | 595 | list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
596 | 596 | |
597 | 597 | if ( 'product' === $field->type ) { |
@@ -610,7 +610,7 @@ discard block |
||
610 | 610 | } |
611 | 611 | |
612 | 612 | GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
613 | - } |
|
613 | + } |
|
614 | 614 | } else { |
615 | 615 | // Set to what it previously was if it's not editable |
616 | 616 | if ( ! in_array( $field->id, $allowed_fields ) ) { |
@@ -656,7 +656,7 @@ discard block |
||
656 | 656 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
657 | 657 | |
658 | 658 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
659 | - $ary = stripslashes_deep( $ary ); |
|
659 | + $ary = stripslashes_deep( $ary ); |
|
660 | 660 | $img_url = \GV\Utils::get( $ary, 0 ); |
661 | 661 | |
662 | 662 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -729,7 +729,7 @@ discard block |
||
729 | 729 | private function maybe_update_post_fields( $form ) { |
730 | 730 | |
731 | 731 | if( empty( $this->entry['post_id'] ) ) { |
732 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
732 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
733 | 733 | return; |
734 | 734 | } |
735 | 735 | |
@@ -764,49 +764,49 @@ discard block |
||
764 | 764 | |
765 | 765 | switch( $field->type ) { |
766 | 766 | |
767 | - case 'post_title': |
|
768 | - $post_title = $value; |
|
769 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
770 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
771 | - } |
|
772 | - $updated_post->post_title = $post_title; |
|
773 | - $updated_post->post_name = $post_title; |
|
774 | - unset( $post_title ); |
|
775 | - break; |
|
776 | - |
|
777 | - case 'post_content': |
|
778 | - $post_content = $value; |
|
779 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
780 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
781 | - } |
|
782 | - $updated_post->post_content = $post_content; |
|
783 | - unset( $post_content ); |
|
784 | - break; |
|
785 | - case 'post_excerpt': |
|
786 | - $updated_post->post_excerpt = $value; |
|
787 | - break; |
|
788 | - case 'post_tags': |
|
789 | - wp_set_post_tags( $post_id, $value, false ); |
|
790 | - break; |
|
791 | - case 'post_category': |
|
792 | - break; |
|
793 | - case 'post_custom_field': |
|
767 | + case 'post_title': |
|
768 | + $post_title = $value; |
|
769 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
770 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
771 | + } |
|
772 | + $updated_post->post_title = $post_title; |
|
773 | + $updated_post->post_name = $post_title; |
|
774 | + unset( $post_title ); |
|
775 | + break; |
|
776 | + |
|
777 | + case 'post_content': |
|
778 | + $post_content = $value; |
|
779 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
780 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
781 | + } |
|
782 | + $updated_post->post_content = $post_content; |
|
783 | + unset( $post_content ); |
|
784 | + break; |
|
785 | + case 'post_excerpt': |
|
786 | + $updated_post->post_excerpt = $value; |
|
787 | + break; |
|
788 | + case 'post_tags': |
|
789 | + wp_set_post_tags( $post_id, $value, false ); |
|
790 | + break; |
|
791 | + case 'post_category': |
|
792 | + break; |
|
793 | + case 'post_custom_field': |
|
794 | 794 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
795 | 795 | $value = $value[ $field_id ]; |
796 | 796 | } |
797 | 797 | |
798 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
799 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
800 | - } |
|
798 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
799 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
800 | + } |
|
801 | 801 | |
802 | 802 | $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
803 | 803 | |
804 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
805 | - break; |
|
804 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
805 | + break; |
|
806 | 806 | |
807 | - case 'post_image': |
|
808 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
809 | - break; |
|
807 | + case 'post_image': |
|
808 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
809 | + break; |
|
810 | 810 | |
811 | 811 | } |
812 | 812 | |
@@ -963,14 +963,14 @@ discard block |
||
963 | 963 | ?><h2 class="gv-edit-entry-title"> |
964 | 964 | <span><?php |
965 | 965 | |
966 | - /** |
|
967 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
968 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
969 | - * @param GravityView_Edit_Entry_Render $this This object |
|
970 | - */ |
|
971 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
966 | + /** |
|
967 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
968 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
969 | + * @param GravityView_Edit_Entry_Render $this This object |
|
970 | + */ |
|
971 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
972 | 972 | |
973 | - echo esc_attr( $edit_entry_title ); |
|
973 | + echo esc_attr( $edit_entry_title ); |
|
974 | 974 | ?></span> |
975 | 975 | </h2> |
976 | 976 | |
@@ -1033,26 +1033,26 @@ discard block |
||
1033 | 1033 | |
1034 | 1034 | switch ( $edit_redirect ) { |
1035 | 1035 | |
1036 | - case '0': |
|
1037 | - $redirect_url = $back_link; |
|
1038 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1039 | - break; |
|
1040 | - |
|
1041 | - case '1': |
|
1042 | - $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
1043 | - $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>' ); |
|
1044 | - break; |
|
1045 | - |
|
1046 | - case '2': |
|
1047 | - $redirect_url = $edit_redirect_url; |
|
1048 | - $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
1049 | - $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>' ); |
|
1050 | - break; |
|
1051 | - |
|
1052 | - case '': |
|
1053 | - default: |
|
1054 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1055 | - break; |
|
1036 | + case '0': |
|
1037 | + $redirect_url = $back_link; |
|
1038 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1039 | + break; |
|
1040 | + |
|
1041 | + case '1': |
|
1042 | + $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
1043 | + $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>' ); |
|
1044 | + break; |
|
1045 | + |
|
1046 | + case '2': |
|
1047 | + $redirect_url = $edit_redirect_url; |
|
1048 | + $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
1049 | + $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>' ); |
|
1050 | + break; |
|
1051 | + |
|
1052 | + case '': |
|
1053 | + default: |
|
1054 | + $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1055 | + break; |
|
1056 | 1056 | } |
1057 | 1057 | |
1058 | 1058 | if ( isset( $redirect_url ) ) { |
@@ -1109,7 +1109,7 @@ discard block |
||
1109 | 1109 | |
1110 | 1110 | ob_get_clean(); |
1111 | 1111 | |
1112 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1112 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
1113 | 1113 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
1114 | 1114 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
1115 | 1115 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1163,7 +1163,7 @@ discard block |
||
1163 | 1163 | |
1164 | 1164 | // for now we don't support Save and Continue feature. |
1165 | 1165 | if( ! self::$supports_save_and_continue ) { |
1166 | - unset( $form['save'] ); |
|
1166 | + unset( $form['save'] ); |
|
1167 | 1167 | } |
1168 | 1168 | |
1169 | 1169 | $form = $this->unselect_default_values( $form ); |
@@ -1190,30 +1190,30 @@ discard block |
||
1190 | 1190 | return $field_content; |
1191 | 1191 | } |
1192 | 1192 | |
1193 | - $message = null; |
|
1193 | + $message = null; |
|
1194 | 1194 | |
1195 | - // First, make sure they have the capability to edit the post. |
|
1196 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1195 | + // First, make sure they have the capability to edit the post. |
|
1196 | + if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1197 | 1197 | |
1198 | - /** |
|
1199 | - * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1200 | - * @param string $message The existing "You don't have permission..." text |
|
1201 | - */ |
|
1202 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1198 | + /** |
|
1199 | + * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1200 | + * @param string $message The existing "You don't have permission..." text |
|
1201 | + */ |
|
1202 | + $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1203 | 1203 | |
1204 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1205 | - /** |
|
1206 | - * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1207 | - * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1208 | - */ |
|
1209 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1210 | - } |
|
1204 | + } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1205 | + /** |
|
1206 | + * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1207 | + * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1208 | + */ |
|
1209 | + $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1210 | + } |
|
1211 | 1211 | |
1212 | - if( $message ) { |
|
1213 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1214 | - } |
|
1212 | + if( $message ) { |
|
1213 | + $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1214 | + } |
|
1215 | 1215 | |
1216 | - return $field_content; |
|
1216 | + return $field_content; |
|
1217 | 1217 | } |
1218 | 1218 | |
1219 | 1219 | /** |
@@ -1241,7 +1241,7 @@ discard block |
||
1241 | 1241 | || ! empty( $field_content ) |
1242 | 1242 | || in_array( $field->type, array( 'honeypot' ) ) |
1243 | 1243 | ) { |
1244 | - return $field_content; |
|
1244 | + return $field_content; |
|
1245 | 1245 | } |
1246 | 1246 | |
1247 | 1247 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1249,24 +1249,24 @@ discard block |
||
1249 | 1249 | |
1250 | 1250 | $field_value = $this->get_field_value( $field ); |
1251 | 1251 | |
1252 | - // Prevent any PHP warnings, like undefined index |
|
1253 | - ob_start(); |
|
1252 | + // Prevent any PHP warnings, like undefined index |
|
1253 | + ob_start(); |
|
1254 | 1254 | |
1255 | - $return = null; |
|
1255 | + $return = null; |
|
1256 | 1256 | |
1257 | 1257 | /** @var GravityView_Field $gv_field */ |
1258 | 1258 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
1259 | 1259 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1260 | 1260 | } else { |
1261 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1262 | - } |
|
1261 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
1262 | + } |
|
1263 | 1263 | |
1264 | - // If there was output, it's an error |
|
1265 | - $warnings = ob_get_clean(); |
|
1264 | + // If there was output, it's an error |
|
1265 | + $warnings = ob_get_clean(); |
|
1266 | 1266 | |
1267 | - if( !empty( $warnings ) ) { |
|
1268 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1269 | - } |
|
1267 | + if( !empty( $warnings ) ) { |
|
1268 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1269 | + } |
|
1270 | 1270 | |
1271 | 1271 | return $return; |
1272 | 1272 | } |
@@ -1301,8 +1301,8 @@ discard block |
||
1301 | 1301 | $input_id = strval( $input['id'] ); |
1302 | 1302 | |
1303 | 1303 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1304 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1305 | - $allow_pre_populated = false; |
|
1304 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1305 | + $allow_pre_populated = false; |
|
1306 | 1306 | } |
1307 | 1307 | |
1308 | 1308 | } |
@@ -1326,7 +1326,7 @@ discard block |
||
1326 | 1326 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
1327 | 1327 | $categories = array(); |
1328 | 1328 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1329 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1329 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1330 | 1330 | } |
1331 | 1331 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1332 | 1332 | } |
@@ -1336,25 +1336,25 @@ discard block |
||
1336 | 1336 | // if value is empty get the default value if defined |
1337 | 1337 | $field_value = $field->get_value_default_if_empty( $field_value ); |
1338 | 1338 | |
1339 | - /** |
|
1340 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1341 | - * @since 1.11 |
|
1342 | - * @since 1.20 Added third param |
|
1343 | - * @param mixed $field_value field value used to populate the input |
|
1344 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1345 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1346 | - */ |
|
1347 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1348 | - |
|
1349 | - /** |
|
1350 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1351 | - * @since 1.17 |
|
1352 | - * @since 1.20 Added third param |
|
1353 | - * @param mixed $field_value field value used to populate the input |
|
1354 | - * @param GF_Field $field Gravity Forms field object |
|
1355 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
1356 | - */ |
|
1357 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1339 | + /** |
|
1340 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
1341 | + * @since 1.11 |
|
1342 | + * @since 1.20 Added third param |
|
1343 | + * @param mixed $field_value field value used to populate the input |
|
1344 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
1345 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1346 | + */ |
|
1347 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
1348 | + |
|
1349 | + /** |
|
1350 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
1351 | + * @since 1.17 |
|
1352 | + * @since 1.20 Added third param |
|
1353 | + * @param mixed $field_value field value used to populate the input |
|
1354 | + * @param GF_Field $field Gravity Forms field object |
|
1355 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
1356 | + */ |
|
1357 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1358 | 1358 | |
1359 | 1359 | return $field_value; |
1360 | 1360 | } |
@@ -1381,7 +1381,7 @@ discard block |
||
1381 | 1381 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1382 | 1382 | // expects certain field array items to be set. |
1383 | 1383 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
1384 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1384 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1385 | 1385 | } |
1386 | 1386 | |
1387 | 1387 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1395,61 +1395,61 @@ discard block |
||
1395 | 1395 | */ |
1396 | 1396 | case 'fileupload': |
1397 | 1397 | |
1398 | - // Set the previous value |
|
1399 | - $entry = $this->get_entry(); |
|
1398 | + // Set the previous value |
|
1399 | + $entry = $this->get_entry(); |
|
1400 | 1400 | |
1401 | - $input_name = 'input_'.$field->id; |
|
1402 | - $form_id = $form['id']; |
|
1401 | + $input_name = 'input_'.$field->id; |
|
1402 | + $form_id = $form['id']; |
|
1403 | 1403 | |
1404 | - $value = NULL; |
|
1404 | + $value = NULL; |
|
1405 | 1405 | |
1406 | - // Use the previous entry value as the default. |
|
1407 | - if( isset( $entry[ $field->id ] ) ) { |
|
1408 | - $value = $entry[ $field->id ]; |
|
1409 | - } |
|
1406 | + // Use the previous entry value as the default. |
|
1407 | + if( isset( $entry[ $field->id ] ) ) { |
|
1408 | + $value = $entry[ $field->id ]; |
|
1409 | + } |
|
1410 | 1410 | |
1411 | - // If this is a single upload file |
|
1412 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1413 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1414 | - $value = $file_path['url']; |
|
1411 | + // If this is a single upload file |
|
1412 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1413 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1414 | + $value = $file_path['url']; |
|
1415 | 1415 | |
1416 | - } else { |
|
1416 | + } else { |
|
1417 | 1417 | |
1418 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1419 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1420 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1418 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1419 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1420 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1421 | 1421 | |
1422 | - } |
|
1422 | + } |
|
1423 | 1423 | |
1424 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1424 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
1425 | 1425 | |
1426 | - // If there are fresh uploads, process and merge them. |
|
1427 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1428 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1429 | - $value = empty( $value ) ? '[]' : $value; |
|
1430 | - $value = stripslashes_deep( $value ); |
|
1431 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1432 | - } |
|
1426 | + // If there are fresh uploads, process and merge them. |
|
1427 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1428 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1429 | + $value = empty( $value ) ? '[]' : $value; |
|
1430 | + $value = stripslashes_deep( $value ); |
|
1431 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1432 | + } |
|
1433 | 1433 | |
1434 | - } else { |
|
1434 | + } else { |
|
1435 | 1435 | |
1436 | - // A file already exists when editing an entry |
|
1437 | - // We set this to solve issue when file upload fields are required. |
|
1438 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1436 | + // A file already exists when editing an entry |
|
1437 | + // We set this to solve issue when file upload fields are required. |
|
1438 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
1439 | 1439 | |
1440 | - } |
|
1440 | + } |
|
1441 | 1441 | |
1442 | - $this->entry[ $input_name ] = $value; |
|
1443 | - $_POST[ $input_name ] = $value; |
|
1442 | + $this->entry[ $input_name ] = $value; |
|
1443 | + $_POST[ $input_name ] = $value; |
|
1444 | 1444 | |
1445 | - break; |
|
1445 | + break; |
|
1446 | 1446 | |
1447 | 1447 | case 'number': |
1448 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
1449 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1450 | - $_POST['input_'.$field->id ] = NULL; |
|
1451 | - } |
|
1452 | - break; |
|
1448 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
1449 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1450 | + $_POST['input_'.$field->id ] = NULL; |
|
1451 | + } |
|
1452 | + break; |
|
1453 | 1453 | } |
1454 | 1454 | |
1455 | 1455 | } |
@@ -1534,43 +1534,43 @@ discard block |
||
1534 | 1534 | case 'fileupload' : |
1535 | 1535 | case 'post_image': |
1536 | 1536 | |
1537 | - // in case nothing is uploaded but there are already files saved |
|
1538 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1539 | - $field->failed_validation = false; |
|
1540 | - unset( $field->validation_message ); |
|
1541 | - } |
|
1537 | + // in case nothing is uploaded but there are already files saved |
|
1538 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1539 | + $field->failed_validation = false; |
|
1540 | + unset( $field->validation_message ); |
|
1541 | + } |
|
1542 | 1542 | |
1543 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1544 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1543 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1544 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1545 | 1545 | |
1546 | - $input_name = 'input_' . $field->id; |
|
1547 | - //uploaded |
|
1548 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1546 | + $input_name = 'input_' . $field->id; |
|
1547 | + //uploaded |
|
1548 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1549 | 1549 | |
1550 | - //existent |
|
1551 | - $entry = $this->get_entry(); |
|
1552 | - $value = NULL; |
|
1553 | - if( isset( $entry[ $field->id ] ) ) { |
|
1554 | - $value = json_decode( $entry[ $field->id ], true ); |
|
1555 | - } |
|
1550 | + //existent |
|
1551 | + $entry = $this->get_entry(); |
|
1552 | + $value = NULL; |
|
1553 | + if( isset( $entry[ $field->id ] ) ) { |
|
1554 | + $value = json_decode( $entry[ $field->id ], true ); |
|
1555 | + } |
|
1556 | 1556 | |
1557 | - // count uploaded files and existent entry files |
|
1558 | - $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
|
1559 | - ( is_array( $value ) ? count( $value ) : 0 ); |
|
1557 | + // count uploaded files and existent entry files |
|
1558 | + $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
|
1559 | + ( is_array( $value ) ? count( $value ) : 0 ); |
|
1560 | 1560 | |
1561 | - if( $count_files > $field->maxFiles ) { |
|
1562 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1563 | - $field->failed_validation = 1; |
|
1564 | - $gv_valid = false; |
|
1561 | + if( $count_files > $field->maxFiles ) { |
|
1562 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1563 | + $field->failed_validation = 1; |
|
1564 | + $gv_valid = false; |
|
1565 | 1565 | |
1566 | - // in case of error make sure the newest upload files are removed from the upload input |
|
1567 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1568 | - } |
|
1566 | + // in case of error make sure the newest upload files are removed from the upload input |
|
1567 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1568 | + } |
|
1569 | 1569 | |
1570 | - } |
|
1570 | + } |
|
1571 | 1571 | |
1572 | 1572 | |
1573 | - break; |
|
1573 | + break; |
|
1574 | 1574 | |
1575 | 1575 | } |
1576 | 1576 | |
@@ -1581,47 +1581,47 @@ discard block |
||
1581 | 1581 | |
1582 | 1582 | switch ( $field_type ) { |
1583 | 1583 | |
1584 | - // Captchas don't need to be re-entered. |
|
1585 | - case 'captcha': |
|
1584 | + // Captchas don't need to be re-entered. |
|
1585 | + case 'captcha': |
|
1586 | 1586 | |
1587 | - // Post Image fields aren't editable, so we un-fail them. |
|
1588 | - case 'post_image': |
|
1589 | - $field->failed_validation = false; |
|
1590 | - unset( $field->validation_message ); |
|
1591 | - break; |
|
1587 | + // Post Image fields aren't editable, so we un-fail them. |
|
1588 | + case 'post_image': |
|
1589 | + $field->failed_validation = false; |
|
1590 | + unset( $field->validation_message ); |
|
1591 | + break; |
|
1592 | 1592 | |
1593 | 1593 | } |
1594 | 1594 | |
1595 | 1595 | // You can't continue inside a switch, so we do it after. |
1596 | 1596 | if( empty( $field->failed_validation ) ) { |
1597 | - continue; |
|
1597 | + continue; |
|
1598 | 1598 | } |
1599 | 1599 | |
1600 | 1600 | // checks if the No Duplicates option is not validating entry against itself, since |
1601 | 1601 | // we're editing a stored entry, it would also assume it's a duplicate. |
1602 | 1602 | if( !empty( $field->noDuplicates ) ) { |
1603 | 1603 | |
1604 | - $entry = $this->get_entry(); |
|
1604 | + $entry = $this->get_entry(); |
|
1605 | 1605 | |
1606 | - // If the value of the entry is the same as the stored value |
|
1607 | - // Then we can assume it's not a duplicate, it's the same. |
|
1608 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1609 | - //if value submitted was not changed, then don't validate |
|
1610 | - $field->failed_validation = false; |
|
1606 | + // If the value of the entry is the same as the stored value |
|
1607 | + // Then we can assume it's not a duplicate, it's the same. |
|
1608 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1609 | + //if value submitted was not changed, then don't validate |
|
1610 | + $field->failed_validation = false; |
|
1611 | 1611 | |
1612 | - unset( $field->validation_message ); |
|
1612 | + unset( $field->validation_message ); |
|
1613 | 1613 | |
1614 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1614 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
1615 | 1615 | |
1616 | - continue; |
|
1617 | - } |
|
1616 | + continue; |
|
1617 | + } |
|
1618 | 1618 | } |
1619 | 1619 | |
1620 | 1620 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1621 | 1621 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
1622 | - unset( $field->validation_message ); |
|
1623 | - $field->validation_message = false; |
|
1624 | - continue; |
|
1622 | + unset( $field->validation_message ); |
|
1623 | + $field->validation_message = false; |
|
1624 | + continue; |
|
1625 | 1625 | } |
1626 | 1626 | |
1627 | 1627 | $gv_valid = false; |
@@ -1685,8 +1685,8 @@ discard block |
||
1685 | 1685 | // Hide fields depending on admin settings |
1686 | 1686 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
1687 | 1687 | |
1688 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1689 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1688 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1689 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
1690 | 1690 | |
1691 | 1691 | /** |
1692 | 1692 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1746,11 +1746,11 @@ discard block |
||
1746 | 1746 | // The edit tab has been configured, so we loop through to configured settings |
1747 | 1747 | foreach ( $configured_fields as $configured_field ) { |
1748 | 1748 | |
1749 | - /** @var GF_Field $field */ |
|
1750 | - foreach ( $fields as $field ) { |
|
1749 | + /** @var GF_Field $field */ |
|
1750 | + foreach ( $fields as $field ) { |
|
1751 | 1751 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
1752 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1753 | - break; |
|
1752 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1753 | + break; |
|
1754 | 1754 | } |
1755 | 1755 | |
1756 | 1756 | } |
@@ -1806,28 +1806,28 @@ discard block |
||
1806 | 1806 | */ |
1807 | 1807 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
1808 | 1808 | |
1809 | - /** |
|
1809 | + /** |
|
1810 | 1810 | * @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 |
1811 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1812 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1813 | - * @since 1.9.1 |
|
1814 | - * @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. |
|
1815 | - * @param array $form GF Form array |
|
1816 | - * @param int $view_id View ID |
|
1817 | - */ |
|
1818 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1819 | - |
|
1820 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1811 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
1812 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
1813 | + * @since 1.9.1 |
|
1814 | + * @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. |
|
1815 | + * @param array $form GF Form array |
|
1816 | + * @param int $view_id View ID |
|
1817 | + */ |
|
1818 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1819 | + |
|
1820 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1821 | 1821 | foreach( $fields as $k => $field ) { |
1822 | 1822 | if( $field->adminOnly ) { |
1823 | - unset( $fields[ $k ] ); |
|
1823 | + unset( $fields[ $k ] ); |
|
1824 | 1824 | } |
1825 | 1825 | } |
1826 | 1826 | return array_values( $fields ); |
1827 | 1827 | } |
1828 | 1828 | |
1829 | - foreach( $fields as &$field ) { |
|
1830 | - $field->adminOnly = false; |
|
1829 | + foreach( $fields as &$field ) { |
|
1830 | + $field->adminOnly = false; |
|
1831 | 1831 | } |
1832 | 1832 | |
1833 | 1833 | return $fields; |
@@ -1847,13 +1847,13 @@ discard block |
||
1847 | 1847 | */ |
1848 | 1848 | private function unselect_default_values( $form ) { |
1849 | 1849 | |
1850 | - foreach ( $form['fields'] as &$field ) { |
|
1850 | + foreach ( $form['fields'] as &$field ) { |
|
1851 | 1851 | |
1852 | 1852 | if ( empty( $field->choices ) ) { |
1853 | - continue; |
|
1853 | + continue; |
|
1854 | 1854 | } |
1855 | 1855 | |
1856 | - foreach ( $field->choices as &$choice ) { |
|
1856 | + foreach ( $field->choices as &$choice ) { |
|
1857 | 1857 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
1858 | 1858 | $choice['isSelected'] = false; |
1859 | 1859 | } |
@@ -1890,36 +1890,36 @@ discard block |
||
1890 | 1890 | |
1891 | 1891 | if( 'checkbox' === $field->type ) { |
1892 | 1892 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1893 | - $input_id = $input['id']; |
|
1894 | - $choice = $field->choices[ $key ]; |
|
1895 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1896 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1897 | - if( $match ) { |
|
1898 | - $field->choices[ $key ]['isSelected'] = true; |
|
1899 | - } |
|
1893 | + $input_id = $input['id']; |
|
1894 | + $choice = $field->choices[ $key ]; |
|
1895 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
1896 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1897 | + if( $match ) { |
|
1898 | + $field->choices[ $key ]['isSelected'] = true; |
|
1899 | + } |
|
1900 | 1900 | } |
1901 | 1901 | } else { |
1902 | 1902 | |
1903 | 1903 | // We need to run through each field to set the default values |
1904 | 1904 | foreach ( $this->entry as $field_id => $field_value ) { |
1905 | 1905 | |
1906 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1906 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1907 | 1907 | |
1908 | - if( 'list' === $field->type ) { |
|
1909 | - $list_rows = maybe_unserialize( $field_value ); |
|
1908 | + if( 'list' === $field->type ) { |
|
1909 | + $list_rows = maybe_unserialize( $field_value ); |
|
1910 | 1910 | |
1911 | - $list_field_value = array(); |
|
1912 | - foreach ( (array) $list_rows as $row ) { |
|
1913 | - foreach ( (array) $row as $column ) { |
|
1914 | - $list_field_value[] = $column; |
|
1915 | - } |
|
1916 | - } |
|
1911 | + $list_field_value = array(); |
|
1912 | + foreach ( (array) $list_rows as $row ) { |
|
1913 | + foreach ( (array) $row as $column ) { |
|
1914 | + $list_field_value[] = $column; |
|
1915 | + } |
|
1916 | + } |
|
1917 | 1917 | |
1918 | - $field->defaultValue = serialize( $list_field_value ); |
|
1919 | - } else { |
|
1920 | - $field->defaultValue = $field_value; |
|
1921 | - } |
|
1922 | - } |
|
1918 | + $field->defaultValue = serialize( $list_field_value ); |
|
1919 | + } else { |
|
1920 | + $field->defaultValue = $field_value; |
|
1921 | + } |
|
1922 | + } |
|
1923 | 1923 | } |
1924 | 1924 | } |
1925 | 1925 | } |
@@ -1973,7 +1973,7 @@ discard block |
||
1973 | 1973 | foreach ( $form['fields'] as &$field ) { |
1974 | 1974 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
1975 | 1975 | |
1976 | - list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
1976 | + list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
1977 | 1977 | |
1978 | 1978 | if ( $field['id'] == $rule_field_id ) { |
1979 | 1979 | unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
@@ -2024,7 +2024,7 @@ discard block |
||
2024 | 2024 | return $has_conditional_logic; |
2025 | 2025 | } |
2026 | 2026 | |
2027 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
2027 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
2028 | 2028 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
2029 | 2029 | } |
2030 | 2030 | |
@@ -2091,14 +2091,14 @@ discard block |
||
2091 | 2091 | |
2092 | 2092 | if( $echo && $error !== true ) { |
2093 | 2093 | |
2094 | - $error = esc_html( $error ); |
|
2094 | + $error = esc_html( $error ); |
|
2095 | 2095 | |
2096 | - /** |
|
2097 | - * @since 1.9 |
|
2098 | - */ |
|
2099 | - if ( ! empty( $this->entry ) ) { |
|
2100 | - $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;" ) ); |
|
2101 | - } |
|
2096 | + /** |
|
2097 | + * @since 1.9 |
|
2098 | + */ |
|
2099 | + if ( ! empty( $this->entry ) ) { |
|
2100 | + $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;" ) ); |
|
2101 | + } |
|
2102 | 2102 | |
2103 | 2103 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
2104 | 2104 | } |
@@ -123,16 +123,16 @@ discard block |
||
123 | 123 | function load() { |
124 | 124 | |
125 | 125 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
126 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
126 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
127 | 127 | |
128 | 128 | // Don't display an embedded form when editing an entry |
129 | 129 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
130 | 130 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
131 | 131 | |
132 | 132 | // Stop Gravity Forms processing what is ours! |
133 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
133 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
134 | 134 | |
135 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
135 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
136 | 136 | |
137 | 137 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
138 | 138 | |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
144 | 144 | |
145 | 145 | // Add fields expected by GFFormDisplay::validate() |
146 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
146 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
147 | 147 | |
148 | 148 | // Fix multiselect value for GF 2.2 |
149 | 149 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | * @return void |
161 | 161 | */ |
162 | 162 | public function prevent_render_form() { |
163 | - if( $this->is_edit_entry() ) { |
|
164 | - if( 'wp_head' === current_filter() ) { |
|
163 | + if ( $this->is_edit_entry() ) { |
|
164 | + if ( 'wp_head' === current_filter() ) { |
|
165 | 165 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
166 | 166 | } else { |
167 | 167 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -176,14 +176,14 @@ discard block |
||
176 | 176 | */ |
177 | 177 | public function prevent_maybe_process_form() { |
178 | 178 | |
179 | - if( ! $this->is_edit_entry_submission() ) { |
|
179 | + if ( ! $this->is_edit_entry_submission() ) { |
|
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
183 | 183 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
184 | 184 | |
185 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
186 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
185 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
186 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | /** |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | */ |
193 | 193 | public function is_edit_entry() { |
194 | 194 | |
195 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
195 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
196 | 196 | |
197 | 197 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
198 | 198 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * @return boolean |
204 | 204 | */ |
205 | 205 | public function is_edit_entry_submission() { |
206 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
206 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
@@ -216,16 +216,16 @@ discard block |
||
216 | 216 | |
217 | 217 | |
218 | 218 | $entries = $gravityview_view->getEntries(); |
219 | - self::$original_entry = $entries[0]; |
|
220 | - $this->entry = $entries[0]; |
|
219 | + self::$original_entry = $entries[ 0 ]; |
|
220 | + $this->entry = $entries[ 0 ]; |
|
221 | 221 | |
222 | 222 | self::$original_form = $gravityview_view->getForm(); |
223 | 223 | $this->form = $gravityview_view->getForm(); |
224 | - $this->form_id = $this->entry['form_id']; |
|
224 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
225 | 225 | $this->view_id = $gravityview_view->getViewId(); |
226 | 226 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
227 | 227 | |
228 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
228 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | |
@@ -284,9 +284,9 @@ discard block |
||
284 | 284 | private function print_scripts() { |
285 | 285 | $gravityview_view = GravityView_View::getInstance(); |
286 | 286 | |
287 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
287 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
288 | 288 | |
289 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
289 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
290 | 290 | |
291 | 291 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
292 | 292 | |
@@ -302,19 +302,19 @@ discard block |
||
302 | 302 | */ |
303 | 303 | private function process_save( $gv_data ) { |
304 | 304 | |
305 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
305 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
306 | 306 | return; |
307 | 307 | } |
308 | 308 | |
309 | 309 | // Make sure the entry, view, and form IDs are all correct |
310 | 310 | $valid = $this->verify_nonce(); |
311 | 311 | |
312 | - if ( !$valid ) { |
|
312 | + if ( ! $valid ) { |
|
313 | 313 | gravityview()->log->error( 'Nonce validation failed.' ); |
314 | 314 | return; |
315 | 315 | } |
316 | 316 | |
317 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
317 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
318 | 318 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
319 | 319 | return; |
320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | |
326 | 326 | $this->validate(); |
327 | 327 | |
328 | - if( $this->is_valid ) { |
|
328 | + if ( $this->is_valid ) { |
|
329 | 329 | |
330 | 330 | gravityview()->log->debug( 'Submission is valid.' ); |
331 | 331 | |
@@ -337,15 +337,15 @@ discard block |
||
337 | 337 | /** |
338 | 338 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
339 | 339 | */ |
340 | - unset( $_GET['page'] ); |
|
340 | + unset( $_GET[ 'page' ] ); |
|
341 | 341 | |
342 | - $date_created = $this->entry['date_created']; |
|
342 | + $date_created = $this->entry[ 'date_created' ]; |
|
343 | 343 | |
344 | 344 | /** |
345 | 345 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
346 | 346 | * @since 1.17.2 |
347 | 347 | */ |
348 | - unset( $this->entry['date_created'] ); |
|
348 | + unset( $this->entry[ 'date_created' ] ); |
|
349 | 349 | |
350 | 350 | /** |
351 | 351 | * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry |
@@ -355,14 +355,14 @@ discard block |
||
355 | 355 | * @param GravityView_Edit_Entry_Render $this This object |
356 | 356 | * @param GravityView_View_Data $gv_data The View data |
357 | 357 | */ |
358 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
358 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
359 | 359 | |
360 | 360 | GFFormsModel::save_lead( $form, $this->entry ); |
361 | 361 | |
362 | 362 | // Delete the values for hidden inputs |
363 | 363 | $this->unset_hidden_field_values(); |
364 | 364 | |
365 | - $this->entry['date_created'] = $date_created; |
|
365 | + $this->entry[ 'date_created' ] = $date_created; |
|
366 | 366 | |
367 | 367 | // Process calculation fields |
368 | 368 | $this->update_calculation_fields(); |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | * @param GravityView_Edit_Entry_Render $this This object |
385 | 385 | * @param GravityView_View_Data $gv_data The View data |
386 | 386 | */ |
387 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
387 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
388 | 388 | |
389 | 389 | } else { |
390 | 390 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -412,16 +412,16 @@ discard block |
||
412 | 412 | */ |
413 | 413 | $unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
414 | 414 | |
415 | - if( ! $unset_hidden_field_values ) { |
|
415 | + if ( ! $unset_hidden_field_values ) { |
|
416 | 416 | return; |
417 | 417 | } |
418 | 418 | |
419 | 419 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
420 | 420 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
421 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
421 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
422 | 422 | } else { |
423 | 423 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
424 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
424 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
425 | 425 | } |
426 | 426 | |
427 | 427 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | |
435 | 435 | $empty_value = $field->get_value_save_entry( |
436 | 436 | is_array( $field->get_entry_inputs() ) ? array() : '', |
437 | - $this->form, '', $this->entry['id'], $this->entry |
|
437 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
438 | 438 | ); |
439 | 439 | |
440 | 440 | $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
@@ -504,7 +504,7 @@ discard block |
||
504 | 504 | } |
505 | 505 | |
506 | 506 | /** No file is being uploaded. */ |
507 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
507 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
508 | 508 | /** So return the original upload */ |
509 | 509 | return $entry[ $input_id ]; |
510 | 510 | } |
@@ -522,11 +522,11 @@ discard block |
||
522 | 522 | * @return mixed |
523 | 523 | */ |
524 | 524 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
525 | - if( ! $this->is_edit_entry() ) { |
|
525 | + if ( ! $this->is_edit_entry() ) { |
|
526 | 526 | return $plupload_init; |
527 | 527 | } |
528 | 528 | |
529 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
529 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
530 | 530 | |
531 | 531 | return $plupload_init; |
532 | 532 | } |
@@ -541,27 +541,27 @@ discard block |
||
541 | 541 | $form = $this->filter_conditional_logic( $this->form ); |
542 | 542 | |
543 | 543 | /** @var GF_Field $field */ |
544 | - foreach( $form['fields'] as $k => &$field ) { |
|
544 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
545 | 545 | |
546 | 546 | /** |
547 | 547 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
548 | 548 | * @since 1.16.3 |
549 | 549 | * @var GF_Field $field |
550 | 550 | */ |
551 | - if( $field->has_calculation() ) { |
|
552 | - unset( $form['fields'][ $k ] ); |
|
551 | + if ( $field->has_calculation() ) { |
|
552 | + unset( $form[ 'fields' ][ $k ] ); |
|
553 | 553 | } |
554 | 554 | |
555 | 555 | $field->adminOnly = false; |
556 | 556 | |
557 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
558 | - foreach( $field->inputs as $key => $input ) { |
|
559 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
557 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
558 | + foreach ( $field->inputs as $key => $input ) { |
|
559 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
560 | 560 | } |
561 | 561 | } |
562 | 562 | } |
563 | 563 | |
564 | - $form['fields'] = array_values( $form['fields'] ); |
|
564 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
565 | 565 | |
566 | 566 | return $form; |
567 | 567 | } |
@@ -573,14 +573,14 @@ discard block |
||
573 | 573 | $update = false; |
574 | 574 | |
575 | 575 | // get the most up to date entry values |
576 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
576 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
577 | 577 | |
578 | 578 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
579 | 579 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
580 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
580 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
581 | 581 | } else { |
582 | 582 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
583 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
583 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | |
@@ -592,24 +592,24 @@ discard block |
||
592 | 592 | $inputs = $field->get_entry_inputs(); |
593 | 593 | if ( is_array( $inputs ) ) { |
594 | 594 | foreach ( $inputs as $input ) { |
595 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
595 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
596 | 596 | |
597 | 597 | if ( 'product' === $field->type ) { |
598 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
598 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
599 | 599 | |
600 | 600 | // Only allow quantity to be set if it's allowed to be edited |
601 | 601 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
602 | 602 | } else { // otherwise set to what it previously was |
603 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
603 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
604 | 604 | } |
605 | 605 | } else { |
606 | 606 | // Set to what it previously was if it's not editable |
607 | 607 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
608 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
608 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
609 | 609 | } |
610 | 610 | } |
611 | 611 | |
612 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
612 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
613 | 613 | } |
614 | 614 | } else { |
615 | 615 | // Set to what it previously was if it's not editable |
@@ -649,19 +649,19 @@ discard block |
||
649 | 649 | |
650 | 650 | $input_name = 'input_' . $field_id; |
651 | 651 | |
652 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
652 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
653 | 653 | |
654 | 654 | // We have a new image |
655 | 655 | |
656 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
656 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
657 | 657 | |
658 | 658 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
659 | 659 | $ary = stripslashes_deep( $ary ); |
660 | 660 | $img_url = \GV\Utils::get( $ary, 0 ); |
661 | 661 | |
662 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
663 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
664 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
662 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
663 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
664 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
665 | 665 | |
666 | 666 | $image_meta = array( |
667 | 667 | 'post_excerpt' => $img_caption, |
@@ -670,7 +670,7 @@ discard block |
||
670 | 670 | |
671 | 671 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
672 | 672 | if ( ! empty( $img_title ) ) { |
673 | - $image_meta['post_title'] = $img_title; |
|
673 | + $image_meta[ 'post_title' ] = $img_title; |
|
674 | 674 | } |
675 | 675 | |
676 | 676 | /** |
@@ -728,15 +728,15 @@ discard block |
||
728 | 728 | */ |
729 | 729 | private function maybe_update_post_fields( $form ) { |
730 | 730 | |
731 | - if( empty( $this->entry['post_id'] ) ) { |
|
731 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
732 | 732 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
733 | 733 | return; |
734 | 734 | } |
735 | 735 | |
736 | - $post_id = $this->entry['post_id']; |
|
736 | + $post_id = $this->entry[ 'post_id' ]; |
|
737 | 737 | |
738 | 738 | // Security check |
739 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
739 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
740 | 740 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
741 | 741 | return; |
742 | 742 | } |
@@ -749,25 +749,25 @@ discard block |
||
749 | 749 | |
750 | 750 | $field = RGFormsModel::get_field( $form, $field_id ); |
751 | 751 | |
752 | - if( ! $field ) { |
|
752 | + if ( ! $field ) { |
|
753 | 753 | continue; |
754 | 754 | } |
755 | 755 | |
756 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
756 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
757 | 757 | |
758 | 758 | // Get the value of the field, including $_POSTed value |
759 | 759 | $value = RGFormsModel::get_field_value( $field ); |
760 | 760 | |
761 | 761 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
762 | 762 | $entry_tmp = $this->entry; |
763 | - $entry_tmp["{$field_id}"] = $value; |
|
763 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
764 | 764 | |
765 | - switch( $field->type ) { |
|
765 | + switch ( $field->type ) { |
|
766 | 766 | |
767 | 767 | case 'post_title': |
768 | 768 | $post_title = $value; |
769 | 769 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
770 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
770 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
771 | 771 | } |
772 | 772 | $updated_post->post_title = $post_title; |
773 | 773 | $updated_post->post_name = $post_title; |
@@ -777,7 +777,7 @@ discard block |
||
777 | 777 | case 'post_content': |
778 | 778 | $post_content = $value; |
779 | 779 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
780 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
780 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
781 | 781 | } |
782 | 782 | $updated_post->post_content = $post_content; |
783 | 783 | unset( $post_content ); |
@@ -795,11 +795,11 @@ discard block |
||
795 | 795 | $value = $value[ $field_id ]; |
796 | 796 | } |
797 | 797 | |
798 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
798 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
799 | 799 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
800 | 800 | } |
801 | 801 | |
802 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
802 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
803 | 803 | |
804 | 804 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
805 | 805 | break; |
@@ -811,7 +811,7 @@ discard block |
||
811 | 811 | } |
812 | 812 | |
813 | 813 | // update entry after |
814 | - $this->entry["{$field_id}"] = $value; |
|
814 | + $this->entry[ "{$field_id}" ] = $value; |
|
815 | 815 | |
816 | 816 | $update_entry = true; |
817 | 817 | |
@@ -820,11 +820,11 @@ discard block |
||
820 | 820 | |
821 | 821 | } |
822 | 822 | |
823 | - if( $update_entry ) { |
|
823 | + if ( $update_entry ) { |
|
824 | 824 | |
825 | 825 | $return_entry = GFAPI::update_entry( $this->entry ); |
826 | 826 | |
827 | - if( is_wp_error( $return_entry ) ) { |
|
827 | + if ( is_wp_error( $return_entry ) ) { |
|
828 | 828 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
829 | 829 | } else { |
830 | 830 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -834,7 +834,7 @@ discard block |
||
834 | 834 | |
835 | 835 | $return_post = wp_update_post( $updated_post, true ); |
836 | 836 | |
837 | - if( is_wp_error( $return_post ) ) { |
|
837 | + if ( is_wp_error( $return_post ) ) { |
|
838 | 838 | $return_post->add_data( $updated_post, '$updated_post' ); |
839 | 839 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
840 | 840 | } else { |
@@ -868,7 +868,7 @@ discard block |
||
868 | 868 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
869 | 869 | |
870 | 870 | // replace conditional shortcodes |
871 | - if( $do_shortcode ) { |
|
871 | + if ( $do_shortcode ) { |
|
872 | 872 | $output = do_shortcode( $output ); |
873 | 873 | } |
874 | 874 | |
@@ -887,19 +887,19 @@ discard block |
||
887 | 887 | */ |
888 | 888 | private function after_update() { |
889 | 889 | |
890 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
891 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
890 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
891 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
892 | 892 | |
893 | 893 | // Re-define the entry now that we've updated it. |
894 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
894 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
895 | 895 | |
896 | 896 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
897 | 897 | |
898 | 898 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
899 | 899 | // We need to clear the cache because Gravity Forms caches the field values, which |
900 | 900 | // we have just updated. |
901 | - foreach ($this->form['fields'] as $key => $field) { |
|
902 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
901 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
902 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
903 | 903 | } |
904 | 904 | } |
905 | 905 | |
@@ -909,11 +909,11 @@ discard block |
||
909 | 909 | * @since develop |
910 | 910 | */ |
911 | 911 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
912 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
912 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
913 | 913 | if ( ! is_wp_error( $feeds ) ) { |
914 | 914 | $registered_feeds = array(); |
915 | 915 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
916 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
916 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
917 | 917 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
918 | 918 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
919 | 919 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -921,8 +921,8 @@ discard block |
||
921 | 921 | } |
922 | 922 | } |
923 | 923 | foreach ( $feeds as $feed ) { |
924 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
925 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
924 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
925 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
926 | 926 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
927 | 927 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
928 | 928 | $entry = $returned_entry; |
@@ -952,7 +952,7 @@ discard block |
||
952 | 952 | |
953 | 953 | <div class="gv-edit-entry-wrapper"><?php |
954 | 954 | |
955 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
955 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
956 | 956 | |
957 | 957 | /** |
958 | 958 | * Fixes weird wpautop() issue |
@@ -968,7 +968,7 @@ discard block |
||
968 | 968 | * @param string $edit_entry_title Modify the "Edit Entry" title |
969 | 969 | * @param GravityView_Edit_Entry_Render $this This object |
970 | 970 | */ |
971 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
971 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
972 | 972 | |
973 | 973 | echo esc_attr( $edit_entry_title ); |
974 | 974 | ?></span> |
@@ -1018,13 +1018,13 @@ discard block |
||
1018 | 1018 | |
1019 | 1019 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
1020 | 1020 | |
1021 | - if( ! $this->is_valid ){ |
|
1021 | + if ( ! $this->is_valid ) { |
|
1022 | 1022 | |
1023 | 1023 | // Keeping this compatible with Gravity Forms. |
1024 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
1025 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
1024 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
1025 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
1026 | 1026 | |
1027 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
1027 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
1028 | 1028 | |
1029 | 1029 | } else { |
1030 | 1030 | $view = \GV\View::by_id( $this->view_id ); |
@@ -1035,23 +1035,23 @@ discard block |
||
1035 | 1035 | |
1036 | 1036 | case '0': |
1037 | 1037 | $redirect_url = $back_link; |
1038 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1038 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
1039 | 1039 | break; |
1040 | 1040 | |
1041 | 1041 | case '1': |
1042 | 1042 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
1043 | - $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>' ); |
|
1043 | + $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>' ); |
|
1044 | 1044 | break; |
1045 | 1045 | |
1046 | 1046 | case '2': |
1047 | 1047 | $redirect_url = $edit_redirect_url; |
1048 | 1048 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
1049 | - $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>' ); |
|
1049 | + $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>' ); |
|
1050 | 1050 | break; |
1051 | 1051 | |
1052 | 1052 | case '': |
1053 | 1053 | default: |
1054 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1054 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
1055 | 1055 | break; |
1056 | 1056 | } |
1057 | 1057 | |
@@ -1067,7 +1067,7 @@ discard block |
||
1067 | 1067 | * @param array $entry Gravity Forms entry array |
1068 | 1068 | * @param string $back_link URL to return to the original entry. @since 1.6 |
1069 | 1069 | */ |
1070 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
1070 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1071 | 1071 | |
1072 | 1072 | echo GVCommon::generate_notice( $message ); |
1073 | 1073 | } |
@@ -1091,21 +1091,21 @@ discard block |
||
1091 | 1091 | */ |
1092 | 1092 | do_action( 'gravityview/edit-entry/render/before', $this ); |
1093 | 1093 | |
1094 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1095 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
1094 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
1095 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1096 | 1096 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
1097 | 1097 | |
1098 | 1098 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
1099 | 1099 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
1100 | 1100 | |
1101 | 1101 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
1102 | - unset( $_GET['page'] ); |
|
1102 | + unset( $_GET[ 'page' ] ); |
|
1103 | 1103 | |
1104 | 1104 | // TODO: Verify multiple-page forms |
1105 | 1105 | |
1106 | 1106 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
1107 | 1107 | |
1108 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
1108 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1109 | 1109 | |
1110 | 1110 | ob_get_clean(); |
1111 | 1111 | |
@@ -1131,7 +1131,7 @@ discard block |
||
1131 | 1131 | * @return string |
1132 | 1132 | */ |
1133 | 1133 | public function render_form_buttons() { |
1134 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
1134 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1135 | 1135 | } |
1136 | 1136 | |
1137 | 1137 | |
@@ -1151,10 +1151,10 @@ discard block |
||
1151 | 1151 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
1152 | 1152 | |
1153 | 1153 | // In case we have validated the form, use it to inject the validation results into the form render |
1154 | - if( isset( $this->form_after_validation ) ) { |
|
1154 | + if ( isset( $this->form_after_validation ) ) { |
|
1155 | 1155 | $form = $this->form_after_validation; |
1156 | 1156 | } else { |
1157 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1157 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1158 | 1158 | } |
1159 | 1159 | |
1160 | 1160 | $form = $this->filter_conditional_logic( $form ); |
@@ -1162,8 +1162,8 @@ discard block |
||
1162 | 1162 | $form = $this->prefill_conditional_logic( $form ); |
1163 | 1163 | |
1164 | 1164 | // for now we don't support Save and Continue feature. |
1165 | - if( ! self::$supports_save_and_continue ) { |
|
1166 | - unset( $form['save'] ); |
|
1165 | + if ( ! self::$supports_save_and_continue ) { |
|
1166 | + unset( $form[ 'save' ] ); |
|
1167 | 1167 | } |
1168 | 1168 | |
1169 | 1169 | $form = $this->unselect_default_values( $form ); |
@@ -1186,31 +1186,31 @@ discard block |
||
1186 | 1186 | */ |
1187 | 1187 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1188 | 1188 | |
1189 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
1189 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
1190 | 1190 | return $field_content; |
1191 | 1191 | } |
1192 | 1192 | |
1193 | 1193 | $message = null; |
1194 | 1194 | |
1195 | 1195 | // First, make sure they have the capability to edit the post. |
1196 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1196 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1197 | 1197 | |
1198 | 1198 | /** |
1199 | 1199 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1200 | 1200 | * @param string $message The existing "You don't have permission..." text |
1201 | 1201 | */ |
1202 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1202 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1203 | 1203 | |
1204 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1204 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1205 | 1205 | /** |
1206 | 1206 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1207 | 1207 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1208 | 1208 | */ |
1209 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1209 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1210 | 1210 | } |
1211 | 1211 | |
1212 | - if( $message ) { |
|
1213 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1212 | + if ( $message ) { |
|
1213 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1214 | 1214 | } |
1215 | 1215 | |
1216 | 1216 | return $field_content; |
@@ -1234,8 +1234,8 @@ discard block |
||
1234 | 1234 | |
1235 | 1235 | // If the form has been submitted, then we don't need to pre-fill the values, |
1236 | 1236 | // Except for fileupload type and when a field input is overridden- run always!! |
1237 | - if( |
|
1238 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1237 | + if ( |
|
1238 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1239 | 1239 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1240 | 1240 | && ! GFCommon::is_product_field( $field->type ) |
1241 | 1241 | || ! empty( $field_content ) |
@@ -1255,7 +1255,7 @@ discard block |
||
1255 | 1255 | $return = null; |
1256 | 1256 | |
1257 | 1257 | /** @var GravityView_Field $gv_field */ |
1258 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1258 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1259 | 1259 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1260 | 1260 | } else { |
1261 | 1261 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1264,7 +1264,7 @@ discard block |
||
1264 | 1264 | // If there was output, it's an error |
1265 | 1265 | $warnings = ob_get_clean(); |
1266 | 1266 | |
1267 | - if( !empty( $warnings ) ) { |
|
1267 | + if ( ! empty( $warnings ) ) { |
|
1268 | 1268 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
1269 | 1269 | } |
1270 | 1270 | |
@@ -1289,7 +1289,7 @@ discard block |
||
1289 | 1289 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1290 | 1290 | |
1291 | 1291 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1292 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1292 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1293 | 1293 | |
1294 | 1294 | $field_value = array(); |
1295 | 1295 | |
@@ -1298,10 +1298,10 @@ discard block |
||
1298 | 1298 | |
1299 | 1299 | foreach ( (array)$field->inputs as $input ) { |
1300 | 1300 | |
1301 | - $input_id = strval( $input['id'] ); |
|
1301 | + $input_id = strval( $input[ 'id' ] ); |
|
1302 | 1302 | |
1303 | 1303 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1304 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1304 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1305 | 1305 | $allow_pre_populated = false; |
1306 | 1306 | } |
1307 | 1307 | |
@@ -1309,7 +1309,7 @@ discard block |
||
1309 | 1309 | |
1310 | 1310 | $pre_value = $field->get_value_submission( array(), false ); |
1311 | 1311 | |
1312 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1312 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1313 | 1313 | |
1314 | 1314 | } else { |
1315 | 1315 | |
@@ -1320,13 +1320,13 @@ discard block |
||
1320 | 1320 | |
1321 | 1321 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1322 | 1322 | // or pre-populated value if not empty and set to override saved value |
1323 | - $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; |
|
1323 | + $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; |
|
1324 | 1324 | |
1325 | 1325 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1326 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1326 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1327 | 1327 | $categories = array(); |
1328 | 1328 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1329 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1329 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1330 | 1330 | } |
1331 | 1331 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1332 | 1332 | } |
@@ -1354,7 +1354,7 @@ discard block |
||
1354 | 1354 | * @param GF_Field $field Gravity Forms field object |
1355 | 1355 | * @param GravityView_Edit_Entry_Render $this Current object |
1356 | 1356 | */ |
1357 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1357 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1358 | 1358 | |
1359 | 1359 | return $field_value; |
1360 | 1360 | } |
@@ -1371,12 +1371,12 @@ discard block |
||
1371 | 1371 | */ |
1372 | 1372 | public function gform_pre_validation( $form ) { |
1373 | 1373 | |
1374 | - if( ! $this->verify_nonce() ) { |
|
1374 | + if ( ! $this->verify_nonce() ) { |
|
1375 | 1375 | return $form; |
1376 | 1376 | } |
1377 | 1377 | |
1378 | 1378 | // Fix PHP warning regarding undefined index. |
1379 | - foreach ( $form['fields'] as &$field) { |
|
1379 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1380 | 1380 | |
1381 | 1381 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1382 | 1382 | // expects certain field array items to be set. |
@@ -1384,7 +1384,7 @@ discard block |
||
1384 | 1384 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1385 | 1385 | } |
1386 | 1386 | |
1387 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1387 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1388 | 1388 | |
1389 | 1389 | /** |
1390 | 1390 | * 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. |
@@ -1398,26 +1398,26 @@ discard block |
||
1398 | 1398 | // Set the previous value |
1399 | 1399 | $entry = $this->get_entry(); |
1400 | 1400 | |
1401 | - $input_name = 'input_'.$field->id; |
|
1402 | - $form_id = $form['id']; |
|
1401 | + $input_name = 'input_' . $field->id; |
|
1402 | + $form_id = $form[ 'id' ]; |
|
1403 | 1403 | |
1404 | 1404 | $value = NULL; |
1405 | 1405 | |
1406 | 1406 | // Use the previous entry value as the default. |
1407 | - if( isset( $entry[ $field->id ] ) ) { |
|
1407 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1408 | 1408 | $value = $entry[ $field->id ]; |
1409 | 1409 | } |
1410 | 1410 | |
1411 | 1411 | // If this is a single upload file |
1412 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1413 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1414 | - $value = $file_path['url']; |
|
1412 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1413 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1414 | + $value = $file_path[ 'url' ]; |
|
1415 | 1415 | |
1416 | 1416 | } else { |
1417 | 1417 | |
1418 | 1418 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1419 | 1419 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1420 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1420 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1421 | 1421 | |
1422 | 1422 | } |
1423 | 1423 | |
@@ -1425,10 +1425,10 @@ discard block |
||
1425 | 1425 | |
1426 | 1426 | // If there are fresh uploads, process and merge them. |
1427 | 1427 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1428 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1428 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1429 | 1429 | $value = empty( $value ) ? '[]' : $value; |
1430 | 1430 | $value = stripslashes_deep( $value ); |
1431 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1431 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1432 | 1432 | } |
1433 | 1433 | |
1434 | 1434 | } else { |
@@ -1446,8 +1446,8 @@ discard block |
||
1446 | 1446 | |
1447 | 1447 | case 'number': |
1448 | 1448 | // Fix "undefined index" issue at line 1286 in form_display.php |
1449 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1450 | - $_POST['input_'.$field->id ] = NULL; |
|
1449 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1450 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1451 | 1451 | } |
1452 | 1452 | break; |
1453 | 1453 | } |
@@ -1484,7 +1484,7 @@ discard block |
||
1484 | 1484 | * You can enter whatever you want! |
1485 | 1485 | * We try validating, and customize the results using `self::custom_validation()` |
1486 | 1486 | */ |
1487 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1487 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1488 | 1488 | |
1489 | 1489 | // Needed by the validate funtion |
1490 | 1490 | $failed_validation_page = NULL; |
@@ -1492,14 +1492,14 @@ discard block |
||
1492 | 1492 | |
1493 | 1493 | // Prevent entry limit from running when editing an entry, also |
1494 | 1494 | // prevent form scheduling from preventing editing |
1495 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1495 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1496 | 1496 | |
1497 | 1497 | // Hide fields depending on Edit Entry settings |
1498 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1498 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1499 | 1499 | |
1500 | 1500 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1501 | 1501 | |
1502 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1502 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1503 | 1503 | } |
1504 | 1504 | |
1505 | 1505 | |
@@ -1522,7 +1522,7 @@ discard block |
||
1522 | 1522 | |
1523 | 1523 | $gv_valid = true; |
1524 | 1524 | |
1525 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1525 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1526 | 1526 | |
1527 | 1527 | $value = RGFormsModel::get_field_value( $field ); |
1528 | 1528 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1535,22 +1535,22 @@ discard block |
||
1535 | 1535 | case 'post_image': |
1536 | 1536 | |
1537 | 1537 | // in case nothing is uploaded but there are already files saved |
1538 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1538 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1539 | 1539 | $field->failed_validation = false; |
1540 | 1540 | unset( $field->validation_message ); |
1541 | 1541 | } |
1542 | 1542 | |
1543 | 1543 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
1544 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1544 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1545 | 1545 | |
1546 | 1546 | $input_name = 'input_' . $field->id; |
1547 | 1547 | //uploaded |
1548 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1548 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1549 | 1549 | |
1550 | 1550 | //existent |
1551 | 1551 | $entry = $this->get_entry(); |
1552 | 1552 | $value = NULL; |
1553 | - if( isset( $entry[ $field->id ] ) ) { |
|
1553 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1554 | 1554 | $value = json_decode( $entry[ $field->id ], true ); |
1555 | 1555 | } |
1556 | 1556 | |
@@ -1558,13 +1558,13 @@ discard block |
||
1558 | 1558 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
1559 | 1559 | ( is_array( $value ) ? count( $value ) : 0 ); |
1560 | 1560 | |
1561 | - if( $count_files > $field->maxFiles ) { |
|
1561 | + if ( $count_files > $field->maxFiles ) { |
|
1562 | 1562 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
1563 | 1563 | $field->failed_validation = 1; |
1564 | 1564 | $gv_valid = false; |
1565 | 1565 | |
1566 | 1566 | // in case of error make sure the newest upload files are removed from the upload input |
1567 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1567 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1568 | 1568 | } |
1569 | 1569 | |
1570 | 1570 | } |
@@ -1575,7 +1575,7 @@ discard block |
||
1575 | 1575 | } |
1576 | 1576 | |
1577 | 1577 | // This field has failed validation. |
1578 | - if( !empty( $field->failed_validation ) ) { |
|
1578 | + if ( ! empty( $field->failed_validation ) ) { |
|
1579 | 1579 | |
1580 | 1580 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
1581 | 1581 | |
@@ -1593,19 +1593,19 @@ discard block |
||
1593 | 1593 | } |
1594 | 1594 | |
1595 | 1595 | // You can't continue inside a switch, so we do it after. |
1596 | - if( empty( $field->failed_validation ) ) { |
|
1596 | + if ( empty( $field->failed_validation ) ) { |
|
1597 | 1597 | continue; |
1598 | 1598 | } |
1599 | 1599 | |
1600 | 1600 | // checks if the No Duplicates option is not validating entry against itself, since |
1601 | 1601 | // we're editing a stored entry, it would also assume it's a duplicate. |
1602 | - if( !empty( $field->noDuplicates ) ) { |
|
1602 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1603 | 1603 | |
1604 | 1604 | $entry = $this->get_entry(); |
1605 | 1605 | |
1606 | 1606 | // If the value of the entry is the same as the stored value |
1607 | 1607 | // Then we can assume it's not a duplicate, it's the same. |
1608 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1608 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1609 | 1609 | //if value submitted was not changed, then don't validate |
1610 | 1610 | $field->failed_validation = false; |
1611 | 1611 | |
@@ -1618,7 +1618,7 @@ discard block |
||
1618 | 1618 | } |
1619 | 1619 | |
1620 | 1620 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1621 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1621 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1622 | 1622 | unset( $field->validation_message ); |
1623 | 1623 | $field->validation_message = false; |
1624 | 1624 | continue; |
@@ -1630,12 +1630,12 @@ discard block |
||
1630 | 1630 | |
1631 | 1631 | } |
1632 | 1632 | |
1633 | - $validation_results['is_valid'] = $gv_valid; |
|
1633 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1634 | 1634 | |
1635 | 1635 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
1636 | 1636 | |
1637 | 1637 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1638 | - $this->form_after_validation = $validation_results['form']; |
|
1638 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1639 | 1639 | |
1640 | 1640 | return $validation_results; |
1641 | 1641 | } |
@@ -1648,7 +1648,7 @@ discard block |
||
1648 | 1648 | */ |
1649 | 1649 | public function get_entry() { |
1650 | 1650 | |
1651 | - if( empty( $this->entry ) ) { |
|
1651 | + if ( empty( $this->entry ) ) { |
|
1652 | 1652 | // Get the database value of the entry that's being edited |
1653 | 1653 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1654 | 1654 | } |
@@ -1680,10 +1680,10 @@ discard block |
||
1680 | 1680 | } |
1681 | 1681 | |
1682 | 1682 | // If edit tab not yet configured, show all fields |
1683 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1683 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1684 | 1684 | |
1685 | 1685 | // Hide fields depending on admin settings |
1686 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1686 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1687 | 1687 | |
1688 | 1688 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1689 | 1689 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1715,7 +1715,7 @@ discard block |
||
1715 | 1715 | */ |
1716 | 1716 | private function filter_fields( $fields, $configured_fields ) { |
1717 | 1717 | |
1718 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1718 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1719 | 1719 | return $fields; |
1720 | 1720 | } |
1721 | 1721 | |
@@ -1728,18 +1728,18 @@ discard block |
||
1728 | 1728 | |
1729 | 1729 | // Remove the fields that have calculation properties and keep them to be used later |
1730 | 1730 | // @since 1.16.2 |
1731 | - if( $field->has_calculation() ) { |
|
1732 | - $this->fields_with_calculation[] = $field; |
|
1731 | + if ( $field->has_calculation() ) { |
|
1732 | + $this->fields_with_calculation[ ] = $field; |
|
1733 | 1733 | // don't remove the calculation fields on form render. |
1734 | 1734 | } |
1735 | 1735 | |
1736 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1736 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1737 | 1737 | unset( $fields[ $key ] ); |
1738 | 1738 | } |
1739 | 1739 | } |
1740 | 1740 | |
1741 | 1741 | // The Edit tab has not been configured, so we return all fields by default. |
1742 | - if( empty( $configured_fields ) ) { |
|
1742 | + if ( empty( $configured_fields ) ) { |
|
1743 | 1743 | return array_values( $fields ); |
1744 | 1744 | } |
1745 | 1745 | |
@@ -1748,8 +1748,8 @@ discard block |
||
1748 | 1748 | |
1749 | 1749 | /** @var GF_Field $field */ |
1750 | 1750 | foreach ( $fields as $field ) { |
1751 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1752 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1751 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1752 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1753 | 1753 | break; |
1754 | 1754 | } |
1755 | 1755 | |
@@ -1772,14 +1772,14 @@ discard block |
||
1772 | 1772 | |
1773 | 1773 | $return_field = $field; |
1774 | 1774 | |
1775 | - if( empty( $field_setting['show_label'] ) ) { |
|
1775 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1776 | 1776 | $return_field->label = ''; |
1777 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1778 | - $return_field->label = $field_setting['custom_label']; |
|
1777 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
1778 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
1779 | 1779 | } |
1780 | 1780 | |
1781 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
1782 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
1781 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
1782 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1783 | 1783 | } |
1784 | 1784 | |
1785 | 1785 | /** |
@@ -1817,16 +1817,16 @@ discard block |
||
1817 | 1817 | */ |
1818 | 1818 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
1819 | 1819 | |
1820 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1821 | - foreach( $fields as $k => $field ) { |
|
1822 | - if( $field->adminOnly ) { |
|
1820 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
1821 | + foreach ( $fields as $k => $field ) { |
|
1822 | + if ( $field->adminOnly ) { |
|
1823 | 1823 | unset( $fields[ $k ] ); |
1824 | 1824 | } |
1825 | 1825 | } |
1826 | 1826 | return array_values( $fields ); |
1827 | 1827 | } |
1828 | 1828 | |
1829 | - foreach( $fields as &$field ) { |
|
1829 | + foreach ( $fields as &$field ) { |
|
1830 | 1830 | $field->adminOnly = false; |
1831 | 1831 | } |
1832 | 1832 | |
@@ -1847,7 +1847,7 @@ discard block |
||
1847 | 1847 | */ |
1848 | 1848 | private function unselect_default_values( $form ) { |
1849 | 1849 | |
1850 | - foreach ( $form['fields'] as &$field ) { |
|
1850 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1851 | 1851 | |
1852 | 1852 | if ( empty( $field->choices ) ) { |
1853 | 1853 | continue; |
@@ -1855,7 +1855,7 @@ discard block |
||
1855 | 1855 | |
1856 | 1856 | foreach ( $field->choices as &$choice ) { |
1857 | 1857 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
1858 | - $choice['isSelected'] = false; |
|
1858 | + $choice[ 'isSelected' ] = false; |
|
1859 | 1859 | } |
1860 | 1860 | } |
1861 | 1861 | } |
@@ -1880,22 +1880,22 @@ discard block |
||
1880 | 1880 | */ |
1881 | 1881 | function prefill_conditional_logic( $form ) { |
1882 | 1882 | |
1883 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1883 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1884 | 1884 | return $form; |
1885 | 1885 | } |
1886 | 1886 | |
1887 | 1887 | // Have Conditional Logic pre-fill fields as if the data were default values |
1888 | 1888 | /** @var GF_Field $field */ |
1889 | - foreach ( $form['fields'] as &$field ) { |
|
1889 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1890 | 1890 | |
1891 | - if( 'checkbox' === $field->type ) { |
|
1891 | + if ( 'checkbox' === $field->type ) { |
|
1892 | 1892 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1893 | - $input_id = $input['id']; |
|
1893 | + $input_id = $input[ 'id' ]; |
|
1894 | 1894 | $choice = $field->choices[ $key ]; |
1895 | 1895 | $value = \GV\Utils::get( $this->entry, $input_id ); |
1896 | 1896 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
1897 | - if( $match ) { |
|
1898 | - $field->choices[ $key ]['isSelected'] = true; |
|
1897 | + if ( $match ) { |
|
1898 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
1899 | 1899 | } |
1900 | 1900 | } |
1901 | 1901 | } else { |
@@ -1903,15 +1903,15 @@ discard block |
||
1903 | 1903 | // We need to run through each field to set the default values |
1904 | 1904 | foreach ( $this->entry as $field_id => $field_value ) { |
1905 | 1905 | |
1906 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1906 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1907 | 1907 | |
1908 | - if( 'list' === $field->type ) { |
|
1908 | + if ( 'list' === $field->type ) { |
|
1909 | 1909 | $list_rows = maybe_unserialize( $field_value ); |
1910 | 1910 | |
1911 | 1911 | $list_field_value = array(); |
1912 | - foreach ( (array) $list_rows as $row ) { |
|
1913 | - foreach ( (array) $row as $column ) { |
|
1914 | - $list_field_value[] = $column; |
|
1912 | + foreach ( (array)$list_rows as $row ) { |
|
1913 | + foreach ( (array)$row as $column ) { |
|
1914 | + $list_field_value[ ] = $column; |
|
1915 | 1915 | } |
1916 | 1916 | } |
1917 | 1917 | |
@@ -1944,32 +1944,32 @@ discard block |
||
1944 | 1944 | * @see https://github.com/gravityview/GravityView/issues/840 |
1945 | 1945 | * @since develop |
1946 | 1946 | */ |
1947 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
1947 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
1948 | 1948 | $editable_ids = array(); |
1949 | - foreach ( $form['fields'] as $field ) { |
|
1950 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
1949 | + foreach ( $form[ 'fields' ] as $field ) { |
|
1950 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
1951 | 1951 | } |
1952 | 1952 | $remove_conditions_rule = array(); |
1953 | - foreach ( $the_form['fields'] as $field ) { |
|
1954 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
1955 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
1956 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
1953 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
1954 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
1955 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
1956 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
1957 | 1957 | /** |
1958 | 1958 | * This conditional field is not editable in this View. |
1959 | 1959 | * We need to remove the rule, but only if it matches. |
1960 | 1960 | */ |
1961 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
1961 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
1962 | 1962 | $value = $_field->get_value_export( $this->entry ); |
1963 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
1964 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
1963 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
1964 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
1965 | 1965 | } else { |
1966 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
1966 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
1967 | 1967 | } |
1968 | 1968 | |
1969 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
1969 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
1970 | 1970 | |
1971 | 1971 | if ( $match ) { |
1972 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
1972 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
1973 | 1973 | } |
1974 | 1974 | } |
1975 | 1975 | } |
@@ -1977,21 +1977,21 @@ discard block |
||
1977 | 1977 | } |
1978 | 1978 | |
1979 | 1979 | if ( $remove_conditions_rule ) { |
1980 | - foreach ( $form['fields'] as &$field ) { |
|
1980 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1981 | 1981 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
1982 | 1982 | |
1983 | 1983 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
1984 | 1984 | |
1985 | - if ( $field['id'] == $rule_field_id ) { |
|
1986 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
1987 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
1985 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
1986 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
1987 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
1988 | 1988 | } |
1989 | 1989 | } |
1990 | 1990 | } |
1991 | 1991 | } |
1992 | 1992 | |
1993 | 1993 | /** Normalize the indices... */ |
1994 | - $form['fields'] = array_values( $form['fields'] ); |
|
1994 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
1995 | 1995 | |
1996 | 1996 | /** |
1997 | 1997 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2001,16 +2001,16 @@ discard block |
||
2001 | 2001 | */ |
2002 | 2002 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
2003 | 2003 | |
2004 | - if( $use_conditional_logic ) { |
|
2004 | + if ( $use_conditional_logic ) { |
|
2005 | 2005 | return $form; |
2006 | 2006 | } |
2007 | 2007 | |
2008 | - foreach( $form['fields'] as &$field ) { |
|
2008 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2009 | 2009 | /* @var GF_Field $field */ |
2010 | 2010 | $field->conditionalLogic = null; |
2011 | 2011 | } |
2012 | 2012 | |
2013 | - unset( $form['button']['conditionalLogic'] ); |
|
2013 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
2014 | 2014 | |
2015 | 2015 | return $form; |
2016 | 2016 | |
@@ -2027,7 +2027,7 @@ discard block |
||
2027 | 2027 | */ |
2028 | 2028 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
2029 | 2029 | |
2030 | - if( ! $this->is_edit_entry() ) { |
|
2030 | + if ( ! $this->is_edit_entry() ) { |
|
2031 | 2031 | return $has_conditional_logic; |
2032 | 2032 | } |
2033 | 2033 | |
@@ -2059,44 +2059,44 @@ discard block |
||
2059 | 2059 | * 2. There are two entries embedded using oEmbed |
2060 | 2060 | * 3. One of the entries has just been saved |
2061 | 2061 | */ |
2062 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
2062 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
2063 | 2063 | |
2064 | 2064 | $error = true; |
2065 | 2065 | |
2066 | 2066 | } |
2067 | 2067 | |
2068 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
2068 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
2069 | 2069 | |
2070 | 2070 | $error = true; |
2071 | 2071 | |
2072 | - } elseif( ! $this->verify_nonce() ) { |
|
2072 | + } elseif ( ! $this->verify_nonce() ) { |
|
2073 | 2073 | |
2074 | 2074 | /** |
2075 | 2075 | * If the Entry is embedded, there may be two entries on the same page. |
2076 | 2076 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
2077 | 2077 | */ |
2078 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2078 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2079 | 2079 | $error = true; |
2080 | 2080 | } else { |
2081 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
2081 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
2082 | 2082 | } |
2083 | 2083 | |
2084 | 2084 | } |
2085 | 2085 | |
2086 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2087 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
2086 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2087 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
2088 | 2088 | } |
2089 | 2089 | |
2090 | - if( $this->entry['status'] === 'trash' ) { |
|
2091 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2090 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
2091 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2092 | 2092 | } |
2093 | 2093 | |
2094 | 2094 | // No errors; everything's fine here! |
2095 | - if( empty( $error ) ) { |
|
2095 | + if ( empty( $error ) ) { |
|
2096 | 2096 | return true; |
2097 | 2097 | } |
2098 | 2098 | |
2099 | - if( $echo && $error !== true ) { |
|
2099 | + if ( $echo && $error !== true ) { |
|
2100 | 2100 | |
2101 | 2101 | $error = esc_html( $error ); |
2102 | 2102 | |
@@ -2104,10 +2104,10 @@ discard block |
||
2104 | 2104 | * @since 1.9 |
2105 | 2105 | */ |
2106 | 2106 | if ( ! empty( $this->entry ) ) { |
2107 | - $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;" ) ); |
|
2107 | + $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;" ) ); |
|
2108 | 2108 | } |
2109 | 2109 | |
2110 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
2110 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
2111 | 2111 | } |
2112 | 2112 | |
2113 | 2113 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2127,17 +2127,17 @@ discard block |
||
2127 | 2127 | |
2128 | 2128 | $error = NULL; |
2129 | 2129 | |
2130 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2131 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
2130 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2131 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2132 | 2132 | } |
2133 | 2133 | |
2134 | 2134 | // No errors; everything's fine here! |
2135 | - if( empty( $error ) ) { |
|
2135 | + if ( empty( $error ) ) { |
|
2136 | 2136 | return true; |
2137 | 2137 | } |
2138 | 2138 | |
2139 | - if( $echo ) { |
|
2140 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
2139 | + if ( $echo ) { |
|
2140 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2141 | 2141 | } |
2142 | 2142 | |
2143 | 2143 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2158,14 +2158,14 @@ discard block |
||
2158 | 2158 | private function check_user_cap_edit_field( $field ) { |
2159 | 2159 | |
2160 | 2160 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
2161 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2161 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2162 | 2162 | return true; |
2163 | 2163 | } |
2164 | 2164 | |
2165 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
2165 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2166 | 2166 | |
2167 | - if( $field_cap ) { |
|
2168 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
2167 | + if ( $field_cap ) { |
|
2168 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2169 | 2169 | } |
2170 | 2170 | |
2171 | 2171 | return false; |
@@ -2179,17 +2179,17 @@ discard block |
||
2179 | 2179 | public function verify_nonce() { |
2180 | 2180 | |
2181 | 2181 | // Verify form submitted for editing single |
2182 | - if( $this->is_edit_entry_submission() ) { |
|
2182 | + if ( $this->is_edit_entry_submission() ) { |
|
2183 | 2183 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
2184 | 2184 | } |
2185 | 2185 | |
2186 | 2186 | // Verify |
2187 | - else if( ! $this->is_edit_entry() ) { |
|
2187 | + else if ( ! $this->is_edit_entry() ) { |
|
2188 | 2188 | $valid = false; |
2189 | 2189 | } |
2190 | 2190 | |
2191 | 2191 | else { |
2192 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
2192 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2193 | 2193 | } |
2194 | 2194 | |
2195 | 2195 | /** |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | gravityview()->log->debug( '$passed_atts: ', array( 'data' => $passed_atts ) ); |
49 | 49 | |
50 | 50 | // Get details about the current View |
51 | - if( !empty( $passed_atts['detail'] ) ) { |
|
52 | - return $this->get_view_detail( $passed_atts['detail'] ); |
|
51 | + if ( ! empty( $passed_atts[ 'detail' ] ) ) { |
|
52 | + return $this->get_view_detail( $passed_atts[ 'detail' ] ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | $atts = $this->parse_and_sanitize_atts( $passed_atts ); |
@@ -85,16 +85,16 @@ discard block |
||
85 | 85 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
86 | 86 | |
87 | 87 | // Only keep the passed attributes after making sure that they're valid pairs |
88 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
88 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
89 | 89 | |
90 | 90 | $atts = array(); |
91 | 91 | |
92 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
92 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
93 | 93 | |
94 | 94 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
95 | 95 | $passed_value = GravityView_Merge_Tags::replace_variables( $passed_value ); |
96 | 96 | |
97 | - switch( $defaults[ $key ]['type'] ) { |
|
97 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
98 | 98 | |
99 | 99 | /** |
100 | 100 | * Make sure number fields are numeric. |
@@ -102,14 +102,14 @@ discard block |
||
102 | 102 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
103 | 103 | */ |
104 | 104 | case 'number': |
105 | - if( is_numeric( $passed_value ) ) { |
|
105 | + if ( is_numeric( $passed_value ) ) { |
|
106 | 106 | $atts[ $key ] = ( $passed_value + 0 ); |
107 | 107 | } |
108 | 108 | break; |
109 | 109 | |
110 | 110 | /** @since 2.1 */ |
111 | 111 | case 'operator': |
112 | - if( GFFormsModel::is_valid_operator( $passed_value ) ) { |
|
112 | + if ( GFFormsModel::is_valid_operator( $passed_value ) ) { |
|
113 | 113 | $atts[ $key ] = $passed_value; |
114 | 114 | } |
115 | 115 | break; |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | */ |
125 | 125 | case 'select': |
126 | 126 | case 'radio': |
127 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
128 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
127 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
128 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
129 | 129 | $atts[ $key ] = $passed_value; |
130 | 130 | } |
131 | 131 | break; |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $gravityview_view = GravityView_View::getInstance(); |
155 | 155 | $return = ''; |
156 | 156 | |
157 | - switch( $detail ) { |
|
157 | + switch ( $detail ) { |
|
158 | 158 | case 'total_entries': |
159 | 159 | $return = number_format_i18n( $gravityview_view->getTotalEntries() ); |
160 | 160 | break; |
@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | abstract class GravityView_Extension extends \GV\Extension { |
16 | 16 | public function __construct() { |
17 | - if( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
17 | + if ( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
18 | 18 | gravityview()->log->warning( '\GravityView_Extension is deprecated. Inherit from \GV\Extension instead', array( 'data' => $this ) ); |
19 | 19 | } |
20 | 20 | parent::__construct(); |
@@ -20,16 +20,16 @@ |
||
20 | 20 | */ |
21 | 21 | function gravityview_register_gravityview_widgets() { |
22 | 22 | |
23 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); |
|
23 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); |
|
24 | 24 | |
25 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' ); |
|
26 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' ); |
|
27 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' ); |
|
28 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' ); |
|
29 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' ); |
|
25 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' ); |
|
26 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' ); |
|
27 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' ); |
|
28 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' ); |
|
29 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' ); |
|
30 | 30 | |
31 | - if( class_exists('GFPolls') ) { |
|
32 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' ); |
|
31 | + if ( class_exists( 'GFPolls' ) ) { |
|
32 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' ); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | |
75 | 75 | /** |
76 | 76 | * Render the page size widget |
77 | - * |
|
77 | + * |
|
78 | 78 | * @param array $widget_args The Widget shortcode args. |
79 | 79 | * @param string $content The content. |
80 | 80 | * @param string|\GV\Template_Context $context The context, if available. |
@@ -115,14 +115,14 @@ discard block |
||
115 | 115 | <?php } ?> |
116 | 116 | </select> |
117 | 117 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
118 | - if( ! empty( $_GET ) ) { |
|
119 | - $get = $_GET; |
|
120 | - unset( $get['page_size'] ); |
|
121 | - foreach ( $get as $key => $value ) { |
|
122 | - printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) ); |
|
123 | - } |
|
124 | - } |
|
125 | - ?> |
|
118 | + if( ! empty( $_GET ) ) { |
|
119 | + $get = $_GET; |
|
120 | + unset( $get['page_size'] ); |
|
121 | + foreach ( $get as $key => $value ) { |
|
122 | + printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) ); |
|
123 | + } |
|
124 | + } |
|
125 | + ?> |
|
126 | 126 | </div> |
127 | 127 | </form> |
128 | 128 | </div> |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $default_size = 25; |
46 | 46 | |
47 | 47 | if ( $context instanceof \GV\Template_Context ) { |
48 | - $default_size = (int) $context->view->settings->get( 'page_size' ); |
|
48 | + $default_size = (int)$context->view->settings->get( 'page_size' ); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | $sizes = array( 10, 25, $default_size, 50, 100 ); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | $page_sizes = array(); |
58 | 58 | foreach ( $sizes as $size ) { |
59 | - $page_sizes [] = array( |
|
59 | + $page_sizes [ ] = array( |
|
60 | 60 | 'value' => $size, |
61 | 61 | 'text' => $size |
62 | 62 | ); |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function render_frontend( $widget_args, $content = '', $context = null ) { |
83 | 83 | |
84 | - if( ! $this->pre_render_frontend() ) { |
|
84 | + if ( ! $this->pre_render_frontend() ) { |
|
85 | 85 | return; |
86 | 86 | } |
87 | 87 | |
88 | - $page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
88 | + $page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
89 | 89 | |
90 | 90 | $settings = shortcode_atts( array( |
91 | 91 | 'label' => __( 'Page Size', 'gravityview' ), |
@@ -104,20 +104,20 @@ discard block |
||
104 | 104 | <div class="gv-widget-page-size"> |
105 | 105 | <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();"> |
106 | 106 | <div> |
107 | - <?php if( ! empty( $settings['label'] ) ) { ?> |
|
108 | - <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label> |
|
107 | + <?php if ( ! empty( $settings[ 'label' ] ) ) { ?> |
|
108 | + <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label> |
|
109 | 109 | <?php } ?> |
110 | 110 | <select name="page_size" id="gv-page_size"> |
111 | - <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option> |
|
111 | + <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option> |
|
112 | 112 | <?php |
113 | - foreach ( $settings['choices'] as $choice ) { ?> |
|
114 | - <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
113 | + foreach ( $settings[ 'choices' ] as $choice ) { ?> |
|
114 | + <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
115 | 115 | <?php } ?> |
116 | 116 | </select> |
117 | 117 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
118 | - if( ! empty( $_GET ) ) { |
|
118 | + if ( ! empty( $_GET ) ) { |
|
119 | 119 | $get = $_GET; |
120 | - unset( $get['page_size'] ); |
|
120 | + unset( $get[ 'page_size' ] ); |
|
121 | 121 | foreach ( $get as $key => $value ) { |
122 | 122 | printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) ); |
123 | 123 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | |
152 | 152 | // Already overridden |
153 | - if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) { |
|
153 | + if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) { |
|
154 | 154 | return; |
155 | 155 | } |
156 | 156 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | 'view' => $view, |
159 | 159 | ) ); |
160 | 160 | |
161 | - if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
161 | + if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
162 | 162 | gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) ); |
163 | 163 | return; |
164 | 164 | } |
@@ -78,7 +78,7 @@ |
||
78 | 78 | $gv_page = gravityview()->request->is_admin( '', 'single' ); |
79 | 79 | |
80 | 80 | // New View or Edit View page |
81 | - if( $gv_page && $pagenow === 'post-new.php' ) { |
|
81 | + if ( $gv_page && $pagenow === 'post-new.php' ) { |
|
82 | 82 | remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' ); |
83 | 83 | } |
84 | 84 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | parent::add_hooks(); |
69 | 69 | |
70 | - if( gravityview()->request->is_admin( '', null ) ) { |
|
70 | + if ( gravityview()->request->is_admin( '', null ) ) { |
|
71 | 71 | |
72 | 72 | // Make Yoast metabox go down to the bottom please. |
73 | 73 | add_filter( 'wpseo_metabox_prio', array( $this, 'return_low' ) ); |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function disable_content_analysis( $options ) { |
94 | 94 | |
95 | - $options['keyword_analysis_active'] = false; |
|
96 | - $options['content_analysis_active'] = false; |
|
95 | + $options[ 'keyword_analysis_active' ] = false; |
|
96 | + $options[ 'content_analysis_active' ] = false; |
|
97 | 97 | |
98 | 98 | return $options; |
99 | 99 | } |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | global $pagenow; |
113 | 113 | |
114 | 114 | // New View page |
115 | - if( $pagenow === 'post-new.php' ) { |
|
116 | - $options['hideeditbox-gravityview'] = true; |
|
115 | + if ( $pagenow === 'post-new.php' ) { |
|
116 | + $options[ 'hideeditbox-gravityview' ] = true; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | return $options; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @return array |
103 | 103 | */ |
104 | 104 | public function modify_app_settings_menu_title( $setting_tabs ) { |
105 | - $setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' ); |
|
105 | + $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' ); |
|
106 | 106 | return $setting_tabs; |
107 | 107 | } |
108 | 108 | |
@@ -308,15 +308,15 @@ discard block |
||
308 | 308 | </ul> |
309 | 309 | <div class="gv-followup widefat"> |
310 | 310 | <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p> |
311 | - <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea> |
|
311 | + <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea> |
|
312 | 312 | </div> |
313 | 313 | <div class="scale-description"> |
314 | 314 | <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p> |
315 | 315 | <ul class="inline"> |
316 | 316 | <?php |
317 | 317 | $i = 0; |
318 | - while( $i < 11 ) { |
|
319 | - echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>'; |
|
318 | + while ( $i < 11 ) { |
|
319 | + echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>'; |
|
320 | 320 | $i++; |
321 | 321 | } |
322 | 322 | ?> |
@@ -533,15 +533,15 @@ discard block |
||
533 | 533 | * @return string The HTML |
534 | 534 | */ |
535 | 535 | public function as_html( $field, $echo = true ) { |
536 | - $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit'; |
|
536 | + $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; |
|
537 | 537 | |
538 | 538 | $attributes = $this->get_field_attributes( $field ); |
539 | 539 | $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); |
540 | - $value = $this->get( $field['name'], $default_value ); |
|
540 | + $value = $this->get( $field[ 'name' ], $default_value ); |
|
541 | 541 | |
542 | 542 | |
543 | - $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton'; |
|
544 | - $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; |
|
543 | + $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton'; |
|
544 | + $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; |
|
545 | 545 | |
546 | 546 | if ( empty( $value ) ) { |
547 | 547 | $value = __( 'Update Settings', 'gravityview' ); |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | $attributes = $this->get_field_attributes( $field ); |
551 | 551 | |
552 | 552 | $html = '<input |
553 | - type="' . $field['type'] . '" |
|
553 | + type="' . $field[ 'type' ] . '" |
|
554 | 554 | name="' . esc_attr( $name ) . '" |
555 | 555 | value="' . $value . '" ' . |
556 | 556 | implode( ' ', $attributes ) . |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | * @return bool |
582 | 582 | */ |
583 | 583 | public function is_save_postback() { |
584 | - return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] ); |
|
584 | + return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] ); |
|
585 | 585 | } |
586 | 586 | |
587 | 587 | /** |
@@ -591,7 +591,7 @@ discard block |
||
591 | 591 | */ |
592 | 592 | public function license_key_notice() { |
593 | 593 | |
594 | - if( $this->is_save_postback() ) { |
|
594 | + if ( $this->is_save_postback() ) { |
|
595 | 595 | $settings = $this->get_posted_settings(); |
596 | 596 | $license_key = \GV\Utils::get( $settings, 'license_key' ); |
597 | 597 | $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | * but didn't want to mess up the translation strings for the translators. |
613 | 613 | */ |
614 | 614 | $message = mb_substr( $message, 0, mb_strlen( $message ) - 1 ); |
615 | - $title = __( 'Inactive License', 'gravityview'); |
|
615 | + $title = __( 'Inactive License', 'gravityview' ); |
|
616 | 616 | $status = ''; |
617 | 617 | $update_below = false; |
618 | 618 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
@@ -642,7 +642,7 @@ discard block |
||
642 | 642 | $update_below = __( 'Activate your license key below.', 'gravityview' ); |
643 | 643 | break; |
644 | 644 | } |
645 | - $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice'; |
|
645 | + $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice'; |
|
646 | 646 | |
647 | 647 | // Show a different notice on settings page for inactive licenses (hide the buttons) |
648 | 648 | if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) { |
@@ -686,7 +686,7 @@ discard block |
||
686 | 686 | public function scripts() { |
687 | 687 | $scripts = parent::scripts(); |
688 | 688 | |
689 | - $scripts[] = array( |
|
689 | + $scripts[ ] = array( |
|
690 | 690 | 'handle' => 'gform_tooltip_init', |
691 | 691 | 'enqueue' => array( |
692 | 692 | array( |
@@ -705,7 +705,7 @@ discard block |
||
705 | 705 | public function styles() { |
706 | 706 | $styles = parent::styles(); |
707 | 707 | |
708 | - $styles[] = array( |
|
708 | + $styles[ ] = array( |
|
709 | 709 | 'handle' => 'gravityview_settings', |
710 | 710 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
711 | 711 | 'version' => Plugin::$version, |
@@ -736,7 +736,7 @@ discard block |
||
736 | 736 | * If multisite and not network admin, we don't want the settings to show. |
737 | 737 | * @since 1.7.6 |
738 | 738 | */ |
739 | - $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
739 | + $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
740 | 740 | |
741 | 741 | /** |
742 | 742 | * Override whether to show the Settings menu on a per-blog basis. |
@@ -784,26 +784,26 @@ discard block |
||
784 | 784 | 'label' => __( 'License Key', 'gravityview' ), |
785 | 785 | 'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates & support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ), |
786 | 786 | 'type' => 'edd_license', |
787 | - 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
787 | + 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
788 | 788 | 'data-pending-text' => __( 'Verifying license…', 'gravityview' ), |
789 | - 'default_value' => $default_settings['license_key'], |
|
789 | + 'default_value' => $default_settings[ 'license_key' ], |
|
790 | 790 | 'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', |
791 | 791 | ), |
792 | 792 | array( |
793 | 793 | 'name' => 'license_key_response', |
794 | - 'default_value' => $default_settings['license_key_response'], |
|
794 | + 'default_value' => $default_settings[ 'license_key_response' ], |
|
795 | 795 | 'type' => 'hidden', |
796 | 796 | ), |
797 | 797 | array( |
798 | 798 | 'name' => 'license_key_status', |
799 | - 'default_value' => $default_settings['license_key_status'], |
|
799 | + 'default_value' => $default_settings[ 'license_key_status' ], |
|
800 | 800 | 'type' => 'hidden', |
801 | 801 | ), |
802 | 802 | array( |
803 | 803 | 'name' => 'support-email', |
804 | 804 | 'type' => 'text', |
805 | 805 | 'validate' => 'email', |
806 | - 'default_value' => $default_settings['support-email'], |
|
806 | + 'default_value' => $default_settings[ 'support-email' ], |
|
807 | 807 | 'label' => __( 'Support Email', 'gravityview' ), |
808 | 808 | 'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), |
809 | 809 | 'class' => 'code regular-text', |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | 'name' => 'support_port', |
816 | 816 | 'type' => 'radio', |
817 | 817 | 'label' => __( 'Show Support Port?', 'gravityview' ), |
818 | - 'default_value' => $default_settings['support_port'], |
|
818 | + 'default_value' => $default_settings[ 'support_port' ], |
|
819 | 819 | 'horizontal' => 1, |
820 | 820 | 'choices' => array( |
821 | 821 | array( |
@@ -834,7 +834,7 @@ discard block |
||
834 | 834 | 'name' => 'no-conflict-mode', |
835 | 835 | 'type' => 'radio', |
836 | 836 | 'label' => __( 'No-Conflict Mode', 'gravityview' ), |
837 | - 'default_value' => $default_settings['no-conflict-mode'], |
|
837 | + 'default_value' => $default_settings[ 'no-conflict-mode' ], |
|
838 | 838 | 'horizontal' => 1, |
839 | 839 | 'choices' => array( |
840 | 840 | array( |
@@ -856,7 +856,7 @@ discard block |
||
856 | 856 | 'name' => 'rest_api', |
857 | 857 | 'type' => 'radio', |
858 | 858 | 'label' => __( 'REST API', 'gravityview' ), |
859 | - 'default_value' => $default_settings['rest_api'], |
|
859 | + 'default_value' => $default_settings[ 'rest_api' ], |
|
860 | 860 | 'horizontal' => 1, |
861 | 861 | 'choices' => array( |
862 | 862 | array( |
@@ -875,7 +875,7 @@ discard block |
||
875 | 875 | 'name' => 'beta', |
876 | 876 | 'type' => 'checkbox', |
877 | 877 | 'label' => __( 'Become a Beta Tester', 'gravityview' ), |
878 | - 'default_value' => $default_settings['beta'], |
|
878 | + 'default_value' => $default_settings[ 'beta' ], |
|
879 | 879 | 'horizontal' => 1, |
880 | 880 | 'choices' => array( |
881 | 881 | array( |
@@ -908,17 +908,17 @@ discard block |
||
908 | 908 | * @since 1.7.4 |
909 | 909 | */ |
910 | 910 | foreach ( $fields as &$field ) { |
911 | - $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); |
|
912 | - $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); |
|
913 | - $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); |
|
914 | - $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); |
|
911 | + $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); |
|
912 | + $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); |
|
913 | + $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); |
|
914 | + $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); |
|
915 | 915 | |
916 | 916 | if ( $disabled_attribute ) { |
917 | - $field['disabled'] = $disabled_attribute; |
|
917 | + $field[ 'disabled' ] = $disabled_attribute; |
|
918 | 918 | } |
919 | 919 | |
920 | - if ( empty( $field['disabled'] ) ) { |
|
921 | - unset( $field['disabled'] ); |
|
920 | + if ( empty( $field[ 'disabled' ] ) ) { |
|
921 | + unset( $field[ 'disabled' ] ); |
|
922 | 922 | } |
923 | 923 | } |
924 | 924 | |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | ); |
937 | 937 | |
938 | 938 | if ( $disabled_attribute ) { |
939 | - $button['disabled'] = $disabled_attribute; |
|
939 | + $button[ 'disabled' ] = $disabled_attribute; |
|
940 | 940 | } |
941 | 941 | |
942 | 942 | /** |
@@ -955,20 +955,20 @@ discard block |
||
955 | 955 | // If there are extensions, add a section for them |
956 | 956 | if ( ! empty( $extension_sections ) ) { |
957 | 957 | |
958 | - if( $disabled_attribute ) { |
|
958 | + if ( $disabled_attribute ) { |
|
959 | 959 | foreach ( $extension_sections as &$section ) { |
960 | - foreach ( $section['fields'] as &$field ) { |
|
961 | - $field['disabled'] = $disabled_attribute; |
|
960 | + foreach ( $section[ 'fields' ] as &$field ) { |
|
961 | + $field[ 'disabled' ] = $disabled_attribute; |
|
962 | 962 | } |
963 | 963 | } |
964 | 964 | } |
965 | 965 | |
966 | - $k = count( $extension_sections ) - 1 ; |
|
967 | - $extension_sections[ $k ]['fields'][] = $button; |
|
966 | + $k = count( $extension_sections ) - 1; |
|
967 | + $extension_sections[ $k ][ 'fields' ][ ] = $button; |
|
968 | 968 | $sections = array_merge( $sections, $extension_sections ); |
969 | 969 | } else { |
970 | 970 | // add the 'update settings' button to the general section |
971 | - $sections[0]['fields'][] = $button; |
|
971 | + $sections[ 0 ][ 'fields' ][ ] = $button; |
|
972 | 972 | } |
973 | 973 | |
974 | 974 | return $sections; |
@@ -1024,7 +1024,7 @@ discard block |
||
1024 | 1024 | protected function settings_edd_license( $field, $echo = true ) { |
1025 | 1025 | |
1026 | 1026 | if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
1027 | - $field['input_type'] = 'password'; |
|
1027 | + $field[ 'input_type' ] = 'password'; |
|
1028 | 1028 | } |
1029 | 1029 | |
1030 | 1030 | $text = $this->settings_text( $field, false ); |
@@ -1073,7 +1073,7 @@ discard block |
||
1073 | 1073 | public function single_setting_row_html( $field ) { |
1074 | 1074 | ?> |
1075 | 1075 | |
1076 | - <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>"> |
|
1076 | + <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>"> |
|
1077 | 1077 | <td colspan="2"> |
1078 | 1078 | <?php $this->single_setting( $field ); ?> |
1079 | 1079 | </td> |
@@ -1091,10 +1091,10 @@ discard block |
||
1091 | 1091 | * @return string |
1092 | 1092 | */ |
1093 | 1093 | public function settings_save( $field, $echo = true ) { |
1094 | - $field['type'] = 'submit'; |
|
1095 | - $field['name'] = 'gform-settings-save'; |
|
1096 | - $field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton'; |
|
1097 | - $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1094 | + $field[ 'type' ] = 'submit'; |
|
1095 | + $field[ 'name' ] = 'gform-settings-save'; |
|
1096 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton'; |
|
1097 | + $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1098 | 1098 | |
1099 | 1099 | $output = $this->settings_submit( $field, false ); |
1100 | 1100 | |
@@ -1125,8 +1125,8 @@ discard block |
||
1125 | 1125 | * @return void |
1126 | 1126 | */ |
1127 | 1127 | public function single_setting_row( $field ) { |
1128 | - $field['gv_description'] = Utils::get( $field, 'description' ); |
|
1129 | - $field['description'] = Utils::get( $field, 'subtitle' ); |
|
1128 | + $field[ 'gv_description' ] = Utils::get( $field, 'description' ); |
|
1129 | + $field[ 'description' ] = Utils::get( $field, 'subtitle' ); |
|
1130 | 1130 | parent::single_setting_row( $field ); |
1131 | 1131 | } |
1132 | 1132 | |
@@ -1138,7 +1138,7 @@ discard block |
||
1138 | 1138 | public function single_setting_label( $field ) { |
1139 | 1139 | parent::single_setting_label( $field ); |
1140 | 1140 | if ( $description = Utils::get( $field, 'gv_description' ) ) { |
1141 | - echo '<span class="description">'. $description .'</span>'; |
|
1141 | + echo '<span class="description">' . $description . '</span>'; |
|
1142 | 1142 | } |
1143 | 1143 | } |
1144 | 1144 | |
@@ -1175,9 +1175,9 @@ discard block |
||
1175 | 1175 | // If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response), |
1176 | 1176 | // then we assume it's changed. If it's changed, unset the status and the previous response. |
1177 | 1177 | if ( $local_key !== $response_key ) { |
1178 | - unset( $posted_settings['license_key_response'] ); |
|
1179 | - unset( $posted_settings['license_key_status'] ); |
|
1180 | - \GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1178 | + unset( $posted_settings[ 'license_key_response' ] ); |
|
1179 | + unset( $posted_settings[ 'license_key_status' ] ); |
|
1180 | + \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1181 | 1181 | } |
1182 | 1182 | return $posted_settings; |
1183 | 1183 | } |
@@ -134,28 +134,28 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function add_network_menu() { |
136 | 136 | |
137 | - if ( ! gravityview()->plugin->is_network_activated() ) { |
|
137 | + if ( ! gravityview()->plugin->is_network_activated() ) { |
|
138 | 138 | return; |
139 | 139 | } |
140 | 140 | |
141 | - add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); |
|
141 | + add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
145 | - * Uninstall all traces of GravityView |
|
146 | - * |
|
147 | - * Note: method is public because parent method is public |
|
148 | - * |
|
145 | + * Uninstall all traces of GravityView |
|
146 | + * |
|
147 | + * Note: method is public because parent method is public |
|
148 | + * |
|
149 | 149 | * @return bool |
150 | 150 | */ |
151 | 151 | public function uninstall() { |
152 | 152 | gravityview()->plugin->uninstall(); |
153 | 153 | |
154 | 154 | /** |
155 | - * Set the path so that Gravity Forms can de-activate GravityView |
|
156 | - * @see GFAddOn::uninstall_addon |
|
157 | - * @uses deactivate_plugins() |
|
158 | - */ |
|
155 | + * Set the path so that Gravity Forms can de-activate GravityView |
|
156 | + * @see GFAddOn::uninstall_addon |
|
157 | + * @uses deactivate_plugins() |
|
158 | + */ |
|
159 | 159 | $this->_path = GRAVITYVIEW_FILE; |
160 | 160 | |
161 | 161 | return true; |
@@ -185,42 +185,42 @@ discard block |
||
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
188 | - * Get an array of reasons why the plugin might be uninstalled |
|
189 | - * |
|
190 | - * @since 1.17.5 |
|
191 | - * |
|
188 | + * Get an array of reasons why the plugin might be uninstalled |
|
189 | + * |
|
190 | + * @since 1.17.5 |
|
191 | + * |
|
192 | 192 | * @return array Array of reasons with the label and followup questions for each uninstall reason |
193 | 193 | */ |
194 | 194 | private function get_uninstall_reasons() { |
195 | 195 | $reasons = array( |
196 | 196 | 'will-continue' => array( |
197 | - 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
198 | - ), |
|
197 | + 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
198 | + ), |
|
199 | 199 | 'no-longer-need' => array( |
200 | - 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
201 | - ), |
|
200 | + 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
201 | + ), |
|
202 | 202 | 'doesnt-work' => array( |
203 | - 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
204 | - ), |
|
203 | + 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
204 | + ), |
|
205 | 205 | 'found-other' => array( |
206 | - 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
207 | - 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
208 | - ), |
|
206 | + 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
207 | + 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
208 | + ), |
|
209 | 209 | 'other' => array( |
210 | - 'label' => esc_html__( 'Other', 'gravityview' ), |
|
211 | - ), |
|
210 | + 'label' => esc_html__( 'Other', 'gravityview' ), |
|
211 | + ), |
|
212 | 212 | ); |
213 | 213 | |
214 | 214 | shuffle( $reasons ); |
215 | 215 | |
216 | 216 | return $reasons; |
217 | - } |
|
217 | + } |
|
218 | 218 | |
219 | 219 | /** |
220 | - * Display a feedback form when the plugin is uninstalled |
|
221 | - * |
|
222 | - * @since 1.17.5 |
|
223 | - * |
|
220 | + * Display a feedback form when the plugin is uninstalled |
|
221 | + * |
|
222 | + * @since 1.17.5 |
|
223 | + * |
|
224 | 224 | * @return string HTML of the uninstallation form |
225 | 225 | */ |
226 | 226 | public function uninstall_form() { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2> |
301 | 301 | <ul> |
302 | 302 | <?php |
303 | - $reasons = $this->get_uninstall_reasons(); |
|
303 | + $reasons = $this->get_uninstall_reasons(); |
|
304 | 304 | foreach ( $reasons as $reason ) { |
305 | 305 | printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) ); |
306 | 306 | } |
@@ -394,12 +394,12 @@ discard block |
||
394 | 394 | } |
395 | 395 | |
396 | 396 | public function app_settings_tab() { |
397 | - parent::app_settings_tab(); |
|
397 | + parent::app_settings_tab(); |
|
398 | 398 | |
399 | 399 | if ( $this->maybe_uninstall() ) { |
400 | - echo $this->uninstall_form(); |
|
400 | + echo $this->uninstall_form(); |
|
401 | 401 | } |
402 | - } |
|
402 | + } |
|
403 | 403 | |
404 | 404 | /** |
405 | 405 | * The Settings title |
@@ -557,8 +557,8 @@ discard block |
||
557 | 557 | type="' . $field['type'] . '" |
558 | 558 | name="' . esc_attr( $name ) . '" |
559 | 559 | value="' . $value . '" ' . |
560 | - implode( ' ', $attributes ) . |
|
561 | - ' />'; |
|
560 | + implode( ' ', $attributes ) . |
|
561 | + ' />'; |
|
562 | 562 | |
563 | 563 | if ( $echo ) { |
564 | 564 | echo $html; |
@@ -576,12 +576,12 @@ discard block |
||
576 | 576 | } |
577 | 577 | |
578 | 578 | /** |
579 | - * Check whether GravityView is being saved |
|
580 | - * |
|
581 | - * The generic is_save_postback() is true for all addons |
|
582 | - * |
|
583 | - * @since 2.0.8 |
|
584 | - * |
|
579 | + * Check whether GravityView is being saved |
|
580 | + * |
|
581 | + * The generic is_save_postback() is true for all addons |
|
582 | + * |
|
583 | + * @since 2.0.8 |
|
584 | + * |
|
585 | 585 | * @return bool |
586 | 586 | */ |
587 | 587 | public function is_save_postback() { |
@@ -595,16 +595,16 @@ discard block |
||
595 | 595 | */ |
596 | 596 | public function license_key_notice() { |
597 | 597 | |
598 | - if( $this->is_save_postback() ) { |
|
599 | - $settings = $this->get_posted_settings(); |
|
600 | - $license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
601 | - $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
602 | - } else { |
|
603 | - $license_status = $this->get( 'license_key_status', 'inactive' ); |
|
604 | - $license_key = $this->get( 'license_key' ); |
|
605 | - } |
|
598 | + if( $this->is_save_postback() ) { |
|
599 | + $settings = $this->get_posted_settings(); |
|
600 | + $license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
601 | + $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
602 | + } else { |
|
603 | + $license_status = $this->get( 'license_key_status', 'inactive' ); |
|
604 | + $license_key = $this->get( 'license_key' ); |
|
605 | + } |
|
606 | 606 | |
607 | - $license_id = empty( $license_key ) ? 'license' : $license_key; |
|
607 | + $license_id = empty( $license_key ) ? 'license' : $license_key; |
|
608 | 608 | |
609 | 609 | $message = esc_html__( 'Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
610 | 610 | |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | $update_below = false; |
622 | 622 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
623 | 623 | |
624 | - switch ( $license_status ) { |
|
624 | + switch ( $license_status ) { |
|
625 | 625 | /** @since 1.17 */ |
626 | 626 | case 'expired': |
627 | 627 | $title = __( 'Expired License', 'gravityview' ); |
@@ -659,13 +659,13 @@ discard block |
||
659 | 659 | return; |
660 | 660 | } |
661 | 661 | |
662 | - \GravityView_Admin_Notices::add_notice( array( |
|
663 | - 'message' => $message, |
|
664 | - 'class' => 'notice notice-warning', |
|
665 | - 'title' => $title, |
|
666 | - 'cap' => 'gravityview_edit_settings', |
|
667 | - 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) |
|
668 | - ) ); |
|
662 | + \GravityView_Admin_Notices::add_notice( array( |
|
663 | + 'message' => $message, |
|
664 | + 'class' => 'notice notice-warning', |
|
665 | + 'title' => $title, |
|
666 | + 'cap' => 'gravityview_edit_settings', |
|
667 | + 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) |
|
668 | + ) ); |
|
669 | 669 | } |
670 | 670 | |
671 | 671 | /** |
@@ -679,12 +679,12 @@ discard block |
||
679 | 679 | } |
680 | 680 | |
681 | 681 | /** |
682 | - * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
683 | - * |
|
684 | - * @since 1.21.5 |
|
685 | - * |
|
686 | - * @see GFAddOn::scripts() |
|
687 | - * |
|
682 | + * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
683 | + * |
|
684 | + * @since 1.21.5 |
|
685 | + * |
|
686 | + * @see GFAddOn::scripts() |
|
687 | + * |
|
688 | 688 | * @return array Array of scripts |
689 | 689 | */ |
690 | 690 | public function scripts() { |
@@ -693,10 +693,10 @@ discard block |
||
693 | 693 | $scripts[] = array( |
694 | 694 | 'handle' => 'gform_tooltip_init', |
695 | 695 | 'enqueue' => array( |
696 | - array( |
|
697 | - 'admin_page' => array( 'app_settings' ) |
|
698 | - ) |
|
699 | - ) |
|
696 | + array( |
|
697 | + 'admin_page' => array( 'app_settings' ) |
|
698 | + ) |
|
699 | + ) |
|
700 | 700 | ); |
701 | 701 | |
702 | 702 | return $scripts; |
@@ -714,10 +714,10 @@ discard block |
||
714 | 714 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
715 | 715 | 'version' => Plugin::$version, |
716 | 716 | 'deps' => array( |
717 | - 'gform_admin', |
|
717 | + 'gform_admin', |
|
718 | 718 | 'gaddon_form_settings_css', |
719 | - 'gform_tooltip', |
|
720 | - 'gform_font_awesome', |
|
719 | + 'gform_tooltip', |
|
720 | + 'gform_font_awesome', |
|
721 | 721 | ), |
722 | 722 | 'enqueue' => array( |
723 | 723 | array( 'admin_page' => array( |
@@ -885,7 +885,7 @@ discard block |
||
885 | 885 | array( |
886 | 886 | 'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ), |
887 | 887 | 'value' => '1', |
888 | - 'name' => 'beta', |
|
888 | + 'name' => 'beta', |
|
889 | 889 | ), |
890 | 890 | ), |
891 | 891 | 'description' => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ), |
@@ -923,38 +923,38 @@ discard block |
||
923 | 923 | |
924 | 924 | if ( empty( $field['disabled'] ) ) { |
925 | 925 | unset( $field['disabled'] ); |
926 | - } |
|
926 | + } |
|
927 | 927 | } |
928 | 928 | |
929 | - $sections = array( |
|
930 | - array( |
|
931 | - 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
932 | - 'fields' => $fields, |
|
933 | - ) |
|
934 | - ); |
|
929 | + $sections = array( |
|
930 | + array( |
|
931 | + 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
932 | + 'fields' => $fields, |
|
933 | + ) |
|
934 | + ); |
|
935 | 935 | |
936 | - // custom 'update settings' button |
|
937 | - $button = array( |
|
938 | - 'class' => 'button button-primary button-hero', |
|
939 | - 'type' => 'save', |
|
940 | - ); |
|
936 | + // custom 'update settings' button |
|
937 | + $button = array( |
|
938 | + 'class' => 'button button-primary button-hero', |
|
939 | + 'type' => 'save', |
|
940 | + ); |
|
941 | 941 | |
942 | 942 | if ( $disabled_attribute ) { |
943 | 943 | $button['disabled'] = $disabled_attribute; |
944 | 944 | } |
945 | 945 | |
946 | - /** |
|
947 | - * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
948 | - * Extensions can tap in here to insert their own section and settings. |
|
949 | - * <code> |
|
950 | - * $sections[] = array( |
|
951 | - * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
952 | - * 'fields' => $settings, |
|
953 | - * ); |
|
954 | - * </code> |
|
955 | - * @param array $extension_settings Empty array, ready for extension settings! |
|
956 | - */ |
|
957 | - $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
946 | + /** |
|
947 | + * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
948 | + * Extensions can tap in here to insert their own section and settings. |
|
949 | + * <code> |
|
950 | + * $sections[] = array( |
|
951 | + * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
952 | + * 'fields' => $settings, |
|
953 | + * ); |
|
954 | + * </code> |
|
955 | + * @param array $extension_settings Empty array, ready for extension settings! |
|
956 | + */ |
|
957 | + $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
958 | 958 | |
959 | 959 | // If there are extensions, add a section for them |
960 | 960 | if ( ! empty( $extension_sections ) ) { |
@@ -967,13 +967,13 @@ discard block |
||
967 | 967 | } |
968 | 968 | } |
969 | 969 | |
970 | - $k = count( $extension_sections ) - 1 ; |
|
971 | - $extension_sections[ $k ]['fields'][] = $button; |
|
970 | + $k = count( $extension_sections ) - 1 ; |
|
971 | + $extension_sections[ $k ]['fields'][] = $button; |
|
972 | 972 | $sections = array_merge( $sections, $extension_sections ); |
973 | 973 | } else { |
974 | - // add the 'update settings' button to the general section |
|
975 | - $sections[0]['fields'][] = $button; |
|
976 | - } |
|
974 | + // add the 'update settings' button to the general section |
|
975 | + $sections[0]['fields'][] = $button; |
|
976 | + } |
|
977 | 977 | |
978 | 978 | return $sections; |
979 | 979 | } |
@@ -1027,9 +1027,9 @@ discard block |
||
1027 | 1027 | */ |
1028 | 1028 | protected function settings_edd_license( $field, $echo = true ) { |
1029 | 1029 | |
1030 | - if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
1031 | - $field['input_type'] = 'password'; |
|
1032 | - } |
|
1030 | + if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
1031 | + $field['input_type'] = 'password'; |
|
1032 | + } |
|
1033 | 1033 | |
1034 | 1034 | $text = $this->settings_text( $field, false ); |
1035 | 1035 | |
@@ -1046,9 +1046,9 @@ discard block |
||
1046 | 1046 | |
1047 | 1047 | /** |
1048 | 1048 | * Allow pure HTML settings row |
1049 | - * |
|
1050 | - * @since 2.0.6 |
|
1051 | - * |
|
1049 | + * |
|
1050 | + * @since 2.0.6 |
|
1051 | + * |
|
1052 | 1052 | * @param array $field |
1053 | 1053 | * @param bool $echo Whether to echo the |
1054 | 1054 | * |
@@ -1114,19 +1114,19 @@ discard block |
||
1114 | 1114 | } |
1115 | 1115 | |
1116 | 1116 | /** |
1117 | - * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
1118 | - * |
|
1119 | - * Converts `$field['description']` to `$field['gv_description']` |
|
1120 | - * Converts `$field['subtitle']` to `$field['description']` |
|
1121 | - * |
|
1122 | - * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
1123 | - * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
1124 | - * |
|
1125 | - * @since 1.21.5.2 |
|
1126 | - * |
|
1117 | + * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
1118 | + * |
|
1119 | + * Converts `$field['description']` to `$field['gv_description']` |
|
1120 | + * Converts `$field['subtitle']` to `$field['description']` |
|
1121 | + * |
|
1122 | + * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
1123 | + * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
1124 | + * |
|
1125 | + * @since 1.21.5.2 |
|
1126 | + * |
|
1127 | 1127 | * @param array $field |
1128 | - * |
|
1129 | - * @return void |
|
1128 | + * |
|
1129 | + * @return void |
|
1130 | 1130 | */ |
1131 | 1131 | public function single_setting_row( $field ) { |
1132 | 1132 | $field['gv_description'] = Utils::get( $field, 'description' ); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | $is_page = false; |
40 | 40 | |
41 | - if( function_exists( '\get_current_screen' ) || function_exists( 'get_current_screen' ) ) { |
|
41 | + if ( function_exists( '\get_current_screen' ) || function_exists( 'get_current_screen' ) ) { |
|
42 | 42 | $current_screen = \get_current_screen(); |
43 | 43 | } else { |
44 | 44 | $current_screen = false; |
@@ -51,13 +51,13 @@ discard block |
||
51 | 51 | $is_page = 'single'; |
52 | 52 | } elseif ( $is_gv_settings = 'gravityview_page_gravityview_settings' === $current_screen->id ) { |
53 | 53 | $is_page = 'settings'; |
54 | - } elseif( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) { |
|
54 | + } elseif ( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) { |
|
55 | 55 | $is_page = 'downloads'; |
56 | - } elseif( $is_changelog = 'gravityview_page_gv-changelog' === $current_screen->id ) { |
|
56 | + } elseif ( $is_changelog = 'gravityview_page_gv-changelog' === $current_screen->id ) { |
|
57 | 57 | $is_page = 'changelog'; |
58 | - } elseif( $is_getting_started = 'gravityview_page_gv-getting-started' === $current_screen->id ) { |
|
58 | + } elseif ( $is_getting_started = 'gravityview_page_gv-getting-started' === $current_screen->id ) { |
|
59 | 59 | $is_page = 'getting-started'; |
60 | - } elseif( $is_credits = 'gravityview_page_gv-credits' === $current_screen->id ) { |
|
60 | + } elseif ( $is_credits = 'gravityview_page_gv-credits' === $current_screen->id ) { |
|
61 | 61 | $is_page = 'credits'; |
62 | 62 | } |
63 | 63 | } |