@@ -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 ) { |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | 'total' => wp_count_posts( 'gravityview' )->publish, |
| 64 | 64 | ); |
| 65 | 65 | foreach ( $items as $item ) { |
| 66 | - $data['views'][] = $this->prepare_view_for_response( $item, $request ); |
|
| 66 | + $data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request ); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | return new \WP_REST_Response( $data, 200 ); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | $url = $request->get_url_params(); |
| 84 | 84 | |
| 85 | - $view_id = intval( $url['id'] ); |
|
| 85 | + $view_id = intval( $url[ 'id' ] ); |
|
| 86 | 86 | |
| 87 | 87 | $item = get_post( $view_id ); |
| 88 | 88 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | // Only output the fields that should be displayed. |
| 115 | 115 | $allowed = array(); |
| 116 | 116 | foreach ( $view->fields->by_position( "{$context}_*" )->by_visible()->all() as $field ) { |
| 117 | - $allowed[] = $field; |
|
| 117 | + $allowed[ ] = $field; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | // Tack on additional fields if needed |
| 135 | 135 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
| 136 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 136 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | $r = new Request( $request ); |
@@ -201,10 +201,10 @@ discard block |
||
| 201 | 201 | public function get_sub_items( $request ) { |
| 202 | 202 | |
| 203 | 203 | $url = $request->get_url_params(); |
| 204 | - $view_id = intval( $url['id'] ); |
|
| 204 | + $view_id = intval( $url[ 'id' ] ); |
|
| 205 | 205 | $format = \GV\Utils::get( $url, 'format', 'json' ); |
| 206 | 206 | |
| 207 | - if( $post_id = $request->get_param('post_id') ) { |
|
| 207 | + if ( $post_id = $request->get_param( 'post_id' ) ) { |
|
| 208 | 208 | global $post; |
| 209 | 209 | |
| 210 | 210 | $post = get_post( $post_id ); |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | |
| 303 | 303 | $data = array( 'entries' => $entries->all(), 'total' => $entries->total() ); |
| 304 | 304 | |
| 305 | - foreach ( $data['entries'] as &$entry ) { |
|
| 305 | + foreach ( $data[ 'entries' ] as &$entry ) { |
|
| 306 | 306 | $entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' ); |
| 307 | 307 | } |
| 308 | 308 | |
@@ -321,8 +321,8 @@ discard block |
||
| 321 | 321 | */ |
| 322 | 322 | public function get_sub_item( $request ) { |
| 323 | 323 | $url = $request->get_url_params(); |
| 324 | - $view_id = intval( $url['id'] ); |
|
| 325 | - $entry_id = intval( $url['s_id'] ); |
|
| 324 | + $view_id = intval( $url[ 'id' ] ); |
|
| 325 | + $entry_id = intval( $url[ 's_id' ] ); |
|
| 326 | 326 | $format = \GV\Utils::get( $url, 'format', 'json' ); |
| 327 | 327 | |
| 328 | 328 | $view = \GV\View::by_id( $view_id ); |
@@ -357,32 +357,32 @@ discard block |
||
| 357 | 357 | // Add all the WP_Post data |
| 358 | 358 | $view_post = $view_post->to_array(); |
| 359 | 359 | |
| 360 | - unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] ); |
|
| 360 | + unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] ); |
|
| 361 | 361 | |
| 362 | 362 | $return = wp_parse_args( $item, $view_post ); |
| 363 | 363 | |
| 364 | - $return['title'] = $return['post_title']; |
|
| 364 | + $return[ 'title' ] = $return[ 'post_title' ]; |
|
| 365 | 365 | |
| 366 | - $return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array(); |
|
| 367 | - unset( $return['atts'], $return['view_id'] ); |
|
| 366 | + $return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array(); |
|
| 367 | + unset( $return[ 'atts' ], $return[ 'view_id' ] ); |
|
| 368 | 368 | |
| 369 | - $return['search_criteria'] = array( |
|
| 369 | + $return[ 'search_criteria' ] = array( |
|
| 370 | 370 | 'page_size' => rgars( $return, 'settings/page_size' ), |
| 371 | 371 | 'sort_field' => rgars( $return, 'settings/sort_field' ), |
| 372 | 372 | 'sort_direction' => rgars( $return, 'settings/sort_direction' ), |
| 373 | 373 | 'offset' => rgars( $return, 'settings/offset' ), |
| 374 | 374 | ); |
| 375 | 375 | |
| 376 | - unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] ); |
|
| 376 | + unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] ); |
|
| 377 | 377 | |
| 378 | 378 | // Redact for non-logged ins |
| 379 | 379 | if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) { |
| 380 | - unset( $return['settings'] ); |
|
| 381 | - unset( $return['search_criteria'] ); |
|
| 380 | + unset( $return[ 'settings' ] ); |
|
| 381 | + unset( $return[ 'search_criteria' ] ); |
|
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) { |
| 385 | - unset( $return['form'] ); |
|
| 385 | + unset( $return[ 'form' ] ); |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | return $return; |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | $view_id = func_get_arg( 1 ); // $view_id override |
| 399 | 399 | } else { |
| 400 | 400 | $url = $request->get_url_params(); |
| 401 | - $view_id = intval( $url['id'] ); |
|
| 401 | + $view_id = intval( $url[ 'id' ] ); |
|
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | if ( ! $view = \GV\View::by_id( $view_id ) ) { |
@@ -444,8 +444,8 @@ discard block |
||
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | $url = $request->get_url_params(); |
| 447 | - $view_id = intval( $url['id'] ); |
|
| 448 | - $entry_id = intval( $url['s_id'] ); |
|
| 447 | + $view_id = intval( $url[ 'id' ] ); |
|
| 448 | + $entry_id = intval( $url[ 's_id' ] ); |
|
| 449 | 449 | |
| 450 | 450 | $view = \GV\View::by_id( $view_id ); |
| 451 | 451 | |
@@ -453,11 +453,11 @@ discard block |
||
| 453 | 453 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | - if ( $entry['form_id'] != $view->form->ID ) { |
|
| 456 | + if ( $entry[ 'form_id' ] != $view->form->ID ) { |
|
| 457 | 457 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - if ( $entry['status'] != 'active' ) { |
|
| 460 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 461 | 461 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 462 | 462 | } |
| 463 | 463 | |
@@ -465,10 +465,10 @@ discard block |
||
| 465 | 465 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 466 | 466 | } |
| 467 | 467 | |
| 468 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 468 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 469 | 469 | |
| 470 | 470 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 471 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 471 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 472 | 472 | return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' ); |
| 473 | 473 | } |
| 474 | 474 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @var string The hash key used to generate secure message history |
| 16 | - * @since 2.2.5 |
|
| 16 | + * @since 2.2.5 |
|
| 17 | 17 | */ |
| 18 | 18 | const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w='; |
| 19 | 19 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | 'payment_id' => '', |
| 111 | 111 | 'customer_name' => '', |
| 112 | 112 | 'customer_email' => '', |
| 113 | - 'price_id' => '0', |
|
| 113 | + 'price_id' => '0', |
|
| 114 | 114 | ) ); |
| 115 | 115 | |
| 116 | 116 | // This is just HTML we don't need. |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | case 3: |
| 128 | 128 | $package = 'All Access'; |
| 129 | 129 | break; |
| 130 | - case 4: |
|
| 131 | - $package = 'Lifetime'; |
|
| 132 | - break; |
|
| 130 | + case 4: |
|
| 131 | + $package = 'Lifetime'; |
|
| 132 | + break; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $current_user = wp_get_current_user(); |
@@ -159,27 +159,27 @@ discard block |
||
| 159 | 159 | // Help Scout length limit is 200 characters |
| 160 | 160 | foreach( $data as $key => $value ) { |
| 161 | 161 | if ( ! is_string( $value ) ) { |
| 162 | - continue; |
|
| 162 | + continue; |
|
| 163 | 163 | } |
| 164 | - $data[ $key ] = mb_substr( $value, 0, 200 ); |
|
| 165 | - } |
|
| 164 | + $data[ $key ] = mb_substr( $value, 0, 200 ); |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | 167 | $localization_data = array( |
| 168 | 168 | 'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ), |
| 169 | 169 | 'data' => $data, |
| 170 | 170 | 'translation' => $translation, |
| 171 | - 'suggest' => array(), |
|
| 171 | + 'suggest' => array(), |
|
| 172 | 172 | ); |
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | - * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run |
|
| 175 | + * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run |
|
| 176 | 176 | * @since 2.0 |
| 177 | - * @param array $localization_data { |
|
| 178 | - * @type int $contactEnabled Can the user contact support? |
|
| 179 | - * @type array $data Support/license info |
|
| 180 | - * @type array $translation i18n strings |
|
| 181 | - * @type array $suggest Article IDs to recommend to the user (per page in the admin |
|
| 182 | - * } |
|
| 177 | + * @param array $localization_data { |
|
| 178 | + * @type int $contactEnabled Can the user contact support? |
|
| 179 | + * @type array $data Support/license info |
|
| 180 | + * @type array $translation i18n strings |
|
| 181 | + * @type array $suggest Article IDs to recommend to the user (per page in the admin |
|
| 182 | + * } |
|
| 183 | 183 | */ |
| 184 | 184 | $localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data ); |
| 185 | 185 | |
@@ -193,11 +193,11 @@ discard block |
||
| 193 | 193 | * |
| 194 | 194 | * If the user doesn't have the `gravityview_support_port` capability, returns false; then |
| 195 | 195 | * If global setting is "hide", returns false; then |
| 196 | - * If user preference is not set, return global setting; then |
|
| 197 | - * If user preference is set, return that setting. |
|
| 196 | + * If user preference is not set, return global setting; then |
|
| 197 | + * If user preference is set, return that setting. |
|
| 198 | 198 | * |
| 199 | 199 | * @since 1.15 |
| 200 | - * @since 1.17.5 Changed behavior to respect global setting |
|
| 200 | + * @since 1.17.5 Changed behavior to respect global setting |
|
| 201 | 201 | * |
| 202 | 202 | * @param int $user Optional. ID of the user to check, defaults to 0 for current user. |
| 203 | 203 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $global_setting = gravityview()->plugin->settings->get( 'support_port' ); |
| 213 | 213 | |
| 214 | 214 | if ( empty( $global_setting ) ) { |
| 215 | - return false; |
|
| 215 | + return false; |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | // Get the per-user Support Port setting |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * Modifies the output of profile.php to add GravityView Support preference |
| 249 | 249 | * |
| 250 | 250 | * @since 1.15 |
| 251 | - * @since 1.17.5 Only show if global setting is active |
|
| 251 | + * @since 1.17.5 Only show if global setting is active |
|
| 252 | 252 | * |
| 253 | 253 | * @param WP_User $user Current user info |
| 254 | 254 | * |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $global_setting = gravityview()->plugin->settings->get( 'support_port' ); |
| 260 | 260 | |
| 261 | 261 | if ( empty( $global_setting ) ) { |
| 262 | - return; |
|
| 262 | + return; |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
@@ -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 | } |
@@ -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 | } |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | * |
| 142 | 142 | * @see add_columns_sort_links |
| 143 | 143 | * @param string $url Single-sort URL |
| 144 | - * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format |
|
| 145 | - * @param string|int $field_id ID of the current field being displayed |
|
| 144 | + * @param string[] $sort_args Single sorting for rules, in [ field_id, dir ] format |
|
| 145 | + * @param string $field_id ID of the current field being displayed |
|
| 146 | 146 | * |
| 147 | 147 | * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
| 148 | 148 | */ |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | * Output a field cell. |
| 347 | 347 | * |
| 348 | 348 | * @param \GV\Field $field The field to be ouput. |
| 349 | - * @param \GV\Field $entry The entry this field is for. |
|
| 349 | + * @param Entry $entry The entry this field is for. |
|
| 350 | 350 | * |
| 351 | 351 | * @return void |
| 352 | 352 | */ |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | - * Constructor. Add filters to modify output. |
|
| 23 | - * |
|
| 22 | + * Constructor. Add filters to modify output. |
|
| 23 | + * |
|
| 24 | 24 | * @since 2.0.4 |
| 25 | 25 | * |
| 26 | 26 | * @param View $view |
@@ -29,19 +29,19 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function __construct( View $view, Entry_Collection $entries, Request $request ) { |
| 31 | 31 | |
| 32 | - add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
| 32 | + add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
| 33 | 33 | |
| 34 | 34 | parent::__construct( $view, $entries, $request ); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | - * Add sorting links to HTML columns that support sorting |
|
| 39 | - * |
|
| 40 | - * @since 2.0.4 |
|
| 41 | - * @since 2.0.5 Made static |
|
| 42 | - * |
|
| 43 | - * @static |
|
| 44 | - * |
|
| 38 | + * Add sorting links to HTML columns that support sorting |
|
| 39 | + * |
|
| 40 | + * @since 2.0.4 |
|
| 41 | + * @since 2.0.5 Made static |
|
| 42 | + * |
|
| 43 | + * @static |
|
| 44 | + * |
|
| 45 | 45 | * @param string $column_label Label for the table column |
| 46 | 46 | * @param \GV\Template_Context $context |
| 47 | 47 | * |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $sort_columns = $context->view->settings->get( 'sort_columns' ); |
| 53 | 53 | |
| 54 | 54 | if ( empty( $sort_columns ) ) { |
| 55 | - return $column_label; |
|
| 55 | + return $column_label; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) { |
@@ -102,22 +102,22 @@ discard block |
||
| 102 | 102 | // If we are already sorting by the current field... |
| 103 | 103 | if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
| 104 | 104 | |
| 105 | - switch( $sorting['direction'] ) { |
|
| 106 | - // No sort |
|
| 107 | - case '': |
|
| 108 | - $sort_args[1] = 'asc'; |
|
| 109 | - $class .= ' gv-icon-caret-up-down'; |
|
| 110 | - break; |
|
| 111 | - case 'desc': |
|
| 112 | - $sort_args[1] = ''; |
|
| 113 | - $class .= ' gv-icon-sort-asc'; |
|
| 114 | - break; |
|
| 115 | - case 'asc': |
|
| 116 | - default: |
|
| 117 | - $sort_args[1] = 'desc'; |
|
| 118 | - $class .= ' gv-icon-sort-desc'; |
|
| 119 | - break; |
|
| 120 | - } |
|
| 105 | + switch( $sorting['direction'] ) { |
|
| 106 | + // No sort |
|
| 107 | + case '': |
|
| 108 | + $sort_args[1] = 'asc'; |
|
| 109 | + $class .= ' gv-icon-caret-up-down'; |
|
| 110 | + break; |
|
| 111 | + case 'desc': |
|
| 112 | + $sort_args[1] = ''; |
|
| 113 | + $class .= ' gv-icon-sort-asc'; |
|
| 114 | + break; |
|
| 115 | + case 'asc': |
|
| 116 | + default: |
|
| 117 | + $sort_args[1] = 'desc'; |
|
| 118 | + $class .= ' gv-icon-sort-desc'; |
|
| 119 | + break; |
|
| 120 | + } |
|
| 121 | 121 | |
| 122 | 122 | } else { |
| 123 | 123 | $class .= ' gv-icon-caret-up-down'; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $url = remove_query_arg( 'sort', $url ); |
| 128 | 128 | $multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID ); |
| 129 | 129 | |
| 130 | - $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 130 | + $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 131 | 131 | |
| 132 | 132 | $return = '<a href="'. esc_url_raw( $url ) .'"'; |
| 133 | 133 | |
@@ -141,50 +141,50 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * Get the multi-sort URL used in the sorting links |
|
| 145 | - * |
|
| 146 | - * @todo Consider moving to Utils? |
|
| 147 | - * |
|
| 148 | - * @since 2.3 |
|
| 149 | - * |
|
| 150 | - * @see add_columns_sort_links |
|
| 144 | + * Get the multi-sort URL used in the sorting links |
|
| 145 | + * |
|
| 146 | + * @todo Consider moving to Utils? |
|
| 147 | + * |
|
| 148 | + * @since 2.3 |
|
| 149 | + * |
|
| 150 | + * @see add_columns_sort_links |
|
| 151 | 151 | * @param string $url Single-sort URL |
| 152 | 152 | * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format |
| 153 | - * @param string|int $field_id ID of the current field being displayed |
|
| 154 | - * |
|
| 155 | - * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
| 153 | + * @param string|int $field_id ID of the current field being displayed |
|
| 154 | + * |
|
| 155 | + * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
| 156 | 156 | */ |
| 157 | 157 | static public function _get_multisort_url( $url, $sort_args, $field_id ) { |
| 158 | 158 | |
| 159 | 159 | $sorts = Utils::_GET( 'sort' ); |
| 160 | 160 | |
| 161 | 161 | if ( ! is_array( $sorts ) ) { |
| 162 | - return $url; |
|
| 162 | + return $url; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - $multisort_url = $url; |
|
| 165 | + $multisort_url = $url; |
|
| 166 | 166 | |
| 167 | 167 | // If the field has already been sorted by, add the field to the URL |
| 168 | - if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
| 169 | - if ( count( $keys ) ) { |
|
| 170 | - $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
| 171 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 172 | - } else { |
|
| 173 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - // Otherwise, we are just updating the sort order |
|
| 177 | - else { |
|
| 178 | - |
|
| 179 | - // Pass empty value to unset |
|
| 180 | - if( '' === $sort_args[1] ) { |
|
| 181 | - unset( $sorts[ $field_id ] ); |
|
| 182 | - } else { |
|
| 183 | - $sorts[ $field_id ] = $sort_args[1]; |
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
| 187 | - } |
|
| 168 | + if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
| 169 | + if ( count( $keys ) ) { |
|
| 170 | + $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
| 171 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 172 | + } else { |
|
| 173 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + // Otherwise, we are just updating the sort order |
|
| 177 | + else { |
|
| 178 | + |
|
| 179 | + // Pass empty value to unset |
|
| 180 | + if( '' === $sort_args[1] ) { |
|
| 181 | + unset( $sorts[ $field_id ] ); |
|
| 182 | + } else { |
|
| 183 | + $sorts[ $field_id ] = $sort_args[1]; |
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
| 187 | + } |
|
| 188 | 188 | |
| 189 | 189 | return $multisort_url; |
| 190 | 190 | } |
@@ -214,10 +214,10 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | - * Returns the label for a column, with support for all deprecated filters |
|
| 218 | - * |
|
| 219 | - * @since 2.1 |
|
| 220 | - * |
|
| 217 | + * Returns the label for a column, with support for all deprecated filters |
|
| 218 | + * |
|
| 219 | + * @since 2.1 |
|
| 220 | + * |
|
| 221 | 221 | * @param \GV\Field $field |
| 222 | 222 | * @param \GV\Template_Context $context |
| 223 | 223 | */ |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context ); |
| 241 | 241 | |
| 242 | 242 | return $column_label; |
| 243 | - } |
|
| 243 | + } |
|
| 244 | 244 | |
| 245 | 245 | /** |
| 246 | 246 | * Output the entry row. |
@@ -309,15 +309,15 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | do_action( 'gravityview/template/table/cells/before', $context ); |
| 311 | 311 | |
| 312 | - /** |
|
| 313 | - * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 314 | - * @since 1.0.7 |
|
| 312 | + /** |
|
| 313 | + * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 314 | + * @since 1.0.7 |
|
| 315 | 315 | * @param \GravityView_View $this Current GravityView_View object |
| 316 | 316 | * @deprecated Use `gravityview/template/table/cells/before` |
| 317 | - */ |
|
| 318 | - do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
| 317 | + */ |
|
| 318 | + do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
| 319 | 319 | |
| 320 | - foreach ( $fields->all() as $field ) { |
|
| 320 | + foreach ( $fields->all() as $field ) { |
|
| 321 | 321 | if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
| 322 | 322 | if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
| 323 | 323 | $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
@@ -337,13 +337,13 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | do_action( 'gravityview/template/table/cells/after', $context ); |
| 339 | 339 | |
| 340 | - /** |
|
| 341 | - * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 342 | - * @since 1.0.7 |
|
| 340 | + /** |
|
| 341 | + * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 342 | + * @since 1.0.7 |
|
| 343 | 343 | * @param \GravityView_View $this Current GravityView_View object |
| 344 | 344 | * @deprecated Use `gravityview/template/table/cells/after` |
| 345 | - */ |
|
| 346 | - do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
| 345 | + */ |
|
| 346 | + do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
| 347 | 347 | |
| 348 | 348 | ?> |
| 349 | 349 | </tr> |
@@ -384,9 +384,9 @@ discard block |
||
| 384 | 384 | 'value' => $value, |
| 385 | 385 | 'hide_empty' => false, |
| 386 | 386 | 'zone_id' => 'directory_table-columns', |
| 387 | - 'label' => self::get_field_column_label( $field, $context ), |
|
| 387 | + 'label' => self::get_field_column_label( $field, $context ), |
|
| 388 | 388 | 'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>', |
| 389 | - 'form' => $form, |
|
| 389 | + 'form' => $form, |
|
| 390 | 390 | ); |
| 391 | 391 | |
| 392 | 392 | /** Output. */ |
@@ -411,11 +411,11 @@ discard block |
||
| 411 | 411 | do_action( 'gravityview/template/table/body/before', $context ); |
| 412 | 412 | |
| 413 | 413 | /** |
| 414 | - * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 415 | - * @deprecated Use `gravityview/template/table/body/before` |
|
| 416 | - * @since 1.0.7 |
|
| 417 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 418 | - */ |
|
| 414 | + * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 415 | + * @deprecated Use `gravityview/template/table/body/before` |
|
| 416 | + * @since 1.0.7 |
|
| 417 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 418 | + */ |
|
| 419 | 419 | do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
| 420 | 420 | } |
| 421 | 421 | |
@@ -437,11 +437,11 @@ discard block |
||
| 437 | 437 | do_action( 'gravityview/template/table/body/after', $context ); |
| 438 | 438 | |
| 439 | 439 | /** |
| 440 | - * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 441 | - * @deprecated Use `gravityview/template/table/body/after` |
|
| 442 | - * @since 1.0.7 |
|
| 443 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 444 | - */ |
|
| 440 | + * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 441 | + * @deprecated Use `gravityview/template/table/body/after` |
|
| 442 | + * @since 1.0.7 |
|
| 443 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 444 | + */ |
|
| 445 | 445 | do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
| 446 | 446 | } |
| 447 | 447 | |
@@ -69,22 +69,22 @@ discard block |
||
| 69 | 69 | if ( is_array( $sorts ) ) { |
| 70 | 70 | foreach ( (array)$sorts as $key => $direction ) { |
| 71 | 71 | if ( $key == $context->field->ID ) { |
| 72 | - $sorting['key'] = $context->field->ID; |
|
| 73 | - $sorting['direction'] = strtolower( $direction ); |
|
| 72 | + $sorting[ 'key' ] = $context->field->ID; |
|
| 73 | + $sorting[ 'direction' ] = strtolower( $direction ); |
|
| 74 | 74 | break; |
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | } else { |
| 78 | 78 | if ( $sorts == $context->field->ID ) { |
| 79 | - $sorting['key'] = $context->field->ID; |
|
| 80 | - $sorting['direction'] = strtolower( Utils::_GET( 'dir', '' ) ); |
|
| 79 | + $sorting[ 'key' ] = $context->field->ID; |
|
| 80 | + $sorting[ 'direction' ] = strtolower( Utils::_GET( 'dir', '' ) ); |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | } else { |
| 84 | 84 | foreach ( (array)$context->view->settings->get( 'sort_field', array() ) as $i => $sort_field ) { |
| 85 | 85 | if ( $sort_field == $context->field->ID ) { |
| 86 | - $sorting['key'] = $sort_field; |
|
| 87 | - $sorting['direction'] = strtolower( Utils::get( $directions, $i, '' ) ); |
|
| 86 | + $sorting[ 'key' ] = $sort_field; |
|
| 87 | + $sorting[ 'direction' ] = strtolower( Utils::get( $directions, $i, '' ) ); |
|
| 88 | 88 | break; // Only get the first sort |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -100,21 +100,21 @@ discard block |
||
| 100 | 100 | ); |
| 101 | 101 | |
| 102 | 102 | // If we are already sorting by the current field... |
| 103 | - if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
| 103 | + if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
| 104 | 104 | |
| 105 | - switch( $sorting['direction'] ) { |
|
| 105 | + switch ( $sorting[ 'direction' ] ) { |
|
| 106 | 106 | // No sort |
| 107 | 107 | case '': |
| 108 | - $sort_args[1] = 'asc'; |
|
| 108 | + $sort_args[ 1 ] = 'asc'; |
|
| 109 | 109 | $class .= ' gv-icon-caret-up-down'; |
| 110 | 110 | break; |
| 111 | 111 | case 'desc': |
| 112 | - $sort_args[1] = ''; |
|
| 112 | + $sort_args[ 1 ] = ''; |
|
| 113 | 113 | $class .= ' gv-icon-sort-asc'; |
| 114 | 114 | break; |
| 115 | 115 | case 'asc': |
| 116 | 116 | default: |
| 117 | - $sort_args[1] = 'desc'; |
|
| 117 | + $sort_args[ 1 ] = 'desc'; |
|
| 118 | 118 | $class .= ' gv-icon-sort-desc'; |
| 119 | 119 | break; |
| 120 | 120 | } |
@@ -127,15 +127,15 @@ discard block |
||
| 127 | 127 | $url = remove_query_arg( 'sort', $url ); |
| 128 | 128 | $multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID ); |
| 129 | 129 | |
| 130 | - $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 130 | + $url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $url ); |
|
| 131 | 131 | |
| 132 | - $return = '<a href="'. esc_url_raw( $url ) .'"'; |
|
| 132 | + $return = '<a href="' . esc_url_raw( $url ) . '"'; |
|
| 133 | 133 | |
| 134 | 134 | if ( ! empty( $multisort_url ) ) { |
| 135 | - $return .= ' data-multisort-href="'. esc_url_raw( $multisort_url ) . '"'; |
|
| 135 | + $return .= ' data-multisort-href="' . esc_url_raw( $multisort_url ) . '"'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - $return .= ' class="'. $class .'" ></a> '. $column_label; |
|
| 138 | + $return .= ' class="' . $class . '" ></a> ' . $column_label; |
|
| 139 | 139 | |
| 140 | 140 | return $return; |
| 141 | 141 | } |
@@ -168,19 +168,19 @@ discard block |
||
| 168 | 168 | if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
| 169 | 169 | if ( count( $keys ) ) { |
| 170 | 170 | $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
| 171 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 171 | + $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url ); |
|
| 172 | 172 | } else { |
| 173 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 173 | + $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url ); |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | // Otherwise, we are just updating the sort order |
| 177 | 177 | else { |
| 178 | 178 | |
| 179 | 179 | // Pass empty value to unset |
| 180 | - if( '' === $sort_args[1] ) { |
|
| 180 | + if ( '' === $sort_args[ 1 ] ) { |
|
| 181 | 181 | unset( $sorts[ $field_id ] ); |
| 182 | 182 | } else { |
| 183 | - $sorts[ $field_id ] = $sort_args[1]; |
|
| 183 | + $sorts[ $field_id ] = $sort_args[ 1 ]; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
@@ -318,9 +318,9 @@ discard block |
||
| 318 | 318 | do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
| 319 | 319 | |
| 320 | 320 | foreach ( $fields->all() as $field ) { |
| 321 | - if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
|
| 322 | - if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
|
| 323 | - $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
|
| 321 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) { |
|
| 322 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) { |
|
| 323 | + $field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ]; |
|
| 324 | 324 | } else { |
| 325 | 325 | if ( ! $field instanceof Internal_Field ) { |
| 326 | 326 | $field = Internal_Field::from_configuration( array( 'id' => 'custom' ) ); |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | public static function get_instance() { |
| 96 | 96 | |
| 97 | - if( empty( self::$instance ) ) { |
|
| 97 | + if ( empty( self::$instance ) ) { |
|
| 98 | 98 | self::$instance = new self; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | $operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS ); |
| 130 | 130 | |
| 131 | - if( $with_values ) { |
|
| 131 | + if ( $with_values ) { |
|
| 132 | 132 | $operators_with_values = array(); |
| 133 | - foreach( $operators as $key ) { |
|
| 133 | + foreach ( $operators as $key ) { |
|
| 134 | 134 | $operators_with_values[ $key ] = ''; |
| 135 | 135 | } |
| 136 | 136 | return $operators_with_values; |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | $operators = $this->get_operators( false ); |
| 151 | 151 | |
| 152 | - if( !in_array( $operation, $operators ) ) { |
|
| 152 | + if ( ! in_array( $operation, $operators ) ) { |
|
| 153 | 153 | gravityview()->log->debug( ' Attempted to add invalid operation type. {operation}', array( 'operation' => $operation ) ); |
| 154 | 154 | return false; |
| 155 | 155 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | return null; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - if( empty( $atts ) ) { |
|
| 204 | + if ( empty( $atts ) ) { |
|
| 205 | 205 | gravityview()->log->error( '$atts are empty.', array( 'data' => $atts ) ); |
| 206 | 206 | return null; |
| 207 | 207 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | $setup = $this->setup_operation_and_comparison(); |
| 226 | 226 | |
| 227 | 227 | // We need an operation and comparison value |
| 228 | - if( ! $setup ) { |
|
| 228 | + if ( ! $setup ) { |
|
| 229 | 229 | gravityview()->log->error( 'No valid operators were passed.', array( 'data' => $this->atts ) ); |
| 230 | 230 | return null; |
| 231 | 231 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | $logged_in_match = ! $this->logged_in ^ is_user_logged_in(); // XNOR |
| 278 | 278 | |
| 279 | 279 | // Only logged-in match |
| 280 | - if( 1 === sizeof( $this->passed_atts ) ) { |
|
| 280 | + if ( 1 === sizeof( $this->passed_atts ) ) { |
|
| 281 | 281 | $this->is_match = $logged_in_match; |
| 282 | 282 | } else { |
| 283 | 283 | $this->is_match = $logged_in_match && $comparison_match; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | private function get_output() { |
| 293 | 293 | |
| 294 | - if( $this->is_match ) { |
|
| 294 | + if ( $this->is_match ) { |
|
| 295 | 295 | $output = $this->content; |
| 296 | 296 | } else { |
| 297 | 297 | $output = $this->else_content; |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | * @param string $output HTML/text output |
| 310 | 310 | * @param GVLogic_Shortcode $this This class |
| 311 | 311 | */ |
| 312 | - $output = apply_filters('gravityview/gvlogic/output', $output, $this ); |
|
| 312 | + $output = apply_filters( 'gravityview/gvlogic/output', $output, $this ); |
|
| 313 | 313 | |
| 314 | 314 | gravityview()->log->debug( 'Output: ', array( 'data' => $output ) ); |
| 315 | 315 | |
@@ -329,14 +329,14 @@ discard block |
||
| 329 | 329 | list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL ); |
| 330 | 330 | list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL ); |
| 331 | 331 | |
| 332 | - $else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL; |
|
| 332 | + $else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL; |
|
| 333 | 333 | $else_content = isset( $after_else ) ? $after_else : $else_attr; |
| 334 | 334 | |
| 335 | 335 | // The content is everything OTHER than the [else] |
| 336 | 336 | $this->content = $before_else_if; |
| 337 | 337 | |
| 338 | 338 | if ( ! $this->is_match ) { |
| 339 | - if( $elseif_content = $this->process_elseif( $before_else ) ) { |
|
| 339 | + if ( $elseif_content = $this->process_elseif( $before_else ) ) { |
|
| 340 | 340 | $this->else_content = $elseif_content; |
| 341 | 341 | } else { |
| 342 | 342 | $this->else_content = $else_content; |
@@ -364,16 +364,16 @@ discard block |
||
| 364 | 364 | foreach ( $else_if_matches as $key => $else_if_match ) { |
| 365 | 365 | |
| 366 | 366 | // If $else_if_match[5] exists and has content, check for more shortcodes |
| 367 | - preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER ); |
|
| 367 | + preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER ); |
|
| 368 | 368 | |
| 369 | 369 | // If the logic passes, this is the value that should be used for $this->else_content |
| 370 | - $else_if_value = $else_if_match[5]; |
|
| 371 | - $check_elseif_match = $else_if_match[0]; |
|
| 370 | + $else_if_value = $else_if_match[ 5 ]; |
|
| 371 | + $check_elseif_match = $else_if_match[ 0 ]; |
|
| 372 | 372 | |
| 373 | 373 | // Retrieve the value of the match that is currently being checked, without any other [else] tags |
| 374 | - if( ! empty( $recursive_matches[0][0] ) ) { |
|
| 375 | - $else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value ); |
|
| 376 | - $check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match ); |
|
| 374 | + if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) { |
|
| 375 | + $else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value ); |
|
| 376 | + $check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match ); |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | $check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match ); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | // Process any remaining [else] tags |
| 393 | - return $this->process_elseif( $else_if_match[5] ); |
|
| 393 | + return $this->process_elseif( $else_if_match[ 5 ] ); |
|
| 394 | 394 | } |
| 395 | 395 | |
| 396 | 396 | return false; |
@@ -417,11 +417,11 @@ discard block |
||
| 417 | 417 | $this->atts = array_intersect_key( $this->passed_atts, $this->atts ); |
| 418 | 418 | |
| 419 | 419 | // Strip whitespace if it's not default false |
| 420 | - $this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false; |
|
| 420 | + $this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false; |
|
| 421 | 421 | |
| 422 | - if ( isset( $this->atts['logged_in'] ) ) { |
|
| 422 | + if ( isset( $this->atts[ 'logged_in' ] ) ) { |
|
| 423 | 423 | // Truthy |
| 424 | - if ( in_array( strtolower( $this->atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) { |
|
| 424 | + if ( in_array( strtolower( $this->atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) { |
|
| 425 | 425 | $this->logged_in = false; |
| 426 | 426 | } else { |
| 427 | 427 | $this->logged_in = true; |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | do_action( 'gravityview/gvlogic/parse_atts/after', $this ); |
| 438 | 438 | |
| 439 | 439 | // Make sure the "if" isn't processed in self::setup_operation_and_comparison() |
| 440 | - unset( $this->atts['if'] ); |
|
| 440 | + unset( $this->atts[ 'if' ] ); |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | |