|
@@ -125,8 +125,8 @@ discard block |
|
|
block discarded – undo |
|
125
|
125
|
|
|
126
|
126
|
$form = false; |
|
127
|
127
|
|
|
128
|
|
- if( $entry ) { |
|
129
|
|
- $form = GFAPI::get_form( $entry['form_id'] ); |
|
|
128
|
+ if ( $entry ) { |
|
|
129
|
+ $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
130
|
130
|
} |
|
131
|
131
|
|
|
132
|
132
|
return $form; |
|
@@ -202,7 +202,7 @@ discard block |
|
|
block discarded – undo |
|
202
|
202
|
} |
|
203
|
203
|
} |
|
204
|
204
|
|
|
205
|
|
- return (bool) $has_transaction_data; |
|
|
205
|
+ return (bool)$has_transaction_data; |
|
206
|
206
|
} |
|
207
|
207
|
|
|
208
|
208
|
/** |
|
@@ -240,7 +240,7 @@ discard block |
|
|
block discarded – undo |
|
240
|
240
|
|
|
241
|
241
|
$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging ); |
|
242
|
242
|
|
|
243
|
|
- $result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null; |
|
|
243
|
+ $result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null; |
|
244
|
244
|
|
|
245
|
245
|
return $result; |
|
246
|
246
|
} |
|
@@ -257,10 +257,10 @@ discard block |
|
|
block discarded – undo |
|
257
|
257
|
* |
|
258
|
258
|
* @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms |
|
259
|
259
|
*/ |
|
260
|
|
- public static function get_forms( $active = true, $trash = false ) { |
|
|
260
|
+ public static function get_forms( $active = true, $trash = false ) { |
|
261
|
261
|
$forms = array(); |
|
262
|
262
|
if ( class_exists( 'GFAPI' ) ) { |
|
263
|
|
- if( 'any' === $active ) { |
|
|
263
|
+ if ( 'any' === $active ) { |
|
264
|
264
|
$active_forms = GFAPI::get_forms( true, $trash ); |
|
265
|
265
|
$inactive_forms = GFAPI::get_forms( false, $trash ); |
|
266
|
266
|
$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) ); |
|
@@ -291,9 +291,9 @@ discard block |
|
|
block discarded – undo |
|
291
|
291
|
$has_post_fields = false; |
|
292
|
292
|
|
|
293
|
293
|
if ( $form ) { |
|
294
|
|
- foreach ( $form['fields'] as $field ) { |
|
295
|
|
- if ( $include_parent_field || empty( $field['inputs'] ) ) { |
|
296
|
|
- $fields["{$field['id']}"] = array( |
|
|
294
|
+ foreach ( $form[ 'fields' ] as $field ) { |
|
|
295
|
+ if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) { |
|
|
296
|
+ $fields[ "{$field[ 'id' ]}" ] = array( |
|
297
|
297
|
'label' => \GV\Utils::get( $field, 'label' ), |
|
298
|
298
|
'parent' => null, |
|
299
|
299
|
'type' => \GV\Utils::get( $field, 'type' ), |
|
@@ -302,10 +302,10 @@ discard block |
|
|
block discarded – undo |
|
302
|
302
|
); |
|
303
|
303
|
} |
|
304
|
304
|
|
|
305
|
|
- if ( $add_default_properties && ! empty( $field['inputs'] ) ) { |
|
306
|
|
- foreach ( $field['inputs'] as $input ) { |
|
|
305
|
+ if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) { |
|
|
306
|
+ foreach ( $field[ 'inputs' ] as $input ) { |
|
307
|
307
|
|
|
308
|
|
- if( ! empty( $input['isHidden'] ) ) { |
|
|
308
|
+ if ( ! empty( $input[ 'isHidden' ] ) ) { |
|
309
|
309
|
continue; |
|
310
|
310
|
} |
|
311
|
311
|
|
|
@@ -313,10 +313,10 @@ discard block |
|
|
block discarded – undo |
|
313
|
313
|
* @hack |
|
314
|
314
|
* In case of email/email confirmation, the input for email has the same id as the parent field |
|
315
|
315
|
*/ |
|
316
|
|
- if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
|
|
316
|
+ if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) { |
|
317
|
317
|
continue; |
|
318
|
318
|
} |
|
319
|
|
- $fields["{$input['id']}"] = array( |
|
|
319
|
+ $fields[ "{$input[ 'id' ]}" ] = array( |
|
320
|
320
|
'label' => \GV\Utils::get( $input, 'label' ), |
|
321
|
321
|
'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
|
322
|
322
|
'parent' => $field, |
|
@@ -328,7 +328,7 @@ discard block |
|
|
block discarded – undo |
|
328
|
328
|
} |
|
329
|
329
|
|
|
330
|
330
|
|
|
331
|
|
- if( GFCommon::is_product_field( $field['type'] ) ){ |
|
|
331
|
+ if ( GFCommon::is_product_field( $field[ 'type' ] ) ) { |
|
332
|
332
|
$has_product_fields = true; |
|
333
|
333
|
} |
|
334
|
334
|
|
|
@@ -342,7 +342,7 @@ discard block |
|
|
block discarded – undo |
|
342
|
342
|
* @since 1.7 |
|
343
|
343
|
*/ |
|
344
|
344
|
if ( $has_post_fields ) { |
|
345
|
|
- $fields['post_id'] = array( |
|
|
345
|
+ $fields[ 'post_id' ] = array( |
|
346
|
346
|
'label' => __( 'Post ID', 'gravityview' ), |
|
347
|
347
|
'type' => 'post_id', |
|
348
|
348
|
); |
|
@@ -355,11 +355,11 @@ discard block |
|
|
block discarded – undo |
|
355
|
355
|
foreach ( $payment_fields as $payment_field ) { |
|
356
|
356
|
|
|
357
|
357
|
// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key |
|
358
|
|
- if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
|
358
|
+ if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
359
|
359
|
continue; |
|
360
|
360
|
} |
|
361
|
361
|
|
|
362
|
|
- $fields["{$payment_field->name}"] = array( |
|
|
362
|
+ $fields[ "{$payment_field->name}" ] = array( |
|
363
|
363
|
'label' => $payment_field->label, |
|
364
|
364
|
'desc' => $payment_field->description, |
|
365
|
365
|
'type' => $payment_field->name, |
|
@@ -391,9 +391,9 @@ discard block |
|
|
block discarded – undo |
|
391
|
391
|
|
|
392
|
392
|
$fields = array(); |
|
393
|
393
|
|
|
394
|
|
- foreach ( $extra_fields as $key => $field ){ |
|
395
|
|
- if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) { |
|
396
|
|
- $fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' ); |
|
|
394
|
+ foreach ( $extra_fields as $key => $field ) { |
|
|
395
|
+ if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) { |
|
|
396
|
+ $fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' ); |
|
397
|
397
|
} |
|
398
|
398
|
} |
|
399
|
399
|
|
|
@@ -433,33 +433,33 @@ discard block |
|
|
block discarded – undo |
|
433
|
433
|
'search_criteria' => null, |
|
434
|
434
|
'sorting' => null, |
|
435
|
435
|
'paging' => null, |
|
436
|
|
- 'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true), |
|
|
436
|
+ 'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ), |
|
437
|
437
|
'context_view_id' => null, |
|
438
|
438
|
); |
|
439
|
439
|
|
|
440
|
440
|
$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults ); |
|
441
|
441
|
|
|
442
|
|
- if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) { |
|
443
|
|
- foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) { |
|
|
442
|
+ if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
|
443
|
+ foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) { |
|
444
|
444
|
|
|
445
|
445
|
if ( ! is_array( $filter ) ) { |
|
446
|
446
|
continue; |
|
447
|
447
|
} |
|
448
|
448
|
|
|
449
|
449
|
// By default, we want searches to be wildcard for each field. |
|
450
|
|
- $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
|
450
|
+ $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
451
|
451
|
|
|
452
|
452
|
/** |
|
453
|
453
|
* @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc) |
|
454
|
454
|
* @param string $operator Existing search operator |
|
455
|
455
|
* @param array $filter array with `key`, `value`, `operator`, `type` keys |
|
456
|
456
|
*/ |
|
457
|
|
- $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter ); |
|
|
457
|
+ $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter ); |
|
458
|
458
|
} |
|
459
|
459
|
|
|
460
|
460
|
// don't send just the [mode] without any field filter. |
|
461
|
|
- if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) { |
|
462
|
|
- unset( $criteria['search_criteria']['field_filters']['mode'] ); |
|
|
461
|
+ if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
|
462
|
+ unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] ); |
|
463
|
463
|
} |
|
464
|
464
|
|
|
465
|
465
|
} |
|
@@ -470,33 +470,33 @@ discard block |
|
|
block discarded – undo |
|
470
|
470
|
* Prepare date formats to be in Gravity Forms DB format; |
|
471
|
471
|
* $passed_criteria may include date formats incompatible with Gravity Forms. |
|
472
|
472
|
*/ |
|
473
|
|
- foreach ( array('start_date', 'end_date' ) as $key ) { |
|
|
473
|
+ foreach ( array( 'start_date', 'end_date' ) as $key ) { |
|
474
|
474
|
|
|
475
|
|
- if ( ! empty( $criteria['search_criteria'][ $key ] ) ) { |
|
|
475
|
+ if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) { |
|
476
|
476
|
|
|
477
|
477
|
// Use date_create instead of new DateTime so it returns false if invalid date format. |
|
478
|
|
- $date = date_create( $criteria['search_criteria'][ $key ] ); |
|
|
478
|
+ $date = date_create( $criteria[ 'search_criteria' ][ $key ] ); |
|
479
|
479
|
|
|
480
|
480
|
if ( $date ) { |
|
481
|
481
|
// Gravity Forms wants dates in the `Y-m-d H:i:s` format. |
|
482
|
|
- $criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
|
482
|
+ $criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
483
|
483
|
} else { |
|
484
|
|
- gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) ); |
|
|
484
|
+ gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) ); |
|
485
|
485
|
|
|
486
|
486
|
// If it's an invalid date, unset it. Gravity Forms freaks out otherwise. |
|
487
|
|
- unset( $criteria['search_criteria'][ $key ] ); |
|
|
487
|
+ unset( $criteria[ 'search_criteria' ][ $key ] ); |
|
488
|
488
|
} |
|
489
|
489
|
} |
|
490
|
490
|
} |
|
491
|
491
|
|
|
492
|
|
- if ( empty( $criteria['context_view_id'] ) ) { |
|
|
492
|
+ if ( empty( $criteria[ 'context_view_id' ] ) ) { |
|
493
|
493
|
// Calculate the context view id and send it to the advanced filter |
|
494
|
494
|
if ( GravityView_frontend::getInstance()->getSingleEntry() ) { |
|
495
|
|
- $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
|
495
|
+ $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
496
|
496
|
} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) { |
|
497
|
|
- $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
|
497
|
+ $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
498
|
498
|
} else if ( 'delete' === GFForms::get( 'action' ) ) { |
|
499
|
|
- $criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null; |
|
|
499
|
+ $criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null; |
|
500
|
500
|
} |
|
501
|
501
|
} |
|
502
|
502
|
|
|
@@ -506,7 +506,7 @@ discard block |
|
|
block discarded – undo |
|
506
|
506
|
* @param array $form_ids Forms to search |
|
507
|
507
|
* @param int $view_id ID of the view being used to search |
|
508
|
508
|
*/ |
|
509
|
|
- $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] ); |
|
|
509
|
+ $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] ); |
|
510
|
510
|
|
|
511
|
511
|
return (array)$criteria; |
|
512
|
512
|
} |
|
@@ -541,7 +541,7 @@ discard block |
|
|
block discarded – undo |
|
541
|
541
|
/** Reduce # of database calls */ |
|
542
|
542
|
add_filter( 'gform_is_encrypted_field', '__return_false' ); |
|
543
|
543
|
|
|
544
|
|
- if ( ! empty( $criteria['cache'] ) ) { |
|
|
544
|
+ if ( ! empty( $criteria[ 'cache' ] ) ) { |
|
545
|
545
|
|
|
546
|
546
|
$Cache = new GravityView_Cache( $form_ids, $criteria ); |
|
547
|
547
|
|
|
@@ -549,7 +549,7 @@ discard block |
|
|
block discarded – undo |
|
549
|
549
|
|
|
550
|
550
|
// Still update the total count when using cached results |
|
551
|
551
|
if ( ! is_null( $total ) ) { |
|
552
|
|
- $total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] ); |
|
|
552
|
+ $total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] ); |
|
553
|
553
|
} |
|
554
|
554
|
|
|
555
|
555
|
$return = $entries; |
|
@@ -571,9 +571,9 @@ discard block |
|
|
block discarded – undo |
|
571
|
571
|
$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) ); |
|
572
|
572
|
|
|
573
|
573
|
// No entries returned from gravityview_before_get_entries |
|
574
|
|
- if( is_null( $entries ) ) { |
|
|
574
|
+ if ( is_null( $entries ) ) { |
|
575
|
575
|
|
|
576
|
|
- $entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total ); |
|
|
576
|
+ $entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total ); |
|
577
|
577
|
|
|
578
|
578
|
if ( is_wp_error( $entries ) ) { |
|
579
|
579
|
gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) ); |
|
@@ -584,7 +584,7 @@ discard block |
|
|
block discarded – undo |
|
584
|
584
|
} |
|
585
|
585
|
} |
|
586
|
586
|
|
|
587
|
|
- if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) { |
|
|
587
|
+ if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) { |
|
588
|
588
|
|
|
589
|
589
|
// Cache results |
|
590
|
590
|
$Cache->set( $entries, 'entries' ); |
|
@@ -693,12 +693,12 @@ discard block |
|
|
block discarded – undo |
|
693
|
693
|
*/ |
|
694
|
694
|
$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry ); |
|
695
|
695
|
|
|
696
|
|
- if( $check_entry_display ) { |
|
|
696
|
+ if ( $check_entry_display ) { |
|
697
|
697
|
// Is the entry allowed |
|
698
|
698
|
$entry = self::check_entry_display( $entry ); |
|
699
|
699
|
} |
|
700
|
700
|
|
|
701
|
|
- if( is_wp_error( $entry ) ) { |
|
|
701
|
+ if ( is_wp_error( $entry ) ) { |
|
702
|
702
|
gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) ); |
|
703
|
703
|
return false; |
|
704
|
704
|
} |
|
@@ -732,12 +732,12 @@ discard block |
|
|
block discarded – undo |
|
732
|
732
|
|
|
733
|
733
|
$value = false; |
|
734
|
734
|
|
|
735
|
|
- if( 'context' === $val1 ) { |
|
|
735
|
+ if ( 'context' === $val1 ) { |
|
736
|
736
|
|
|
737
|
737
|
$matching_contexts = array( $val2 ); |
|
738
|
738
|
|
|
739
|
739
|
// We allow for non-standard contexts. |
|
740
|
|
- switch( $val2 ) { |
|
|
740
|
+ switch ( $val2 ) { |
|
741
|
741
|
// Check for either single or edit |
|
742
|
742
|
case 'singular': |
|
743
|
743
|
$matching_contexts = array( 'single', 'edit' ); |
|
@@ -780,18 +780,18 @@ discard block |
|
|
block discarded – undo |
|
780
|
780
|
$json_val_1 = json_decode( $val1, true ); |
|
781
|
781
|
$json_val_2 = json_decode( $val2, true ); |
|
782
|
782
|
|
|
783
|
|
- if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
|
783
|
+ if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
784
|
784
|
|
|
785
|
785
|
$json_in = false; |
|
786
|
|
- $json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 ); |
|
787
|
|
- $json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 ); |
|
|
786
|
+ $json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 ); |
|
|
787
|
+ $json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 ); |
|
788
|
788
|
|
|
789
|
789
|
// For JSON, we want to compare as "in" or "not in" rather than "contains" |
|
790
|
790
|
foreach ( $json_val_1 as $item_1 ) { |
|
791
|
791
|
foreach ( $json_val_2 as $item_2 ) { |
|
792
|
792
|
$json_in = self::matches_operation( $item_1, $item_2, 'is' ); |
|
793
|
793
|
|
|
794
|
|
- if( $json_in ) { |
|
|
794
|
+ if ( $json_in ) { |
|
795
|
795
|
break 2; |
|
796
|
796
|
} |
|
797
|
797
|
} |
|
@@ -843,10 +843,10 @@ discard block |
|
|
block discarded – undo |
|
843
|
843
|
public static function check_entry_display( $entry, $view = null ) { |
|
844
|
844
|
|
|
845
|
845
|
if ( ! $entry || is_wp_error( $entry ) ) { |
|
846
|
|
- return new WP_Error('entry_not_found', 'Entry was not found.', $entry ); |
|
|
846
|
+ return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry ); |
|
847
|
847
|
} |
|
848
|
848
|
|
|
849
|
|
- if ( empty( $entry['form_id'] ) ) { |
|
|
849
|
+ if ( empty( $entry[ 'form_id' ] ) ) { |
|
850
|
850
|
return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry ); |
|
851
|
851
|
} |
|
852
|
852
|
|
|
@@ -854,59 +854,59 @@ discard block |
|
|
block discarded – undo |
|
854
|
854
|
'context_view_id' => $view ? $view->ID : null, |
|
855
|
855
|
) ); |
|
856
|
856
|
|
|
857
|
|
- if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) { |
|
|
857
|
+ if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) { |
|
858
|
858
|
gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) ); |
|
859
|
859
|
return $entry; |
|
860
|
860
|
} |
|
861
|
861
|
|
|
862
|
862
|
// Make sure the current View is connected to the same form as the Entry |
|
863
|
|
- if( ! empty( $criteria['context_view_id'] ) ) { |
|
864
|
|
- $context_view_id = intval( $criteria['context_view_id'] ); |
|
|
863
|
+ if ( ! empty( $criteria[ 'context_view_id' ] ) ) { |
|
|
864
|
+ $context_view_id = intval( $criteria[ 'context_view_id' ] ); |
|
865
|
865
|
$context_form_id = gravityview_get_form_id( $context_view_id ); |
|
866
|
|
- if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) { |
|
867
|
|
- return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] ); |
|
|
866
|
+ if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) { |
|
|
867
|
+ return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] ); |
|
868
|
868
|
} |
|
869
|
869
|
} |
|
870
|
870
|
|
|
871
|
|
- $search_criteria = $criteria['search_criteria']; |
|
|
871
|
+ $search_criteria = $criteria[ 'search_criteria' ]; |
|
872
|
872
|
|
|
873
|
873
|
// check entry status |
|
874
|
|
- if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) { |
|
875
|
|
- return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria ); |
|
|
874
|
+ if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) { |
|
|
875
|
+ return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria ); |
|
876
|
876
|
} |
|
877
|
877
|
|
|
878
|
878
|
// check entry date |
|
879
|
879
|
// @todo: Does it make sense to apply the Date create filters to the single entry? |
|
880
|
880
|
|
|
881
|
881
|
// field_filters |
|
882
|
|
- if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) { |
|
|
882
|
+ if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) { |
|
883
|
883
|
gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) ); |
|
884
|
884
|
return $entry; |
|
885
|
885
|
} |
|
886
|
886
|
|
|
887
|
|
- $filters = $search_criteria['field_filters']; |
|
|
887
|
+ $filters = $search_criteria[ 'field_filters' ]; |
|
888
|
888
|
|
|
889
|
|
- $mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all'; |
|
|
889
|
+ $mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all'; |
|
890
|
890
|
|
|
891
|
|
- $mode = $mode ? : 'all'; // If mode is an empty string, assume it's 'all' |
|
|
891
|
+ $mode = $mode ?: 'all'; // If mode is an empty string, assume it's 'all' |
|
892
|
892
|
|
|
893
|
893
|
// Prevent the mode from being processed below |
|
894
|
|
- unset( $filters['mode'] ); |
|
|
894
|
+ unset( $filters[ 'mode' ] ); |
|
895
|
895
|
|
|
896
|
|
- $form = self::get_form( $entry['form_id'] ); |
|
|
896
|
+ $form = self::get_form( $entry[ 'form_id' ] ); |
|
897
|
897
|
|
|
898
|
898
|
foreach ( $filters as $filter ) { |
|
899
|
|
- $operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is'; |
|
|
899
|
+ $operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is'; |
|
900
|
900
|
|
|
901
|
|
- if ( ! isset( $filter['key'] ) ) { |
|
|
901
|
+ if ( ! isset( $filter[ 'key' ] ) ) { |
|
902
|
902
|
gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set, any field mode', array( 'filter' => $filter ) ); |
|
903
|
903
|
/** |
|
904
|
904
|
* This is a cross-field search. Let's start digging'. |
|
905
|
905
|
*/ |
|
906
|
906
|
foreach ( \GV\Utils::get( $form, 'fields', array() ) as $field ) { |
|
907
|
907
|
$field_value = GFFormsModel::get_lead_field_value( $entry, $field ); |
|
908
|
|
- if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field ) ) { |
|
909
|
|
- if ( 'any' === $mode) { |
|
|
908
|
+ if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field ) ) { |
|
|
909
|
+ if ( 'any' === $mode ) { |
|
910
|
910
|
return $entry; // All good here |
|
911
|
911
|
} // mode === 'all' |
|
912
|
912
|
continue 2; // Next filter |
|
@@ -915,13 +915,13 @@ discard block |
|
|
block discarded – undo |
|
915
|
915
|
} |
|
916
|
916
|
|
|
917
|
917
|
if ( 'all' === $mode ) { |
|
918
|
|
- return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter ); |
|
|
918
|
+ return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter ); |
|
919
|
919
|
} |
|
920
|
920
|
|
|
921
|
921
|
continue; |
|
922
|
922
|
} |
|
923
|
923
|
|
|
924
|
|
- $k = $filter['key']; |
|
|
924
|
+ $k = $filter[ 'key' ]; |
|
925
|
925
|
|
|
926
|
926
|
$field = self::get_field( $form, $k ); |
|
927
|
927
|
|
|
@@ -929,12 +929,12 @@ discard block |
|
|
block discarded – undo |
|
929
|
929
|
$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null; |
|
930
|
930
|
$field = $k; |
|
931
|
931
|
} else { |
|
932
|
|
- $field_value = GFFormsModel::get_lead_field_value( $entry, $field ); |
|
|
932
|
+ $field_value = GFFormsModel::get_lead_field_value( $entry, $field ); |
|
933
|
933
|
// If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it |
|
934
|
934
|
$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value; |
|
935
|
935
|
} |
|
936
|
936
|
|
|
937
|
|
- $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field ); |
|
|
937
|
+ $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field ); |
|
938
|
938
|
|
|
939
|
939
|
// Any match is all we need to know |
|
940
|
940
|
if ( $is_value_match && 'any' === $mode ) { |
|
@@ -943,7 +943,7 @@ discard block |
|
|
block discarded – undo |
|
943
|
943
|
|
|
944
|
944
|
// Any failed match is a total fail |
|
945
|
945
|
if ( ! $is_value_match && 'all' === $mode ) { |
|
946
|
|
- return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter ); |
|
|
946
|
+ return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter ); |
|
947
|
947
|
} |
|
948
|
948
|
} |
|
949
|
949
|
|
|
@@ -953,7 +953,7 @@ discard block |
|
|
block discarded – undo |
|
953
|
953
|
gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' ); |
|
954
|
954
|
return $entry; |
|
955
|
955
|
} else { |
|
956
|
|
- return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters ); |
|
|
956
|
+ return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters ); |
|
957
|
957
|
} |
|
958
|
958
|
|
|
959
|
959
|
} |
|
@@ -994,18 +994,18 @@ discard block |
|
|
block discarded – undo |
|
994
|
994
|
* Gravity Forms code to adjust date to locally-configured Time Zone |
|
995
|
995
|
* @see GFCommon::format_date() for original code |
|
996
|
996
|
*/ |
|
997
|
|
- $date_gmt_time = mysql2date( 'G', $date_string ); |
|
|
997
|
+ $date_gmt_time = mysql2date( 'G', $date_string ); |
|
998
|
998
|
$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time ); |
|
999
|
999
|
|
|
1000
|
|
- $format = \GV\Utils::get( $atts, 'format' ); |
|
1001
|
|
- $is_human = ! empty( $atts['human'] ); |
|
1002
|
|
- $is_diff = ! empty( $atts['diff'] ); |
|
1003
|
|
- $is_raw = ! empty( $atts['raw'] ); |
|
1004
|
|
- $is_timestamp = ! empty( $atts['timestamp'] ); |
|
1005
|
|
- $include_time = ! empty( $atts['time'] ); |
|
|
1000
|
+ $format = \GV\Utils::get( $atts, 'format' ); |
|
|
1001
|
+ $is_human = ! empty( $atts[ 'human' ] ); |
|
|
1002
|
+ $is_diff = ! empty( $atts[ 'diff' ] ); |
|
|
1003
|
+ $is_raw = ! empty( $atts[ 'raw' ] ); |
|
|
1004
|
+ $is_timestamp = ! empty( $atts[ 'timestamp' ] ); |
|
|
1005
|
+ $include_time = ! empty( $atts[ 'time' ] ); |
|
1006
|
1006
|
|
|
1007
|
1007
|
// If we're using time diff, we want to have a different default format |
|
1008
|
|
- if( empty( $format ) ) { |
|
|
1008
|
+ if ( empty( $format ) ) { |
|
1009
|
1009
|
/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */ |
|
1010
|
1010
|
$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' ); |
|
1011
|
1011
|
} |
|
@@ -1013,7 +1013,7 @@ discard block |
|
|
block discarded – undo |
|
1013
|
1013
|
// If raw was specified, don't modify the stored value |
|
1014
|
1014
|
if ( $is_raw ) { |
|
1015
|
1015
|
$formatted_date = $date_string; |
|
1016
|
|
- } elseif( $is_timestamp ) { |
|
|
1016
|
+ } elseif ( $is_timestamp ) { |
|
1017
|
1017
|
$formatted_date = $date_local_timestamp; |
|
1018
|
1018
|
} elseif ( $is_diff ) { |
|
1019
|
1019
|
$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) ); |
|
@@ -1047,7 +1047,7 @@ discard block |
|
|
block discarded – undo |
|
1047
|
1047
|
|
|
1048
|
1048
|
$label = \GV\Utils::get( $field, 'label' ); |
|
1049
|
1049
|
|
|
1050
|
|
- if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
|
1050
|
+ if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
1051
|
1051
|
$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id ); |
|
1052
|
1052
|
} |
|
1053
|
1053
|
|
|
@@ -1075,7 +1075,7 @@ discard block |
|
|
block discarded – undo |
|
1075
|
1075
|
$form = GFAPI::get_form( $form ); |
|
1076
|
1076
|
} |
|
1077
|
1077
|
|
|
1078
|
|
- if ( class_exists( 'GFFormsModel' ) ){ |
|
|
1078
|
+ if ( class_exists( 'GFFormsModel' ) ) { |
|
1079
|
1079
|
return GFFormsModel::get_field( $form, $field_id ); |
|
1080
|
1080
|
} else { |
|
1081
|
1081
|
return null; |
|
@@ -1122,19 +1122,19 @@ discard block |
|
|
block discarded – undo |
|
1122
|
1122
|
$shortcodes = array(); |
|
1123
|
1123
|
|
|
1124
|
1124
|
preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); |
|
1125
|
|
- if ( empty( $matches ) ){ |
|
|
1125
|
+ if ( empty( $matches ) ) { |
|
1126
|
1126
|
return false; |
|
1127
|
1127
|
} |
|
1128
|
1128
|
|
|
1129
|
1129
|
foreach ( $matches as $shortcode ) { |
|
1130
|
|
- if ( $tag === $shortcode[2] ) { |
|
|
1130
|
+ if ( $tag === $shortcode[ 2 ] ) { |
|
1131
|
1131
|
|
|
1132
|
1132
|
// Changed this to $shortcode instead of true so we get the parsed atts. |
|
1133
|
|
- $shortcodes[] = $shortcode; |
|
|
1133
|
+ $shortcodes[ ] = $shortcode; |
|
1134
|
1134
|
|
|
1135
|
|
- } else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) { |
|
1136
|
|
- foreach( $results as $result ) { |
|
1137
|
|
- $shortcodes[] = $result; |
|
|
1135
|
+ } else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) { |
|
|
1136
|
+ foreach ( $results as $result ) { |
|
|
1137
|
+ $shortcodes[ ] = $result; |
|
1138
|
1138
|
} |
|
1139
|
1139
|
} |
|
1140
|
1140
|
} |
|
@@ -1166,7 +1166,7 @@ discard block |
|
|
block discarded – undo |
|
1166
|
1166
|
'post_type' => 'gravityview', |
|
1167
|
1167
|
'posts_per_page' => 100, |
|
1168
|
1168
|
'meta_key' => '_gravityview_form_id', |
|
1169
|
|
- 'meta_value' => (int) $form_id, |
|
|
1169
|
+ 'meta_value' => (int)$form_id, |
|
1170
|
1170
|
); |
|
1171
|
1171
|
$args = wp_parse_args( $args, $defaults ); |
|
1172
|
1172
|
$views = get_posts( $args ); |
|
@@ -1178,21 +1178,21 @@ discard block |
|
|
block discarded – undo |
|
1178
|
1178
|
|
|
1179
|
1179
|
$data = unserialize( $view->meta_value ); |
|
1180
|
1180
|
|
|
1181
|
|
- if( ! $data || ! is_array( $data ) ) { |
|
|
1181
|
+ if ( ! $data || ! is_array( $data ) ) { |
|
1182
|
1182
|
continue; |
|
1183
|
1183
|
} |
|
1184
|
1184
|
|
|
1185
|
1185
|
foreach ( $data as $datum ) { |
|
1186
|
|
- if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) { |
|
1187
|
|
- $joined_forms[] = $view->post_id; |
|
|
1186
|
+ if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) { |
|
|
1187
|
+ $joined_forms[ ] = $view->post_id; |
|
1188
|
1188
|
} |
|
1189
|
1189
|
} |
|
1190
|
1190
|
} |
|
1191
|
1191
|
|
|
1192
|
1192
|
if ( $joined_forms ) { |
|
1193
|
|
- $joined_args = array( |
|
|
1193
|
+ $joined_args = array( |
|
1194
|
1194
|
'post_type' => 'gravityview', |
|
1195
|
|
- 'posts_per_page' => $args['posts_per_page'], |
|
|
1195
|
+ 'posts_per_page' => $args[ 'posts_per_page' ], |
|
1196
|
1196
|
'post__in' => $joined_forms, |
|
1197
|
1197
|
); |
|
1198
|
1198
|
$views = array_merge( $views, get_posts( $joined_args ) ); |
|
@@ -1348,7 +1348,7 @@ discard block |
|
|
block discarded – undo |
|
1348
|
1348
|
|
|
1349
|
1349
|
$directory_widgets = wp_parse_args( $view_widgets, $defaults ); |
|
1350
|
1350
|
|
|
1351
|
|
- if( $json_decode ) { |
|
|
1351
|
+ if ( $json_decode ) { |
|
1352
|
1352
|
$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' ); |
|
1353
|
1353
|
} |
|
1354
|
1354
|
|
|
@@ -1364,7 +1364,7 @@ discard block |
|
|
block discarded – undo |
|
1364
|
1364
|
* @return string html |
|
1365
|
1365
|
*/ |
|
1366
|
1366
|
public static function get_sortable_fields( $formid, $current = '' ) { |
|
1367
|
|
- $output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>'; |
|
|
1367
|
+ $output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>'; |
|
1368
|
1368
|
|
|
1369
|
1369
|
if ( empty( $formid ) ) { |
|
1370
|
1370
|
return $output; |
|
@@ -1377,11 +1377,11 @@ discard block |
|
|
block discarded – undo |
|
1377
|
1377
|
$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null ); |
|
1378
|
1378
|
|
|
1379
|
1379
|
foreach ( $fields as $id => $field ) { |
|
1380
|
|
- if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
|
1380
|
+ if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
1381
|
1381
|
continue; |
|
1382
|
1382
|
} |
|
1383
|
1383
|
|
|
1384
|
|
- $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>'; |
|
|
1384
|
+ $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>'; |
|
1385
|
1385
|
} |
|
1386
|
1386
|
} |
|
1387
|
1387
|
|
|
@@ -1416,9 +1416,9 @@ discard block |
|
|
block discarded – undo |
|
1416
|
1416
|
$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
|
1417
|
1417
|
|
|
1418
|
1418
|
// TODO: Convert to using array_filter |
|
1419
|
|
- foreach( $fields as $id => $field ) { |
|
|
1419
|
+ foreach ( $fields as $id => $field ) { |
|
1420
|
1420
|
|
|
1421
|
|
- if( in_array( $field['type'], $blacklist_field_types ) ) { |
|
|
1421
|
+ if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
1422
|
1422
|
unset( $fields[ $id ] ); |
|
1423
|
1423
|
} |
|
1424
|
1424
|
} |
|
@@ -1459,14 +1459,14 @@ discard block |
|
|
block discarded – undo |
|
1459
|
1459
|
* @param int|array $field field key or field array |
|
1460
|
1460
|
* @return boolean |
|
1461
|
1461
|
*/ |
|
1462
|
|
- public static function is_field_numeric( $form = null, $field = '' ) { |
|
|
1462
|
+ public static function is_field_numeric( $form = null, $field = '' ) { |
|
1463
|
1463
|
|
|
1464
|
1464
|
if ( ! is_array( $form ) && ! is_array( $field ) ) { |
|
1465
|
1465
|
$form = self::get_form( $form ); |
|
1466
|
1466
|
} |
|
1467
|
1467
|
|
|
1468
|
1468
|
// If entry meta, it's a string. Otherwise, numeric |
|
1469
|
|
- if( ! is_numeric( $field ) && is_string( $field ) ) { |
|
|
1469
|
+ if ( ! is_numeric( $field ) && is_string( $field ) ) { |
|
1470
|
1470
|
$type = $field; |
|
1471
|
1471
|
} else { |
|
1472
|
1472
|
$type = self::get_field_type( $form, $field ); |
|
@@ -1480,9 +1480,9 @@ discard block |
|
|
block discarded – undo |
|
1480
|
1480
|
$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) ); |
|
1481
|
1481
|
|
|
1482
|
1482
|
// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true |
|
1483
|
|
- if( $gv_field = GravityView_Fields::get( $type ) ) { |
|
1484
|
|
- if( true === $gv_field->is_numeric ) { |
|
1485
|
|
- $numeric_types[] = $gv_field->is_numeric; |
|
|
1483
|
+ if ( $gv_field = GravityView_Fields::get( $type ) ) { |
|
|
1484
|
+ if ( true === $gv_field->is_numeric ) { |
|
|
1485
|
+ $numeric_types[ ] = $gv_field->is_numeric; |
|
1486
|
1486
|
} |
|
1487
|
1487
|
} |
|
1488
|
1488
|
|
|
@@ -1632,18 +1632,18 @@ discard block |
|
|
block discarded – undo |
|
1632
|
1632
|
$final_atts = array_filter( $final_atts ); |
|
1633
|
1633
|
|
|
1634
|
1634
|
// If the href wasn't passed as an attribute, use the value passed to the function |
|
1635
|
|
- if ( empty( $final_atts['href'] ) && ! empty( $href ) ) { |
|
1636
|
|
- $final_atts['href'] = $href; |
|
|
1635
|
+ if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) { |
|
|
1636
|
+ $final_atts[ 'href' ] = $href; |
|
1637
|
1637
|
} |
|
1638
|
1638
|
|
|
1639
|
|
- $final_atts['href'] = esc_url_raw( $href ); |
|
|
1639
|
+ $final_atts[ 'href' ] = esc_url_raw( $href ); |
|
1640
|
1640
|
|
|
1641
|
1641
|
/** |
|
1642
|
1642
|
* Fix potential security issue with target=_blank |
|
1643
|
1643
|
* @see https://dev.to/ben/the-targetblank-vulnerability-by-example |
|
1644
|
1644
|
*/ |
|
1645
|
|
- if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
1646
|
|
- $final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
|
1645
|
+ if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
|
1646
|
+ $final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
1647
|
1647
|
} |
|
1648
|
1648
|
|
|
1649
|
1649
|
// Sort the attributes alphabetically, to help testing |
|
@@ -1655,7 +1655,7 @@ discard block |
|
|
block discarded – undo |
|
1655
|
1655
|
$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) ); |
|
1656
|
1656
|
} |
|
1657
|
1657
|
|
|
1658
|
|
- if( '' !== $output ) { |
|
|
1658
|
+ if ( '' !== $output ) { |
|
1659
|
1659
|
$output = '<a' . $output . '>' . $anchor_text . '</a>'; |
|
1660
|
1660
|
} |
|
1661
|
1661
|
|
|
@@ -1682,7 +1682,7 @@ discard block |
|
|
block discarded – undo |
|
1682
|
1682
|
if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
|
1683
|
1683
|
$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
|
1684
|
1684
|
} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) { |
|
1685
|
|
- $merged[] = $value; |
|
|
1685
|
+ $merged[ ] = $value; |
|
1686
|
1686
|
} else { |
|
1687
|
1687
|
$merged[ $key ] = $value; |
|
1688
|
1688
|
} |
|
@@ -1715,7 +1715,7 @@ discard block |
|
|
block discarded – undo |
|
1715
|
1715
|
* `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..) |
|
1716
|
1716
|
* @param array $settings Settings array, with `number` key defining the # of users to display |
|
1717
|
1717
|
*/ |
|
1718
|
|
- $get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
|
1718
|
+ $get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
1719
|
1719
|
|
|
1720
|
1720
|
return get_users( $get_users_settings ); |
|
1721
|
1721
|
} |
|
@@ -1735,11 +1735,11 @@ discard block |
|
|
block discarded – undo |
|
1735
|
1735
|
public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
1736
|
1736
|
|
|
1737
|
1737
|
// If $cap is defined, only show notice if user has capability |
|
1738
|
|
- if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
|
1738
|
+ if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
1739
|
1739
|
return ''; |
|
1740
|
1740
|
} |
|
1741
|
1741
|
|
|
1742
|
|
- return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
|
1742
|
+ return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>'; |
|
1743
|
1743
|
} |
|
1744
|
1744
|
|
|
1745
|
1745
|
/** |