@@ -102,7 +102,9 @@ discard block |
||
| 102 | 102 | protected function sendNotification( $postId ) |
| 103 | 103 | { |
| 104 | 104 | $notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' ); |
| 105 | - if( !in_array( $notificationType, ['default','custom','webhook'] ))return; |
|
| 105 | + if( !in_array( $notificationType, ['default','custom','webhook'] )) { |
|
| 106 | + return; |
|
| 107 | + } |
|
| 106 | 108 | $assignedToTitle = get_the_title( (int)$this->command->assigned_to ); |
| 107 | 109 | $notificationSubject = _nx( |
| 108 | 110 | 'New %s-star review', |
@@ -150,7 +152,9 @@ discard block |
||
| 150 | 152 | */ |
| 151 | 153 | protected function sendWebhookNotification( array $args ) |
| 152 | 154 | { |
| 153 | - if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return; |
|
| 155 | + if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' ))) { |
|
| 156 | + return; |
|
| 157 | + } |
|
| 154 | 158 | $notification = $this->createWebhookNotification( $args ); |
| 155 | 159 | $result = wp_remote_post( $endpoint, [ |
| 156 | 160 | 'blocking' => false, |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | $this->sendNotification( $postId ); |
| 33 | 33 | do_action( 'site-reviews/local/review/submitted', $postId, $command ); |
| 34 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
|
| 34 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) ); |
|
| 35 | 35 | if( $command->ajax_request ) { |
| 36 | 36 | glsr( Session::class )->clear(); |
| 37 | 37 | return; |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | if( $this->command->author ) { |
| 82 | 82 | $fields[] = ['value' => trim( $this->command->author.$this->command->email.' - '.$this->command->ip_address )]; |
| 83 | 83 | } |
| 84 | - $fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ))]; |
|
| 85 | - return json_encode([ |
|
| 84 | + $fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ) )]; |
|
| 85 | + return json_encode( [ |
|
| 86 | 86 | 'icon_url' => glsr()->url( 'assets/img/icon.png' ), |
| 87 | 87 | 'username' => glsr()->name, |
| 88 | 88 | 'attachments' => [[ |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | 'fallback' => $this->createEmailNotification( $args )->read( 'plaintext' ), |
| 92 | 92 | 'fields' => $fields, |
| 93 | 93 | ]], |
| 94 | - ]); |
|
| 94 | + ] ); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -101,12 +101,12 @@ discard block |
||
| 101 | 101 | protected function sendNotification( $postId ) |
| 102 | 102 | { |
| 103 | 103 | $notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' ); |
| 104 | - if( !in_array( $notificationType, ['default','custom','webhook'] ))return; |
|
| 104 | + if( !in_array( $notificationType, ['default', 'custom', 'webhook'] ) )return; |
|
| 105 | 105 | $assignedToTitle = get_the_title( (int)$this->command->assigned_to ); |
| 106 | 106 | $notificationSubject = _nx( |
| 107 | 107 | 'New %s-star review', |
| 108 | 108 | 'New %s-star review of: %s', |
| 109 | - intval( empty( $assignedToTitle )), |
|
| 109 | + intval( empty($assignedToTitle) ), |
|
| 110 | 110 | 'The text is different depending on whether or not the review has been assigned to a post.', |
| 111 | 111 | 'site-reviews' |
| 112 | 112 | ); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | sprintf( $notificationSubject, $this->command->rating, $assignedToTitle ) |
| 116 | 116 | ); |
| 117 | 117 | $args = [ |
| 118 | - 'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ))), |
|
| 118 | + 'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ) ) ), |
|
| 119 | 119 | 'notification_title' => $notificationTitle, |
| 120 | 120 | 'notification_type' => $notificationType, |
| 121 | 121 | ]; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $args['recipient'] = $args['notification_type'] !== 'default' |
| 134 | 134 | ? glsr( OptionManager::class )->get( 'settings.general.notification_email' ) |
| 135 | 135 | : get_option( 'admin_email' ); |
| 136 | - if( empty( $args['recipient'] )) { |
|
| 136 | + if( empty($args['recipient']) ) { |
|
| 137 | 137 | glsr_log()->error( 'Email notification was not sent: missing email, subject, or message.' ); |
| 138 | 138 | } |
| 139 | 139 | else { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | */ |
| 150 | 150 | protected function sendWebhookNotification( array $args ) |
| 151 | 151 | { |
| 152 | - if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return; |
|
| 152 | + if( !($endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )) )return; |
|
| 153 | 153 | $notification = $this->createWebhookNotification( $args ); |
| 154 | 154 | $result = wp_remote_post( $endpoint, [ |
| 155 | 155 | 'blocking' => false, |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | 'redirection' => 5, |
| 161 | 161 | 'sslverify' => false, |
| 162 | 162 | 'timeout' => 45, |
| 163 | - ]); |
|
| 164 | - if( is_wp_error( $result )) { |
|
| 163 | + ] ); |
|
| 164 | + if( is_wp_error( $result ) ) { |
|
| 165 | 165 | glsr_log()->error( $result->get_error_message() ); |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -27,21 +27,21 @@ discard block |
||
| 27 | 27 | public function __construct( $input ) |
| 28 | 28 | { |
| 29 | 29 | $this->request = $input; |
| 30 | - $this->ajax_request = isset( $input['ajax_request'] ); |
|
| 30 | + $this->ajax_request = isset($input['ajax_request']); |
|
| 31 | 31 | $this->assigned_to = $this->getNumeric( 'assign_to' ); |
| 32 | - $this->author = sanitize_text_field( $this->get( 'name' )); |
|
| 33 | - $this->avatar = get_avatar_url( $this->get( 'email' )); |
|
| 34 | - $this->blacklisted = isset( $input['blacklisted'] ); |
|
| 35 | - $this->category = sanitize_key( $this->get( 'category' )); |
|
| 36 | - $this->content = sanitize_textarea_field( $this->get( 'content' )); |
|
| 32 | + $this->author = sanitize_text_field( $this->get( 'name' ) ); |
|
| 33 | + $this->avatar = get_avatar_url( $this->get( 'email' ) ); |
|
| 34 | + $this->blacklisted = isset($input['blacklisted']); |
|
| 35 | + $this->category = sanitize_key( $this->get( 'category' ) ); |
|
| 36 | + $this->content = sanitize_textarea_field( $this->get( 'content' ) ); |
|
| 37 | 37 | $this->custom = $this->getCustom(); |
| 38 | - $this->email = sanitize_email( $this->get( 'email' )); |
|
| 39 | - $this->form_id = sanitize_key( $this->get( 'form_id' )); |
|
| 38 | + $this->email = sanitize_email( $this->get( 'email' ) ); |
|
| 39 | + $this->form_id = sanitize_key( $this->get( 'form_id' ) ); |
|
| 40 | 40 | $this->ip_address = $this->get( 'ip_address' ); |
| 41 | - $this->rating = intval( $this->get( 'rating' )); |
|
| 41 | + $this->rating = intval( $this->get( 'rating' ) ); |
|
| 42 | 42 | $this->referrer = $this->get( 'referrer' ); |
| 43 | - $this->terms = isset( $input['terms'] ); |
|
| 44 | - $this->title = sanitize_text_field( $this->get( 'title' )); |
|
| 43 | + $this->terms = isset($input['terms']); |
|
| 44 | + $this->title = sanitize_text_field( $this->get( 'title' ) ); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | protected function get( $key ) |
| 52 | 52 | { |
| 53 | - return isset( $this->request[$key] ) |
|
| 53 | + return isset($this->request[$key]) |
|
| 54 | 54 | ? (string)$this->request[$key] |
| 55 | 55 | : ''; |
| 56 | 56 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | ]; |
| 68 | 68 | $custom = $this->request; |
| 69 | 69 | foreach( $unset as $value ) { |
| 70 | - unset( $custom[$value] ); |
|
| 70 | + unset($custom[$value]); |
|
| 71 | 71 | } |
| 72 | 72 | return $custom; |
| 73 | 73 | } |
@@ -193,8 +193,12 @@ discard block |
||
| 193 | 193 | */ |
| 194 | 194 | protected function validateAkismet() |
| 195 | 195 | { |
| 196 | - if( !empty( $this->error ))return; |
|
| 197 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
| 196 | + if( !empty( $this->error )) { |
|
| 197 | + return; |
|
| 198 | + } |
|
| 199 | + if( !glsr( Akismet::class )->isSpam( $this->request )) { |
|
| 200 | + return; |
|
| 201 | + } |
|
| 198 | 202 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
| 199 | 203 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
| 200 | 204 | } |
@@ -204,8 +208,12 @@ discard block |
||
| 204 | 208 | */ |
| 205 | 209 | protected function validateBlacklist() |
| 206 | 210 | { |
| 207 | - if( !empty( $this->error ))return; |
|
| 208 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
| 211 | + if( !empty( $this->error )) { |
|
| 212 | + return; |
|
| 213 | + } |
|
| 214 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) { |
|
| 215 | + return; |
|
| 216 | + } |
|
| 209 | 217 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
| 210 | 218 | if( $blacklistAction == 'reject' ) { |
| 211 | 219 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -220,9 +228,13 @@ discard block |
||
| 220 | 228 | */ |
| 221 | 229 | protected function validateCustom() |
| 222 | 230 | { |
| 223 | - if( !empty( $this->error ))return; |
|
| 231 | + if( !empty( $this->error )) { |
|
| 232 | + return; |
|
| 233 | + } |
|
| 224 | 234 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
| 225 | - if( $validated === true )return; |
|
| 235 | + if( $validated === true ) { |
|
| 236 | + return; |
|
| 237 | + } |
|
| 226 | 238 | $this->setSessionValues( 'errors', [] ); |
| 227 | 239 | $this->setSessionValues( 'values', $this->request ); |
| 228 | 240 | $this->error = is_string( $validated ) |
@@ -235,8 +247,12 @@ discard block |
||
| 235 | 247 | */ |
| 236 | 248 | protected function validateHoneyPot() |
| 237 | 249 | { |
| 238 | - if( !empty( $this->error ))return; |
|
| 239 | - if( empty( $this->request['gotcha'] ))return; |
|
| 250 | + if( !empty( $this->error )) { |
|
| 251 | + return; |
|
| 252 | + } |
|
| 253 | + if( empty( $this->request['gotcha'] )) { |
|
| 254 | + return; |
|
| 255 | + } |
|
| 240 | 256 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
| 241 | 257 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
| 242 | 258 | } |
@@ -246,7 +262,9 @@ discard block |
||
| 246 | 262 | */ |
| 247 | 263 | protected function validateRecaptcha() |
| 248 | 264 | { |
| 249 | - if( !empty( $this->error ))return; |
|
| 265 | + if( !empty( $this->error )) { |
|
| 266 | + return; |
|
| 267 | + } |
|
| 250 | 268 | $isValid = $this->isRecaptchaResponseValid(); |
| 251 | 269 | if( is_null( $isValid )) { |
| 252 | 270 | $this->setSessionValues( 'recaptcha', true ); |
@@ -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 ); |
@@ -16,11 +16,11 @@ discard block |
||
| 16 | 16 | <div id="<?= $tax_name; ?>-all" class="tabs-panel"> |
| 17 | 17 | <input type="hidden" name="tax_input[<?= $tax_name; ?>][]" value='0' /> |
| 18 | 18 | <ul id="<?= $tax_name; ?>checklist" data-wp-lists="list:<?= $tax_name; ?>" class="categorychecklist form-no-clear"> |
| 19 | - <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids )); ?> |
|
| 19 | + <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?> |
|
| 20 | 20 | </ul> |
| 21 | 21 | </div> |
| 22 | 22 | |
| 23 | - <?php if( current_user_can( $taxonomy->cap->edit_terms )) : ?> |
|
| 23 | + <?php if( current_user_can( $taxonomy->cap->edit_terms ) ) : ?> |
|
| 24 | 24 | <div id="<?= $tax_name; ?>-adder" class="wp-hidden-children"> |
| 25 | 25 | <a id="<?= $tax_name; ?>-add-toggle" href="#<?= $tax_name; ?>-add" class="hide-if-no-js taxonomy-add-new"> |
| 26 | 26 | <?= sprintf( '+ %s', $taxonomy->labels->add_new_item ); ?> |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | <label class="screen-reader-text" for="new<?= $tax_name; ?>"><?= $taxonomy->labels->add_new_item; ?></label> |
| 30 | 30 | <input type="text" name="new<?= $tax_name; ?>" id="new<?= $tax_name; ?>" class="form-required form-input-tip" value="<?= esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/> |
| 31 | 31 | <input type="button" id="<?= $tax_name; ?>-add-submit" data-wp-lists="add:<?= $tax_name; ?>checklist:<?= $tax_name; ?>-add" class="button category-add-submit" value="<?= esc_attr( $taxonomy->labels->add_new_item ); ?>" /> |
| 32 | - <?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?> |
|
| 32 | + <?php wp_nonce_field( 'add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false ); ?> |
|
| 33 | 33 | <span id="<?= $tax_name; ?>-ajax-response"></span> |
| 34 | 34 | </div> |
| 35 | 35 | </div> |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php defined( 'WPINC' ) || die; ?> |
| 2 | 2 | |
| 3 | 3 | <div id="titlediv"> |
| 4 | - <input type="text" id="title" value="<?= $post->post_title ? esc_attr( $post->post_title ) : sprintf( '(%s)', __( 'no title', 'site-reviews' )); ?>" readonly> |
|
| 4 | + <input type="text" id="title" value="<?= $post->post_title ? esc_attr( $post->post_title ) : sprintf( '(%s)', __( 'no title', 'site-reviews' ) ); ?>" readonly> |
|
| 5 | 5 | </div> |
| 6 | 6 | |
| 7 | 7 | <div id="contentdiv"> |
@@ -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 | } |
@@ -35,7 +35,9 @@ |
||
| 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 )) { |
|
| 39 | + return; |
|
| 40 | + } |
|
| 39 | 41 | glsr( Html::class )->render()->label( __( 'Filter by category', 'site-reviews' ), [ |
| 40 | 42 | 'class' => 'screen-reader-text', |
| 41 | 43 | 'for' => Application::TAXONOMY, |
@@ -86,7 +86,9 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function renderFilters( $postType ) |
| 88 | 88 | { |
| 89 | - if( $postType !== Application::POST_TYPE )return; |
|
| 89 | + if( $postType !== Application::POST_TYPE ) { |
|
| 90 | + return; |
|
| 91 | + } |
|
| 90 | 92 | if( !( $status = filter_input( INPUT_GET, 'post_status' ))) { |
| 91 | 93 | $status = 'publish'; |
| 92 | 94 | } |
@@ -103,7 +105,9 @@ discard block |
||
| 103 | 105 | */ |
| 104 | 106 | public function renderValues( $column, $postId ) |
| 105 | 107 | { |
| 106 | - if( glsr_current_screen()->post_type != Application::POST_TYPE )return; |
|
| 108 | + if( glsr_current_screen()->post_type != Application::POST_TYPE ) { |
|
| 109 | + return; |
|
| 110 | + } |
|
| 107 | 111 | $method = glsr( Helper::class )->buildMethodName( $column, 'buildColumn' ); |
| 108 | 112 | echo method_exists( $this, $method ) |
| 109 | 113 | ? call_user_func( [$this, $method], $postId ) |
@@ -116,7 +120,9 @@ discard block |
||
| 116 | 120 | */ |
| 117 | 121 | protected function renderFilterRatings( $ratings ) |
| 118 | 122 | { |
| 119 | - if( empty( $ratings ))return; |
|
| 123 | + if( empty( $ratings )) { |
|
| 124 | + return; |
|
| 125 | + } |
|
| 120 | 126 | $ratings = array_flip( array_reverse( $ratings )); |
| 121 | 127 | array_walk( $ratings, function( &$value, $key ) { |
| 122 | 128 | $label = _n( '%s star', '%s stars', $key, 'site-reviews' ); |
@@ -139,7 +145,9 @@ discard block |
||
| 139 | 145 | */ |
| 140 | 146 | protected function renderFilterTypes( $types ) |
| 141 | 147 | { |
| 142 | - if( count( glsr()->reviewTypes ) < 2 )return; |
|
| 148 | + if( count( glsr()->reviewTypes ) < 2 ) { |
|
| 149 | + return; |
|
| 150 | + } |
|
| 143 | 151 | echo glsr( Builder::class )->label( __( 'Filter by type', 'site-reviews' ), [ |
| 144 | 152 | 'class' => 'screen-reader-text', |
| 145 | 153 | 'for' => 'review_type', |
@@ -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 = get_post_meta( $postId, 'pinned', true ) |
| 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 | /** |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function buildColumnReviewer( $postId ) |
| 50 | 50 | { |
| 51 | - return strval( get_post_meta( $postId, 'author', true )); |
|
| 51 | + return strval( get_post_meta( $postId, 'author', true ) ); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -59,8 +59,8 @@ discard block |
||
| 59 | 59 | public function buildColumnRating( $postId ) |
| 60 | 60 | { |
| 61 | 61 | return glsr( Html::class )->buildPartial( 'star-rating', [ |
| 62 | - 'rating' => intval( get_post_meta( $postId, 'rating', true )), |
|
| 63 | - ]); |
|
| 62 | + 'rating' => intval( get_post_meta( $postId, 'rating', true ) ), |
|
| 63 | + ] ); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
@@ -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' ), |
@@ -48,7 +48,9 @@ |
||
| 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 )) { |
|
| 52 | + return; |
|
| 53 | + } |
|
| 52 | 54 | $strings = $this->getReviewLabels(); |
| 53 | 55 | $restored = filter_input( INPUT_GET, 'revision' ); |
| 54 | 56 | if( $revisionTitle = wp_post_revision_title( intval( $restored ), false )) { |
@@ -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(); |