@@ -41,22 +41,22 @@ |
||
| 41 | 41 | |
| 42 | 42 | <?php |
| 43 | 43 | |
| 44 | - $search_value = \GV\Utils::_GET( $search_field['name'] ); |
|
| 44 | + $search_value = \GV\Utils::_GET( $search_field['name'] ); |
|
| 45 | 45 | |
| 46 | - foreach ( $search_field['choices'] as $k => $choice ) { |
|
| 46 | + foreach ( $search_field['choices'] as $k => $choice ) { |
|
| 47 | 47 | |
| 48 | - if ( 0 != $k ) { |
|
| 49 | - echo esc_html( $links_sep ); |
|
| 50 | - } |
|
| 48 | + if ( 0 != $k ) { |
|
| 49 | + echo esc_html( $links_sep ); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false; |
|
| 52 | + $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false; |
|
| 53 | 53 | |
| 54 | - if ( $active ) { |
|
| 55 | - $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url ); |
|
| 56 | - } else { |
|
| 57 | - $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) ); |
|
| 58 | - } |
|
| 59 | - ?> |
|
| 54 | + if ( $active ) { |
|
| 55 | + $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url ); |
|
| 56 | + } else { |
|
| 57 | + $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) ); |
|
| 58 | + } |
|
| 59 | + ?> |
|
| 60 | 60 | |
| 61 | 61 | <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a> |
| 62 | 62 | |
@@ -13,12 +13,12 @@ discard block |
||
| 13 | 13 | $base_url = GravityView_Widget_Search::get_search_form_action(); |
| 14 | 14 | |
| 15 | 15 | // Make sure that there are choices to display |
| 16 | -if ( empty( $search_field['choices'] ) ) { |
|
| 16 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
| 17 | 17 | gravityview()->log->debug( 'search-field-link.php - No choices for field' ); |
| 18 | 18 | return; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | -$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label']; |
|
| 21 | +$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ]; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type |
@@ -41,24 +41,24 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | <?php |
| 43 | 43 | |
| 44 | - $search_value = \GV\Utils::_GET( $search_field['name'] ); |
|
| 44 | + $search_value = \GV\Utils::_GET( $search_field[ 'name' ] ); |
|
| 45 | 45 | |
| 46 | - foreach ( $search_field['choices'] as $k => $choice ) { |
|
| 46 | + foreach ( $search_field[ 'choices' ] as $k => $choice ) { |
|
| 47 | 47 | |
| 48 | 48 | if ( 0 != $k ) { |
| 49 | 49 | echo esc_html( $links_sep ); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false; |
|
| 52 | + $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false; |
|
| 53 | 53 | |
| 54 | 54 | if ( $active ) { |
| 55 | - $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url ); |
|
| 55 | + $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url ); |
|
| 56 | 56 | } else { |
| 57 | - $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) ); |
|
| 57 | + $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) ); |
|
| 58 | 58 | } |
| 59 | 59 | ?> |
| 60 | 60 | |
| 61 | - <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a> |
|
| 61 | + <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a> |
|
| 62 | 62 | |
| 63 | 63 | <?php } ?> |
| 64 | 64 | </p> |
@@ -10,22 +10,22 @@ |
||
| 10 | 10 | $search_field = $gravityview_view->search_field; |
| 11 | 11 | |
| 12 | 12 | // Make sure that there are choices to display |
| 13 | -if( empty( $search_field['choices'] ) ) { |
|
| 13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
| 14 | 14 | gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' ); |
| 15 | 15 | return; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | ?> |
| 19 | 19 | <div class="gv-search-box gv-search-field-checkbox"> |
| 20 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
| 21 | - <label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label> |
|
| 20 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
| 21 | + <label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
| 22 | 22 | <?php } ?> |
| 23 | 23 | <p> |
| 24 | - <?php foreach( $search_field['choices'] as $choice ) { ?> |
|
| 24 | + <?php foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
| 25 | 25 | |
| 26 | - <label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio"> |
|
| 27 | - <input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>> |
|
| 28 | - <?php echo esc_html( $choice['text'] ); ?> |
|
| 26 | + <label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio"> |
|
| 27 | + <input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>> |
|
| 28 | + <?php echo esc_html( $choice[ 'text' ] ); ?> |
|
| 29 | 29 | </label> |
| 30 | 30 | |
| 31 | 31 | <?php } ?> |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button) |
| 33 | 33 | * @param GravityView_Widget_Search $this GravityView Widget instance |
| 34 | - * @param array $search_field |
|
| 34 | + * @param array $search_field |
|
| 35 | 35 | */ |
| 36 | 36 | do_action( 'gravityview_search_widget_field_before', $this, $search_field ); |
| 37 | 37 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | /** |
| 47 | 47 | * @action `gravityview_search_widget_field_after` After each search input is rendered (other than the submit button) |
| 48 | 48 | * @param GravityView_Widget_Search $this GravityView Widget instance |
| 49 | - * @param array $search_field |
|
| 49 | + * @param array $search_field |
|
| 50 | 50 | */ |
| 51 | 51 | do_action( 'gravityview_search_widget_field_after', $this, $search_field ); |
| 52 | 52 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | do_action( 'gravityview_search_widget_fields_after', $this ); |
| 59 | 59 | |
| 60 | 60 | if( $has_inputs ) { |
| 61 | - $this->render( 'search-field', 'submit', false ); |
|
| 62 | - } |
|
| 61 | + $this->render( 'search-field', 'submit', false ); |
|
| 62 | + } |
|
| 63 | 63 | ?> |
| 64 | 64 | </form> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | do_action( 'gravityview_search_widget_fields_before', $this ); |
| 28 | 28 | |
| 29 | - foreach( array_merge( $this->search_fields, $this->permalink_fields ) as $search_field ) { |
|
| 29 | + foreach ( array_merge( $this->search_fields, $this->permalink_fields ) as $search_field ) { |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button) |
@@ -36,10 +36,10 @@ discard block |
||
| 36 | 36 | do_action( 'gravityview_search_widget_field_before', $this, $search_field ); |
| 37 | 37 | |
| 38 | 38 | $gravityview_view->search_field = $search_field; |
| 39 | - $this->render( 'search-field', $search_field['input'], false ); |
|
| 39 | + $this->render( 'search-field', $search_field[ 'input' ], false ); |
|
| 40 | 40 | |
| 41 | 41 | // show/hide the search button if there are input type fields |
| 42 | - if( !$has_inputs && $search_field['input'] != 'link' ) { |
|
| 42 | + if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) { |
|
| 43 | 43 | $has_inputs = true; |
| 44 | 44 | } |
| 45 | 45 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | do_action( 'gravityview_search_widget_fields_after', $this ); |
| 59 | 59 | |
| 60 | - if( $has_inputs ) { |
|
| 60 | + if ( $has_inputs ) { |
|
| 61 | 61 | $this->render( 'search-field', 'submit', false ); |
| 62 | 62 | } |
| 63 | 63 | ?> |
@@ -10,22 +10,22 @@ |
||
| 10 | 10 | $search_field = $gravityview_view->search_field; |
| 11 | 11 | |
| 12 | 12 | // Make sure that there are choices to display |
| 13 | -if( empty( $search_field['choices'] ) ) { |
|
| 13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
| 14 | 14 | gravityview()->log->debug( 'search-field-radio.php - No choices for field' ); |
| 15 | 15 | return; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | ?> |
| 19 | 19 | <div class="gv-search-box gv-search-field-radio"> |
| 20 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
| 21 | - <label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label> |
|
| 20 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
| 21 | + <label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
| 22 | 22 | <?php } ?> |
| 23 | 23 | <p> |
| 24 | - <?php foreach( $search_field['choices'] as $choice ) { ?> |
|
| 24 | + <?php foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
| 25 | 25 | |
| 26 | - <label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio"> |
|
| 27 | - <input type="radio" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php checked( $choice['value'], $search_field['value'], true ); ?>> |
|
| 28 | - <?php echo esc_html( $choice['text'] ); ?> |
|
| 26 | + <label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio"> |
|
| 27 | + <input type="radio" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php checked( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>> |
|
| 28 | + <?php echo esc_html( $choice[ 'text' ] ); ?> |
|
| 29 | 29 | </label> |
| 30 | 30 | |
| 31 | 31 | <?php } ?> |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | $search_field = $gravityview_view->search_field; |
| 11 | 11 | |
| 12 | 12 | // Make sure that there are choices to display |
| 13 | -if( empty( $search_field['choices'] ) ) { |
|
| 13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
| 14 | 14 | gravityview()->log->debug( 'search-field-multiselect.php - No choices for field' ); |
| 15 | 15 | return; |
| 16 | 16 | } |
@@ -21,19 +21,19 @@ discard block |
||
| 21 | 21 | * @param string $default_option Default: `—` (—) |
| 22 | 22 | * @param string $field_type Field type: "select" or "multiselect" |
| 23 | 23 | */ |
| 24 | -$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'multiselect' ); |
|
| 24 | +$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'multiselect' ); |
|
| 25 | 25 | |
| 26 | 26 | ?> |
| 27 | 27 | <div class="gv-search-box gv-search-field-multiselect"> |
| 28 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
| 29 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
| 28 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
| 29 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
| 30 | 30 | <?php } ?> |
| 31 | 31 | <p> |
| 32 | - <select name="<?php echo esc_attr( $search_field['name'] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" multiple> |
|
| 33 | - <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
| 32 | + <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" multiple> |
|
| 33 | + <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
| 34 | 34 | <?php |
| 35 | - foreach( $search_field['choices'] as $choice ) : ?> |
|
| 36 | - <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
| 35 | + foreach ( $search_field[ 'choices' ] as $choice ) : ?> |
|
| 36 | + <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
| 37 | 37 | <?php endforeach; ?> |
| 38 | 38 | </select> |
| 39 | 39 | </p> |
@@ -28,13 +28,13 @@ |
||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); |
| 30 | 30 | |
| 31 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 32 | - $class .= ' merge-tag-support mt-position-right '; |
|
| 31 | + if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 32 | + $class .= ' merge-tag-support mt-position-right '; |
|
| 33 | 33 | |
| 34 | - if( empty( $this->field['show_all_fields'] ) ) { |
|
| 35 | - $class .= ' mt-hide_all_fields '; |
|
| 36 | - } |
|
| 37 | - } |
|
| 34 | + if( empty( $this->field['show_all_fields'] ) ) { |
|
| 35 | + $class .= ' mt-hide_all_fields '; |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | 38 | $class .= \GV\Utils::get( $this->field, 'class' ); |
| 39 | 39 | $placeholder = \GV\Utils::get( $this->field, 'placeholder' ); |
| 40 | 40 | $rows = \GV\Utils::get( $this->field, 'rows', 5 ); |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | ?> |
| 10 | 10 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php |
| 11 | 11 | |
| 12 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; |
|
| 12 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; |
|
| 13 | 13 | echo $this->get_tooltip() . $this->get_field_desc(); |
| 14 | 14 | ?><div> |
| 15 | 15 | <?php $this->render_input(); ?> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | function render_input( $override_input = null ) { |
| 22 | - if( isset( $override_input ) ) { |
|
| 22 | + if ( isset( $override_input ) ) { |
|
| 23 | 23 | echo $override_input; |
| 24 | 24 | return; |
| 25 | 25 | } |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); |
| 30 | 30 | |
| 31 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 31 | + if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { |
|
| 32 | 32 | $class .= ' merge-tag-support mt-position-right '; |
| 33 | 33 | |
| 34 | - if( empty( $this->field['show_all_fields'] ) ) { |
|
| 34 | + if ( empty( $this->field[ 'show_all_fields' ] ) ) { |
|
| 35 | 35 | $class .= ' mt-hide_all_fields '; |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $placeholder = \GV\Utils::get( $this->field, 'placeholder' ); |
| 40 | 40 | $rows = \GV\Utils::get( $this->field, 'rows', 5 ); |
| 41 | 41 | ?> |
| 42 | - <textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea> |
|
| 42 | + <textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea> |
|
| 43 | 43 | <?php |
| 44 | 44 | } |
| 45 | 45 | |
@@ -28,11 +28,11 @@ |
||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); |
| 30 | 30 | |
| 31 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 32 | - $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
|
| 33 | - } |
|
| 34 | - $class .= \GV\Utils::get( $this->field, 'class', 'widefat' ); |
|
| 35 | - $placeholder = \GV\Utils::get( $this->field, 'placeholder' ); |
|
| 31 | + if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 32 | + $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
|
| 33 | + } |
|
| 34 | + $class .= \GV\Utils::get( $this->field, 'class', 'widefat' ); |
|
| 35 | + $placeholder = \GV\Utils::get( $this->field, 'placeholder' ); |
|
| 36 | 36 | ?> |
| 37 | 37 | <input name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>"> |
| 38 | 38 | <?php |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | ?> |
| 9 | 9 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php |
| 10 | 10 | |
| 11 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; |
|
| 11 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; |
|
| 12 | 12 | echo $this->get_tooltip() . $this->get_field_desc(); |
| 13 | 13 | ?><div> |
| 14 | 14 | <?php $this->render_input(); ?> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | function render_input( $override_input = null ) { |
| 21 | 21 | |
| 22 | - if( isset( $override_input ) ) { |
|
| 22 | + if ( isset( $override_input ) ) { |
|
| 23 | 23 | echo $override_input; |
| 24 | 24 | return; |
| 25 | 25 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); |
| 30 | 30 | |
| 31 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
| 31 | + if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { |
|
| 32 | 32 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
| 33 | 33 | } |
| 34 | 34 | $class .= \GV\Utils::get( $this->field, 'class', 'widefat' ); |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | |
| 240 | 240 | self::getInstance()->set_entry( $entry ); |
| 241 | 241 | |
| 242 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 242 | + $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 243 | 243 | |
| 244 | 244 | if ( empty( $base ) ) { |
| 245 | 245 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | 'action' => 'delete', |
| 254 | 254 | 'entry_id' => $entry_slug, |
| 255 | 255 | 'gvid' => $view_id, |
| 256 | - 'view_id' => $view_id, |
|
| 256 | + 'view_id' => $view_id, |
|
| 257 | 257 | ), $base ); |
| 258 | 258 | |
| 259 | 259 | $url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' ); |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | * @since 1.16.4 |
| 428 | 428 | * @param int $entry_id ID of the Gravity Forms entry |
| 429 | 429 | * @param array $entry Deleted entry array |
| 430 | - */ |
|
| 430 | + */ |
|
| 431 | 431 | do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry ); |
| 432 | 432 | } |
| 433 | 433 | |
@@ -222,7 +222,6 @@ discard block |
||
| 222 | 222 | * |
| 223 | 223 | * @since 1.5.1 |
| 224 | 224 | * @param array $visibility_caps Array of capabilities to display in field dropdown. |
| 225 | - * @param string $field_type Type of field options to render (`field` or `widget`) |
|
| 226 | 225 | * @param string $template_id Table slug |
| 227 | 226 | * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
| 228 | 227 | * @param string $context What context are we in? Example: `single` or `directory` |
@@ -651,7 +650,7 @@ discard block |
||
| 651 | 650 | * |
| 652 | 651 | * @param array $entry Gravity Forms entry array |
| 653 | 652 | * @param array $field Field settings (optional) |
| 654 | - * @param int|\GV\View $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional) |
|
| 653 | + * @param integer $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional) |
|
| 655 | 654 | * @return bool |
| 656 | 655 | */ |
| 657 | 656 | public static function check_user_cap_delete_entry( $entry, $field = array(), $view = 0 ) { |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | add_action( 'wp', array( $this, 'process_delete' ), 10000 ); |
| 44 | 44 | |
| 45 | - add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 ); |
|
| 45 | + add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
| 46 | 46 | |
| 47 | 47 | add_action( 'gravityview_before', array( $this, 'maybe_display_message' ) ); |
| 48 | 48 | |
| 49 | 49 | // For the Delete Entry Link, you don't want visible to all users. |
| 50 | - add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 ); |
|
| 50 | + add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
| 51 | 51 | |
| 52 | 52 | // Modify the field options based on the name of the field type |
| 53 | 53 | add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 ); |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | // add template path to check for field |
| 56 | 56 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
| 57 | 57 | |
| 58 | - add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 4 ); |
|
| 58 | + add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 4 ); |
|
| 59 | 59 | |
| 60 | - add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 61 | - add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 60 | + add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 61 | + add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
| 62 | 62 | |
| 63 | 63 | add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 ); |
| 64 | 64 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | static function getInstance() { |
| 73 | 73 | |
| 74 | - if( empty( self::$instance ) ) { |
|
| 74 | + if ( empty( self::$instance ) ) { |
|
| 75 | 75 | self::$instance = new self; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -151,20 +151,20 @@ discard block |
||
| 151 | 151 | function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 152 | 152 | |
| 153 | 153 | // Always a link, never a filter |
| 154 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
| 154 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
| 155 | 155 | |
| 156 | 156 | // Delete Entry link should only appear to visitors capable of editing entries |
| 157 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 157 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
| 158 | 158 | |
| 159 | - $add_option['delete_link'] = array( |
|
| 159 | + $add_option[ 'delete_link' ] = array( |
|
| 160 | 160 | 'type' => 'text', |
| 161 | 161 | 'label' => __( 'Delete Link Text', 'gravityview' ), |
| 162 | 162 | 'desc' => NULL, |
| 163 | - 'value' => __('Delete Entry', 'gravityview'), |
|
| 163 | + 'value' => __( 'Delete Entry', 'gravityview' ), |
|
| 164 | 164 | 'merge_tags' => true, |
| 165 | 165 | ); |
| 166 | 166 | |
| 167 | - $field_options['allow_edit_cap'] = array( |
|
| 167 | + $field_options[ 'allow_edit_cap' ] = array( |
|
| 168 | 168 | 'type' => 'select', |
| 169 | 169 | 'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ), |
| 170 | 170 | 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
@@ -188,8 +188,8 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
| 190 | 190 | |
| 191 | - if( 'edit' !== $zone ) { |
|
| 192 | - $entry_default_fields['delete_link'] = array( |
|
| 191 | + if ( 'edit' !== $zone ) { |
|
| 192 | + $entry_default_fields[ 'delete_link' ] = array( |
|
| 193 | 193 | 'label' => __( 'Delete Entry', 'gravityview' ), |
| 194 | 194 | 'type' => 'delete_link', |
| 195 | 195 | 'desc' => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ), |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | function add_available_field( $available_fields = array() ) { |
| 208 | 208 | |
| 209 | - $available_fields['delete_link'] = array( |
|
| 209 | + $available_fields[ 'delete_link' ] = array( |
|
| 210 | 210 | 'label_text' => __( 'Delete Entry', 'gravityview' ), |
| 211 | 211 | 'field_id' => 'delete_link', |
| 212 | 212 | 'label_type' => 'field', |
@@ -234,12 +234,12 @@ discard block |
||
| 234 | 234 | $caps = $visibility_caps; |
| 235 | 235 | |
| 236 | 236 | // If we're configuring fields in the edit context, we want a limited selection |
| 237 | - if( $field_id === 'delete_link' ) { |
|
| 237 | + if ( $field_id === 'delete_link' ) { |
|
| 238 | 238 | |
| 239 | 239 | // Remove other built-in caps. |
| 240 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
| 240 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] ); |
|
| 241 | 241 | |
| 242 | - $caps['read'] = _x('Entry Creator', 'User capability', 'gravityview'); |
|
| 242 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | return $caps; |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | * @param [type] $entry [description] |
| 253 | 253 | */ |
| 254 | 254 | function set_entry( $entry = null ) { |
| 255 | - $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry; |
|
| 255 | + $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry; |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | /** |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | self::getInstance()->set_entry( $entry ); |
| 287 | 287 | |
| 288 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 288 | + $base = GravityView_API::directory_link( $post_id ?: $view_id, true ); |
|
| 289 | 289 | |
| 290 | 290 | if ( empty( $base ) ) { |
| 291 | 291 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | // Use the slug instead of the ID for consistent security |
| 296 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
| 296 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
| 297 | 297 | |
| 298 | 298 | $actionurl = add_query_arg( array( |
| 299 | 299 | 'action' => 'delete', |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | 'view_id' => $view_id, |
| 303 | 303 | ), $base ); |
| 304 | 304 | |
| 305 | - $url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' ); |
|
| 305 | + $url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' ); |
|
| 306 | 306 | |
| 307 | 307 | return $url; |
| 308 | 308 | } |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) { |
| 325 | 325 | |
| 326 | 326 | // Only show the link to those who are allowed to see it. |
| 327 | - if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 327 | + if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 328 | 328 | return; |
| 329 | 329 | } |
| 330 | 330 | |
@@ -335,13 +335,13 @@ discard block |
||
| 335 | 335 | $show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true ); |
| 336 | 336 | |
| 337 | 337 | // If the button is hidden by the filter, don't show. |
| 338 | - if( !$show_delete_button ) { |
|
| 338 | + if ( ! $show_delete_button ) { |
|
| 339 | 339 | return; |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | $attributes = array( |
| 343 | 343 | 'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete', |
| 344 | - 'tabindex' => ( GFCommon::$tab_index ++ ), |
|
| 344 | + 'tabindex' => ( GFCommon::$tab_index++ ), |
|
| 345 | 345 | 'onclick' => self::get_confirm_dialog(), |
| 346 | 346 | ); |
| 347 | 347 | |
@@ -365,27 +365,27 @@ discard block |
||
| 365 | 365 | function process_delete() { |
| 366 | 366 | |
| 367 | 367 | // If the form is submitted |
| 368 | - if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) { |
|
| 368 | + if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) { |
|
| 369 | 369 | |
| 370 | 370 | // Make sure it's a GravityView request |
| 371 | - $valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) ); |
|
| 371 | + $valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) ); |
|
| 372 | 372 | |
| 373 | - if( ! $valid_nonce_key ) { |
|
| 373 | + if ( ! $valid_nonce_key ) { |
|
| 374 | 374 | gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' ); |
| 375 | 375 | return; |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | // Get the entry slug |
| 379 | - $entry_slug = esc_attr( $_GET['entry_id'] ); |
|
| 379 | + $entry_slug = esc_attr( $_GET[ 'entry_id' ] ); |
|
| 380 | 380 | |
| 381 | 381 | // See if there's an entry there |
| 382 | 382 | $entry = gravityview_get_entry( $entry_slug, true, false ); |
| 383 | 383 | |
| 384 | - if( $entry ) { |
|
| 384 | + if ( $entry ) { |
|
| 385 | 385 | |
| 386 | 386 | $has_permission = $this->user_can_delete_entry( $entry, \GV\Utils::_GET( 'gvid', \GV\Utils::_GET( 'view_id' ) ) ); |
| 387 | 387 | |
| 388 | - if( is_wp_error( $has_permission ) ) { |
|
| 388 | + if ( is_wp_error( $has_permission ) ) { |
|
| 389 | 389 | |
| 390 | 390 | $messages = array( |
| 391 | 391 | 'message' => urlencode( $has_permission->get_error_message() ), |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | // Delete the entry |
| 398 | 398 | $delete_response = $this->delete_or_trash_entry( $entry ); |
| 399 | 399 | |
| 400 | - if( is_wp_error( $delete_response ) ) { |
|
| 400 | + if ( is_wp_error( $delete_response ) ) { |
|
| 401 | 401 | |
| 402 | 402 | $messages = array( |
| 403 | 403 | 'message' => urlencode( $delete_response->get_error_message() ), |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) ); |
| 420 | 420 | |
| 421 | 421 | $messages = array( |
| 422 | - 'message' => urlencode( __('The entry does not exist.', 'gravityview') ), |
|
| 422 | + 'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ), |
|
| 423 | 423 | 'status' => 'error', |
| 424 | 424 | ); |
| 425 | 425 | } |
@@ -459,18 +459,18 @@ discard block |
||
| 459 | 459 | */ |
| 460 | 460 | private function delete_or_trash_entry( $entry ) { |
| 461 | 461 | |
| 462 | - $entry_id = $entry['id']; |
|
| 462 | + $entry_id = $entry[ 'id' ]; |
|
| 463 | 463 | |
| 464 | 464 | $mode = $this->get_delete_mode(); |
| 465 | 465 | |
| 466 | - if( 'delete' === $mode ) { |
|
| 466 | + if ( 'delete' === $mode ) { |
|
| 467 | 467 | |
| 468 | 468 | gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) ); |
| 469 | 469 | |
| 470 | 470 | // Delete the entry |
| 471 | 471 | $delete_response = GFAPI::delete_entry( $entry_id ); |
| 472 | 472 | |
| 473 | - if( ! is_wp_error( $delete_response ) ) { |
|
| 473 | + if ( ! is_wp_error( $delete_response ) ) { |
|
| 474 | 474 | $delete_response = 'deleted'; |
| 475 | 475 | |
| 476 | 476 | /** |
@@ -491,8 +491,8 @@ discard block |
||
| 491 | 491 | $trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' ); |
| 492 | 492 | new GravityView_Cache; |
| 493 | 493 | |
| 494 | - if( ! $trashed ) { |
|
| 495 | - $delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) ); |
|
| 494 | + if ( ! $trashed ) { |
|
| 495 | + $delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) ); |
|
| 496 | 496 | } else { |
| 497 | 497 | |
| 498 | 498 | /** |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | public function process_connected_posts( $entry_id = 0, $entry = array() ) { |
| 524 | 524 | |
| 525 | 525 | // The entry had no connected post |
| 526 | - if( empty( $entry['post_id'] ) ) { |
|
| 526 | + if ( empty( $entry[ 'post_id' ] ) ) { |
|
| 527 | 527 | return; |
| 528 | 528 | } |
| 529 | 529 | |
@@ -534,19 +534,19 @@ discard block |
||
| 534 | 534 | */ |
| 535 | 535 | $delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true ); |
| 536 | 536 | |
| 537 | - if( false === $delete_post ) { |
|
| 537 | + if ( false === $delete_post ) { |
|
| 538 | 538 | return; |
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | $action = current_action(); |
| 542 | 542 | |
| 543 | - if( 'gravityview/delete-entry/deleted' === $action ) { |
|
| 544 | - $result = wp_delete_post( $entry['post_id'], true ); |
|
| 543 | + if ( 'gravityview/delete-entry/deleted' === $action ) { |
|
| 544 | + $result = wp_delete_post( $entry[ 'post_id' ], true ); |
|
| 545 | 545 | } else { |
| 546 | - $result = wp_trash_post( $entry['post_id'] ); |
|
| 546 | + $result = wp_trash_post( $entry[ 'post_id' ] ); |
|
| 547 | 547 | } |
| 548 | 548 | |
| 549 | - if( false === $result ) { |
|
| 549 | + if ( false === $result ) { |
|
| 550 | 550 | gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) ); |
| 551 | 551 | } else { |
| 552 | 552 | gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) ); |
@@ -562,13 +562,13 @@ discard block |
||
| 562 | 562 | public function verify_nonce() { |
| 563 | 563 | |
| 564 | 564 | // No delete entry request was made |
| 565 | - if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) { |
|
| 565 | + if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
| 566 | 566 | return false; |
| 567 | 567 | } |
| 568 | 568 | |
| 569 | - $nonce_key = self::get_nonce_key( $_GET['entry_id'] ); |
|
| 569 | + $nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] ); |
|
| 570 | 570 | |
| 571 | - $valid = wp_verify_nonce( $_GET['delete'], $nonce_key ); |
|
| 571 | + $valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key ); |
|
| 572 | 572 | |
| 573 | 573 | /** |
| 574 | 574 | * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid. |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | */ |
| 591 | 591 | public static function get_confirm_dialog() { |
| 592 | 592 | |
| 593 | - $confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview'); |
|
| 593 | + $confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' ); |
|
| 594 | 594 | |
| 595 | 595 | /** |
| 596 | 596 | * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | */ |
| 599 | 599 | $confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm ); |
| 600 | 600 | |
| 601 | - return 'return window.confirm(\''. esc_js( $confirm ) .'\');'; |
|
| 601 | + return 'return window.confirm(\'' . esc_js( $confirm ) . '\');'; |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | /** |
@@ -616,16 +616,16 @@ discard block |
||
| 616 | 616 | |
| 617 | 617 | $error = NULL; |
| 618 | 618 | |
| 619 | - if( ! $this->verify_nonce() ) { |
|
| 620 | - $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview'); |
|
| 619 | + if ( ! $this->verify_nonce() ) { |
|
| 620 | + $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 624 | - $error = __( 'You do not have permission to delete this entry.', 'gravityview'); |
|
| 623 | + if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 624 | + $error = __( 'You do not have permission to delete this entry.', 'gravityview' ); |
|
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - if( $entry['status'] === 'trash' ) { |
|
| 628 | - if( 'trash' === $this->get_delete_mode() ) { |
|
| 627 | + if ( $entry[ 'status' ] === 'trash' ) { |
|
| 628 | + if ( 'trash' === $this->get_delete_mode() ) { |
|
| 629 | 629 | $error = __( 'The entry is already in the trash.', 'gravityview' ); |
| 630 | 630 | } else { |
| 631 | 631 | $error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' ); |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | // No errors; everything's fine here! |
| 636 | - if( empty( $error ) ) { |
|
| 636 | + if ( empty( $error ) ) { |
|
| 637 | 637 | return true; |
| 638 | 638 | } |
| 639 | 639 | |
@@ -661,17 +661,17 @@ discard block |
||
| 661 | 661 | $view = \GV\View::by_id( $view_id ); |
| 662 | 662 | } else { |
| 663 | 663 | if ( ! $view instanceof \GV\View ) { |
| 664 | - $view = \GV\View::by_id ( $view ); |
|
| 664 | + $view = \GV\View::by_id( $view ); |
|
| 665 | 665 | } |
| 666 | 666 | $view_id = $view->ID; |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | $current_user = wp_get_current_user(); |
| 670 | 670 | |
| 671 | - $entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL; |
|
| 671 | + $entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL; |
|
| 672 | 672 | |
| 673 | 673 | // Or if they can delete any entries (as defined in Gravity Forms), we're good. |
| 674 | - if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
| 674 | + if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
| 675 | 675 | |
| 676 | 676 | gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' ); |
| 677 | 677 | |
@@ -680,20 +680,20 @@ discard block |
||
| 680 | 680 | |
| 681 | 681 | |
| 682 | 682 | // If field options are passed, check if current user can view the link |
| 683 | - if( !empty( $field ) ) { |
|
| 683 | + if ( ! empty( $field ) ) { |
|
| 684 | 684 | |
| 685 | 685 | // If capability is not defined, something is not right! |
| 686 | - if( empty( $field['allow_edit_cap'] ) ) { |
|
| 686 | + if ( empty( $field[ 'allow_edit_cap' ] ) ) { |
|
| 687 | 687 | |
| 688 | 688 | gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) ); |
| 689 | 689 | |
| 690 | 690 | return false; |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | - if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) { |
|
| 693 | + if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) { |
|
| 694 | 694 | |
| 695 | 695 | // Do not return true if cap is read, as we need to check if the current user created the entry |
| 696 | - if( $field['allow_edit_cap'] !== 'read' ) { |
|
| 696 | + if ( $field[ 'allow_edit_cap' ] !== 'read' ) { |
|
| 697 | 697 | return true; |
| 698 | 698 | } |
| 699 | 699 | |
@@ -706,9 +706,9 @@ discard block |
||
| 706 | 706 | |
| 707 | 707 | } |
| 708 | 708 | |
| 709 | - if( !isset( $entry['created_by'] ) ) { |
|
| 709 | + if ( ! isset( $entry[ 'created_by' ] ) ) { |
|
| 710 | 710 | |
| 711 | - gravityview()->log->error( 'Entry `created_by` doesn\'t exist.'); |
|
| 711 | + gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' ); |
|
| 712 | 712 | |
| 713 | 713 | return false; |
| 714 | 714 | } |
@@ -722,7 +722,7 @@ discard block |
||
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | // If the logged-in user is the same as the user who created the entry, we're good. |
| 725 | - if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
| 725 | + if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) { |
|
| 726 | 726 | |
| 727 | 727 | gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) ); |
| 728 | 728 | |
@@ -746,12 +746,12 @@ discard block |
||
| 746 | 746 | * @return void |
| 747 | 747 | */ |
| 748 | 748 | public function maybe_display_message( $current_view_id = 0 ) { |
| 749 | - if( empty( $_GET['status'] ) || ! self::verify_nonce() ) { |
|
| 749 | + if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) { |
|
| 750 | 750 | return; |
| 751 | 751 | } |
| 752 | 752 | |
| 753 | 753 | // Entry wasn't deleted from current View |
| 754 | - if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) { |
|
| 754 | + if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) { |
|
| 755 | 755 | return; |
| 756 | 756 | } |
| 757 | 757 | |
@@ -760,11 +760,11 @@ discard block |
||
| 760 | 760 | |
| 761 | 761 | public function display_message() { |
| 762 | 762 | |
| 763 | - if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) { |
|
| 763 | + if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
| 764 | 764 | return; |
| 765 | 765 | } |
| 766 | 766 | |
| 767 | - $status = esc_attr( $_GET['status'] ); |
|
| 767 | + $status = esc_attr( $_GET[ 'status' ] ); |
|
| 768 | 768 | $message_from_url = \GV\Utils::_GET( 'message' ); |
| 769 | 769 | $message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) ); |
| 770 | 770 | $class = ''; |
@@ -772,14 +772,14 @@ discard block |
||
| 772 | 772 | switch ( $status ) { |
| 773 | 773 | case 'error': |
| 774 | 774 | $class = ' gv-error error'; |
| 775 | - $error_message = __('There was an error deleting the entry: %s', 'gravityview'); |
|
| 775 | + $error_message = __( 'There was an error deleting the entry: %s', 'gravityview' ); |
|
| 776 | 776 | $message = sprintf( $error_message, $message_from_url ); |
| 777 | 777 | break; |
| 778 | 778 | case 'trashed': |
| 779 | - $message = __('The entry was successfully moved to the trash.', 'gravityview'); |
|
| 779 | + $message = __( 'The entry was successfully moved to the trash.', 'gravityview' ); |
|
| 780 | 780 | break; |
| 781 | 781 | default: |
| 782 | - $message = __('The entry was successfully deleted.', 'gravityview'); |
|
| 782 | + $message = __( 'The entry was successfully deleted.', 'gravityview' ); |
|
| 783 | 783 | break; |
| 784 | 784 | } |
| 785 | 785 | |
@@ -793,7 +793,7 @@ discard block |
||
| 793 | 793 | $message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url ); |
| 794 | 794 | |
| 795 | 795 | // DISPLAY ERROR/SUCCESS MESSAGE |
| 796 | - echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>'; |
|
| 796 | + echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>'; |
|
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | static function getInstance() { |
| 43 | 43 | gravityview()->log->notice( '\GravityView_oEmbed is deprecated. Use \GV\oEmbed instead.' ); |
| 44 | 44 | |
| 45 | - if( empty( self::$instance ) ) { |
|
| 45 | + if ( empty( self::$instance ) ) { |
|
| 46 | 46 | self::$instance = new self; |
| 47 | 47 | self::$instance->initialize(); |
| 48 | 48 | } |