@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function renderTaxonomyFilter() |
37 | 37 | { |
38 | - if( !is_object_in_taxonomy( get_current_screen()->post_type, Application::TAXONOMY ))return; |
|
38 | + if( !is_object_in_taxonomy( get_current_screen()->post_type, Application::TAXONOMY ) )return; |
|
39 | 39 | glsr( Html::class )->render()->label( __( 'Filter by category', 'site-reviews' ), [ |
40 | 40 | 'class' => 'screen-reader-text', |
41 | 41 | 'for' => Application::TAXONOMY, |
42 | - ]); |
|
43 | - wp_dropdown_categories([ |
|
42 | + ] ); |
|
43 | + wp_dropdown_categories( [ |
|
44 | 44 | 'depth' => 3, |
45 | 45 | 'hide_empty' => true, |
46 | 46 | 'hide_if_empty' => true, |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | 'show_option_all' => $this->getShowOptionAll(), |
53 | 53 | 'taxonomy' => Application::TAXONOMY, |
54 | 54 | 'value_field' => 'slug', |
55 | - ]); |
|
55 | + ] ); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | protected function getSelected() |
62 | 62 | { |
63 | 63 | global $wp_query; |
64 | - return isset( $wp_query->query[Application::TAXONOMY] ) |
|
64 | + return isset($wp_query->query[Application::TAXONOMY]) |
|
65 | 65 | ? $wp_query->query[Application::TAXONOMY] |
66 | 66 | : ''; |
67 | 67 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | $taxonomy = get_taxonomy( Application::TAXONOMY ); |
75 | 75 | return $taxonomy |
76 | - ? ucfirst( strtolower( $taxonomy->labels->all_items )) |
|
76 | + ? ucfirst( strtolower( $taxonomy->labels->all_items ) ) |
|
77 | 77 | : ''; |
78 | 78 | } |
79 | 79 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | if( $assignedPost instanceof WP_Post && $assignedPost->post_status == 'publish' ) { |
23 | 23 | $column = glsr( Builder::class )->a( get_the_title( $assignedPost->ID ), [ |
24 | 24 | 'href' => (string)get_the_permalink( $assignedPost->ID ), |
25 | - ]); |
|
25 | + ] ); |
|
26 | 26 | } |
27 | 27 | return $column; |
28 | 28 | } |
@@ -36,10 +36,10 @@ discard block |
||
36 | 36 | $pinned = glsr( Database::class )->getReviewMeta( $postId )->pinned |
37 | 37 | ? 'pinned ' |
38 | 38 | : ''; |
39 | - return glsr( Builder::class )->i([ |
|
39 | + return glsr( Builder::class )->i( [ |
|
40 | 40 | 'class' => $pinned.'dashicons dashicons-sticky', |
41 | 41 | 'data-id' => $postId, |
42 | - ]); |
|
42 | + ] ); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | { |
61 | 61 | return glsr( Html::class )->buildPartial( 'star-rating', [ |
62 | 62 | 'rating' => glsr( Database::class )->getReviewMeta( $postId )->rating, |
63 | - ]); |
|
63 | + ] ); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | public function buildColumnType( $postId ) |
71 | 71 | { |
72 | 72 | $reviewMeta = glsr( Database::class )->getReviewMeta( $postId ); |
73 | - return isset( glsr()->reviewTypes[$reviewMeta->review_type] ) |
|
73 | + return isset(glsr()->reviewTypes[$reviewMeta->review_type]) |
|
74 | 74 | ? glsr()->reviewTypes[$reviewMeta->review_type] |
75 | 75 | : $reviewMeta->review_type; |
76 | 76 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | public function renderFilters( $postType ) |
83 | 83 | { |
84 | 84 | if( $postType !== Application::POST_TYPE )return; |
85 | - if( !( $status = filter_input( INPUT_GET, 'post_status' ))) { |
|
85 | + if( !($status = filter_input( INPUT_GET, 'post_status' )) ) { |
|
86 | 86 | $status = 'publish'; |
87 | 87 | } |
88 | 88 | $ratings = glsr( Database::class )->getReviewsMeta( 'rating', $status ); |
@@ -111,8 +111,8 @@ discard block |
||
111 | 111 | */ |
112 | 112 | protected function renderFilterRatings( $ratings ) |
113 | 113 | { |
114 | - if( empty( $ratings ))return; |
|
115 | - $ratings = array_flip( array_reverse( $ratings )); |
|
114 | + if( empty($ratings) )return; |
|
115 | + $ratings = array_flip( array_reverse( $ratings ) ); |
|
116 | 116 | array_walk( $ratings, function( &$value, $key ) { |
117 | 117 | $label = _n( '%s star', '%s stars', $key, 'site-reviews' ); |
118 | 118 | $value = sprintf( $label, $key ); |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | echo glsr( Builder::class )->label( __( 'Filter by rating', 'site-reviews' ), [ |
121 | 121 | 'class' => 'screen-reader-text', |
122 | 122 | 'for' => 'rating', |
123 | - ]); |
|
124 | - echo glsr( Builder::class )->select([ |
|
123 | + ] ); |
|
124 | + echo glsr( Builder::class )->select( [ |
|
125 | 125 | 'name' => 'rating', |
126 | 126 | 'options' => ['' => __( 'All ratings', 'site-reviews' )] + $ratings, |
127 | 127 | 'value' => filter_input( INPUT_GET, 'rating' ), |
128 | - ]); |
|
128 | + ] ); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -138,11 +138,11 @@ discard block |
||
138 | 138 | echo glsr( Builder::class )->label( __( 'Filter by type', 'site-reviews' ), [ |
139 | 139 | 'class' => 'screen-reader-text', |
140 | 140 | 'for' => 'review_type', |
141 | - ]); |
|
142 | - echo glsr( Builder::class )->select([ |
|
141 | + ] ); |
|
142 | + echo glsr( Builder::class )->select( [ |
|
143 | 143 | 'name' => 'review_type', |
144 | 144 | 'options' => ['' => __( 'All types', 'site-reviews' )] + glsr()->reviewTypes, |
145 | 145 | 'value' => filter_input( INPUT_GET, 'review_type' ), |
146 | - ]); |
|
146 | + ] ); |
|
147 | 147 | } |
148 | 148 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | 'savePending' => __( 'Save as Unapproved', 'site-reviews' ), |
18 | 18 | 'published' => __( 'Approved', 'site-reviews' ), |
19 | 19 | ]; |
20 | - if( $this->canModifyTranslation() && isset( $wp_scripts->registered['post']->extra['data'] )) { |
|
20 | + if( $this->canModifyTranslation() && isset($wp_scripts->registered['post']->extra['data']) ) { |
|
21 | 21 | $l10n = &$wp_scripts->registered['post']->extra['data']; |
22 | 22 | foreach( $strings as $search => $replace ) { |
23 | 23 | $l10n = preg_replace( '/("'.$search.'":")([^"]+)/', "$1".$replace, $l10n ); |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function filterPostStatusLabels( $translation, $text, $domain ) |
35 | 35 | { |
36 | - if( $this->canModifyTranslation( $domain )) { |
|
36 | + if( $this->canModifyTranslation( $domain ) ) { |
|
37 | 37 | $replacements = $this->getStatusLabels(); |
38 | - if( array_key_exists( $text, $replacements )) { |
|
38 | + if( array_key_exists( $text, $replacements ) ) { |
|
39 | 39 | $translation = $replacements[$text]; |
40 | 40 | } |
41 | 41 | } |
@@ -48,14 +48,14 @@ discard block |
||
48 | 48 | public function filterUpdateMessages( array $messages ) |
49 | 49 | { |
50 | 50 | $post = get_post(); |
51 | - if( !( $post instanceof WP_Post ))return; |
|
51 | + if( !($post instanceof WP_Post) )return; |
|
52 | 52 | $strings = $this->getReviewLabels(); |
53 | 53 | $restored = filter_input( INPUT_GET, 'revision' ); |
54 | - if( $revisionTitle = wp_post_revision_title( intval( $restored ), false )) { |
|
54 | + if( $revisionTitle = wp_post_revision_title( intval( $restored ), false ) ) { |
|
55 | 55 | $restored = sprintf( $strings['restored'], $revisionTitle ); |
56 | 56 | } |
57 | - $scheduled_date = date_i18n( 'M j, Y @ H:i', strtotime( $post->post_date )); |
|
58 | - $messages[ Application::POST_TYPE ] = [ |
|
57 | + $scheduled_date = date_i18n( 'M j, Y @ H:i', strtotime( $post->post_date ) ); |
|
58 | + $messages[Application::POST_TYPE] = [ |
|
59 | 59 | 1 => $strings['updated'], |
60 | 60 | 4 => $strings['updated'], |
61 | 61 | 5 => $restored, |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | protected function canModifyTranslation( $domain = 'default' ) |
79 | 79 | { |
80 | - if( $domain != 'default' || empty( glsr_current_screen()->base )) { |
|
80 | + if( $domain != 'default' || empty(glsr_current_screen()->base) ) { |
|
81 | 81 | return false; |
82 | 82 | } |
83 | 83 | return get_current_screen()->post_type == Application::POST_TYPE |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | protected function getStatusLabels() |
113 | 113 | { |
114 | 114 | static $labels; |
115 | - if( empty( $labels )) { |
|
115 | + if( empty($labels) ) { |
|
116 | 116 | $labels = [ |
117 | 117 | 'Pending' => __( 'Unapproved', 'site-reviews' ), |
118 | 118 | 'Pending Review' => __( 'Unapproved', 'site-reviews' ), |
@@ -57,7 +57,7 @@ |
||
57 | 57 | */ |
58 | 58 | protected function isReviewEditable() |
59 | 59 | { |
60 | - $postId = intval( filter_input( INPUT_GET, 'post' )); |
|
60 | + $postId = intval( filter_input( INPUT_GET, 'post' ) ); |
|
61 | 61 | return $postId > 0 |
62 | 62 | && get_post_meta( $postId, 'review_type', true ) == 'local' |
63 | 63 | && $this->isReviewEditor(); |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | return $input; |
22 | 22 | } |
23 | 23 | $triggered = true; |
24 | - if( !is_array( $input )) { |
|
24 | + if( !is_array( $input ) ) { |
|
25 | 25 | $input = ['settings' => []]; |
26 | 26 | } |
27 | 27 | if( key( $input ) == 'settings' ) { |
28 | - glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' )); |
|
28 | + glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) ); |
|
29 | 29 | } |
30 | 30 | $options = array_replace_recursive( glsr( OptionManager::class )->all(), $input ); |
31 | 31 | $options = $this->sanitizeGeneral( $input, $options ); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [ |
44 | 44 | 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
45 | - ]); |
|
45 | + ] ); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | protected function sanitizeSubmissions( array $input, array $options ) |
63 | 63 | { |
64 | 64 | $inputForm = $input['settings']['submissions']; |
65 | - $options['settings']['submissions']['required'] = isset( $inputForm['required'] ) |
|
65 | + $options['settings']['submissions']['required'] = isset($inputForm['required']) |
|
66 | 66 | ? $inputForm['required'] |
67 | 67 | : []; |
68 | 68 | return $options; |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | */ |
74 | 74 | protected function sanitizeTranslations( array $input, array $options ) |
75 | 75 | { |
76 | - if( isset( $input['settings']['strings'] )) { |
|
77 | - $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] )); |
|
76 | + if( isset($input['settings']['strings']) ) { |
|
77 | + $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) ); |
|
78 | 78 | array_walk( $options['settings']['strings'], function( &$string ) { |
79 | - if( isset( $string['s2'] )) { |
|
79 | + if( isset($string['s2']) ) { |
|
80 | 80 | $string['s2'] = wp_strip_all_tags( $string['s2'] ); |
81 | 81 | } |
82 | - if( isset( $string['p2'] )) { |
|
82 | + if( isset($string['p2']) ) { |
|
83 | 83 | $string['p2'] = wp_strip_all_tags( $string['p2'] ); |
84 | 84 | } |
85 | 85 | }); |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | public function registerPostType() |
20 | 20 | { |
21 | 21 | if( !glsr()->hasPermission() )return; |
22 | - $command = new RegisterPostType([ |
|
22 | + $command = new RegisterPostType( [ |
|
23 | 23 | 'capabilities'=> ['create_posts' => 'create_'.Application::POST_TYPE], |
24 | 24 | 'columns' => [ |
25 | 25 | 'title' => '', |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'plural' => __( 'Reviews', 'site-reviews' ), |
38 | 38 | 'post_type' => Application::POST_TYPE, |
39 | 39 | 'single' => __( 'Review', 'site-reviews' ), |
40 | - ]); |
|
40 | + ] ); |
|
41 | 41 | $this->execute( $command ); |
42 | 42 | } |
43 | 43 | |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function registerShortcodes() |
49 | 49 | { |
50 | - $command = new RegisterShortcodes([ |
|
50 | + $command = new RegisterShortcodes( [ |
|
51 | 51 | 'site_reviews', |
52 | 52 | 'site_reviews_form', |
53 | 53 | 'site_reviews_summary', |
54 | - ]); |
|
54 | + ] ); |
|
55 | 55 | $this->execute( $command ); |
56 | 56 | } |
57 | 57 | |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | */ |
62 | 62 | public function registerTaxonomy() |
63 | 63 | { |
64 | - $command = new RegisterTaxonomy([ |
|
64 | + $command = new RegisterTaxonomy( [ |
|
65 | 65 | 'hierarchical' => true, |
66 | 66 | 'meta_box_cb' => [glsr( EditorController::class ), 'renderTaxonomyMetabox'], |
67 | 67 | 'public' => false, |
68 | 68 | 'show_admin_column' => true, |
69 | 69 | 'show_ui' => true, |
70 | - ]); |
|
70 | + ] ); |
|
71 | 71 | $this->execute( $command ); |
72 | 72 | } |
73 | 73 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | public function registerWidgets() |
79 | 79 | { |
80 | - $command = new RegisterWidgets([ |
|
80 | + $command = new RegisterWidgets( [ |
|
81 | 81 | 'site-reviews' => [ |
82 | 82 | 'class' => 'glsr-widget glsr-widget-site-reviews', |
83 | 83 | 'description' => __( 'Your site’s most recent reviews.', 'site-reviews' ), |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | 'description' => __( 'A summary of your site’s reviews.', 'site-reviews' ), |
94 | 94 | 'title' => __( 'Summary of Reviews', 'site-reviews' ), |
95 | 95 | ], |
96 | - ]); |
|
96 | + ] ); |
|
97 | 97 | $this->execute( $command ); |
98 | 98 | } |
99 | 99 | } |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | { |
31 | 31 | foreach( $args as $key => $value ) { |
32 | 32 | $property = glsr( Helper::class )->buildPropertyName( $key ); |
33 | - if( !property_exists( $this, $property ))continue; |
|
33 | + if( !property_exists( $this, $property ) )continue; |
|
34 | 34 | $this->$property = $value; |
35 | - unset( $args[$key] ); |
|
35 | + unset($args[$key]); |
|
36 | 36 | } |
37 | 37 | $this->args = wp_parse_args( $args, [ |
38 | 38 | 'menu_name' => $this->plural, |
39 | - ]); |
|
39 | + ] ); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | 'singular_name' => $this->single, |
60 | 60 | 'uploaded_to_this_item' => sprintf( _x( 'Uploaded to this %s', 'Uploaded to this Post', 'site-reviews' ), $this->single ), |
61 | 61 | 'view_item' => sprintf( _x( 'View %s', 'View Post', 'site-reviews' ), $this->single ), |
62 | - ]); |
|
63 | - unset( $this->args['menu_name'] ); |
|
62 | + ] ); |
|
63 | + unset($this->args['menu_name']); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | protected function normalizeColumns() |
70 | 70 | { |
71 | 71 | $this->columns = ['cb' => ''] + $this->columns; |
72 | - if( array_key_exists( 'category', $this->columns )) { |
|
72 | + if( array_key_exists( 'category', $this->columns ) ) { |
|
73 | 73 | $keys = array_keys( $this->columns ); |
74 | 74 | $keys[array_search( 'category', $keys )] = 'taxonomy-'.Application::TAXONOMY; |
75 | 75 | $this->columns = array_combine( $keys, $this->columns ); |
76 | 76 | } |
77 | - if( array_key_exists( 'pinned', $this->columns )) { |
|
77 | + if( array_key_exists( 'pinned', $this->columns ) ) { |
|
78 | 78 | $this->columns['pinned'] = glsr( Builder::class )->span( '<span>'.$this->columns['pinned'].'</span>', |
79 | 79 | ['class' => 'pinned-icon'] |
80 | 80 | ); |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | { |
17 | 17 | $queries = []; |
18 | 18 | foreach( $keys as $key ) { |
19 | - if( !array_key_exists( $key, $values ))continue; |
|
19 | + if( !array_key_exists( $key, $values ) )continue; |
|
20 | 20 | $methodName = glsr( Helper::class )->buildMethodName( $key, __FUNCTION__ ); |
21 | - if( !method_exists( $this, $methodName ))continue; |
|
21 | + if( !method_exists( $this, $methodName ) )continue; |
|
22 | 22 | $query = call_user_func( [$this, $methodName], $values[$key] ); |
23 | - if( is_array( $query )) { |
|
23 | + if( is_array( $query ) ) { |
|
24 | 24 | $queries[] = $query; |
25 | 25 | } |
26 | 26 | } |
@@ -35,11 +35,11 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function buildSqlOr( $values, $sprintfFormat ) |
37 | 37 | { |
38 | - if( !is_array( $values )) { |
|
38 | + if( !is_array( $values ) ) { |
|
39 | 39 | $values = explode( ',', $values ); |
40 | 40 | } |
41 | - $values = array_filter( array_map( 'trim', (array)$values )); |
|
42 | - $values = array_map( function( $value ) use( $sprintfFormat ) { |
|
41 | + $values = array_filter( array_map( 'trim', (array)$values ) ); |
|
42 | + $values = array_map( function( $value ) use($sprintfFormat) { |
|
43 | 43 | return sprintf( $sprintfFormat, $value ); |
44 | 44 | }, $values ); |
45 | 45 | return implode( ' OR ', $values ); |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function filterSearchByTitle( $search, WP_Query $query ) |
56 | 56 | { |
57 | - if( empty( $search ) || empty( $query->get( 'search_terms' ))) { |
|
57 | + if( empty($search) || empty($query->get( 'search_terms' )) ) { |
|
58 | 58 | return $search; |
59 | 59 | } |
60 | 60 | global $wpdb; |
61 | - $n = empty( $query->get( 'exact' )) |
|
61 | + $n = empty($query->get( 'exact' )) |
|
62 | 62 | ? '%' |
63 | 63 | : ''; |
64 | 64 | $search = []; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | ? Application::PAGED_QUERY_VAR |
83 | 83 | : 'page'; |
84 | 84 | return $isEnabled |
85 | - ? max( 1, intval( get_query_var( $pagedQuery ))) |
|
85 | + ? max( 1, intval( get_query_var( $pagedQuery ) ) ) |
|
86 | 86 | : 1; |
87 | 87 | } |
88 | 88 | |
@@ -92,11 +92,11 @@ discard block |
||
92 | 92 | */ |
93 | 93 | protected function buildQueryAssignedTo( $value ) |
94 | 94 | { |
95 | - if( empty( $value ))return; |
|
95 | + if( empty($value) )return; |
|
96 | 96 | return [ |
97 | 97 | 'compare' => 'IN', |
98 | 98 | 'key' => 'assigned_to', |
99 | - 'value' => array_filter( array_map( 'trim', explode( ',', $value )), 'is_numeric' ), |
|
99 | + 'value' => array_filter( array_map( 'trim', explode( ',', $value ) ), 'is_numeric' ), |
|
100 | 100 | ]; |
101 | 101 | } |
102 | 102 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | protected function buildQueryCategory( $value ) |
108 | 108 | { |
109 | - if( empty( $value ))return; |
|
109 | + if( empty($value) )return; |
|
110 | 110 | return [ |
111 | 111 | 'field' => 'term_id', |
112 | 112 | 'taxonomy' => Application::TAXONOMY, |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | protected function buildQueryRating( $value ) |
122 | 122 | { |
123 | - if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 )))return; |
|
123 | + if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 ) ) )return; |
|
124 | 124 | return [ |
125 | 125 | 'compare' => '>=', |
126 | 126 | 'key' => 'rating', |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | */ |
135 | 135 | protected function buildQueryType( $value ) |
136 | 136 | { |
137 | - if( in_array( $value, ['','all'] ))return; |
|
137 | + if( in_array( $value, ['', 'all'] ) )return; |
|
138 | 138 | return [ |
139 | 139 | 'key' => 'review_type', |
140 | 140 | 'value' => $value, |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $this->validateBlacklist(); |
62 | 62 | $this->validateAkismet(); |
63 | 63 | $this->validateRecaptcha(); |
64 | - if( !empty( $this->error )) { |
|
64 | + if( !empty($this->error) ) { |
|
65 | 65 | $this->setSessionValues( 'message', $this->error ); |
66 | 66 | } |
67 | 67 | return $this; |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ), |
87 | 87 | $this->getOption( 'settings.submissions.required', [] ) |
88 | 88 | ); |
89 | - $excluded = isset( $request['excluded'] ) |
|
89 | + $excluded = isset($request['excluded']) |
|
90 | 90 | ? (array)json_decode( $request['excluded'] ) |
91 | 91 | : []; |
92 | - return array_diff_key( $rules, array_flip( $excluded )); |
|
92 | + return array_diff_key( $rules, array_flip( $excluded ) ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -101,14 +101,14 @@ discard block |
||
101 | 101 | if( !$integration ) { |
102 | 102 | return true; |
103 | 103 | } |
104 | - if( empty( $this->request['recaptcha-token'] )) { |
|
104 | + if( empty($this->request['recaptcha-token']) ) { |
|
105 | 105 | return null; // @see $this->validateRecaptcha() |
106 | 106 | } |
107 | 107 | if( $integration == 'custom' ) { |
108 | 108 | return $this->isRecaptchaValid( $this->request['recaptcha-token'] ); |
109 | 109 | } |
110 | 110 | if( $integration == 'invisible-recaptcha' ) { |
111 | - return boolval( apply_filters( 'google_invre_is_valid_request_filter', true )); |
|
111 | + return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ) ); |
|
112 | 112 | } |
113 | 113 | return false; |
114 | 114 | } |
@@ -119,17 +119,17 @@ discard block |
||
119 | 119 | */ |
120 | 120 | protected function isRecaptchaValid( $recaptchaToken ) |
121 | 121 | { |
122 | - $endpoint = add_query_arg([ |
|
122 | + $endpoint = add_query_arg( [ |
|
123 | 123 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
124 | 124 | 'response' => $recaptchaToken, |
125 | 125 | 'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ), |
126 | 126 | ], static::RECAPTCHA_ENDPOINT ); |
127 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
127 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
128 | 128 | glsr_log()->error( $response->get_error_message() ); |
129 | 129 | return false; |
130 | 130 | } |
131 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
132 | - if( !empty( $response->success )) { |
|
131 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
132 | + if( !empty($response->success) ) { |
|
133 | 133 | return boolval( $response->success ); |
134 | 134 | } |
135 | 135 | $errorCodes = [ |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | { |
153 | 153 | $rules = $this->getValidationRules( $request ); |
154 | 154 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
155 | - if( empty( $errors )) { |
|
155 | + if( empty($errors) ) { |
|
156 | 156 | return true; |
157 | 157 | } |
158 | 158 | $this->setSessionValues( 'errors', $errors ); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
170 | 170 | { |
171 | 171 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
172 | - if( !empty( $loggedMessage )) { |
|
172 | + if( !empty($loggedMessage) ) { |
|
173 | 173 | glsr_log()->warning( $loggedMessage ); |
174 | 174 | glsr_log()->warning( $this->request ); |
175 | 175 | } |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | */ |
181 | 181 | protected function validateAkismet() |
182 | 182 | { |
183 | - if( !empty( $this->error ))return; |
|
184 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
183 | + if( !empty($this->error) )return; |
|
184 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
185 | 185 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
186 | 186 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
187 | 187 | } |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | */ |
192 | 192 | protected function validateBlacklist() |
193 | 193 | { |
194 | - if( !empty( $this->error ))return; |
|
195 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
194 | + if( !empty($this->error) )return; |
|
195 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
196 | 196 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
197 | 197 | if( $blacklistAction == 'reject' ) { |
198 | 198 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | */ |
208 | 208 | protected function validateCustom() |
209 | 209 | { |
210 | - if( !empty( $this->error ))return; |
|
210 | + if( !empty($this->error) )return; |
|
211 | 211 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
212 | 212 | if( $validated === true )return; |
213 | 213 | $this->setSessionValues( 'errors', [] ); |
@@ -222,8 +222,8 @@ discard block |
||
222 | 222 | */ |
223 | 223 | protected function validateHoneyPot() |
224 | 224 | { |
225 | - if( !empty( $this->error ))return; |
|
226 | - if( empty( $this->request['gotcha'] ))return; |
|
225 | + if( !empty($this->error) )return; |
|
226 | + if( empty($this->request['gotcha']) )return; |
|
227 | 227 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
228 | 228 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
229 | 229 | } |
@@ -233,9 +233,9 @@ discard block |
||
233 | 233 | */ |
234 | 234 | protected function validateRecaptcha() |
235 | 235 | { |
236 | - if( !empty( $this->error ))return; |
|
236 | + if( !empty($this->error) )return; |
|
237 | 237 | $isValid = $this->isRecaptchaResponseValid(); |
238 | - if( is_null( $isValid )) { |
|
238 | + if( is_null( $isValid ) ) { |
|
239 | 239 | $this->setSessionValues( 'recaptcha', true ); |
240 | 240 | $this->recaptchaIsUnset = true; |
241 | 241 | } |
@@ -251,11 +251,11 @@ discard block |
||
251 | 251 | */ |
252 | 252 | protected function validateRequest( array $request ) |
253 | 253 | { |
254 | - if( !$this->isRequestValid( $request )) { |
|
254 | + if( !$this->isRequestValid( $request ) ) { |
|
255 | 255 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
256 | 256 | return $request; |
257 | 257 | } |
258 | - if( empty( $request['title'] )) { |
|
258 | + if( empty($request['title']) ) { |
|
259 | 259 | $request['title'] = __( 'No Title', 'site-reviews' ); |
260 | 260 | } |
261 | 261 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |