@@ -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 | ); |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | wp_send_json( glsr( Html::class )->renderPartial( 'link', [ |
| 26 | 26 | 'post_id' => $request['ID'], |
| 27 | - ])); |
|
| 27 | + ] ) ); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public function routerChangeReviewStatus( array $request ) |
| 34 | 34 | { |
| 35 | - wp_send_json( $this->execute( new ChangeStatus( $request ))); |
|
| 35 | + wp_send_json( $this->execute( new ChangeStatus( $request ) ) ); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | public function routerClearConsole() |
| 42 | 42 | { |
| 43 | 43 | glsr( AdminController::class )->routerClearConsole(); |
| 44 | - wp_send_json([ |
|
| 44 | + wp_send_json( [ |
|
| 45 | 45 | 'console' => glsr( Console::class )->get(), |
| 46 | 46 | 'notices' => glsr( Notice::class )->get(), |
| 47 | - ]); |
|
| 47 | + ] ); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | { |
| 55 | 55 | $shortcode = $request['shortcode']; |
| 56 | 56 | $response = false; |
| 57 | - if( array_key_exists( $shortcode, glsr()->mceShortcodes )) { |
|
| 57 | + if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) { |
|
| 58 | 58 | $data = glsr()->mceShortcodes[$shortcode]; |
| 59 | - if( !empty( $data['errors'] )) { |
|
| 59 | + if( !empty($data['errors']) ) { |
|
| 60 | 60 | $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )]; |
| 61 | 61 | } |
| 62 | 62 | $response = [ |
@@ -76,10 +76,10 @@ discard block |
||
| 76 | 76 | public function routerSearchPosts( array $request ) |
| 77 | 77 | { |
| 78 | 78 | $results = glsr( Database::class )->searchPosts( $request['search'] ); |
| 79 | - wp_send_json_success([ |
|
| 79 | + wp_send_json_success( [ |
|
| 80 | 80 | 'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>', |
| 81 | 81 | 'items' => $results, |
| 82 | - ]); |
|
| 82 | + ] ); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | public function routerSearchTranslations( array $request ) |
| 89 | 89 | { |
| 90 | - if( empty( $request['exclude'] )) { |
|
| 90 | + if( empty($request['exclude']) ) { |
|
| 91 | 91 | $request['exclude'] = []; |
| 92 | 92 | } |
| 93 | 93 | $results = glsr( Translator::class ) |
@@ -95,10 +95,10 @@ discard block |
||
| 95 | 95 | ->exclude() |
| 96 | 96 | ->exclude( $request['exclude'] ) |
| 97 | 97 | ->renderResults(); |
| 98 | - wp_send_json_success([ |
|
| 98 | + wp_send_json_success( [ |
|
| 99 | 99 | 'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>', |
| 100 | 100 | 'items' => $results, |
| 101 | - ]); |
|
| 101 | + ] ); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -107,11 +107,11 @@ discard block |
||
| 107 | 107 | public function routerSubmitReview( array $request ) |
| 108 | 108 | { |
| 109 | 109 | glsr( PublicController::class )->routerSubmitReview( $request ); |
| 110 | - wp_send_json([ |
|
| 110 | + wp_send_json( [ |
|
| 111 | 111 | 'errors' => glsr( Session::class )->get( $request['form_id'].'errors', false, true ), |
| 112 | - 'message' => wpautop( glsr( Session::class )->get( $request['form_id'].'message', '', true )), |
|
| 112 | + 'message' => wpautop( glsr( Session::class )->get( $request['form_id'].'message', '', true ) ), |
|
| 113 | 113 | 'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ), |
| 114 | - ]); |
|
| 114 | + ] ); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public function routerTogglePinned( array $request ) |
| 121 | 121 | { |
| 122 | - $isPinned = $this->execute( new TogglePinned( $request )); |
|
| 123 | - wp_send_json([ |
|
| 122 | + $isPinned = $this->execute( new TogglePinned( $request ) ); |
|
| 123 | + wp_send_json( [ |
|
| 124 | 124 | 'notices' => glsr( Notice::class )->get(), |
| 125 | 125 | 'pinned' => $isPinned, |
| 126 | - ]); |
|
| 126 | + ] ); |
|
| 127 | 127 | } |
| 128 | 128 | } |
@@ -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 ); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param mixed $default |
| 94 | 94 | * @return mixed |
| 95 | 95 | */ |
| 96 | - public function getProperty( $property, $default = null) |
|
| 96 | + public function getProperty( $property, $default = null ) |
|
| 97 | 97 | { |
| 98 | 98 | return $this->properties[$property] ?? $default; |
| 99 | 99 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | public function offsetUnset( $offset ) |
| 163 | 163 | { |
| 164 | - unset( $this->properties[$offset] ); |
|
| 164 | + unset($this->properties[$offset]); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -207,16 +207,16 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | protected function getParents( $parents = null ) |
| 209 | 209 | { |
| 210 | - if( !isset( $parents )) { |
|
| 210 | + if( !isset($parents) ) { |
|
| 211 | 211 | $parents = $this->parents; |
| 212 | 212 | } |
| 213 | 213 | $newParents = $parents; |
| 214 | 214 | foreach( $parents as $parent ) { |
| 215 | 215 | $parentClass = glsr( Helper::class )->buildClassName( $parent, __NAMESPACE__ ); |
| 216 | - if( !class_exists( $parentClass ))continue; |
|
| 217 | - $newParents = array_merge( $newParents, $this->getParents( (new $parentClass)->parents )); |
|
| 216 | + if( !class_exists( $parentClass ) )continue; |
|
| 217 | + $newParents = array_merge( $newParents, $this->getParents( (new $parentClass)->parents ) ); |
|
| 218 | 218 | } |
| 219 | - return array_values( array_unique( $newParents )); |
|
| 219 | + return array_values( array_unique( $newParents ) ); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
@@ -227,8 +227,8 @@ discard block |
||
| 227 | 227 | $parents = $this->getParents(); |
| 228 | 228 | foreach( $parents as $parent ) { |
| 229 | 229 | $parentClass = glsr( Helper::class )->buildClassName( $parent, __NAMESPACE__ ); |
| 230 | - if( !class_exists( $parentClass ))continue; |
|
| 231 | - $this->allowed = array_values( array_unique( array_merge( (new $parentClass)->allowed, $this->allowed ))); |
|
| 230 | + if( !class_exists( $parentClass ) )continue; |
|
| 231 | + $this->allowed = array_values( array_unique( array_merge( (new $parentClass)->allowed, $this->allowed ) ) ); |
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | |
@@ -238,17 +238,17 @@ discard block |
||
| 238 | 238 | */ |
| 239 | 239 | protected function serializeProperty( $property ) |
| 240 | 240 | { |
| 241 | - if( is_array( $property )) { |
|
| 241 | + if( is_array( $property ) ) { |
|
| 242 | 242 | return array_map( [$this, 'serializeProperty'], $property ); |
| 243 | 243 | } |
| 244 | 244 | if( $property instanceof Type ) { |
| 245 | 245 | $property = $property->toArray(); |
| 246 | - unset( $property['@context'] ); |
|
| 246 | + unset($property['@context']); |
|
| 247 | 247 | } |
| 248 | 248 | if( $property instanceof DateTimeInterface ) { |
| 249 | 249 | $property = $property->format( DateTime::ATOM ); |
| 250 | 250 | } |
| 251 | - if( is_object( $property )) { |
|
| 251 | + if( is_object( $property ) ) { |
|
| 252 | 252 | throw new InvalidProperty(); |
| 253 | 253 | } |
| 254 | 254 | return $property; |
@@ -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 ); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(), |
| 58 | 58 | ], |
| 59 | 59 | 'fields' => $this->getFields(), |
| 60 | - ]); |
|
| 60 | + ] ); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | { |
| 68 | 68 | $integration = glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' ); |
| 69 | 69 | $recaptchaMethod = glsr( Helper::class )->buildMethodName( $integration, 'getRecaptcha' ); |
| 70 | - if( method_exists( $this, $recaptchaMethod )) { |
|
| 70 | + if( method_exists( $this, $recaptchaMethod ) ) { |
|
| 71 | 71 | return $this->$recaptchaMethod(); |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | return glsr( Partial::class )->build( 'form-results', [ |
| 81 | 81 | 'errors' => $this->errors, |
| 82 | 82 | 'message' => $this->message, |
| 83 | - ]); |
|
| 83 | + ] ); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | { |
| 91 | 91 | return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [ |
| 92 | 92 | 'type' => 'submit', |
| 93 | - ]); |
|
| 93 | + ] ); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $fields = array_merge( |
| 111 | 111 | $this->getHiddenFields(), |
| 112 | 112 | [$this->getHoneypotField()], |
| 113 | - $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' )) |
|
| 113 | + $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) ) |
|
| 114 | 114 | ); |
| 115 | 115 | return $fields; |
| 116 | 116 | } |
@@ -123,27 +123,27 @@ discard block |
||
| 123 | 123 | $fields = [[ |
| 124 | 124 | 'name' => 'action', |
| 125 | 125 | 'value' => 'submit-review', |
| 126 | - ],[ |
|
| 126 | + ], [ |
|
| 127 | 127 | 'name' => 'assign_to', |
| 128 | 128 | 'value' => $this->args['assign_to'], |
| 129 | - ],[ |
|
| 129 | + ], [ |
|
| 130 | 130 | 'name' => 'category', |
| 131 | 131 | 'value' => $this->args['category'], |
| 132 | - ],[ |
|
| 132 | + ], [ |
|
| 133 | 133 | 'name' => 'excluded', |
| 134 | 134 | 'value' => $this->args['excluded'], // @todo should default to "[]" |
| 135 | - ],[ |
|
| 135 | + ], [ |
|
| 136 | 136 | 'name' => 'form_id', |
| 137 | 137 | 'value' => $this->args['id'], |
| 138 | - ],[ |
|
| 138 | + ], [ |
|
| 139 | 139 | 'name' => 'nonce', |
| 140 | 140 | 'value' => wp_create_nonce( 'submit-review' ), |
| 141 | - ],[ |
|
| 141 | + ], [ |
|
| 142 | 142 | 'name' => 'referer', |
| 143 | - 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), |
|
| 143 | + 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), |
|
| 144 | 144 | ]]; |
| 145 | 145 | return array_map( function( $field ) { |
| 146 | - return new Field( wp_parse_args( $field, ['type' => 'hidden'] )); |
|
| 146 | + return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) ); |
|
| 147 | 147 | }, $fields ); |
| 148 | 148 | } |
| 149 | 149 | |
@@ -152,10 +152,10 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | protected function getHoneypotField() |
| 154 | 154 | { |
| 155 | - return new Field([ |
|
| 155 | + return new Field( [ |
|
| 156 | 156 | 'name' => 'gotcha', |
| 157 | 157 | 'type' => 'honeypot', |
| 158 | - ]); |
|
| 158 | + ] ); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | /** |
@@ -163,12 +163,12 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | protected function getRecaptchaCustom() |
| 165 | 165 | { |
| 166 | - return glsr( Builder::class )->div([ |
|
| 166 | + return glsr( Builder::class )->div( [ |
|
| 167 | 167 | 'class' => 'glsr-recaptcha-holder', |
| 168 | - 'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' )), |
|
| 169 | - 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )), |
|
| 168 | + 'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ) ), |
|
| 169 | + 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ), |
|
| 170 | 170 | 'data-size' => 'invisible', |
| 171 | - ]); |
|
| 171 | + ] ); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /** |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $html = ob_get_clean(); |
| 182 | 182 | return glsr( Builder::class )->div( $html, [ |
| 183 | 183 | 'class' => 'glsr-recaptcha-holder', |
| 184 | - ]); |
|
| 184 | + ] ); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | /** |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | protected function normalizeFieldErrors( Field &$field ) |
| 191 | 191 | { |
| 192 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
| 192 | + if( !array_key_exists( $field->field['path'], $this->errors ) )return; |
|
| 193 | 193 | $field->field['errors'] = $this->errors[$field->field['path']]; |
| 194 | 194 | } |
| 195 | 195 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | */ |
| 199 | 199 | protected function normalizeFieldRequired( Field &$field ) |
| 200 | 200 | { |
| 201 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
| 201 | + if( !in_array( $field->field['path'], $this->required ) )return; |
|
| 202 | 202 | $field->field['required'] = true; |
| 203 | 203 | } |
| 204 | 204 | |
@@ -220,8 +220,8 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | protected function normalizeFieldValue( Field &$field ) |
| 222 | 222 | { |
| 223 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
| 224 | - if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
|
| 223 | + if( !array_key_exists( $field->field['path'], $this->values ) )return; |
|
| 224 | + if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) { |
|
| 225 | 225 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
| 226 | 226 | } |
| 227 | 227 | else { |