@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | $supports = array( 'title', 'revisions' ); |
| 135 | 135 | |
| 136 | 136 | if ( $is_hierarchical ) { |
| 137 | - $supports[] = 'page-attributes'; |
|
| 137 | + $supports[ ] = 'page-attributes'; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -243,12 +243,12 @@ discard block |
||
| 243 | 243 | $tsv_rule = array( sprintf( '%s/([^/]+)/tsv/?', $slug ), 'index.php?gravityview=$matches[1]&tsv=1', 'top' ); |
| 244 | 244 | |
| 245 | 245 | add_filter( 'query_vars', function( $query_vars ) { |
| 246 | - $query_vars[] = 'csv'; |
|
| 247 | - $query_vars[] = 'tsv'; |
|
| 246 | + $query_vars[ ] = 'csv'; |
|
| 247 | + $query_vars[ ] = 'tsv'; |
|
| 248 | 248 | return $query_vars; |
| 249 | 249 | } ); |
| 250 | 250 | |
| 251 | - if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[0] ] ) ) { |
|
| 251 | + if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[ 0 ] ] ) ) { |
|
| 252 | 252 | call_user_func_array( 'add_rewrite_rule', $csv_rule ); |
| 253 | 253 | call_user_func_array( 'add_rewrite_rule', $tsv_rule ); |
| 254 | 254 | } |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | |
| 310 | 310 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
| 311 | 311 | |
| 312 | - $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) ); |
|
| 312 | + $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) ); |
|
| 313 | 313 | |
| 314 | 314 | return \GVCommon::generate_notice( '<h3>' . $title . '</h3>' . wpautop( $message . $image ), 'notice' ); |
| 315 | 315 | } |
@@ -335,13 +335,13 @@ discard block |
||
| 335 | 335 | return $content; |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 338 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 339 | 339 | |
| 340 | 340 | /** |
| 341 | 341 | * Editing a single entry. |
| 342 | 342 | */ |
| 343 | 343 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
| 344 | - if ( $entry['status'] != 'active' ) { |
|
| 344 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 345 | 345 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 346 | 346 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 347 | 347 | } |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 355 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 355 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 356 | 356 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 357 | 357 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 358 | 358 | } |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | |
| 376 | 376 | foreach ( $entryset as $e ) { |
| 377 | 377 | |
| 378 | - if ( 'active' !== $e['status'] ) { |
|
| 378 | + if ( 'active' !== $e[ 'status' ] ) { |
|
| 379 | 379 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
| 380 | 380 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 381 | 381 | } |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
| 389 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 389 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 390 | 390 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
| 391 | 391 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 392 | 392 | } |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
| 562 | 562 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
| 563 | 563 | |
| 564 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 564 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | return $joins; |
@@ -651,13 +651,13 @@ discard block |
||
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | foreach ( $_fields as $field ) { |
| 654 | - if ( ! empty( $field['unions'] ) ) { |
|
| 655 | - foreach ( $field['unions'] as $form_id => $field_id ) { |
|
| 654 | + if ( ! empty( $field[ 'unions' ] ) ) { |
|
| 655 | + foreach ( $field[ 'unions' ] as $form_id => $field_id ) { |
|
| 656 | 656 | if ( ! isset( $unions[ $form_id ] ) ) { |
| 657 | 657 | $unions[ $form_id ] = array(); |
| 658 | 658 | } |
| 659 | 659 | |
| 660 | - $unions[ $form_id ][ $field['id'] ] = |
|
| 660 | + $unions[ $form_id ][ $field[ 'id' ] ] = |
|
| 661 | 661 | is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
| 662 | 662 | } |
| 663 | 663 | } |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | if ( ! $view->form ) { |
| 713 | 713 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
| 714 | 714 | 'view_id' => $view->ID, |
| 715 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
| 715 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
| 716 | 716 | ) ); |
| 717 | 717 | } |
| 718 | 718 | |
@@ -956,11 +956,11 @@ discard block |
||
| 956 | 956 | * Remove multiple sorting before calling legacy filters. |
| 957 | 957 | * This allows us to fake it till we make it. |
| 958 | 958 | */ |
| 959 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
| 959 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
| 960 | 960 | $has_multisort = true; |
| 961 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
| 962 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
| 963 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
| 961 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
| 962 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
| 963 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
| 964 | 964 | } |
| 965 | 965 | } |
| 966 | 966 | |
@@ -969,31 +969,30 @@ discard block |
||
| 969 | 969 | */ |
| 970 | 970 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); |
| 971 | 971 | |
| 972 | - $parameters['context_view_id'] = $this->ID; |
|
| 972 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
| 973 | 973 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
| 974 | 974 | |
| 975 | 975 | if ( ! is_array( $parameters ) ) { |
| 976 | 976 | $parameters = array(); |
| 977 | 977 | } |
| 978 | 978 | |
| 979 | - if ( ! is_array( $parameters['search_criteria'] ) ) { |
|
| 980 | - $parameters['search_criteria'] = array(); |
|
| 979 | + if ( ! is_array( $parameters[ 'search_criteria' ] ) ) { |
|
| 980 | + $parameters[ 'search_criteria' ] = array(); |
|
| 981 | 981 | } |
| 982 | 982 | |
| 983 | - if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) { |
|
| 984 | - $parameters['search_criteria']['field_filters'] = array(); |
|
| 983 | + if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) { |
|
| 984 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = array(); |
|
| 985 | 985 | } |
| 986 | 986 | |
| 987 | 987 | if ( $request instanceof REST\Request ) { |
| 988 | 988 | $atts = $this->settings->as_atts(); |
| 989 | 989 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
| 990 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
| 990 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
| 991 | 991 | ) ); |
| 992 | - $parameters['paging'] = $paging_parameters['paging']; |
|
| 992 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
| 993 | 993 | } |
| 994 | 994 | |
| 995 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 996 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
| 995 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
| 997 | 996 | |
| 998 | 997 | /** |
| 999 | 998 | * Cleanup duplicate field_filter parameters to simplify the query. |
@@ -1001,14 +1000,14 @@ discard block |
||
| 1001 | 1000 | $unique_field_filters = array(); |
| 1002 | 1001 | foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) { |
| 1003 | 1002 | if ( 'mode' === $key ) { |
| 1004 | - $unique_field_filters['mode'] = $filter; |
|
| 1003 | + $unique_field_filters[ 'mode' ] = $filter; |
|
| 1005 | 1004 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
| 1006 | - $unique_field_filters[] = $filter; |
|
| 1005 | + $unique_field_filters[ ] = $filter; |
|
| 1007 | 1006 | } |
| 1008 | 1007 | } |
| 1009 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
| 1008 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
| 1010 | 1009 | |
| 1011 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
| 1010 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 1012 | 1011 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
| 1013 | 1012 | } |
| 1014 | 1013 | |
@@ -1017,7 +1016,7 @@ discard block |
||
| 1017 | 1016 | $query_class = $this->get_query_class(); |
| 1018 | 1017 | |
| 1019 | 1018 | /** @type \GF_Query $query */ |
| 1020 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) ); |
|
| 1019 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) ); |
|
| 1021 | 1020 | |
| 1022 | 1021 | /** |
| 1023 | 1022 | * Apply multisort. |
@@ -1028,15 +1027,15 @@ discard block |
||
| 1028 | 1027 | $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); |
| 1029 | 1028 | $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); |
| 1030 | 1029 | |
| 1031 | - $has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); |
|
| 1030 | + $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); |
|
| 1032 | 1031 | |
| 1033 | - if( $has_sort_query_param ) { |
|
| 1034 | - $has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); |
|
| 1032 | + if ( $has_sort_query_param ) { |
|
| 1033 | + $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); |
|
| 1035 | 1034 | } |
| 1036 | 1035 | |
| 1037 | 1036 | if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { |
| 1038 | - $sort_field_ids = array_keys( $_GET['sort'] ); |
|
| 1039 | - $sort_directions = array_values( $_GET['sort'] ); |
|
| 1037 | + $sort_field_ids = array_keys( $_GET[ 'sort' ] ); |
|
| 1038 | + $sort_directions = array_values( $_GET[ 'sort' ] ); |
|
| 1040 | 1039 | } else { |
| 1041 | 1040 | $sort_field_ids = $view_setting_sort_field_ids; |
| 1042 | 1041 | $sort_directions = $view_setting_sort_directions; |
@@ -1044,7 +1043,7 @@ discard block |
||
| 1044 | 1043 | |
| 1045 | 1044 | $skip_first = false; |
| 1046 | 1045 | |
| 1047 | - foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { |
|
| 1046 | + foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { |
|
| 1048 | 1047 | |
| 1049 | 1048 | if ( ! $skip_first && ! $has_sort_query_param ) { |
| 1050 | 1049 | $skip_first = true; // Skip the first one, it's already in the query |
@@ -1074,18 +1073,18 @@ discard block |
||
| 1074 | 1073 | |
| 1075 | 1074 | $merged_time = false; |
| 1076 | 1075 | |
| 1077 | - foreach ( $q['order'] as $oid => $order ) { |
|
| 1076 | + foreach ( $q[ 'order' ] as $oid => $order ) { |
|
| 1078 | 1077 | |
| 1079 | 1078 | $column = null; |
| 1080 | 1079 | |
| 1081 | - if ( $order[0] instanceof \GF_Query_Column ) { |
|
| 1082 | - $column = $order[0]; |
|
| 1083 | - } else if ( $order[0] instanceof \GF_Query_Call ) { |
|
| 1084 | - if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { |
|
| 1080 | + if ( $order[ 0 ] instanceof \GF_Query_Column ) { |
|
| 1081 | + $column = $order[ 0 ]; |
|
| 1082 | + } else if ( $order[ 0 ] instanceof \GF_Query_Call ) { |
|
| 1083 | + if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { |
|
| 1085 | 1084 | $orders[ $oid ] = $order; |
| 1086 | 1085 | continue; // Need something that resembles a single sort |
| 1087 | 1086 | } |
| 1088 | - $column = $order[0]->columns[0]; |
|
| 1087 | + $column = $order[ 0 ]->columns[ 0 ]; |
|
| 1089 | 1088 | } |
| 1090 | 1089 | |
| 1091 | 1090 | if ( ! $column || ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { |
@@ -1099,7 +1098,7 @@ discard block |
||
| 1099 | 1098 | |
| 1100 | 1099 | $orders[ $oid ] = array( |
| 1101 | 1100 | new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), |
| 1102 | - $order[1] // Mock it! |
|
| 1101 | + $order[ 1 ] // Mock it! |
|
| 1103 | 1102 | ); |
| 1104 | 1103 | |
| 1105 | 1104 | $merged_time = true; |
@@ -1110,15 +1109,15 @@ discard block |
||
| 1110 | 1109 | * ORDER again. |
| 1111 | 1110 | */ |
| 1112 | 1111 | if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { |
| 1113 | - $sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
| 1112 | + $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
| 1114 | 1113 | } |
| 1115 | 1114 | } |
| 1116 | 1115 | |
| 1117 | 1116 | return $sql; |
| 1118 | 1117 | } ); |
| 1119 | 1118 | |
| 1120 | - $query->limit( $parameters['paging']['page_size'] ) |
|
| 1121 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
| 1119 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1120 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
| 1122 | 1121 | |
| 1123 | 1122 | /** |
| 1124 | 1123 | * Any joins? |
@@ -1141,7 +1140,7 @@ discard block |
||
| 1141 | 1140 | |
| 1142 | 1141 | $query_parameters = $query->_introspect(); |
| 1143 | 1142 | |
| 1144 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
| 1143 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
| 1145 | 1144 | } |
| 1146 | 1145 | |
| 1147 | 1146 | /** |
@@ -1175,7 +1174,7 @@ discard block |
||
| 1175 | 1174 | } |
| 1176 | 1175 | |
| 1177 | 1176 | $q = $query->_introspect(); |
| 1178 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); |
|
| 1177 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); |
|
| 1179 | 1178 | |
| 1180 | 1179 | if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 1181 | 1180 | |
@@ -1200,7 +1199,7 @@ discard block |
||
| 1200 | 1199 | |
| 1201 | 1200 | $query_parameters = $query->_introspect(); |
| 1202 | 1201 | |
| 1203 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
| 1202 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
| 1204 | 1203 | } |
| 1205 | 1204 | } |
| 1206 | 1205 | |
@@ -1224,7 +1223,7 @@ discard block |
||
| 1224 | 1223 | $conditions = array(); |
| 1225 | 1224 | |
| 1226 | 1225 | foreach ( $condition->expressions as $_condition ) { |
| 1227 | - $conditions[] = $recurse( $_condition, $fields, $recurse ); |
|
| 1226 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse ); |
|
| 1228 | 1227 | } |
| 1229 | 1228 | |
| 1230 | 1229 | return call_user_func_array( |
@@ -1253,10 +1252,10 @@ discard block |
||
| 1253 | 1252 | $q = new $query_class( $form_id ); |
| 1254 | 1253 | |
| 1255 | 1254 | // Copy the WHERE clauses but substitute the field_ids to the respective ones |
| 1256 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); |
|
| 1255 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); |
|
| 1257 | 1256 | |
| 1258 | 1257 | // Copy the ORDER clause and substitute the field_ids to the respective ones |
| 1259 | - foreach ( $query_parameters['order'] as $order ) { |
|
| 1258 | + foreach ( $query_parameters[ 'order' ] as $order ) { |
|
| 1260 | 1259 | list( $column, $_order ) = $order; |
| 1261 | 1260 | |
| 1262 | 1261 | if ( $column && $column instanceof \GF_Query_Column ) { |
@@ -1270,15 +1269,15 @@ discard block |
||
| 1270 | 1269 | |
| 1271 | 1270 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { |
| 1272 | 1271 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
| 1273 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
| 1272 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
| 1274 | 1273 | |
| 1275 | 1274 | // Record the SQL |
| 1276 | - $unions_sql[] = array( |
|
| 1275 | + $unions_sql[ ] = array( |
|
| 1277 | 1276 | // Remove columns, we'll rebuild them |
| 1278 | 1277 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), |
| 1279 | - 'from' => $sql['from'], |
|
| 1280 | - 'join' => $sql['join'], |
|
| 1281 | - 'where' => $sql['where'], |
|
| 1278 | + 'from' => $sql[ 'from' ], |
|
| 1279 | + 'join' => $sql[ 'join' ], |
|
| 1280 | + 'where' => $sql[ 'where' ], |
|
| 1282 | 1281 | // Remove order and limit |
| 1283 | 1282 | ); |
| 1284 | 1283 | |
@@ -1295,11 +1294,11 @@ discard block |
||
| 1295 | 1294 | |
| 1296 | 1295 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { |
| 1297 | 1296 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
| 1298 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
| 1297 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
| 1299 | 1298 | |
| 1300 | 1299 | // Remove columns, we'll rebuild them |
| 1301 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); |
|
| 1302 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); |
|
| 1300 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); |
|
| 1301 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); |
|
| 1303 | 1302 | |
| 1304 | 1303 | $unions = array(); |
| 1305 | 1304 | |
@@ -1310,30 +1309,30 @@ discard block |
||
| 1310 | 1309 | }; |
| 1311 | 1310 | |
| 1312 | 1311 | // Add all the order columns into the selects, so we can order by the whole union group |
| 1313 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); |
|
| 1312 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); |
|
| 1314 | 1313 | |
| 1315 | 1314 | $columns = array( |
| 1316 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) |
|
| 1315 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) |
|
| 1317 | 1316 | ); |
| 1318 | 1317 | |
| 1319 | 1318 | foreach ( array_slice( $order_matches, 1 ) as $match ) { |
| 1320 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); |
|
| 1319 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); |
|
| 1321 | 1320 | |
| 1322 | 1321 | // Rewrite the order columns to the shared aliases |
| 1323 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); |
|
| 1322 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); |
|
| 1324 | 1323 | } |
| 1325 | 1324 | |
| 1326 | 1325 | $columns = array_unique( $columns ); |
| 1327 | 1326 | |
| 1328 | 1327 | // Add the columns to every UNION |
| 1329 | 1328 | foreach ( $unions_sql as $union_sql ) { |
| 1330 | - $union_sql['select'] .= implode( ', ', $columns ); |
|
| 1331 | - $unions []= implode( ' ', $union_sql ); |
|
| 1329 | + $union_sql[ 'select' ] .= implode( ', ', $columns ); |
|
| 1330 | + $unions [ ] = implode( ' ', $union_sql ); |
|
| 1332 | 1331 | } |
| 1333 | 1332 | |
| 1334 | 1333 | // Add the columns to the main SELECT, but only grab the entry id column |
| 1335 | - $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); |
|
| 1336 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; |
|
| 1334 | + $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); |
|
| 1335 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; |
|
| 1337 | 1336 | |
| 1338 | 1337 | return $sql; |
| 1339 | 1338 | } ); |
@@ -1378,20 +1377,20 @@ discard block |
||
| 1378 | 1377 | } ); |
| 1379 | 1378 | } else { |
| 1380 | 1379 | $entries = $this->form->entries |
| 1381 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
| 1380 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
| 1382 | 1381 | ->offset( $this->settings->get( 'offset' ) ) |
| 1383 | - ->limit( $parameters['paging']['page_size'] ) |
|
| 1382 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1384 | 1383 | ->page( $page ); |
| 1385 | 1384 | |
| 1386 | - if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { |
|
| 1385 | + if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { |
|
| 1387 | 1386 | // Pluck off multisort arrays |
| 1388 | - $parameters['sorting'] = $parameters['sorting'][0]; |
|
| 1387 | + $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; |
|
| 1389 | 1388 | } |
| 1390 | 1389 | |
| 1391 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
| 1390 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
| 1392 | 1391 | $field = new \GV\Field(); |
| 1393 | - $field->ID = $parameters['sorting']['key']; |
|
| 1394 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1392 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
| 1393 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1395 | 1394 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
| 1396 | 1395 | } |
| 1397 | 1396 | } |
@@ -1475,7 +1474,7 @@ discard block |
||
| 1475 | 1474 | $allowed = $headers = array(); |
| 1476 | 1475 | |
| 1477 | 1476 | foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) { |
| 1478 | - $allowed[] = $field; |
|
| 1477 | + $allowed[ ] = $field; |
|
| 1479 | 1478 | } |
| 1480 | 1479 | |
| 1481 | 1480 | $renderer = new Field_Renderer(); |
@@ -1497,17 +1496,17 @@ discard block |
||
| 1497 | 1496 | } ); |
| 1498 | 1497 | |
| 1499 | 1498 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
| 1500 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 1499 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 1501 | 1500 | } |
| 1502 | 1501 | |
| 1503 | 1502 | foreach ( $allowed as $field ) { |
| 1504 | 1503 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); |
| 1505 | 1504 | |
| 1506 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
| 1505 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
| 1507 | 1506 | |
| 1508 | 1507 | if ( ! $headers_done ) { |
| 1509 | 1508 | $label = $field->get_label( $view, $source, $entry ); |
| 1510 | - $headers[] = $label ? $label : $field->ID; |
|
| 1509 | + $headers[ ] = $label ? $label : $field->ID; |
|
| 1511 | 1510 | } |
| 1512 | 1511 | } |
| 1513 | 1512 | |
@@ -1605,7 +1604,7 @@ discard block |
||
| 1605 | 1604 | * @return void |
| 1606 | 1605 | */ |
| 1607 | 1606 | public function set_anchor_id( $counter = 1 ) { |
| 1608 | - $this->anchor_id = sprintf( 'gv-view-%d-%d', $this->ID, (int) $counter ); |
|
| 1607 | + $this->anchor_id = sprintf( 'gv-view-%d-%d', $this->ID, (int)$counter ); |
|
| 1609 | 1608 | } |
| 1610 | 1609 | |
| 1611 | 1610 | /** |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * @uses {@var $counter} |
| 122 | 122 | * @param Template_Context $context |
| 123 | 123 | */ |
| 124 | - add_action( 'gravityview/template/view/render', $add_anchor_id_filter = function ( $context ) use ( &$counter ) { |
|
| 124 | + add_action( 'gravityview/template/view/render', $add_anchor_id_filter = function( $context ) use ( &$counter ) { |
|
| 125 | 125 | /** @see \GV\View::set_anchor_id() */ |
| 126 | 126 | $context->view->set_anchor_id( $counter[ $context->view->ID ] ); |
| 127 | 127 | } ); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | * @uses {@var View $view} |
| 133 | 133 | * @param string $action The search form action URL. |
| 134 | 134 | */ |
| 135 | - add_filter( 'gravityview/widget/search/form/action', $add_search_action_filter = function ( $action ) use ( $view ) { |
|
| 135 | + add_filter( 'gravityview/widget/search/form/action', $add_search_action_filter = function( $action ) use ( $view ) { |
|
| 136 | 136 | return $action . '#' . $view->get_anchor_id(); |
| 137 | 137 | } ); |
| 138 | 138 | |
@@ -141,11 +141,11 @@ discard block |
||
| 141 | 141 | * This allows us to fake it till we make it. |
| 142 | 142 | */ |
| 143 | 143 | $parameters = $view->settings->as_atts(); |
| 144 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
| 144 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
| 145 | 145 | $has_multisort = true; |
| 146 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
| 147 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
| 148 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
| 146 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
| 147 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
| 148 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | 'entries' => $entries, |
| 161 | 161 | 'request' => $request, |
| 162 | 162 | ), empty( $parameters ) ? array() : array( |
| 163 | - 'paging' => $parameters['paging'], |
|
| 164 | - 'sorting' => $parameters['sorting'], |
|
| 163 | + 'paging' => $parameters[ 'paging' ], |
|
| 164 | + 'sorting' => $parameters[ 'sorting' ], |
|
| 165 | 165 | ), empty( $post ) ? array() : array( |
| 166 | 166 | 'post' => $post, |
| 167 | 167 | ) ) ); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | 'search_clear' => array( |
| 56 | 56 | 'type' => 'checkbox', |
| 57 | 57 | 'label' => __( 'Show Clear button', 'gravityview' ), |
| 58 | - 'desc' => __( 'When a search is performed, display a button that removes all search values.', 'gravityview'), |
|
| 58 | + 'desc' => __( 'When a search is performed, display a button that removes all search values.', 'gravityview' ), |
|
| 59 | 59 | 'value' => true, |
| 60 | 60 | ), |
| 61 | 61 | 'search_fields' => array( |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | 'type' => 'radio', |
| 69 | 69 | 'full_width' => true, |
| 70 | 70 | 'label' => esc_html__( 'Search Mode', 'gravityview' ), |
| 71 | - 'desc' => __('Should search results match all search fields, or any?', 'gravityview'), |
|
| 71 | + 'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ), |
|
| 72 | 72 | 'value' => 'any', |
| 73 | 73 | 'class' => 'hide-if-js', |
| 74 | 74 | 'options' => array( |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | // admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999 |
| 89 | 89 | add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 ); |
| 90 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
| 90 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
| 91 | 91 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
| 92 | 92 | |
| 93 | 93 | // ajax - get the searchable fields |
@@ -123,19 +123,19 @@ discard block |
||
| 123 | 123 | */ |
| 124 | 124 | public function add_reserved_args( $args ) { |
| 125 | 125 | |
| 126 | - $args[] = 'gv_search'; |
|
| 127 | - $args[] = 'gv_start'; |
|
| 128 | - $args[] = 'gv_end'; |
|
| 129 | - $args[] = 'gv_id'; |
|
| 130 | - $args[] = 'gv_by'; |
|
| 131 | - $args[] = 'mode'; |
|
| 126 | + $args[ ] = 'gv_search'; |
|
| 127 | + $args[ ] = 'gv_start'; |
|
| 128 | + $args[ ] = 'gv_end'; |
|
| 129 | + $args[ ] = 'gv_id'; |
|
| 130 | + $args[ ] = 'gv_by'; |
|
| 131 | + $args[ ] = 'mode'; |
|
| 132 | 132 | |
| 133 | - $get = (array) $_GET; |
|
| 133 | + $get = (array)$_GET; |
|
| 134 | 134 | |
| 135 | 135 | // If the fields being searched as reserved; not to be considered user-passed variables |
| 136 | 136 | foreach ( $get as $key => $value ) { |
| 137 | 137 | if ( $key !== $this->convert_request_key_to_filter_key( $key ) ) { |
| 138 | - $args[] = $key; |
|
| 138 | + $args[ ] = $key; |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 260 | 260 | $script_source = empty( $script_min ) ? '/source' : ''; |
| 261 | 261 | |
| 262 | - wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version ); |
|
| 262 | + wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version ); |
|
| 263 | 263 | |
| 264 | 264 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
| 265 | 265 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
| 282 | 282 | */ |
| 283 | 283 | public function register_no_conflict( $allowed ) { |
| 284 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
| 284 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
| 285 | 285 | return $allowed; |
| 286 | 286 | } |
| 287 | 287 | |
@@ -293,24 +293,24 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | public static function get_searchable_fields() { |
| 295 | 295 | |
| 296 | - if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 296 | + if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 297 | 297 | exit( '0' ); |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | $form = ''; |
| 301 | 301 | |
| 302 | 302 | // Fetch the form for the current View |
| 303 | - if ( ! empty( $_POST['view_id'] ) ) { |
|
| 303 | + if ( ! empty( $_POST[ 'view_id' ] ) ) { |
|
| 304 | 304 | |
| 305 | - $form = gravityview_get_form_id( $_POST['view_id'] ); |
|
| 305 | + $form = gravityview_get_form_id( $_POST[ 'view_id' ] ); |
|
| 306 | 306 | |
| 307 | - } elseif ( ! empty( $_POST['formid'] ) ) { |
|
| 307 | + } elseif ( ! empty( $_POST[ 'formid' ] ) ) { |
|
| 308 | 308 | |
| 309 | - $form = (int) $_POST['formid']; |
|
| 309 | + $form = (int)$_POST[ 'formid' ]; |
|
| 310 | 310 | |
| 311 | - } elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 311 | + } elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 312 | 312 | |
| 313 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
| 313 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
| 314 | 314 | |
| 315 | 315 | } |
| 316 | 316 | |
@@ -360,14 +360,14 @@ discard block |
||
| 360 | 360 | ); |
| 361 | 361 | |
| 362 | 362 | if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) { |
| 363 | - $custom_fields['is_approved'] = array( |
|
| 363 | + $custom_fields[ 'is_approved' ] = array( |
|
| 364 | 364 | 'text' => esc_html__( 'Approval Status', 'gravityview' ), |
| 365 | 365 | 'type' => 'multi', |
| 366 | 366 | ); |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 370 | - $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] ); |
|
| 369 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 370 | + $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] ); |
|
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | // Get fields with sub-inputs and no parent |
@@ -389,13 +389,13 @@ discard block |
||
| 389 | 389 | |
| 390 | 390 | foreach ( $fields as $id => $field ) { |
| 391 | 391 | |
| 392 | - if ( in_array( $field['type'], $blocklist_field_types ) ) { |
|
| 392 | + if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) { |
|
| 393 | 393 | continue; |
| 394 | 394 | } |
| 395 | 395 | |
| 396 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
| 396 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
| 397 | 397 | |
| 398 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
| 398 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
| 399 | 399 | } |
| 400 | 400 | } |
| 401 | 401 | |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
| 419 | 419 | |
| 420 | 420 | // @todo - This needs to be improved - many fields have . including products and addresses |
| 421 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 421 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 422 | 422 | $input_type = 'boolean'; // on/off checkbox |
| 423 | 423 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
| 424 | 424 | $input_type = 'multi'; //multiselect |
@@ -464,19 +464,19 @@ discard block |
||
| 464 | 464 | $post_id = 0; |
| 465 | 465 | |
| 466 | 466 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
| 467 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
| 468 | - $post_id = absint( $widget_args['post_id'] ); |
|
| 467 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
| 468 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
| 469 | 469 | } |
| 470 | 470 | // We're in the WordPress Widget context, and the base View ID should be used |
| 471 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
| 472 | - $post_id = absint( $widget_args['view_id'] ); |
|
| 471 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
| 472 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | $args = gravityview_get_permalink_query_args( $post_id ); |
| 476 | 476 | |
| 477 | 477 | // Add hidden fields to the search form |
| 478 | 478 | foreach ( $args as $key => $value ) { |
| 479 | - $search_fields[] = array( |
|
| 479 | + $search_fields[ ] = array( |
|
| 480 | 480 | 'name' => $key, |
| 481 | 481 | 'input' => 'hidden', |
| 482 | 482 | 'value' => $value, |
@@ -515,28 +515,28 @@ discard block |
||
| 515 | 515 | /** |
| 516 | 516 | * Include the sidebar Widgets. |
| 517 | 517 | */ |
| 518 | - $widgets = (array) get_option( 'widget_gravityview_search', array() ); |
|
| 518 | + $widgets = (array)get_option( 'widget_gravityview_search', array() ); |
|
| 519 | 519 | |
| 520 | 520 | foreach ( $widgets as $widget ) { |
| 521 | - if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) { |
|
| 522 | - if( $_fields = json_decode( $widget['search_fields'], true ) ) { |
|
| 521 | + if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) { |
|
| 522 | + if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) { |
|
| 523 | 523 | foreach ( $_fields as $field ) { |
| 524 | - if ( empty( $field['form_id'] ) ) { |
|
| 525 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 524 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
| 525 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 526 | 526 | } |
| 527 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
| 527 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | } |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) { |
| 534 | - if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
| 534 | + if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
| 535 | 535 | foreach ( $_fields as $field ) { |
| 536 | - if ( empty( $field['form_id'] ) ) { |
|
| 537 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 536 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
| 537 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 538 | 538 | } |
| 539 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
| 539 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
| 540 | 540 | } |
| 541 | 541 | } |
| 542 | 542 | } |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | return $search_criteria; // Return the original criteria, GF_Query modification kicks in later |
| 583 | 583 | } |
| 584 | 584 | |
| 585 | - if( 'post' === $this->search_method ) { |
|
| 585 | + if ( 'post' === $this->search_method ) { |
|
| 586 | 586 | $get = $_POST; |
| 587 | 587 | } else { |
| 588 | 588 | $get = $_GET; |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | $get = gv_map_deep( $get, 'rawurldecode' ); |
| 604 | 604 | |
| 605 | 605 | // Make sure array key is set up |
| 606 | - $search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
| 606 | + $search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
| 607 | 607 | |
| 608 | 608 | $searchable_fields = $this->get_view_searchable_fields( $view ); |
| 609 | 609 | $searchable_field_objects = $this->get_view_searchable_fields( $view, true ); |
@@ -623,9 +623,9 @@ discard block |
||
| 623 | 623 | $trim_search_value = apply_filters( 'gravityview/search-trim-input', true ); |
| 624 | 624 | |
| 625 | 625 | // add free search |
| 626 | - if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) { |
|
| 626 | + if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) { |
|
| 627 | 627 | |
| 628 | - $search_all_value = $trim_search_value ? trim( $get['gv_search'] ) : $get['gv_search']; |
|
| 628 | + $search_all_value = $trim_search_value ? trim( $get[ 'gv_search' ] ) : $get[ 'gv_search' ]; |
|
| 629 | 629 | |
| 630 | 630 | if ( $split_words ) { |
| 631 | 631 | // Search for a piece |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | } |
| 642 | 642 | |
| 643 | 643 | foreach ( $words as $word ) { |
| 644 | - $search_criteria['field_filters'][] = array( |
|
| 644 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 645 | 645 | 'key' => null, // The field ID to search |
| 646 | 646 | 'value' => $word, // The value to search |
| 647 | 647 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -654,14 +654,14 @@ discard block |
||
| 654 | 654 | /** |
| 655 | 655 | * Get and normalize the dates according to the input format. |
| 656 | 656 | */ |
| 657 | - if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) { |
|
| 658 | - if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
| 657 | + if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) { |
|
| 658 | + if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
| 659 | 659 | $curr_start = $curr_start_date->format( 'Y-m-d' ); |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | - if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) { |
|
| 664 | - if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
| 663 | + if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) { |
|
| 664 | + if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
| 665 | 665 | $curr_end = $curr_end_date->format( 'Y-m-d' ); |
| 666 | 666 | } |
| 667 | 667 | } |
@@ -697,22 +697,22 @@ discard block |
||
| 697 | 697 | */ |
| 698 | 698 | if ( ! empty( $curr_start ) ) { |
| 699 | 699 | $curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) ); |
| 700 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 700 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 701 | 701 | } |
| 702 | 702 | |
| 703 | 703 | if ( ! empty( $curr_end ) ) { |
| 704 | 704 | // Fast-forward 24 hour on the end time |
| 705 | 705 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
| 706 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 707 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
| 708 | - $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
|
| 706 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 707 | + if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
| 708 | + $search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 ); |
|
| 709 | 709 | } |
| 710 | 710 | } |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | // search for a specific entry ID |
| 714 | 714 | if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) { |
| 715 | - $search_criteria['field_filters'][] = array( |
|
| 715 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 716 | 716 | 'key' => 'id', |
| 717 | 717 | 'value' => absint( $get[ 'gv_id' ] ), |
| 718 | 718 | 'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ), |
@@ -721,15 +721,15 @@ discard block |
||
| 721 | 721 | |
| 722 | 722 | // search for a specific Created_by ID |
| 723 | 723 | if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) { |
| 724 | - $search_criteria['field_filters'][] = array( |
|
| 724 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 725 | 725 | 'key' => 'created_by', |
| 726 | - 'value' => $get['gv_by'], |
|
| 726 | + 'value' => $get[ 'gv_by' ], |
|
| 727 | 727 | 'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ), |
| 728 | 728 | ); |
| 729 | 729 | } |
| 730 | 730 | |
| 731 | 731 | // Get search mode passed in URL |
| 732 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
| 732 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
| 733 | 733 | |
| 734 | 734 | // get the other search filters |
| 735 | 735 | foreach ( $get as $key => $value ) { |
@@ -747,7 +747,7 @@ discard block |
||
| 747 | 747 | $value = is_array( $value ) ? array_map( 'trim', $value ) : trim( $value ); |
| 748 | 748 | } |
| 749 | 749 | |
| 750 | - if ( gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { |
|
| 750 | + if ( gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) { |
|
| 751 | 751 | /** |
| 752 | 752 | * @filter `gravityview/search/ignore-empty-values` Filter to control if empty field values should be ignored or strictly matched (default: true) |
| 753 | 753 | * @since 2.14.2.1 |
@@ -778,21 +778,21 @@ discard block |
||
| 778 | 778 | continue; |
| 779 | 779 | } |
| 780 | 780 | |
| 781 | - if ( ! isset( $filter['operator'] ) ) { |
|
| 782 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
| 781 | + if ( ! isset( $filter[ 'operator' ] ) ) { |
|
| 782 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
| 783 | 783 | } |
| 784 | 784 | |
| 785 | - if ( isset( $filter[0]['value'] ) ) { |
|
| 786 | - $filter[0]['value'] = $trim_search_value ? trim( $filter[0]['value'] ) : $filter[0]['value']; |
|
| 785 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
| 786 | + $filter[ 0 ][ 'value' ] = $trim_search_value ? trim( $filter[ 0 ][ 'value' ] ) : $filter[ 0 ][ 'value' ]; |
|
| 787 | 787 | |
| 788 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
| 788 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
| 789 | 789 | |
| 790 | 790 | // if date range type, set search mode to ALL |
| 791 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 791 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 792 | 792 | $mode = 'all'; |
| 793 | 793 | } |
| 794 | - } elseif( !empty( $filter ) ) { |
|
| 795 | - $search_criteria['field_filters'][] = $filter; |
|
| 794 | + } elseif ( ! empty( $filter ) ) { |
|
| 795 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
| 796 | 796 | } |
| 797 | 797 | } |
| 798 | 798 | |
@@ -801,7 +801,7 @@ discard block |
||
| 801 | 801 | * @since 1.5.1 |
| 802 | 802 | * @param string $mode Search mode (`any` vs `all`) |
| 803 | 803 | */ |
| 804 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 804 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 805 | 805 | |
| 806 | 806 | gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) ); |
| 807 | 807 | |
@@ -835,19 +835,19 @@ discard block |
||
| 835 | 835 | |
| 836 | 836 | $query_class = $view->get_query_class(); |
| 837 | 837 | |
| 838 | - if ( empty( $search_criteria['field_filters'] ) ) { |
|
| 838 | + if ( empty( $search_criteria[ 'field_filters' ] ) ) { |
|
| 839 | 839 | return; |
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | $widgets = $view->widgets->by_id( $this->widget_id ); |
| 843 | 843 | if ( $widgets->count() ) { |
| 844 | 844 | $widgets = $widgets->all(); |
| 845 | - $widget = $widgets[0]; |
|
| 845 | + $widget = $widgets[ 0 ]; |
|
| 846 | 846 | |
| 847 | 847 | $search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ); |
| 848 | 848 | |
| 849 | - foreach ( (array) $search_fields as $search_field ) { |
|
| 850 | - if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) { |
|
| 849 | + foreach ( (array)$search_fields as $search_field ) { |
|
| 850 | + if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) { |
|
| 851 | 851 | $created_by_text_mode = true; |
| 852 | 852 | } |
| 853 | 853 | } |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | $extra_conditions = array(); |
| 857 | 857 | $mode = 'any'; |
| 858 | 858 | |
| 859 | - foreach ( $search_criteria['field_filters'] as $key => &$filter ) { |
|
| 859 | + foreach ( $search_criteria[ 'field_filters' ] as $key => &$filter ) { |
|
| 860 | 860 | if ( ! is_array( $filter ) ) { |
| 861 | 861 | if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) { |
| 862 | 862 | $mode = $filter; |
@@ -865,13 +865,13 @@ discard block |
||
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | // Construct a manual query for unapproved statuses |
| 868 | - if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) { |
|
| 869 | - $_tmp_query = new $query_class( $view->form->ID, array( |
|
| 868 | + if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) { |
|
| 869 | + $_tmp_query = new $query_class( $view->form->ID, array( |
|
| 870 | 870 | 'field_filters' => array( |
| 871 | 871 | array( |
| 872 | 872 | 'operator' => 'in', |
| 873 | 873 | 'key' => 'is_approved', |
| 874 | - 'value' => (array) $filter['value'], |
|
| 874 | + 'value' => (array)$filter[ 'value' ], |
|
| 875 | 875 | ), |
| 876 | 876 | array( |
| 877 | 877 | 'operator' => 'is', |
@@ -883,30 +883,30 @@ discard block |
||
| 883 | 883 | ) ); |
| 884 | 884 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 885 | 885 | |
| 886 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
| 886 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
| 887 | 887 | |
| 888 | 888 | $filter = false; |
| 889 | 889 | continue; |
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | // Construct manual query for text mode creator search |
| 893 | - if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) { |
|
| 894 | - $extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
| 893 | + if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) { |
|
| 894 | + $extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
| 895 | 895 | $filter = false; |
| 896 | 896 | continue; |
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | // By default, we want searches to be wildcard for each field. |
| 900 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
| 900 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
| 901 | 901 | |
| 902 | 902 | // For multichoice, let's have an in (OR) search. |
| 903 | - if ( is_array( $filter['value'] ) ) { |
|
| 904 | - $filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
| 903 | + if ( is_array( $filter[ 'value' ] ) ) { |
|
| 904 | + $filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | // Default form with joins functionality |
| 908 | - if ( empty( $filter['form_id'] ) ) { |
|
| 909 | - $filter['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 908 | + if ( empty( $filter[ 'form_id' ] ) ) { |
|
| 909 | + $filter[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 910 | 910 | } |
| 911 | 911 | |
| 912 | 912 | /** |
@@ -916,32 +916,32 @@ discard block |
||
| 916 | 916 | * @param array $filter array with `key`, `value`, `operator`, `type` keys |
| 917 | 917 | * @param \GV\View $view The View we're operating on. |
| 918 | 918 | */ |
| 919 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view ); |
|
| 919 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view ); |
|
| 920 | 920 | |
| 921 | - if ( 'is' !== $filter['operator'] && '' === $filter['value'] ) { |
|
| 922 | - unset( $search_criteria['field_filters'][ $key ] ); |
|
| 921 | + if ( 'is' !== $filter[ 'operator' ] && '' === $filter[ 'value' ] ) { |
|
| 922 | + unset( $search_criteria[ 'field_filters' ][ $key ] ); |
|
| 923 | 923 | } |
| 924 | 924 | } |
| 925 | 925 | |
| 926 | - if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) { |
|
| 926 | + if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) { |
|
| 927 | 927 | $date_criteria = array(); |
| 928 | 928 | |
| 929 | - if ( isset( $search_criteria['start_date'] ) ) { |
|
| 930 | - $date_criteria['start_date'] = $search_criteria['start_date']; |
|
| 929 | + if ( isset( $search_criteria[ 'start_date' ] ) ) { |
|
| 930 | + $date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ]; |
|
| 931 | 931 | } |
| 932 | 932 | |
| 933 | - if ( isset( $search_criteria['end_date'] ) ) { |
|
| 934 | - $date_criteria['end_date'] = $search_criteria['end_date']; |
|
| 933 | + if ( isset( $search_criteria[ 'end_date' ] ) ) { |
|
| 934 | + $date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ]; |
|
| 935 | 935 | } |
| 936 | 936 | |
| 937 | 937 | $_tmp_query = new $query_class( $view->form->ID, $date_criteria ); |
| 938 | 938 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 939 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
| 939 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
| 940 | 940 | } |
| 941 | 941 | |
| 942 | 942 | $search_conditions = array(); |
| 943 | 943 | |
| 944 | - if ( $filters = array_filter( $search_criteria['field_filters'] ) ) { |
|
| 944 | + if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) { |
|
| 945 | 945 | foreach ( $filters as &$filter ) { |
| 946 | 946 | if ( ! is_array( $filter ) ) { |
| 947 | 947 | continue; |
@@ -953,12 +953,12 @@ discard block |
||
| 953 | 953 | * code by reusing what's inside GF_Query already as they |
| 954 | 954 | * take care of many small things like forcing numeric, etc. |
| 955 | 955 | */ |
| 956 | - $_tmp_query = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
| 956 | + $_tmp_query = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
| 957 | 957 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 958 | - $search_condition = $_tmp_query_parts['where']; |
|
| 958 | + $search_condition = $_tmp_query_parts[ 'where' ]; |
|
| 959 | 959 | |
| 960 | - if ( empty( $filter['key'] ) && $search_condition->expressions ) { |
|
| 961 | - $search_conditions[] = $search_condition; |
|
| 960 | + if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) { |
|
| 961 | + $search_conditions[ ] = $search_condition; |
|
| 962 | 962 | } else { |
| 963 | 963 | $left = $search_condition->left; |
| 964 | 964 | |
@@ -970,8 +970,8 @@ discard block |
||
| 970 | 970 | |
| 971 | 971 | $value = $reflectionProperty->getValue( $left ); |
| 972 | 972 | |
| 973 | - if ( ! empty( $value[0] ) && $value[0] instanceof GF_Query_Column ) { |
|
| 974 | - $left = $value[0]; |
|
| 973 | + if ( ! empty( $value[ 0 ] ) && $value[ 0 ] instanceof GF_Query_Column ) { |
|
| 974 | + $left = $value[ 0 ]; |
|
| 975 | 975 | } else { |
| 976 | 976 | continue; |
| 977 | 977 | } |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | $on = $_join->join_on; |
| 988 | 988 | $join = $_join->join; |
| 989 | 989 | |
| 990 | - $search_conditions[] = GF_Query_Condition::_or( |
|
| 990 | + $search_conditions[ ] = GF_Query_Condition::_or( |
|
| 991 | 991 | // Join |
| 992 | 992 | new GF_Query_Condition( |
| 993 | 993 | new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ), |
@@ -1003,7 +1003,7 @@ discard block |
||
| 1003 | 1003 | ); |
| 1004 | 1004 | } |
| 1005 | 1005 | } else { |
| 1006 | - $search_conditions[] = new GF_Query_Condition( |
|
| 1006 | + $search_conditions[ ] = new GF_Query_Condition( |
|
| 1007 | 1007 | new GF_Query_Column( $left->field_id, $left->source, $alias ), |
| 1008 | 1008 | $search_condition->operator, |
| 1009 | 1009 | $search_condition->right |
@@ -1025,7 +1025,7 @@ discard block |
||
| 1025 | 1025 | /** |
| 1026 | 1026 | * Combine the parts as a new WHERE clause. |
| 1027 | 1027 | */ |
| 1028 | - $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) ); |
|
| 1028 | + $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) ); |
|
| 1029 | 1029 | $query->where( $where ); |
| 1030 | 1030 | } |
| 1031 | 1031 | |
@@ -1048,7 +1048,7 @@ discard block |
||
| 1048 | 1048 | $field_id = str_replace( array( 'filter_', 'input_' ), '', $key ); |
| 1049 | 1049 | |
| 1050 | 1050 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
| 1051 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
| 1051 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
| 1052 | 1052 | $field_id = str_replace( '_', '.', $field_id ); |
| 1053 | 1053 | } |
| 1054 | 1054 | |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | // form is in searchable fields |
| 1106 | 1106 | $found = false; |
| 1107 | 1107 | foreach ( $searchable_fields as $field ) { |
| 1108 | - if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) { |
|
| 1108 | + if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) { |
|
| 1109 | 1109 | $found = true; |
| 1110 | 1110 | break; |
| 1111 | 1111 | } |
@@ -1145,7 +1145,7 @@ discard block |
||
| 1145 | 1145 | |
| 1146 | 1146 | case 'select': |
| 1147 | 1147 | case 'radio': |
| 1148 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1148 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1149 | 1149 | break; |
| 1150 | 1150 | |
| 1151 | 1151 | case 'post_category': |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | |
| 1160 | 1160 | foreach ( $value as $val ) { |
| 1161 | 1161 | $cat = get_term( $val, 'category' ); |
| 1162 | - $filter[] = array( |
|
| 1162 | + $filter[ ] = array( |
|
| 1163 | 1163 | 'key' => $field_id, |
| 1164 | 1164 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
| 1165 | 1165 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | $filter = array(); |
| 1179 | 1179 | |
| 1180 | 1180 | foreach ( $value as $val ) { |
| 1181 | - $filter[] = array( 'key' => $field_id, 'value' => $val ); |
|
| 1181 | + $filter[ ] = array( 'key' => $field_id, 'value' => $val ); |
|
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | break; |
@@ -1187,9 +1187,9 @@ discard block |
||
| 1187 | 1187 | // convert checkbox on/off into the correct search filter |
| 1188 | 1188 | if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) { |
| 1189 | 1189 | foreach ( $form_field->inputs as $k => $input ) { |
| 1190 | - if ( $input['id'] == $field_id ) { |
|
| 1191 | - $filter['value'] = $form_field->choices[ $k ]['value']; |
|
| 1192 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1190 | + if ( $input[ 'id' ] == $field_id ) { |
|
| 1191 | + $filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ]; |
|
| 1192 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1193 | 1193 | break; |
| 1194 | 1194 | } |
| 1195 | 1195 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | $filter = array(); |
| 1200 | 1200 | |
| 1201 | 1201 | foreach ( $value as $val ) { |
| 1202 | - $filter[] = array( |
|
| 1202 | + $filter[ ] = array( |
|
| 1203 | 1203 | 'key' => $field_id, |
| 1204 | 1204 | 'value' => $val, |
| 1205 | 1205 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1220,9 +1220,9 @@ discard block |
||
| 1220 | 1220 | foreach ( $words as $word ) { |
| 1221 | 1221 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
| 1222 | 1222 | // Keep the same key for each filter |
| 1223 | - $filter['value'] = $word; |
|
| 1223 | + $filter[ 'value' ] = $word; |
|
| 1224 | 1224 | // Add a search for the value |
| 1225 | - $filters[] = $filter; |
|
| 1225 | + $filters[ ] = $filter; |
|
| 1226 | 1226 | } |
| 1227 | 1227 | } |
| 1228 | 1228 | |
@@ -1236,19 +1236,19 @@ discard block |
||
| 1236 | 1236 | |
| 1237 | 1237 | foreach ( $searchable_fields as $searchable_field ) { |
| 1238 | 1238 | |
| 1239 | - if( $form_field->ID !== $searchable_field['field'] ) { |
|
| 1239 | + if ( $form_field->ID !== $searchable_field[ 'field' ] ) { |
|
| 1240 | 1240 | continue; |
| 1241 | 1241 | } |
| 1242 | 1242 | |
| 1243 | 1243 | // Only exact-match dropdowns, not text search |
| 1244 | - if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) { |
|
| 1244 | + if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) { |
|
| 1245 | 1245 | continue; |
| 1246 | 1246 | } |
| 1247 | 1247 | |
| 1248 | 1248 | $input_id = gravityview_get_input_id_from_id( $form_field->ID ); |
| 1249 | 1249 | |
| 1250 | 1250 | if ( 4 === $input_id ) { |
| 1251 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1251 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1252 | 1252 | }; |
| 1253 | 1253 | } |
| 1254 | 1254 | } |
@@ -1276,12 +1276,12 @@ discard block |
||
| 1276 | 1276 | * @since 1.16.3 |
| 1277 | 1277 | * Safeguard until GF implements '<=' operator |
| 1278 | 1278 | */ |
| 1279 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 1279 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 1280 | 1280 | $operator = '<'; |
| 1281 | 1281 | $date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) ); |
| 1282 | 1282 | } |
| 1283 | 1283 | |
| 1284 | - $filter[] = array( |
|
| 1284 | + $filter[ ] = array( |
|
| 1285 | 1285 | 'key' => $field_id, |
| 1286 | 1286 | 'value' => self::get_formatted_date( $date, 'Y-m-d', $date_format ), |
| 1287 | 1287 | 'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ), |
@@ -1289,12 +1289,12 @@ discard block |
||
| 1289 | 1289 | } |
| 1290 | 1290 | } else { |
| 1291 | 1291 | $date = $value; |
| 1292 | - $filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
| 1293 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1292 | + $filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
| 1293 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1294 | 1294 | } |
| 1295 | 1295 | |
| 1296 | - if ('payment_date' === $key) { |
|
| 1297 | - $filter['operator'] = 'contains'; |
|
| 1296 | + if ( 'payment_date' === $key ) { |
|
| 1297 | + $filter[ 'operator' ] = 'contains'; |
|
| 1298 | 1298 | } |
| 1299 | 1299 | |
| 1300 | 1300 | break; |
@@ -1323,7 +1323,7 @@ discard block |
||
| 1323 | 1323 | 'ymd_dot' => 'Y.m.d', |
| 1324 | 1324 | ); |
| 1325 | 1325 | |
| 1326 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
| 1326 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
| 1327 | 1327 | $format = $datepicker[ $field->dateFormat ]; |
| 1328 | 1328 | } |
| 1329 | 1329 | |
@@ -1360,7 +1360,7 @@ discard block |
||
| 1360 | 1360 | public function add_template_path( $file_paths ) { |
| 1361 | 1361 | |
| 1362 | 1362 | // Index 100 is the default GravityView template path. |
| 1363 | - $file_paths[102] = self::$file . 'templates/'; |
|
| 1363 | + $file_paths[ 102 ] = self::$file . 'templates/'; |
|
| 1364 | 1364 | |
| 1365 | 1365 | return $file_paths; |
| 1366 | 1366 | } |
@@ -1379,7 +1379,7 @@ discard block |
||
| 1379 | 1379 | $has_date = false; |
| 1380 | 1380 | |
| 1381 | 1381 | foreach ( $search_fields as $k => $field ) { |
| 1382 | - if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 1382 | + if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 1383 | 1383 | $has_date = true; |
| 1384 | 1384 | break; |
| 1385 | 1385 | } |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | $view = \GV\View::by_id( $gravityview_view->view_id ); |
| 1409 | 1409 | |
| 1410 | 1410 | // get configured search fields |
| 1411 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
| 1411 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
| 1412 | 1412 | |
| 1413 | 1413 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
| 1414 | 1414 | gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) ); |
@@ -1422,39 +1422,39 @@ discard block |
||
| 1422 | 1422 | |
| 1423 | 1423 | $updated_field = $this->get_search_filter_details( $updated_field, $context ); |
| 1424 | 1424 | |
| 1425 | - switch ( $field['field'] ) { |
|
| 1425 | + switch ( $field[ 'field' ] ) { |
|
| 1426 | 1426 | |
| 1427 | 1427 | case 'search_all': |
| 1428 | - $updated_field['key'] = 'search_all'; |
|
| 1429 | - $updated_field['input'] = 'search_all'; |
|
| 1430 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 1428 | + $updated_field[ 'key' ] = 'search_all'; |
|
| 1429 | + $updated_field[ 'input' ] = 'search_all'; |
|
| 1430 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 1431 | 1431 | break; |
| 1432 | 1432 | |
| 1433 | 1433 | case 'entry_date': |
| 1434 | - $updated_field['key'] = 'entry_date'; |
|
| 1435 | - $updated_field['input'] = 'entry_date'; |
|
| 1436 | - $updated_field['value'] = array( |
|
| 1434 | + $updated_field[ 'key' ] = 'entry_date'; |
|
| 1435 | + $updated_field[ 'input' ] = 'entry_date'; |
|
| 1436 | + $updated_field[ 'value' ] = array( |
|
| 1437 | 1437 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
| 1438 | 1438 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
| 1439 | 1439 | ); |
| 1440 | 1440 | break; |
| 1441 | 1441 | |
| 1442 | 1442 | case 'entry_id': |
| 1443 | - $updated_field['key'] = 'entry_id'; |
|
| 1444 | - $updated_field['input'] = 'entry_id'; |
|
| 1445 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 1443 | + $updated_field[ 'key' ] = 'entry_id'; |
|
| 1444 | + $updated_field[ 'input' ] = 'entry_id'; |
|
| 1445 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 1446 | 1446 | break; |
| 1447 | 1447 | |
| 1448 | 1448 | case 'created_by': |
| 1449 | - $updated_field['key'] = 'created_by'; |
|
| 1450 | - $updated_field['name'] = 'gv_by'; |
|
| 1451 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 1449 | + $updated_field[ 'key' ] = 'created_by'; |
|
| 1450 | + $updated_field[ 'name' ] = 'gv_by'; |
|
| 1451 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 1452 | 1452 | break; |
| 1453 | 1453 | |
| 1454 | 1454 | case 'is_approved': |
| 1455 | - $updated_field['key'] = 'is_approved'; |
|
| 1456 | - $updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
| 1457 | - $updated_field['choices'] = self::get_is_approved_choices(); |
|
| 1455 | + $updated_field[ 'key' ] = 'is_approved'; |
|
| 1456 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
| 1457 | + $updated_field[ 'choices' ] = self::get_is_approved_choices(); |
|
| 1458 | 1458 | break; |
| 1459 | 1459 | } |
| 1460 | 1460 | |
@@ -1475,16 +1475,16 @@ discard block |
||
| 1475 | 1475 | |
| 1476 | 1476 | $gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args ); |
| 1477 | 1477 | |
| 1478 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
| 1478 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
| 1479 | 1479 | |
| 1480 | 1480 | /** @since 1.14 */ |
| 1481 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
| 1481 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
| 1482 | 1482 | |
| 1483 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
| 1483 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
| 1484 | 1484 | |
| 1485 | 1485 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
| 1486 | 1486 | |
| 1487 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
| 1487 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
| 1488 | 1488 | |
| 1489 | 1489 | if ( $this->has_date_field( $search_fields ) ) { |
| 1490 | 1490 | // enqueue datepicker stuff only if needed! |
@@ -1506,10 +1506,10 @@ discard block |
||
| 1506 | 1506 | public static function get_search_class( $custom_class = '' ) { |
| 1507 | 1507 | $gravityview_view = GravityView_View::getInstance(); |
| 1508 | 1508 | |
| 1509 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
| 1509 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
| 1510 | 1510 | |
| 1511 | - if ( ! empty( $custom_class ) ) { |
|
| 1512 | - $search_class .= ' '.$custom_class; |
|
| 1511 | + if ( ! empty( $custom_class ) ) { |
|
| 1512 | + $search_class .= ' ' . $custom_class; |
|
| 1513 | 1513 | } |
| 1514 | 1514 | |
| 1515 | 1515 | /** |
@@ -1560,9 +1560,9 @@ discard block |
||
| 1560 | 1560 | |
| 1561 | 1561 | if ( ! $label ) { |
| 1562 | 1562 | |
| 1563 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
| 1563 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
| 1564 | 1564 | |
| 1565 | - switch( $field['field'] ) { |
|
| 1565 | + switch ( $field[ 'field' ] ) { |
|
| 1566 | 1566 | case 'search_all': |
| 1567 | 1567 | $label = __( 'Search Entries:', 'gravityview' ); |
| 1568 | 1568 | break; |
@@ -1574,10 +1574,10 @@ discard block |
||
| 1574 | 1574 | break; |
| 1575 | 1575 | default: |
| 1576 | 1576 | // If this is a field input, not a field |
| 1577 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
| 1577 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
| 1578 | 1578 | |
| 1579 | 1579 | // Get the label for the field in question, which returns an array |
| 1580 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
| 1580 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
| 1581 | 1581 | |
| 1582 | 1582 | // Get the item with the `label` key |
| 1583 | 1583 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1618,13 +1618,13 @@ discard block |
||
| 1618 | 1618 | $form = $gravityview_view->getForm(); |
| 1619 | 1619 | |
| 1620 | 1620 | // for advanced field ids (eg, first name / last name ) |
| 1621 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
| 1621 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
| 1622 | 1622 | |
| 1623 | 1623 | // get searched value from $_GET/$_POST (string or array) |
| 1624 | 1624 | $value = $this->rgget_or_rgpost( $name ); |
| 1625 | 1625 | |
| 1626 | 1626 | // get form field details |
| 1627 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
| 1627 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
| 1628 | 1628 | |
| 1629 | 1629 | $form_field_type = \GV\Utils::get( $form_field, 'type' ); |
| 1630 | 1630 | |
@@ -1638,22 +1638,22 @@ discard block |
||
| 1638 | 1638 | ); |
| 1639 | 1639 | |
| 1640 | 1640 | // collect choices |
| 1641 | - if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
| 1642 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
| 1643 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
| 1644 | - $filter['choices'] = $form_field['choices']; |
|
| 1641 | + if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
| 1642 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
| 1643 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
| 1644 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
| 1645 | 1645 | } |
| 1646 | 1646 | |
| 1647 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
| 1648 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
| 1647 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
| 1648 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
| 1649 | 1649 | } |
| 1650 | 1650 | |
| 1651 | - if ( 'created_by' === $field['field'] ) { |
|
| 1652 | - $filter['choices'] = self::get_created_by_choices( ( isset( $context->view ) ? $context->view : null ) ); |
|
| 1653 | - $filter['type'] = 'created_by'; |
|
| 1651 | + if ( 'created_by' === $field[ 'field' ] ) { |
|
| 1652 | + $filter[ 'choices' ] = self::get_created_by_choices( ( isset( $context->view ) ? $context->view : null ) ); |
|
| 1653 | + $filter[ 'type' ] = 'created_by'; |
|
| 1654 | 1654 | } |
| 1655 | 1655 | |
| 1656 | - if ( ! empty( $filter['choices'] ) ) { |
|
| 1656 | + if ( ! empty( $filter[ 'choices' ] ) ) { |
|
| 1657 | 1657 | /** |
| 1658 | 1658 | * @filter `gravityview/search/sieve_choices` Only output used choices for this field. |
| 1659 | 1659 | * @param bool Yes or no. |
@@ -1661,7 +1661,7 @@ discard block |
||
| 1661 | 1661 | * @param \GV\Context The context. |
| 1662 | 1662 | */ |
| 1663 | 1663 | if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) { |
| 1664 | - $filter['choices'] = $this->sieve_filter_choices( $filter, $context ); |
|
| 1664 | + $filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context ); |
|
| 1665 | 1665 | } |
| 1666 | 1666 | } |
| 1667 | 1667 | |
@@ -1690,12 +1690,12 @@ discard block |
||
| 1690 | 1690 | * @return array The filter choices. |
| 1691 | 1691 | */ |
| 1692 | 1692 | private function sieve_filter_choices( $filter, $context ) { |
| 1693 | - if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) { |
|
| 1693 | + if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) { |
|
| 1694 | 1694 | return $filter; // @todo Populate plugins might give us empty choices |
| 1695 | 1695 | } |
| 1696 | 1696 | |
| 1697 | 1697 | // Allow only created_by and field-ids to be sieved. |
| 1698 | - if ( 'created_by' !== $filter['key'] && ! is_numeric( $filter['key'] ) ) { |
|
| 1698 | + if ( 'created_by' !== $filter[ 'key' ] && ! is_numeric( $filter[ 'key' ] ) ) { |
|
| 1699 | 1699 | return $filter; |
| 1700 | 1700 | } |
| 1701 | 1701 | |
@@ -1706,13 +1706,13 @@ discard block |
||
| 1706 | 1706 | $entry_table_name = GFFormsModel::get_entry_table_name(); |
| 1707 | 1707 | $entry_meta_table_name = GFFormsModel::get_entry_meta_table_name(); |
| 1708 | 1708 | |
| 1709 | - $key_like = $wpdb->esc_like( $filter['key'] ) . '.%'; |
|
| 1709 | + $key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%'; |
|
| 1710 | 1710 | |
| 1711 | 1711 | switch ( \GV\Utils::get( $filter, 'type' ) ): |
| 1712 | 1712 | case 'post_category': |
| 1713 | 1713 | $choices = $wpdb->get_col( $wpdb->prepare( |
| 1714 | 1714 | "SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $entry_meta_table_name WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
| 1715 | - $key_like, $filter['key'], $form_id |
|
| 1715 | + $key_like, $filter[ 'key' ], $form_id |
|
| 1716 | 1716 | ) ); |
| 1717 | 1717 | break; |
| 1718 | 1718 | case 'created_by': |
@@ -1724,17 +1724,17 @@ discard block |
||
| 1724 | 1724 | default: |
| 1725 | 1725 | $choices = $wpdb->get_col( $wpdb->prepare( |
| 1726 | 1726 | "SELECT DISTINCT meta_value FROM $entry_meta_table_name WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
| 1727 | - $key_like, $filter['key'], $form_id |
|
| 1727 | + $key_like, $filter[ 'key' ], $form_id |
|
| 1728 | 1728 | ) ); |
| 1729 | 1729 | |
| 1730 | - if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) { |
|
| 1730 | + if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) { |
|
| 1731 | 1731 | $choices = array_map( 'json_decode', $choices ); |
| 1732 | 1732 | $_choices_array = array(); |
| 1733 | 1733 | foreach ( $choices as $choice ) { |
| 1734 | 1734 | if ( is_array( $choice ) ) { |
| 1735 | 1735 | $_choices_array = array_merge( $_choices_array, $choice ); |
| 1736 | 1736 | } else { |
| 1737 | - $_choices_array []= $choice; |
|
| 1737 | + $_choices_array [ ] = $choice; |
|
| 1738 | 1738 | } |
| 1739 | 1739 | } |
| 1740 | 1740 | $choices = array_unique( $_choices_array ); |
@@ -1744,9 +1744,9 @@ discard block |
||
| 1744 | 1744 | endswitch; |
| 1745 | 1745 | |
| 1746 | 1746 | $filter_choices = array(); |
| 1747 | - foreach ( $filter['choices'] as $choice ) { |
|
| 1748 | - if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) { |
|
| 1749 | - $filter_choices[] = $choice; |
|
| 1747 | + foreach ( $filter[ 'choices' ] as $choice ) { |
|
| 1748 | + if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) { |
|
| 1749 | + $filter_choices[ ] = $choice; |
|
| 1750 | 1750 | } |
| 1751 | 1751 | } |
| 1752 | 1752 | |
@@ -1781,7 +1781,7 @@ discard block |
||
| 1781 | 1781 | * @param \GV\View|null $view The view. |
| 1782 | 1782 | */ |
| 1783 | 1783 | $text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view ); |
| 1784 | - $choices[] = array( |
|
| 1784 | + $choices[ ] = array( |
|
| 1785 | 1785 | 'value' => $user->ID, |
| 1786 | 1786 | 'text' => $text, |
| 1787 | 1787 | ); |
@@ -1801,9 +1801,9 @@ discard block |
||
| 1801 | 1801 | |
| 1802 | 1802 | $choices = array(); |
| 1803 | 1803 | foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) { |
| 1804 | - $choices[] = array( |
|
| 1805 | - 'value' => $status['value'], |
|
| 1806 | - 'text' => $status['label'], |
|
| 1804 | + $choices[ ] = array( |
|
| 1805 | + 'value' => $status[ 'value' ], |
|
| 1806 | + 'text' => $status[ 'label' ], |
|
| 1807 | 1807 | ); |
| 1808 | 1808 | } |
| 1809 | 1809 | |
@@ -1855,7 +1855,7 @@ discard block |
||
| 1855 | 1855 | */ |
| 1856 | 1856 | public function add_datepicker_js_dependency( $js_dependencies ) { |
| 1857 | 1857 | |
| 1858 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
| 1858 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
| 1859 | 1859 | |
| 1860 | 1860 | return $js_dependencies; |
| 1861 | 1861 | } |
@@ -1899,7 +1899,7 @@ discard block |
||
| 1899 | 1899 | 'isRTL' => is_rtl(), |
| 1900 | 1900 | ), $view_data ); |
| 1901 | 1901 | |
| 1902 | - $localizations['datepicker'] = $datepicker_settings; |
|
| 1902 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
| 1903 | 1903 | |
| 1904 | 1904 | return $localizations; |
| 1905 | 1905 | |
@@ -1926,7 +1926,7 @@ discard block |
||
| 1926 | 1926 | * @return void |
| 1927 | 1927 | */ |
| 1928 | 1928 | private function maybe_enqueue_flexibility() { |
| 1929 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
| 1929 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
| 1930 | 1930 | wp_enqueue_script( 'gv-flexibility' ); |
| 1931 | 1931 | } |
| 1932 | 1932 | } |
@@ -1948,7 +1948,7 @@ discard block |
||
| 1948 | 1948 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
| 1949 | 1949 | |
| 1950 | 1950 | $scheme = is_ssl() ? 'https://' : 'http://'; |
| 1951 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1951 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1952 | 1952 | |
| 1953 | 1953 | /** |
| 1954 | 1954 | * @filter `gravityview_search_datepicker_class` |
@@ -2027,7 +2027,7 @@ discard block |
||
| 2027 | 2027 | public function add_preview_inputs() { |
| 2028 | 2028 | global $wp; |
| 2029 | 2029 | |
| 2030 | - if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) { |
|
| 2030 | + if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) { |
|
| 2031 | 2031 | return; |
| 2032 | 2032 | } |
| 2033 | 2033 | |
@@ -2085,7 +2085,7 @@ discard block |
||
| 2085 | 2085 | */ |
| 2086 | 2086 | class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition { |
| 2087 | 2087 | public function __construct( $filter, $view ) { |
| 2088 | - $this->value = $filter['value']; |
|
| 2088 | + $this->value = $filter[ 'value' ]; |
|
| 2089 | 2089 | $this->view = $view; |
| 2090 | 2090 | } |
| 2091 | 2091 | |
@@ -2117,11 +2117,11 @@ discard block |
||
| 2117 | 2117 | $conditions = array(); |
| 2118 | 2118 | |
| 2119 | 2119 | foreach ( $user_fields as $user_field ) { |
| 2120 | - $conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2120 | + $conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2121 | 2121 | } |
| 2122 | 2122 | |
| 2123 | 2123 | foreach ( $user_meta_fields as $meta_field ) { |
| 2124 | - $conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2124 | + $conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2125 | 2125 | } |
| 2126 | 2126 | |
| 2127 | 2127 | $conditions = '(' . implode( ' OR ', $conditions ) . ')'; |