@@ -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 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | static function getInstance() { |
| 75 | 75 | |
| 76 | - if( empty( self::$instance ) ) { |
|
| 76 | + if ( empty( self::$instance ) ) { |
|
| 77 | 77 | self::$instance = new self; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -149,20 +149,20 @@ discard block |
||
| 149 | 149 | function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 150 | 150 | |
| 151 | 151 | // Always a link, never a filter |
| 152 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
| 152 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
| 153 | 153 | |
| 154 | 154 | // Delete Entry link should only appear to visitors capable of editing entries |
| 155 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
| 155 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
| 156 | 156 | |
| 157 | - $add_option['delete_link'] = array( |
|
| 157 | + $add_option[ 'delete_link' ] = array( |
|
| 158 | 158 | 'type' => 'text', |
| 159 | 159 | 'label' => __( 'Delete Link Text', 'gravityview' ), |
| 160 | 160 | 'desc' => NULL, |
| 161 | - 'value' => __('Delete Entry', 'gravityview'), |
|
| 161 | + 'value' => __( 'Delete Entry', 'gravityview' ), |
|
| 162 | 162 | 'merge_tags' => true, |
| 163 | 163 | ); |
| 164 | 164 | |
| 165 | - $field_options['allow_edit_cap'] = array( |
|
| 165 | + $field_options[ 'allow_edit_cap' ] = array( |
|
| 166 | 166 | 'type' => 'select', |
| 167 | 167 | 'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ), |
| 168 | 168 | 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
@@ -186,8 +186,8 @@ discard block |
||
| 186 | 186 | */ |
| 187 | 187 | function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
| 188 | 188 | |
| 189 | - if( 'edit' !== $zone ) { |
|
| 190 | - $entry_default_fields['delete_link'] = array( |
|
| 189 | + if ( 'edit' !== $zone ) { |
|
| 190 | + $entry_default_fields[ 'delete_link' ] = array( |
|
| 191 | 191 | 'label' => __( 'Delete Entry', 'gravityview' ), |
| 192 | 192 | 'type' => 'delete_link', |
| 193 | 193 | 'desc' => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ), |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | */ |
| 205 | 205 | function add_available_field( $available_fields = array() ) { |
| 206 | 206 | |
| 207 | - $available_fields['delete_link'] = array( |
|
| 207 | + $available_fields[ 'delete_link' ] = array( |
|
| 208 | 208 | 'label_text' => __( 'Delete Entry', 'gravityview' ), |
| 209 | 209 | 'field_id' => 'delete_link', |
| 210 | 210 | 'label_type' => 'field', |
@@ -247,12 +247,12 @@ discard block |
||
| 247 | 247 | $caps = $visibility_caps; |
| 248 | 248 | |
| 249 | 249 | // If we're configuring fields in the edit context, we want a limited selection |
| 250 | - if( $field_id === 'delete_link' ) { |
|
| 250 | + if ( $field_id === 'delete_link' ) { |
|
| 251 | 251 | |
| 252 | 252 | // Remove other built-in caps. |
| 253 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
| 253 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] ); |
|
| 254 | 254 | |
| 255 | - $caps['read'] = _x('Entry Creator', 'User capability', 'gravityview'); |
|
| 255 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | return $caps; |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | * @param [type] $entry [description] |
| 266 | 266 | */ |
| 267 | 267 | function set_entry( $entry = null ) { |
| 268 | - $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry; |
|
| 268 | + $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry; |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | /** |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | |
| 299 | 299 | self::getInstance()->set_entry( $entry ); |
| 300 | 300 | |
| 301 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
| 301 | + $base = GravityView_API::directory_link( $post_id ?: $view_id, true ); |
|
| 302 | 302 | |
| 303 | 303 | if ( empty( $base ) ) { |
| 304 | 304 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | 'view_id' => $view_id, |
| 318 | 318 | ), $base ); |
| 319 | 319 | |
| 320 | - $url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' ); |
|
| 320 | + $url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' ); |
|
| 321 | 321 | |
| 322 | 322 | return $url; |
| 323 | 323 | } |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) { |
| 340 | 340 | |
| 341 | 341 | // Only show the link to those who are allowed to see it. |
| 342 | - if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 342 | + if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 343 | 343 | return; |
| 344 | 344 | } |
| 345 | 345 | |
@@ -350,13 +350,13 @@ discard block |
||
| 350 | 350 | $show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true ); |
| 351 | 351 | |
| 352 | 352 | // If the button is hidden by the filter, don't show. |
| 353 | - if( !$show_delete_button ) { |
|
| 353 | + if ( ! $show_delete_button ) { |
|
| 354 | 354 | return; |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | 357 | $attributes = array( |
| 358 | 358 | 'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete', |
| 359 | - 'tabindex' => ( GFCommon::$tab_index ++ ), |
|
| 359 | + 'tabindex' => ( GFCommon::$tab_index++ ), |
|
| 360 | 360 | 'onclick' => self::get_confirm_dialog(), |
| 361 | 361 | ); |
| 362 | 362 | |
@@ -380,27 +380,27 @@ discard block |
||
| 380 | 380 | function process_delete() { |
| 381 | 381 | |
| 382 | 382 | // If the form is submitted |
| 383 | - if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) { |
|
| 383 | + if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) { |
|
| 384 | 384 | |
| 385 | 385 | // Make sure it's a GravityView request |
| 386 | - $valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) ); |
|
| 386 | + $valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) ); |
|
| 387 | 387 | |
| 388 | - if( ! $valid_nonce_key ) { |
|
| 388 | + if ( ! $valid_nonce_key ) { |
|
| 389 | 389 | gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' ); |
| 390 | 390 | return; |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | // Get the entry slug |
| 394 | - $entry_slug = esc_attr( $_GET['entry_id'] ); |
|
| 394 | + $entry_slug = esc_attr( $_GET[ 'entry_id' ] ); |
|
| 395 | 395 | |
| 396 | 396 | // See if there's an entry there |
| 397 | 397 | $entry = gravityview_get_entry( $entry_slug, true, false ); |
| 398 | 398 | |
| 399 | - if( $entry ) { |
|
| 399 | + if ( $entry ) { |
|
| 400 | 400 | |
| 401 | 401 | $has_permission = $this->user_can_delete_entry( $entry, \GV\Utils::_GET( 'gvid', \GV\Utils::_GET( 'view_id' ) ) ); |
| 402 | 402 | |
| 403 | - if( is_wp_error( $has_permission ) ) { |
|
| 403 | + if ( is_wp_error( $has_permission ) ) { |
|
| 404 | 404 | |
| 405 | 405 | $messages = array( |
| 406 | 406 | 'message' => urlencode( $has_permission->get_error_message() ), |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | // Delete the entry |
| 413 | 413 | $delete_response = $this->delete_or_trash_entry( $entry ); |
| 414 | 414 | |
| 415 | - if( is_wp_error( $delete_response ) ) { |
|
| 415 | + if ( is_wp_error( $delete_response ) ) { |
|
| 416 | 416 | |
| 417 | 417 | $messages = array( |
| 418 | 418 | 'message' => urlencode( $delete_response->get_error_message() ), |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) ); |
| 435 | 435 | |
| 436 | 436 | $messages = array( |
| 437 | - 'message' => urlencode( __('The entry does not exist.', 'gravityview') ), |
|
| 437 | + 'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ), |
|
| 438 | 438 | 'status' => 'error', |
| 439 | 439 | ); |
| 440 | 440 | } |
@@ -474,18 +474,18 @@ discard block |
||
| 474 | 474 | */ |
| 475 | 475 | private function delete_or_trash_entry( $entry ) { |
| 476 | 476 | |
| 477 | - $entry_id = $entry['id']; |
|
| 477 | + $entry_id = $entry[ 'id' ]; |
|
| 478 | 478 | |
| 479 | 479 | $mode = $this->get_delete_mode(); |
| 480 | 480 | |
| 481 | - if( 'delete' === $mode ) { |
|
| 481 | + if ( 'delete' === $mode ) { |
|
| 482 | 482 | |
| 483 | 483 | gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) ); |
| 484 | 484 | |
| 485 | 485 | // Delete the entry |
| 486 | 486 | $delete_response = GFAPI::delete_entry( $entry_id ); |
| 487 | 487 | |
| 488 | - if( ! is_wp_error( $delete_response ) ) { |
|
| 488 | + if ( ! is_wp_error( $delete_response ) ) { |
|
| 489 | 489 | $delete_response = 'deleted'; |
| 490 | 490 | |
| 491 | 491 | /** |
@@ -506,8 +506,8 @@ discard block |
||
| 506 | 506 | $trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' ); |
| 507 | 507 | new GravityView_Cache; |
| 508 | 508 | |
| 509 | - if( ! $trashed ) { |
|
| 510 | - $delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) ); |
|
| 509 | + if ( ! $trashed ) { |
|
| 510 | + $delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) ); |
|
| 511 | 511 | } else { |
| 512 | 512 | |
| 513 | 513 | /** |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | public function process_connected_posts( $entry_id = 0, $entry = array() ) { |
| 539 | 539 | |
| 540 | 540 | // The entry had no connected post |
| 541 | - if( empty( $entry['post_id'] ) ) { |
|
| 541 | + if ( empty( $entry[ 'post_id' ] ) ) { |
|
| 542 | 542 | return; |
| 543 | 543 | } |
| 544 | 544 | |
@@ -549,19 +549,19 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | $delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true ); |
| 551 | 551 | |
| 552 | - if( false === $delete_post ) { |
|
| 552 | + if ( false === $delete_post ) { |
|
| 553 | 553 | return; |
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | $action = current_action(); |
| 557 | 557 | |
| 558 | - if( 'gravityview/delete-entry/deleted' === $action ) { |
|
| 559 | - $result = wp_delete_post( $entry['post_id'], true ); |
|
| 558 | + if ( 'gravityview/delete-entry/deleted' === $action ) { |
|
| 559 | + $result = wp_delete_post( $entry[ 'post_id' ], true ); |
|
| 560 | 560 | } else { |
| 561 | - $result = wp_trash_post( $entry['post_id'] ); |
|
| 561 | + $result = wp_trash_post( $entry[ 'post_id' ] ); |
|
| 562 | 562 | } |
| 563 | 563 | |
| 564 | - if( false === $result ) { |
|
| 564 | + if ( false === $result ) { |
|
| 565 | 565 | gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) ); |
| 566 | 566 | } else { |
| 567 | 567 | gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) ); |
@@ -577,13 +577,13 @@ discard block |
||
| 577 | 577 | public function verify_nonce() { |
| 578 | 578 | |
| 579 | 579 | // No delete entry request was made |
| 580 | - if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) { |
|
| 580 | + if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
| 581 | 581 | return false; |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | - $nonce_key = self::get_nonce_key( $_GET['entry_id'] ); |
|
| 584 | + $nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] ); |
|
| 585 | 585 | |
| 586 | - $valid = wp_verify_nonce( $_GET['delete'], $nonce_key ); |
|
| 586 | + $valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key ); |
|
| 587 | 587 | |
| 588 | 588 | /** |
| 589 | 589 | * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid. |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | */ |
| 606 | 606 | public static function get_confirm_dialog() { |
| 607 | 607 | |
| 608 | - $confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview'); |
|
| 608 | + $confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' ); |
|
| 609 | 609 | |
| 610 | 610 | /** |
| 611 | 611 | * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | */ |
| 614 | 614 | $confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm ); |
| 615 | 615 | |
| 616 | - return 'return window.confirm(\''. esc_js( $confirm ) .'\');'; |
|
| 616 | + return 'return window.confirm(\'' . esc_js( $confirm ) . '\');'; |
|
| 617 | 617 | } |
| 618 | 618 | |
| 619 | 619 | /** |
@@ -631,16 +631,16 @@ discard block |
||
| 631 | 631 | |
| 632 | 632 | $error = NULL; |
| 633 | 633 | |
| 634 | - if( ! $this->verify_nonce() ) { |
|
| 635 | - $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview'); |
|
| 634 | + if ( ! $this->verify_nonce() ) { |
|
| 635 | + $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 636 | 636 | } |
| 637 | 637 | |
| 638 | - if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 639 | - $error = __( 'You do not have permission to delete this entry.', 'gravityview'); |
|
| 638 | + if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
| 639 | + $error = __( 'You do not have permission to delete this entry.', 'gravityview' ); |
|
| 640 | 640 | } |
| 641 | 641 | |
| 642 | - if( $entry['status'] === 'trash' ) { |
|
| 643 | - if( 'trash' === $this->get_delete_mode() ) { |
|
| 642 | + if ( $entry[ 'status' ] === 'trash' ) { |
|
| 643 | + if ( 'trash' === $this->get_delete_mode() ) { |
|
| 644 | 644 | $error = __( 'The entry is already in the trash.', 'gravityview' ); |
| 645 | 645 | } else { |
| 646 | 646 | $error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' ); |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | } |
| 649 | 649 | |
| 650 | 650 | // No errors; everything's fine here! |
| 651 | - if( empty( $error ) ) { |
|
| 651 | + if ( empty( $error ) ) { |
|
| 652 | 652 | return true; |
| 653 | 653 | } |
| 654 | 654 | |
@@ -676,17 +676,17 @@ discard block |
||
| 676 | 676 | $view = \GV\View::by_id( $view_id ); |
| 677 | 677 | } else { |
| 678 | 678 | if ( ! $view instanceof \GV\View ) { |
| 679 | - $view = \GV\View::by_id ( $view ); |
|
| 679 | + $view = \GV\View::by_id( $view ); |
|
| 680 | 680 | } |
| 681 | 681 | $view_id = $view->ID; |
| 682 | 682 | } |
| 683 | 683 | |
| 684 | 684 | $current_user = wp_get_current_user(); |
| 685 | 685 | |
| 686 | - $entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL; |
|
| 686 | + $entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL; |
|
| 687 | 687 | |
| 688 | 688 | // Or if they can delete any entries (as defined in Gravity Forms), we're good. |
| 689 | - if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
| 689 | + if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
| 690 | 690 | |
| 691 | 691 | gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' ); |
| 692 | 692 | |
@@ -695,20 +695,20 @@ discard block |
||
| 695 | 695 | |
| 696 | 696 | |
| 697 | 697 | // If field options are passed, check if current user can view the link |
| 698 | - if( !empty( $field ) ) { |
|
| 698 | + if ( ! empty( $field ) ) { |
|
| 699 | 699 | |
| 700 | 700 | // If capability is not defined, something is not right! |
| 701 | - if( empty( $field['allow_edit_cap'] ) ) { |
|
| 701 | + if ( empty( $field[ 'allow_edit_cap' ] ) ) { |
|
| 702 | 702 | |
| 703 | 703 | gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) ); |
| 704 | 704 | |
| 705 | 705 | return false; |
| 706 | 706 | } |
| 707 | 707 | |
| 708 | - if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) { |
|
| 708 | + if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) { |
|
| 709 | 709 | |
| 710 | 710 | // Do not return true if cap is read, as we need to check if the current user created the entry |
| 711 | - if( $field['allow_edit_cap'] !== 'read' ) { |
|
| 711 | + if ( $field[ 'allow_edit_cap' ] !== 'read' ) { |
|
| 712 | 712 | return true; |
| 713 | 713 | } |
| 714 | 714 | |
@@ -721,9 +721,9 @@ discard block |
||
| 721 | 721 | |
| 722 | 722 | } |
| 723 | 723 | |
| 724 | - if( !isset( $entry['created_by'] ) ) { |
|
| 724 | + if ( ! isset( $entry[ 'created_by' ] ) ) { |
|
| 725 | 725 | |
| 726 | - gravityview()->log->error( 'Entry `created_by` doesn\'t exist.'); |
|
| 726 | + gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' ); |
|
| 727 | 727 | |
| 728 | 728 | return false; |
| 729 | 729 | } |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | } |
| 738 | 738 | |
| 739 | 739 | // If the logged-in user is the same as the user who created the entry, we're good. |
| 740 | - if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
| 740 | + if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) { |
|
| 741 | 741 | |
| 742 | 742 | gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) ); |
| 743 | 743 | |
@@ -761,12 +761,12 @@ discard block |
||
| 761 | 761 | * @return void |
| 762 | 762 | */ |
| 763 | 763 | public function maybe_display_message( $current_view_id = 0 ) { |
| 764 | - if( empty( $_GET['status'] ) || ! self::verify_nonce() ) { |
|
| 764 | + if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) { |
|
| 765 | 765 | return; |
| 766 | 766 | } |
| 767 | 767 | |
| 768 | 768 | // Entry wasn't deleted from current View |
| 769 | - if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) { |
|
| 769 | + if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) { |
|
| 770 | 770 | return; |
| 771 | 771 | } |
| 772 | 772 | |
@@ -775,11 +775,11 @@ discard block |
||
| 775 | 775 | |
| 776 | 776 | public function display_message() { |
| 777 | 777 | |
| 778 | - if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) { |
|
| 778 | + if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
| 779 | 779 | return; |
| 780 | 780 | } |
| 781 | 781 | |
| 782 | - $status = esc_attr( $_GET['status'] ); |
|
| 782 | + $status = esc_attr( $_GET[ 'status' ] ); |
|
| 783 | 783 | $message_from_url = \GV\Utils::_GET( 'message' ); |
| 784 | 784 | $message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) ); |
| 785 | 785 | $class = ''; |
@@ -787,14 +787,14 @@ discard block |
||
| 787 | 787 | switch ( $status ) { |
| 788 | 788 | case 'error': |
| 789 | 789 | $class = ' gv-error error'; |
| 790 | - $error_message = __('There was an error deleting the entry: %s', 'gravityview'); |
|
| 790 | + $error_message = __( 'There was an error deleting the entry: %s', 'gravityview' ); |
|
| 791 | 791 | $message = sprintf( $error_message, $message_from_url ); |
| 792 | 792 | break; |
| 793 | 793 | case 'trashed': |
| 794 | - $message = __('The entry was successfully moved to the trash.', 'gravityview'); |
|
| 794 | + $message = __( 'The entry was successfully moved to the trash.', 'gravityview' ); |
|
| 795 | 795 | break; |
| 796 | 796 | default: |
| 797 | - $message = __('The entry was successfully deleted.', 'gravityview'); |
|
| 797 | + $message = __( 'The entry was successfully deleted.', 'gravityview' ); |
|
| 798 | 798 | break; |
| 799 | 799 | } |
| 800 | 800 | |
@@ -808,7 +808,7 @@ discard block |
||
| 808 | 808 | $message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url ); |
| 809 | 809 | |
| 810 | 810 | // DISPLAY ERROR/SUCCESS MESSAGE |
| 811 | - echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>'; |
|
| 811 | + echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>'; |
|
| 812 | 812 | } |
| 813 | 813 | |
| 814 | 814 | |
@@ -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 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | $widget_ops = array( |
| 13 | 13 | 'classname' => 'widget_gravityview_search', |
| 14 | - 'description' => __( 'A search form for a specific GravityView.', 'gravityview') |
|
| 14 | + 'description' => __( 'A search form for a specific GravityView.', 'gravityview' ) |
|
| 15 | 15 | ); |
| 16 | 16 | |
| 17 | 17 | $widget_display = array( |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | private function load_required_files() { |
| 37 | - if( !class_exists( 'GravityView_Widget_Search' ) ) { |
|
| 37 | + if ( ! class_exists( 'GravityView_Widget_Search' ) ) { |
|
| 38 | 38 | gravityview_register_gravityview_widgets(); |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | public function widget( $args, $instance ) { |
| 54 | 54 | |
| 55 | 55 | // Don't show unless a View ID has been set. |
| 56 | - if( empty( $instance['view_id'] ) ) { |
|
| 56 | + if ( empty( $instance[ 'view_id' ] ) ) { |
|
| 57 | 57 | |
| 58 | 58 | gravityview()->log->debug( 'No View ID has been defined. Not showing the widget.', array( 'data' => $instance ) ); |
| 59 | 59 | |
@@ -61,22 +61,22 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** This filter is documented in wp-includes/default-widgets.php */ |
| 64 | - $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); |
|
| 64 | + $title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base ); |
|
| 65 | 65 | |
| 66 | - echo $args['before_widget']; |
|
| 66 | + echo $args[ 'before_widget' ]; |
|
| 67 | 67 | |
| 68 | 68 | if ( $title ) { |
| 69 | - echo $args['before_title'] . $title . $args['after_title']; |
|
| 69 | + echo $args[ 'before_title' ] . $title . $args[ 'after_title' ]; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // @todo Add to the widget configuration form |
| 73 | - $instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance ); |
|
| 73 | + $instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance ); |
|
| 74 | 74 | |
| 75 | - $instance['context'] = 'wp_widget'; |
|
| 75 | + $instance[ 'context' ] = 'wp_widget'; |
|
| 76 | 76 | |
| 77 | 77 | // form |
| 78 | - $instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] ); |
|
| 79 | - $instance['form'] = GVCommon::get_form( $instance['form_id'] ); |
|
| 78 | + $instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] ); |
|
| 79 | + $instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] ); |
|
| 80 | 80 | |
| 81 | 81 | // We don't want to overwrite existing context, etc. |
| 82 | 82 | $previous_view = GravityView_View::getInstance(); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | new GravityView_View( $previous_view ); |
| 94 | 94 | |
| 95 | - echo $args['after_widget']; |
|
| 95 | + echo $args[ 'after_widget' ]; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -102,27 +102,27 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | $instance = $old_instance; |
| 104 | 104 | |
| 105 | - if( $this->is_preview() ) { |
|
| 105 | + if ( $this->is_preview() ) { |
|
| 106 | 106 | //Oh! Sorry but still not fully compatible with customizer |
| 107 | 107 | return $instance; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - $new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() ); |
|
| 110 | + $new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() ); |
|
| 111 | 111 | |
| 112 | - $instance['title'] = strip_tags( $new_instance['title'] ); |
|
| 113 | - $instance['view_id'] = absint( $new_instance['view_id'] ); |
|
| 114 | - $instance['search_fields'] = $new_instance['search_fields']; |
|
| 115 | - $instance['post_id'] = $new_instance['post_id']; |
|
| 116 | - $instance['search_clear'] = $new_instance['search_clear']; |
|
| 117 | - $instance['search_mode'] = $new_instance['search_mode']; |
|
| 112 | + $instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] ); |
|
| 113 | + $instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] ); |
|
| 114 | + $instance[ 'search_fields' ] = $new_instance[ 'search_fields' ]; |
|
| 115 | + $instance[ 'post_id' ] = $new_instance[ 'post_id' ]; |
|
| 116 | + $instance[ 'search_clear' ] = $new_instance[ 'search_clear' ]; |
|
| 117 | + $instance[ 'search_mode' ] = $new_instance[ 'search_mode' ]; |
|
| 118 | 118 | |
| 119 | - $is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'], true ); |
|
| 119 | + $is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ], true ); |
|
| 120 | 120 | |
| 121 | 121 | //check if post_id is a valid post with embedded View |
| 122 | - $instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL; |
|
| 122 | + $instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL; |
|
| 123 | 123 | |
| 124 | 124 | // Share that the widget isn't brand new |
| 125 | - $instance['updated'] = 1; |
|
| 125 | + $instance[ 'updated' ] = 1; |
|
| 126 | 126 | |
| 127 | 127 | return $instance; |
| 128 | 128 | } |
@@ -133,28 +133,28 @@ discard block |
||
| 133 | 133 | public function form( $instance ) { |
| 134 | 134 | |
| 135 | 135 | // @todo Make compatible with Customizer |
| 136 | - if( $this->is_preview() ) { |
|
| 136 | + if ( $this->is_preview() ) { |
|
| 137 | 137 | |
| 138 | - $warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' ); |
|
| 138 | + $warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="' . admin_url( 'widgets.php' ) . '">', '</a>' ); |
|
| 139 | 139 | |
| 140 | 140 | echo wpautop( GravityView_Admin::get_floaty() . $warning ); |
| 141 | 141 | |
| 142 | 142 | return; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - $instance = wp_parse_args( (array) $instance, self::get_defaults() ); |
|
| 145 | + $instance = wp_parse_args( (array)$instance, self::get_defaults() ); |
|
| 146 | 146 | |
| 147 | - $title = $instance['title']; |
|
| 148 | - $view_id = $instance['view_id']; |
|
| 149 | - $post_id = $instance['post_id']; |
|
| 150 | - $search_fields = $instance['search_fields']; |
|
| 151 | - $search_clear = $instance['search_clear']; |
|
| 152 | - $search_mode = $instance['search_mode']; |
|
| 147 | + $title = $instance[ 'title' ]; |
|
| 148 | + $view_id = $instance[ 'view_id' ]; |
|
| 149 | + $post_id = $instance[ 'post_id' ]; |
|
| 150 | + $search_fields = $instance[ 'search_fields' ]; |
|
| 151 | + $search_clear = $instance[ 'search_clear' ]; |
|
| 152 | + $search_mode = $instance[ 'search_mode' ]; |
|
| 153 | 153 | |
| 154 | 154 | $views = GVCommon::get_all_views(); |
| 155 | 155 | |
| 156 | 156 | // If there are no views set up yet, we get outta here. |
| 157 | - if( empty( $views ) ) { ?> |
|
| 157 | + if ( empty( $views ) ) { ?> |
|
| 158 | 158 | <div id="select_gravityview_view"> |
| 159 | 159 | <div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div> |
| 160 | 160 | </div> |
@@ -162,17 +162,17 @@ discard block |
||
| 162 | 162 | } |
| 163 | 163 | ?> |
| 164 | 164 | |
| 165 | - <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p> |
|
| 165 | + <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'gravityview' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p> |
|
| 166 | 166 | |
| 167 | 167 | <?php |
| 168 | 168 | /** |
| 169 | 169 | * Display errors generated for invalid embed IDs |
| 170 | 170 | * @see GravityView_View_Data::is_valid_embed_id |
| 171 | 171 | */ |
| 172 | - if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) { |
|
| 172 | + if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) { |
|
| 173 | 173 | ?> |
| 174 | 174 | <div class="error inline hide-on-view-change"> |
| 175 | - <p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p> |
|
| 175 | + <p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p> |
|
| 176 | 176 | </div> |
| 177 | 177 | <?php |
| 178 | 178 | unset ( $error ); |
@@ -181,12 +181,12 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | <p> |
| 183 | 183 | <label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label> |
| 184 | - <select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat"> |
|
| 184 | + <select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat"> |
|
| 185 | 185 | <option value=""><?php esc_html_e( '— Select a View —', 'gravityview' ); ?></option> |
| 186 | 186 | <?php |
| 187 | - foreach( $views as $view_option ) { |
|
| 188 | - $title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title; |
|
| 189 | - echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>'; |
|
| 187 | + foreach ( $views as $view_option ) { |
|
| 188 | + $title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title; |
|
| 189 | + echo '<option value="' . $view_option->ID . '" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>' . esc_html( sprintf( '%s #%d', $title, $view_option->ID ) ) . '</option>'; |
|
| 190 | 190 | } |
| 191 | 191 | ?> |
| 192 | 192 | </select> |
@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | * Display errors generated for invalid embed IDs |
| 199 | 199 | * @see GravityView_View_Data::is_valid_embed_id |
| 200 | 200 | */ |
| 201 | - if( !empty( $instance['error_post_id'] ) ) { |
|
| 201 | + if ( ! empty( $instance[ 'error_post_id' ] ) ) { |
|
| 202 | 202 | ?> |
| 203 | 203 | <div class="error inline"> |
| 204 | - <p><?php echo $instance['error_post_id']; ?></p> |
|
| 204 | + <p><?php echo $instance[ 'error_post_id' ]; ?></p> |
|
| 205 | 205 | </div> |
| 206 | 206 | <?php |
| 207 | 207 | unset ( $error ); |
@@ -209,40 +209,40 @@ discard block |
||
| 209 | 209 | ?> |
| 210 | 210 | |
| 211 | 211 | <p> |
| 212 | - <label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label> |
|
| 213 | - <input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" /> |
|
| 212 | + <label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label> |
|
| 213 | + <input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" /> |
|
| 214 | 214 | <span class="howto"><?php |
| 215 | - esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' ); |
|
| 216 | - echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more…', 'gravityview' ), 'target=_blank' ); |
|
| 215 | + esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' ); |
|
| 216 | + echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more…', 'gravityview' ), 'target=_blank' ); |
|
| 217 | 217 | ?></span> |
| 218 | 218 | </p> |
| 219 | 219 | |
| 220 | 220 | <p> |
| 221 | - <label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label> |
|
| 222 | - <input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0"> |
|
| 223 | - <input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>> |
|
| 221 | + <label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label> |
|
| 222 | + <input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0"> |
|
| 223 | + <input id="<?php echo $this->get_field_id( 'search_clear' ); ?>" name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>> |
|
| 224 | 224 | </p> |
| 225 | 225 | |
| 226 | 226 | <p> |
| 227 | 227 | <label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label> |
| 228 | - <label for="<?php echo $this->get_field_id('search_mode'); ?>_any"> |
|
| 229 | - <input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>> |
|
| 228 | + <label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any"> |
|
| 229 | + <input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>> |
|
| 230 | 230 | <?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?> |
| 231 | 231 | </label> |
| 232 | - <label for="<?php echo $this->get_field_id('search_mode'); ?>_all"> |
|
| 233 | - <input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>> |
|
| 232 | + <label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all"> |
|
| 233 | + <input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>> |
|
| 234 | 234 | <?php esc_html_e( 'Match All Fields', 'gravityview' ); ?> |
| 235 | 235 | </label> |
| 236 | - <span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span |
|
| 236 | + <span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span |
|
| 237 | 237 | </p> |
| 238 | 238 | |
| 239 | 239 | <hr /> |
| 240 | 240 | |
| 241 | 241 | <?php // @todo: move style to CSS ?> |
| 242 | 242 | <div style="margin-bottom: 1em;"> |
| 243 | - <label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label> |
|
| 244 | - <div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>"> |
|
| 245 | - <input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value"> |
|
| 243 | + <label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label> |
|
| 244 | + <div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>"> |
|
| 245 | + <input id="<?php echo $this->get_field_id( 'search_fields' ); ?>" name="<?php echo $this->get_field_name( 'search_fields' ); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value"> |
|
| 246 | 246 | </div> |
| 247 | 247 | |
| 248 | 248 | </div> |