@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public static function is_add_oembed_preview() { |
47 | 47 | /** The preview request is a parse-embed AJAX call without a type set. */ |
48 | - return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) ); |
|
48 | + return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) ); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * @return boolean |
64 | 64 | */ |
65 | 65 | public static function is_rest() { |
66 | - return ! empty( $GLOBALS['wp']->query_vars['rest_route'] ); |
|
66 | + return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] ); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | return false; |
126 | 126 | } |
127 | 127 | |
128 | - if ( ! in_array( $e['form_id'], $valid_forms ) ) { |
|
128 | + if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) { |
|
129 | 129 | return false; |
130 | 130 | } |
131 | 131 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | $entry = Multi_Entry::from_entries( array_filter( $multientry ) ); |
144 | - } else { |
|
144 | + } else { |
|
145 | 145 | /** |
146 | 146 | * A regular one. |
147 | 147 | */ |
@@ -196,15 +196,15 @@ discard block |
||
196 | 196 | $get = $_GET; |
197 | 197 | } |
198 | 198 | |
199 | - unset( $get['mode'] ); |
|
199 | + unset( $get[ 'mode' ] ); |
|
200 | 200 | |
201 | 201 | $get = array_filter( $get, 'gravityview_is_not_empty_string' ); |
202 | 202 | |
203 | - if( $has_field_key = $this->_has_field_key( $get ) ) { |
|
203 | + if ( $has_field_key = $this->_has_field_key( $get ) ) { |
|
204 | 204 | return true; |
205 | 205 | } |
206 | 206 | |
207 | - return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] ); |
|
207 | + return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] ); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
@@ -227,13 +227,13 @@ discard block |
||
227 | 227 | |
228 | 228 | $meta = array(); |
229 | 229 | foreach ( $fields as $field ) { |
230 | - if( empty( $field->_gf_field_class_name ) ) { |
|
231 | - $meta[] = preg_quote( $field->name ); |
|
230 | + if ( empty( $field->_gf_field_class_name ) ) { |
|
231 | + $meta[ ] = preg_quote( $field->name ); |
|
232 | 232 | } |
233 | 233 | } |
234 | 234 | |
235 | 235 | foreach ( $get as $key => $value ) { |
236 | - if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) { |
|
236 | + if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) { |
|
237 | 237 | $has_field_key = true; |
238 | 238 | break; |
239 | 239 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @return string |
27 | 27 | */ |
28 | 28 | public function the_field( \GV\Field $field, $extras = null ) { |
29 | - $form = \GV\GF_Form::by_id( $field->form_id ) ? : $this->view->form; |
|
29 | + $form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form; |
|
30 | 30 | $entry = $this->entry->from_field( $field ); |
31 | 31 | |
32 | 32 | if ( ! $entry ) { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | $renderer = new Field_Renderer(); |
37 | - $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ? : $this->view->form ) : new Internal_Source(); |
|
37 | + $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source(); |
|
38 | 38 | |
39 | 39 | $value = $renderer->render( $field, $this->view, $source, $entry, $this->request ); |
40 | 40 | |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | $hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context ); |
63 | 63 | |
64 | 64 | if ( is_numeric( $field->ID ) ) { |
65 | - $extras['field'] = $field->as_configuration(); |
|
65 | + $extras[ 'field' ] = $field->as_configuration(); |
|
66 | 66 | } |
67 | 67 | |
68 | - $extras['entry'] = $this->entry->as_entry(); |
|
69 | - $extras['hide_empty'] = $hide_empty; |
|
70 | - $extras['label'] = $label; |
|
71 | - $extras['value'] = $value; |
|
68 | + $extras[ 'entry' ] = $this->entry->as_entry(); |
|
69 | + $extras[ 'hide_empty' ] = $hide_empty; |
|
70 | + $extras[ 'label' ] = $label; |
|
71 | + $extras[ 'value' ] = $value; |
|
72 | 72 | |
73 | 73 | return \gravityview_field_output( $extras, $context ); |
74 | 74 | } |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | public function the_field( \GV\Field $field, \GV\Entry $entry, $extras = null ) { |
30 | 30 | $form = $this->view->form; |
31 | 31 | |
32 | - if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
|
33 | - if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
|
34 | - $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
|
32 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) { |
|
33 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) { |
|
34 | + $field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ]; |
|
35 | 35 | } elseif ( ! $field instanceof Internal_Field ) { |
36 | 36 | $field = Internal_Field::from_configuration( array( 'id' => 'custom' ) ); |
37 | 37 | } |
@@ -81,13 +81,13 @@ discard block |
||
81 | 81 | $hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context ); |
82 | 82 | |
83 | 83 | if ( is_numeric( $field->ID ) ) { |
84 | - $extras['field'] = $field->as_configuration(); |
|
84 | + $extras[ 'field' ] = $field->as_configuration(); |
|
85 | 85 | } |
86 | 86 | |
87 | - $extras['entry'] = $entry->as_entry(); |
|
88 | - $extras['hide_empty'] = $hide_empty; |
|
89 | - $extras['label'] = $label; |
|
90 | - $extras['value'] = $value; |
|
87 | + $extras[ 'entry' ] = $entry->as_entry(); |
|
88 | + $extras[ 'hide_empty' ] = $hide_empty; |
|
89 | + $extras[ 'label' ] = $label; |
|
90 | + $extras[ 'value' ] = $value; |
|
91 | 91 | |
92 | 92 | return \gravityview_field_output( $extras, $context ); |
93 | 93 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | /** |
90 | 90 | * @var string The REST API functionality identifier. |
91 | 91 | */ |
92 | - const FEATURE_REST = 'rest_api'; |
|
92 | + const FEATURE_REST = 'rest_api'; |
|
93 | 93 | |
94 | 94 | /** |
95 | 95 | * Get the global instance of \GV\Plugin. |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | include_once $this->dir( 'includes/class-frontend-views.php' ); |
216 | 216 | include_once $this->dir( 'includes/class-gravityview-admin-bar.php' ); |
217 | 217 | include_once $this->dir( 'includes/class-gravityview-entry-list.php' ); |
218 | - include_once $this->dir( 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */ |
|
218 | + include_once $this->dir( 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */ |
|
219 | 219 | include_once $this->dir( 'includes/class-data.php' ); |
220 | 220 | include_once $this->dir( 'includes/class-gravityview-shortcode.php' ); |
221 | 221 | include_once $this->dir( 'includes/class-gravityview-entry-link-shortcode.php' ); |
@@ -269,11 +269,11 @@ discard block |
||
269 | 269 | |
270 | 270 | // Pre-4.6 loading |
271 | 271 | // TODO: Remove when GV minimum version is WordPress 4.6.0 |
272 | - $locale = apply_filters( 'plugin_locale', ( ( function_exists('get_user_locale') && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' ); |
|
272 | + $locale = apply_filters( 'plugin_locale', ( ( function_exists( 'get_user_locale' ) && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' ); |
|
273 | 273 | |
274 | - $loaded = load_textdomain( 'gravityview', sprintf( '%s/%s-%s.mo', $this->dir('languages'), $domain, $locale ) ); |
|
274 | + $loaded = load_textdomain( 'gravityview', sprintf( '%s/%s-%s.mo', $this->dir( 'languages' ), $domain, $locale ) ); |
|
275 | 275 | |
276 | - if( $loaded ) { |
|
276 | + if ( $loaded ) { |
|
277 | 277 | return; |
278 | 278 | } |
279 | 279 | |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | */ |
425 | 425 | public function is_compatible_wordpress( $version = null ) { |
426 | 426 | |
427 | - if( ! $version ) { |
|
427 | + if ( ! $version ) { |
|
428 | 428 | $version = self::$min_wp_version; |
429 | 429 | } |
430 | 430 | |
@@ -465,8 +465,8 @@ discard block |
||
465 | 465 | * @return string The version of PHP. |
466 | 466 | */ |
467 | 467 | private function get_php_version() { |
468 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ? |
|
469 | - $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion(); |
|
468 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ? |
|
469 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion(); |
|
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
@@ -477,8 +477,8 @@ discard block |
||
477 | 477 | * @return string The version of WordPress. |
478 | 478 | */ |
479 | 479 | private function get_wordpress_version() { |
480 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ? |
|
481 | - $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version']; |
|
480 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ? |
|
481 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ]; |
|
482 | 482 | } |
483 | 483 | |
484 | 484 | /** |
@@ -489,13 +489,13 @@ discard block |
||
489 | 489 | * @return string|null The version of Gravity Forms or null if inactive. |
490 | 490 | */ |
491 | 491 | private function get_gravityforms_version() { |
492 | - if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) { |
|
492 | + if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) { |
|
493 | 493 | gravityview()->log->error( 'Gravity Forms is inactive or not installed.' ); |
494 | 494 | return null; |
495 | 495 | } |
496 | 496 | |
497 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ? |
|
498 | - $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version; |
|
497 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ? |
|
498 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version; |
|
499 | 499 | } |
500 | 500 | |
501 | 501 | /** |
@@ -552,9 +552,9 @@ discard block |
||
552 | 552 | $tables = array(); |
553 | 553 | |
554 | 554 | if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) { |
555 | - $tables []= \GFFormsModel::get_entry_meta_table_name(); |
|
555 | + $tables [ ] = \GFFormsModel::get_entry_meta_table_name(); |
|
556 | 556 | } |
557 | - $tables []= \GFFormsModel::get_lead_meta_table_name(); |
|
557 | + $tables [ ] = \GFFormsModel::get_lead_meta_table_name(); |
|
558 | 558 | |
559 | 559 | foreach ( $tables as $meta_table ) { |
560 | 560 | $sql = " |
@@ -572,13 +572,13 @@ discard block |
||
572 | 572 | $tables = array(); |
573 | 573 | |
574 | 574 | if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) { |
575 | - $tables[] = \GFFormsModel::get_entry_notes_table_name(); |
|
575 | + $tables[ ] = \GFFormsModel::get_entry_notes_table_name(); |
|
576 | 576 | } |
577 | 577 | |
578 | - $tables[] = \GFFormsModel::get_lead_notes_table_name(); |
|
578 | + $tables[ ] = \GFFormsModel::get_lead_notes_table_name(); |
|
579 | 579 | |
580 | - $disapproved = __('Disapproved the Entry for GravityView', 'gravityview'); |
|
581 | - $approved = __('Approved the Entry for GravityView', 'gravityview'); |
|
580 | + $disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' ); |
|
581 | + $approved = __( 'Approved the Entry for GravityView', 'gravityview' ); |
|
582 | 582 | |
583 | 583 | $suppress = $wpdb->suppress_errors(); |
584 | 584 | foreach ( $tables as $notes_table ) { |
@@ -10,14 +10,14 @@ 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-select.php - No choices for field' ); |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | -if( is_array( $search_field['value'] ) ) { |
|
18 | +if ( is_array( $search_field[ 'value' ] ) ) { |
|
19 | 19 | gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
20 | - $search_field['value'] = reset( $search_field['value'] ); |
|
20 | + $search_field[ 'value' ] = reset( $search_field[ 'value' ] ); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -26,26 +26,26 @@ discard block |
||
26 | 26 | * @param string $default_option Default: `—` (—) |
27 | 27 | * @param string $field_type Field type: "select" or "multiselect" |
28 | 28 | */ |
29 | -$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' ); |
|
29 | +$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' ); |
|
30 | 30 | |
31 | 31 | ?> |
32 | 32 | <div class="gv-search-box gv-search-field-select"> |
33 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
34 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
33 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
34 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
35 | 35 | <?php } ?> |
36 | 36 | <p> |
37 | - <select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"> |
|
38 | - <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
37 | + <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"> |
|
38 | + <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
39 | 39 | <?php |
40 | - foreach( $search_field['choices'] as $choice ) { ?> |
|
41 | - <?php if ( is_array( $choice['value'] ) ) { ?> |
|
42 | - <optgroup label="<?php echo esc_attr( $choice['text'] ); ?>"> |
|
43 | - <?php foreach ( $choice['value'] as $subchoice ): ?> |
|
44 | - <option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option> |
|
40 | + foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
41 | + <?php if ( is_array( $choice[ 'value' ] ) ) { ?> |
|
42 | + <optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>"> |
|
43 | + <?php foreach ( $choice[ 'value' ] as $subchoice ): ?> |
|
44 | + <option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option> |
|
45 | 45 | <?php endforeach; ?> |
46 | 46 | </optgroup> |
47 | 47 | <?php } else { ?> |
48 | - <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
48 | + <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
49 | 49 | <?php } ?> |
50 | 50 | <?php } ?> |
51 | 51 | </select> |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | ) ); |
115 | 115 | |
116 | 116 | // This is just HTML we don't need. |
117 | - unset( $response['message'] ); |
|
117 | + unset( $response[ 'message' ] ); |
|
118 | 118 | |
119 | - switch ( intval( $response['price_id'] ) ) { |
|
119 | + switch ( intval( $response[ 'price_id' ] ) ) { |
|
120 | 120 | default: |
121 | 121 | case 1: |
122 | 122 | $package = 'Core'; |
@@ -142,12 +142,12 @@ discard block |
||
142 | 142 | 'email' => $current_user->user_email, |
143 | 143 | 'name' => mb_substr( $current_user->display_name, 0, 80 ), |
144 | 144 | 'signature' => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ), |
145 | - 'License Key' => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')', |
|
145 | + 'License Key' => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')', |
|
146 | 146 | 'License Level' => $package, |
147 | 147 | 'Alt Emails' => sprintf( "Admin: %s, GV Support: %s", get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ), |
148 | - 'Payment Details' => $response['customer_name'] . ' ' . $response['customer_email'], |
|
148 | + 'Payment Details' => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ], |
|
149 | 149 | 'WordPress Version' => get_bloginfo( 'version', 'display' ), |
150 | - 'PHP Version' => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ), |
|
150 | + 'PHP Version' => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ), |
|
151 | 151 | 'No-Conflict Mode' => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled', |
152 | 152 | 'GravityView Version' => \GV\Plugin::$version, |
153 | 153 | 'Gravity Forms Version' => GFForms::$version, |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | ob_get_clean(); |
158 | 158 | |
159 | 159 | // Help Scout length limit is 200 characters |
160 | - foreach( $data as $key => $value ) { |
|
160 | + foreach ( $data as $key => $value ) { |
|
161 | 161 | if ( ! is_string( $value ) ) { |
162 | 162 | continue; |
163 | 163 | } |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | 'detail' => null, |
42 | 42 | ) ); |
43 | 43 | |
44 | - if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) { |
|
45 | - if ( $atts['detail'] && $view = $request->is_view() ) { |
|
44 | + if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) { |
|
45 | + if ( $atts[ 'detail' ] && $view = $request->is_view() ) { |
|
46 | 46 | $view_id = $view->ID; |
47 | 47 | } |
48 | 48 | } |
@@ -111,12 +111,12 @@ discard block |
||
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
114 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
115 | 115 | |
116 | 116 | /** |
117 | 117 | * View details. |
118 | 118 | */ |
119 | - if ( $atts['detail'] ) { |
|
119 | + if ( $atts[ 'detail' ] ) { |
|
120 | 120 | $entries = $view->get_entries( $request ); |
121 | 121 | return self::_return( $this->detail( $view, $entries, $atts ) ); |
122 | 122 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | return self::_return( '' ); |
134 | 134 | } |
135 | 135 | |
136 | - if ( $entry['status'] != 'active' ) { |
|
136 | + if ( $entry[ 'status' ] != 'active' ) { |
|
137 | 137 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
138 | 138 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
139 | 139 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
147 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
147 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
148 | 148 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
149 | 149 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
150 | 150 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $entryset = $entry->is_multi() ? $entry->entries : array( $entry ); |
168 | 168 | |
169 | 169 | foreach ( $entryset as $e ) { |
170 | - if ( $e['status'] != 'active' ) { |
|
170 | + if ( $e[ 'status' ] != 'active' ) { |
|
171 | 171 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
172 | 172 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
173 | 173 | } |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | } |
179 | 179 | |
180 | 180 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
181 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
181 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
182 | 182 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
183 | 183 | return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) ); |
184 | 184 | } |
@@ -203,10 +203,10 @@ discard block |
||
203 | 203 | |
204 | 204 | // Mock the request with the actual View, not the global one |
205 | 205 | $mock_request = new \GV\Mock_Request(); |
206 | - $mock_request->returns['is_view'] = $view; |
|
207 | - $mock_request->returns['is_entry'] = $request->is_entry( $view->form ? $view->form->ID : 0 ); |
|
208 | - $mock_request->returns['is_edit_entry'] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ); |
|
209 | - $mock_request->returns['is_search'] = $request->is_search(); |
|
206 | + $mock_request->returns[ 'is_view' ] = $view; |
|
207 | + $mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 ); |
|
208 | + $mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ); |
|
209 | + $mock_request->returns[ 'is_search' ] = $request->is_search(); |
|
210 | 210 | |
211 | 211 | $request = $mock_request; |
212 | 212 | } |
@@ -242,16 +242,16 @@ discard block |
||
242 | 242 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
243 | 243 | |
244 | 244 | // Only keep the passed attributes after making sure that they're valid pairs |
245 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
245 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
246 | 246 | |
247 | 247 | $atts = array(); |
248 | 248 | |
249 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
249 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
250 | 250 | |
251 | 251 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
252 | 252 | $passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value ); |
253 | 253 | |
254 | - switch( $defaults[ $key ]['type'] ) { |
|
254 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
255 | 255 | |
256 | 256 | /** |
257 | 257 | * Make sure number fields are numeric. |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
260 | 260 | */ |
261 | 261 | case 'number': |
262 | - if( is_numeric( $passed_value ) ) { |
|
262 | + if ( is_numeric( $passed_value ) ) { |
|
263 | 263 | $atts[ $key ] = ( $passed_value + 0 ); |
264 | 264 | } |
265 | 265 | break; |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | */ |
275 | 275 | case 'select': |
276 | 276 | case 'radio': |
277 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
278 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
277 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
278 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
279 | 279 | $atts[ $key ] = $passed_value; |
280 | 280 | } |
281 | 281 | break; |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | } |
288 | 288 | } |
289 | 289 | |
290 | - $atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
290 | + $atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
291 | 291 | |
292 | 292 | return $atts; |
293 | 293 | } |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | private function detail( $view, $entries, $atts ) { |
305 | 305 | $output = ''; |
306 | 306 | |
307 | - switch ( $key = $atts['detail'] ): |
|
307 | + switch ( $key = $atts[ 'detail' ] ): |
|
308 | 308 | case 'total_entries': |
309 | 309 | $output = number_format_i18n( $entries->total() ); |
310 | 310 | break; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | die; |
17 | 17 | } |
18 | 18 | |
19 | -if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) { |
|
19 | +if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) { |
|
20 | 20 | require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' ); |
21 | 21 | } |
22 | 22 | |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | 'atts' => NULL, |
158 | 158 | ) ); |
159 | 159 | |
160 | - foreach ($atts as $key => $value) { |
|
161 | - if( is_null( $value ) ) { |
|
160 | + foreach ( $atts as $key => $value ) { |
|
161 | + if ( is_null( $value ) ) { |
|
162 | 162 | continue; |
163 | 163 | } |
164 | 164 | $this->{$key} = $value; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | */ |
189 | 189 | static function getInstance( $passed_post = NULL ) { |
190 | 190 | |
191 | - if( empty( self::$instance ) ) { |
|
191 | + if ( empty( self::$instance ) ) { |
|
192 | 192 | self::$instance = new self( $passed_post ); |
193 | 193 | } |
194 | 194 | |
@@ -201,8 +201,8 @@ discard block |
||
201 | 201 | */ |
202 | 202 | public function getCurrentField( $key = NULL ) { |
203 | 203 | |
204 | - if( !empty( $key ) ) { |
|
205 | - if( isset( $this->_current_field[ $key ] ) ) { |
|
204 | + if ( ! empty( $key ) ) { |
|
205 | + if ( isset( $this->_current_field[ $key ] ) ) { |
|
206 | 206 | return $this->_current_field[ $key ]; |
207 | 207 | } |
208 | 208 | return NULL; |
@@ -213,16 +213,16 @@ discard block |
||
213 | 213 | |
214 | 214 | public function setCurrentFieldSetting( $key, $value ) { |
215 | 215 | |
216 | - if( !empty( $this->_current_field ) ) { |
|
217 | - $this->_current_field['field_settings'][ $key ] = $value; |
|
216 | + if ( ! empty( $this->_current_field ) ) { |
|
217 | + $this->_current_field[ 'field_settings' ][ $key ] = $value; |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | } |
221 | 221 | |
222 | 222 | public function getCurrentFieldSetting( $key ) { |
223 | - $settings = $this->getCurrentField('field_settings'); |
|
223 | + $settings = $this->getCurrentField( 'field_settings' ); |
|
224 | 224 | |
225 | - if( $settings && !empty( $settings[ $key ] ) ) { |
|
225 | + if ( $settings && ! empty( $settings[ $key ] ) ) { |
|
226 | 226 | return $settings[ $key ]; |
227 | 227 | } |
228 | 228 | |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | */ |
254 | 254 | public function getAtts( $key = NULL ) { |
255 | 255 | |
256 | - if( !empty( $key ) ) { |
|
257 | - if( isset( $this->atts[ $key ] ) ) { |
|
256 | + if ( ! empty( $key ) ) { |
|
257 | + if ( isset( $this->atts[ $key ] ) ) { |
|
258 | 258 | return $this->atts[ $key ]; |
259 | 259 | } |
260 | 260 | return NULL; |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | |
321 | 321 | $fields = empty( $this->fields ) ? NULL : $this->fields; |
322 | 322 | |
323 | - if( $fields && !empty( $key ) ) { |
|
323 | + if ( $fields && ! empty( $key ) ) { |
|
324 | 324 | $fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL; |
325 | 325 | } |
326 | 326 | |
@@ -338,18 +338,18 @@ discard block |
||
338 | 338 | */ |
339 | 339 | public function getContextFields( $context = '' ) { |
340 | 340 | |
341 | - if( '' === $context ) { |
|
341 | + if ( '' === $context ) { |
|
342 | 342 | $context = $this->getContext(); |
343 | 343 | } |
344 | 344 | |
345 | 345 | $fields = $this->getFields(); |
346 | 346 | |
347 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
347 | + foreach ( (array)$fields as $key => $context_fields ) { |
|
348 | 348 | |
349 | 349 | // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
350 | 350 | $matches = explode( '_', $key ); |
351 | 351 | |
352 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
352 | + if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) { |
|
353 | 353 | return $context_fields; |
354 | 354 | } |
355 | 355 | } |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function getField( $key ) { |
372 | 372 | |
373 | - if( !empty( $key ) ) { |
|
374 | - if( isset( $this->fields[ $key ] ) ) { |
|
373 | + if ( ! empty( $key ) ) { |
|
374 | + if ( isset( $this->fields[ $key ] ) ) { |
|
375 | 375 | return $this->fields[ $key ]; |
376 | 376 | } |
377 | 377 | } |
@@ -477,8 +477,8 @@ discard block |
||
477 | 477 | public function getPaginationCounts() { |
478 | 478 | |
479 | 479 | $paging = $this->getPaging(); |
480 | - $offset = $paging['offset']; |
|
481 | - $page_size = $paging['page_size']; |
|
480 | + $offset = $paging[ 'offset' ]; |
|
481 | + $page_size = $paging[ 'page_size' ]; |
|
482 | 482 | $total = $this->getTotalEntries(); |
483 | 483 | |
484 | 484 | if ( empty( $total ) ) { |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | */ |
500 | 500 | list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) ); |
501 | 501 | |
502 | - return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total ); |
|
502 | + return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total ); |
|
503 | 503 | } |
504 | 504 | |
505 | 505 | /** |
@@ -595,16 +595,16 @@ discard block |
||
595 | 595 | */ |
596 | 596 | public function getCurrentEntry() { |
597 | 597 | |
598 | - if( in_array( $this->getContext(), array( 'edit', 'single') ) ) { |
|
598 | + if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) { |
|
599 | 599 | $entries = $this->getEntries(); |
600 | - $entry = $entries[0]; |
|
600 | + $entry = $entries[ 0 ]; |
|
601 | 601 | } else { |
602 | 602 | $entry = $this->_current_entry; |
603 | 603 | } |
604 | 604 | |
605 | 605 | /** @since 1.16 Fixes DataTables empty entry issue */ |
606 | - if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) { |
|
607 | - $entry = $this->_current_field['entry']; |
|
606 | + if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) { |
|
607 | + $entry = $this->_current_field[ 'entry' ]; |
|
608 | 608 | } |
609 | 609 | |
610 | 610 | return $entry; |
@@ -644,7 +644,7 @@ discard block |
||
644 | 644 | public function renderZone( $zone = '', $atts = array(), $echo = true ) { |
645 | 645 | |
646 | 646 | if ( empty( $zone ) ) { |
647 | - gravityview()->log->error( 'No zone defined.'); |
|
647 | + gravityview()->log->error( 'No zone defined.' ); |
|
648 | 648 | return NULL; |
649 | 649 | } |
650 | 650 | |
@@ -653,16 +653,16 @@ discard block |
||
653 | 653 | 'context' => $this->getContext(), |
654 | 654 | 'entry' => $this->getCurrentEntry(), |
655 | 655 | 'form' => $this->getForm(), |
656 | - 'hide_empty' => $this->getAtts('hide_empty'), |
|
656 | + 'hide_empty' => $this->getAtts( 'hide_empty' ), |
|
657 | 657 | ); |
658 | 658 | |
659 | 659 | $final_atts = wp_parse_args( $atts, $defaults ); |
660 | 660 | |
661 | 661 | $output = ''; |
662 | 662 | |
663 | - $final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}"; |
|
663 | + $final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}"; |
|
664 | 664 | |
665 | - $fields = $this->getField( $final_atts['zone_id'] ); |
|
665 | + $fields = $this->getField( $final_atts[ 'zone_id' ] ); |
|
666 | 666 | |
667 | 667 | // Backward compatibility |
668 | 668 | if ( 'table' === $this->getTemplatePartSlug() ) { |
@@ -672,19 +672,19 @@ discard block |
||
672 | 672 | * @param \GravityView_View $this |
673 | 673 | * @deprecated Use `gravityview/template/table/fields` |
674 | 674 | */ |
675 | - $fields = apply_filters("gravityview_table_cells", $fields, $this ); |
|
675 | + $fields = apply_filters( "gravityview_table_cells", $fields, $this ); |
|
676 | 676 | } |
677 | 677 | |
678 | 678 | if ( empty( $fields ) ) { |
679 | 679 | |
680 | - gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) ); |
|
680 | + gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) ); |
|
681 | 681 | |
682 | 682 | return NULL; |
683 | 683 | } |
684 | 684 | |
685 | 685 | $field_output = ''; |
686 | 686 | foreach ( $fields as $field ) { |
687 | - $final_atts['field'] = $field; |
|
687 | + $final_atts[ 'field' ] = $field; |
|
688 | 688 | |
689 | 689 | $field_output .= gravityview_field_output( $final_atts ); |
690 | 690 | } |
@@ -701,17 +701,17 @@ discard block |
||
701 | 701 | return NULL; |
702 | 702 | } |
703 | 703 | |
704 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
705 | - $output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">'; |
|
704 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
705 | + $output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">'; |
|
706 | 706 | } |
707 | 707 | |
708 | 708 | $output .= $field_output; |
709 | 709 | |
710 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
710 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
711 | 711 | $output .= '</div>'; |
712 | 712 | } |
713 | 713 | |
714 | - if( $echo ) { |
|
714 | + if ( $echo ) { |
|
715 | 715 | echo $output; |
716 | 716 | } |
717 | 717 | |
@@ -729,7 +729,7 @@ discard block |
||
729 | 729 | */ |
730 | 730 | function locate_template( $template_names, $load = false, $require_once = true ) { |
731 | 731 | |
732 | - if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
732 | + if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
733 | 733 | |
734 | 734 | $located = $this->located_templates[ $template_names ]; |
735 | 735 | |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | // Set $load to always false so we handle it here. |
739 | 739 | $located = parent::locate_template( $template_names, false, $require_once ); |
740 | 740 | |
741 | - if( is_string( $template_names ) ) { |
|
741 | + if ( is_string( $template_names ) ) { |
|
742 | 742 | $this->located_templates[ $template_names ] = $located; |
743 | 743 | } |
744 | 744 | } |
@@ -756,7 +756,7 @@ discard block |
||
756 | 756 | * @return mixed|null The stored data. |
757 | 757 | */ |
758 | 758 | public function __get( $name ) { |
759 | - if( isset( $this->{$name} ) ) { |
|
759 | + if ( isset( $this->{$name} ) ) { |
|
760 | 760 | return $this->{$name}; |
761 | 761 | } else { |
762 | 762 | return NULL; |
@@ -785,17 +785,17 @@ discard block |
||
785 | 785 | $additional = array(); |
786 | 786 | |
787 | 787 | // form-19-table-body.php |
788 | - $additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
788 | + $additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
789 | 789 | |
790 | - if( $view_id = $this->getViewId() ) { |
|
790 | + if ( $view_id = $this->getViewId() ) { |
|
791 | 791 | // view-3-table-body.php |
792 | - $additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name ); |
|
792 | + $additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name ); |
|
793 | 793 | } |
794 | 794 | |
795 | - if( $this->getPostId() ) { |
|
795 | + if ( $this->getPostId() ) { |
|
796 | 796 | |
797 | 797 | // page-19-table-body.php |
798 | - $additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
798 | + $additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
799 | 799 | } |
800 | 800 | |
801 | 801 | // Combine with existing table-body.php and table.php |
@@ -817,7 +817,7 @@ discard block |
||
817 | 817 | |
818 | 818 | gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) ); |
819 | 819 | |
820 | - if( !empty( $template_file) ) { |
|
820 | + if ( ! empty( $template_file ) ) { |
|
821 | 821 | |
822 | 822 | if ( $require_once ) { |
823 | 823 | require_once( $template_file ); |
@@ -892,7 +892,7 @@ discard block |
||
892 | 892 | |
893 | 893 | // Prevent being called twice |
894 | 894 | if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) { |
895 | - gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) ); |
|
895 | + gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) ); |
|
896 | 896 | return; |
897 | 897 | } |
898 | 898 | |
@@ -914,7 +914,7 @@ discard block |
||
914 | 914 | * @param string $zone Current widget zone, either `header` or `footer` |
915 | 915 | * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']` |
916 | 916 | */ |
917 | - $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
917 | + $css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
918 | 918 | |
919 | 919 | $css_class = gravityview_sanitize_html_class( $css_class ); |
920 | 920 | |
@@ -922,15 +922,15 @@ discard block |
||
922 | 922 | ?> |
923 | 923 | <div class="<?php echo $css_class; ?>"> |
924 | 924 | <?php |
925 | - foreach( $rows as $row ) { |
|
926 | - foreach( $row as $col => $areas ) { |
|
925 | + foreach ( $rows as $row ) { |
|
926 | + foreach ( $row as $col => $areas ) { |
|
927 | 927 | $column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left"; |
928 | 928 | ?> |
929 | 929 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
930 | 930 | <?php |
931 | 931 | if ( ! empty( $areas ) ) { |
932 | 932 | foreach ( $areas as $area ) { |
933 | - foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) { |
|
933 | + foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) { |
|
934 | 934 | do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context ); |
935 | 935 | } |
936 | 936 | } |
@@ -28,18 +28,18 @@ |
||
28 | 28 | |
29 | 29 | $sort_fields_input = '<select name="template_settings[sort_field][]" class="gravityview_sort_field" id="gravityview_sort_field_%d">%s</select>'; |
30 | 30 | |
31 | - if ( is_array( $current_settings['sort_field'] ) ) { |
|
32 | - $primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][0] ); |
|
33 | - $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] ); |
|
31 | + if ( is_array( $current_settings[ 'sort_field' ] ) ) { |
|
32 | + $primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 0 ] ); |
|
33 | + $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 1 ] ); |
|
34 | 34 | } else { |
35 | - $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] ); |
|
35 | + $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] ); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | // Splice the sort direction |
39 | 39 | $_directions = array(); |
40 | 40 | foreach ( (array)\GV\Utils::get( $current_settings, 'sort_direction', array() ) as $i => $direction ) { |
41 | 41 | if ( ! $i ) { |
42 | - $_directions['sort_direction'] = $direction; |
|
42 | + $_directions[ 'sort_direction' ] = $direction; |
|
43 | 43 | } else { |
44 | 44 | $_directions[ sprintf( 'sort_direction_%d', $i + 1 ) ] = $direction; |
45 | 45 | } |