@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | if ( ! $entry instanceof Entry ) { |
45 | 45 | continue; |
46 | 46 | } |
47 | - $_entry->entries[ $entry['form_id'] ] = &$entry; |
|
47 | + $_entry->entries[ $entry[ 'form_id' ] ] = &$entry; |
|
48 | 48 | } |
49 | 49 | return $_entry; |
50 | 50 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | foreach ( $this->entries as $entry ) { |
67 | 67 | $entry = $entry->as_entry(); |
68 | - $_entry['_multi'][ $entry['form_id'] ] = $entry; |
|
68 | + $_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry; |
|
69 | 69 | } |
70 | 70 | } |
71 | 71 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | public function get_permalink( \GV\View $view = null, \GV\Request $request = null, $track_directory = true ) { |
88 | 88 | $slugs = array(); |
89 | 89 | add_filter( 'gravityview/entry/slug', $callback = function( $slug ) use ( &$slugs ) { |
90 | - $slugs[] = $slug; |
|
90 | + $slugs[ ] = $slug; |
|
91 | 91 | return implode( ',', $slugs ); |
92 | 92 | }, 10, 1 ); |
93 | 93 |
@@ -24,6 +24,6 @@ |
||
24 | 24 | $plugin_theme_hooks_files = glob( $include_path . 'class-gravityview-{plugin,theme}-hooks-*.php', $glob_flags ); |
25 | 25 | |
26 | 26 | // Load all plugin and theme files automatically |
27 | -foreach ( (array) $plugin_theme_hooks_files as $gv_hooks_filename ) { |
|
27 | +foreach ( (array)$plugin_theme_hooks_files as $gv_hooks_filename ) { |
|
28 | 28 | include $gv_hooks_filename; |
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | function __construct() { |
23 | 23 | |
24 | 24 | $this->widget_id = 'poll'; |
25 | - $this->widget_description = __('Displays the results of Poll Fields that exist in the form.', 'gravityview' ); |
|
26 | - $this->widget_subtitle = sprintf( _x('Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' ); |
|
25 | + $this->widget_description = __( 'Displays the results of Poll Fields that exist in the form.', 'gravityview' ); |
|
26 | + $this->widget_subtitle = sprintf( _x( 'Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' ); |
|
27 | 27 | |
28 | 28 | $default_values = array( |
29 | 29 | 'header' => 1, |
@@ -32,27 +32,27 @@ discard block |
||
32 | 32 | |
33 | 33 | $settings = array( |
34 | 34 | 'percentages' => array( |
35 | - 'label' => __('Display Percentages', 'gravityview'), |
|
35 | + 'label' => __( 'Display Percentages', 'gravityview' ), |
|
36 | 36 | 'type' => 'checkbox', |
37 | 37 | 'value' => true, |
38 | 38 | 'tooltip' => __( 'Display results percentages as part of results? Supported values are: true, false. Defaults to "true".', 'gravityview' ), |
39 | 39 | ), |
40 | 40 | 'counts' => array( |
41 | - 'label' => __('Display Counts', 'gravityview'), |
|
41 | + 'label' => __( 'Display Counts', 'gravityview' ), |
|
42 | 42 | 'type' => 'checkbox', |
43 | 43 | 'value' => true, |
44 | 44 | 'tooltip' => __( 'Display number of times each choice has been selected when displaying results? Supported values are: true, false. Defaults to "true".', 'gravityview' ), |
45 | 45 | ), |
46 | 46 | 'style' => array( |
47 | 47 | 'type' => 'select', |
48 | - 'label' => __('Style', 'gravityview'), |
|
48 | + 'label' => __( 'Style', 'gravityview' ), |
|
49 | 49 | 'tooltip' => __( 'The Polls Add-On currently supports 4 built in styles: red, green, orange, blue. Defaults to "green".', 'gravityview' ), |
50 | 50 | 'value' => 'green', |
51 | 51 | 'choices' => array( |
52 | - 'green' => __('Green', 'gravityview'), |
|
53 | - 'blue' => __('Blue', 'gravityview'), |
|
54 | - 'red' => __('Red', 'gravityview'), |
|
55 | - 'orange' => __('Orange', 'gravityview'), |
|
52 | + 'green' => __( 'Green', 'gravityview' ), |
|
53 | + 'blue' => __( 'Blue', 'gravityview' ), |
|
54 | + 'red' => __( 'Red', 'gravityview' ), |
|
55 | + 'orange' => __( 'Orange', 'gravityview' ), |
|
56 | 56 | ), |
57 | 57 | ), |
58 | 58 | ); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
63 | 63 | } |
64 | 64 | |
65 | - parent::__construct( __( 'Poll Results', 'gravityview' ) , null, $default_values, $settings ); |
|
65 | + parent::__construct( __( 'Poll Results', 'gravityview' ), null, $default_values, $settings ); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | |
90 | 90 | $GFPolls = GFPolls::get_instance(); |
91 | 91 | |
92 | - wp_enqueue_script('gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array('jquery'), $GFPolls->_version); |
|
92 | + wp_enqueue_script( 'gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array( 'jquery' ), $GFPolls->_version ); |
|
93 | 93 | |
94 | 94 | $GFPolls->localize_scripts(); |
95 | 95 | |
96 | - wp_enqueue_style('gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version); |
|
96 | + wp_enqueue_style( 'gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version ); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function pre_render_frontend() { |
105 | 105 | |
106 | - if( ! class_exists('GFPolls') ) { |
|
106 | + if ( ! class_exists( 'GFPolls' ) ) { |
|
107 | 107 | |
108 | 108 | gravityview()->log->error( 'Poll Widget not displayed; the Poll Addon is not loaded' ); |
109 | 109 | |
@@ -112,10 +112,10 @@ discard block |
||
112 | 112 | |
113 | 113 | $view = gravityview()->views->get(); |
114 | 114 | |
115 | - $poll_fields = array( $view->form->form['id'] => GFCommon::get_fields_by_type( $view->form, array( 'poll' ) ) ); |
|
115 | + $poll_fields = array( $view->form->form[ 'id' ] => GFCommon::get_fields_by_type( $view->form, array( 'poll' ) ) ); |
|
116 | 116 | |
117 | 117 | foreach ( $view->joins as $join ) { |
118 | - $poll_fields[ $join->join_on->form['id'] ] = GFCommon::get_fields_by_type( $join->join_on->form, array( 'poll' ) ); |
|
118 | + $poll_fields[ $join->join_on->form[ 'id' ] ] = GFCommon::get_fields_by_type( $join->join_on->form, array( 'poll' ) ); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | $poll_fields = array_filter( $poll_fields ); |
@@ -167,12 +167,12 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public function render_frontend( $widget_args, $content = '', $context = '' ) { |
169 | 169 | |
170 | - if( ! $this->pre_render_frontend() ) { |
|
170 | + if ( ! $this->pre_render_frontend() ) { |
|
171 | 171 | return; |
172 | 172 | } |
173 | 173 | |
174 | 174 | // Make sure the class is loaded in DataTables |
175 | - if( !class_exists( 'GFFormDisplay' ) ) { |
|
175 | + if ( ! class_exists( 'GFFormDisplay' ) ) { |
|
176 | 176 | include_once( GFCommon::get_base_path() . '/form_display.php' ); |
177 | 177 | } |
178 | 178 | |
@@ -180,14 +180,14 @@ discard block |
||
180 | 180 | |
181 | 181 | $settings = $this->get_frontend_settings( $widget_args ); |
182 | 182 | |
183 | - $percentages = empty( $settings['percentages'] ) ? 'false' : 'true'; |
|
183 | + $percentages = empty( $settings[ 'percentages' ] ) ? 'false' : 'true'; |
|
184 | 184 | |
185 | - $counts = empty( $settings['counts'] ) ? 'false' : 'true'; |
|
185 | + $counts = empty( $settings[ 'counts' ] ) ? 'false' : 'true'; |
|
186 | 186 | |
187 | - if( !empty( $settings['field'] ) ) { |
|
188 | - $merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings['field'], $settings['style'], $percentages, $counts ); |
|
187 | + if ( ! empty( $settings[ 'field' ] ) ) { |
|
188 | + $merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings[ 'field' ], $settings[ 'style' ], $percentages, $counts ); |
|
189 | 189 | } else { |
190 | - $merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings['style'], $percentages, $counts ); |
|
190 | + $merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings[ 'style' ], $percentages, $counts ); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | $gravityview_view = GravityView_View::getInstance(); |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | $gravityview_view->poll_settings = $settings; |
198 | 198 | $gravityview_view->poll_fields = $this->poll_fields; |
199 | 199 | |
200 | - $gravityview_view->render('widget', 'poll', false ); |
|
200 | + $gravityview_view->render( 'widget', 'poll', false ); |
|
201 | 201 | |
202 | 202 | unset( $gravityview_view->poll_merge_tag, $gravityview_view->poll_settings, $gravityview_view->poll_form, $gravityview_view->poll_fields ); |
203 | 203 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function the_field( \GV\Field $field ) { |
28 | 28 | $renderer = new Field_Renderer(); |
29 | - $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ? : $this->view->form ) : new Internal_Source(); |
|
29 | + $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source(); |
|
30 | 30 | |
31 | 31 | return $renderer->render( $field, $this->view, $source, $this->entry->from_field( $field ), $this->request ); |
32 | 32 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | foreach ( $fields->all() as $field ) { |
64 | 64 | $context = Template_Context::from_template( $this, compact( 'field' ) ); |
65 | 65 | |
66 | - $form = \GV\GF_Form::by_id( $field->form_id ) ? : $this->view->form; |
|
66 | + $form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form; |
|
67 | 67 | $entry = $this->entry->from_field( $field ); |
68 | 68 | |
69 | 69 | if ( ! $entry ) { |
@@ -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> |
@@ -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; |