@@ -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 )) { |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function onCreateReview( $postData, $meta, $postId ) |
| 24 | 24 | { |
| 25 | - if( !$this->isReviewPostType( $review = get_post( $postId )))return; |
|
| 25 | + if( !$this->isReviewPostType( $review = get_post( $postId ) ) )return; |
|
| 26 | 26 | $this->updateAssignedToPost( $review ); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public function onDeleteReview( $postId ) |
| 34 | 34 | { |
| 35 | - if( !$this->isReviewPostType( $review = get_post( $postId )))return; |
|
| 35 | + if( !$this->isReviewPostType( $review = get_post( $postId ) ) )return; |
|
| 36 | 36 | $review->post_status = 'deleted'; // important to change the post_status here first! |
| 37 | 37 | $this->updateAssignedToPost( $review ); |
| 38 | 38 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function saveAssignedToMetabox( $postId ) |
| 54 | 54 | { |
| 55 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ))return; |
|
| 55 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ) )return; |
|
| 56 | 56 | $assignedTo = glsr( Helper::class )->filterInput( 'assigned_to' ); |
| 57 | 57 | $assignedTo || $assignedTo = ''; |
| 58 | 58 | if( get_post_meta( $postId, 'assigned_to', true ) != $assignedTo ) { |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function saveResponseMetabox( $postId ) |
| 69 | 69 | { |
| 70 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ))return; |
|
| 70 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ) )return; |
|
| 71 | 71 | $response = glsr( Helper::class )->filterInput( 'response' ); |
| 72 | 72 | $response || $response = ''; |
| 73 | 73 | update_post_meta( $postId, 'response', trim( wp_kses( $response, [ |
| 74 | 74 | 'a' => ['href' => [], 'title' => []], |
| 75 | 75 | 'em' => [], |
| 76 | 76 | 'strong' => [], |
| 77 | - ]))); |
|
| 77 | + ] ) ) ); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | protected function getAssignedToPostId( $postId ) |
| 85 | 85 | { |
| 86 | - $assignedTo = intval( get_post_meta( $postId, 'assigned_to', true )); |
|
| 87 | - if(( $post = get_post( $assignedTo )) instanceof WP_Post ) { |
|
| 86 | + $assignedTo = intval( get_post_meta( $postId, 'assigned_to', true ) ); |
|
| 87 | + if( ($post = get_post( $assignedTo )) instanceof WP_Post ) { |
|
| 88 | 88 | return $post->ID; |
| 89 | 89 | } |
| 90 | 90 | return false; |
@@ -120,22 +120,22 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | protected function updateAssignedToPost( WP_Post $review ) |
| 122 | 122 | { |
| 123 | - if( !( $postId = $this->getAssignedToPostId( $review->ID )))return; |
|
| 124 | - $reviewIds = array_filter( (array)get_post_meta( $postId, static::META_REVIEW_ID )); |
|
| 125 | - if( empty( $reviewIds ))return; |
|
| 123 | + if( !($postId = $this->getAssignedToPostId( $review->ID )) )return; |
|
| 124 | + $reviewIds = array_filter( (array)get_post_meta( $postId, static::META_REVIEW_ID ) ); |
|
| 125 | + if( empty($reviewIds) )return; |
|
| 126 | 126 | $this->updateReviewIdOfPost( $postId, $review, $reviewIds ); |
| 127 | - $updatedReviewIds = array_filter( (array)get_post_meta( $postId, static::META_REVIEW_ID )); |
|
| 128 | - if( empty( $updatedReviewIds )) { |
|
| 127 | + $updatedReviewIds = array_filter( (array)get_post_meta( $postId, static::META_REVIEW_ID ) ); |
|
| 128 | + if( empty($updatedReviewIds) ) { |
|
| 129 | 129 | delete_post_meta( $postId, static::META_RANKING ); |
| 130 | 130 | delete_post_meta( $postId, static::META_REVIEW_ID ); |
| 131 | 131 | } |
| 132 | - else if( !glsr( Helper::class )->compareArrays( $reviewIds, $updatedReviewIds )) { |
|
| 133 | - $reviews = glsr( Database::class )->getReviews([ |
|
| 132 | + else if( !glsr( Helper::class )->compareArrays( $reviewIds, $updatedReviewIds ) ) { |
|
| 133 | + $reviews = glsr( Database::class )->getReviews( [ |
|
| 134 | 134 | 'count' => -1, |
| 135 | 135 | 'post__in' => $updatedReviewIds, |
| 136 | - ]); |
|
| 137 | - update_post_meta( $postId, static::META_AVERAGE, $this->recalculatePostAverage( $reviews->results )); |
|
| 138 | - update_post_meta( $postId, static::META_RANKING, $this->recalculatePostRanking( $reviews->results )); |
|
| 136 | + ] ); |
|
| 137 | + update_post_meta( $postId, static::META_AVERAGE, $this->recalculatePostAverage( $reviews->results ) ); |
|
| 138 | + update_post_meta( $postId, static::META_RANKING, $this->recalculatePostRanking( $reviews->results ) ); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | if( $review->post_status != 'publish' ) { |
| 149 | 149 | delete_post_meta( $postId, static::META_REVIEW_ID, $review->ID ); |
| 150 | 150 | } |
| 151 | - else if( !in_array( $review->ID, $reviewIds )) { |
|
| 151 | + else if( !in_array( $review->ID, $reviewIds ) ) { |
|
| 152 | 152 | add_post_meta( $postId, static::META_REVIEW_ID, $review->ID ); |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -22,7 +22,9 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function onCreateReview( $postData, $meta, $postId ) |
| 24 | 24 | { |
| 25 | - if( !$this->isReviewPostType( $review = get_post( $postId )))return; |
|
| 25 | + if( !$this->isReviewPostType( $review = get_post( $postId ))) { |
|
| 26 | + return; |
|
| 27 | + } |
|
| 26 | 28 | $this->updateAssignedToPost( $review ); |
| 27 | 29 | } |
| 28 | 30 | |
@@ -32,7 +34,9 @@ discard block |
||
| 32 | 34 | */ |
| 33 | 35 | public function onDeleteReview( $postId ) |
| 34 | 36 | { |
| 35 | - if( !$this->isReviewPostType( $review = get_post( $postId )))return; |
|
| 37 | + if( !$this->isReviewPostType( $review = get_post( $postId ))) { |
|
| 38 | + return; |
|
| 39 | + } |
|
| 36 | 40 | $review->post_status = 'deleted'; // important to change the post_status here first! |
| 37 | 41 | $this->updateAssignedToPost( $review ); |
| 38 | 42 | } |
@@ -52,7 +56,9 @@ discard block |
||
| 52 | 56 | */ |
| 53 | 57 | public function saveAssignedToMetabox( $postId ) |
| 54 | 58 | { |
| 55 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ))return; |
|
| 59 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' )) { |
|
| 60 | + return; |
|
| 61 | + } |
|
| 56 | 62 | $assignedTo = glsr( Helper::class )->filterInput( 'assigned_to' ); |
| 57 | 63 | $assignedTo || $assignedTo = ''; |
| 58 | 64 | if( get_post_meta( $postId, 'assigned_to', true ) != $assignedTo ) { |
@@ -67,7 +73,9 @@ discard block |
||
| 67 | 73 | */ |
| 68 | 74 | public function saveResponseMetabox( $postId ) |
| 69 | 75 | { |
| 70 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ))return; |
|
| 76 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' )) { |
|
| 77 | + return; |
|
| 78 | + } |
|
| 71 | 79 | $response = glsr( Helper::class )->filterInput( 'response' ); |
| 72 | 80 | $response || $response = ''; |
| 73 | 81 | update_post_meta( $postId, 'response', trim( wp_kses( $response, [ |
@@ -120,9 +128,13 @@ discard block |
||
| 120 | 128 | */ |
| 121 | 129 | protected function updateAssignedToPost( WP_Post $review ) |
| 122 | 130 | { |
| 123 | - if( !( $postId = $this->getAssignedToPostId( $review->ID )))return; |
|
| 131 | + if( !( $postId = $this->getAssignedToPostId( $review->ID ))) { |
|
| 132 | + return; |
|
| 133 | + } |
|
| 124 | 134 | $reviewIds = array_filter( (array)get_post_meta( $postId, static::META_REVIEW_ID )); |
| 125 | - if( empty( $reviewIds ))return; |
|
| 135 | + if( empty( $reviewIds )) { |
|
| 136 | + return; |
|
| 137 | + } |
|
| 126 | 138 | $this->updateReviewIdOfPost( $postId, $review, $reviewIds ); |
| 127 | 139 | $updatedReviewIds = array_filter( (array)get_post_meta( $postId, static::META_REVIEW_ID )); |
| 128 | 140 | if( empty( $updatedReviewIds )) { |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | */ |
| 58 | 58 | protected function isReviewEditable() |
| 59 | 59 | { |
| 60 | - $postId = intval( filter_input( INPUT_GET, 'post' )); |
|
| 60 | + $postId = intval( filter_input( INPUT_GET, 'post' ) ); |
|
| 61 | 61 | return $postId > 0 |
| 62 | 62 | && get_post_meta( $postId, 'review_type', true ) == 'local' |
| 63 | 63 | && $this->isReviewEditor(); |
@@ -21,11 +21,11 @@ discard block |
||
| 21 | 21 | return $input; |
| 22 | 22 | } |
| 23 | 23 | $triggered = true; |
| 24 | - if( !is_array( $input )) { |
|
| 24 | + if( !is_array( $input ) ) { |
|
| 25 | 25 | $input = ['settings' => []]; |
| 26 | 26 | } |
| 27 | 27 | if( key( $input ) == 'settings' ) { |
| 28 | - glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' )); |
|
| 28 | + glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) ); |
|
| 29 | 29 | } |
| 30 | 30 | $options = array_replace_recursive( glsr( OptionManager::class )->all(), $input ); |
| 31 | 31 | $options = $this->sanitizeGeneral( $input, $options ); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | { |
| 43 | 43 | register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [ |
| 44 | 44 | 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
| 45 | - ]); |
|
| 45 | + ] ); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | protected function sanitizeSubmissions( array $input, array $options ) |
| 63 | 63 | { |
| 64 | 64 | $inputForm = $input['settings']['submissions']; |
| 65 | - $options['settings']['submissions']['required'] = isset( $inputForm['required'] ) |
|
| 65 | + $options['settings']['submissions']['required'] = isset($inputForm['required']) |
|
| 66 | 66 | ? $inputForm['required'] |
| 67 | 67 | : []; |
| 68 | 68 | return $options; |
@@ -73,13 +73,13 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | protected function sanitizeTranslations( array $input, array $options ) |
| 75 | 75 | { |
| 76 | - if( isset( $input['settings']['strings'] )) { |
|
| 77 | - $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] )); |
|
| 76 | + if( isset($input['settings']['strings']) ) { |
|
| 77 | + $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) ); |
|
| 78 | 78 | array_walk( $options['settings']['strings'], function( &$string ) { |
| 79 | - if( isset( $string['s2'] )) { |
|
| 79 | + if( isset($string['s2']) ) { |
|
| 80 | 80 | $string['s2'] = wp_strip_all_tags( $string['s2'] ); |
| 81 | 81 | } |
| 82 | - if( isset( $string['p2'] )) { |
|
| 82 | + if( isset($string['p2']) ) { |
|
| 83 | 83 | $string['p2'] = wp_strip_all_tags( $string['p2'] ); |
| 84 | 84 | } |
| 85 | 85 | }); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function enqueueAssets() |
| 25 | 25 | { |
| 26 | - $command = new EnqueueAdminAssets([ |
|
| 26 | + $command = new EnqueueAdminAssets( [ |
|
| 27 | 27 | 'pointers' => [[ |
| 28 | 28 | 'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ), |
| 29 | 29 | 'id' => 'glsr-pointer-pinned', |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | 'target' => '#misc-pub-pinned', |
| 36 | 36 | 'title' => __( 'Pin Your Reviews', 'site-reviews' ), |
| 37 | 37 | ]], |
| 38 | - ]); |
|
| 38 | + ] ); |
|
| 39 | 39 | $this->execute( $command ); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | $links[] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [ |
| 49 | 49 | 'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ), |
| 50 | - ]); |
|
| 50 | + ] ); |
|
| 51 | 51 | return $links; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -58,19 +58,19 @@ discard block |
||
| 58 | 58 | public function filterDashboardGlanceItems( array $items ) |
| 59 | 59 | { |
| 60 | 60 | $postCount = wp_count_posts( Application::POST_TYPE ); |
| 61 | - if( empty( $postCount->publish )) { |
|
| 61 | + if( empty($postCount->publish) ) { |
|
| 62 | 62 | return $items; |
| 63 | 63 | } |
| 64 | 64 | $text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' ); |
| 65 | - $text = sprintf( $text, number_format_i18n( $postCount->publish )); |
|
| 65 | + $text = sprintf( $text, number_format_i18n( $postCount->publish ) ); |
|
| 66 | 66 | $items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts ) |
| 67 | 67 | ? glsr( Builder::class )->a( $text, [ |
| 68 | 68 | 'class' => 'glsr-review-count', |
| 69 | 69 | 'href' => 'edit.php?post_type='.Application::POST_TYPE, |
| 70 | - ]) |
|
| 70 | + ] ) |
|
| 71 | 71 | : glsr( Builder::class )->span( $text, [ |
| 72 | 72 | 'class' => 'glsr-review-count', |
| 73 | - ]); |
|
| 73 | + ] ); |
|
| 74 | 74 | return $items; |
| 75 | 75 | } |
| 76 | 76 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | public function filterTinymcePlugins( array $plugins ) |
| 82 | 82 | { |
| 83 | 83 | if( user_can_richedit() |
| 84 | - && ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ))) { |
|
| 84 | + && (current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' )) ) { |
|
| 85 | 85 | $plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' ); |
| 86 | 86 | } |
| 87 | 87 | return $plugins; |
@@ -93,11 +93,11 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | public function registerShortcodeButtons() |
| 95 | 95 | { |
| 96 | - $command = new RegisterShortcodeButtons([ |
|
| 96 | + $command = new RegisterShortcodeButtons( [ |
|
| 97 | 97 | 'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ), |
| 98 | 98 | 'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ), |
| 99 | 99 | 'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ), |
| 100 | - ]); |
|
| 100 | + ] ); |
|
| 101 | 101 | $this->execute( $command ); |
| 102 | 102 | } |
| 103 | 103 | |
@@ -107,10 +107,10 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function renderReviewEditor( WP_Post $post ) |
| 109 | 109 | { |
| 110 | - if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return; |
|
| 110 | + if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return; |
|
| 111 | 111 | glsr()->render( 'partials/editor/review', [ |
| 112 | 112 | 'post' => $post, |
| 113 | - ]); |
|
| 113 | + ] ); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | /** |
@@ -119,13 +119,13 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public function renderReviewNotice( WP_Post $post ) |
| 121 | 121 | { |
| 122 | - if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return; |
|
| 123 | - glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' )); |
|
| 122 | + if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return; |
|
| 123 | + glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ) ); |
|
| 124 | 124 | glsr( Html::class )->renderTemplate( 'partials/editor/notice', [ |
| 125 | 125 | 'context' => [ |
| 126 | 126 | 'notices' => glsr( Notice::class )->get(), |
| 127 | 127 | ], |
| 128 | - ]); |
|
| 128 | + ] ); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -137,13 +137,13 @@ discard block |
||
| 137 | 137 | if( glsr_current_screen()->base != 'post' )return; |
| 138 | 138 | $shortcodes = []; |
| 139 | 139 | foreach( glsr()->mceShortcodes as $shortcode => $values ) { |
| 140 | - if( !apply_filters( sanitize_title( $shortcode ).'_condition', true ))continue; |
|
| 140 | + if( !apply_filters( sanitize_title( $shortcode ).'_condition', true ) )continue; |
|
| 141 | 141 | $shortcodes[$shortcode] = $values; |
| 142 | 142 | } |
| 143 | - if( empty( $shortcodes ))return; |
|
| 143 | + if( empty($shortcodes) )return; |
|
| 144 | 144 | glsr()->render( 'partials/editor/tinymce', [ |
| 145 | 145 | 'shortcodes' => $shortcodes, |
| 146 | - ]); |
|
| 146 | + ] ); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | public function routerClearLog() |
| 153 | 153 | { |
| 154 | 154 | glsr( Logger::class )->clear(); |
| 155 | - glsr( Notice::class )->addSuccess( __( 'Log cleared.', 'site-reviews' )); |
|
| 155 | + glsr( Notice::class )->addSuccess( __( 'Log cleared.', 'site-reviews' ) ); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -186,17 +186,17 @@ discard block |
||
| 186 | 186 | { |
| 187 | 187 | $file = $_FILES['import-file']; |
| 188 | 188 | if( $file['error'] !== UPLOAD_ERR_OK ) { |
| 189 | - return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] )); |
|
| 189 | + return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) ); |
|
| 190 | 190 | } |
| 191 | - if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] )) { |
|
| 192 | - return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' )); |
|
| 191 | + if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] ) ) { |
|
| 192 | + return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) ); |
|
| 193 | 193 | } |
| 194 | 194 | $settings = json_decode( file_get_contents( $file['tmp_name'] ), true ); |
| 195 | - if( empty( $settings )) { |
|
| 196 | - return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' )); |
|
| 195 | + if( empty($settings) ) { |
|
| 196 | + return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) ); |
|
| 197 | 197 | } |
| 198 | - glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings )); |
|
| 199 | - glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' )); |
|
| 198 | + glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) ); |
|
| 199 | + glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) ); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ), |
| 215 | 215 | UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ), |
| 216 | 216 | ]; |
| 217 | - return !isset( $errors[$errorCode] ) |
|
| 217 | + return !isset($errors[$errorCode]) |
|
| 218 | 218 | ? __( 'Unknown upload error.', 'site-reviews' ) |
| 219 | 219 | : $errors[$errorCode]; |
| 220 | 220 | } |
@@ -107,7 +107,9 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function renderReviewEditor( WP_Post $post ) |
| 109 | 109 | { |
| 110 | - if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return; |
|
| 110 | + if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post )) { |
|
| 111 | + return; |
|
| 112 | + } |
|
| 111 | 113 | glsr()->render( 'partials/editor/review', [ |
| 112 | 114 | 'post' => $post, |
| 113 | 115 | ]); |
@@ -119,7 +121,9 @@ discard block |
||
| 119 | 121 | */ |
| 120 | 122 | public function renderReviewNotice( WP_Post $post ) |
| 121 | 123 | { |
| 122 | - if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return; |
|
| 124 | + if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post )) { |
|
| 125 | + return; |
|
| 126 | + } |
|
| 123 | 127 | glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' )); |
| 124 | 128 | glsr( Html::class )->renderTemplate( 'partials/editor/notice', [ |
| 125 | 129 | 'context' => [ |
@@ -134,13 +138,19 @@ discard block |
||
| 134 | 138 | */ |
| 135 | 139 | public function renderTinymceButton() |
| 136 | 140 | { |
| 137 | - if( glsr_current_screen()->base != 'post' )return; |
|
| 141 | + if( glsr_current_screen()->base != 'post' ) { |
|
| 142 | + return; |
|
| 143 | + } |
|
| 138 | 144 | $shortcodes = []; |
| 139 | 145 | foreach( glsr()->mceShortcodes as $shortcode => $values ) { |
| 140 | - if( !apply_filters( sanitize_title( $shortcode ).'_condition', true ))continue; |
|
| 146 | + if( !apply_filters( sanitize_title( $shortcode ).'_condition', true )) { |
|
| 147 | + continue; |
|
| 148 | + } |
|
| 141 | 149 | $shortcodes[$shortcode] = $values; |
| 142 | 150 | } |
| 143 | - if( empty( $shortcodes ))return; |
|
| 151 | + if( empty( $shortcodes )) { |
|
| 152 | + return; |
|
| 153 | + } |
|
| 144 | 154 | glsr()->render( 'partials/editor/tinymce', [ |
| 145 | 155 | 'shortcodes' => $shortcodes, |
| 146 | 156 | ]); |
@@ -35,10 +35,10 @@ discard block |
||
| 35 | 35 | foreach( glsr( Database::class )->getReviews( $this->args )->results as $review ) { |
| 36 | 36 | $reviews[] = $this->buildReview( $review ); |
| 37 | 37 | } |
| 38 | - if( !empty( $reviews )) { |
|
| 38 | + if( !empty($reviews) ) { |
|
| 39 | 39 | array_walk( $reviews, function( &$review ) { |
| 40 | - unset( $review['@context'] ); |
|
| 41 | - unset( $review['itemReviewed'] ); |
|
| 40 | + unset($review['@context']); |
|
| 41 | + unset($review['itemReviewed']); |
|
| 42 | 42 | }); |
| 43 | 43 | $schema['review'] = $reviews; |
| 44 | 44 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function buildSummary( $args = null ) |
| 53 | 53 | { |
| 54 | - if( is_array( $args )) { |
|
| 54 | + if( is_array( $args ) ) { |
|
| 55 | 55 | $this->args = $args; |
| 56 | 56 | } |
| 57 | 57 | $buildSummary = glsr( Helper::class )->buildMethodName( $this->getSchemaOptionValue( 'type' ), 'buildSummaryFor' ); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $schema = method_exists( $this, $buildSummary ) |
| 60 | 60 | ? $this->$buildSummary() |
| 61 | 61 | : $this->buildSummaryForCustom(); |
| 62 | - if( !empty( $count )) { |
|
| 62 | + if( !empty($count) ) { |
|
| 63 | 63 | $schema->aggregateRating( SchemaOrg::AggregateRating() |
| 64 | 64 | ->ratingValue( $this->getRatingValue() ) |
| 65 | 65 | ->reviewCount( $count ) |
@@ -77,11 +77,11 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function render() |
| 79 | 79 | { |
| 80 | - if( is_null( glsr()->schemas ))return; |
|
| 80 | + if( is_null( glsr()->schemas ) )return; |
|
| 81 | 81 | printf( '<script type="application/ld+json">%s</script>', json_encode( |
| 82 | 82 | apply_filters( 'site-reviews/schema/all', glsr()->schemas ), |
| 83 | 83 | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES |
| 84 | - )); |
|
| 84 | + ) ); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function store( array $schema ) |
| 91 | 91 | { |
| 92 | - $schemas = (array) glsr()->schemas; |
|
| 92 | + $schemas = (array)glsr()->schemas; |
|
| 93 | 93 | $schemas[] = $schema; |
| 94 | - glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ))); |
|
| 94 | + glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ) ) ); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -101,16 +101,16 @@ discard block |
||
| 101 | 101 | protected function buildReview( $review ) |
| 102 | 102 | { |
| 103 | 103 | $schema = SchemaOrg::Review() |
| 104 | - ->doIf( !in_array( 'title', $this->args['hide'] ), function( ReviewSchema $schema ) use( $review ) { |
|
| 104 | + ->doIf( !in_array( 'title', $this->args['hide'] ), function( ReviewSchema $schema ) use($review) { |
|
| 105 | 105 | $schema->name( $review->title ); |
| 106 | 106 | }) |
| 107 | - ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( ReviewSchema $schema ) use( $review ) { |
|
| 107 | + ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( ReviewSchema $schema ) use($review) { |
|
| 108 | 108 | $schema->reviewBody( $review->content ); |
| 109 | 109 | }) |
| 110 | - ->datePublished(( new DateTime( $review->date ))->format( DateTime::ISO8601 )) |
|
| 111 | - ->author( SchemaOrg::Person()->name( $review->author )) |
|
| 112 | - ->itemReviewed( $this->getSchemaType()->name( $this->getSchemaOptionValue( 'name' ))); |
|
| 113 | - if( !empty( $review->rating )) { |
|
| 110 | + ->datePublished( (new DateTime( $review->date ))->format( DateTime::ISO8601 ) ) |
|
| 111 | + ->author( SchemaOrg::Person()->name( $review->author ) ) |
|
| 112 | + ->itemReviewed( $this->getSchemaType()->name( $this->getSchemaOptionValue( 'name' ) ) ); |
|
| 113 | + if( !empty($review->rating) ) { |
|
| 114 | 114 | $schema->reviewRating( SchemaOrg::Rating() |
| 115 | 115 | ->ratingValue( $review->rating ) |
| 116 | 116 | ->bestRating( Rating::MAX_RATING ) |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | { |
| 128 | 128 | foreach( $values as $value ) { |
| 129 | 129 | $option = $this->getSchemaOptionValue( $value ); |
| 130 | - if( empty( $option ))continue; |
|
| 130 | + if( empty($option) )continue; |
|
| 131 | 131 | $schema->$value( $option ); |
| 132 | 132 | } |
| 133 | 133 | return $schema; |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | { |
| 141 | 141 | return $this->buildSchemaValues( $this->getSchemaType(), [ |
| 142 | 142 | 'description', 'image', 'name', 'url', |
| 143 | - ]); |
|
| 143 | + ] ); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | { |
| 151 | 151 | return $this->buildSchemaValues( $this->buildSummaryForCustom(), [ |
| 152 | 152 | 'address', 'priceRange', 'telephone', |
| 153 | - ]); |
|
| 153 | + ] ); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /** |
@@ -160,10 +160,10 @@ discard block |
||
| 160 | 160 | { |
| 161 | 161 | $offers = $this->buildSchemaValues( SchemaOrg::AggregateOffer(), [ |
| 162 | 162 | 'highPrice', 'lowPrice', 'priceCurrency', |
| 163 | - ]); |
|
| 163 | + ] ); |
|
| 164 | 164 | return $this->buildSummaryForCustom() |
| 165 | 165 | ->offers( $offers ) |
| 166 | - ->setProperty( '@id', $this->getSchemaOptionValue( 'url' )); |
|
| 166 | + ->setProperty( '@id', $this->getSchemaOptionValue( 'url' ) ); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | /** |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | */ |
| 188 | 188 | protected function getReviews( $force = false ) |
| 189 | 189 | { |
| 190 | - if( !isset( $this->reviews ) || $force ) { |
|
| 190 | + if( !isset($this->reviews) || $force ) { |
|
| 191 | 191 | $args = wp_parse_args( ['count' => -1], $this->args ); |
| 192 | 192 | $this->reviews = glsr( Database::class )->getReviews( $args )->results; |
| 193 | 193 | } |
@@ -202,14 +202,14 @@ discard block |
||
| 202 | 202 | protected function getSchemaOption( $option, $fallback ) |
| 203 | 203 | { |
| 204 | 204 | $option = strtolower( $option ); |
| 205 | - if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ))) { |
|
| 205 | + if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ) ) ) { |
|
| 206 | 206 | return $schemaOption; |
| 207 | 207 | } |
| 208 | 208 | $setting = glsr( OptionManager::class )->get( 'settings.schema.'.$option ); |
| 209 | - if( is_array( $setting )) { |
|
| 209 | + if( is_array( $setting ) ) { |
|
| 210 | 210 | return $this->getSchemaOptionDefault( $setting, $fallback ); |
| 211 | 211 | } |
| 212 | - return !empty( $setting ) |
|
| 212 | + return !empty($setting) |
|
| 213 | 213 | ? $setting |
| 214 | 214 | : $fallback; |
| 215 | 215 | } |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | $setting = wp_parse_args( $setting, [ |
| 225 | 225 | 'custom' => '', |
| 226 | 226 | 'default' => $fallback, |
| 227 | - ]); |
|
| 227 | + ] ); |
|
| 228 | 228 | return $setting['default'] != 'custom' |
| 229 | 229 | ? $setting['default'] |
| 230 | 230 | : $setting['custom']; |
@@ -270,11 +270,11 @@ discard block |
||
| 270 | 270 | protected function getThingDescription() |
| 271 | 271 | { |
| 272 | 272 | $post = get_post(); |
| 273 | - if( !( $post instanceof WP_Post )) { |
|
| 273 | + if( !($post instanceof WP_Post) ) { |
|
| 274 | 274 | return ''; |
| 275 | 275 | } |
| 276 | - $text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt )); |
|
| 277 | - return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 )); |
|
| 276 | + $text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt ) ); |
|
| 277 | + return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ) ); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | /** |
@@ -77,7 +77,9 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function render() |
| 79 | 79 | { |
| 80 | - if( is_null( glsr()->schemas ))return; |
|
| 80 | + if( is_null( glsr()->schemas )) { |
|
| 81 | + return; |
|
| 82 | + } |
|
| 81 | 83 | printf( '<script type="application/ld+json">%s</script>', json_encode( |
| 82 | 84 | apply_filters( 'site-reviews/schema/all', glsr()->schemas ), |
| 83 | 85 | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES |
@@ -127,7 +129,9 @@ discard block |
||
| 127 | 129 | { |
| 128 | 130 | foreach( $values as $value ) { |
| 129 | 131 | $option = $this->getSchemaOptionValue( $value ); |
| 130 | - if( empty( $option ))continue; |
|
| 132 | + if( empty( $option )) { |
|
| 133 | + continue; |
|
| 134 | + } |
|
| 131 | 135 | $schema->$value( $option ); |
| 132 | 136 | } |
| 133 | 137 | return $schema; |
@@ -241,7 +245,9 @@ discard block |
||
| 241 | 245 | if( $value != $fallback ) { |
| 242 | 246 | return $value; |
| 243 | 247 | } |
| 244 | - if( !is_single() && !is_page() )return; |
|
| 248 | + if( !is_single() && !is_page() ) { |
|
| 249 | + return; |
|
| 250 | + } |
|
| 245 | 251 | // @todo make this dynamic |
| 246 | 252 | switch( $option ) { |
| 247 | 253 | case 'description': |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function read( $plaintext = false ) |
| 62 | 62 | { |
| 63 | - if( wp_validate_boolean( $plaintext )) { |
|
| 63 | + if( wp_validate_boolean( $plaintext ) ) { |
|
| 64 | 64 | $message = $this->stripHtmlTags( $this->message ); |
| 65 | 65 | return apply_filters( 'site-reviews/email/message', $message, 'text', $this ); |
| 66 | 66 | } |
@@ -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 ); |
@@ -72,7 +72,9 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | public function send() |
| 74 | 74 | { |
| 75 | - if( !$this->message || !$this->subject || !$this->to )return; |
|
| 75 | + if( !$this->message || !$this->subject || !$this->to ) { |
|
| 76 | + return; |
|
| 77 | + } |
|
| 76 | 78 | $sent = wp_mail( |
| 77 | 79 | $this->to, |
| 78 | 80 | $this->subject, |
@@ -90,8 +92,12 @@ discard block |
||
| 90 | 92 | */ |
| 91 | 93 | public function buildPlainTextMessage( PHPMailer $phpmailer ) |
| 92 | 94 | { |
| 93 | - if( empty( $this->email ))return; |
|
| 94 | - if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return; |
|
| 95 | + if( empty( $this->email )) { |
|
| 96 | + return; |
|
| 97 | + } |
|
| 98 | + if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody )) { |
|
| 99 | + return; |
|
| 100 | + } |
|
| 95 | 101 | $message = $this->stripHtmlTags( $phpmailer->Body ); |
| 96 | 102 | $phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this ); |
| 97 | 103 | } |
@@ -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, __METHOD__ ); |
| 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, |
@@ -16,9 +16,13 @@ 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 )) { |
|
| 20 | + continue; |
|
| 21 | + } |
|
| 20 | 22 | $methodName = glsr( Helper::class )->buildMethodName( $key, __METHOD__ ); |
| 21 | - if( !method_exists( $this, $methodName ))continue; |
|
| 23 | + if( !method_exists( $this, $methodName )) { |
|
| 24 | + continue; |
|
| 25 | + } |
|
| 22 | 26 | $query = call_user_func( [$this, $methodName], $values[$key] ); |
| 23 | 27 | if( is_array( $query )) { |
| 24 | 28 | $queries[] = $query; |
@@ -92,7 +96,9 @@ discard block |
||
| 92 | 96 | */ |
| 93 | 97 | protected function buildQueryAssignedTo( $value ) |
| 94 | 98 | { |
| 95 | - if( empty( $value ))return; |
|
| 99 | + if( empty( $value )) { |
|
| 100 | + return; |
|
| 101 | + } |
|
| 96 | 102 | return [ |
| 97 | 103 | 'compare' => 'IN', |
| 98 | 104 | 'key' => 'assigned_to', |
@@ -106,7 +112,9 @@ discard block |
||
| 106 | 112 | */ |
| 107 | 113 | protected function buildQueryCategory( $value ) |
| 108 | 114 | { |
| 109 | - if( empty( $value ))return; |
|
| 115 | + if( empty( $value )) { |
|
| 116 | + return; |
|
| 117 | + } |
|
| 110 | 118 | return [ |
| 111 | 119 | 'field' => 'term_id', |
| 112 | 120 | 'taxonomy' => Application::TAXONOMY, |
@@ -120,7 +128,9 @@ discard block |
||
| 120 | 128 | */ |
| 121 | 129 | protected function buildQueryRating( $value ) |
| 122 | 130 | { |
| 123 | - if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 )))return; |
|
| 131 | + if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 ))) { |
|
| 132 | + return; |
|
| 133 | + } |
|
| 124 | 134 | return [ |
| 125 | 135 | 'compare' => '>=', |
| 126 | 136 | 'key' => 'rating', |
@@ -134,7 +144,9 @@ discard block |
||
| 134 | 144 | */ |
| 135 | 145 | protected function buildQueryType( $value ) |
| 136 | 146 | { |
| 137 | - if( in_array( $value, ['','all'] ))return; |
|
| 147 | + if( in_array( $value, ['','all'] )) { |
|
| 148 | + return; |
|
| 149 | + } |
|
| 138 | 150 | return [ |
| 139 | 151 | 'key' => 'review_type', |
| 140 | 152 | 'value' => $value, |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | public function routeAdminPostRequest() |
| 17 | 17 | { |
| 18 | 18 | $request = $this->getRequest(); |
| 19 | - if( !$this->isValidPostRequest( $request ))return; |
|
| 19 | + if( !$this->isValidPostRequest( $request ) )return; |
|
| 20 | 20 | $this->checkAdminNonce( $request['action'] ); |
| 21 | 21 | $this->routeRequest( 'admin', $request['action'], $request ); |
| 22 | 22 | } |
@@ -29,15 +29,15 @@ discard block |
||
| 29 | 29 | public function routeAjaxRequest() |
| 30 | 30 | { |
| 31 | 31 | $request = $this->getRequest(); |
| 32 | - if( !isset( $request['action'] )) { |
|
| 32 | + if( !isset($request['action']) ) { |
|
| 33 | 33 | glsr_log()->error( 'The AJAX request must include an action' )->info( $request ); |
| 34 | 34 | wp_die(); |
| 35 | 35 | } |
| 36 | - if( !isset( $request['nonce'] )) { |
|
| 36 | + if( !isset($request['nonce']) ) { |
|
| 37 | 37 | glsr_log()->error( 'The AJAX request must include a nonce' )->info( $request ); |
| 38 | 38 | wp_die(); |
| 39 | 39 | } |
| 40 | - if( !wp_verify_nonce( $request['nonce'], $request['action'] )) { |
|
| 40 | + if( !wp_verify_nonce( $request['nonce'], $request['action'] ) ) { |
|
| 41 | 41 | glsr_log()->error( 'Nonce check failed for ajax request' )->info( $request ); |
| 42 | 42 | wp_die( -1, 403 ); |
| 43 | 43 | } |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | { |
| 54 | 54 | if( is_admin() )return; |
| 55 | 55 | $request = $this->getRequest(); |
| 56 | - if( !$this->isValidPostRequest( $request ))return; |
|
| 57 | - if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) { |
|
| 56 | + if( !$this->isValidPostRequest( $request ) )return; |
|
| 57 | + if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] ) ) { |
|
| 58 | 58 | glsr_log()->error( 'Nonce check failed for public request' )->info( $request ); |
| 59 | 59 | return; |
| 60 | 60 | } |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | { |
| 93 | 93 | foreach( ['request', Application::ID] as $key ) { |
| 94 | 94 | $request = glsr( Helper::class )->filterInputArray( $key ); |
| 95 | - if( !empty( $request ))break; |
|
| 95 | + if( !empty($request) )break; |
|
| 96 | 96 | } |
| 97 | - if( isset( $request[Application::ID]['action'] )) { |
|
| 97 | + if( isset($request[Application::ID]['action']) ) { |
|
| 98 | 98 | $request = $request[Application::ID]; |
| 99 | 99 | } |
| 100 | 100 | return $request; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | protected function isValidPostRequest( array $request = [] ) |
| 107 | 107 | { |
| 108 | - return !empty( $request['action'] ) && empty( glsr( Helper::class )->filterInput( 'ajax_request' )); |
|
| 108 | + return !empty($request['action']) && empty(glsr( Helper::class )->filterInput( 'ajax_request' )); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -116,11 +116,11 @@ discard block |
||
| 116 | 116 | protected function routeRequest( $type, $action, array $request = [] ) |
| 117 | 117 | { |
| 118 | 118 | $actionHook = 'site-reviews/route/'.$type.'/request'; |
| 119 | - $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' )); |
|
| 119 | + $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) ); |
|
| 120 | 120 | $method = glsr( Helper::class )->buildMethodName( $action, 'router' ); |
| 121 | 121 | $request = apply_filters( 'site-reviews/route/request', $request, $action, $type ); |
| 122 | 122 | do_action( $actionHook, $action, $request ); |
| 123 | - if( is_callable( [$controller, $method] )) { |
|
| 123 | + if( is_callable( [$controller, $method] ) ) { |
|
| 124 | 124 | call_user_func( [$controller, $method], $request ); |
| 125 | 125 | return; |
| 126 | 126 | } |
@@ -16,7 +16,9 @@ discard block |
||
| 16 | 16 | public function routeAdminPostRequest() |
| 17 | 17 | { |
| 18 | 18 | $request = $this->getRequest(); |
| 19 | - if( !$this->isValidPostRequest( $request ))return; |
|
| 19 | + if( !$this->isValidPostRequest( $request )) { |
|
| 20 | + return; |
|
| 21 | + } |
|
| 20 | 22 | $this->checkAdminNonce( $request['action'] ); |
| 21 | 23 | $this->routeRequest( 'admin', $request['action'], $request ); |
| 22 | 24 | } |
@@ -51,9 +53,13 @@ discard block |
||
| 51 | 53 | */ |
| 52 | 54 | public function routePublicPostRequest() |
| 53 | 55 | { |
| 54 | - if( is_admin() )return; |
|
| 56 | + if( is_admin() ) { |
|
| 57 | + return; |
|
| 58 | + } |
|
| 55 | 59 | $request = $this->getRequest(); |
| 56 | - if( !$this->isValidPostRequest( $request ))return; |
|
| 60 | + if( !$this->isValidPostRequest( $request )) { |
|
| 61 | + return; |
|
| 62 | + } |
|
| 57 | 63 | if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) { |
| 58 | 64 | glsr_log()->error( 'Nonce check failed for public request' )->info( $request ); |
| 59 | 65 | return; |
@@ -67,7 +73,9 @@ discard block |
||
| 67 | 73 | public function routeWebhookRequest() |
| 68 | 74 | { |
| 69 | 75 | $request = filter_input( INPUT_GET, Application::PREFIX.'hook' ); |
| 70 | - if( !$request )return; |
|
| 76 | + if( !$request ) { |
|
| 77 | + return; |
|
| 78 | + } |
|
| 71 | 79 | // @todo manage webhook here |
| 72 | 80 | } |
| 73 | 81 | |
@@ -92,7 +100,9 @@ discard block |
||
| 92 | 100 | { |
| 93 | 101 | foreach( ['request', Application::ID] as $key ) { |
| 94 | 102 | $request = glsr( Helper::class )->filterInputArray( $key ); |
| 95 | - if( !empty( $request ))break; |
|
| 103 | + if( !empty( $request )) { |
|
| 104 | + break; |
|
| 105 | + } |
|
| 96 | 106 | } |
| 97 | 107 | if( isset( $request[Application::ID]['action'] )) { |
| 98 | 108 | $request = $request[Application::ID]; |