@@ -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 | * @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 | } |
@@ -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 ) { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | public function __construct() { |
| 27 | 27 | $this->label = esc_html__( 'Other Entries', 'gravityview' ); |
| 28 | - $this->description = esc_html__('Display other entries created by the entry creator.', 'gravityview'); |
|
| 28 | + $this->description = esc_html__( 'Display other entries created by the entry creator.', 'gravityview' ); |
|
| 29 | 29 | parent::__construct(); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -35,32 +35,32 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 37 | 37 | |
| 38 | - if( 'edit' === $context ) { |
|
| 38 | + if ( 'edit' === $context ) { |
|
| 39 | 39 | return $field_options; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | // No "Link to single entry"; all the items will be links to entries! |
| 43 | - unset( $field_options['show_as_link'] ); |
|
| 43 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 44 | 44 | |
| 45 | 45 | $new_options = array(); |
| 46 | 46 | |
| 47 | - $new_options['link_format'] = array( |
|
| 47 | + $new_options[ 'link_format' ] = array( |
|
| 48 | 48 | 'type' => 'text', |
| 49 | 49 | 'label' => __( 'Entry link text (required)', 'gravityview' ), |
| 50 | - 'value' => __('Entry #{entry_id}', 'gravityview'), |
|
| 50 | + 'value' => __( 'Entry #{entry_id}', 'gravityview' ), |
|
| 51 | 51 | 'merge_tags' => 'force', |
| 52 | 52 | ); |
| 53 | 53 | |
| 54 | - $new_options['after_link'] = array( |
|
| 54 | + $new_options[ 'after_link' ] = array( |
|
| 55 | 55 | 'type' => 'textarea', |
| 56 | 56 | 'label' => __( 'Text or HTML to display after the link (optional)', 'gravityview' ), |
| 57 | - 'desc' => __('This content will be displayed below each entry link.', 'gravityview'), |
|
| 57 | + 'desc' => __( 'This content will be displayed below each entry link.', 'gravityview' ), |
|
| 58 | 58 | 'value' => '', |
| 59 | 59 | 'merge_tags' => 'force', |
| 60 | 60 | 'class' => 'widefat code', |
| 61 | 61 | ); |
| 62 | 62 | |
| 63 | - $new_options['page_size'] = array( |
|
| 63 | + $new_options[ 'page_size' ] = array( |
|
| 64 | 64 | 'type' => 'number', |
| 65 | 65 | 'label' => __( 'Entries to Display', 'gravityview' ), |
| 66 | 66 | 'desc' => __( 'What is the maximum number of entries that should be shown?', 'gravityview' ), |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | 'merge_tags' => false, |
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | - $new_options['no_entries_hide'] = array( |
|
| 71 | + $new_options[ 'no_entries_hide' ] = array( |
|
| 72 | 72 | 'type' => 'checkbox', |
| 73 | 73 | 'label' => __( 'Hide if no entries', 'gravityview' ), |
| 74 | 74 | 'desc' => __( 'Don\'t display this field if the entry creator has no other entries', 'gravityview' ), |
| 75 | 75 | 'value' => false, |
| 76 | 76 | ); |
| 77 | 77 | |
| 78 | - $new_options['no_entries_text'] = array( |
|
| 78 | + $new_options[ 'no_entries_text' ] = array( |
|
| 79 | 79 | 'type' => 'text', |
| 80 | 80 | 'label' => __( 'No Entries Text', 'gravityview' ), |
| 81 | 81 | 'desc' => __( 'The text that is shown if the entry creator has no other entries (and "Hide if no entries" is disabled).', 'gravityview' ), |
@@ -107,11 +107,11 @@ discard block |
||
| 107 | 107 | foreach ( $filters as $filter ) { |
| 108 | 108 | foreach ( $wp_filter[ $filter ] as $priority => $callbacks ) { |
| 109 | 109 | foreach ( $callbacks as $id => $callback ) { |
| 110 | - if ( ! is_array( $callback['function'] ) ) { |
|
| 110 | + if ( ! is_array( $callback[ 'function' ] ) ) { |
|
| 111 | 111 | continue; |
| 112 | 112 | } |
| 113 | - if ( $callback['function'][0] instanceof \GV\Widget ) { |
|
| 114 | - $remove[] = array( $filter, $priority, $id ); |
|
| 113 | + if ( $callback[ 'function' ][ 0 ] instanceof \GV\Widget ) { |
|
| 114 | + $remove[ ] = array( $filter, $priority, $id ); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | foreach ( $remove as $r ) { |
| 121 | 121 | list( $filter, $priority, $id ) = $r; |
| 122 | - $removed[] = array( $filter, $priority, $id, $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] ); |
|
| 122 | + $removed[ ] = array( $filter, $priority, $id, $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] ); |
|
| 123 | 123 | unset( $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] ); |
| 124 | 124 | } |
| 125 | 125 | |
@@ -143,10 +143,10 @@ discard block |
||
| 143 | 143 | public function filter_entries( $search_criteria, $form_id = null, $args = array(), $force_search_criteria = false ) { |
| 144 | 144 | $context = $this->context; |
| 145 | 145 | |
| 146 | - $created_by = $context->entry['created_by']; |
|
| 146 | + $created_by = $context->entry[ 'created_by' ]; |
|
| 147 | 147 | |
| 148 | 148 | /** Filter entries by approved and created_by. */ |
| 149 | - $search_criteria['field_filters'][] = array( |
|
| 149 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 150 | 150 | 'key' => 'created_by', |
| 151 | 151 | 'value' => $created_by, |
| 152 | 152 | 'operator' => 'is' |
@@ -166,14 +166,14 @@ discard block |
||
| 166 | 166 | $criteria = apply_filters( 'gravityview/field/other_entries/criteria', $search_criteria, $context->view->settings->as_atts(), $context->view->form->ID, $context ); |
| 167 | 167 | |
| 168 | 168 | /** Force mode all and filter out our own entry. */ |
| 169 | - $search_criteria['field_filters']['mode'] = 'all'; |
|
| 170 | - $search_criteria['field_filters'][] = array( |
|
| 169 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
| 170 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 171 | 171 | 'key' => 'id', |
| 172 | 172 | 'value' => $context->entry->ID, |
| 173 | 173 | 'operator' => 'isnot' |
| 174 | 174 | ); |
| 175 | 175 | |
| 176 | - $search_criteria['paging']['page_size'] = $context->field->page_size ? : 10; |
|
| 176 | + $search_criteria[ 'paging' ][ 'page_size' ] = $context->field->page_size ?: 10; |
|
| 177 | 177 | |
| 178 | 178 | return $search_criteria; |
| 179 | 179 | } |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | if ( 'address' === \GV\Utils::get( $search_field, 'type' ) ) { |
| 62 | 62 | |
| 63 | - $field_id = intval( floor( $search_field['key'] ) ); |
|
| 64 | - $input_id = gravityview_get_input_id_from_id( $search_field['key'] ); |
|
| 63 | + $field_id = intval( floor( $search_field[ 'key' ] ) ); |
|
| 64 | + $input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] ); |
|
| 65 | 65 | $form = GravityView_View::getInstance()->getForm(); |
| 66 | 66 | |
| 67 | 67 | /** @var GF_Field_Address $address_field */ |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $choices = array(); |
| 71 | 71 | |
| 72 | 72 | $method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id ); |
| 73 | - if( method_exists( $this, $method_name ) ) { |
|
| 73 | + if ( method_exists( $this, $method_name ) ) { |
|
| 74 | 74 | /** |
| 75 | 75 | * @uses GravityView_Field_Address::get_choices_country() |
| 76 | 76 | * @uses GravityView_Field_Address::get_choices_state() |
@@ -78,12 +78,12 @@ discard block |
||
| 78 | 78 | $choices = $this->{$method_name}( $address_field, $form ); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if( ! empty( $choices ) ) { |
|
| 82 | - $search_field['choices'] = $choices; |
|
| 83 | - $search_field['type'] = \GV\Utils::get( $search_field, 'input'); |
|
| 81 | + if ( ! empty( $choices ) ) { |
|
| 82 | + $search_field[ 'choices' ] = $choices; |
|
| 83 | + $search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' ); |
|
| 84 | 84 | } else { |
| 85 | - $search_field['type'] = 'text'; |
|
| 86 | - $search_field['input'] = 'input_text'; |
|
| 85 | + $search_field[ 'type' ] = 'text'; |
|
| 86 | + $search_field[ 'input' ] = 'input_text'; |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $country_choices = array(); |
| 110 | 110 | |
| 111 | 111 | foreach ( $countries as $key => $country ) { |
| 112 | - $country_choices[] = array( |
|
| 112 | + $country_choices[ ] = array( |
|
| 113 | 113 | 'value' => $country, |
| 114 | 114 | 'text' => $country, |
| 115 | 115 | ); |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | private function get_choices_state( $address_field, $form ) { |
| 136 | 136 | |
| 137 | - $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType; |
|
| 137 | + $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType; |
|
| 138 | 138 | |
| 139 | 139 | $state_choices = array(); |
| 140 | 140 | |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | $states = GFCommon::get_canadian_provinces(); |
| 147 | 147 | break; |
| 148 | 148 | default: |
| 149 | - $address_types = $address_field->get_address_types( $form['id'] ); |
|
| 150 | - $states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states']; |
|
| 149 | + $address_types = $address_field->get_address_types( $form[ 'id' ] ); |
|
| 150 | + $states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ]; |
|
| 151 | 151 | break; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -156,19 +156,19 @@ discard block |
||
| 156 | 156 | $state_subchoices = array(); |
| 157 | 157 | |
| 158 | 158 | foreach ( $state as $substate ) { |
| 159 | - $state_subchoices[] = array( |
|
| 159 | + $state_subchoices[ ] = array( |
|
| 160 | 160 | 'value' => $substate, |
| 161 | 161 | 'text' => $substate, |
| 162 | 162 | ); |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - $state_choices[] = array( |
|
| 165 | + $state_choices[ ] = array( |
|
| 166 | 166 | 'text' => $key, |
| 167 | 167 | 'value' => $state_subchoices, |
| 168 | 168 | ); |
| 169 | 169 | |
| 170 | 170 | } else { |
| 171 | - $state_choices[] = array( |
|
| 171 | + $state_choices[ ] = array( |
|
| 172 | 172 | 'value' => $state, |
| 173 | 173 | 'text' => $state, |
| 174 | 174 | ); |
@@ -192,13 +192,13 @@ discard block |
||
| 192 | 192 | // Use the same inputs as the "text" input type allows |
| 193 | 193 | $text_inputs = \GV\Utils::get( $input_types, 'text' ); |
| 194 | 194 | |
| 195 | - $input_types['street'] = $text_inputs; |
|
| 196 | - $input_types['street2'] = $text_inputs; |
|
| 197 | - $input_types['city'] = $text_inputs; |
|
| 195 | + $input_types[ 'street' ] = $text_inputs; |
|
| 196 | + $input_types[ 'street2' ] = $text_inputs; |
|
| 197 | + $input_types[ 'city' ] = $text_inputs; |
|
| 198 | 198 | |
| 199 | - $input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 200 | - $input_types['zip'] = array( 'input_text' ); |
|
| 201 | - $input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 199 | + $input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 200 | + $input_types[ 'zip' ] = array( 'input_text' ); |
|
| 201 | + $input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
| 202 | 202 | |
| 203 | 203 | return $input_types; |
| 204 | 204 | } |
@@ -219,10 +219,10 @@ discard block |
||
| 219 | 219 | // Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)? |
| 220 | 220 | $input_id = gravityview_get_input_id_from_id( $field_id ); |
| 221 | 221 | |
| 222 | - if( 'address' === $field_type && $input_id ) { |
|
| 222 | + if ( 'address' === $field_type && $input_id ) { |
|
| 223 | 223 | |
| 224 | 224 | // If the input ID matches an expected address input, set to that. Otherwise, keep existing input type. |
| 225 | - if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
| 225 | + if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
| 226 | 226 | $input_type = $address_field_name; |
| 227 | 227 | } |
| 228 | 228 | } |
@@ -271,20 +271,20 @@ discard block |
||
| 271 | 271 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
| 272 | 272 | |
| 273 | 273 | // If this is NOT the full address field, return default options. |
| 274 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 274 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 275 | 275 | return $field_options; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - if( 'edit' === $context ) { |
|
| 278 | + if ( 'edit' === $context ) { |
|
| 279 | 279 | return $field_options; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | $add_options = array(); |
| 283 | 283 | |
| 284 | - $add_options['show_map_link'] = array( |
|
| 284 | + $add_options[ 'show_map_link' ] = array( |
|
| 285 | 285 | 'type' => 'checkbox', |
| 286 | 286 | 'label' => __( 'Show Map Link:', 'gravityview' ), |
| 287 | - 'desc' => __('Display a "Map It" link below the address', 'gravityview'), |
|
| 287 | + 'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ), |
|
| 288 | 288 | 'value' => true, |
| 289 | 289 | 'merge_tags' => false, |
| 290 | 290 | ); |