@@ -23,11 +23,11 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function deleteAllSessions( $sessionCookiePrefix ) |
25 | 25 | { |
26 | - return $this->db->query(" |
|
26 | + return $this->db->query( " |
|
27 | 27 | DELETE |
28 | 28 | FROM {$this->db->options} |
29 | 29 | WHERE option_name LIKE '{$sessionCookiePrefix}_%' |
30 | - "); |
|
30 | + " ); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public function deleteExpiredSessions( $expiredSessions ) |
38 | 38 | { |
39 | - return $this->db->query(" |
|
39 | + return $this->db->query( " |
|
40 | 40 | DELETE |
41 | 41 | FROM {$this->db->options} |
42 | 42 | WHERE option_name IN ('{$expiredSessions}') |
43 | - "); |
|
43 | + " ); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -49,14 +49,14 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function getReviewCountsFor( $metaKey ) |
51 | 51 | { |
52 | - return (array) $this->db->get_results(" |
|
52 | + return (array)$this->db->get_results( " |
|
53 | 53 | SELECT m.meta_value AS name, COUNT(*) num_posts |
54 | 54 | FROM {$this->db->posts} AS p |
55 | 55 | INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id |
56 | 56 | WHERE p.post_type = '{$this->postType}' |
57 | 57 | AND m.meta_key = '{$metaKey}' |
58 | 58 | GROUP BY name |
59 | - "); |
|
59 | + " ); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -66,13 +66,13 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function getExpiredSessions( $sessionCookiePrefix, $limit ) |
68 | 68 | { |
69 | - return $this->db->get_results(" |
|
69 | + return $this->db->get_results( " |
|
70 | 70 | SELECT option_name AS name, option_value AS expiration |
71 | 71 | FROM {$this->db->options} |
72 | 72 | WHERE option_name LIKE '{$sessionCookiePrefix}_expires_%' |
73 | 73 | ORDER BY option_value ASC |
74 | 74 | LIMIT 0, {$limit} |
75 | - "); |
|
75 | + " ); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function getReviewCounts( $lastPostId = 0, $limit = 500 ) |
84 | 84 | { |
85 | - return $this->db->get_results(" |
|
85 | + return $this->db->get_results( " |
|
86 | 86 | SELECT p.ID, m1.meta_value AS rating, m2.meta_value AS type |
87 | 87 | FROM {$this->db->posts} AS p |
88 | 88 | INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id |
@@ -103,14 +103,14 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function getReviewPostId( $metaReviewId ) |
105 | 105 | { |
106 | - $postId = $this->db->get_var(" |
|
106 | + $postId = $this->db->get_var( " |
|
107 | 107 | SELECT p.ID |
108 | 108 | FROM {$this->db->posts} AS p |
109 | 109 | INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id |
110 | 110 | WHERE p.post_type = '{$this->postType}' |
111 | 111 | AND m.meta_key = 'review_id' |
112 | 112 | AND m.meta_value = '{$metaReviewId}' |
113 | - "); |
|
113 | + " ); |
|
114 | 114 | return intval( $postId ); |
115 | 115 | } |
116 | 116 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function getReviewIdsByType( $reviewType ) |
122 | 122 | { |
123 | - $query = $this->db->get_col(" |
|
123 | + $query = $this->db->get_col( " |
|
124 | 124 | SELECT m1.meta_value AS review_id |
125 | 125 | FROM {$this->db->posts} AS p |
126 | 126 | INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | AND m1.meta_key = 'review_id' |
130 | 130 | AND m2.meta_key = 'review_type' |
131 | 131 | AND m2.meta_value = '{$reviewType}' |
132 | - "); |
|
133 | - return array_keys( array_flip( $query )); |
|
132 | + " ); |
|
133 | + return array_keys( array_flip( $query ) ); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | */ |
142 | 142 | public function getReviewPostCounts( $postId, $lastPostId = 0, $limit = 500 ) |
143 | 143 | { |
144 | - return $this->db->get_results(" |
|
144 | + return $this->db->get_results( " |
|
145 | 145 | SELECT p.ID, m1.meta_value AS rating, m2.meta_value AS type |
146 | 146 | FROM {$this->db->posts} AS p |
147 | 147 | INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id |
@@ -167,9 +167,9 @@ discard block |
||
167 | 167 | public function getReviewRatingsFromIds( array $postIds, $greaterThanId = 0, $limit = 100 ) |
168 | 168 | { |
169 | 169 | sort( $postIds ); |
170 | - $postIds = array_slice( $postIds, intval( array_search( $greaterThanId, $postIds )), $limit ); |
|
170 | + $postIds = array_slice( $postIds, intval( array_search( $greaterThanId, $postIds ) ), $limit ); |
|
171 | 171 | $postIds = implode( ',', $postIds ); |
172 | - return $this->db->get_results(" |
|
172 | + return $this->db->get_results( " |
|
173 | 173 | SELECT p.ID, m.meta_value AS rating |
174 | 174 | FROM {$this->db->posts} AS p |
175 | 175 | INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $queryBuilder = glsr( QueryBuilder::class ); |
194 | 194 | $key = $queryBuilder->buildSqlOr( $key, "m.meta_key = '%s'" ); |
195 | 195 | $status = $queryBuilder->buildSqlOr( $status, "p.post_status = '%s'" ); |
196 | - return $this->db->get_col(" |
|
196 | + return $this->db->get_col( " |
|
197 | 197 | SELECT DISTINCT m.meta_value |
198 | 198 | FROM {$this->db->postmeta} m |
199 | 199 | LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | AND ({$key}) |
202 | 202 | AND ({$status}) |
203 | 203 | ORDER BY m.meta_value |
204 | - "); |
|
204 | + " ); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | */ |
213 | 213 | public function getReviewTermCounts( $termId, $lastPostId = 0, $limit = 500 ) |
214 | 214 | { |
215 | - return $this->db->get_results(" |
|
215 | + return $this->db->get_results( " |
|
216 | 216 | SELECT p.ID, m1.meta_value AS rating, m2.meta_value AS type |
217 | 217 | FROM {$this->db->posts} AS p |
218 | 218 | INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function saveAssignedToMetabox( $postId ) |
15 | 15 | { |
16 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ))return; |
|
17 | - $assignedTo = strval( glsr( Helper::class )->filterInput( 'assigned_to' )); |
|
16 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ) )return; |
|
17 | + $assignedTo = strval( glsr( Helper::class )->filterInput( 'assigned_to' ) ); |
|
18 | 18 | if( get_post_meta( $postId, 'assigned_to', true ) != $assignedTo ) { |
19 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
19 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
20 | 20 | glsr( CountsManager::class )->decreasePostCounts( $review ); |
21 | 21 | } |
22 | 22 | update_post_meta( $postId, 'assigned_to', $assignedTo ); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function saveResponseMetabox( $postId ) |
30 | 30 | { |
31 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ))return; |
|
32 | - $response = strval( glsr( Helper::class )->filterInput( 'response' )); |
|
31 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ) )return; |
|
32 | + $response = strval( glsr( Helper::class )->filterInput( 'response' ) ); |
|
33 | 33 | update_post_meta( $postId, 'response', trim( wp_kses( $response, [ |
34 | 34 | 'a' => ['href' => [], 'title' => []], |
35 | 35 | 'em' => [], |
36 | 36 | 'strong' => [], |
37 | - ]))); |
|
37 | + ] ) ) ); |
|
38 | 38 | } |
39 | 39 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public function download( $filename, $content ) |
17 | 17 | { |
18 | - if( !current_user_can( Application::CAPABILITY ))return; |
|
18 | + if( !current_user_can( Application::CAPABILITY ) )return; |
|
19 | 19 | nocache_headers(); |
20 | 20 | header( 'Content-Type: text/plain' ); |
21 | 21 | header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function execute( $command ) |
32 | 32 | { |
33 | - $handlerClass = str_replace( 'Commands', 'Handlers', get_class( $command )); |
|
34 | - if( !class_exists( $handlerClass )) { |
|
33 | + $handlerClass = str_replace( 'Commands', 'Handlers', get_class( $command ) ); |
|
34 | + if( !class_exists( $handlerClass ) ) { |
|
35 | 35 | throw new InvalidArgumentException( 'Handler '.$handlerClass.' not found.' ); |
36 | 36 | } |
37 | 37 | try { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | catch( Exception $e ) { |
41 | 41 | status_header( 400 ); |
42 | - glsr( Notice::class )->addError( new WP_Error( 'site_reviews_error', $e->getMessage() )); |
|
42 | + glsr( Notice::class )->addError( new WP_Error( 'site_reviews_error', $e->getMessage() ) ); |
|
43 | 43 | glsr_log()->error( $e->getMessage() ); |
44 | 44 | } |
45 | 45 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | protected function getPostId() |
51 | 51 | { |
52 | - return intval( filter_input( INPUT_GET, 'post' )); |
|
52 | + return intval( filter_input( INPUT_GET, 'post' ) ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | { |
50 | 50 | $average = array_sum( $ratingCounts ); |
51 | 51 | if( $average > 0 ) { |
52 | - $average = round( $this->getTotalSum( $ratingCounts ) / $average, intval( $roundBy )); |
|
52 | + $average = round( $this->getTotalSum( $ratingCounts ) / $average, intval( $roundBy ) ); |
|
53 | 53 | } |
54 | - return floatval( apply_filters( 'site-reviews/rating/average', $average, $ratingCounts )); |
|
54 | + return floatval( apply_filters( 'site-reviews/rating/average', $average, $ratingCounts ) ); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | $z = static::CONFIDENCE_LEVEL_Z_SCORES[$confidencePercentage]; |
74 | 74 | $phat = 1 * $upDownCounts[1] / $numRatings; |
75 | - return ( $phat + $z * $z / ( 2 * $numRatings ) - $z * sqrt(( $phat * ( 1 - $phat ) + $z * $z / ( 4 * $numRatings )) / $numRatings )) / ( 1 + $z * $z / $numRatings ); |
|
75 | + return ($phat + $z * $z / (2 * $numRatings) - $z * sqrt( ($phat * (1 - $phat) + $z * $z / (4 * $numRatings)) / $numRatings )) / (1 + $z * $z / $numRatings); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | { |
91 | 91 | $total = array_sum( $ratingCounts ); |
92 | 92 | foreach( $ratingCounts as $index => $count ) { |
93 | - if( empty( $count ))continue; |
|
93 | + if( empty($count) )continue; |
|
94 | 94 | $ratingCounts[$index] = $count / $total * 100; |
95 | 95 | } |
96 | 96 | return $this->getRoundedPercentages( $ratingCounts ); |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $this->getRankingUsingImdb( $ratingCounts ), |
106 | 106 | $ratingCounts, |
107 | 107 | $this |
108 | - )); |
|
108 | + ) ); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
@@ -123,12 +123,12 @@ discard block |
||
123 | 123 | $avgRating = $this->getAverage( $ratingCounts ); |
124 | 124 | // Represents a prior (your prior opinion without data) for the average star rating. A higher prior also means a higher margin for error. |
125 | 125 | // This could also be the average score of all items instead of a fixed value. |
126 | - $bayesMean = ( $confidencePercentage / 100 ) * static::MAX_RATING; // prior, 70% = 3.5 |
|
126 | + $bayesMean = ($confidencePercentage / 100) * static::MAX_RATING; // prior, 70% = 3.5 |
|
127 | 127 | // Represents the number of ratings expected to begin observing a pattern that would put confidence in the prior. |
128 | 128 | $bayesMinimal = 10; // confidence |
129 | 129 | $numOfReviews = array_sum( $ratingCounts ); |
130 | 130 | return $avgRating > 0 |
131 | - ? (( $bayesMinimal * $bayesMean ) + ( $avgRating * $numOfReviews )) / ( $bayesMinimal + $numOfReviews ) |
|
131 | + ? (($bayesMinimal * $bayesMean) + ($avgRating * $numOfReviews)) / ($bayesMinimal + $numOfReviews) |
|
132 | 132 | : 0; |
133 | 133 | } |
134 | 134 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $weight = $this->getWeight( $ratingCounts, $ratingCountsSum ); |
149 | 149 | $weightPow2 = $this->getWeight( $ratingCounts, $ratingCountsSum, true ); |
150 | 150 | $zScore = static::CONFIDENCE_LEVEL_Z_SCORES[$confidencePercentage]; |
151 | - return $weight - $zScore * sqrt(( $weightPow2 - pow( $weight, 2 )) / ( $ratingCountsSum + 1 )); |
|
151 | + return $weight - $zScore * sqrt( ($weightPow2 - pow( $weight, 2 )) / ($ratingCountsSum + 1) ); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -168,14 +168,14 @@ discard block |
||
168 | 168 | $remainders = array_column( $percentages, 'remainder' ); |
169 | 169 | array_multisort( $remainders, SORT_DESC, SORT_STRING, $indexes, SORT_DESC, $percentages ); |
170 | 170 | $i = 0; |
171 | - if( array_sum( array_column( $percentages, 'percent' )) > 0 ) { |
|
172 | - while( array_sum( array_column( $percentages, 'percent' )) < $totalPercent ) { |
|
171 | + if( array_sum( array_column( $percentages, 'percent' ) ) > 0 ) { |
|
172 | + while( array_sum( array_column( $percentages, 'percent' ) ) < $totalPercent ) { |
|
173 | 173 | $percentages[$i]['percent']++; |
174 | 174 | $i++; |
175 | 175 | } |
176 | 176 | } |
177 | 177 | array_multisort( $indexes, SORT_DESC, $percentages ); |
178 | - return array_combine( $indexes, array_column( $percentages, 'percent' )); |
|
178 | + return array_combine( $indexes, array_column( $percentages, 'percent' ) ); |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | /** |
@@ -183,8 +183,8 @@ discard block |
||
183 | 183 | */ |
184 | 184 | protected function getTotalSum( array $ratingCounts ) |
185 | 185 | { |
186 | - return array_reduce( array_keys( $ratingCounts ), function( $carry, $index ) use( $ratingCounts ) { |
|
187 | - return $carry + ( $index * $ratingCounts[$index] ); |
|
186 | + return array_reduce( array_keys( $ratingCounts ), function( $carry, $index ) use($ratingCounts) { |
|
187 | + return $carry + ($index * $ratingCounts[$index]); |
|
188 | 188 | }); |
189 | 189 | } |
190 | 190 | |
@@ -196,11 +196,11 @@ discard block |
||
196 | 196 | protected function getWeight( array $ratingCounts, $ratingCountsSum, $powerOf2 = false ) |
197 | 197 | { |
198 | 198 | return array_reduce( array_keys( $ratingCounts ), |
199 | - function( $count, $rating ) use( $ratingCounts, $ratingCountsSum, $powerOf2 ) { |
|
199 | + function( $count, $rating ) use($ratingCounts, $ratingCountsSum, $powerOf2) { |
|
200 | 200 | $ratingLevel = $powerOf2 |
201 | 201 | ? pow( $rating, 2 ) |
202 | 202 | : $rating; |
203 | - return $count + ( $ratingLevel * ( $ratingCounts[$rating] + 1 )) / $ratingCountsSum; |
|
203 | + return $count + ($ratingLevel * ($ratingCounts[$rating] + 1)) / $ratingCountsSum; |
|
204 | 204 | } |
205 | 205 | ); |
206 | 206 | } |
@@ -25,13 +25,13 @@ discard block |
||
25 | 25 | { |
26 | 26 | sort( $termIds ); |
27 | 27 | sort( $oldTermIds ); |
28 | - if( $termIds === $oldTermIds || !$this->isReviewPostId( $postId ))return; |
|
29 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
28 | + if( $termIds === $oldTermIds || !$this->isReviewPostId( $postId ) )return; |
|
29 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
30 | 30 | $ignoredTerms = array_intersect( $oldTermIds, $termIds ); |
31 | - if( $review->term_ids = array_diff( $oldTermIds, $ignoredTerms )) { |
|
31 | + if( $review->term_ids = array_diff( $oldTermIds, $ignoredTerms ) ) { |
|
32 | 32 | glsr( CountsManager::class )->decreaseTermCounts( $review ); |
33 | 33 | } |
34 | - if( $review->term_ids = array_diff( $termIds, $ignoredTerms )) { |
|
34 | + if( $review->term_ids = array_diff( $termIds, $ignoredTerms ) ) { |
|
35 | 35 | glsr( CountsManager::class )->increaseTermCounts( $review ); |
36 | 36 | } |
37 | 37 | } |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function onAfterCreate( $postData, $meta, $postId ) |
47 | 47 | { |
48 | - if( !$this->isReviewPostId( $postId ))return; |
|
49 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
48 | + if( !$this->isReviewPostId( $postId ) )return; |
|
49 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
50 | 50 | glsr( CountsManager::class )->increase( $review ); |
51 | 51 | } |
52 | 52 | |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function onBeforeDelete( $postId ) |
59 | 59 | { |
60 | - if( !$this->isReviewPostId( $postId ))return; |
|
61 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
60 | + if( !$this->isReviewPostId( $postId ) )return; |
|
61 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
62 | 62 | glsr( CountsManager::class )->decrease( $review ); |
63 | 63 | } |
64 | 64 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | if( !$this->isReviewPostId( $postId ) |
76 | 76 | || !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] ) |
77 | 77 | )return; |
78 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
78 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
79 | 79 | if( $review->$metaKey == $metaValue )return; |
80 | 80 | $method = glsr( Helper::class )->buildMethodName( $metaKey, 'onBeforeChange' ); |
81 | 81 | call_user_func( [$this, $method], $review, $metaValue ); |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | */ |
123 | 123 | public function onChangeStatus( $newStatus, $oldStatus, WP_Post $post ) |
124 | 124 | { |
125 | - if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ))return; |
|
126 | - $review = glsr( ReviewManager::class )->single( get_post( $post->ID )); |
|
125 | + if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ) )return; |
|
126 | + $review = glsr( ReviewManager::class )->single( get_post( $post->ID ) ); |
|
127 | 127 | if( $post->post_status == 'publish' ) { |
128 | 128 | glsr( CountsManager::class )->increase( $review ); |
129 | 129 | } |
@@ -12,12 +12,12 @@ |
||
12 | 12 | */ |
13 | 13 | public function build( array $args = [] ) |
14 | 14 | { |
15 | - require_once( ABSPATH.'wp-admin/includes/template.php' ); |
|
15 | + require_once(ABSPATH.'wp-admin/includes/template.php'); |
|
16 | 16 | ob_start(); |
17 | 17 | wp_star_rating( $args ); |
18 | 18 | $stars = ob_get_clean(); |
19 | 19 | return glsr( Builder::class )->div( $stars, [ |
20 | 20 | 'class' => 'glsr-stars', |
21 | - ]); |
|
21 | + ] ); |
|
22 | 22 | } |
23 | 23 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if( strpos( $message, '%s' ) === false ) { |
29 | 29 | return $message; |
30 | 30 | } |
31 | - return preg_replace_callback( '/(%s)/', function() use( &$parameters ) { |
|
31 | + return preg_replace_callback( '/(%s)/', function() use(&$parameters) { |
|
32 | 32 | foreach( $parameters as $key => $value ) { |
33 | 33 | return array_shift( $parameters ); |
34 | 34 | } |
@@ -113,8 +113,8 @@ discard block |
||
113 | 113 | public function validateRequired( $value ) |
114 | 114 | { |
115 | 115 | return is_null( $value ) |
116 | - || ( is_string( $value ) && trim( $value ) === '' ) |
|
117 | - || ( is_array( $value ) && count( $value ) < 1 ) |
|
116 | + || (is_string( $value ) && trim( $value ) === '') |
|
117 | + || (is_array( $value ) && count( $value ) < 1) |
|
118 | 118 | ? false |
119 | 119 | : true; |
120 | 120 | } |
@@ -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; |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | { |
85 | 85 | $rules = array_intersect_key( |
86 | 86 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ), |
87 | - array_flip( $this->getOption( 'settings.submissions.required', [] )) |
|
87 | + array_flip( $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 | /** |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) { |
101 | 101 | return true; |
102 | 102 | } |
103 | - if( empty( $this->request['recaptcha-token'] )) { |
|
103 | + if( empty($this->request['recaptcha-token']) ) { |
|
104 | 104 | return null; // @see $this->validateRecaptcha() |
105 | 105 | } |
106 | 106 | return $this->isRecaptchaValid( $this->request['recaptcha-token'] ); |
@@ -112,17 +112,17 @@ discard block |
||
112 | 112 | */ |
113 | 113 | protected function isRecaptchaValid( $recaptchaToken ) |
114 | 114 | { |
115 | - $endpoint = add_query_arg([ |
|
115 | + $endpoint = add_query_arg( [ |
|
116 | 116 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
117 | 117 | 'response' => $recaptchaToken, |
118 | 118 | 'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ), |
119 | 119 | ], static::RECAPTCHA_ENDPOINT ); |
120 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
120 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
121 | 121 | glsr_log()->error( $response->get_error_message() ); |
122 | 122 | return false; |
123 | 123 | } |
124 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
125 | - if( !empty( $response->success )) { |
|
124 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
125 | + if( !empty($response->success) ) { |
|
126 | 126 | return boolval( $response->success ); |
127 | 127 | } |
128 | 128 | foreach( $response->{'error-codes'} as $error ) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | $rules = $this->getValidationRules( $request ); |
140 | 140 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
141 | - if( empty( $errors )) { |
|
141 | + if( empty($errors) ) { |
|
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | $this->setSessionValues( 'errors', $errors ); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
156 | 156 | { |
157 | 157 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
158 | - if( !empty( $loggedMessage )) { |
|
158 | + if( !empty($loggedMessage) ) { |
|
159 | 159 | glsr_log()->warning( $loggedMessage ); |
160 | 160 | glsr_log()->warning( $this->request ); |
161 | 161 | } |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | */ |
167 | 167 | protected function validateAkismet() |
168 | 168 | { |
169 | - if( !empty( $this->error ))return; |
|
170 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
169 | + if( !empty($this->error) )return; |
|
170 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
171 | 171 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
172 | 172 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
173 | 173 | } |
@@ -177,8 +177,8 @@ discard block |
||
177 | 177 | */ |
178 | 178 | protected function validateBlacklist() |
179 | 179 | { |
180 | - if( !empty( $this->error ))return; |
|
181 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
180 | + if( !empty($this->error) )return; |
|
181 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
182 | 182 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
183 | 183 | if( $blacklistAction == 'reject' ) { |
184 | 184 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | */ |
194 | 194 | protected function validateCustom() |
195 | 195 | { |
196 | - if( !empty( $this->error ))return; |
|
196 | + if( !empty($this->error) )return; |
|
197 | 197 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
198 | 198 | if( $validated === true )return; |
199 | 199 | $this->setSessionValues( 'errors', [] ); |
@@ -208,8 +208,8 @@ discard block |
||
208 | 208 | */ |
209 | 209 | protected function validateHoneyPot() |
210 | 210 | { |
211 | - if( !empty( $this->error ))return; |
|
212 | - if( empty( $this->request['gotcha'] ))return; |
|
211 | + if( !empty($this->error) )return; |
|
212 | + if( empty($this->request['gotcha']) )return; |
|
213 | 213 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
214 | 214 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
215 | 215 | } |
@@ -219,9 +219,9 @@ discard block |
||
219 | 219 | */ |
220 | 220 | protected function validateRecaptcha() |
221 | 221 | { |
222 | - if( !empty( $this->error ))return; |
|
222 | + if( !empty($this->error) )return; |
|
223 | 223 | $isValid = $this->isRecaptchaResponseValid(); |
224 | - if( is_null( $isValid )) { |
|
224 | + if( is_null( $isValid ) ) { |
|
225 | 225 | $this->setSessionValues( 'recaptcha', 'unset' ); |
226 | 226 | $this->recaptchaIsUnset = true; |
227 | 227 | } |
@@ -237,11 +237,11 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function validateRequest( array $request ) |
239 | 239 | { |
240 | - if( !$this->isRequestValid( $request )) { |
|
240 | + if( !$this->isRequestValid( $request ) ) { |
|
241 | 241 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
242 | 242 | return $request; |
243 | 243 | } |
244 | - if( empty( $request['title'] )) { |
|
244 | + if( empty($request['title']) ) { |
|
245 | 245 | $request['title'] = __( 'No Title', 'site-reviews' ); |
246 | 246 | } |
247 | 247 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function all() |
30 | 30 | { |
31 | - if( empty( $this->options )) { |
|
31 | + if( empty($this->options) ) { |
|
32 | 32 | $this->reset(); |
33 | 33 | } |
34 | 34 | return $this->options; |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | $options = $this->all(); |
46 | 46 | $pointer = &$options; |
47 | 47 | foreach( $keys as $key ) { |
48 | - if( !isset( $pointer[$key] ) || !is_array( $pointer[$key] ))continue; |
|
48 | + if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) )continue; |
|
49 | 49 | $pointer = &$pointer[$key]; |
50 | 50 | } |
51 | - unset( $pointer[$last] ); |
|
51 | + unset($pointer[$last]); |
|
52 | 52 | return $this->set( $options ); |
53 | 53 | } |
54 | 54 | |
@@ -80,8 +80,8 @@ discard block |
||
80 | 80 | glsr( DefaultsManager::class )->defaults() |
81 | 81 | ); |
82 | 82 | array_walk( $options, function( &$value ) { |
83 | - if( !is_string( $value ))return; |
|
84 | - $value = wp_kses( $value, wp_kses_allowed_html( 'post' )); |
|
83 | + if( !is_string( $value ) )return; |
|
84 | + $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) ); |
|
85 | 85 | }); |
86 | 86 | return glsr( Helper::class )->convertDotNotationArray( $options ); |
87 | 87 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | public function isRecaptchaEnabled() |
93 | 93 | { |
94 | 94 | $integration = $this->get( 'settings.submissions.recaptcha.integration' ); |
95 | - return $integration == 'all' || ( $integration == 'guest' && !is_user_logged_in() ); |
|
95 | + return $integration == 'all' || ($integration == 'guest' && !is_user_logged_in()); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | public function reset() |
102 | 102 | { |
103 | 103 | $options = get_option( static::databaseKey(), [] ); |
104 | - if( !is_array( $options ) || empty( $options )) { |
|
104 | + if( !is_array( $options ) || empty($options) ) { |
|
105 | 105 | delete_option( static::databaseKey() ); |
106 | 106 | $options = wp_parse_args( glsr()->defaults, ['settings' => []] ); |
107 | 107 | } |
@@ -115,10 +115,10 @@ discard block |
||
115 | 115 | */ |
116 | 116 | public function set( $pathOrOptions, $value = '' ) |
117 | 117 | { |
118 | - if( is_string( $pathOrOptions )) { |
|
118 | + if( is_string( $pathOrOptions ) ) { |
|
119 | 119 | $pathOrOptions = glsr( Helper::class )->setPathValue( $pathOrOptions, $value, $this->all() ); |
120 | 120 | } |
121 | - if( $result = update_option( static::databaseKey(), (array)$pathOrOptions )) { |
|
121 | + if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) { |
|
122 | 122 | $this->reset(); |
123 | 123 | } |
124 | 124 | return $result; |