@@ -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( $this->search_fields as $search_field ) { |
|
29 | + foreach ( $this->search_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' ); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | $field_options = array(); |
29 | 29 | |
30 | - if( 'field' === $field_type ) { |
|
30 | + if ( 'field' === $field_type ) { |
|
31 | 31 | |
32 | 32 | // Default options - fields |
33 | 33 | $field_options = array( |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'custom_class' => array( |
46 | 46 | 'type' => 'text', |
47 | 47 | 'label' => __( 'Custom CSS Class:', 'gravityview' ), |
48 | - 'desc' => __( 'This class will be added to the field container', 'gravityview'), |
|
48 | + 'desc' => __( 'This class will be added to the field container', 'gravityview' ), |
|
49 | 49 | 'value' => '', |
50 | 50 | 'merge_tags' => true, |
51 | 51 | 'tooltip' => 'gv_css_merge_tags', |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | ); |
66 | 66 | |
67 | 67 | // Match Table as well as DataTables |
68 | - if( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) { |
|
69 | - $field_options['width'] = array( |
|
68 | + if ( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) { |
|
69 | + $field_options[ 'width' ] = array( |
|
70 | 70 | 'type' => 'number', |
71 | - 'label' => __('Percent Width', 'gravityview'), |
|
72 | - 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'), |
|
71 | + 'label' => __( 'Percent Width', 'gravityview' ), |
|
72 | + 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ), |
|
73 | 73 | 'class' => 'code widefat', |
74 | 74 | 'value' => '', |
75 | 75 | ); |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | 'manage_options' => __( 'Administrator', 'gravityview' ), |
123 | 123 | ); |
124 | 124 | |
125 | - if( is_multisite() ) { |
|
126 | - $select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' ); |
|
125 | + if ( is_multisite() ) { |
|
126 | + $select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' ); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | * @param string $context Optional. What context are we in? Example: `single` or `directory` |
137 | 137 | * @param string $input_type Optional. (textarea, list, select, etc.) |
138 | 138 | */ |
139 | - $select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); |
|
139 | + $select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); |
|
140 | 140 | |
141 | 141 | return $select_cap_choices; |
142 | 142 | } |
@@ -164,27 +164,27 @@ discard block |
||
164 | 164 | */ |
165 | 165 | public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) { |
166 | 166 | |
167 | - if( empty( $uniqid ) ) { |
|
167 | + if ( empty( $uniqid ) ) { |
|
168 | 168 | //generate a unique field id |
169 | - $uniqid = uniqid('', false); |
|
169 | + $uniqid = uniqid( '', false ); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | // get field/widget options |
173 | 173 | $options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type ); |
174 | 174 | |
175 | 175 | // two different post arrays, depending of the field type |
176 | - $name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']'; |
|
176 | + $name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']'; |
|
177 | 177 | |
178 | 178 | // build output |
179 | 179 | $output = ''; |
180 | - $output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">'; |
|
181 | - $output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">'; |
|
180 | + $output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">'; |
|
181 | + $output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">'; |
|
182 | 182 | if ( $form_id ) { |
183 | - $output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">'; |
|
183 | + $output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">'; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | // If there are no options, return what we got. |
187 | - if(empty($options)) { |
|
187 | + if ( empty( $options ) ) { |
|
188 | 188 | |
189 | 189 | // This is here for checking if the output is empty in render_label() |
190 | 190 | $output .= '<!-- No Options -->'; |
@@ -192,33 +192,33 @@ discard block |
||
192 | 192 | return $output; |
193 | 193 | } |
194 | 194 | |
195 | - $output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">'; |
|
195 | + $output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">'; |
|
196 | 196 | |
197 | 197 | /** |
198 | 198 | * @since 1.8 |
199 | 199 | */ |
200 | - if( !empty( $item['subtitle'] ) ) { |
|
201 | - $output .= '<div class="subtitle">' . $item['subtitle'] . '</div>'; |
|
200 | + if ( ! empty( $item[ 'subtitle' ] ) ) { |
|
201 | + $output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>'; |
|
202 | 202 | } |
203 | 203 | |
204 | - foreach( $options as $key => $option ) { |
|
204 | + foreach ( $options as $key => $option ) { |
|
205 | 205 | |
206 | 206 | $value = isset( $current[ $key ] ) ? $current[ $key ] : NULL; |
207 | 207 | |
208 | - $field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value); |
|
208 | + $field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value ); |
|
209 | 209 | |
210 | 210 | // The setting is empty |
211 | - if( empty( $field_output ) ) { |
|
211 | + if ( empty( $field_output ) ) { |
|
212 | 212 | continue; |
213 | 213 | } |
214 | 214 | |
215 | - switch( $option['type'] ) { |
|
215 | + switch ( $option[ 'type' ] ) { |
|
216 | 216 | // Hide hidden fields |
217 | 217 | case 'hidden': |
218 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>'; |
|
218 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>'; |
|
219 | 219 | break; |
220 | 220 | default: |
221 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>'; |
|
221 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>'; |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
@@ -247,17 +247,17 @@ discard block |
||
247 | 247 | * @deprecated setting index 'default' was replaced by 'value' |
248 | 248 | * @see GravityView_FieldType::get_field_defaults |
249 | 249 | */ |
250 | - if( !empty( $option['default'] ) && empty( $option['value'] ) ) { |
|
251 | - $option['value'] = $option['default']; |
|
252 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' ); |
|
250 | + if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) { |
|
251 | + $option[ 'value' ] = $option[ 'default' ]; |
|
252 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' ); |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | // prepare to render option field type |
256 | - if( isset( $option['type'] ) ) { |
|
256 | + if ( isset( $option[ 'type' ] ) ) { |
|
257 | 257 | |
258 | 258 | $type_class = self::load_type_class( $option ); |
259 | 259 | |
260 | - if( class_exists( $type_class ) ) { |
|
260 | + if ( class_exists( $type_class ) ) { |
|
261 | 261 | |
262 | 262 | /** @var GravityView_FieldType $render_type */ |
263 | 263 | $render_type = new $type_class( $name, $option, $curr_value ); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | * @param[in,out] string $output field class name |
275 | 275 | * @param[in] array $option option field data |
276 | 276 | */ |
277 | - $output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option ); |
|
277 | + $output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option ); |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | } // isset option[type] |
@@ -309,27 +309,27 @@ discard block |
||
309 | 309 | * @deprecated setting index 'name' was replaced by 'label' |
310 | 310 | * @see GravityView_FieldType::get_field_defaults |
311 | 311 | */ |
312 | - if( isset( $setting['name'] ) && empty( $setting['label'] ) ) { |
|
313 | - $setting['label'] = $setting['name']; |
|
314 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' ); |
|
312 | + if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) { |
|
313 | + $setting[ 'label' ] = $setting[ 'name' ]; |
|
314 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' ); |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | $name = esc_attr( sprintf( $name, $key ) ); |
318 | - $setting['id'] = esc_attr( sprintf( $id, $key ) ); |
|
319 | - $setting['tooltip'] = 'gv_' . $key; |
|
318 | + $setting[ 'id' ] = esc_attr( sprintf( $id, $key ) ); |
|
319 | + $setting[ 'tooltip' ] = 'gv_' . $key; |
|
320 | 320 | |
321 | 321 | // Use default if current setting isn't set. |
322 | - $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value']; |
|
322 | + $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ]; |
|
323 | 323 | |
324 | 324 | // default setting type = text |
325 | - $setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type']; |
|
325 | + $setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ]; |
|
326 | 326 | |
327 | 327 | // merge tags |
328 | - if( !isset( $setting['merge_tags'] ) ) { |
|
329 | - if( $setting['type'] === 'text' ) { |
|
330 | - $setting['merge_tags'] = true; |
|
328 | + if ( ! isset( $setting[ 'merge_tags' ] ) ) { |
|
329 | + if ( $setting[ 'type' ] === 'text' ) { |
|
330 | + $setting[ 'merge_tags' ] = true; |
|
331 | 331 | } else { |
332 | - $setting['merge_tags'] = false; |
|
332 | + $setting[ 'merge_tags' ] = false; |
|
333 | 333 | } |
334 | 334 | } |
335 | 335 | |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | |
338 | 338 | // render the setting |
339 | 339 | $type_class = self::load_type_class( $setting ); |
340 | - if( class_exists( $type_class ) ) { |
|
340 | + if ( class_exists( $type_class ) ) { |
|
341 | 341 | /** @var GravityView_FieldType $render_type */ |
342 | 342 | $render_type = new $type_class( $name, $setting, $curr_value ); |
343 | 343 | ob_start(); |
@@ -346,21 +346,21 @@ discard block |
||
346 | 346 | } |
347 | 347 | |
348 | 348 | // Check if setting is specific for a template |
349 | - if( !empty( $setting['show_in_template'] ) ) { |
|
350 | - if( !is_array( $setting['show_in_template'] ) ) { |
|
351 | - $setting['show_in_template'] = array( $setting['show_in_template'] ); |
|
349 | + if ( ! empty( $setting[ 'show_in_template' ] ) ) { |
|
350 | + if ( ! is_array( $setting[ 'show_in_template' ] ) ) { |
|
351 | + $setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] ); |
|
352 | 352 | } |
353 | - $show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"'; |
|
353 | + $show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"'; |
|
354 | 354 | } else { |
355 | 355 | $show_if = ''; |
356 | 356 | } |
357 | 357 | |
358 | - if( ! empty( $setting['requires'] ) ) { |
|
359 | - $show_if .= sprintf( ' data-requires="%s"', $setting['requires'] ); |
|
358 | + if ( ! empty( $setting[ 'requires' ] ) ) { |
|
359 | + $show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] ); |
|
360 | 360 | } |
361 | 361 | |
362 | 362 | // output |
363 | - echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>'; |
|
363 | + echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>'; |
|
364 | 364 | |
365 | 365 | } |
366 | 366 | |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | */ |
373 | 373 | public static function load_type_class( $field = NULL ) { |
374 | 374 | |
375 | - if( empty( $field['type'] ) ) { |
|
375 | + if ( empty( $field[ 'type' ] ) ) { |
|
376 | 376 | return NULL; |
377 | 377 | } |
378 | 378 | |
@@ -381,19 +381,19 @@ discard block |
||
381 | 381 | * @param string $class_suffix field class suffix; `GravityView_FieldType_{$class_suffix}` |
382 | 382 | * @param array $field field data |
383 | 383 | */ |
384 | - $type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field ); |
|
384 | + $type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field ); |
|
385 | 385 | |
386 | - if( !class_exists( $type_class ) ) { |
|
386 | + if ( ! class_exists( $type_class ) ) { |
|
387 | 387 | |
388 | 388 | /** |
389 | 389 | * @filter `gravityview/setting/class_file/{field_type}` |
390 | 390 | * @param string $field_type_include_path field class file path |
391 | 391 | * @param array $field field data |
392 | 392 | */ |
393 | - $class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field ); |
|
393 | + $class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field ); |
|
394 | 394 | |
395 | - if( $class_file ) { |
|
396 | - if( file_exists( $class_file ) ) { |
|
395 | + if ( $class_file ) { |
|
396 | + if ( file_exists( $class_file ) ) { |
|
397 | 397 | require_once( $class_file ); |
398 | 398 | } |
399 | 399 | } |
@@ -418,8 +418,8 @@ discard block |
||
418 | 418 | |
419 | 419 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' ); |
420 | 420 | |
421 | - $output = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">'; |
|
422 | - $output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >'; |
|
421 | + $output = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">'; |
|
422 | + $output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >'; |
|
423 | 423 | |
424 | 424 | return $output; |
425 | 425 | } |
@@ -439,22 +439,22 @@ discard block |
||
439 | 439 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' ); |
440 | 440 | |
441 | 441 | // Show the merge tags if the field is a list view |
442 | - $is_list = ( preg_match( '/_list-/ism', $name )); |
|
442 | + $is_list = ( preg_match( '/_list-/ism', $name ) ); |
|
443 | 443 | |
444 | 444 | // Or is a single entry view |
445 | - $is_single = ( preg_match( '/single_/ism', $name )); |
|
445 | + $is_single = ( preg_match( '/single_/ism', $name ) ); |
|
446 | 446 | $show = ( $is_single || $is_list ); |
447 | 447 | |
448 | 448 | $class = ''; |
449 | 449 | // and $add_merge_tags is not false |
450 | - if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
450 | + if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
451 | 451 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
452 | 452 | } |
453 | 453 | |
454 | - $class .= !empty( $args['class'] ) ? $args['class'] : 'widefat'; |
|
455 | - $type = !empty( $args['type'] ) ? $args['type'] : 'text'; |
|
454 | + $class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat'; |
|
455 | + $type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text'; |
|
456 | 456 | |
457 | - return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">'; |
|
457 | + return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">'; |
|
458 | 458 | } |
459 | 459 | |
460 | 460 | /** |
@@ -471,21 +471,21 @@ discard block |
||
471 | 471 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' ); |
472 | 472 | |
473 | 473 | // Show the merge tags if the field is a list view |
474 | - $is_list = ( preg_match( '/_list-/ism', $name )); |
|
474 | + $is_list = ( preg_match( '/_list-/ism', $name ) ); |
|
475 | 475 | |
476 | 476 | // Or is a single entry view |
477 | - $is_single = ( preg_match( '/single_/ism', $name )); |
|
477 | + $is_single = ( preg_match( '/single_/ism', $name ) ); |
|
478 | 478 | $show = ( $is_single || $is_list ); |
479 | 479 | |
480 | 480 | $class = ''; |
481 | 481 | // and $add_merge_tags is not false |
482 | - if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
482 | + if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
483 | 483 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
484 | 484 | } |
485 | 485 | |
486 | - $class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat'; |
|
486 | + $class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat'; |
|
487 | 487 | |
488 | - return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>'; |
|
488 | + return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>'; |
|
489 | 489 | } |
490 | 490 | |
491 | 491 | /** |
@@ -501,9 +501,9 @@ discard block |
||
501 | 501 | |
502 | 502 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' ); |
503 | 503 | |
504 | - $output = '<select name="'. $name .'" id="'. $id .'">'; |
|
505 | - foreach( $choices as $value => $label ) { |
|
506 | - $output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>'; |
|
504 | + $output = '<select name="' . $name . '" id="' . $id . '">'; |
|
505 | + foreach ( $choices as $value => $label ) { |
|
506 | + $output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>'; |
|
507 | 507 | } |
508 | 508 | $output .= '</select>'; |
509 | 509 |
@@ -10,13 +10,13 @@ discard block |
||
10 | 10 | wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' ); |
11 | 11 | |
12 | 12 | //current value |
13 | -$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) ); |
|
13 | +$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) ); |
|
14 | 14 | |
15 | 15 | // If form is in trash or not existing, show error |
16 | 16 | GravityView_Admin::connected_form_warning( $current_form ); |
17 | 17 | |
18 | 18 | // check for available gravity forms |
19 | -$forms = gravityview_get_forms('any'); |
|
19 | +$forms = gravityview_get_forms( 'any' ); |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @param int $current_form Form currently selected in the View (0 if none selected) |
@@ -35,24 +35,24 @@ discard block |
||
35 | 35 | ?> |
36 | 36 | <a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a> |
37 | 37 | |
38 | - <?php if( !empty( $forms ) ) { ?> |
|
38 | + <?php if ( ! empty( $forms ) ) { ?> |
|
39 | 39 | <span> <?php esc_html_e( 'or use an existing form', 'gravityview' ); ?> </span> |
40 | 40 | <?php } |
41 | 41 | } |
42 | 42 | |
43 | 43 | // If there are no forms to select, show no forms. |
44 | - if( !empty( $forms ) ) { ?> |
|
44 | + if ( ! empty( $forms ) ) { ?> |
|
45 | 45 | <select name="gravityview_form_id" id="gravityview_form_id"> |
46 | 46 | <option value="" <?php selected( '', $current_form, true ); ?>>— <?php esc_html_e( 'list of forms', 'gravityview' ); ?> —</option> |
47 | - <?php foreach( $forms as $form ) { ?> |
|
48 | - <option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option> |
|
47 | + <?php foreach ( $forms as $form ) { ?> |
|
48 | + <option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option> |
|
49 | 49 | <?php } ?> |
50 | 50 | </select> |
51 | 51 | <?php } else { ?> |
52 | 52 | <select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select> |
53 | 53 | <?php } ?> |
54 | 54 | |
55 | - <a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a> |
|
55 | + <a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a> |
|
56 | 56 | </p> |
57 | 57 | |
58 | 58 | <?php // confirm dialog box ?> |
@@ -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 | } |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | public function get_output() { |
180 | 180 | |
181 | 181 | // No Entries |
182 | - if( empty( $this->entries ) ) { |
|
183 | - return '<div class="gv-no-results">'.$this->empty_message.'</div>'; |
|
182 | + if ( empty( $this->entries ) ) { |
|
183 | + return '<div class="gv-no-results">' . $this->empty_message . '</div>'; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | $output = ''; |
@@ -191,18 +191,18 @@ discard block |
||
191 | 191 | $current_entry = GravityView_View::getInstance()->getCurrentEntry(); |
192 | 192 | } |
193 | 193 | |
194 | - $output .= '<'. $this->wrapper_tag .'>'; |
|
194 | + $output .= '<' . $this->wrapper_tag . '>'; |
|
195 | 195 | |
196 | - foreach( $this->entries as $entry ) { |
|
196 | + foreach ( $this->entries as $entry ) { |
|
197 | 197 | |
198 | - if( $this->skip_entry( $entry, $current_entry ) ) { |
|
198 | + if ( $this->skip_entry( $entry, $current_entry ) ) { |
|
199 | 199 | continue; |
200 | 200 | } |
201 | 201 | |
202 | 202 | $output .= $this->get_item_output( $entry ); |
203 | 203 | } |
204 | 204 | |
205 | - $output .= '</'. $this->wrapper_tag .'>'; |
|
205 | + $output .= '</' . $this->wrapper_tag . '>'; |
|
206 | 206 | |
207 | 207 | /** |
208 | 208 | * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output |
@@ -225,15 +225,15 @@ discard block |
||
225 | 225 | private function skip_entry( $entry, $current_entry ) { |
226 | 226 | |
227 | 227 | // If skip entry is off, or there's no current entry, return false |
228 | - if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) { |
|
228 | + if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) { |
|
229 | 229 | return false; |
230 | 230 | } |
231 | 231 | |
232 | 232 | // If in Single or Edit mode, $current_entry will be an array. |
233 | - $current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry; |
|
233 | + $current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry; |
|
234 | 234 | |
235 | 235 | // If the entry ID matches the current entry, yes: skip |
236 | - if( $entry['id'] === $current_entry_id ) { |
|
236 | + if ( $entry[ 'id' ] === $current_entry_id ) { |
|
237 | 237 | return true; |
238 | 238 | } |
239 | 239 | |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | |
261 | 261 | $item_output = gravityview_get_link( $link, $this->link_format ); |
262 | 262 | |
263 | - if( !empty( $this->after_link ) ) { |
|
263 | + if ( ! empty( $this->after_link ) ) { |
|
264 | 264 | |
265 | 265 | /** |
266 | 266 | * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list |
@@ -269,14 +269,14 @@ discard block |
||
269 | 269 | * @param array $entry Gravity Forms entry array |
270 | 270 | * @param GravityView_Entry_List $this The current class instance |
271 | 271 | */ |
272 | - $after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this ); |
|
272 | + $after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this ); |
|
273 | 273 | |
274 | 274 | $item_output .= $after_link; |
275 | 275 | } |
276 | 276 | |
277 | 277 | $item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry ); |
278 | 278 | |
279 | - $item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>'; |
|
279 | + $item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>'; |
|
280 | 280 | |
281 | 281 | /** |
282 | 282 | * @filter `gravityview/entry-list/item` Modify each item's output in an entry list |