@@ -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 | } |
@@ -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(); |
@@ -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 | ); |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | */ |
| 7 | 7 | function glsr( $alias = null ) { |
| 8 | 8 | $app = \GeminiLabs\SiteReviews\Application::load(); |
| 9 | - return !empty( $alias ) |
|
| 9 | + return !empty($alias) |
|
| 10 | 10 | ? $app->make( $alias ) |
| 11 | 11 | : $app; |
| 12 | 12 | } |
@@ -15,10 +15,10 @@ discard block |
||
| 15 | 15 | * @return \WP_Screen|object |
| 16 | 16 | */ |
| 17 | 17 | function glsr_current_screen() { |
| 18 | - if( function_exists( 'get_current_screen' )) { |
|
| 18 | + if( function_exists( 'get_current_screen' ) ) { |
|
| 19 | 19 | $screen = get_current_screen(); |
| 20 | 20 | } |
| 21 | - return empty( $screen ) |
|
| 21 | + return empty($screen) |
|
| 22 | 22 | ? (object)array_fill_keys( ['base', 'id', 'post_type'], null ) |
| 23 | 23 | : $screen; |
| 24 | 24 | } |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | function glsr_log() { |
| 55 | 55 | $args = func_get_args(); |
| 56 | - $context = isset( $args[1] ) |
|
| 56 | + $context = isset($args[1]) |
|
| 57 | 57 | ? $args[1] |
| 58 | 58 | : []; |
| 59 | 59 | $console = glsr( 'Modules\Console' ); |
| 60 | - return !empty( $args ) |
|
| 60 | + return !empty($args) |
|
| 61 | 61 | ? $console->log( 'debug', $args[0], $context ) |
| 62 | 62 | : $console; |
| 63 | 63 | } |
@@ -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 ); |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public function buildPlainTextMessage( PHPMailer $phpmailer ) |
| 92 | 92 | { |
| 93 | - if( empty( $this->email ))return; |
|
| 94 | - if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return; |
|
| 93 | + if( empty($this->email) )return; |
|
| 94 | + if( $phpmailer->ContentType === 'text/plain' || !empty($phpmailer->AltBody) )return; |
|
| 95 | 95 | $message = $this->stripHtmlTags( $phpmailer->Body ); |
| 96 | 96 | $phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this ); |
| 97 | 97 | } |
@@ -104,10 +104,10 @@ discard block |
||
| 104 | 104 | $allowed = [ |
| 105 | 105 | 'bcc', 'cc', 'from', 'reply-to', |
| 106 | 106 | ]; |
| 107 | - $headers = array_intersect_key( $this->email, array_flip( $allowed )); |
|
| 107 | + $headers = array_intersect_key( $this->email, array_flip( $allowed ) ); |
|
| 108 | 108 | $headers = array_filter( $headers ); |
| 109 | 109 | foreach( $headers as $key => $value ) { |
| 110 | - unset( $headers[$key] ); |
|
| 110 | + unset($headers[$key]); |
|
| 111 | 111 | $headers[] = $key.': '.$value; |
| 112 | 112 | } |
| 113 | 113 | $headers[] = 'Content-Type: text/html'; |
@@ -119,16 +119,16 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | protected function buildHtmlMessage() |
| 121 | 121 | { |
| 122 | - $template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' )); |
|
| 123 | - if( !empty( $template )) { |
|
| 122 | + $template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) ); |
|
| 123 | + if( !empty($template) ) { |
|
| 124 | 124 | $message = glsr( Template::class )->interpolate( $template, $this->email['template-tags'] ); |
| 125 | 125 | } |
| 126 | 126 | else if( $this->email['template'] ) { |
| 127 | 127 | $message = glsr( Template::class )->build( 'templates/'.$this->email['template'], [ |
| 128 | 128 | 'context' => $this->email['template-tags'], |
| 129 | - ]); |
|
| 129 | + ] ); |
|
| 130 | 130 | } |
| 131 | - if( !isset( $message )) { |
|
| 131 | + if( !isset($message) ) { |
|
| 132 | 132 | $message = $this->email['message']; |
| 133 | 133 | } |
| 134 | 134 | $message = $this->email['before'].$message.$this->email['after']; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $message = str_replace( ']]>', ']]>', $message ); |
| 140 | 140 | $message = glsr( Template::class )->build( 'partials/email/index', [ |
| 141 | 141 | 'context' => ['message' => $message], |
| 142 | - ]); |
|
| 142 | + ] ); |
|
| 143 | 143 | return apply_filters( 'site-reviews/email/message', stripslashes( $message ), 'html', $this ); |
| 144 | 144 | } |
| 145 | 145 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | protected function normalize( array $email = [] ) |
| 150 | 150 | { |
| 151 | 151 | $email = shortcode_atts( glsr( EmailDefaults::class )->defaults(), $email ); |
| 152 | - if( empty( $email['reply-to'] )) { |
|
| 152 | + if( empty($email['reply-to']) ) { |
|
| 153 | 153 | $email['reply-to'] = $email['from']; |
| 154 | 154 | } |
| 155 | 155 | $this->email = apply_filters( 'site-reviews/email/compose', $email, $this ); |
@@ -127,8 +127,8 @@ |
||
| 127 | 127 | public function validateRequired( $value ) |
| 128 | 128 | { |
| 129 | 129 | return is_null( $value ) |
| 130 | - || ( is_string( $value ) && trim( $value ) === '' ) |
|
| 131 | - || ( is_array( $value ) && count( $value ) < 1 ) |
|
| 130 | + || (is_string( $value ) && trim( $value ) === '') |
|
| 131 | + || (is_array( $value ) && count( $value ) < 1) |
|
| 132 | 132 | ? false |
| 133 | 133 | : true; |
| 134 | 134 | } |