Skip to content

Commit

Permalink
Merge pull request #2403 from seothemes/reviews-avoid-use-of-inline-css
Browse files Browse the repository at this point in the history 
Avoid use of inline CSS in course reviews
  • Loading branch information
@ideadude
ideadude authored Apr 24, 2023
2 parents e436b2e + fc7fd47 commit 9bc63b9
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 57 deletions.
5 changes: 5 additions & 0 deletions .changelogs/reviews-avoid-use-of-inline-css.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
significance: patch
type: changed
links:
- "#410"
entry: Avoid use of inline styles in course reviews.
33 changes: 33 additions & 0 deletions assets/scss/frontend/_reviews.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.llms_review {
margin: 20px 0px;
padding: 10px;

h5 {
font-size: 17px;
margin: 3px 0px;
}

h6 {
font-size: 13px;
}

p {
font-size: 15px;
}
}

.review_box {

[type=text] {
margin: 10px 0px
}

h5 {
color: red;
display: none;
}

+ .thank_you_box {
display: none;
}
}
1 change: 1 addition & 0 deletions assets/scss/lifterlms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@import "frontend/syllabus";
@import "frontend/llms-progress";
@import "frontend/llms-author";
@import "frontend/reviews";

@import "frontend/notices";
@import "frontend/llms-achievements-certs";
Expand Down
176 changes: 119 additions & 57 deletions includes/class.llms.review.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,36 @@
* LifterLMS Course reviews
*
* This class handles the front end of the reviews. It is responsible
* for outputting the HTML on the course page (if reviews are activated)
* for outputting the HTML on the course page (if reviews are activated).
*
* @package LifterLMS/Classes
*
* @since Unknown
* @version 5.9.0
* @since 1.2.7
* @version [version]
*/

defined( 'ABSPATH' ) || exit;

/**
* LLMS_Reviews class
*
* @since Unknown
* @since 1.2.7
*/
class LLMS_Reviews {

/**
* This is the constructor for this class. It takes care of attaching
* the functions in this file to the appropriate actions. These actions are:
* 1) output after course info
* 2) output after membership info
* 3 & 4) Add function call to the proper AJAX call
* This is the constructor for this class.
*
* It takes care of attaching the functions in this file to the
* appropriate actions.
* These actions are:
* 1) Output after course info.
* 2) Output after membership info.
* 3 & 4) Add function call to the proper AJAX call.
*
* @since 3.1.3
*
* @return void
* @version 3.1.3
*/
public function __construct() {
add_action( 'wp_ajax_LLMSSubmitReview', array( $this, 'process_review' ) );
Expand All @@ -40,64 +45,112 @@ public function __construct() {
* if not, nothing will happen. This function also checks to
* see if a user is allowed to review more than once.
*
* @since Unknown
* @since 1.2.7
* @since 3.24.0 Unknown.
* @since [version] Improve inline styles, escape output.
*
* @return void
*/
public static function output() {

/**
* Check to see if we are supposed to output the code at all
* Check to see if we are supposed to output the code at all.
*/
if ( get_post_meta( get_the_ID(), '_llms_display_reviews', true ) ) {

/**
* Filters the reviews section title.
*
* @since 1.2.7
*
* @param string $section_title The section title.
*/
$section_title = apply_filters( 'lifterlms_reviews_section_title', __( 'What Others Have Said', 'lifterlms' ) );

?>
<div id="old_reviews">
<h3><?php echo apply_filters( 'lifterlms_reviews_section_title', __( 'What Others Have Said', 'lifterlms' ) ); ?></h3>
<?php
$args = array(
'posts_per_page' => get_post_meta( get_the_ID(), '_llms_num_reviews', true ),
'post_type' => 'llms_review',
'post_status' => 'publish',
'post_parent' => get_the_ID(),
'suppress_filters' => true,
);
$posts_array = get_posts( $args );
<h3><?php echo esc_html( $section_title ); ?></h3>
<?php
$args = array(
'posts_per_page' => get_post_meta( get_the_ID(), '_llms_num_reviews', true ),
'post_type' => 'llms_review',
'post_status' => 'publish',
'post_parent' => get_the_ID(),
'suppress_filters' => true,
);

$styles = array(
'background-color' => '#EFEFEF',
'title-color' => 'inherit',
'text-color' => 'inherit',
'custom-css' => '',
);
$posts_array = get_posts( $args );

if ( has_filter( 'llms_review_custom_styles' ) ) {
$styles = apply_filters( 'llms_review_custom_styles', $styles );
}
/**
* Allow review custom styles to be filtered.
*
* @since 1.2.7
*
* @param array $styles Array of custom styles.
*/
$styles = apply_filters(
'llms_review_custom_styles',
array(
'background-color' => '#efefef',
'title-color' => 'inherit',
'text-color' => 'inherit',
'custom-css' => '',
)
);

$inline_styles = '';

if ( $styles['background-color'] ?? '' ) {
$inline_styles .= '.llms_review{background-color:' . $styles['background-color'] . '}';
}

if ( $styles['title-color'] ?? '' ) {
$inline_styles .= '.llms_review h5{color:' . $styles['title-color'] . '}';
}

foreach ( $posts_array as $post ) {
echo $styles['custom-css'];
if ( $styles['text-color'] ?? '' ) {
$inline_styles .= '.llms_review h6,.llms_review p{color:' . $styles['text-color'] . '}';
}

if ( $styles['custom-css'] ?? '' ) {

// Remove style tags in case they were added with the filter.
$inline_styles .= str_replace( array( '<style>', '</style>' ), '', $styles['custom-css'] );
}

if ( $inline_styles ) {
echo '<style id="llms_review_custom_styles">' . $inline_styles . '</style>';
}

foreach ( $posts_array as $post ) {
?>
<div class="llms_review">
<h5><strong><?php echo get_the_title( $post->ID ); ?></strong></h5>
<h6>
<?php
// Translators: %s = The author display name.
echo esc_html( sprintf( __( 'By: %s', 'lifterlms' ), get_the_author_meta( 'display_name', get_post_field( 'post_author', $post->ID ) ) ) );
?>
</h6>
<p><?php echo esc_html( get_post_field( 'post_content', $post->ID ) ); ?></p>
</div>
<?php
}
?>
<div class="llms_review" style="margin:20px 0px; background-color:<?php echo $styles['background-color']; ?>; padding:10px">
<h5 style="font-size:17px; color:<?php echo $styles['title-color']; ?>;" style="margin:3px 0px"><strong><?php echo get_the_title( $post->ID ); ?></strong></h5>
<h6 style="font-size:13px; color:<?php echo $styles['text-color']; ?>;"><?php echo sprintf( __( 'By: %s', 'lifterlms' ), get_the_author_meta( 'display_name', get_post_field( 'post_author', $post->ID ) ) ); ?></h6>
<p style="font-size:15px; color:<?php echo $styles['text-color']; ?>;"><?php echo get_post_field( 'post_content', $post->ID ); ?></p>
</div>
<?php
}
?>
<hr>
<hr>
</div>
<?php
}// End if().
}

/**
* Check to see if reviews are open
* Check to see if reviews are open.
*/
if ( get_post_meta( get_the_ID(), '_llms_reviews_enabled', true ) && is_user_logged_in() ) {

/**
* Look for previous reviews that we have written on this course.
*
* @var array
* @var array $posts_array Array of posts.
*/
$args = array(
'posts_per_page' => 1,
Expand All @@ -109,33 +162,42 @@ public static function output() {
);
$posts_array = get_posts( $args );

/**
* Filters the thank you text.
*
* @since 1.2.7
*
* @param string $thank_you_text The thank you text.
*/
$thank_you_text = apply_filters( 'llms_review_thank_you_text', __( 'Thank you for your review!', 'lifterlms' ) );

/**
* Check to see if we are allowed to write more than one review.
* If we are not, check to see if we have written a review already.
*/
if ( get_post_meta( get_the_ID(), '_llms_multiple_reviews_disabled', true ) && $posts_array ) {
?>
<div id="thank_you_box">
<h2><?php echo apply_filters( 'llms_review_thank_you_text', __( 'Thank you for your review!', 'lifterlms' ) ); ?></h2>
<h2><?php echo esc_html( $thank_you_text ); ?></h2>
</div>
<?php
} else {
?>
<div class="review_box" id="review_box">
<h3><?php _e( 'Write a Review', 'lifterlms' ); ?></h3>
<!--<form method="post" name="review_form" id="review_form">-->
<input style="margin:10px 0px" type="text" name="review_title" placeholder="<?php _e( 'Review Title', 'lifterlms' ); ?>" id="review_title">
<h5 style="color:red; display:none" id="review_title_error"><?php _e( 'Review Title is required.', 'lifterlms' ); ?></h5>
<textarea name="review_text" placeholder="<?php _e( 'Review Text', 'lifterlms' ); ?>" id="review_text"></textarea>
<h5 style="color:red; display:none" id="review_text_error"><?php _e( 'Review Text is required.', 'lifterlms' ); ?></h5>
<h3><?php esc_html_e( 'Write a Review', 'lifterlms' ); ?></h3>
<!--<form method="post" name="review_form" id="review_form">-->
<input type="text" name="review_title" placeholder="<?php esc_attr_e( 'Review Title', 'lifterlms' ); ?>" id="review_title">
<h5 id="review_title_error"><?php esc_html_e( 'Review Title is required.', 'lifterlms' ); ?></h5>
<textarea name="review_text" placeholder="<?php esc_attr_e( 'Review Text', 'lifterlms' ); ?>" id="review_text"></textarea>
<h5 id="review_text_error"><?php esc_html_e( 'Review Text is required.', 'lifterlms' ); ?></h5>
<?php wp_nonce_field( 'submit_review', 'submit_review_nonce_code' ); ?>
<input name="action" value="submit_review" type="hidden">
<input name="post_ID" value="<?php echo get_the_ID(); ?>" type="hidden" id="post_ID">
<input type="submit" class="button" value="<?php _e( 'Leave Review', 'lifterlms' ); ?>" id="llms_review_submit_button">
<!--</form> -->
<input type="submit" class="button" value="<?php esc_attr_e( 'Leave Review', 'lifterlms' ); ?>" id="llms_review_submit_button">
<!--</form> -->
</div>
<div id="thank_you_box" style="display:none;">
<h2><?php echo apply_filters( 'llms_review_thank_you_text', __( 'Thank you for your review!', 'lifterlms' ) ); ?></h2>
<div class="thank_you_box" id="thank_you_box">
<h2><?php echo esc_html( $thank_you_text ); ?></h2>
</div>
<?php
}
Expand All @@ -148,7 +210,7 @@ public static function output() {
* is pressed. This function gathers the data from $_POST and
* then adds the review with the appropriate content.
*
* @since Unknown
* @since 1.2.7
* @since 5.9.0 Stop using deprecated `FILTER_SANITIZE_STRING`.
*
* @return void
Expand Down

0 comments on commit 9bc63b9

Please sign in to comment.